etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Dependencies and SDK target to match Vanced

This commit is contained in:
KevinX8 2022-01-31 12:49:59 +00:00
parent 5f2b3b5205
commit d231e059f7
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -4,8 +4,8 @@
*/ */
buildscript { buildscript {
ext.androidMinSdk = 21 ext.androidMinSdk = 23
ext.androidTargetSdk = 29 ext.androidTargetSdk = 30
ext.androidCompileSdk = 31 ext.androidCompileSdk = 31
repositories { repositories {

2
play-services-base/build.gradle
View File

@ -38,6 +38,6 @@ dependencies {
api project(':play-services-tasks') api project(':play-services-tasks')
api project(':play-services-base-api') 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' implementation 'com.google.android.gms:play-services-base:18.0.1'
} }

8
play-services-core/build.gradle
View File

@ -32,16 +32,16 @@ dependencies {
// AndroidX UI // AndroidX UI
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.mediarouter:mediarouter:1.2.5' implementation 'androidx.mediarouter:mediarouter:1.2.6'
implementation "androidx.preference:preference-ktx:1.1.1" implementation 'androidx.preference:preference-ktx:1.2.0'
implementation "org.microg.gms:conscrypt-gmscore:2.5.1" implementation "org.microg.gms:conscrypt-gmscore:2.5.1"
implementation 'androidx.annotation:annotation:1.3.0' implementation 'androidx.annotation:annotation:1.3.0'
implementation 'androidx.lifecycle:lifecycle-service:2.4.0' implementation 'androidx.lifecycle:lifecycle-service:2.4.0'
// Navigation // Navigation
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' implementation 'androidx.navigation:navigation-fragment-ktx:2.4.0'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' implementation 'androidx.navigation:navigation-ui-ktx:2.4.0'
implementation 'androidx.lifecycle:lifecycle-service:2.4.0' implementation 'androidx.lifecycle:lifecycle-service:2.4.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10'

2
play-services-core/microg-ui-tools/build.gradle
View File

@ -38,6 +38,6 @@ android {
dependencies { dependencies {
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.4.1'
implementation "androidx.preference:preference:1.1.1" implementation 'androidx.preference:preference:1.2.0'
} }

7
play-services-core/src/main/kotlin/org/microg/gms/ui/AppIconPreference.kt
View File

@ -13,9 +13,10 @@ import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder import androidx.preference.PreferenceViewHolder
class AppIconPreference : Preference { class AppIconPreference : Preference {
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) context!!, attrs, defStyleAttr, defStyleRes)
constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context!!, attrs, defStyleAttr)
constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs)
constructor(context: Context) : super(context) constructor(context: Context) : super(context)
override fun onBindViewHolder(holder: PreferenceViewHolder) { override fun onBindViewHolder(holder: PreferenceViewHolder) {

13
play-services-core/src/main/kotlin/org/microg/gms/ui/TextPreference.kt
View File

@ -15,20 +15,21 @@ import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder import androidx.preference.PreferenceViewHolder
class TextPreference : Preference { class TextPreference : Preference {
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(
constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) context!!, attrs, defStyleAttr, defStyleRes)
constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context!!, attrs, defStyleAttr)
constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs)
constructor(context: Context) : super(context) constructor(context: Context) : super(context)
override fun onBindViewHolder(holder: PreferenceViewHolder?) { override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder) 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?.layoutParams?.height = MATCH_PARENT
(iconFrame as? LinearLayout)?.gravity = Gravity.TOP or Gravity.START (iconFrame as? LinearLayout)?.gravity = Gravity.TOP or Gravity.START
val pad = (context.resources.displayMetrics.densityDpi/160f * 20).toInt() val pad = (context.resources.displayMetrics.densityDpi/160f * 20).toInt()
iconFrame?.setPadding(0, pad, 0, pad) 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 textView?.maxLines = Int.MAX_VALUE
} }
} }