diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle index cdb968aef07..631236cd9ae 100644 --- a/Corona-Warn-App/build.gradle +++ b/Corona-Warn-App/build.gradle @@ -27,12 +27,12 @@ android { println("Current VERSION_PATCH: ${VERSION_PATCH}") println("Current VERSION_BUILD: ${VERSION_BUILD}") - compileSdkVersion 31 + compileSdkVersion 32 buildToolsVersion "32.0.0" defaultConfig { applicationId 'de.rki.coronawarnapp' minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 32 ndkVersion "21.2.6472646" @@ -347,7 +347,7 @@ dependencies { // ANDROID STANDARD implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'androidx.core:core-ktx:1.8.0' - implementation 'com.google.android.material:material:1.6.1' + implementation 'com.google.android.material:material:1.7.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui-ktx:$nav_version" diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_appconfig.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_appconfig.xml index bfde8507203..8b3add8fda3 100644 --- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_appconfig.xml +++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_appconfig.xml @@ -81,7 +81,7 @@ android:layout_margin="@dimen/spacing_tiny" android:orientation="vertical"> - - - - - - - - - - (R.id.switch_view) } + private val switch by lazy { findViewById(R.id.switch_view) } private val title by lazy { findViewById(R.id.switch_title) } private val subtitleView by lazy { findViewById(R.id.switch_subtitle) } diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt index 24d760f8221..caf065faa02 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt @@ -10,15 +10,15 @@ import com.airbnb.lottie.LottieAnimationView import com.airbnb.lottie.LottieDrawable import com.airbnb.lottie.LottieProperty import com.airbnb.lottie.model.KeyPath +import com.google.android.material.materialswitch.MaterialSwitch import com.google.android.material.progressindicator.CircularProgressIndicator -import com.google.android.material.switchmaterial.SwitchMaterial import de.rki.coronawarnapp.util.ContextExtensions.getDrawableCompat const val IGNORE_CHANGE_TAG = "ignore" const val DRAWABLE_TYPE = "drawable" @BindingAdapter("checked") -fun setChecked(switch: SwitchMaterial, status: Boolean?) { +fun setChecked(switch: MaterialSwitch, status: Boolean?) { if (status != null) { switch.tag = IGNORE_CHANGE_TAG switch.isChecked = status diff --git a/Corona-Warn-App/src/main/res/layout/cwa_user_card_item.xml b/Corona-Warn-App/src/main/res/layout/cwa_user_card_item.xml index b73017aaed6..de2d68a4932 100644 --- a/Corona-Warn-App/src/main/res/layout/cwa_user_card_item.xml +++ b/Corona-Warn-App/src/main/res/layout/cwa_user_card_item.xml @@ -33,7 +33,7 @@ app:layout_constraintTop_toBottomOf="@id/user_name" tools:text="geboren 18.04.1943" /> - - - - @color/nav_item_color @style/ThemeOverlay.App.BottomNavigation @color/colorSurface1 + @color/colorSurface1 @style/BottomNavigationActiveIndicator diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt index 6d79b44ff05..7cdd421b0ac 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt @@ -5,7 +5,7 @@ import android.content.res.Resources import android.graphics.drawable.Drawable import com.airbnb.lottie.LottieAnimationView import com.airbnb.lottie.LottieDrawable -import com.google.android.material.switchmaterial.SwitchMaterial +import com.google.android.material.materialswitch.MaterialSwitch import de.rki.coronawarnapp.R import de.rki.coronawarnapp.util.ContextExtensions.getDrawableCompat import io.mockk.MockKAnnotations @@ -32,7 +32,7 @@ class DataBindingAdaptersTest : BaseTest() { } private fun setChecked(status: Boolean?) { - val switch = mockk().apply { + val switch = mockk().apply { every { tag = any() } just Runs every { isChecked = any() } just Runs }