Skip to content
Snippets Groups Projects
Unverified Commit 938c2fe1 authored by fynngodau's avatar fynngodau Committed by GitHub
Browse files

Compat changes after 2.0 (COMMUNITY) (#2844)


* Replace android.widget.Button with Button

* Replace getColor with getColorCompat

Co-authored-by: default avatarMatthias Urhahn <matthias.urhahn@sap.com>
Co-authored-by: default avatarMohamed <mohamed.metwalli@sap.com>
parent 4b576ae1
No related branches found
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ import de.rki.coronawarnapp.ui.setupWithNavController2 ...@@ -27,6 +27,7 @@ import de.rki.coronawarnapp.ui.setupWithNavController2
import de.rki.coronawarnapp.util.AppShortcuts import de.rki.coronawarnapp.util.AppShortcuts
import de.rki.coronawarnapp.util.CWADebug import de.rki.coronawarnapp.util.CWADebug
import de.rki.coronawarnapp.util.ConnectivityHelper import de.rki.coronawarnapp.util.ConnectivityHelper
import de.rki.coronawarnapp.util.ContextExtensions.getColorCompat
import de.rki.coronawarnapp.util.DialogHelper import de.rki.coronawarnapp.util.DialogHelper
import de.rki.coronawarnapp.util.device.PowerManagement import de.rki.coronawarnapp.util.device.PowerManagement
import de.rki.coronawarnapp.util.di.AppInjector import de.rki.coronawarnapp.util.di.AppInjector
...@@ -114,7 +115,7 @@ class MainActivity : AppCompatActivity(), HasAndroidInjector { ...@@ -114,7 +115,7 @@ class MainActivity : AppCompatActivity(), HasAndroidInjector {
if (count > 0) { if (count > 0) {
val badge = getOrCreateBadge(targetId) val badge = getOrCreateBadge(targetId)
badge.number = count badge.number = count
badge.badgeTextColor = getColor(android.R.color.white) badge.badgeTextColor = getColorCompat(android.R.color.white)
} else { } else {
removeBadge(targetId) removeBadge(targetId)
} }
......
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>
<android.widget.Button <Button
android:id="@+id/trace_location_qr_info_understand_button" android:id="@+id/trace_location_qr_info_understand_button"
style="@style/buttonPrimary" style="@style/buttonPrimary"
android:layout_width="0dp" android:layout_width="0dp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment