refactor: merge to BetterAndroid new usage

2025-09-09 12:04:11 +08:00 · 2024-01-02 11:11:27 +08:00
parent 7935372e2f
commit ace3f11460
37 changed files with 218 additions and 685 deletions
--- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/builder/ImageVector.kt
+++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/builder/ImageVector.kt
@@ -1,51 +0,0 @@
-/*
- * Flexi UI - A flexible and useful UI component library.
- * Copyright (C) 2019-2023 HighCapable
- * https://github.com/BetterAndroid/FlexiUI
- *
- * Apache License Version 2.0
- *
- * 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
- *
- *     https://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.
- *
- * This file is created by fankes on 2023/11/11.
- */
-@file:Suppress("unused")
-
-package com.highcapable.flexiui.resources.builder
-
-import androidx.compose.ui.graphics.BlendMode
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.DefaultGroupName
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.unit.Dp
-
-internal inline fun buildImageVector(
-    name: String = DefaultGroupName,
-    defaultWidth: Dp,
-    defaultHeight: Dp,
-    viewportWidth: Float,
-    viewportHeight: Float,
-    tintColor: Color = Color.Unspecified,
-    tintBlendMode: BlendMode = BlendMode.SrcIn,
-    autoMirror: Boolean = false,
-    builder: ImageVector.Builder.() -> Unit
-) = ImageVector.Builder(
-    name = name,
-    defaultWidth = defaultWidth,
-    defaultHeight = defaultHeight,
-    viewportWidth = viewportWidth,
-    viewportHeight = viewportHeight,
-    tintColor = tintColor,
-    tintBlendMode = tintBlendMode,
-    autoMirror = autoMirror
-).apply(builder).build()
--- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowForward.kt
+++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowForward.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
+import com.highcapable.betterandroid.compose.extension.ui.ImageVector
 import com.highcapable.flexiui.resources.Icons
-import com.highcapable.flexiui.resources.builder.buildImageVector

 val Icons.ArrowForward by lazy {
-    buildImageVector(
+    ImageVector(
        name = "arrow_forward",
        defaultWidth = 32.dp,
        defaultHeight = 32.dp,
--- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowNaviUp.kt
+++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ArrowNaviUp.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
+import com.highcapable.betterandroid.compose.extension.ui.ImageVector
 import com.highcapable.flexiui.resources.Icons
-import com.highcapable.flexiui.resources.builder.buildImageVector

 val Icons.ArrowNaviUp by lazy {
-    buildImageVector(
+    ImageVector(
        name = "arrow_navi_up",
        defaultWidth = 32.dp,
        defaultHeight = 32.dp,
--- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Backspace.kt
+++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Backspace.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
+import com.highcapable.betterandroid.compose.extension.ui.ImageVector
 import com.highcapable.flexiui.resources.Icons
-import com.highcapable.flexiui.resources.builder.buildImageVector

 val Icons.Backspace by lazy {
-    buildImageVector(
+    ImageVector(
        name = "backspace",
        defaultWidth = 32.dp,
        defaultHeight = 32.dp,
--- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/CheckMark.kt
+++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/CheckMark.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
+import com.highcapable.betterandroid.compose.extension.ui.ImageVector
 import com.highcapable.flexiui.resources.Icons
-import com.highcapable.flexiui.resources.builder.buildImageVector

 val Icons.CheckMark by lazy {
-    buildImageVector(
+    ImageVector(
        name = "check_mark",
        defaultWidth = 32.dp,
        defaultHeight = 32.dp,
--- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Dropdown.kt
+++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/Dropdown.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
+import com.highcapable.betterandroid.compose.extension.ui.ImageVector
 import com.highcapable.flexiui.resources.Icons
-import com.highcapable.flexiui.resources.builder.buildImageVector

 val Icons.Dropdown by lazy {
-    buildImageVector(
+    ImageVector(
        name = "dropdown",
        defaultWidth = 24.dp,
        defaultHeight = 24.dp,
--- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/FinishClose.kt
+++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/FinishClose.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
+import com.highcapable.betterandroid.compose.extension.ui.ImageVector
 import com.highcapable.flexiui.resources.Icons
-import com.highcapable.flexiui.resources.builder.buildImageVector

 val Icons.FinishClose by lazy {
-    buildImageVector(
+    ImageVector(
        name = "finish_close",
        defaultWidth = 32.dp,
        defaultHeight = 32.dp,
--- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerClose.kt
+++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerClose.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
+import com.highcapable.betterandroid.compose.extension.ui.ImageVector
 import com.highcapable.flexiui.resources.Icons
-import com.highcapable.flexiui.resources.builder.buildImageVector

 val Icons.ViewerClose by lazy {
-    buildImageVector(
+    ImageVector(
        name = "viewer_close",
        defaultWidth = 32.dp,
        defaultHeight = 32.dp,
--- a/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerOpen.kt
+++ b/flexiui-resources/src/commonMain/kotlin/com/highcapable/flexiui/resources/icon/ViewerOpen.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.StrokeJoin
 import androidx.compose.ui.graphics.vector.path
 import androidx.compose.ui.unit.dp
+import com.highcapable.betterandroid.compose.extension.ui.ImageVector
 import com.highcapable.flexiui.resources.Icons
-import com.highcapable.flexiui.resources.builder.buildImageVector

 val Icons.ViewerOpen by lazy {
-    buildImageVector(
+    ImageVector(
        name = "viewer_open",
        defaultWidth = 32.dp,
        defaultHeight = 32.dp,