change buttons style

Razeeman · Razeeman · commit 94c551f239f3 · 2021-08-22T12:14:34.000+03:00
diff --git a/core/src/main/res/layout/buttons_row_item_layout.xml b/core/src/main/res/layout/buttons_row_item_layout.xml
@@ -5,9 +5,10 @@
     android:id="@+id/btnButtonsRowView"
     style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/button_height"
     android:ellipsize="end"
     android:maxLines="1"
-    android:textColor="@color/white"
+    android:textColor="?appLightTextColor"
     app:backgroundTint="@color/transparent"
+    app:cornerRadius="@dimen/button_corner_radius"
     tools:text="Button name" />
diff --git a/core/src/main/res/layout/buttons_row_view_layout.xml b/core/src/main/res/layout/buttons_row_view_layout.xml
@@ -9,12 +9,13 @@
     <com.google.android.material.button.MaterialButton
         style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/button_height"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:clickable="false"
         android:focusable="false"
-        app:backgroundTint="?appInactiveColor" />
+        app:backgroundTint="?appInactiveColor"
+        app:cornerRadius="@dimen/button_corner_radius" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvButtonsRowView"
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
@@ -17,4 +17,7 @@
     <dimen name="color_icon_item_corner_radius">8dp</dimen>
     <dimen name="color_icon_item_elevation">4dp</dimen>
     <dimen name="color_icon_recycler_margin">8dp</dimen>
+
+    <dimen name="button_height">58dp</dimen>
+    <dimen name="button_corner_radius">8dp</dimen>
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
@@ -242,12 +242,24 @@
         <item name="android:paddingTop">12dp</item>
     </style>
 
-    <style name="ContainerRangeMainButton">
+    <style name="AppButton">
+        <item name="android:layout_height">@dimen/button_height</item>
+        <item name="android:textColor">?appLightTextColor</item>
+        <item name="backgroundTint">?appInactiveColor</item>
+        <item name="cornerRadius">@dimen/button_corner_radius</item>
+    </style>
+
+    <style name="AppButtonActive">
+        <item name="android:layout_height">@dimen/button_height</item>
+        <item name="android:textColor">?appLightTextColor</item>
+        <item name="backgroundTint">?appActiveColor</item>
+        <item name="cornerRadius">@dimen/button_corner_radius</item>
+    </style>
+
+    <style name="ContainerRangeMainButton" parent="AppButtonActive">
         <item name="android:layout_marginStart">8dp</item>
         <item name="android:layout_marginEnd">8dp</item>
         <item name="android:padding">0dp</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="backgroundTint">?appActiveColor</item>
         <item name="layout_constraintHorizontal_weight">2.5</item>
     </style>
 
@@ -258,9 +270,8 @@
         <item name="iconTint">@color/white</item>
     </style>
 
-    <style name="ContainerRangeButton">
+    <style name="ContainerRangeButton" parent="AppButton">
         <item name="android:scaleType">fitXY</item>
-        <item name="backgroundTint">?appInactiveColor</item>
         <item name="icon">@drawable/arrow_left</item>
         <item name="iconGravity">start</item>
         <item name="iconTint">@color/white</item>
diff --git a/feature_change_category/src/main/res/layout/change_category_fragment.xml b/feature_change_category/src/main/res/layout/change_category_fragment.xml
@@ -171,15 +171,12 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnChangeCategorySave"
+        style="@style/AppButtonActive"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:gravity="center"
         android:text="@string/change_category_save"
-        android:textColor="?appLightTextColor"
-        app:backgroundTint="?appActiveColor"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/feature_change_record/src/main/res/layout/change_record_fragment.xml b/feature_change_record/src/main/res/layout/change_record_fragment.xml
@@ -232,15 +232,12 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnChangeRecordSave"
+        style="@style/AppButtonActive"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:gravity="center"
         android:text="@string/change_record_save"
-        android:textColor="?appLightTextColor"
-        app:backgroundTint="?appActiveColor"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/feature_change_record_tag/src/main/res/layout/change_record_tag_fragment.xml b/feature_change_record_tag/src/main/res/layout/change_record_tag_fragment.xml
@@ -112,15 +112,12 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnChangeRecordTagSave"
+        style="@style/AppButtonActive"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:gravity="center"
         android:text="@string/change_category_save"
-        android:textColor="?appLightTextColor"
-        app:backgroundTint="?appActiveColor"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml b/feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml
@@ -316,15 +316,11 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnChangeRecordTypeSave"
+        style="@style/AppButtonActive"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginHorizontal="8dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:gravity="center"
         android:text="@string/change_record_type_save"
-        android:textColor="?appLightTextColor"
-        app:backgroundTint="?appActiveColor"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/feature_change_running_record/src/main/res/layout/change_running_record_fragment.xml b/feature_change_running_record/src/main/res/layout/change_running_record_fragment.xml
@@ -202,15 +202,12 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnChangeRunningRecordSave"
+        style="@style/AppButtonActive"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:gravity="center"
         android:text="@string/change_record_save"
-        android:textColor="?appLightTextColor"
-        app:backgroundTint="?appActiveColor"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/feature_dialogs/src/main/res/layout/archive_dialog_fragment.xml b/feature_dialogs/src/main/res/layout/archive_dialog_fragment.xml
@@ -19,7 +19,7 @@
         android:id="@+id/rvArchiveDialogContent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="16dp"
+        android:layout_marginTop="16dp"
         tools:itemCount="1"
         tools:listitem="@layout/item_record_type_layout" />
 
diff --git a/feature_dialogs/src/main/res/layout/card_size_dialog_fragment.xml b/feature_dialogs/src/main/res/layout/card_size_dialog_fragment.xml
@@ -39,12 +39,9 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnCardSizeDefault"
+        style="@style/AppButton"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:text="@string/card_size_default"
-        android:textColor="@color/white"
-        app:backgroundTint="?appInactiveColor" />
+        android:layout_marginHorizontal="8dp"
+        android:text="@string/card_size_default" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/feature_dialogs/src/main/res/layout/chart_filter_dialog_fragment.xml b/feature_dialogs/src/main/res/layout/chart_filter_dialog_fragment.xml
@@ -51,32 +51,28 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnChartFilterShowAll"
+            style="@style/AppButton"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="4dp"
             android:ellipsize="marquee"
             android:paddingHorizontal="0dp"
             android:singleLine="true"
             android:text="@string/types_filter_show_all"
-            android:textColor="@color/white"
-            app:backgroundTint="?appInactiveColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/btnChartFilterHideAll"
             app:layout_constraintStart_toStartOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnChartFilterHideAll"
+            style="@style/AppButton"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="8dp"
             android:ellipsize="marquee"
             android:paddingHorizontal="0dp"
             android:singleLine="true"
             android:text="@string/types_filter_hide_all"
-            android:textColor="@color/white"
-            app:backgroundTint="?appInactiveColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/btnChartFilterShowAll" />
diff --git a/feature_dialogs/src/main/res/layout/csv_export_settings_fragment.xml b/feature_dialogs/src/main/res/layout/csv_export_settings_fragment.xml
@@ -81,36 +81,30 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnCsvExportSettingsRange"
+        style="@style/AppButton"
         android:layout_width="0dp"
-        android:layout_height="@dimen/input_field_height"
         android:layout_marginStart="10dp"
         android:layout_marginTop="6dp"
         android:layout_marginEnd="6dp"
         android:ellipsize="marquee"
         android:paddingHorizontal="0dp"
         android:singleLine="true"
         android:text="@string/csv_export_settings_range"
-        android:textColor="@color/white"
-        app:backgroundTint="?appInactiveColor"
-        app:cornerRadius="@dimen/input_field_corner_radius"
         app:layout_constraintEnd_toStartOf="@id/btnCsvExportSettingsAll"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/fieldCsvExportSettingsTimeStarted" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnCsvExportSettingsAll"
+        style="@style/AppButton"
         android:layout_width="0dp"
-        android:layout_height="@dimen/input_field_height"
         android:layout_marginStart="6dp"
         android:layout_marginTop="6dp"
         android:layout_marginEnd="10dp"
         android:ellipsize="marquee"
         android:paddingHorizontal="0dp"
         android:singleLine="true"
         android:text="@string/csv_export_settings_all"
-        android:textColor="@color/white"
-        app:backgroundTint="?appInactiveColor"
-        app:cornerRadius="@dimen/input_field_corner_radius"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/btnCsvExportSettingsRange"
         app:layout_constraintTop_toBottomOf="@id/fieldCsvExportSettingsTimeStarted" />
diff --git a/feature_dialogs/src/main/res/layout/duration_dialog_fragment.xml b/feature_dialogs/src/main/res/layout/duration_dialog_fragment.xml
@@ -22,9 +22,9 @@
         android:layout_marginVertical="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="16dp"
-        app:durationLegendTextSize="32sp"
-        app:durationLegendTextColor="?appTextHintColor"
         app:durationLegendPadding="16dp"
+        app:durationLegendTextColor="?appTextHintColor"
+        app:durationLegendTextSize="32sp"
         app:durationTextColor="?appTextPrimaryColor"
         app:layout_constraintBottom_toTopOf="@id/guidelineDurationPicker"
         app:layout_constraintEnd_toStartOf="@id/ivDurationPickerDelete"
@@ -74,32 +74,27 @@
         android:id="@+id/containerDurationPickerButtons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
         android:paddingHorizontal="4dp"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnDurationPickerSave"
+            style="@style/AppButtonActive"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
             android:text="@string/duration_dialog_save"
-            android:textColor="@color/white"
-            app:backgroundTint="?appActiveColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/btnDurationPickerDisable"
             app:layout_constraintStart_toStartOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnDurationPickerDisable"
+            style="@style/AppButton"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
             android:text="@string/duration_dialog_disable"
-            android:textColor="@color/white"
-            app:backgroundTint="?appInactiveColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/btnDurationPickerSave" />
diff --git a/feature_dialogs/src/main/res/layout/item_archive_dialog_buttons.xml b/feature_dialogs/src/main/res/layout/item_archive_dialog_buttons.xml
@@ -6,26 +6,22 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnArchiveDialogDelete"
+        style="@style/AppButtonActive"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
         android:text="@string/archive_dialog_delete"
-        android:textColor="@color/white"
-        app:backgroundTint="?appActiveColor"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/btnArchiveDialogRestore"
         app:layout_constraintStart_toStartOf="parent" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btnArchiveDialogRestore"
+        style="@style/AppButton"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="8dp"
         android:text="@string/archive_dialog_restore"
-        android:textColor="@color/white"
-        app:backgroundTint="?appInactiveColor"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/btnArchiveDialogDelete" />
diff --git a/feature_dialogs/src/main/res/layout/types_filter_dialog_fragment.xml b/feature_dialogs/src/main/res/layout/types_filter_dialog_fragment.xml
@@ -31,32 +31,28 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnTypesFilterShowAll"
+            style="@style/AppButton"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="4dp"
             android:ellipsize="marquee"
             android:paddingHorizontal="0dp"
             android:singleLine="true"
             android:text="@string/types_filter_show_all"
-            android:textColor="@color/white"
-            app:backgroundTint="?appInactiveColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/btnTypesFilterHideAll"
             app:layout_constraintStart_toStartOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnTypesFilterHideAll"
+            style="@style/AppButton"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="8dp"
             android:ellipsize="marquee"
             android:paddingHorizontal="0dp"
             android:singleLine="true"
             android:text="@string/types_filter_hide_all"
-            android:textColor="@color/white"
-            app:backgroundTint="?appInactiveColor"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/btnTypesFilterShowAll" />
diff --git a/feature_records/src/main/res/layout/records_container_fragment.xml b/feature_records/src/main/res/layout/records_container_fragment.xml
diff --git a/feature_statistics/src/main/res/layout/statistics_container_fragment.xml b/feature_statistics/src/main/res/layout/statistics_container_fragment.xml
diff --git a/feature_statistics_detail/src/main/res/layout/statistics_detail_fragment.xml b/feature_statistics_detail/src/main/res/layout/statistics_detail_fragment.xml
