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

Update AndroidX dependencies

Browse Source
This commit is contained in:
Julian Raufelder 2022-06-01 15:26:39 +02:00
parent 03043a409a
commit a95e5dca54
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
buildsystem/dependencies.gradle
View File

@ -30,9 +30,9 @@ ext {
javaxAnnotationVersion = '1.0' javaxAnnotationVersion = '1.0'
// support lib // support lib
androidSupportAnnotationsVersion = '1.2.0' androidSupportAnnotationsVersion = '1.3.0'
androidSupportAppcompatVersion = '1.3.1' androidSupportAppcompatVersion = '1.4.1'
androidSupportDesignVersion = '1.4.0' androidMaterialDesignVersion = '1.6.0'
coreDesugaringVersion = '1.1.5' coreDesugaringVersion = '1.1.5'
@ -102,11 +102,11 @@ ext {
uiautomatorVersion = '2.2.0' uiautomatorVersion = '2.2.0'
androidxTestJunitKtlnVersion = '1.1.3' androidxTestJunitKtlnVersion = '1.1.3'
androidxCoreVersion = '1.6.0' androidxCoreVersion = '1.7.0'
androidxFragmentVersion = '1.3.6' androidxFragmentVersion = '1.4.1'
androidxViewpagerVersion = '1.0.0' androidxViewpagerVersion = '1.0.0'
androidxSwiperefreshVersion = '1.1.0' androidxSwiperefreshVersion = '1.1.0'
androidxPreferenceVersion = '1.1.1' androidxPreferenceVersion = '1.2.0'
androidxRecyclerViewVersion = '1.2.1' androidxRecyclerViewVersion = '1.2.1'
androidxDocumentfileVersion = '1.0.1' androidxDocumentfileVersion = '1.0.1'
androidxBiometricVersion = '1.1.0' androidxBiometricVersion = '1.1.0'
@ -134,7 +134,7 @@ ext {
cryptolib : "org.cryptomator:cryptolib:${cryptolibVersion}", cryptolib : "org.cryptomator:cryptolib:${cryptolibVersion}",
dagger : "com.google.dagger:dagger:${daggerVersion}", dagger : "com.google.dagger:dagger:${daggerVersion}",
daggerCompiler : "com.google.dagger:dagger-compiler:${daggerVersion}", daggerCompiler : "com.google.dagger:dagger-compiler:${daggerVersion}",
design : "com.google.android.material:material:${androidSupportDesignVersion}", design : "com.google.android.material:material:${androidMaterialDesignVersion}",
coreDesugaring : "com.android.tools:desugar_jdk_libs:${coreDesugaringVersion}", coreDesugaring : "com.android.tools:desugar_jdk_libs:${coreDesugaringVersion}",
dropbox : "com.dropbox.core:dropbox-core-sdk:${dropboxVersion}", dropbox : "com.dropbox.core:dropbox-core-sdk:${dropboxVersion}",
espresso : "androidx.test.espresso:espresso-core:${espressoVersion}", espresso : "androidx.test.espresso:espresso-core:${espressoVersion}",

18
presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt
View File

@ -132,10 +132,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
if (biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_SUCCESS if (biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_SUCCESS
&& biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED && biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
) { ) {
val preference = findPreference(BIOMETRIC_AUTHENTICATION_ITEM_KEY) as Preference? (findPreference(BIOMETRIC_AUTHENTICATION_ITEM_KEY) as Preference?)?.let { preference ->
val generalCategory = findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory? (findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory?)?.removePreference(preference)
generalCategory?.removePreference(preference) }
Timber // Timber //
.tag("SettingsFragment") // .tag("SettingsFragment") //
.d("No working biometric hardware detected") .d("No working biometric hardware detected")
@ -189,7 +188,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
removeUpdateCheck() removeUpdateCheck()
} }
else -> { else -> {
preferenceScreen.removePreference(findPreference(LICENSE_ITEM_KEY)) (findPreference(LICENSE_ITEM_KEY) as Preference?)?.let { preferenceScreen.removePreference(it) }
removeUpdateCheck() removeUpdateCheck()
} }
} }
@ -197,8 +196,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
private fun removeUpdateCheck() { private fun removeUpdateCheck() {
val versionCategory = findPreference("versionCategory") as PreferenceCategory? val versionCategory = findPreference("versionCategory") as PreferenceCategory?
versionCategory?.removePreference(findPreference(UPDATE_CHECK_ITEM_KEY)) (findPreference(UPDATE_CHECK_ITEM_KEY) as Preference?)?.let { versionCategory?.removePreference(it) }
versionCategory?.removePreference(findPreference(UPDATE_INTERVAL_ITEM_KEY)) (findPreference(UPDATE_INTERVAL_ITEM_KEY) as Preference?)?.let { versionCategory?.removePreference(it) }
} }
fun setupUpdateCheck() { fun setupUpdateCheck() {
@ -224,8 +223,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
private fun setupCryptomatorVariants() { private fun setupCryptomatorVariants() {
if (BuildConfig.FLAVOR == "playstore") { if (BuildConfig.FLAVOR == "playstore") {
val generalCategory = findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory? (findPreference(CRYPTOMATOR_VARIANTS) as Preference?)?.let { preference ->
generalCategory?.removePreference(findPreference(CRYPTOMATOR_VARIANTS)) (findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory?)?.removePreference(preference)
}
} }
} }