From 4e226c2cbc0d22d535fd47e8fbb425fb6f26ae17 Mon Sep 17 00:00:00 2001 From: Zhengyu Peng Date: Tue, 22 Feb 2022 22:18:39 -0500 Subject: [PATCH] update --- .../com/rookiedev/hexapod/MainActivity.kt | 35 ++++++++++--------- .../src/main/res/layout/selected_device.xml | 4 +-- 2 files changed, 21 insertions(+), 18 deletions(-) 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 288f7c8..4326f27 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 @@ -40,8 +40,8 @@ class MainActivity : AppCompatActivity() { private lateinit var ipInput: TextInputEditText private lateinit var portInput: TextInputEditText - private lateinit var deviceName: TextView - private lateinit var deviceAddress: TextView + private lateinit var btDeviceName: TextView + private lateinit var btDeviceMac: TextView private lateinit var tabLayout: TabLayout @@ -51,16 +51,19 @@ class MainActivity : AppCompatActivity() { mContext = applicationContext - ipInput = findViewById(R.id.ip_input) - portInput = findViewById(R.id.port_input) - val buttonConnect = findViewById