Move scroll related function

gradle · Jul 12, 2024 · 7adb6e1 · 7adb6e1
1 parent a68a602
commit 7adb6e1
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 42 deletions.
diff --git a/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/composables/FailureContent.kt b/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/composables/FailureContent.kt
@@ -1,16 +1,11 @@
 package org.gradle.client.ui.composables
 
-import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontFamily
-import org.gradle.client.ui.connected.horizontalScrollContent
 
 @Composable
 fun FailureContent(exception: Exception) {

diff --git a/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/composables/Scroll.kt b/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/composables/Scroll.kt
@@ -0,0 +1,41 @@
+package org.gradle.client.ui.composables
+
+import androidx.compose.foundation.HorizontalScrollbar
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.rememberScrollbarAdapter
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+
+@Composable
+fun horizontalScrollContent(
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    Box(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        val stateHorizontal = rememberScrollState(0)
+
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(bottom = 12.dp)
+                .horizontalScroll(stateHorizontal)
+        ) {
+            Column {
+                content()
+            }
+        }
+
+        HorizontalScrollbar(
+            modifier = Modifier
+                .align(Alignment.BottomStart)
+                .fillMaxWidth(),
+            adapter = rememberScrollbarAdapter(stateHorizontal)
+        )
+    }
+}
diff --git a/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/ConnectedContent.kt b/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/ConnectedContent.kt
@@ -1,10 +1,6 @@
 package org.gradle.client.ui.connected
 
-import androidx.compose.foundation.HorizontalScrollbar
-import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.rememberScrollbarAdapter
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.PlayCircle
@@ -13,7 +9,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
 import com.arkivanov.decompose.extensions.compose.subscribeAsState
 import org.gradle.client.ui.composables.FailureContent
 import org.gradle.client.ui.composables.Loading
@@ -110,32 +105,3 @@ private fun ConnectedMainContent(component: ConnectedComponent, model: Connectio
         )
     }
 }
-
-@Composable
-fun horizontalScrollContent(
-    content: @Composable ColumnScope.() -> Unit,
-) {
-    Box(
-        modifier = Modifier.fillMaxSize()
-    ) {
-        val stateHorizontal = rememberScrollState(0)
-
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(bottom = 12.dp)
-                .horizontalScroll(stateHorizontal)
-        ) {
-            Column {
-                content()
-            }
-        }
-
-        HorizontalScrollbar(
-            modifier = Modifier
-                .align(Alignment.BottomStart)
-                .fillMaxWidth(),
-            adapter = rememberScrollbarAdapter(stateHorizontal)
-        )
-    }
-}
diff --git a/...e-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetBuildEnvironment.kt b/...e-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetBuildEnvironment.kt
@@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import org.gradle.client.ui.connected.horizontalScrollContent
+import org.gradle.client.ui.composables.horizontalScrollContent
 import org.gradle.tooling.model.build.BuildEnvironment
 
 class GetBuildEnvironment : GetModelAction<BuildEnvironment> {

diff --git a/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetGradleBuild.kt b/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetGradleBuild.kt
@@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import org.gradle.client.ui.connected.horizontalScrollContent
+import org.gradle.client.ui.composables.horizontalScrollContent
 import org.gradle.tooling.model.gradle.GradleBuild
 
 class GetGradleBuild : GetModelAction<GradleBuild> {

diff --git a/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetGradleProject.kt b/gradle-client/src/jvmMain/kotlin/org/gradle/client/ui/connected/actions/GetGradleProject.kt
@@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import org.gradle.client.ui.connected.horizontalScrollContent
+import org.gradle.client.ui.composables.horizontalScrollContent
 import org.gradle.tooling.model.GradleProject
 
 class GetGradleProject : GetModelAction<GradleProject> {