From 44b065972e07fac19f3d74d9aa5fa460a05f75c8 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Tue, 16 Jan 2024 23:30:21 +0800 Subject: [PATCH] refactor: merge to compose-extension new usage --- .../com/highcapable/flexiui/demo/Components.kt | 14 -------------- .../flexiui/demo/screen/LazyListScreen.kt | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt index 902161f..6627bfe 100644 --- a/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt +++ b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/Components.kt @@ -25,8 +25,6 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.hapticfeedback.HapticFeedbackType -import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.unit.dp import com.highcapable.flexiui.FlexiTheme import com.highcapable.flexiui.component.Text @@ -50,16 +48,4 @@ fun SecondaryText(text: String) { color = FlexiTheme.colors.textSecondary, style = FlexiTheme.typography.secondary ) -} - -@Composable -fun HapticFeedback( - type: HapticFeedbackType = HapticFeedbackType.LongPress, - handler: () -> Unit -): () -> Unit { - val hapticFeedback = LocalHapticFeedback.current - return { - handler() - hapticFeedback.performHapticFeedback(type) - } } \ No newline at end of file diff --git a/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt index 79e1b8a..67fa429 100644 --- a/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt +++ b/samples/composeApp/src/commonMain/kotlin/com/highcapable/flexiui/demo/screen/LazyListScreen.kt @@ -45,6 +45,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import com.highcapable.betterandroid.compose.extension.ui.HapticFeedback import com.highcapable.betterandroid.compose.multiplatform.backpress.BackHandler import com.highcapable.flexiui.component.Button import com.highcapable.flexiui.component.DropdownMenu @@ -59,7 +60,6 @@ import com.highcapable.flexiui.component.Text import com.highcapable.flexiui.component.window.FlexiDialog import com.highcapable.flexiui.demo.Delete import com.highcapable.flexiui.demo.DeleteForever -import com.highcapable.flexiui.demo.HapticFeedback import com.highcapable.flexiui.demo.ListAdd import com.highcapable.flexiui.demo.PrimarySpacer import com.highcapable.flexiui.demo.bean.SimpleListBean