From 34073705639615bcc0b23752fcfd10b76055ecf5 Mon Sep 17 00:00:00 2001 From: JerretQueen Date: Sat, 30 Dec 2023 00:14:24 -0600 Subject: [PATCH 1/4] 1. Fixed a typo in @string/onboarding_body2. The message now correctly says "implementation" instead of "implemtation". 2. Changed layout of overview_pods_dual_item.xml so that the left and right pod status are properly lined up with each other. --- app-wear/src/main/res/layout/overview_pods_dual_item.xml | 7 ++----- app/src/main/res/values/strings.xml | 2 +- build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app-wear/src/main/res/layout/overview_pods_dual_item.xml b/app-wear/src/main/res/layout/overview_pods_dual_item.xml index 8757a988..07524dda 100644 --- a/app-wear/src/main/res/layout/overview_pods_dual_item.xml +++ b/app-wear/src/main/res/layout/overview_pods_dual_item.xml @@ -69,11 +69,9 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:layout_marginEnd="4dp" - app:layout_constraintBottom_toTopOf="@id/barrier_bottom" app:layout_constraintEnd_toStartOf="@id/pod_case_container" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/barrier_top" - app:layout_constraintVertical_bias="0.2"> + app:layout_constraintTop_toTopOf="@+id/pod_right_container"> + app:layout_constraintTop_toBottomOf="@id/barrier_top"> This app adds support for AirPod specific features to Android. - Not all Android devices fully support the extra AirPod features. Your operating system requires a correctly working Bluetooth-Low-Energy implemtation. + Not all Android devices fully support the extra AirPod features. Your operating system requires a correctly working Bluetooth-Low-Energy implementation. CAPod has no ads and does not collect your data. You can upgrade to CAPod Pro to gain extra features and support development. diff --git a/build.gradle.kts b/build.gradle.kts index 91b4c9e5..59cfe163 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.1.2") + classpath("com.android.tools.build:gradle:8.2.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.Kotlin.core}") classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.Dagger.core}") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.AndroidX.Navigation.core}") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 2348cb02..61fb4fc6 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -8,7 +8,7 @@ repositories { mavenCentral() } dependencies { - implementation("com.android.tools.build:gradle:8.1.2") + implementation("com.android.tools.build:gradle:8.2.0") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0") implementation("com.squareup:javapoet:1.13.0") } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3be66318..11ce38c2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 16 07:17:06 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 16b627393821aaf9b91a3f5370d55248289d56ea Mon Sep 17 00:00:00 2001 From: Matthias Urhahn Date: Sun, 25 Feb 2024 13:04:08 +0100 Subject: [PATCH 2/4] Update build.gradle.kts --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 59cfe163..a0f81c4f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.2.0") + classpath("com.android.tools.build:gradle:8.1.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.Kotlin.core}") classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.Dagger.core}") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.AndroidX.Navigation.core}") @@ -20,4 +20,4 @@ allprojects { tasks.register("clean").configure { delete("build") -} \ No newline at end of file +} From 1e80d742cce36c9e889cf8dd697923ce337c7670 Mon Sep 17 00:00:00 2001 From: Matthias Urhahn Date: Sun, 25 Feb 2024 13:04:38 +0100 Subject: [PATCH 3/4] Update build.gradle.kts --- buildSrc/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 61fb4fc6..174366d0 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -8,7 +8,7 @@ repositories { mavenCentral() } dependencies { - implementation("com.android.tools.build:gradle:8.2.0") + implementation("com.android.tools.build:gradle:8.1.2") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0") implementation("com.squareup:javapoet:1.13.0") -} \ No newline at end of file +} From 471837ab887d8a739d72eff539ab29447d462e84 Mon Sep 17 00:00:00 2001 From: Matthias Urhahn Date: Sun, 25 Feb 2024 13:05:05 +0100 Subject: [PATCH 4/4] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 11ce38c2..3be66318 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 16 07:17:06 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists