diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/InputActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/InputActivity.kt index 3c188605e..6b639745b 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/InputActivity.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/InputActivity.kt @@ -21,14 +21,6 @@ class InputActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { binding = ActivityInputBinding.inflate(layoutInflater) super.onCreate(savedInstanceState) - binding.titleView.text = viewModel.title - - binding.speechInput.setOnClickListener { - showSpeechInput() - } - binding.keyboardInput.setOnClickListener { - showKeyboard() - } binding.editText.setOnEditorActionListener { _, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE) { @@ -38,6 +30,8 @@ class InputActivity : BaseActivity() { } false } + + showKeyboard() } private fun returnInput(inputString: String?) { @@ -48,28 +42,15 @@ class InputActivity : BaseActivity() { } private fun showKeyboard() { - binding.editText.hint = binding.titleView.text - binding.editText.setText(viewModel.existingInput) - binding.editText.requestFocus() - binding.editText.postDelayed(100) { - val imm: InputMethodManager = - getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager - imm.showSoftInput(binding.editText, InputMethodManager.SHOW_FORCED) + binding.editText.post { + binding.editText.setText(viewModel.existingInput) + binding.editText.requestFocus() + binding.editText.postDelayed(250) { + val imm: InputMethodManager = + getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + imm.showSoftInput(binding.editText, InputMethodManager.SHOW_FORCED) + } } } - private val speechInputResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { - if (it.resultCode == Activity.RESULT_OK) { - val spokenText: String? = it.data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)?.firstOrNull() - returnInput(spokenText) - } - } - - private fun showSpeechInput() { - val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply { - putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM) - putExtra(RecognizerIntent.EXTRA_PROMPT, binding.titleView.text) - } - speechInputResult.launch(intent) - } } diff --git a/wearos/src/main/res/layout/activity_input.xml b/wearos/src/main/res/layout/activity_input.xml index b42ec4daf..0257eab1a 100644 --- a/wearos/src/main/res/layout/activity_input.xml +++ b/wearos/src/main/res/layout/activity_input.xml @@ -9,42 +9,15 @@ android:layout_gravity="center" android:orientation="vertical" android:gravity="center"> - - - + android:visibility="visible"> Start new day Check off any you did yesterday: Task Type - Task title… + Enter Task Title Save Sync Data Hide task rewards