AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

#291 enhance focus flow in dialog's using TAB key in hardware keyboards

Browse Source
This commit is contained in:
Julian Raufelder 2021-04-15 13:02:07 +02:00
parent 8d198dafe4
commit 88f17d610f
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
8 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
presentation/src/main/java/org/cryptomator/presentation/ui/dialog/ChangePasswordDialog.kt
View File

@ -46,6 +46,11 @@ class ChangePasswordDialog : BaseProgressErrorDialog<ChangePasswordDialog.Callba
}
dialog.setCanceledOnTouchOutside(false)
et_old_password.requestFocus()
et_old_password.nextFocusForwardId = et_new_password.id
et_new_password.nextFocusForwardId = et_new_retype_password.id
changePasswordButton?.let { button ->
et_new_retype_password.nextFocusForwardId = button.id
}
}
}

3
presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CloudNodeRenameDialog.kt
View File

@ -41,6 +41,9 @@ class CloudNodeRenameDialog : BaseProgressErrorDialog<CloudNodeRenameDialog.Call
}
dialog.setCanceledOnTouchOutside(false)
et_rename.requestFocus()
renameConfirmButton?.let { button ->
et_rename.nextFocusForwardId = button.id
}
}
}

3
presentation/src/main/java/org/cryptomator/presentation/ui/dialog/CreateFolderDialog.kt
View File

@ -36,6 +36,9 @@ class CreateFolderDialog : BaseProgressErrorDialog<CreateFolderDialog.Callback>(
}
dialog.setCanceledOnTouchOutside(false)
et_folder_name.requestFocus()
createFolderButton?.let { button ->
et_folder_name.nextFocusForwardId = button.id
}
}
}

4
presentation/src/main/java/org/cryptomator/presentation/ui/dialog/EnterPasswordDialog.kt
View File

@ -41,7 +41,9 @@ class EnterPasswordDialog : BaseProgressErrorDialog<EnterPasswordDialog.Callback
onWaitForResponse(et_password)
dialog.getButton(android.app.Dialog.BUTTON_NEGATIVE)?.isEnabled = true
}
unlockButton?.let { button ->
et_password.nextFocusForwardId = button.id
}
it.setCanceledOnTouchOutside(false)
et_password.requestFocus()
}

3
presentation/src/main/java/org/cryptomator/presentation/ui/dialog/FileNameDialog.kt
View File

@ -32,6 +32,9 @@ class FileNameDialog : BaseProgressErrorDialog<FileNameDialog.Callback>() {
}
dialog.setCanceledOnTouchOutside(false)
file_name.requestFocus()
createFileButton?.let { button ->
file_name.nextFocusForwardId = button.id
}
}
}

8
presentation/src/main/java/org/cryptomator/presentation/ui/dialog/UpdateLicenseDialog.kt
View File

@ -23,14 +23,17 @@ class UpdateLicenseDialog : BaseProgressErrorDialog<UpdateLicenseDialog.Callback
override fun onStart() {
super.onStart()
allowClosingDialog(false)
val dialog = dialog as AlertDialog?
if (dialog != null) {
dialog?.let {
checkLicenseButton = dialog.getButton(android.app.Dialog.BUTTON_POSITIVE)
checkLicenseButton?.setOnClickListener {
callback?.checkLicenseClicked(et_license.text.toString())
onWaitForResponse(et_license)
}
dialog.setCanceledOnTouchOutside(false)
checkLicenseButton?.let { button ->
et_license.nextFocusForwardId = button.id
}
}
}
@ -39,7 +42,6 @@ class UpdateLicenseDialog : BaseProgressErrorDialog<UpdateLicenseDialog.Callback
.setTitle(getString(R.string.dialog_enter_license_title)) //
.setPositiveButton(getText(R.string.dialog_enter_license_ok_button)) { _: DialogInterface, _: Int -> } //
.setNegativeButton(getText(R.string.dialog_enter_license_decline_button)) { _: DialogInterface, _: Int -> callback?.onCheckLicenseCanceled() } //
.setCancelable(false) //
.create()
}

3
presentation/src/main/java/org/cryptomator/presentation/ui/dialog/VaultRenameDialog.kt
View File

@ -37,6 +37,9 @@ class VaultRenameDialog : BaseProgressErrorDialog<VaultRenameDialog.Callback>()
}
dialog.setCanceledOnTouchOutside(false)
et_rename.requestFocus()
renameConfirmButton?.let { button ->
et_rename.nextFocusForwardId = button.id
}
}
}

12
presentation/src/main/java/org/cryptomator/presentation/ui/fragment/LicensesFragment.kt
View File

@ -1,12 +0,0 @@
package org.cryptomator.presentation.ui.fragment
import android.os.Bundle
import androidx.preference.PreferenceFragmentCompat
import org.cryptomator.presentation.R
class LicensesFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.licenses)
}
}