Centralize cell attributes

cyb3rko · Feb 5, 2023 · 757542e · 757542e
1 parent b40f254
commit 757542e
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 33 deletions.
diff --git a/app/src/main/res/drawable/cell_shape_cyan.xml b/app/src/main/res/drawable/cell_shape_cyan.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="0.75dp"
-        android:color="@color/black" />
+        android:width="@dimen/table_cell_stroke"
+        android:color="@color/table_cell_unselected" />
 
-    <solid android:color="#00bcd4" />
+    <solid android:color="@color/table_cell_cyan" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_cyan_selected.xml b/app/src/main/res/drawable/cell_shape_cyan_selected.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="3dp"
+        android:width="@dimen/table_cell_stroke_selected"
         android:color="@color/table_cell_selected" />
 
-    <solid android:color="#00bcd4" />
+    <solid android:color="@color/table_cell_cyan" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_green.xml b/app/src/main/res/drawable/cell_shape_green.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="0.75dp"
-        android:color="@color/black" />
+        android:width="@dimen/table_cell_stroke"
+        android:color="@color/table_cell_unselected" />
 
-    <solid android:color="#4caf50" />
+    <solid android:color="@color/table_cell_green" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_green_selected.xml b/app/src/main/res/drawable/cell_shape_green_selected.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="3dp"
+        android:width="@dimen/table_cell_stroke_selected"
         android:color="@color/table_cell_selected" />
 
-    <solid android:color="#4caf50" />
+    <solid android:color="@color/table_cell_green" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_orange.xml b/app/src/main/res/drawable/cell_shape_orange.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="0.75dp"
-        android:color="@color/black" />
+        android:width="@dimen/table_cell_stroke"
+        android:color="@color/table_cell_unselected" />
 
-    <solid android:color="#ff9800" />
+    <solid android:color="@color/table_cell_orange" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_orange_selected.xml b/app/src/main/res/drawable/cell_shape_orange_selected.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="3dp"
+        android:width="@dimen/table_cell_stroke_selected"
         android:color="@color/table_cell_selected" />
 
-    <solid android:color="#ff9800" />
+    <solid android:color="@color/table_cell_orange" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_red.xml b/app/src/main/res/drawable/cell_shape_red.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="0.75dp"
-        android:color="@color/black" />
+        android:width="@dimen/table_cell_stroke"
+        android:color="@color/table_cell_unselected" />
 
     <solid android:color="@color/table_cell_pink" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_red_selected.xml b/app/src/main/res/drawable/cell_shape_red_selected.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="3dp"
+        android:width="@dimen/table_cell_stroke_selected"
         android:color="@color/table_cell_selected" />
 
     <solid android:color="@color/table_cell_pink" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_yellow.xml b/app/src/main/res/drawable/cell_shape_yellow.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="0.75dp"
-        android:color="@color/black" />
+        android:width="@dimen/table_cell_stroke"
+        android:color="@color/table_cell_unselected" />
 
-    <solid android:color="#ffeb3b" />
+    <solid android:color="@color/table_cell_yellow" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/drawable/cell_shape_yellow_selected.xml b/app/src/main/res/drawable/cell_shape_yellow_selected.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <stroke
-        android:width="3dp"
+        android:width="@dimen/table_cell_stroke_selected"
         android:color="@color/table_cell_selected" />
 
-    <solid android:color="#ffeb3b" />
+    <solid android:color="@color/table_cell_yellow" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="@dimen/table_cell_corner_radius" />
 </shape>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -7,6 +7,7 @@
     <color name="app_bar_icon">@color/md_theme_light_onSurfaceVariant</color>
     <color name="base_dynamic_color">@color/black</color>
     <color name="table_cell_text">@color/black</color>
+    <color name="table_cell_unselected">@color/black</color>
     <color name="table_cell_selected">@color/gray</color>
     <color name="table_cell_cyan">#00C0C6</color>
     <color name="table_cell_green">#7eff00</color>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,8 @@
 <resources>
     <dimen name="fab_margin">24dp</dimen>
+    <dimen name="table_cell_stroke">0.75dp</dimen>
+    <dimen name="table_cell_stroke_selected">3dp</dimen>
+    <dimen name="table_cell_corner_radius">5dp</dimen>
     <dimen name="table_cell_height">45dp</dimen>
     <dimen name="table_text_size">20sp</dimen>
     <dimen name="table_vertical_space">2dp</dimen>