[iOS] Add workaround for using Moko in tests and previews (#114)

JuliaJakubcova · web-flow · commit 26a21470027d · 2025-05-30T13:30:16.000+02:00
* [iOS] Add workaround for using Moko in tests and previews

* [iOS] Remove no longer needed hack for .module
diff --git a/android/shared/src/main/res/values-en/generated_strings.xml b/android/shared/src/main/res/values-en/generated_strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 1.1.2 -->
+<!-- Generated by Twine 1.1.3 -->
 <!-- Language: en -->
 <resources>
 	<!-- SECTION: General -->
@@ -249,9 +249,7 @@
 	<string name="recipe_tipkit_popover_tip_title">This tip is floating, you can define arrow anchors</string>
 	<string name="recipe_tipkit_popover_tip_message">This message is optional</string>
 	<string name="recipe_tipkit_rule_tip_title">This tip has rule that appears the tip after 3 taps on button</string>
-	<string name="recipe_tipkit_rule_tip_message">If you close the tip you will have to restart the app for appear tip
-		again
-	</string>
+	<string name="recipe_tipkit_rule_tip_message">If you close the tip you will have to restart the app for appear tip again</string>
 	<string name="recipe_tipkit_title">Example of TipKit</string>
 	<string name="recipe_tipkit_inline_tip">Inline tip</string>
 	<string name="recipe_tipkit_rule_tip">Rule tip</string>
diff --git a/android/shared/src/main/res/values-sk/generated_strings.xml b/android/shared/src/main/res/values-sk/generated_strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 1.1.2 -->
+<!-- Generated by Twine 1.1.3 -->
 <!-- Language: sk -->
 <resources>
 	<!-- SECTION: General -->
@@ -248,11 +248,8 @@
 	<string name="recipe_tipkit_inline_tip_message">Táto správa je nepovinná</string>
 	<string name="recipe_tipkit_popover_tip_title">Tento tip je plávajúci, môžete definovať kotvy šípok</string>
 	<string name="recipe_tipkit_popover_tip_message">Táto správa je nepovinná</string>
-	<string name="recipe_tipkit_rule_tip_title">Tento tip má pravidlo, že sa tip zobrazí po 3 ťuknutiach na tlačidlo
-	</string>
-	<string name="recipe_tipkit_rule_tip_message">Ak tip zatvoríte, budete musieť reštartovať aplikáciu, aby sa tip opäť
-		zobrazil
-	</string>
+	<string name="recipe_tipkit_rule_tip_title">Tento tip má pravidlo, že sa tip zobrazí po 3 ťuknutiach na tlačidlo</string>
+	<string name="recipe_tipkit_rule_tip_message">Ak tip zatvoríte, budete musieť reštartovať aplikáciu, aby sa tip opäť zobrazil</string>
 	<string name="recipe_tipkit_title">Príklady TipKita</string>
 	<string name="recipe_tipkit_inline_tip">Inline tip</string>
 	<string name="recipe_tipkit_rule_tip">Rule tip</string>
diff --git a/android/shared/src/main/res/values/generated_strings.xml b/android/shared/src/main/res/values/generated_strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 1.1.2 -->
+<!-- Generated by Twine 1.1.3 -->
 <!-- Language: cs -->
 <resources>
 	<!-- SECTION: General -->
@@ -248,11 +248,8 @@
 	<string name="recipe_tipkit_inline_tip_message">Tahle zpráva je nepovinná</string>
 	<string name="recipe_tipkit_popover_tip_title">Tento tip je plovoucí, můžete definovat kotvy šipek</string>
 	<string name="recipe_tipkit_popover_tip_message">Tahle zpráva je nepovinná</string>
-	<string name="recipe_tipkit_rule_tip_title">Tento tip má pravidlo, že se tip objeví po 3 klepnutích na tlačítko
-	</string>
-	<string name="recipe_tipkit_rule_tip_message">Pokud tip zavřete, budete muset aplikaci restartovat, aby se tip znovu
-		objevil.
-	</string>
+	<string name="recipe_tipkit_rule_tip_title">Tento tip má pravidlo, že se tip objeví po 3 klepnutích na tlačítko</string>
+	<string name="recipe_tipkit_rule_tip_message">Pokud tip zavřete, budete muset aplikaci restartovat, aby se tip znovu objevil.</string>
 	<string name="recipe_tipkit_title">Příklady TipKitu</string>
 	<string name="recipe_tipkit_inline_tip">Inline tip</string>
 	<string name="recipe_tipkit_rule_tip">Rule tip</string>
diff --git a/ios/PresentationLayer/Onboarding/Sources/Onboarding/Errors/ValidationError.swift b/ios/PresentationLayer/Onboarding/Sources/Onboarding/Errors/ValidationError.swift
@@ -13,13 +13,11 @@ extension ValidationError: LocalizedError {
         switch self {
         case .email(let reason):
             switch reason {
-            #warning("TODO: Use MR strings when issue [https://github.com/icerockdev/moko-resources/issues/714] is resolved")
-            case .isEmpty: "Invalid email format" // MR.strings().invalid_email.desc().localized()
+            case .isEmpty: return MR.strings().invalid_email.desc().localized()
             }
         case .password(let reason):
             switch reason {
-            #warning("TODO: Use MR strings when issue [https://github.com/icerockdev/moko-resources/issues/714] is resolved")
-            case .isEmpty: "Invalid password" // MR.strings().invalid_password.desc().localized()
+            case .isEmpty: return MR.strings().invalid_password.desc().localized()
             }
         }
     }
diff --git a/ios/PresentationLayer/Onboarding/Tests/OnboardingTests/LoginViewModelTests.swift b/ios/PresentationLayer/Onboarding/Tests/OnboardingTests/LoginViewModelTests.swift
@@ -102,10 +102,10 @@ final class LoginViewModelTests: XCTestCase {
     func testLoginInvalidPassword() async {
         let vm = createViewModel()
         let errorResult = AuthError.InvalidLoginCredentials(throwable: nil)
-        #warning("TODO: Use localizedMessage when issue [https://github.com/icerockdev/moko-resources/issues/714] is resolved")
+        fixMokoResourcesForTests() 
         loginUseCase.executeThrowableError = KmmLocalizedError(
             errorResult: errorResult,
-            localizedMessage: "" // errorResult.localizedMessage(nil)
+            localizedMessage: errorResult.localizedMessage(nil)
         )
         
         vm.onIntent(.changeEmail(LoginData.stubValid.email))
diff --git a/ios/PresentationLayer/Onboarding/Tests/OnboardingTests/RegistrationViewModelTests.swift b/ios/PresentationLayer/Onboarding/Tests/OnboardingTests/RegistrationViewModelTests.swift
@@ -30,6 +30,7 @@ final class RegistrationViewModelTests: XCTestCase {
     // MARK: Tests
 
     func testRegisterEmptyEmail() async {
+        fixMokoResourcesForTests()
         let vm = createViewModel()
         registrationUseCase.executeThrowableError = ValidationError.email(.isEmpty)
         
@@ -39,14 +40,13 @@ final class RegistrationViewModelTests: XCTestCase {
         await vm.awaitAllTasks()
         
         XCTAssert(!vm.state.isLoading)
-        #warning("TODO: Use MR strings when issue [https://github.com/icerockdev/moko-resources/issues/714] is resolved")
-        // XCTAssertEqual(vm.state.alert, AlertData(title: MR.strings().invalid_email.desc().localized()))
-        XCTAssertEqual(vm.state.alert, AlertData(title: "Invalid email format"))
+        XCTAssertEqual(vm.state.alert, AlertData(title: MR.strings().invalid_email.desc().localized()))
         XCTAssertEqual(fc.handleFlowValue, nil)
         XCTAssert(registrationUseCase.executeReceivedInvocations == [.stubEmptyEmail])
     }
     
     func testRegisterEmptyPassword() async {
+        fixMokoResourcesForTests()
         let vm = createViewModel()
         registrationUseCase.executeThrowableError = ValidationError.password(.isEmpty)
         
@@ -56,9 +56,7 @@ final class RegistrationViewModelTests: XCTestCase {
         await vm.awaitAllTasks()
         
         XCTAssert(!vm.state.isLoading)
-        #warning("TODO: Use MR strings when issue [https://github.com/icerockdev/moko-resources/issues/714] is resolved")
-        // XCTAssertEqual(vm.state.alert, AlertData(title: MR.strings().invalid_password.desc().localized()))
-        XCTAssertEqual(vm.state.alert, AlertData(title: "Invalid password"))
+        XCTAssertEqual(vm.state.alert, AlertData(title: MR.strings().invalid_password.desc().localized()))
         XCTAssertEqual(fc.handleFlowValue, nil)
         XCTAssert(registrationUseCase.executeReceivedInvocations == [.stubEmptyPassword])
     }
diff --git a/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Extensions/Bundle+Extensions.swift b/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Extensions/Bundle+Extensions.swift
diff --git a/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Extensions/BundleToken.swift b/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Extensions/BundleToken.swift
@@ -0,0 +1,8 @@
+//
+//  Created by Petr Chmelar on 30.05.2022
+//  Copyright © 2022 Matee. All rights reserved.
+//
+
+import Foundation
+
+private final class BundleToken {}
diff --git a/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Utilities/MokoFix.swift b/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Utilities/MokoFix.swift
@@ -0,0 +1,20 @@
+//
+//  Created by Julia Jakubcova on 23/09/2024
+//  Copyright © 2024 Matee. All rights reserved.
+//
+
+import DevstackKmpShared
+
+#warning("TODO: Remove this workaround when issue [https://github.com/icerockdev/moko-resources/issues/714] is resolved")
+public func fixMokoResourcesForTests() {
+    if ProcessInfo.processInfo.processName == "xctest" {
+        MokoResourcesPreviewWorkaroundKt.nsBundle = Bundle.init(for: KotlinBase.self)
+    }
+}
+
+#warning("TODO: Remove this workaround when issue [https://github.com/icerockdev/moko-resources/issues/714] is resolved")
+public func fixMokoResourcesForPreviews() {
+    if ProcessInfo.processInfo.processName == "XCPreviewAgent" {
+        MokoResourcesPreviewWorkaroundKt.nsBundle = Bundle.init(for: KotlinBase.self)
+    }
+}
diff --git a/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Utilities/Plurals.swift b/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Utilities/Plurals.swift
@@ -22,15 +22,15 @@ public enum Plurals: String {
     
     func stringForCount(_ count: Int) -> String {
         if count == 0 { // swiftlint:disable:this empty_count
-            return String(format: NSLocalizedString("zero_\(rawValue)", bundle: .myModule, comment: ""), count)
+            return String(format: NSLocalizedString("zero_\(rawValue)", bundle: .module, comment: ""), count)
         } else if abs(count) == 1 {
-            return String(format: NSLocalizedString("one_\(rawValue)", bundle: .myModule, comment: ""), count)
+            return String(format: NSLocalizedString("one_\(rawValue)", bundle: .module, comment: ""), count)
         } else if abs(count) > 1 && abs(count) < 5 {
-            return String(format: NSLocalizedString("few_\(rawValue)", bundle: .myModule, comment: ""), count)
+            return String(format: NSLocalizedString("few_\(rawValue)", bundle: .module, comment: ""), count)
         } else if abs(count) >= 5 {
-            return String(format: NSLocalizedString("many_\(rawValue)", bundle: .myModule, comment: ""), count)
+            return String(format: NSLocalizedString("many_\(rawValue)", bundle: .module, comment: ""), count)
         } else {
-            return String(format: NSLocalizedString("other_\(rawValue)", bundle: .myModule, comment: ""), count)
+            return String(format: NSLocalizedString("other_\(rawValue)", bundle: .module, comment: ""), count)
         }
     }
 }
diff --git a/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/swiftgen-strings.stencil b/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/swiftgen-strings.stencil
@@ -3,7 +3,6 @@
 // Revision: 7e13d641745b56775d9a7f983a5468d2d9952ada
 
 // Modifications:
-// - Use `.myModule` [workaround](https://developer.apple.com/forums/thread/664295) to address SwiftUI Previews crashes
 // - Use snake_case instead of camelCase, this is done by changing `swiftIdentifier:"pretty"` to `swiftIdentifier`
 // - Ability to change localization via Environment.localization
 
@@ -102,7 +101,7 @@ extension {{enumName}} {
 private final class BundleToken {
   static let bundle: Bundle = {
     #if SWIFT_PACKAGE
-    return Bundle.myModule
+    return Bundle.module
     #else
     return Bundle(for: BundleToken.self)
     #endif
diff --git a/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/swiftgen-xcassets.stencil b/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/swiftgen-xcassets.stencil
@@ -3,7 +3,6 @@
 // Revision: 937d05fa32ff389c63f93f0f9e2919d2c461b3c9
 
 // Modifications:
-// - Use `.myModule` [workaround](https://developer.apple.com/forums/thread/664295) to address SwiftUI Previews crashes
 // - Ensure SwiftUI-first behavior for colors by renaming `.color` to `.uiColor` and `.swiftUIColor` to `.color`
 // - Ensure SwiftUI-first behavior for images by renaming `.image` to `.uiImage` and `.swiftUIImage` to `.image`
 
@@ -433,7 +432,7 @@
 private final class BundleToken {
   static let bundle: Bundle = {
     #if SWIFT_PACKAGE
-    return Bundle.myModule
+    return Bundle.module
     #else
     return Bundle(for: BundleToken.self)
     #endif
diff --git a/shared/src/commonMain/resources/MR/base/strings.xml b/shared/src/commonMain/resources/MR/base/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 1.1.2 -->
+<!-- Generated by Twine 1.1.3 -->
 <!-- Language: en -->
 <resources>
 	<!-- SECTION: General -->
diff --git a/shared/src/commonMain/resources/MR/cs/strings.xml b/shared/src/commonMain/resources/MR/cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 1.1.2 -->
+<!-- Generated by Twine 1.1.3 -->
 <!-- Language: cs -->
 <resources>
 	<!-- SECTION: General -->
diff --git a/shared/src/commonMain/resources/MR/sk/strings.xml b/shared/src/commonMain/resources/MR/sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Android Strings File -->
-<!-- Generated by Twine 1.1.2 -->
+<!-- Generated by Twine 1.1.3 -->
 <!-- Language: sk -->
 <resources>
 	<!-- SECTION: General -->
diff --git a/shared/src/iosMain/kotlin/dev/icerock/moko/resources/utils/MokoResourcesPreviewWorkaround.kt b/shared/src/iosMain/kotlin/dev/icerock/moko/resources/utils/MokoResourcesPreviewWorkaround.kt
@@ -0,0 +1,38 @@
+package dev.icerock.moko.resources.utils // must be same as in moko-resources to override method
+
+import platform.Foundation.NSBundle
+import platform.Foundation.NSDirectoryEnumerator
+import platform.Foundation.NSFileManager
+import platform.Foundation.NSURL
+import platform.Foundation.pathExtension
+
+/**
+ * Workaround by MAX-POLKOVNIK from https://github.com/icerockdev/moko-resources/issues/747#issuecomment-2330854244
+ * Remove when https://github.com/icerockdev/moko-resources/issues/747 is resolved
+ */
+
+var nsBundle: NSBundle = NSBundle.mainBundle // <-- this is where we should looking for resources, by default mainBundle
+
+fun NSBundle.Companion.loadableBundle(identifier: String): NSBundle {
+    val bundlePath: String = nsBundle.bundlePath // <-- path where we should search for bundle with resources
+    val enumerator: NSDirectoryEnumerator = requireNotNull(NSFileManager.defaultManager.enumeratorAtPath(bundlePath))
+    while (true) {
+        val relativePath: String = enumerator.nextObject() as? String ?: break
+        val url = NSURL(fileURLWithPath = relativePath)
+        if (url.pathExtension == "bundle") {
+            val fullPath = "$bundlePath/$relativePath"
+            val foundedBundle: NSBundle? = NSBundle.bundleWithPath(fullPath)
+            val loadedIdentifier: String? = foundedBundle?.bundleIdentifier
+
+            if (isBundleSearchLogEnabled) {
+                println("moko-resources auto-load bundle with identifier $loadedIdentifier at path $fullPath")
+            }
+
+            if (foundedBundle?.bundleIdentifier == identifier) return foundedBundle
+        }
+    }
+
+    throw IllegalArgumentException("bundle with identifier $identifier not found")
+}
+
+var isBundleSearchLogEnabled = false

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,11 @@ extension ValidationError: LocalizedError {`
`13`	`13`	`switch self {`
`14`	`14`	`case .email(let reason):`
`15`	`15`	`switch reason {`
`16`		`- #warning("TODO: Use MR strings when issue [https://github.com/icerockdev/moko-resources/issues/714] is resolved")`
`17`		`- case .isEmpty: "Invalid email format" // MR.strings().invalid_email.desc().localized()`
	`16`	`+ case .isEmpty: return MR.strings().invalid_email.desc().localized()`
`18`	`17`	`}`
`19`	`18`	`case .password(let reason):`
`20`	`19`	`switch reason {`
`21`		`- #warning("TODO: Use MR strings when issue [https://github.com/icerockdev/moko-resources/issues/714] is resolved")`
`22`		`- case .isEmpty: "Invalid password" // MR.strings().invalid_password.desc().localized()`
	`20`	`+ case .isEmpty: return MR.strings().invalid_password.desc().localized()`
`23`	`21`	`}`
`24`	`22`	`}`
`25`	`23`	`}`