@momo-kits/native-kits 0.153.1-beta.7 → 0.153.1-newsfeed.6

package/build.gradle.kts

@@ -11,6 +11,16 @@ plugins {
     alias(libs.plugins.android.application) apply false
 }
 
+repositories {
+    mavenLocal()
+    mavenCentral()
+    google()
+    maven {
+        url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
+        isAllowInsecureProtocol = true
+    }
+}
+
 buildscript {
     repositories {
         maven("https://storage.googleapis.com/r8-releases/raw")

package/compose/build.gradle.kts

@@ -7,6 +7,19 @@ plugins {
     kotlin("plugin.serialization")
     id("maven-publish")
 }
+
+allprojects {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+        maven {
+            url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
+            isAllowInsecureProtocol = true
+        }
+    }
+}
+
 fun getVersionFromPackageJson(): String {
     val packageJsonFile = file("../package.json")
     val packageJsonText = packageJsonFile.readText()
@@ -76,7 +89,7 @@ kotlin {
                 implementation(libs.coil.multiplatform.network.ktor)
                 implementation(libs.jetbrains.serialization.json)
                 implementation(libs.kotlinx.datetime)
-                api(project(":NativeMaxApi"))
+                api(libs.native.max.api)
             }
         }
         val androidMain by getting {

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

@@ -2,7 +2,8 @@ package vn.momo.kits.components.datetimepicker
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 import kotlinx.datetime.DatePeriod
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
@@ -149,6 +150,7 @@ val timeMode = listOf("AM", "PM")
 /**
  * Get today's date
  */
+@OptIn(ExperimentalTime::class)
 fun getCurrentDateTime(): LocalDateTime {
     return Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())
 }

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

@@ -0,0 +1,26 @@
+package vn.momo.kits.navigation
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+// Support swipe back on iOS
+object ComposeNavigatorManager {
+    private val _managers = MutableStateFlow<List<Navigator>>(emptyList())
+    val managers = _managers.asStateFlow()
+
+    fun push(manager: Navigator) {
+        _managers.value = _managers.value + manager
+    }
+
+    fun removeLast() {
+        _managers.value = _managers.value.dropLast(1)
+    }
+
+    fun checkCanPop(): Boolean = _managers.value.isNotEmpty()
+
+    fun pop() {
+        top()?.pop()
+    }
+
+    private fun top(): Navigator? = _managers.value.lastOrNull()
+}

package/ios/Badge/BadgeRibbon.swift

@@ -1,74 +1,5 @@
 import SwiftUI
 
-// MARK: - Custom Shape for Rounded Corners
-struct RoundedCorners: Shape {
-    var topLeft: CGFloat = 0.0
-    var topRight: CGFloat = 0.0
-    var bottomLeft: CGFloat = 0.0
-    var bottomRight: CGFloat = 0.0
-    
-    func path(in rect: CGRect) -> Path {
-        var path = Path()
-        
-        let width = rect.size.width
-        let height = rect.size.height
-        
-        // Start from top left
-        path.move(to: CGPoint(x: topLeft, y: 0))
-        
-        // Top edge and top right corner
-        path.addLine(to: CGPoint(x: width - topRight, y: 0))
-        if topRight > 0 {
-            path.addArc(
-                center: CGPoint(x: width - topRight, y: topRight),
-                radius: topRight,
-                startAngle: Angle(degrees: -90),
-                endAngle: Angle(degrees: 0),
-                clockwise: false
-            )
-        }
-        
-        // Right edge and bottom right corner
-        path.addLine(to: CGPoint(x: width, y: height - bottomRight))
-        if bottomRight > 0 {
-            path.addArc(
-                center: CGPoint(x: width - bottomRight, y: height - bottomRight),
-                radius: bottomRight,
-                startAngle: Angle(degrees: 0),
-                endAngle: Angle(degrees: 90),
-                clockwise: false
-            )
-        }
-        
-        // Bottom edge and bottom left corner
-        path.addLine(to: CGPoint(x: bottomLeft, y: height))
-        if bottomLeft > 0 {
-            path.addArc(
-                center: CGPoint(x: bottomLeft, y: height - bottomLeft),
-                radius: bottomLeft,
-                startAngle: Angle(degrees: 90),
-                endAngle: Angle(degrees: 180),
-                clockwise: false
-            )
-        }
-        
-        // Left edge and top left corner
-        path.addLine(to: CGPoint(x: 0, y: topLeft))
-        if topLeft > 0 {
-            path.addArc(
-                center: CGPoint(x: topLeft, y: topLeft),
-                radius: topLeft,
-                startAngle: Angle(degrees: 180),
-                endAngle: Angle(degrees: 270),
-                clockwise: false
-            )
-        }
-        
-        path.closeSubpath()
-        return path
-    }
-}
-
 public enum RibbonPosition {
     case topLeft
     case topRight
@@ -145,13 +76,14 @@ public struct BadgeRibbon: View {
         .frame(height: RibbonConstants.roundHeight)
         .padding(.trailing, RibbonConstants.roundPaddingEnd)
         .background(
-            RoundedCorners(
-                topLeft: 0,
-                topRight: RibbonConstants.roundRightRadius,
-                bottomLeft: 0,
-                bottomRight: RibbonConstants.roundRightRadius
-            )
-            .fill(backgroundColor)
+            RoundedRectangle(cornerRadius: Radius.M)
+                .fill(backgroundColor)
+                .mask(
+                    HStack(spacing: 0) {
+                        Rectangle()
+                        RoundedRectangle(cornerRadius: Radius.M)
+                    }
+                )
         )
     }
     
@@ -207,7 +139,7 @@ private struct RibbonConstants {
     static let ribbonHeight: CGFloat = 20
     static let roundHeight: CGFloat = 16
     static let skewBodyHeight: CGFloat = 16
-    static let roundRightRadius: CGFloat = 8
+    static let roundRightRadius: CGFloat = 12
     static let roundPaddingEnd: CGFloat = 6
     static let skewTailWidth: CGFloat = 8
     static let skewTailHeight: CGFloat = 16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.153.1-beta.7",
+  "version": "0.153.1-newsfeed.6",
   "private": false,
   "dependencies": {
     "@momo-platform/native-max-api": "1.0.18"

package/settings.gradle.kts

@@ -19,7 +19,4 @@ dependencyResolutionManagement {
         google()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
-}
-
-include(":NativeMaxApi")
-project(":NativeMaxApi").projectDir = file("./node_modules/@momo-platform/native-max-api/NativeMaxApi")
+}

package/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Thu Jan 09 10:43:10 ICT 2025
-sdk.dir=/Users/sophia/Library/Android/sdk