#49: Switched to AppCompatButton

Entreco · Jul 21, 2018 · b17a086 · b17a086
1 parent 8799a74
commit b17a086
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/android/DartsScorecard/app/src/main/res/layout/activity_launch.xml b/android/DartsScorecard/app/src/main/res/layout/activity_launch.xml
@@ -30,7 +30,7 @@
                 layout="@layout/include_launch_header" />
         </FrameLayout>
 
-        <Button
+        <android.support.v7.widget.AppCompatButton
             android:id="@+id/launch_resume"
             style="@style/Launch.Btn"
             android:layout_width="match_parent"
@@ -40,7 +40,7 @@
             android:text="@string/resume_x01"
             app:resumeGame="@{viewModel.resumedGame}" />
 
-        <Button
+        <android.support.v7.widget.AppCompatButton
             android:id="@+id/launch_play"
             style="@style/Launch.Btn"
             android:layout_width="match_parent"
@@ -49,7 +49,7 @@
             android:onClick="@{() -> viewModel.onNewGamePressed(context)}"
             android:text="@string/play_x01" />
 
-        <Button
+        <android.support.v7.widget.AppCompatButton
             android:id="@+id/launch_players"
             style="@style/Launch.Btn"
             android:layout_width="match_parent"
@@ -58,7 +58,7 @@
             android:onClick="@{() -> viewModel.onProfilePressed(context)}"
             android:text="@string/profiles" />
 
-        <Button
+        <android.support.v7.widget.AppCompatButton
             android:id="@+id/launch_beta"
             style="@style/Launch.Btn"
             android:layout_width="match_parent"

diff --git a/android/DartsScorecard/app/src/main/res/layout/activity_setup_01.xml b/android/DartsScorecard/app/src/main/res/layout/activity_setup_01.xml
@@ -59,7 +59,7 @@
                     layout="@layout/include_setup_settings"
                     app:viewModel="@{settingsViewModel}" />
 
-                <Button
+                <android.support.v7.widget.AppCompatButton
                     style="@style/Setup.Btn"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

diff --git a/android/DartsScorecard/app/src/main/res/layout/donate_item.xml b/android/DartsScorecard/app/src/main/res/layout/donate_item.xml
@@ -12,7 +12,7 @@
             type="nl.entreco.dartsscorecard.beta.donate.DonateViewModel" />
     </data>
 
-    <Button
+    <android.support.v7.widget.AppCompatButton
         style="@style/Beta.DonateBtn"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/android/DartsScorecard/app/src/main/res/values/styles_beta.xml b/android/DartsScorecard/app/src/main/res/values/styles_beta.xml
@@ -27,7 +27,7 @@
         <item name="android:gravity">center</item>
     </style>
 
-    <style name="Beta.DonateBtn" parent="@style/Widget.AppCompat.Button">
+    <style name="Beta.DonateBtn" parent="@style/Widget.AppCompat.Button.Colored">
         <item name="android:background">@drawable/launch_btn</item>
         <item name="android:textColor">?attr/launchText</item>
         <item name="android:layout_marginTop">@dimen/small</item>

diff --git a/android/DartsScorecard/app/src/main/res/values/styles_launch.xml b/android/DartsScorecard/app/src/main/res/values/styles_launch.xml
@@ -3,7 +3,7 @@
 
     <style name="Launch" />
 
-    <style name="Launch.Btn" parent="@style/Widget.AppCompat.Button">
+    <style name="Launch.Btn" parent="@style/Widget.AppCompat.Button.Colored">
         <item name="android:background">@drawable/launch_btn</item>
         <item name="android:textColor">?attr/launchText</item>
         <item name="android:layout_marginTop">@dimen/small</item>

diff --git a/android/DartsScorecard/app/src/main/res/values/styles_setup.xml b/android/DartsScorecard/app/src/main/res/values/styles_setup.xml
@@ -10,7 +10,7 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="Setup.Progress" parent="Widget.AppCompat.SeekBar.Discrete">
+    <style name="Setup.Progress" parent="@style/Widget.AppCompat.SeekBar.Discrete">
         <item name="android:layout_gravity">center</item>
         <item name="tickMark">@null</item>
     </style>
@@ -85,7 +85,7 @@
         <item name="android:textColor">?attr/nameText</item>
     </style>
 
-    <style name="Setup.Btn" parent="Base.Widget.AppCompat.Button">
+    <style name="Setup.Btn" parent="@style/Widget.AppCompat.Button.Colored">
         <item name="android:background">@drawable/score_hint</item>
         <item name="android:textColor">?attr/scoreText</item>
         <item name="android:fontFamily">sans-serif-condensed</item>