add exit button and disable save button until data is acquired

bri3d · Jun 11, 2019 · aee5bfd · aee5bfd
1 parent f684fc2
commit aee5bfd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/app/src/main/java/com/brianledbetter/tuneadjuster/MainActivity.kt b/app/src/main/java/com/brianledbetter/tuneadjuster/MainActivity.kt
@@ -56,6 +56,8 @@ class MainActivity : FragmentActivity(), AdjustFieldFragment.OnParameterAdjusted
                 Context.BIND_AUTO_CREATE)
 
         isActive = savedInstanceState?.getBoolean("Active") ?: false
+        button.isEnabled = isActive
+        connectionSwitch.isChecked = isActive
 
         connectionSwitch.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
             if (isChecked && !isActive) {
@@ -65,9 +67,14 @@ class MainActivity : FragmentActivity(), AdjustFieldFragment.OnParameterAdjusted
             }
         }
 
-        button.setOnClickListener { _ ->
+        button.setOnClickListener {
             saveBoostAndOctane()
         }
+
+        exitSwitch.setOnClickListener {
+            stopBluetoothThread()
+            finish()
+        }
     }
 
     override fun onSaveInstanceState(outState: Bundle?, outPersistentState: PersistableBundle?) {
@@ -125,6 +132,7 @@ class MainActivity : FragmentActivity(), AdjustFieldFragment.OnParameterAdjusted
             ServiceActions.Responses.SOCKET_CLOSED, ServiceActions.Responses.CONNECTION_NOT_ACTIVE -> {
                 statusLabel.text = resources.getString(R.string.not_connected)
                 isActive = false
+                button.isEnabled = false
                 connectionSwitch.isChecked = false
             }
             ServiceActions.Responses.CONNECTION_ACTIVE -> {
@@ -155,6 +163,7 @@ class MainActivity : FragmentActivity(), AdjustFieldFragment.OnParameterAdjusted
                 serviceMessenger?.send(messageWithIntent(Intent(ServiceActions.Requests.FETCH_TUNE_DATA)))
             }
             ServiceActions.Responses.TUNE_DATA -> {
+                button.isEnabled = true
                 statusLabel.text = resources.getString(R.string.got_data)
                 val octaneData = intent.getParcelableExtra<EurodyneIO.OctaneInfo>("octaneInfo")
                 val boostData = intent.getParcelableExtra<EurodyneIO.BoostInfo>("boostInfo")
@@ -208,6 +217,10 @@ class MainActivity : FragmentActivity(), AdjustFieldFragment.OnParameterAdjusted
 
     override fun onBackPressed() {
         super.onBackPressed()
+        stopBluetoothThread()
+    }
+
+    private fun stopBluetoothThread() {
         val serviceIntent = Intent(this, BluetoothService::class.java)
         stopService(serviceIntent)
     }

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -61,14 +61,23 @@
         android:saveEnabled="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fieldThreeFragmentContainer"
+        app:layout_constraintBottom_toTopOf="@+id/exitSwitch"
         app:layout_constraintVertical_weight="1.5" />
 
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/exitSwitch"
+        android:text="@string/exit"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/save"
+        android:enabled="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -20,4 +20,5 @@
     <string name="vinNumber">VIN</string>
     <string name="channel_name">Eurodyne Tune Adjuster</string>
     <string name="channel_description">Notification used to keep Bluetooth running.</string>
+    <string name="exit">Exit</string>
 </resources>