From d231e059f7e62f98b967f4e0db50c318396d52c9 Mon Sep 17 00:00:00 2001 From: KevinX8 Date: Mon, 31 Jan 2022 12:49:59 +0000 Subject: [PATCH] Update Dependencies and SDK target to match Vanced --- build.gradle | 4 ++-- play-services-base/build.gradle | 2 +- play-services-core/build.gradle | 8 ++++---- play-services-core/microg-ui-tools/build.gradle | 2 +- .../kotlin/org/microg/gms/ui/AppIconPreference.kt | 7 ++++--- .../main/kotlin/org/microg/gms/ui/TextPreference.kt | 13 +++++++------ 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 51afd3a0..b6dea5be 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ */ buildscript { - ext.androidMinSdk = 21 - ext.androidTargetSdk = 29 + ext.androidMinSdk = 23 + ext.androidTargetSdk = 30 ext.androidCompileSdk = 31 repositories { diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle index 98181ef9..67fef509 100644 --- a/play-services-base/build.gradle +++ b/play-services-base/build.gradle @@ -38,6 +38,6 @@ dependencies { api project(':play-services-tasks') api project(':play-services-base-api') - implementation 'androidx.fragment:fragment:1.4.0' + implementation 'androidx.fragment:fragment:1.4.1' implementation 'com.google.android.gms:play-services-base:18.0.1' } \ No newline at end of file diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 70f64e5c..16d32fcd 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -32,16 +32,16 @@ dependencies { // AndroidX UI implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'androidx.mediarouter:mediarouter:1.2.5' - implementation "androidx.preference:preference-ktx:1.1.1" + implementation 'androidx.mediarouter:mediarouter:1.2.6' + implementation 'androidx.preference:preference-ktx:1.2.0' implementation "org.microg.gms:conscrypt-gmscore:2.5.1" implementation 'androidx.annotation:annotation:1.3.0' implementation 'androidx.lifecycle:lifecycle-service:2.4.0' // Navigation - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' + implementation 'androidx.navigation:navigation-fragment-ktx:2.4.0' + implementation 'androidx.navigation:navigation-ui-ktx:2.4.0' implementation 'androidx.lifecycle:lifecycle-service:2.4.0' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10' diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle index f77f77c9..cfd28f93 100644 --- a/play-services-core/microg-ui-tools/build.gradle +++ b/play-services-core/microg-ui-tools/build.gradle @@ -38,6 +38,6 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' - implementation "androidx.preference:preference:1.1.1" + implementation 'androidx.preference:preference:1.2.0' } diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/AppIconPreference.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/AppIconPreference.kt index 4d53f241..739c514c 100755 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/AppIconPreference.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/AppIconPreference.kt @@ -13,9 +13,10 @@ import androidx.preference.Preference import androidx.preference.PreferenceViewHolder class AppIconPreference : Preference { - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) - constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super( + context!!, attrs, defStyleAttr, defStyleRes) + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context!!, attrs, defStyleAttr) + constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs) constructor(context: Context) : super(context) override fun onBindViewHolder(holder: PreferenceViewHolder) { diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/TextPreference.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/TextPreference.kt index 4415512c..a6fefde7 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/TextPreference.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/TextPreference.kt @@ -15,20 +15,21 @@ import androidx.preference.Preference import androidx.preference.PreferenceViewHolder class TextPreference : Preference { - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) - constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super( + context!!, attrs, defStyleAttr, defStyleRes) + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context!!, attrs, defStyleAttr) + constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs) constructor(context: Context) : super(context) - override fun onBindViewHolder(holder: PreferenceViewHolder?) { + override fun onBindViewHolder(holder: PreferenceViewHolder) { super.onBindViewHolder(holder) - val iconFrame = holder?.findViewById(androidx.preference.R.id.icon_frame) + val iconFrame = holder.findViewById(androidx.preference.R.id.icon_frame) iconFrame?.layoutParams?.height = MATCH_PARENT (iconFrame as? LinearLayout)?.gravity = Gravity.TOP or Gravity.START val pad = (context.resources.displayMetrics.densityDpi/160f * 20).toInt() iconFrame?.setPadding(0, pad, 0, pad) - val textView = holder?.findViewById(android.R.id.summary) as? TextView + val textView = holder.findViewById(android.R.id.summary) as? TextView textView?.maxLines = Int.MAX_VALUE } }