Skip to content

Commit 472bb48

Browse files
committed
chore: update dependencies
update to: navigation: 2.5.1 kotlin-coroutines: 1.6.4 androidx-core-ktx: 1.8.0 androidx-appcompat: 1.4.2 androidx-preference-ktx: 1.2.0 androidx-constraintlayout: 2.1.4 androidx-fragment-ktx: 1.5.1 kotlinx-serialization-json: 1.4.0 - refactor(ui): minor refactor due to API changes brought by dependency update
1 parent 677106c commit 472bb48

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

app/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -111,20 +111,20 @@ dependencies {
111111
implementation "com.blankj:utilcodex:1.30.6"
112112
implementation "com.jakewharton.timber:timber:5.0.1"
113113
implementation "cat.ereza:customactivityoncrash:2.4.0"
114-
implementation "androidx.core:core-ktx:1.7.0"
115-
implementation "androidx.appcompat:appcompat:1.3.0"
116-
implementation "androidx.preference:preference-ktx:1.1.1"
117-
implementation "androidx.constraintlayout:constraintlayout:2.1.2"
114+
implementation "androidx.core:core-ktx:1.8.0"
115+
implementation "androidx.appcompat:appcompat:1.4.2"
116+
implementation "androidx.preference:preference-ktx:1.2.0"
117+
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
118118
implementation "androidx.viewpager2:viewpager2:1.0.0"
119-
implementation "androidx.fragment:fragment-ktx:1.4.0"
119+
implementation "androidx.fragment:fragment-ktx:1.5.1"
120120
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
121121
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
122122
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
123123
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
124124
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
125-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
125+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0"
126126
implementation "com.google.android.flexbox:flexbox:3.0.0"
127-
127+
128128
// Testing
129129
testImplementation "junit:junit:4.13.2"
130130
androidTestImplementation "junit:junit:4.13.2"

app/src/main/java/com/osfans/trime/ui/components/FolderPickerPreference.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class FolderPickerPreference : Preference {
3737
private val currentValue: String
3838
get() = getPersistedString(value)
3939

40-
override fun onGetDefaultValue(a: TypedArray?, index: Int): Any {
41-
return a?.getString(index) ?: ""
40+
override fun onGetDefaultValue(a: TypedArray, index: Int): Any {
41+
return a.getString(index) ?: ""
4242
}
4343

4444
override fun onSetInitialValue(defaultValue: Any?) {

app/src/main/java/com/osfans/trime/ui/fragments/AboutFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class AboutFragment : PaddingPreferenceFragment() {
6262
}
6363

6464
private fun Preference.hidden() {
65-
if (this.summary.isBlank() || this.intent.data.toString().isBlank()) {
65+
if (this.summary?.isBlank() == true || this.intent?.data == null) {
6666
this.isVisible = false
6767
}
6868
}

app/src/main/java/com/osfans/trime/ui/fragments/KeyboardFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ class KeyboardFragment :
5656
super.onResume()
5757
viewModel.setToolbarTitle(getString(R.string.pref_keyboard))
5858
viewModel.disableTopOptionsMenu()
59-
preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
59+
preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
6060
}
6161

6262
override fun onPause() {
6363
super.onPause()
64-
preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
64+
preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
6565
}
6666
}

app/src/main/java/com/osfans/trime/ui/fragments/OtherFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class OtherFragment :
6767
}
6868
}
6969

70-
override fun onPreferenceTreeClick(preference: Preference?): Boolean {
71-
when (val key = preference?.key) {
70+
override fun onPreferenceTreeClick(preference: Preference): Boolean {
71+
when (val key = preference.key) {
7272
"other_managed_clipboard",
7373
"other_managed_collection",
7474
"other_managed_draft" -> {
@@ -91,12 +91,12 @@ class OtherFragment :
9191
super.onResume()
9292
viewModel.setToolbarTitle(getString(R.string.pref_other))
9393
viewModel.disableTopOptionsMenu()
94-
preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
94+
preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
9595
}
9696

9797
override fun onPause() {
9898
updateLauncherIconStatus()
99-
preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
99+
preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
100100
super.onPause()
101101
}
102102

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
buildscript {
1010
ext.kotlin_version = '1.7.10'
11-
ext.kotlin_coroutines_version = '1.6.0'
12-
ext.nav_version = '2.4.2'
11+
ext.kotlin_coroutines_version = '1.6.4'
12+
ext.nav_version = '2.5.1'
1313

1414
}
1515

0 commit comments

Comments
 (0)