@momo-kits/native-kits 0.162.2-sp.6-debug → 0.162.2-sp.7-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.162.2-sp.6-debug"
+        version = "0.162.2-sp.7-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"
@@ -132,6 +132,29 @@ compose {
     }
 }
 
+val disableSyntheticPodsDebugDylib by tasks.registering {
+    dependsOn("podInstallSyntheticIos")
+
+    doLast {
+        val syntheticPodsDir = layout.buildDirectory.dir("cocoapods/synthetic/ios/Pods").get().asFile
+        val xcconfigFiles = syntheticPodsDir
+            .resolve("Target Support Files")
+            .walkTopDown()
+            .filter { it.isFile && it.extension == "xcconfig" }
+
+        xcconfigFiles.forEach { file ->
+            val text = file.readText()
+            if (!text.contains("ENABLE_DEBUG_DYLIB")) {
+                file.appendText("\nENABLE_DEBUG_DYLIB = NO\n")
+            }
+        }
+    }
+}
+
+tasks.matching { it.name.startsWith("podBuild") }.configureEach {
+    dependsOn(disableSyntheticPodsDebugDylib)
+}
+
 // publishing {
 //     repositories {
 //         maven {

package/compose/build.gradle.kts.backup

@@ -132,6 +132,29 @@ compose {
     }
 }
 
+val disableSyntheticPodsDebugDylib by tasks.registering {
+    dependsOn("podInstallSyntheticIos")
+
+    doLast {
+        val syntheticPodsDir = layout.buildDirectory.dir("cocoapods/synthetic/ios/Pods").get().asFile
+        val xcconfigFiles = syntheticPodsDir
+            .resolve("Target Support Files")
+            .walkTopDown()
+            .filter { it.isFile && it.extension == "xcconfig" }
+
+        xcconfigFiles.forEach { file ->
+            val text = file.readText()
+            if (!text.contains("ENABLE_DEBUG_DYLIB")) {
+                file.appendText("\nENABLE_DEBUG_DYLIB = NO\n")
+            }
+        }
+    }
+}
+
+tasks.matching { it.name.startsWith("podBuild") }.configureEach {
+    dependsOn(disableSyntheticPodsDebugDylib)
+}
+
 publishing {
     repositories {
         maven {

package/compose/compose.podspec

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

package/gradle.properties

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

package/ios/Application/ApplicationEnvironment.swift

@@ -48,3 +48,14 @@ public class ApplicationEnvironment: ObservableObject {
         self.config = config
     }
 }
+
+private struct ApplicationEnvironmentKey: EnvironmentKey {
+    static let defaultValue = ApplicationEnvironment()
+}
+
+public extension EnvironmentValues {
+    var applicationEnvironment: ApplicationEnvironment {
+        get { self[ApplicationEnvironmentKey.self] }
+        set { self[ApplicationEnvironmentKey.self] = newValue }
+    }
+}

package/ios/Application/HeaderRight.swift

@@ -101,7 +101,7 @@ struct ToolkitHeaderRight: View {
     var tintColor: Color?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
-    @EnvironmentObject private var environment: ApplicationEnvironment
+    @Environment(\.applicationEnvironment) private var environment
 
     private func apiValue(_ value: Any?) -> Any {
         value ?? NSNull()

package/ios/Application/Navigation/NavigationContainer.swift

@@ -13,6 +13,7 @@ import SwiftUI
 @available(iOS 16.0, *)
 public struct NavigationContainer<Initial: View>: View {
     @StateObject private var navigator: Navigator
+    @StateObject private var applicationEnvironment: ApplicationEnvironment
 
     private let setNavigator: ((Navigator) -> Void)?
     private let composeApi: KitComposeApi?
@@ -21,7 +22,9 @@ public struct NavigationContainer<Initial: View>: View {
         initialScreenName: String = "",
         @ViewBuilder initialScreen: @escaping () -> Initial,
         options: NavigationOptions? = nil,
+        applicationContext: MiniAppContext? = nil,
         composeApi: KitComposeApi? = nil,
+        config: KitConfig? = nil,
         setNavigator: ((Navigator) -> Void)? = nil
     ) {
         let nav = Navigator(
@@ -31,6 +34,13 @@ public struct NavigationContainer<Initial: View>: View {
             composeApi: composeApi
         )
         _navigator = StateObject(wrappedValue: nav)
+        _applicationEnvironment = StateObject(
+            wrappedValue: ApplicationEnvironment(
+                applicationContext: applicationContext,
+                composeApi: composeApi,
+                config: config
+            )
+        )
         self.composeApi = composeApi
         self.setNavigator = setNavigator
     }
@@ -43,14 +53,20 @@ public struct NavigationContainer<Initial: View>: View {
                 }
         }
         .environmentObject(navigator)
+        .environmentObject(applicationEnvironment)
+        .environment(\.applicationEnvironment, applicationEnvironment)
         .fullScreenCover(item: $navigator.presented) { route in
             screenView(forDialog: route)
                 .environmentObject(navigator)
+                .environmentObject(applicationEnvironment)
+                .environment(\.applicationEnvironment, applicationEnvironment)
         }
         .overlay {
             if let item = navigator.overplay {
                 OverplayHost(item: item)
                     .environmentObject(navigator)
+                    .environmentObject(applicationEnvironment)
+                    .environment(\.applicationEnvironment, applicationEnvironment)
             }
         }
         .onAppear {

package/ios/Colors+Radius+Spacing/MoMoUIKitsResources.swift

@@ -1,32 +1,2 @@
-import Foundation
-import SwiftUI
-
-private final class MoMoUIKitsBundleToken {}
-
-enum MoMoUIKitsResources {
-    static let bundle: Bundle = {
-        let bundleName = "MoMoUIKitsResources"
-        let tokenBundle = Bundle(for: MoMoUIKitsBundleToken.self)
-        let candidates = [
-            Bundle.main.resourceURL,
-            tokenBundle.resourceURL,
-            tokenBundle.bundleURL
-        ]
-
-        for candidate in candidates {
-            guard let bundleURL = candidate?.appendingPathComponent("\(bundleName).bundle"),
-                  let bundle = Bundle(url: bundleURL) else {
-                continue
-            }
-            return bundle
-        }
-
-        return tokenBundle
-    }()
-}
-
-extension Color {
-    static func momoAsset(_ name: String) -> Color {
-        Color(name, bundle: MoMoUIKitsResources.bundle)
-    }
-}
+// Resource bundle lookup lives in Extensions/Color++.swift so existing Pods
+// projects that already include the color extension can resolve Color.momoAsset.

package/ios/Extensions/Color++.swift

@@ -1,6 +1,35 @@
 import SwiftUI
+import Foundation
+
+private final class MoMoUIKitsBundleToken {}
+
+enum MoMoUIKitsResources {
+    static let bundle: Bundle = {
+        let bundleName = "MoMoUIKitsResources"
+        let tokenBundle = Bundle(for: MoMoUIKitsBundleToken.self)
+        let candidates = [
+            Bundle.main.resourceURL,
+            tokenBundle.resourceURL,
+            tokenBundle.bundleURL
+        ]
+
+        for candidate in candidates {
+            guard let bundleURL = candidate?.appendingPathComponent("\(bundleName).bundle"),
+                  let bundle = Bundle(url: bundleURL) else {
+                continue
+            }
+            return bundle
+        }
+
+        return tokenBundle
+    }()
+}
 
 public extension Color {
+    static func momoAsset(_ name: String) -> Color {
+        Color(name, bundle: MoMoUIKitsResources.bundle)
+    }
+
     init(hex: UInt, alpha: Double = 1) {
         self.init(
             .sRGB,

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.162.2-sp.6'
+  s.version          = '0.162.2-sp.7'
   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.162.2-sp.6'
+  s.version          = '0.162.2-sp.7'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/Home.swift

@@ -97,9 +97,20 @@ public struct HomeView: View {
     // forwarded into the content for filtering.
     @State private var searchText = ""
     private let onOpenCompose: () -> Void
+    private let applicationContext: MiniAppContext?
+    private let composeApi: KitComposeApi?
+    private let config: KitConfig?
 
-    public init(onOpenCompose: @escaping () -> Void = {}) {
+    public init(
+        onOpenCompose: @escaping () -> Void = {},
+        applicationContext: MiniAppContext? = nil,
+        composeApi: KitComposeApi? = nil,
+        config: KitConfig? = nil
+    ) {
         self.onOpenCompose = onOpenCompose
+        self.applicationContext = applicationContext
+        self.composeApi = composeApi
+        self.config = config
     }
 
     public var body: some View {
@@ -182,7 +193,10 @@ public struct HomeView: View {
                     position: .right,
                     bottomPadding: nil
                 )
-            )
+            ),
+            applicationContext: applicationContext,
+            composeApi: composeApi,
+            config: config
         )
     }
 }

package/ios-demo/Sources/MoMoUIKitsDemo/SwiftUIDemoBrowserView.swift

@@ -9,15 +9,15 @@ struct SwiftUIDemoBrowserView: View {
     var body: some View {
         Group {
             if #available(iOS 16.0, *) {
-                HomeView(onOpenCompose: onOpenCompose)
+                HomeView(
+                    onOpenCompose: onOpenCompose,
+                    applicationContext: context.miniAppContext
+                )
             } else {
                 fallbackBrowser
             }
         }
         .environment(\.appTheme, defaultTheme)
-        .environmentObject(
-            ApplicationEnvironment(applicationContext: context.miniAppContext)
-        )
     }
 
     private var fallbackBrowser: some View {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.2-sp.6-debug",
+  "version": "0.162.2-sp.7-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},