@momo-kits/native-kits 0.167.1-beta.18-debug → 0.167.1-beta.19-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.167.1-beta.18-debug"
+        version = "0.167.1-beta.19-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -188,3 +188,16 @@ compose {
 //         }
 //     }
 // }
+
+// KGP's synthetic Podfile only raises pods to iOS 12 (KT-57741); Xcode 27 rejects anything below 15, which breaks lottie-ios (13.0).
+tasks.matching { it.name.startsWith("podGen") }.configureEach {
+    doLast {
+        outputs.files.asFileTree.matching { include("**/Podfile") }.forEach { podfile ->
+            val signingLine = "config.build_settings['CODE_SIGNING_ALLOWED'] = \"NO\""
+            val text = podfile.readText()
+            if ("IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'" !in text) {
+                podfile.writeText(text.replace(signingLine, "$signingLine\n      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'"))
+            }
+        }
+    }
+}

package/compose/build.gradle.kts.backup

@@ -188,3 +188,16 @@ mavenPublishing {
         }
     }
 }
+
+// KGP's synthetic Podfile only raises pods to iOS 12 (KT-57741); Xcode 27 rejects anything below 15, which breaks lottie-ios (13.0).
+tasks.matching { it.name.startsWith("podGen") }.configureEach {
+    doLast {
+        outputs.files.asFileTree.matching { include("**/Podfile") }.forEach { podfile ->
+            val signingLine = "config.build_settings['CODE_SIGNING_ALLOWED'] = \"NO\""
+            val text = podfile.readText()
+            if ("IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'" !in text) {
+                podfile.writeText(text.replace(signingLine, "$signingLine\n      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'"))
+            }
+        }
+    }
+}

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.167.1-beta.18-debug'
+    spec.version                  = '0.167.1-beta.19-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTabBar.kt

@@ -126,17 +126,10 @@ internal fun RowScope.RenderTabBarItem(
 
 @Composable
 internal fun TabBarItem(item: BottomTabItem, selected: Boolean, onClick: () -> Unit) {
-    fun isNumber(label: String): Boolean {
-        val numberRegex = "^\\d+$".toRegex()
-        return numberRegex.matches(label)
-    }
-    fun formatLabel(label: String): String? {
-        if (isNumber(label) && label.toInt() == 0) {
-            return null
-        }
-        return label
-    }
-    val badgeLabel = item.badgeLabel?.let { formatLabel(it) }
+    // RN parity: "0" hides the badge, "" renders a dot.
+    val badgeLabel = item.badgeLabel?.takeUnless { it.toIntOrNull() == 0 }
+    val isNumber = badgeLabel?.toIntOrNull() != null
+    val showDot = badgeLabel?.isEmpty() ?: item.showDot
 
     Box(modifier = Modifier
         .fillMaxSize()
@@ -159,11 +152,19 @@ internal fun TabBarItem(item: BottomTabItem, selected: Boolean, onClick: () -> U
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center
         ) {
-            Icon(
-                source = item.icon,
-                size = 28.dp,
-                modifier = Modifier.padding(Spacing.XS),
-                color = if (selected) AppTheme.current.colors.primary else AppTheme.current.colors.text.hint)
+            Box(modifier = Modifier.padding(Spacing.XS)) {
+                Icon(
+                    source = item.icon,
+                    size = 28.dp,
+                    color = if (selected) AppTheme.current.colors.primary else AppTheme.current.colors.text.hint)
+                // Anchored to the icon (not the tab cell) so it stays put whatever the tab width; matchParentSize + unbounded wrap keeps it from resizing the icon slot.
+                val badgeAnchor = Modifier.matchParentSize().wrapContentSize(Alignment.TopEnd, unbounded = true)
+                if (showDot) {
+                    BadgeDot(size = DotSize.Small, modifier = badgeAnchor.offset(x = 4.dp, y = (-4).dp))
+                } else if (!badgeLabel.isNullOrEmpty()) {
+                    Badge(badgeLabel, modifier = badgeAnchor.offset(x = if (isNumber) 8.dp else 12.dp, y = (-8).dp))
+                }
+            }
             Text(
                 text = item.label,
                 color = if (selected) AppTheme.current.colors.primary else AppTheme.current.colors.text.hint,
@@ -172,15 +173,6 @@ internal fun TabBarItem(item: BottomTabItem, selected: Boolean, onClick: () -> U
                 overflow = TextOverflow.Ellipsis
             )
         }
-        if (badgeLabel != null) {
-            if (badgeLabel.isEmpty())
-                BadgeDot(
-                    size = DotSize.Small,
-                    modifier = Modifier.offset(x = 50.dp, y = (-48).dp)
-                )
-            else
-                Badge(badgeLabel, modifier = Modifier.offset(x = 44.dp, y = (-42).dp))
-        }
     }
 }
 

package/gradle.properties

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

package/ios/Title/Title.swift

@@ -152,16 +152,11 @@ public struct Title: View {
     }
 
     private var titleText: some View {
-        let fontSize = fontScale(titleFontSize)
-        // lineSpacing is added on top of the font's natural line height, not on top of fontSize.
-        let lineSpacing = max(0, fontScale(titleLineHeight)
-            - UIFont.systemFont(ofSize: fontSize).lineHeight)
-
-        return SwiftUI.Text(title)
-            .font(.system(size: fontSize, weight: titleFontWeight))
+        SwiftUI.Text(title)
+            .font(.system(size: fontScale(titleFontSize), weight: titleFontWeight))
             .ignoreBoldTextSetting()
             .foregroundColor(theme.colors.text.default)
-            .lineSpacing(lineSpacing)
+            .lineSpacing(fontScale(titleLineHeight) - fontScale(titleFontSize))
             .lineLimit(titleMaxLines)
             .truncationMode(.tail)
     }

package/ios/Typography/Text.swift

@@ -123,15 +123,6 @@ private func momoFont(size: CGFloat, weight: Font.Weight, family: String) -> Fon
     return .custom(name, fixedSize: size)
 }
 
-// lineHeight is identical across weights of a family, so the regular face is enough.
-private func momoLineHeight(size: CGFloat, family: String) -> CGFloat {
-    if let name = momoFontName(family: family, weight: .regular),
-       let font = UIFont(name: name, size: size) {
-        return font.lineHeight
-    }
-    return UIFont.systemFont(ofSize: size).lineHeight
-}
-
 public struct MomoText: View {
     @Environment(\.appTheme) private var theme
     @Environment(\.momoFontScale) private var fontScale
@@ -231,13 +222,8 @@ public struct MomoText: View {
         // *Strikethrough styles) or the explicit `strikethrough` flag.
         let isStrikethrough = strikethrough || typography.isStrikethrough
 
-        let fontSize = fontScale(typography.fontSize)
-        // lineSpacing is added on top of the font's natural line height, not on top of fontSize.
-        let lineSpacing = max(0, fontScale(typography.lineHeight)
-            - momoLineHeight(size: fontSize, family: theme.font))
-
         var text = baseText
-            .font(momoFont(size: fontSize, weight: typography.fontWeight, family: theme.font))
+            .font(momoFont(size: fontScale(typography.fontSize), weight: typography.fontWeight, family: theme.font))
             .foregroundColor(textColor)
             .strikethrough(isStrikethrough, color: textColor)
             .underline(underline, color: textColor)
@@ -248,7 +234,7 @@ public struct MomoText: View {
 
         return text
             .multilineTextAlignment(textAlign)
-            .lineSpacing(lineSpacing)
+            .lineSpacing(fontScale(typography.lineHeight) - fontScale(typography.fontSize))
             .modifier(LineLimitModifier(range: lineLimitRange))
             .truncationMode(truncationMode)
             .fixedSize(horizontal: !softWrap, vertical: false)

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.167.1-beta.18'
+  s.version          = '0.167.1-beta.19'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.167.1-beta.18'
+  s.version          = '0.167.1-beta.19'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

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.
-#Tue Apr 08 11:13:31 ICT 2025
-sdk.dir=/Users/sonnguyen/Library/Android/sdk
+#Thu Jun 04 17:11:56 ICT 2026
+sdk.dir=/Users/open.design/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.167.1-beta.18-debug",
+  "version": "0.167.1-beta.19-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},