@momo-kits/native-kits 0.156.6-dialog.1-debug → 0.156.6-newcompose.1-debug

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -15,33 +15,20 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.interop.UIKitView
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import cocoapods.lottie_ios.CompatibleAnimation
 import cocoapods.lottie_ios.CompatibleAnimationKeypath
 import cocoapods.lottie_ios.CompatibleAnimationView
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.viewinterop.UIKitInteropProperties
-import androidx.compose.ui.viewinterop.UIKitView
-import cocoapods.SDWebImage.sd_setImageWithURL
 import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.get
 import kotlinx.cinterop.memScoped
-import kotlinx.cinterop.useContents
 import org.jetbrains.skia.FilterBlurMode
 import org.jetbrains.skia.MaskFilter
-import platform.CoreGraphics.CGRectMake
 import platform.Foundation.NSBundle
 import platform.UIKit.UIColor
-import platform.UIKit.UIImageRenderingMode
 import platform.UIKit.UIScreen
-import platform.Foundation.NSURL
-import platform.UIKit.UIImageView
-import platform.UIKit.UIViewContentMode
-import platform.UIKit.UIView
-import vn.momo.kits.components.Options
 
 actual fun getPlatformName(): String = "iOS"
 
@@ -159,167 +146,4 @@ fun Color.toUIColor(): UIColor {
 
 actual fun NativePaint.setColor(color: Color){
     this.color = color.toArgb()
-}
-/**
- * A container UIView that positions an inner UIImageView using the same
- * scale + alignment math as the Android Matrix implementation.
- */
-@OptIn(ExperimentalForeignApi::class)
-class ScaledAlignedImageView(
-    var contentScale: ContentScale,
-    var alignment: Alignment,
-    var imageTintColor: UIColor? = null,
-) : UIView(frame = CGRectMake(0.0, 0.0, 0.0, 0.0)) {
-
-    val imageView = UIImageView().apply {
-        backgroundColor = UIColor.clearColor()
-        clipsToBounds = false
-        contentMode = UIViewContentMode.UIViewContentModeScaleToFill
-    }
-
-    init {
-        clipsToBounds = true
-        addSubview(imageView)
-    }
-
-    fun applyTint() {
-        val img = imageView.image ?: return
-        val color = imageTintColor
-        if (color != null) {
-            imageView.tintColor = color
-            imageView.image = img.imageWithRenderingMode(UIImageRenderingMode.UIImageRenderingModeAlwaysTemplate)
-        } else {
-            imageView.tintColor = super.tintColor
-            imageView.image = img.imageWithRenderingMode(UIImageRenderingMode.UIImageRenderingModeAlwaysOriginal)
-        }
-    }
-
-    override fun layoutSubviews() {
-        super.layoutSubviews()
-        applyImageFrame()
-    }
-
-    @OptIn(ExperimentalForeignApi::class)
-    fun applyImageFrame() {
-        memScoped {
-            val img = imageView.image ?: return
-            val rect = this@ScaledAlignedImageView.bounds.ptr[0]
-            val vw: Double = rect.size.width
-            val vh: Double = rect.size.height
-            if (vw <= 0.0 || vh <= 0.0) return
-
-            val imgSize = img.size
-            val imgScale: Double = img.scale
-            val deviceScale: Double = UIScreen.mainScreen.scale
-            // Normalize: UIImage.size is in pts at img.scale, convert to dp-equivalent pts
-            // (img pixel count = img.size × img.scale → dp = pixels / deviceScale)
-            val dw: Double = (imgSize.useContents { width } * imgScale / deviceScale).takeIf { it > 0.0 } ?: return
-            val dh: Double = (imgSize.useContents { height } * imgScale / deviceScale).takeIf { it > 0.0 } ?: return
-
-            val sxFit: Double = vw / dw
-            val syFit: Double = vh / dh
-
-            val (sx: Double, sy: Double) = when (contentScale) {
-                ContentScale.Crop       -> maxOf(sxFit, syFit).let { it to it }
-                ContentScale.Fit        -> minOf(sxFit, syFit).let { it to it }
-                ContentScale.FillWidth  -> sxFit to sxFit
-                ContentScale.FillHeight -> syFit to syFit
-                ContentScale.FillBounds -> sxFit to syFit
-                ContentScale.Inside     -> minOf(1.0, minOf(sxFit, syFit)).let { it to it }
-                ContentScale.None       -> 1.0 to 1.0
-                else                    -> maxOf(sxFit, syFit).let { it to it }
-            }
-
-            val (bx: Double, by: Double) = when (alignment) {
-                Alignment.TopStart     -> -1.0 to -1.0
-                Alignment.TopCenter    ->  0.0 to -1.0
-                Alignment.TopEnd       ->  1.0 to -1.0
-                Alignment.CenterStart  -> -1.0 to  0.0
-                Alignment.Center       ->  0.0 to  0.0
-                Alignment.CenterEnd    ->  1.0 to  0.0
-                Alignment.BottomStart  -> -1.0 to  1.0
-                Alignment.BottomCenter ->  0.0 to  1.0
-                Alignment.BottomEnd    ->  1.0 to  1.0
-                else                   ->  0.0 to  0.0
-            }
-
-            val scaledW: Double = dw * sx
-            val scaledH: Double = dh * sy
-            val tx: Double = (vw - scaledW) * (bx + 1.0) / 2.0
-            val ty: Double = (vh - scaledH) * (by + 1.0) / 2.0
-
-            imageView.setFrame(CGRectMake(tx, ty, scaledW, scaledH))
-        }
-    }
-}
-
-@OptIn(ExperimentalForeignApi::class, ExperimentalComposeUiApi::class)
-@Composable
-actual fun NativeImage(
-    source: Any,
-    options: Options,
-    loading: Boolean,
-    onLoading: () -> Unit,
-    onSuccess: () -> Unit,
-    onError: () -> Unit,
-) {
-    UIKitView(
-        modifier = Modifier.fillMaxSize(),
-        factory = {
-            ScaledAlignedImageView(
-                contentScale = options.contentScale,
-                alignment = options.alignment,
-                imageTintColor = options.tintColor?.toUIColor(),
-            ).apply {
-                backgroundColor = UIColor.clearColor()
-                alpha = options.alpha.toDouble().coerceIn(0.0, 1.0)
-            }
-        },
-        update = { container ->
-            container.contentScale = options.contentScale
-            container.alignment = options.alignment
-            container.imageTintColor = options.tintColor?.toUIColor()
-            container.alpha = options.alpha.toDouble().coerceIn(0.0, 1.0)
-            container.applyImageFrame()
-
-            val url = (source as? String)?.let { NSURL(string = it) } ?: run {
-                container.imageView.image = null
-                onError()
-                return@UIKitView
-            }
-
-            try {
-                onLoading()
-                container.imageView.sd_setImageWithURL(
-                    url = url,
-                    placeholderImage = null,
-                    options = 0u,
-                    completed = { _, error, _, _ ->
-                        if (error == null) {
-                            container.applyTint()
-                            container.applyImageFrame()
-                            onSuccess()
-                        } else {
-                            onError()
-                        }
-                    }
-                )
-                true
-            } catch (_: Throwable) {
-                onError()
-            }
-        },
-        properties = UIKitInteropProperties(
-            placedAsOverlay = true,
-            // Disable all touch handling on the interop host view so that
-            // Compose click handlers on parent composables (e.g. Icon, BackButton)
-            // receive touches correctly on iOS.
-            interactionMode = null,
-        )
-    )
-}
-
-@Composable
-actual fun ConfigureDialogWindow(decorFitsSystemWindows: Boolean) {
-    // iOS: dialogs already render behind system bars — no additional setup needed.
-}
+}

package/gradle/libs.versions.toml

@@ -7,7 +7,7 @@ coroutines = "1.8.1"
 kotlin = "2.3.0"
 kSerialize = "1.7.1"
 compose = "1.10.1"
-navigation-multiplatform = "2.9.1"
+navigation-multiplatform = "2.9.0-beta02"
 coil3-multiplatform = "3.0.0-alpha10"
 androidGradlePlugin = "8.6.0"
 r8 = "8.13.19"

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.156.6-dialog.1
+version=0.156.6-newcompose.1
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/FloatingButton.swift

@@ -154,7 +154,7 @@ public struct FloatingButton: View {
                     Spacer().frame(width: 8)
                     Text(label)
                         .foregroundColor(.white)
-                        .font(.system(size: 16, weight: .bold))
+                        .font(.system(size: scaleSize(16), weight: .bold))
                         .lineLimit(1)
                         .background(
                             GeometryReader { geo in

package/ios/Badge/BadgeRibbon.swift

@@ -137,7 +137,7 @@ public struct BadgeRibbon: View {
     private var roundContent: some View {
         HStack(spacing: 0) {
             Text(label)
-                .font(.system(size: 12, weight: .medium))
+                .font(.system(size: scaleSize(12), weight: .medium))
                 .foregroundColor(Colors.black01)
                 .lineLimit(1)
                 .rotationEffect(rotation)
@@ -158,7 +158,7 @@ public struct BadgeRibbon: View {
     private var skewContent: some View {
         HStack(spacing: 0) {
             Text(label)
-                .font(.system(size: 12, weight: .medium))
+                .font(.system(size: scaleSize(12), weight: .medium))
                 .foregroundColor(Colors.black01)
                 .lineLimit(1)
                 .rotationEffect(rotation)

package/ios/Image/Image.swift

@@ -31,7 +31,11 @@ public struct ImageView: View {
             .placeholder {
                 VStack(alignment: .center, content: {
                     if error {
-                        Image(systemName: "photo.badge.exclamationmark").frame(width: 24, height: 24)
+                        Image("media_fail")
+                            .resizable()
+                            .renderingMode(.template)
+                            .foregroundColor(Colors.black08)
+                            .frame(width: 24, height: 24)
                     } else if placeholder != nil {
                         placeholder
                     }

package/ios/Input/Input.swift

@@ -174,7 +174,7 @@ public struct Input: View {
                             onChangeText?("")
                         }) {
                             Icon(source: "24_navigation_close_circle_full", size: 16, color: Colors.black12)
-                                .padding(.leading, Spacing.S)
+                                .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                         }
                     }
                     
@@ -194,7 +194,7 @@ public struct Input: View {
                                     size: 24,
                                     color: rightIconColor
                                 )
-                                .padding(.leading, Spacing.S)
+                                .padding(.leading, Spacing.S).accessibility(identifier: "ic_show_hide")
                             }
                         }
                     } else if !rightIcon.isEmpty {

package/ios/Input/InputPhoneNumber.swift

@@ -21,6 +21,7 @@ public struct InputPhoneNumber: View {
     public var onFocus: (() -> Void)?
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
+    public var accessibilityLabel: String?
     
     @State private var isFocused: Bool = false
     
@@ -38,7 +39,8 @@ public struct InputPhoneNumber: View {
         onChangeText: ((String) -> Void)? = nil,
         onFocus: (() -> Void)? = nil,
         onBlur: (() -> Void)? = nil,
-        onRightIconPressed: (() -> Void)? = nil
+        onRightIconPressed: (() -> Void)? = nil,
+        accessibilityLabel: String? = nil
     ) {
         self._text = text
         self.placeholder = placeholder
@@ -53,6 +55,7 @@ public struct InputPhoneNumber: View {
         self.onFocus = onFocus
         self.onBlur = onBlur
         self.onRightIconPressed = onRightIconPressed
+        self.accessibilityLabel = accessibilityLabel
     }
     
     // MARK: - Body
@@ -86,7 +89,7 @@ public struct InputPhoneNumber: View {
                         MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
                     }
                     
-                    TextField("", text: textBinding, onEditingChanged: { focused in
+                    TextField(placeholder, text: textBinding, onEditingChanged: { focused in
                         handleFocusChange(focused)
                     })
                     .keyboardType(.numberPad)
@@ -94,6 +97,7 @@ public struct InputPhoneNumber: View {
                     .foregroundColor(Colors.black17)
                     .applyPrimaryCursorColor()
                     .lineLimit(1)
+                    .accessibility(identifier: accessibilityLabel ?? "")
                 }
                 
                 // Clear button
@@ -103,7 +107,7 @@ public struct InputPhoneNumber: View {
                         onChangeText?("")
                     }) {
                         Icon(source: "24_navigation_close_circle_full", size: 16, color: Colors.black12)
-                            .padding(.leading, Spacing.S)
+                            .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                     }
                 }
                 

package/ios/Popup/PopupDisplay.swift

@@ -128,9 +128,7 @@ public struct PopupDisplay: View {
                             .clipped()
                     }
                     VStack(alignment: .leading, spacing: 0) {
-                        Text(title)
-                            .foregroundColor(.black)
-                            .font(.header_default_semibold)
+                        MomoText(title, typography: .headerDefaultBold)
                             .padding(.top, 24)
                             .padding(.bottom, 8)
                             .lineLimit(2)
@@ -139,9 +137,7 @@ public struct PopupDisplay: View {
                         Group {
                             if isScrollable {
                                 ScrollView(showsIndicators: false) {
-                                    Text(description)
-                                        .font(.body_default_regular)
-                                        .foregroundColor(Colors.black17)
+                                    MomoText(description, typography: .bodyDefaultRegular)
                                         .multilineTextAlignment(.leading)
                                         .background(GeometryReader { geo in
                                             Color.clear.onAppear { textHeight = geo.size.height }
@@ -149,13 +145,12 @@ public struct PopupDisplay: View {
                                         .measureLineHeights(font: .body_default_regular,
                                                             oneLine: $oneLineH,
                                                             twoLines: $twoLineH)
+                                        .accessibility(identifier: "description_popup_permission")
                                 }
                                 // Cap the visible height to ~8.5 lines
                                 .frame(height: min(maxHeight8_5, textHeight))
                             } else {
-                                Text(description)
-                                    .font(.body_default_regular)
-                                    .foregroundColor(Colors.black17)
+                                MomoText(description, typography: .bodyDefaultRegular)
                                     .multilineTextAlignment(.leading)
                                     .background(GeometryReader { geo in
                                         Color.clear.onAppear {
@@ -167,14 +162,13 @@ public struct PopupDisplay: View {
                                     .measureLineHeights(font: .body_default_regular,
                                                         oneLine: $oneLineH,
                                                         twoLines: $twoLineH)
+                                    .accessibility(identifier: "description_popup_permission")
                             }
                         }
                         .padding(.bottom, 8)
                         
                         if(!errorCode.isEmpty) {
-                            Text((errorCodeLabels[language] ?? "Mã lỗi: ") + errorCode)
-                                .foregroundColor(Colors.black12)
-                                .font(.description_xs_regular)
+                            MomoText((errorCodeLabels[language] ?? "Mã lỗi: ") + errorCode, typography: .descriptionXsRegular, color: Colors.black12)
                                 .lineLimit(1)
                                 .padding(.bottom, 8)
                         }

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Oct 02 17:53:13 ICT 2025
+#Mon Dec 22 10:07:29 ICT 2025
 sdk.dir=/Users/phuc/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.156.6-dialog.1-debug",
+  "version": "0.156.6-newcompose.1-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/publish.sh

@@ -185,7 +185,32 @@ phase_publish_maven() {
     
     ./gradlew :compose:publishAllPublicationsToGitLabPackagesRepository
     
-    echo "✅ Maven publishing completed successfully!"
+    echo "✅ compose Maven publishing completed successfully!"
+    
+    echo "📦 Publishing sample/shared KMP artifacts to Maven (version ${VERSION})..."
+    
+    # Temporarily remove composeResources and compose { resources { ... } } block
+    echo "📦 Backing up sample/shared composeResources and build.gradle.kts..."
+    if [ -d "sample/shared/src/commonMain/composeResources" ]; then
+        mv sample/shared/src/commonMain/composeResources sample/shared/src/commonMain/composeResources.backup
+    fi
+    cp sample/shared/build.gradle.kts sample/shared/build.gradle.kts.backup
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        sed -i '' '/^compose {$/,/^}$/d' sample/shared/build.gradle.kts
+    else
+        sed -i '/^compose {$/,/^}$/d' sample/shared/build.gradle.kts
+    fi
+    
+    ./gradlew :sample:shared:publishAllPublicationsToGitLabPackagesRepository
+    
+    # Restore composeResources and build.gradle.kts
+    echo "📦 Restoring sample/shared composeResources and build.gradle.kts..."
+    mv sample/shared/build.gradle.kts.backup sample/shared/build.gradle.kts
+    if [ -d "sample/shared/src/commonMain/composeResources.backup" ]; then
+        mv sample/shared/src/commonMain/composeResources.backup sample/shared/src/commonMain/composeResources
+    fi
+    
+    echo "✅ sample/shared Maven publishing completed successfully!"
     echo "✅ PHASE 2 COMPLETED"
     echo ""
 }

package/compose/MoMoComposeKits.podspec

@@ -1,54 +0,0 @@
-Pod::Spec.new do |spec|
-    spec.name                     = 'MoMoComposeKits'
-    spec.version                  = '0.0.1'
-    spec.homepage                 = 'MoMoComposeKits'
-    spec.source                   = { :http=> ''}
-    spec.authors                  = 'M_SERVICE'
-    spec.license                  = ''
-    spec.summary                  = 'MoMoComposeKits'
-    spec.vendored_frameworks      = 'build/cocoapods/framework/compose.framework'
-    spec.libraries                = 'c++'
-    spec.ios.deployment_target    = '13.0'
-    spec.dependency 'SDWebImage', '>= 5.19.1'
-                
-    if !Dir.exist?('build/cocoapods/framework/compose.framework') || Dir.empty?('build/cocoapods/framework/compose.framework')
-        raise "
-
-        Kotlin framework 'compose' doesn't exist yet, so a proper Xcode project can't be generated.
-        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
-
-            ./gradlew :compose:generateDummyFramework
-
-        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
-    end
-                
-    spec.xcconfig = {
-        'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
-    }
-                
-    spec.pod_target_xcconfig = {
-        'KOTLIN_PROJECT_PATH' => ':compose',
-        'PRODUCT_MODULE_NAME' => 'compose',
-    }
-                
-    spec.script_phases = [
-        {
-            :name => 'Build MoMoComposeKits',
-            :execution_position => :before_compile,
-            :shell_path => '/bin/sh',
-            :script => <<-SCRIPT
-                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
-                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
-                  exit 0
-                fi
-                set -ev
-                REPO_ROOT="$PODS_TARGET_SRCROOT"
-                "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
-                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
-                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
-                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
-            SCRIPT
-        }
-    ]
-    spec.resources = ['build/compose/cocoapods/compose-resources']
-end