Update AndroidX dependencies

SailReal · SailReal · commit a95e5dca5457 · 2022-06-01T15:26:39.000+02:00
diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle
@@ -30,9 +30,9 @@ ext {
 	javaxAnnotationVersion = '1.0'
 
 	// support lib
-	androidSupportAnnotationsVersion = '1.2.0'
-	androidSupportAppcompatVersion = '1.3.1'
-	androidSupportDesignVersion = '1.4.0'
+	androidSupportAnnotationsVersion = '1.3.0'
+	androidSupportAppcompatVersion = '1.4.1'
+	androidMaterialDesignVersion = '1.6.0'
 
 	coreDesugaringVersion = '1.1.5'
 
@@ -102,11 +102,11 @@ ext {
 	uiautomatorVersion = '2.2.0'
 	androidxTestJunitKtlnVersion = '1.1.3'
 
-	androidxCoreVersion = '1.6.0'
-	androidxFragmentVersion = '1.3.6'
+	androidxCoreVersion = '1.7.0'
+	androidxFragmentVersion = '1.4.1'
 	androidxViewpagerVersion = '1.0.0'
 	androidxSwiperefreshVersion = '1.1.0'
-	androidxPreferenceVersion = '1.1.1'
+	androidxPreferenceVersion = '1.2.0'
 	androidxRecyclerViewVersion = '1.2.1'
 	androidxDocumentfileVersion = '1.0.1'
 	androidxBiometricVersion = '1.1.0'
@@ -134,7 +134,7 @@ ext {
 			cryptolib             : "org.cryptomator:cryptolib:${cryptolibVersion}",
 			dagger                : "com.google.dagger:dagger:${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}",
 			dropbox               : "com.dropbox.core:dropbox-core-sdk:${dropboxVersion}",
 			espresso              : "androidx.test.espresso:espresso-core:${espressoVersion}",
diff --git a/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt b/presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SettingsFragment.kt
@@ -132,10 +132,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
 		if (biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_SUCCESS
 			&& biometricAuthenticationAvailable != BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
 		) {
-			val preference = findPreference(BIOMETRIC_AUTHENTICATION_ITEM_KEY) as Preference?
-			val generalCategory = findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory?
-			generalCategory?.removePreference(preference)
-
+			(findPreference(BIOMETRIC_AUTHENTICATION_ITEM_KEY) as Preference?)?.let { preference ->
+				(findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory?)?.removePreference(preference)
+			}
 			Timber //
 				.tag("SettingsFragment") //
 				.d("No working biometric hardware detected")
@@ -189,16 +188,16 @@ class SettingsFragment : PreferenceFragmentCompat() {
 				removeUpdateCheck()
 			}
 			else -> {
-				preferenceScreen.removePreference(findPreference(LICENSE_ITEM_KEY))
+				(findPreference(LICENSE_ITEM_KEY) as Preference?)?.let { preferenceScreen.removePreference(it) }
 				removeUpdateCheck()
 			}
 		}
 	}
 
 	private fun removeUpdateCheck() {
 		val versionCategory = findPreference("versionCategory") as PreferenceCategory?
-		versionCategory?.removePreference(findPreference(UPDATE_CHECK_ITEM_KEY))
-		versionCategory?.removePreference(findPreference(UPDATE_INTERVAL_ITEM_KEY))
+		(findPreference(UPDATE_CHECK_ITEM_KEY) as Preference?)?.let { versionCategory?.removePreference(it) }
+		(findPreference(UPDATE_INTERVAL_ITEM_KEY) as Preference?)?.let { versionCategory?.removePreference(it) }
 	}
 
 	fun setupUpdateCheck() {
@@ -224,8 +223,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
 	private fun setupCryptomatorVariants() {
 		if (BuildConfig.FLAVOR == "playstore") {
-			val generalCategory = findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory?
-			generalCategory?.removePreference(findPreference(CRYPTOMATOR_VARIANTS))
+			(findPreference(CRYPTOMATOR_VARIANTS) as Preference?)?.let { preference ->
+				(findPreference(getString(R.string.screen_settings_section_general)) as PreferenceCategory?)?.removePreference(preference)
+			}
 		}
 	}
 
