modify drawable resources for more distinction between buttons and messages

05nelsonm · 05nelsonm · commit 1e63af6dd1dd · 2020-08-16T05:41:34.000-04:00
diff --git a/sampleapp/src/main/java/io/matthewnelson/sampleapp/App.kt b/sampleapp/src/main/java/io/matthewnelson/sampleapp/App.kt
@@ -215,7 +215,7 @@ class App: Application() {
             e.message?.let {
                 DashboardFragment.showMessage(
                     DashMessage(
-                        "${DashMessage.EXCEPTION}$it", R.drawable.rounded_rectangle_color_red, 5_000
+                        "${DashMessage.EXCEPTION}$it", R.drawable.dash_message_color_red, 5_000
                     )
                 )
             }
diff --git a/sampleapp/src/main/java/io/matthewnelson/sampleapp/ui/fragments/home/HomeFragment.kt b/sampleapp/src/main/java/io/matthewnelson/sampleapp/ui/fragments/home/HomeFragment.kt
@@ -158,7 +158,7 @@ class HomeFragment : Fragment() {
                     DashMessage(
                         DashMessage.EXCEPTION +
                                 "TorServiceController.Builder.build() has not been called yet.",
-                        R.drawable.rounded_rectangle_color_red,
+                        R.drawable.dash_message_color_red,
                         3_000
                     )
                 )
diff --git a/sampleapp/src/main/java/io/matthewnelson/sampleapp/ui/fragments/settings/library/SettingsLibraryFragment.kt b/sampleapp/src/main/java/io/matthewnelson/sampleapp/ui/fragments/settings/library/SettingsLibraryFragment.kt
@@ -161,7 +161,7 @@ class SettingsLibraryFragment : Fragment() {
                     else
                         it
                 DashboardFragment.showMessage(
-                    DashMessage(msg, R.drawable.rounded_rectangle_color_red, 8_000L)
+                    DashMessage(msg, R.drawable.dash_message_color_red, 8_000L)
                 )
             }
             return
@@ -174,7 +174,7 @@ class SettingsLibraryFragment : Fragment() {
         if (bmChanges || nChanges || cChanges) {
             DashboardFragment.librarySettingsWereChanged()
             DashboardFragment.showMessage(
-                DashMessage("Settings Saved", R.drawable.rounded_rectangle_color_green, 3_000L)
+                DashMessage("Settings Saved", R.drawable.dash_message_color_green, 3_000L)
             )
         }
     }
diff --git a/sampleapp/src/main/res/drawable/button_color_grey.xml b/sampleapp/src/main/res/drawable/button_color_grey.xml
diff --git a/sampleapp/src/main/res/drawable/button_color_secondary.xml b/sampleapp/src/main/res/drawable/button_color_secondary.xml
diff --git a/sampleapp/src/main/res/drawable/dash_message_color_green.xml b/sampleapp/src/main/res/drawable/dash_message_color_green.xml
@@ -2,5 +2,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/green" />
-    <corners android:radius="8dp" />
 </shape>
diff --git a/sampleapp/src/main/res/drawable/dash_message_color_primary_light.xml b/sampleapp/src/main/res/drawable/dash_message_color_primary_light.xml
@@ -2,5 +2,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/primaryLightColor" />
-    <corners android:radius="8dp" />
 </shape>
diff --git a/sampleapp/src/main/res/drawable/dash_message_color_red.xml b/sampleapp/src/main/res/drawable/dash_message_color_red.xml
@@ -2,5 +2,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/red" />
-    <corners android:radius="8dp" />
 </shape>
diff --git a/sampleapp/src/main/res/layout/fragment_dashboard.xml b/sampleapp/src/main/res/layout/fragment_dashboard.xml
@@ -204,7 +204,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:background="@drawable/rounded_rectangle_color_secondary"
+        android:background="@drawable/button_color_secondary"
         android:text="@string/dash_button_app_restart"
         android:textAllCaps="false"
         android:visibility="gone"
diff --git a/sampleapp/src/main/res/layout/fragment_home.xml b/sampleapp/src/main/res/layout/fragment_home.xml
@@ -101,7 +101,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
-        android:background="@drawable/rounded_rectangle_color_grey"
+        android:background="@drawable/button_color_grey"
         android:text="@string/home_button_debugging_enable"
         android:textAllCaps="false"
         app:layout_constraintBottom_toTopOf="@+id/home_button_start"
@@ -113,7 +113,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:background="@drawable/rounded_rectangle_color_grey"
+        android:background="@drawable/button_color_grey"
         android:text="@string/home_button_start"
         android:textAllCaps="false"
         app:layout_constraintBottom_toTopOf="@id/home_button_restart"
@@ -125,7 +125,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:background="@drawable/rounded_rectangle_color_grey"
+        android:background="@drawable/button_color_grey"
         android:text="@string/home_button_stop"
         android:textAllCaps="false"
         app:layout_constraintBottom_toTopOf="@id/home_button_new_identity"
@@ -142,7 +142,7 @@
         android:layout_marginEnd="4dp"
         android:layout_marginRight="4dp"
         android:layout_marginBottom="16dp"
-        android:background="@drawable/rounded_rectangle_color_grey"
+        android:background="@drawable/button_color_grey"
         android:text="@string/home_button_restart"
         android:textAllCaps="false"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -158,7 +158,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
-        android:background="@drawable/rounded_rectangle_color_grey"
+        android:background="@drawable/button_color_grey"
         android:text="@string/home_button_new_identity"
         android:textAllCaps="false"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/sampleapp/src/main/res/layout/fragment_settings_library.xml b/sampleapp/src/main/res/layout/fragment_settings_library.xml
@@ -418,7 +418,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:background="@drawable/rounded_rectangle_color_secondary"
+        android:background="@drawable/button_color_secondary"
         android:text="@string/settings_library_button_save"
         android:textAllCaps="false"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/sampleapp/src/main/res/layout/fragment_settings_main.xml b/sampleapp/src/main/res/layout/fragment_settings_main.xml
@@ -93,7 +93,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:background="@drawable/rounded_rectangle_color_grey"
+        android:background="@drawable/button_color_grey"
         android:text="@string/settings_main_button_library"
         android:textAllCaps="false"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -120,7 +120,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:background="@drawable/rounded_rectangle_color_grey"
+        android:background="@drawable/button_color_grey"
         android:text="@string/settings_main_button_app"
         android:textAllCaps="false"
         app:layout_constraintBottom_toTopOf="@id/settings_main_button_library"
@@ -147,7 +147,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:background="@drawable/rounded_rectangle_color_grey"
+        android:background="@drawable/button_color_grey"
         android:text="@string/settings_main_button_tor"
         android:textAllCaps="false"
         app:layout_constraintBottom_toBottomOf="parent"

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ class App: Application() {`
`215`	`215`	`e.message?.let {`
`216`	`216`	`DashboardFragment.showMessage(`
`217`	`217`	`DashMessage(`
`218`		`- "${DashMessage.EXCEPTION}$it", R.drawable.rounded_rectangle_color_red, 5_000`
	`218`	`+ "${DashMessage.EXCEPTION}$it", R.drawable.dash_message_color_red, 5_000`
`219`	`219`	`)`
`220`	`220`	`)`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ class HomeFragment : Fragment() {`
`158`	`158`	`DashMessage(`
`159`	`159`	`DashMessage.EXCEPTION +`
`160`	`160`	`"TorServiceController.Builder.build() has not been called yet.",`
`161`		`- R.drawable.rounded_rectangle_color_red,`
	`161`	`+ R.drawable.dash_message_color_red,`
`162`	`162`	`3_000`
`163`	`163`	`)`
`164`	`164`	`)`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ class SettingsLibraryFragment : Fragment() {`
`161`	`161`	`else`
`162`	`162`	`it`
`163`	`163`	`DashboardFragment.showMessage(`
`164`		`- DashMessage(msg, R.drawable.rounded_rectangle_color_red, 8_000L)`
	`164`	`+ DashMessage(msg, R.drawable.dash_message_color_red, 8_000L)`
`165`	`165`	`)`
`166`	`166`	`}`
`167`	`167`	`return`
`@@ -174,7 +174,7 @@ class SettingsLibraryFragment : Fragment() {`
`174`	`174`	`if (bmChanges \|\| nChanges \|\| cChanges) {`
`175`	`175`	`DashboardFragment.librarySettingsWereChanged()`
`176`	`176`	`DashboardFragment.showMessage(`
`177`		`- DashMessage("Settings Saved", R.drawable.rounded_rectangle_color_green, 3_000L)`
	`177`	`+ DashMessage("Settings Saved", R.drawable.dash_message_color_green, 3_000L)`
`178`	`178`	`)`
`179`	`179`	`}`
`180`	`180`	`}`