From 085b946c7d3df2a7a24183b2949d4bacd5d16c5e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 1 Feb 2020 23:41:44 +0530 Subject: Theming related fixes (#627) * Make navigation match window background Signed-off-by: Harsh Shandilya * Remove light navigation flag Signed-off-by: Harsh Shandilya * Use black navbar in light theme windowLightNavigationBar is not portable across API 23 to 29 so we're better off with this solution Signed-off-by: Harsh Shandilya * Simplify folder dialog title UI Signed-off-by: Harsh Shandilya * Make night theme completely flat Signed-off-by: Harsh Shandilya * Remove unnecessary type Signed-off-by: Harsh Shandilya * Don't try to use non-existent external repo Signed-off-by: Harsh Shandilya Co-authored-by: Aditya Wasan --- app/src/main/java/com/zeapo/pwdstore/UserPreference.kt | 2 +- .../com/zeapo/pwdstore/ui/dialogs/FolderCreationDialogFragment.kt | 1 + app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/com') diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt index d62f926e..bce432ea 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt @@ -88,7 +88,7 @@ class UserPreference : AppCompatActivity() { val clearClipboard20xPreference = findPreference("clear_clipboard_20x") // Autofill preferences - autoFillEnablePreference = findPreference("autofill_enable") + autoFillEnablePreference = findPreference("autofill_enable") val autoFillAppsPreference = findPreference("autofill_apps") val autoFillDefaultPreference = findPreference("autofill_default") val autoFillAlwaysShowDialogPreference = findPreference("autofill_always") diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/FolderCreationDialogFragment.kt b/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/FolderCreationDialogFragment.kt index b9df5613..3b00ec11 100644 --- a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/FolderCreationDialogFragment.kt +++ b/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/FolderCreationDialogFragment.kt @@ -18,6 +18,7 @@ import java.io.File class FolderCreationDialogFragment : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val alertDialogBuilder = MaterialAlertDialogBuilder(requireContext()) + alertDialogBuilder.setTitle(R.string.title_create_folder) alertDialogBuilder.setView(R.layout.folder_creation_dialog_fragment) alertDialogBuilder.setPositiveButton(getString(R.string.button_create)) { _: DialogInterface, _: Int -> createDirectory(requireArguments().getString(CURRENT_DIR_EXTRA)!!) diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt index f6ba7d32..06608671 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt @@ -145,9 +145,12 @@ open class PasswordRepository protected constructor() { } return if (settings.getBoolean("git_external", false)) { val externalRepo = settings.getString("git_external_repo", null) - File(requireNotNull(externalRepo)) + if (externalRepo != null) + File(externalRepo) + else + File(context.filesDir.toString(), "/store") } else { - File(context.filesDir.toString() + "/store") + File(context.filesDir.toString(), "/store") } } -- cgit v1.2.3