-- change of negative button style

-- remove bold from title bar -- change of button bg colour
dimagi · Dec 11, 2024 · 180db27 · 180db27
1 parent 13ae017
commit 180db27
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/app/res/layout/progress_dialog_cancel_button.xml b/app/res/layout/progress_dialog_cancel_button.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.button.MaterialButton
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/NegativeButtonStyle"
+    app:strokeColor="@color/cc_brand_color"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/min_button_height"
     android:layout_below="@+id/main_content_holder"
@@ -12,5 +14,5 @@
     android:layout_marginBottom="@dimen/standard_spacer"
     android:padding="@dimen/standard_spacer"
     android:text="STOP"
-    android:visibility="gone"
-    tools:viewBindingIgnore="true"/>
+    android:visibility="visible"
+    tools:viewBindingIgnore="true" />
diff --git a/app/res/layout/select_install_mode_fragment.xml b/app/res/layout/select_install_mode_fragment.xml
@@ -92,7 +92,7 @@
                             android:layout_height="match_parent"
                             android:background="@drawable/tile_drop_shadow_small_margins"
                             android:gravity="end"
-                            SquareButtonWithText:backgroundColor="@color/url_button_color"
+                            SquareButtonWithText:backgroundColor="@color/barcode_button_color"
                             SquareButtonWithText:img="@drawable/startup_url"
                             SquareButtonWithText:subtitle="Enter Code"
                             SquareButtonWithText:textColor="@color/white"/>

diff --git a/app/res/values/themes.xml b/app/res/values/themes.xml
@@ -74,7 +74,6 @@
         <item name="android:textColor">@color/white</item>
         <item name="android:paddingLeft">16dp</item>
         <item name="android:textSize">22sp</item>
-        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="ActionBarSubtitleTextStyle">