Fix dumb brief theming issue

Nain57 · Aug 3, 2024 · 17c7e82 · 17c7e82
1 parent cd66cf8
commit 17c7e82
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/core/common/ui/src/main/res/values-night/themes.xml b/core/common/ui/src/main/res/values-night/themes.xml
@@ -45,6 +45,8 @@
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
 
+        <item name="itemBriefStyle">@style/AppTheme.Overlay.PositionSelector</item>
+        <item name="gestureRecordStyle">@style/AppTheme.Overlay.GestureRecorder</item>
         <item name="autoCompleteTextViewStyle">@style/AppTheme.Widget.SearchView</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>

diff --git a/core/common/ui/src/main/res/values/dimens.xml b/core/common/ui/src/main/res/values/dimens.xml
@@ -65,6 +65,9 @@
     <dimen name="overlay_position_selector_thickness">6dp</dimen>
     <dimen name="overlay_position_selector_radius">28dp</dimen>
     <dimen name="overlay_position_selector_inner_radius">3dp</dimen>
+    <dimen name="overlay_click_selector_thickness">6dp</dimen>
+    <dimen name="overlay_click_selector_radius">28dp</dimen>
+    <dimen name="overlay_click_selector_inner_radius">3dp</dimen>
 
     <dimen name="overlay_gesture_recorder_thickness">10dp</dimen>
     <dimen name="overlay_gesture_recorder_length">60dp</dimen>

diff --git a/core/common/ui/src/main/res/values/styles.xml b/core/common/ui/src/main/res/values/styles.xml
@@ -227,9 +227,9 @@
     <!-- Style for the click/swipe position(s) overlay selector view. -->
     <style name="AppTheme.Overlay.PositionSelector">
         <item name="colorBackground">@color/overlayActionsBriefBackground</item>
-        <item name="radius">@dimen/overlay_position_selector_radius</item>
-        <item name="innerRadius">@dimen/overlay_position_selector_inner_radius</item>
-        <item name="thickness">@dimen/overlay_position_selector_thickness</item>
+        <item name="radius">@dimen/overlay_click_selector_radius</item>
+        <item name="innerRadius">@dimen/overlay_click_selector_inner_radius</item>
+        <item name="thickness">@dimen/overlay_click_selector_thickness</item>
         <item name="colorInner">@color/overlayViewPrimary</item>
         <item name="colorOutlinePrimary">@color/overlayViewPrimary</item>
         <item name="colorOutlineSecondary">@color/overlayViewPrimary</item>

diff --git a/feature/smart-config/src/main/res/values/dimens.xml b/feature/smart-config/src/main/res/values/dimens.xml
@@ -23,10 +23,6 @@
     <dimen name="dialog_item_condition_copy_icons_height">30dp</dimen>
     <dimen name="dialog_item_condition_copy_condition_size">100dp</dimen>
 
-    <dimen name="overlay_click_selector_thickness">6dp</dimen>
-    <dimen name="overlay_click_selector_radius">28dp</dimen>
-    <dimen name="overlay_click_selector_inner_radius">3dp</dimen>
-
     <dimen name="overlay_condition_selector_width">230dp</dimen>
     <dimen name="overlay_condition_selector_height">130dp</dimen>
     <dimen name="overlay_condition_selector_resize_handle_size">50dp</dimen>

diff --git a/feature/smart-config/src/main/res/values/styles.xml b/feature/smart-config/src/main/res/values/styles.xml
@@ -25,16 +25,6 @@
         <item name="colorBackground">@color/overlayClickSelectorBackground</item>
     </style>
 
-    <!-- Style for the dumb action brief. -->
-    <style name="AppTheme.ScenarioConfig.Selector.Position">
-        <item name="colorBackground">@color/overlayActionsBriefBackground</item>
-        <item name="radius">@dimen/overlay_click_selector_radius</item>
-        <item name="innerRadius">@dimen/overlay_click_selector_inner_radius</item>
-        <item name="thickness">@dimen/overlay_click_selector_thickness</item>
-        <item name="colorInner">@color/overlayViewPrimary</item>
-        <item name="colorOutlinePrimary">@color/overlayViewPrimary</item>
-        <item name="colorOutlineSecondary">@color/overlayViewPrimary</item>
-    </style>
     <!-- Style for the condition overlay selector view. -->
     <style name="AppTheme.ScenarioConfig.Selector.Condition">
         <item name="colorOutlinePrimary">@color/overlayViewPrimary</item>

diff --git a/feature/smart-config/src/main/res/values/themes.xml b/feature/smart-config/src/main/res/values/themes.xml
@@ -19,7 +19,6 @@
 
     <style name="ScenarioConfigTheme" parent="AppTheme">
         <item name="areaSelectorStyle">@style/AppTheme.ScenarioConfig.Selector.Condition</item>
-        <item name="itemBriefStyle">@style/AppTheme.ScenarioConfig.Selector.Position</item>
         <item name="conditionSelectorStyle">@style/AppTheme.ScenarioConfig.Selector.Condition</item>
     </style>