-ui overview design changes

--constant text size -- color of progress bar bg
dimagi · Dec 8, 2024 · 5f22c1a · 5f22c1a
1 parent 1e5f9d8
commit 5f22c1a
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 10 deletions.
diff --git a/app/res/layout/app_manager.xml b/app/res/layout/app_manager.xml
@@ -43,6 +43,7 @@
         android:layout_centerHorizontal="true"
         android:layout_below="@id/manager_instructions"
         android:layout_marginTop="@dimen/standard_spacer"
+        android:textSize="@dimen/font_size_xlarge"
         android:paddingHorizontal="@dimen/standard_spacer_double"
         android:onClick="installAppClicked"
         android:text="@string/install_app" />

diff --git a/app/res/layout/choice_dialog_view.xml b/app/res/layout/choice_dialog_view.xml
@@ -35,7 +35,6 @@
             android:padding="@dimen/standard_spacer"
             android:layout_gravity="end"
             android:layout_marginRight="@dimen/standard_spacer"
-            android:textSize="@dimen/font_size_dp_medium"
             android:visibility="gone"
         android:layout_marginEnd="@dimen/standard_spacer"/>
 

diff --git a/app/res/layout/custom_alert_dialog.xml b/app/res/layout/custom_alert_dialog.xml
@@ -80,7 +80,6 @@
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="@dimen/standard_spacer"
                     android:layout_marginLeft="@dimen/standard_spacer"
-                    android:textSize="@dimen/font_size_dp_medium"
                     android:visibility="gone"
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/standard_spacer"/>
@@ -93,7 +92,6 @@
                 android:padding="@dimen/standard_spacer"
                 android:layout_marginRight="@dimen/standard_spacer"
                 android:layout_toLeftOf="@id/positive_button"
-                android:textSize="@dimen/font_size_dp_medium"
                 android:visibility="gone"
                 android:layout_toStartOf="@id/positive_button"/>
 
@@ -107,7 +105,6 @@
                 android:layout_toLeftOf="@id/neutral_button"
                 android:layout_marginRight="@dimen/standard_spacer"
                 android:layout_marginLeft="@dimen/standard_spacer"
-                android:textSize="@dimen/font_size_dp_medium"
                 android:visibility="gone"
                 android:layout_marginStart="@dimen/standard_spacer"
                 android:layout_marginEnd="@dimen/standard_spacer"

diff --git a/app/res/layout/draw_layout.xml b/app/res/layout/draw_layout.xml
@@ -17,6 +17,7 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
         android:layout_alignParentBottom="true">
 
         <com.google.android.material.button.MaterialButton
@@ -34,6 +35,7 @@
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnResetDraw"
                 android:layout_width="wrap_content"
+                android:layout_marginHorizontal="16dp"
                 android:layout_height="wrap_content"/>
 
             <com.google.android.material.button.MaterialButton

diff --git a/app/res/layout/pin_screen_buttons.xml b/app/res/layout/pin_screen_buttons.xml
@@ -19,7 +19,6 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/min_button_height"
         android:id="@+id/pin_confirm_button"
-        android:textSize="@dimen/font_size_dp_medium"
         android:enabled="false"
         android:layout_weight="1"/>
 

diff --git a/app/res/layout/progress_dialog_cancel_button.xml b/app/res/layout/progress_dialog_cancel_button.xml
@@ -12,6 +12,5 @@
     android:layout_marginBottom="@dimen/standard_spacer"
     android:padding="@dimen/standard_spacer"
     android:text="STOP"
-    android:textSize="@dimen/font_size_dp_medium"
     android:visibility="gone"
     tools:viewBindingIgnore="true"/>
diff --git a/app/res/layout/screen_form_entry.xml b/app/res/layout/screen_form_entry.xml
@@ -56,7 +56,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/nav_badge"
-        android:background="@color/cc_brand_color"
+        android:background="@color/barcode_button_color"
         android:minHeight="@dimen/new_progressbar_minheight"
         android:paddingLeft="@dimen/content_start"
         android:paddingRight="@dimen/content_start"

diff --git a/app/res/layout/update_activity.xml b/app/res/layout/update_activity.xml
@@ -95,7 +95,7 @@
                 android:id="@+id/check_for_update_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                SquareButtonWithText:backgroundColor="@color/cc_brand_color"
+                SquareButtonWithText:backgroundColor="@color/start_home_button"
                 SquareButtonWithText:img="@drawable/check_update"
                 SquareButtonWithText:subtitle=""
                 SquareButtonWithText:textColor="@color/white"/>

diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
@@ -157,6 +157,6 @@
     <color name="url_button_color">#8EA1FF</color>
 
     <!-- Progress bar colors -->
-    <color name="progress_bar_bg">#33000000</color>
+    <color name="progress_bar_bg">#66000000</color>
 
 </resources>
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
@@ -15,7 +15,7 @@
     <!-- region: All strings for multiple apps and app-agnostic properties -->
 
     <string name="manager_activity_name">App Manager</string>
-    <string name="install_app">Install An App</string>
+    <string name="install_app">Install an App</string>
     <string name="uninstall_app">Uninstall</string>
     <string name="archive_app">Archive</string>
     <string name="unarchive_app">Unarchive</string>