From 938c2fe12a07816308ebb2b4d437757d5e80be6b Mon Sep 17 00:00:00 2001
From: fynngodau <fynngodau@mailbox.org>
Date: Mon, 19 Apr 2021 10:23:54 +0200
Subject: [PATCH] Compat changes after 2.0 (COMMUNITY) (#2844)
* Replace android.widget.Button with Button
* Replace getColor with getColorCompat
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
Co-authored-by: Mohamed <mohamed.metwalli@sap.com>
---
.../src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt | 3 ++-
.../layout/trace_location_organizer_qr_code_info_fragment.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
index 18f3611a1..7d6fd9921 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
@@ -27,6 +27,7 @@ import de.rki.coronawarnapp.ui.setupWithNavController2
import de.rki.coronawarnapp.util.AppShortcuts
import de.rki.coronawarnapp.util.CWADebug
import de.rki.coronawarnapp.util.ConnectivityHelper
+import de.rki.coronawarnapp.util.ContextExtensions.getColorCompat
import de.rki.coronawarnapp.util.DialogHelper
import de.rki.coronawarnapp.util.device.PowerManagement
import de.rki.coronawarnapp.util.di.AppInjector
@@ -114,7 +115,7 @@ class MainActivity : AppCompatActivity(), HasAndroidInjector {
if (count > 0) {
val badge = getOrCreateBadge(targetId)
badge.number = count
- badge.badgeTextColor = getColor(android.R.color.white)
+ badge.badgeTextColor = getColorCompat(android.R.color.white)
} else {
removeBadge(targetId)
}
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
index e9ae2372e..de5948e1f 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
@@ -166,7 +166,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
- <android.widget.Button
+ <Button
android:id="@+id/trace_location_qr_info_understand_button"
style="@style/buttonPrimary"
android:layout_width="0dp"
--
GitLab