Split to component composables

T8RIN · Jan 9, 2025 · 44f6aff · 44f6aff
1 parent aafb680
commit 44f6aff
Show file tree

Hide file tree

Showing 11 changed files with 558 additions and 417 deletions.
diff --git a/...ker/core/filters/presentation/widget/filterItem/triple_components/ColorModelTripleItem.kt b/...ker/core/filters/presentation/widget/filterItem/triple_components/ColorModelTripleItem.kt
@@ -47,7 +47,7 @@ internal fun ColorModelTripleItem(
     previewOnly: Boolean
 ) {
     Box(
-        modifier = Modifier.Companion.padding(
+        modifier = Modifier.padding(
             start = 16.dp,
             top = 16.dp,
             end = 16.dp
@@ -77,7 +77,7 @@ internal fun ColorModelTripleItem(
                 titleFontWeight = FontWeight.Companion.Normal,
                 contentHorizontalPadding = 0.dp
             )
-            Spacer(Modifier.Companion.height(8.dp))
+            Spacer(Modifier.height(8.dp))
             ColorRowSelector(
                 title = stringResource(R.string.second_color),
                 value = color2,
@@ -97,7 +97,7 @@ internal fun ColorModelTripleItem(
                 titleFontWeight = FontWeight.Companion.Normal,
                 contentHorizontalPadding = 0.dp
             )
-            Spacer(Modifier.Companion.height(8.dp))
+            Spacer(Modifier.height(8.dp))
             ColorRowSelector(
                 title = stringResource(R.string.third_color),
                 value = color3,

diff --git a/...ters/presentation/widget/filterItem/triple_components/FloatPaletteImageModelTripleItem.kt b/...ters/presentation/widget/filterItem/triple_components/FloatPaletteImageModelTripleItem.kt
@@ -58,7 +58,7 @@ internal fun FloatPaletteImageModelTripleItem(
     var uri1 by remember(value) { mutableStateOf(value.third.data) }
 
     EnhancedSliderItem(
-        modifier = Modifier.Companion
+        modifier = Modifier
             .padding(
                 top = 8.dp,
                 start = 8.dp,
@@ -85,9 +85,9 @@ internal fun FloatPaletteImageModelTripleItem(
         valueRange = filter.paramsInfo[0].valueRange,
         behaveAsContainer = false
     )
-    Spacer(Modifier.Companion.height(8.dp))
+    Spacer(Modifier.height(8.dp))
     Column(
-        modifier = Modifier.Companion
+        modifier = Modifier
             .padding(horizontal = 16.dp)
             .container(
                 shape = ContainerShapeDefaults.topShape,
@@ -96,7 +96,7 @@ internal fun FloatPaletteImageModelTripleItem(
     ) {
         Text(
             text = stringResource(filter.paramsInfo[1].title!!),
-            modifier = Modifier.Companion.padding(
+            modifier = Modifier.padding(
                 top = 8.dp,
                 start = 12.dp,
                 end = 12.dp,
@@ -123,9 +123,9 @@ internal fun FloatPaletteImageModelTripleItem(
             }
         )
     }
-    Spacer(Modifier.Companion.height(4.dp))
+    Spacer(Modifier.height(4.dp))
     ImageSelector(
-        modifier = Modifier.Companion.padding(
+        modifier = Modifier.padding(
             horizontal = 16.dp
         ),
         value = uri1,
@@ -145,5 +145,5 @@ internal fun FloatPaletteImageModelTripleItem(
         subtitle = null,
         shape = ContainerShapeDefaults.bottomShape
     )
-    Spacer(Modifier.Companion.height(16.dp))
+    Spacer(Modifier.height(16.dp))
 }
diff --git a/.../presentation/widget/filterItem/triple_components/NumberColorModelColorModelTripleItem.kt b/.../presentation/widget/filterItem/triple_components/NumberColorModelColorModelTripleItem.kt
@@ -53,7 +53,7 @@ internal fun NumberColorModelColorModelTripleItem(
     var color2 by remember(value) { mutableStateOf(value.third.toColor()) }
 
     EnhancedSliderItem(
-        modifier = Modifier.Companion
+        modifier = Modifier
             .padding(
                 top = 8.dp,
                 start = 8.dp,
@@ -81,7 +81,7 @@ internal fun NumberColorModelColorModelTripleItem(
         behaveAsContainer = false
     )
     Box(
-        modifier = Modifier.Companion.padding(
+        modifier = Modifier.padding(
             start = 16.dp,
             top = 16.dp,
             end = 16.dp
@@ -107,7 +107,7 @@ internal fun NumberColorModelColorModelTripleItem(
                 titleFontWeight = FontWeight.Companion.Normal,
                 contentHorizontalPadding = 0.dp
             )
-            Spacer(Modifier.Companion.height(8.dp))
+            Spacer(Modifier.height(8.dp))
             ColorRowSelector(
                 title = stringResource(filter.paramsInfo[2].title!!),
                 value = color1,

diff --git a/...ters/presentation/widget/filterItem/triple_components/NumberColorModelPopArtTripleItem.kt b/...ters/presentation/widget/filterItem/triple_components/NumberColorModelPopArtTripleItem.kt
@@ -57,7 +57,7 @@ internal fun NumberColorModelPopArtTripleItem(
     var blendMode1 by remember(value) { mutableStateOf(value.third) }
 
     EnhancedSliderItem(
-        modifier = Modifier.Companion
+        modifier = Modifier
             .padding(
                 top = 8.dp,
                 start = 8.dp,
@@ -85,7 +85,7 @@ internal fun NumberColorModelPopArtTripleItem(
         behaveAsContainer = false
     )
     Box(
-        modifier = Modifier.Companion.padding(
+        modifier = Modifier.padding(
             start = 16.dp,
             top = 16.dp,
             end = 16.dp
@@ -113,7 +113,7 @@ internal fun NumberColorModelPopArtTripleItem(
             )
             Text(
                 text = stringResource(filter.paramsInfo[2].title!!),
-                modifier = Modifier.Companion.padding(
+                modifier = Modifier.padding(
                     top = 8.dp,
                     start = 12.dp,
                     end = 12.dp,

diff --git a/...rs/presentation/widget/filterItem/triple_components/NumberNumberBlurEdgeModeTripleItem.kt b/...rs/presentation/widget/filterItem/triple_components/NumberNumberBlurEdgeModeTripleItem.kt
@@ -73,7 +73,7 @@ internal fun NumberNumberBlurEdgeModeTripleItem(
     }
 
     Column(
-        modifier = Modifier.Companion.padding(8.dp)
+        modifier = Modifier.padding(8.dp)
     ) {
         paramsInfo.forEach { (state, info) ->
             val (title, valueRange, roundTo) = info

diff --git a/...ters/presentation/widget/filterItem/triple_components/NumberNumberColorModelTripleItem.kt b/...ters/presentation/widget/filterItem/triple_components/NumberNumberColorModelTripleItem.kt
@@ -77,7 +77,7 @@ internal fun NumberNumberColorModelTripleItem(
     }
 
     Column(
-        modifier = Modifier.Companion.padding(
+        modifier = Modifier.padding(
             top = 8.dp,
             start = 8.dp,
             end = 8.dp
@@ -112,6 +112,6 @@ internal fun NumberNumberColorModelTripleItem(
         defaultColors = ColorSelectionRowDefaults.colorList,
         titleFontWeight = FontWeight.Companion.Normal,
         contentHorizontalPadding = 16.dp,
-        modifier = Modifier.Companion.padding(start = 4.dp)
+        modifier = Modifier.padding(start = 4.dp)
     )
 }
diff --git a/...sentation/widget/filterItem/triple_components/NumberTransferFuncBlurEdgeModeTripleItem.kt b/...sentation/widget/filterItem/triple_components/NumberTransferFuncBlurEdgeModeTripleItem.kt
@@ -58,7 +58,7 @@ internal fun NumberTransferFuncBlurEdgeModeTripleItem(
     }
 
     EnhancedSliderItem(
-        modifier = Modifier.Companion
+        modifier = Modifier
             .padding(
                 top = 8.dp,
                 start = 8.dp,

diff --git a/...hrinker/core/filters/presentation/widget/filterItem/triple_components/NumberTripleItem.kt b/...hrinker/core/filters/presentation/widget/filterItem/triple_components/NumberTripleItem.kt
@@ -75,7 +75,7 @@ internal fun NumberTripleItem(
     }
 
     Column(
-        modifier = Modifier.Companion.padding(8.dp)
+        modifier = Modifier.padding(8.dp)
     ) {
         paramsInfo.forEach { (state, info) ->
             val (title, valueRange, roundTo) = info