Refactor

dimagi · Dec 6, 2024 · 3dcb2f1 · 3dcb2f1
1 parent 4ac0f10
commit 3dcb2f1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/res/drawable/progressbar_modern.xml b/app/res/drawable/progressbar_modern.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/background">
         <shape>
-            <corners android:radius="4dp" />
+            <corners android:radius="@dimen/modern_progressbar_radius" />
             <gradient
                 android:startColor="@color/progress_bar_bg"
                 android:endColor="@color/progress_bar_bg"
@@ -12,7 +12,7 @@
     <item android:id="@android:id/progress">
         <scale android:scaleWidth="100%">
             <shape>
-                <corners android:radius="4dp" />
+                <corners android:radius="@dimen/modern_progressbar_radius" />
                 <gradient
                     android:startColor="@color/white"
                     android:endColor="@color/white"

diff --git a/app/res/drawable/progressbar_modern_blue.xml b/app/res/drawable/progressbar_modern_blue.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/background">
         <shape>
-            <corners android:radius="4dp" />
+            <corners android:radius="@dimen/modern_progressbar_radius" />
             <gradient
                 android:startColor="@color/progress_bar_bg"
                 android:endColor="@color/progress_bar_bg"
@@ -12,7 +12,7 @@
     <item android:id="@android:id/progress">
         <scale android:scaleWidth="100%">
             <shape>
-                <corners android:radius="4dp" />
+                <corners android:radius="@dimen/modern_progressbar_radius" />
                 <gradient
                     android:startColor="@color/cc_brand_color"
                     android:endColor="@color/cc_brand_color"

diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
@@ -105,6 +105,7 @@
     <dimen name="new_progressbar_button_minheight">48dp</dimen>
     <dimen name="new_progressbar_button_minwidth">32dp</dimen>
     <dimen name="new_progressbar_button_padding">24dp</dimen>
+    <dimen name="modern_progressbar_radius">4dp</dimen>
 
     <dimen name="submission_progressbar_height">10dp</dimen>
 

diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
@@ -319,7 +319,7 @@
             <item name="android:gravity">center</item>
             <item name="android:padding">12dp</item>
             <item name="height">40dp</item>
-            <item name="cornerRadius">22dp</item>
+            <item name="cornerRadius">@dimen/rounded_button_corner_radius</item>
             <item name="iconPadding">8dp</item>
             <item name="android:textAllCaps">false</item>
             <item name="android:textStyle">bold</item>
@@ -334,7 +334,7 @@
         <item name="cornerFamilyBottomLeft">rounded</item>
         <item name="cornerFamilyTopRight">rounded</item>
         <item name="cornerFamilyBottomRight">rounded</item>
-        <item name="cornerSize">22dp</item>
+        <item name="cornerSize">@dimen/rounded_button_corner_radius</item>
         <item name="strokeColor">@color/cc_brand_color</item>
         <item name="strokeWidth">2dp</item>
         <item name="textColor">@color/cc_brand_color</item>