@momo-kits/native-kits 0.110.1-sp.3 → 0.110.1-sp.5

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Components.kt

@@ -50,6 +50,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.modifier.setAutomationId
 import vn.momo.kits.platform.getStatusBarHeight
 import vn.momo.kits.utils.bottomBorder
 

package/compose/src/commonMain/kotlin/vn/momo/kits/application/NavigationContainer.kt

@@ -22,6 +22,14 @@ import vn.momo.kits.const.defaultTheme
 import vn.momo.kits.platform.disableOverscroll
 import vn.momo.kits.platform.getStatusBarHeight
 
+val PlatformApi = staticCompositionLocalOf<Any?> { null }
+
+interface ComposeApi {
+    fun request(funcName: String, params: String?): String
+    fun request(funcName: String, params: String?, onResponse: ((String) -> Unit)?): String
+    fun requestCallback(funcName: String, params: String?, onResponse: ((String) -> Unit)?)
+    fun removeCallback(id: String)
+}
 
 val AppNavigator = staticCompositionLocalOf<Navigator> {
     error("no navigator provided!")
@@ -59,15 +67,6 @@ class Navigator {
     }
 }
 
-val PlatformApi = staticCompositionLocalOf<Any?> { null }
-
-interface ComposeApi {
-    fun request(funcName: String, params: String?): String
-    fun request(funcName: String, params: String?, onResponse: ((String) -> Unit)?): String
-    fun requestCallback(funcName: String, params: String?, onResponse: ((String) -> Unit)?)
-    fun removeCallback(id: String)
-}
-
 @Composable
 fun ApplicationContainer(
     theme: Theme = defaultTheme,

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Input.kt

@@ -45,6 +45,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.modifier.setAutomationId
 
 data class InputSizeDetail(
     val borderWidth: Dp,
@@ -178,6 +179,7 @@ fun Input(
     required: Boolean = false,
     fontWeight: InputFontWeight = InputFontWeight.REGULAR,
     keyboardType: KeyboardType = KeyboardType.Text,
+    modifier: Modifier = Modifier,
 ) {
     var isFocused by remember { mutableStateOf(false) }
     var passHidden by remember { mutableStateOf(false) }
@@ -203,9 +205,12 @@ fun Input(
 
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
-    Column(modifier = Modifier.semantics {
-        contentDescription = floatingValue; testTag = testId
-    }) {
+    Column(modifier = Modifier.
+    setAutomationId(testId)
+//    semantics {
+//        contentDescription = floatingValue; testTag = testId
+//    }
+    ) {
         BasicTextField(
             enabled = !disabled,
             readOnly = readOnly,

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Text.kt

@@ -3,9 +3,6 @@ package vn.momo.kits.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
@@ -18,7 +15,6 @@ import vn.momo.kits.const.Typography
 import vn.momo.kits.const.getFontFamily
 import vn.momo.kits.const.scaleSize
 import vn.momo.kits.modifier.setAutomationId
-import vn.momo.kits.platform.getPlatformName
 
 @Composable
 fun Text(
@@ -38,7 +34,7 @@ fun Text(
     val font = getFontFamily(fontFamily, style.fontWeight)
 
     androidx.compose.material3.Text(
-        modifier = modifier.setAutomationId(accessibilityId?:text),
+        modifier = modifier.setAutomationId(accessibilityId?:text, text),
         text = text,
         color = color ?: AppTheme.current.colors.text.default,
         style = style,

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/AutomationId.kt

@@ -11,7 +11,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import vn.momo.kits.platform.getPlatformName
 
-fun Modifier.setAutomationId(accessibilityId : String) : Modifier {
+fun Modifier.setAutomationId(accessibilityId : String, label: String? = null) : Modifier {
     return if (getPlatformName() == "Android") {
         semantics {
             contentDescription = accessibilityId
@@ -19,6 +19,7 @@ fun Modifier.setAutomationId(accessibilityId : String) : Modifier {
     } else {
         semantics {
             testTag = accessibilityId
+            contentDescription = label ?: accessibilityId
         }
     }
 }

package/ios/Switch/Switch.swift

@@ -12,33 +12,33 @@ public struct Switch: View{
         self.onChange = onChange
     }
     
-        public var body: some View {
-            SwiftUI.Button(action: {
-                withAnimation{
-                    onChange?(value)
-                    value.toggle()
-                }
-            }){
-                  HStack{
-                      HStack {
-                      }
-                      .frame(width: 6, height: 6)
-                      .background(value ? Colors.green03 : Colors.black07)
-                      .clipShape(Circle())
-                      .opacity(disabled ? 0.4 : 1)
+    
+    public var body: some View {
+        SwiftUI.Button(action: {
+            withAnimation{
+                value.toggle()
+                onChange?(value)
+            }
+        }){
+              HStack{
+                  HStack {
                   }
-                  .frame(width: 14, height: 14)
-                  .background(Colors.black01)
+                  .frame(width: 6, height: 6)
+                  .background(value ? Colors.pink03 : Colors.black07)
                   .clipShape(Circle())
-                  .padding(.leading,5)
-                  .padding(.trailing,5)
-    
+                  .opacity(disabled ? 0.4 : 1)
               }
-              .disabled(disabled)
-              .frame(width: 40, height: 24, alignment: value == true ? .trailing : .leading)
-              .background(value ? Colors.green03 : Colors.black05)
-              .clipShape(Capsule())
-              .opacity(disabled ? 0.4 : 1)
-        }
-    
+              .frame(width: 14, height: 14)
+              .background(Colors.black01)
+              .clipShape(Circle())
+              .padding(.leading,5)
+              .padding(.trailing,5)
+              
+          }
+          .disabled(disabled)
+          .frame(width: 40, height: 24, alignment: value == true ? .trailing : .leading)
+          .background(value ? Colors.pink03 : Colors.black07)
+          .clipShape(Capsule())
+          .opacity(disabled ? 0.4 : 1)
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.110.1-sp.03",
+  "version": "0.110.1-sp.5",
   "private": false,
   "dependencies": {},
   "devDependencies": {},