Add iOS pull to refresh

coreapp/src/androidMain/kotlin/com/metacto/core/presentation/components/refreshLayout/PullToRefresh.kt

@@ -0,0 +1,56 @@
+package com.metacto.core.presentation.components.refreshLayout
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import com.metacto.core.presentation.theme.CoreTheme
+import com.metacto.core.utils.extensions.pullRefreshIf
+import com.metacto.core.utils.extensions.rememberPullRefreshStateIf
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+actual fun PullToRefresh(
+    modifier: Modifier,
+    isRefreshable: Boolean,
+    isRefreshing: Boolean,
+    onRefresh: (() -> Unit)?,
+    content: @Composable () -> Unit
+) {
+
+   val  refreshIndicatorColor = CoreTheme.colors.pullRefreshIndicator
+    val refreshIndicatorBgColor = CoreTheme.colors.pullRefreshIndicatorBackground
+
+    // Prepare refresh state
+    val pullRefreshState = rememberPullRefreshStateIf(
+        condition = isRefreshable,
+        refreshing = isRefreshing,
+        onRefresh = {
+            onRefresh?.invoke()
+        }
+    )
+
+    // Container box
+    Box(
+        modifier = modifier.pullRefreshIf(
+            condition = isRefreshable,
+            state = pullRefreshState
+        )
+    ) {
+        content
+
+        // Render pull refresh indicator
+        if (pullRefreshState != null) {
+            PullRefreshIndicator(
+                modifier = Modifier.align(Alignment.TopCenter),
+                refreshing = isRefreshing,
+                state = pullRefreshState,
+                contentColor = refreshIndicatorColor,
+                backgroundColor = refreshIndicatorBgColor
+            )
+        }
+    }
+
+}

coreapp/src/commonMain/kotlin/com/metacto/core/presentation/components/containers/CoreColumn.kt

@@ -2,24 +2,17 @@ package com.metacto.core.presentation.components.containers
 
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import com.metacto.core.presentation.theme.CoreTheme
+import com.metacto.core.presentation.components.refreshLayout.PullToRefresh
 import com.metacto.core.utils.extensions.onScrolling
-import com.metacto.core.utils.extensions.pullRefreshIf
-import com.metacto.core.utils.extensions.rememberPullRefreshStateIf
 import com.metacto.core.utils.extensions.rememberScrollStateIf
 import com.metacto.core.utils.extensions.verticalScrollIf
 
-@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun CoreColumn(
     modifier: Modifier = Modifier,
@@ -31,8 +24,6 @@ fun CoreColumn(
     isRefreshable: Boolean = false,
     isRefreshing: Boolean = false,
     onRefresh: (() -> Unit)? = null,
-    refreshIndicatorColor: Color = CoreTheme.colors.pullRefreshIndicator,
-    refreshIndicatorBgColor: Color = CoreTheme.colors.pullRefreshIndicatorBackground,
     content: @Composable ColumnScope.() -> Unit
 ) {
     // Config scroll state
@@ -41,25 +32,8 @@ fun CoreColumn(
             onScrolled?.invoke()
         }
     }
-
-    // Prepare refresh state
-    val pullRefreshState = rememberPullRefreshStateIf(
-        condition = isRefreshable,
-        refreshing = isRefreshing,
-        onRefresh = {
-            onRefresh?.invoke()
-        }
-    )
-
-    // Container box
-    Box(
-        modifier = modifier.pullRefreshIf(
-            condition = isRefreshable,
-            state = pullRefreshState
-        )
-    ) {
-        // Render content column
-        Column(
+    // Render content column
+    val contentColumn = Column(
             verticalArrangement = verticalArrangement,
             horizontalAlignment = horizontalAlignment,
             content = content,
@@ -68,15 +42,11 @@ fun CoreColumn(
                 .verticalScrollIf(isScrollable, scrollState)
         )
 
-        // Render pull refresh indicator
-        if (pullRefreshState != null) {
-            PullRefreshIndicator(
-                modifier = Modifier.align(Alignment.TopCenter),
-                refreshing = isRefreshing,
-                state = pullRefreshState,
-                contentColor = refreshIndicatorColor,
-                backgroundColor = refreshIndicatorBgColor
-            )
-        }
-    }
+    PullToRefresh(
+        isRefreshable = isRefreshable,
+        isRefreshing = isRefreshing,
+        onRefresh = onRefresh,
+        content = { contentColumn },
+        modifier  = modifier
+    )
 }

coreapp/src/commonMain/kotlin/com/metacto/core/presentation/components/containers/ScreenColumn.kt

@@ -70,8 +70,8 @@ fun ScreenColumn(
             isRefreshable = isRefreshable,
             isRefreshing = isRefreshing,
             onRefresh = onRefresh,
-            refreshIndicatorColor = refreshIndicatorColor,
-            refreshIndicatorBgColor = refreshIndicatorBgColor,
+//            refreshIndicatorColor = refreshIndicatorColor,
+//            refreshIndicatorBgColor = refreshIndicatorBgColor,
             modifier = Modifier
                 .weight(1f)
                 .fillMaxWidth()

coreapp/src/commonMain/kotlin/com/metacto/core/presentation/components/refreshLayout/PullToRefresh.kt

@@ -0,0 +1,13 @@
+package com.metacto.core.presentation.components.refreshLayout
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+
+@Composable
+expect fun PullToRefresh(
+    modifier: Modifier,
+    isRefreshable: Boolean,
+    isRefreshing: Boolean,
+    onRefresh: (() -> Unit)? = null,
+    content: @Composable () -> Unit
+)

coreapp/src/iosMain/kotlin/com/metacto/core/presentation/components/refreshLayout/PullToRefresh.kt

@@ -0,0 +1,35 @@
+package com.metacto.core.presentation.components.refreshLayout
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+@Composable
+actual fun PullToRefresh(
+    modifier: Modifier,
+    isRefreshable: Boolean,
+    isRefreshing: Boolean,
+    onRefresh: (() -> Unit)?,
+    content: @Composable () -> Unit
+) {
+   val  refreshContent: @Composable RefreshLayoutState.() -> Unit = remember {
+        { PullToRefreshContent() }
+    }
+
+    RefreshLayout(
+        refreshContent = refreshContent,
+        refreshLayoutState = createState(),
+        modifier = modifier,
+        content = content
+    )
+}
+
+@Composable
+private fun createState() = rememberRefreshLayoutState {
+    coroutineScope.launch {
+        delay(2000)
+        setRefreshState(RefreshContentStateEnum.Stop)
+    }
+}

coreapp/src/iosMain/kotlin/com/metacto/core/presentation/components/refreshLayout/PullToRefreshContent.kt

@@ -0,0 +1,109 @@
+package com.metacto.core.presentation.components.refreshLayout
+
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.metacto.core.presentation.theme.CoreTheme
+import com.metacto.coreApp.resources.Res
+import com.metacto.coreApp.resources.ic_play
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.painterResource
+import kotlin.math.abs
+
+/**
+ * creator: lt  2022/9/18  lt.dygzs@qq.com
+ * effect : 下拉刷新的刷新组件
+ *          Refresh component for pull down refresh
+ * warning:
+ */
+@OptIn(ExperimentalResourceApi::class)
+@Composable
+fun RefreshLayoutState.PullToRefreshContent() {
+    val refreshContentState by remember {
+        getRefreshContentState()
+    }
+    Row(
+        Modifier
+            .fillMaxWidth()
+            .height(35.dp),
+        verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center
+    ) {
+        when (refreshContentState) {
+            RefreshContentStateEnum.Stop -> {
+                //no image
+            }
+
+            RefreshContentStateEnum.Refreshing -> {
+                //循环旋转动画
+                val infiniteTransition = rememberInfiniteTransition()
+                val rotate by infiniteTransition.animateFloat(
+                    initialValue = 0f,
+                    targetValue = 360f,
+                    animationSpec = infiniteRepeatable(
+                        animation = tween(durationMillis = 1000, easing = LinearEasing),
+                        repeatMode = RepeatMode.Restart
+                    )
+                )
+                Image(
+                    painter = painterResource(Res.drawable.ic_play),
+                    contentDescription = "",
+                    modifier = Modifier
+                        .size(20.dp)
+                        .rotate(rotate)
+                )
+                Spacer(Modifier.width(10.dp))
+            }
+
+            RefreshContentStateEnum.Dragging -> {
+                //旋转动画
+                val isCannotRefresh =
+                    abs(getRefreshContentOffset()) < getRefreshContentThreshold()
+                val rotate by animateFloatAsState(targetValue = if (isCannotRefresh) 0f else 180f)
+                Image(
+                    painter = painterResource(Res.drawable.ic_play),
+                    contentDescription = "",
+                    modifier = Modifier
+                        .size(20.dp)
+                        .rotate(rotate)
+                )
+                Spacer(Modifier.width(10.dp))
+            }
+        }
+        Text(
+            text = when (refreshContentState) {
+                RefreshContentStateEnum.Stop -> "Refresh Complete"
+                RefreshContentStateEnum.Refreshing -> "Refreshing"
+                RefreshContentStateEnum.Dragging -> {
+                    if (abs(getRefreshContentOffset()) < getRefreshContentThreshold()) {
+                        "Pull to refresh"
+                    } else {
+                        "Release refresh"
+                    }
+                }
+            },
+            fontSize = 14.sp,
+            color = CoreTheme.colors.red,
+        )
+    }
+}

coreapp/src/iosMain/kotlin/com/metacto/core/presentation/components/refreshLayout/RefreshContentStateEnum.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright lt 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.metacto.core.presentation.components.refreshLayout
+
+enum class RefreshContentStateEnum {
+    Stop,
+    Refreshing,
+    Dragging
+}