From 7f94955bd0d1bfdea98d4f51b9986a42ff689e2b Mon Sep 17 00:00:00 2001
From: Zhengyu Peng <rookiepeng@users.noreply.github.com>
Date: Thu, 10 Feb 2022 21:26:34 -0500
Subject: [PATCH] update

---
 software/android/.idea/gradle.xml             |  1 +
 software/android/app/build.gradle             | 10 +++---
 .../com/rookiedev/hexapod/MainActivity.kt     | 33 +++++++++++++++++++
 .../app/src/main/res/layout/activity_main.xml | 14 ++++----
 software/android/build.gradle                 |  4 +--
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 6 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/software/android/.idea/gradle.xml b/software/android/.idea/gradle.xml
index 4e3844e..526b4c2 100644
--- a/software/android/.idea/gradle.xml
+++ b/software/android/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/software/android/app/build.gradle b/software/android/app/build.gradle
index a578cc0..1e92f5a 100644
--- a/software/android/app/build.gradle
+++ b/software/android/app/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "com.rookiedev.hexapod"
-        minSdk 21
+        minSdk 29
         targetSdk 31
         versionCode 1
         versionName "1.0"
@@ -34,10 +34,10 @@ android {
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
-    testImplementation 'junit:junit:4.+'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
\ No newline at end of file
diff --git a/software/android/app/src/main/java/com/rookiedev/hexapod/MainActivity.kt b/software/android/app/src/main/java/com/rookiedev/hexapod/MainActivity.kt
index 0a8a57e..6bc700b 100644
--- a/software/android/app/src/main/java/com/rookiedev/hexapod/MainActivity.kt
+++ b/software/android/app/src/main/java/com/rookiedev/hexapod/MainActivity.kt
@@ -1,11 +1,44 @@
 package com.rookiedev.hexapod
 
+import android.net.InetAddresses.isNumericAddress
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
+import android.widget.Toast
+import com.google.android.material.textfield.TextInputEditText
+import android.text.Editable
+
+import android.text.TextWatcher
+
+
+
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        val ipInput = findViewById<TextInputEditText>(R.id.ip_input)
+        val portInput = findViewById<TextInputEditText>(R.id.port_input)
+        val buttonConnect = findViewById<Button>(R.id.button_connect)
+
+        buttonConnect.setOnClickListener {
+            // your code to perform when the user clicks on the button
+
+            Toast.makeText(this@MainActivity, "You clicked me.", Toast.LENGTH_SHORT).show()
+        }
+
+
+        ipInput.addTextChangedListener(object : TextWatcher {
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun afterTextChanged(s: Editable) {
+                if (isNumericAddress(s.toString())){
+                    Toast.makeText(this@MainActivity, "Correct", Toast.LENGTH_SHORT).show()
+                } else {
+                    Toast.makeText(this@MainActivity, "Wrong", Toast.LENGTH_SHORT).show()
+                }
+            }
+        })
     }
 }
\ No newline at end of file
diff --git a/software/android/app/src/main/res/layout/activity_main.xml b/software/android/app/src/main/res/layout/activity_main.xml
index f05d3d4..e7ab4bc 100644
--- a/software/android/app/src/main/res/layout/activity_main.xml
+++ b/software/android/app/src/main/res/layout/activity_main.xml
@@ -21,16 +21,17 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/ip_input"
+        android:id="@+id/ip_input_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toTopOf="@id/port_input"
+        app:layout_constraintBottom_toTopOf="@id/port_input_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/hexapod_logo" >
 
         <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/ip_input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="number|numberDecimal"
@@ -39,16 +40,17 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/port_input"
+        android:id="@+id/port_input_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toTopOf="@id/button_first"
+        app:layout_constraintBottom_toTopOf="@id/button_connect"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/ip_input">
+        app:layout_constraintTop_toBottomOf="@id/ip_input_layout">
 
         <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/port_input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="number"
@@ -57,7 +59,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <Button
-        android:id="@+id/button_first"
+        android:id="@+id/button_connect"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/software/android/build.gradle b/software/android/build.gradle
index fcb3742..9262dea 100644
--- a/software/android/build.gradle
+++ b/software/android/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20"
+        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/software/android/gradle/wrapper/gradle-wrapper.properties b/software/android/gradle/wrapper/gradle-wrapper.properties
index d593555..3235c53 100644
--- a/software/android/gradle/wrapper/gradle-wrapper.properties
+++ b/software/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Feb 09 11:03:31 EST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME