fix comment border not visible in comment selection dialog

Razeeman · Razeeman · commit ceb41050374f · 2025-04-20T12:35:10.000+03:00
diff --git a/features/feature_base_adapter/src/main/res/layout/item_comment_field.xml b/features/feature_base_adapter/src/main/res/layout/item_comment_field.xml
@@ -2,7 +2,7 @@
 <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/inputCommentField"
-    style="@style/ChangeItemInputFieldDialog"
+    style="@style/ChangeItemInputField"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:layout_marginHorizontal="@dimen/edit_screen_margin_horizontal">
diff --git a/features/feature_data_edit/src/main/res/layout/data_edit_fragment.xml b/features/feature_data_edit/src/main/res/layout/data_edit_fragment.xml
@@ -178,7 +178,7 @@
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/inputDataEditChangeComment"
-                            style="@style/ChangeItemInputFieldDialog"
+                            style="@style/ChangeItemInputField"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginHorizontal="16dp"
diff --git a/features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml b/features/feature_dialogs/src/main/res/layout/color_selection_dialog_fragment.xml
@@ -80,7 +80,7 @@
         android:layout_height="0dp"
         android:layout_marginHorizontal="8dp"
         android:layout_marginBottom="10dp"
-        app:cardBackgroundColor="?appInputFieldBorderDialogColor"
+        app:cardBackgroundColor="?appInputFieldBorderColor"
         app:cardCornerRadius="@dimen/record_type_card_corner_radius"
         app:cardElevation="0dp"
         app:layout_constraintBottom_toTopOf="@id/inputColorSelectionHex"
diff --git a/features/feature_dialogs/src/main/res/layout/csv_export_settings_fragment.xml b/features/feature_dialogs/src/main/res/layout/csv_export_settings_fragment.xml
@@ -40,7 +40,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/inputCsvExportSettingsFileName"
-                style="@style/ChangeItemInputFieldDialog"
+                style="@style/ChangeItemInputField"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/edit_screen_margin_horizontal"
@@ -99,7 +99,7 @@
                     style="@style/InputFieldCardText"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?appInputFieldBorderDialog"
+                    android:background="?appInputFieldBorder"
                     android:gravity="center"
                     android:maxLines="1"
                     app:autoSizeMaxTextSize="16sp"
@@ -126,7 +126,7 @@
                     style="@style/InputFieldCardText"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="?appInputFieldBorderDialog"
+                    android:background="?appInputFieldBorder"
                     android:gravity="center"
                     android:maxLines="1"
                     app:autoSizeMaxTextSize="16sp"
diff --git a/features/feature_dialogs/src/main/res/layout/custom_range_selection_fragment.xml b/features/feature_dialogs/src/main/res/layout/custom_range_selection_fragment.xml
@@ -33,7 +33,7 @@
             style="@style/InputFieldCardText"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?appInputFieldBorderDialog"
+            android:background="?appInputFieldBorder"
             android:gravity="center"
             android:maxLines="1"
             app:autoSizeMaxTextSize="16sp"
@@ -60,7 +60,7 @@
             style="@style/InputFieldCardText"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?appInputFieldBorderDialog"
+            android:background="?appInputFieldBorder"
             android:gravity="center"
             android:maxLines="1"
             app:autoSizeMaxTextSize="16sp"
diff --git a/features/feature_dialogs/src/main/res/layout/time_dialog_fragment.xml b/features/feature_dialogs/src/main/res/layout/time_dialog_fragment.xml
@@ -12,7 +12,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/inputTimePickerSeconds"
-        style="@style/ChangeItemInputFieldTimeDialog"
+        style="@style/ChangeItemInputField"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
diff --git a/features/feature_records_filter/src/main/res/layout/item_records_filter_range.xml b/features/feature_records_filter/src/main/res/layout/item_records_filter_range.xml
@@ -21,7 +21,7 @@
             style="@style/InputFieldCardText"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?appInputFieldBorderDialog"
+            android:background="?appInputFieldBorder"
             android:maxLines="1"
             app:autoSizeMaxTextSize="16sp"
             app:autoSizeMinTextSize="1sp"
@@ -48,7 +48,7 @@
             style="@style/InputFieldCardText"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?appInputFieldBorderDialog"
+            android:background="?appInputFieldBorder"
             android:maxLines="1"
             app:autoSizeMaxTextSize="16sp"
             app:autoSizeMinTextSize="1sp"
diff --git a/features/feature_tag_selection/src/main/java/com/example/util/simpletimetracker/feature_tag_selection/interactor/RecordTagSelectionViewDataInteractor.kt b/features/feature_tag_selection/src/main/java/com/example/util/simpletimetracker/feature_tag_selection/interactor/RecordTagSelectionViewDataInteractor.kt
@@ -80,6 +80,12 @@ class RecordTagSelectionViewDataInteractor @Inject constructor(
             ).data
         }
 
+        result += EmptySpaceViewData(
+            id = "record_tag_selection_end_space".hashCode().toLong(),
+            width = EmptySpaceViewData.ViewDimension.MatchParent,
+            height = EmptySpaceViewData.ViewDimension.ExactSizeDp(8),
+        )
+
         return result
     }
 }
diff --git a/features/feature_views/src/main/res/color/states_input_field_border_dialog_color.xml b/features/feature_views/src/main/res/color/states_input_field_border_dialog_color.xml
diff --git a/features/feature_views/src/main/res/color/states_input_field_border_time_dialog_color.xml b/features/feature_views/src/main/res/color/states_input_field_border_time_dialog_color.xml
diff --git a/features/feature_views/src/main/res/drawable/bg_input_field_border_dialog_dark.xml b/features/feature_views/src/main/res/drawable/bg_input_field_border_dialog_dark.xml
diff --git a/features/feature_views/src/main/res/values/attrs.xml b/features/feature_views/src/main/res/values/attrs.xml
@@ -12,10 +12,7 @@
     <attr name="appDividerColor" format="reference" />
     <attr name="appDivider" format="reference" />
     <attr name="appInputFieldBorder" format="reference" />
-    <attr name="appInputFieldBorderDialog" format="reference" />
     <attr name="appInputFieldBorderColor" format="reference" />
-    <attr name="appInputFieldBorderDialogColor" format="reference" />
-    <attr name="appInputFieldBorderTimeDialogColor" format="reference" />
     <attr name="appPieChartDividerColor" format="reference" />
     <attr name="appCardBackgroundColor" format="reference" />
     <attr name="appFabBackgroundColor" format="reference" />
diff --git a/features/feature_views/src/main/res/values/colors.xml b/features/feature_views/src/main/res/values/colors.xml
@@ -74,9 +74,7 @@
     <color name="colorLegendSecondaryDark">@color/grey_925</color>
 
     <color name="inputFieldBorder">@color/blue_grey_50</color>
-    <color name="inputFieldBorderDark">@color/grey_900</color>
-    <color name="inputFieldBorderDialogDark">@color/grey_800</color>
-    <color name="inputFieldBorderTimeDialogDark">@color/grey_700</color>
+    <color name="inputFieldBorderDark">#12EEEEEE</color>
 
     <color name="colorPositive">@color/green_600</color>
     <color name="colorPositiveDark">@color/green_700</color>
diff --git a/features/feature_views/src/main/res/values/styles.xml b/features/feature_views/src/main/res/values/styles.xml
@@ -29,10 +29,7 @@
         <item name="appDividerColor">@color/colorDivider</item>
         <item name="appDivider">@drawable/divider_drawable</item>
         <item name="appInputFieldBorder">@drawable/bg_input_field_border</item>
-        <item name="appInputFieldBorderDialog">@drawable/bg_input_field_border</item>
         <item name="appInputFieldBorderColor">@color/inputFieldBorder</item>
-        <item name="appInputFieldBorderDialogColor">@color/inputFieldBorder</item>
-        <item name="appInputFieldBorderTimeDialogColor">@color/inputFieldBorder</item>
         <item name="appPieChartDividerColor">@color/pieChartDivider</item>
         <item name="appCardBackgroundColor">@color/cardBackground</item>
         <item name="appFabBackgroundColor">@color/colorFabBackground</item>
@@ -78,10 +75,7 @@
         <item name="appDividerColor">@color/colorDividerDark</item>
         <item name="appDivider">@drawable/divider_drawable_dark</item>
         <item name="appInputFieldBorder">@drawable/bg_input_field_border_dark</item>
-        <item name="appInputFieldBorderDialog">@drawable/bg_input_field_border_dialog_dark</item>
         <item name="appInputFieldBorderColor">@color/inputFieldBorderDark</item>
-        <item name="appInputFieldBorderDialogColor">@color/inputFieldBorderDialogDark</item>
-        <item name="appInputFieldBorderTimeDialogColor">@color/inputFieldBorderTimeDialogDark</item>
         <item name="appPieChartDividerColor">@color/pieChartDividerDark</item>
         <item name="appCardBackgroundColor">@color/cardBackgroundDark</item>
         <item name="appFabBackgroundColor">@color/colorFabBackgroundDark</item>
@@ -204,19 +198,11 @@
         <item name="boxStrokeErrorColor">@color/blue_grey_300</item>
     </style>
 
-    <style name="ChangeItemInputFieldDialog" parent="ChangeItemInputField">
-        <item name="boxStrokeColor">@color/states_input_field_border_dialog_color</item>
-    </style>
-
-    <style name="ChangeItemInputFieldColorDialog" parent="ChangeItemInputFieldDialog">
+    <style name="ChangeItemInputFieldColorDialog" parent="ChangeItemInputField">
         <item name="endIconDrawable">@null</item>
         <item name="endIconMode">none</item>
     </style>
 
-    <style name="ChangeItemInputFieldTimeDialog" parent="ChangeItemInputField">
-        <item name="boxStrokeColor">@color/states_input_field_border_time_dialog_color</item>
-    </style>
-
     <style name="ChangeItemHintStyle">
         <item name="android:textSize">12sp</item>
     </style>

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,12 @@ class RecordTagSelectionViewDataInteractor @Inject constructor(`
`80`	`80`	`).data`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ result += EmptySpaceViewData(`
	`84`	`+ id = "record_tag_selection_end_space".hashCode().toLong(),`
	`85`	`+ width = EmptySpaceViewData.ViewDimension.MatchParent,`
	`86`	`+ height = EmptySpaceViewData.ViewDimension.ExactSizeDp(8),`
	`87`	`+ )`
	`88`	`+`
`83`	`89`	`return result`
`84`	`90`	`}`
`85`	`91`	`}`