@@ -16,23 +16,18 @@ import androidx.activity.viewModels
1616import androidx.appcompat.app.AppCompatActivity
1717import androidx.core.view.ViewCompat
1818import androidx.core.view.WindowInsetsCompat
19- import androidx.lifecycle.Lifecycle
2019import androidx.lifecycle.lifecycleScope
21- import androidx.lifecycle.repeatOnLifecycle
2220import dagger.hilt.android.AndroidEntryPoint
2321import kotlinx.coroutines.launch
24- import org.kabiri.android.usbterminal.util.scrollToLastLine
2522import org.kabiri.android.usbterminal.ui.setting.SettingModalBottomSheet
2623import org.kabiri.android.usbterminal.ui.setting.SettingViewModel
24+ import org.kabiri.android.usbterminal.util.scrollToLastLine
2725import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
2826
27+ private const val TAG = " MainActivity"
28+
2929@AndroidEntryPoint
3030class MainActivity : AppCompatActivity () {
31-
32- companion object {
33- private const val TAG = " MainActivity"
34- }
35-
3631 private val viewModel by viewModels<MainActivityViewModel >()
3732 private val settingViewModel by viewModels<SettingViewModel >()
3833
@@ -70,9 +65,11 @@ class MainActivity : AppCompatActivity() {
7065 fun sendCommand () {
7166 val input = etInput.text.toString()
7267 // append the input to console
73- if (viewModel.serialWrite(input))
74- etInput.setText(" " ) // clear the terminal input.
75- else Log .e(TAG , " The message was not sent to Arduino" )
68+ if (viewModel.serialWrite(input)) {
69+ etInput.setText(" " )
70+ } else {
71+ Log .e(TAG , " The message was not sent to Arduino" )
72+ }
7673 }
7774
7875 // send the command to device when the button is clicked.
@@ -86,7 +83,9 @@ class MainActivity : AppCompatActivity() {
8683 event.action == KeyEvent .ACTION_DOWN )) {
8784 sendCommand()
8885 true
89- } else false
86+ } else {
87+ false
88+ }
9089 }
9190 }
9291
0 commit comments