update iOS screenshots (#602)

aanorbel · web-flow · commit 443b5685367d · 2025-03-26T16:33:52.000+01:00
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -336,10 +336,6 @@ tasks.register("copyBrandingToCommonResources") {
             from = File(projectDir, "src/${config.folder}/res"),
             to = File(projectDir, "src/commonMain/res"),
         )
-        copyRecursive(
-            from = File(projectDir, "src/${config.folder}/resources"),
-            to = File(projectDir, "src/commonMain/resources"),
-        )
         copyRecursive(
             from = File(projectDir, "src/${config.folder}/composeResources"),
             to = File(projectDir, "src/commonMain/composeResources"),
diff --git a/composeApp/src/commonMain/composeResources/files/assets/.gitignore b/composeApp/src/commonMain/composeResources/files/assets/.gitignore
@@ -0,0 +1,2 @@
+
+descriptors.json
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/navigation/BottomNavigationBar.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/navigation/BottomNavigationBar.kt
@@ -10,6 +10,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
@@ -57,7 +58,7 @@ fun BottomNavigationBar(navController: NavController) {
                     indicatorColor = MaterialTheme.colorScheme.primaryContainer,
                     selectedIconColor = MaterialTheme.colorScheme.onPrimaryContainer,
                 ),
-                modifier = customMinHeightModifier,
+                modifier = customMinHeightModifier.testTag(screen.route),
             )
         }
     }
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/onboarding/OnboardingQuiz.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/onboarding/OnboardingQuiz.kt
@@ -23,6 +23,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
@@ -147,7 +148,8 @@ private fun Quiz(
                     ),
                     modifier = Modifier
                         .height(52.dp)
-                        .weight(1f),
+                        .weight(1f)
+                        .testTag("Quiz-True"),
                 ) {
                     Text(
                         stringResource(Res.string.Onboarding_PopQuiz_True),
diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/settings/SettingsScreen.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/settings/SettingsScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import ooniprobe.composeapp.generated.resources.Res
 import ooniprobe.composeapp.generated.resources.Settings_Title
@@ -38,7 +39,7 @@ fun SettingsScreen(
                 SettingsItemView(
                     icon = item.icon,
                     title = item.title,
-                    modifier = Modifier.clickable {
+                    modifier = Modifier.testTag(item.route.value).clickable {
                         onEvent(
                             SettingsViewModel.Event.SettingsCategoryClick(
                                 item.route,
diff --git a/composeApp/src/dwMain/composeResources/files/assets/descriptors.json b/composeApp/src/dwMain/composeResources/files/assets/descriptors.json
diff --git a/composeApp/src/dwMain/kotlin/org/ooni/probe/domain/GetBootstrapTestDescriptors.kt b/composeApp/src/dwMain/kotlin/org/ooni/probe/domain/GetBootstrapTestDescriptors.kt
@@ -3,6 +3,7 @@ package org.ooni.probe.domain
 import co.touchlab.kermit.Logger
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
+import ooniprobe.composeapp.generated.resources.Res
 import org.ooni.engine.models.OONIRunDescriptor
 import org.ooni.engine.models.toModel
 import org.ooni.probe.data.models.InstalledTestDescriptorModel
@@ -15,7 +16,8 @@ class GetBootstrapTestDescriptors(
 ) {
     suspend operator fun invoke(): List<InstalledTestDescriptorModel> =
         withContext(backgroundContext) {
-            val descriptorsJson = readAssetFile("descriptors.json")
+
+            val descriptorsJson = Res.readBytes("files/assets/descriptors.json").decodeToString()
             val descriptors =
                 try {
                     json.decodeFromString<List<OONIRunDescriptor>>(descriptorsJson)
diff --git a/composeApp/src/iosMain/kotlin/org/ooni/probe/SetupDependencies.kt b/composeApp/src/iosMain/kotlin/org/ooni/probe/SetupDependencies.kt
@@ -24,6 +24,7 @@ import org.ooni.probe.data.models.InstalledTestDescriptorModel
 import org.ooni.probe.data.models.PlatformAction
 import org.ooni.probe.data.models.RunSpecification
 import org.ooni.probe.di.Dependencies
+import org.ooni.probe.domain.PreferenceMigration
 import org.ooni.probe.shared.Platform
 import org.ooni.probe.shared.PlatformInfo
 import platform.BackgroundTasks.BGProcessingTask
@@ -155,6 +156,7 @@ class SetupDependencies(
             producePath = {
                 filesDir() + "/${Dependencies.Companion.DATA_STORE_FILE_NAME}"
             },
+            migrations = listOf(PreferenceMigration),
         )
 
     private fun launchAction(action: PlatformAction): Boolean {
diff --git a/composeApp/src/iosMain/kotlin/org/ooni/probe/domain/PreferenceMigration.kt b/composeApp/src/iosMain/kotlin/org/ooni/probe/domain/PreferenceMigration.kt
@@ -0,0 +1,65 @@
+package org.ooni.probe.domain
+
+import androidx.datastore.core.DataMigration
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.floatPreferencesKey
+import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.longPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
+import co.touchlab.kermit.Logger
+import org.ooni.probe.data.models.SettingsKey
+import platform.Foundation.NSBundle
+import platform.Foundation.NSUserDefaults
+
+object PreferenceMigration : DataMigration<Preferences> {
+    override suspend fun cleanUp() {
+        NSBundle.mainBundle.bundleIdentifier?.let { NSUserDefaults.standardUserDefaults.removePersistentDomainForName(it) }
+    }
+
+    override suspend fun shouldMigrate(currentData: Preferences): Boolean {
+        return NSUserDefaults.standardUserDefaults.dictionaryRepresentation().containsKey(
+            SettingsKey.FIRST_RUN.value,
+        ) && currentData.asMap().isEmpty()
+    }
+
+    override suspend fun migrate(currentData: Preferences): Preferences {
+        val newPreferences = currentData.toMutablePreferences()
+
+        newPreferences[booleanPreferencesKey(SettingsKey.FIRST_RUN.value)] =
+            NSUserDefaults.standardUserDefaults.boolForKey(SettingsKey.FIRST_RUN.value)
+
+        (
+            listOf(
+                SettingsKey.NOTIFICATIONS_ENABLED to true,
+                SettingsKey.SEND_CRASH to true,
+                SettingsKey.UPLOAD_RESULTS to true,
+                SettingsKey.AUTOMATED_TESTING_ENABLED to true,
+                SettingsKey.AUTOMATED_TESTING_WIFIONLY to true,
+                SettingsKey.AUTOMATED_TESTING_CHARGING to true,
+            ) +
+                organizationPreferenceDefaults()
+        ).forEach { (settingsKey, value) ->
+            when (value) {
+                is Int -> newPreferences[intPreferencesKey(settingsKey.value)] = value
+
+                is String -> newPreferences[stringPreferencesKey(settingsKey.value)] = value
+
+                is Boolean -> newPreferences[booleanPreferencesKey(settingsKey.value)] = value
+
+                is Float -> newPreferences[floatPreferencesKey(settingsKey.value)] = value
+
+                is Long -> newPreferences[longPreferencesKey(settingsKey.value)] = value
+            }
+        }
+
+        NSUserDefaults.standardUserDefaults.arrayForKey("categories_disabled")
+            ?.let { disabledCategories ->
+                disabledCategories.mapNotNull { it as? String }.forEach { category ->
+                    newPreferences[booleanPreferencesKey(category)] = false
+                }
+            } ?: Logger.w("'categories_disabled' key not found in NSUserDefaults")
+
+        return newPreferences
+    }
+}
diff --git a/composeApp/src/ooniMain/composeResources/files/assets/descriptors.json b/composeApp/src/ooniMain/composeResources/files/assets/descriptors.json
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -264,7 +264,7 @@ platform :ios do
             scheme: "#{scheme}UITests",
             test_target_name: scheme,
             erase_simulator: true,
-            languages: locales,
+            #languages: locales,
             override_status_bar_arguments: "--time 12:00 --batteryState charging",
         )
     end
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -23,8 +23,6 @@
 		79FBD00F2C5A70AF004E041C /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
 		79FBD0132C5A70AF004E041C /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
 		79FBD0142C5A70AF004E041C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
-		93D3BF652C6B70AD00E9A9B7 /* descriptors.json in Resources */ = {isa = PBXBuildFile; fileRef = 93D3BF602C6B70AD00E9A9B7 /* descriptors.json */; };
-		93D3BF662C6B70AD00E9A9B7 /* descriptors.json in Resources */ = {isa = PBXBuildFile; fileRef = 93D3BF602C6B70AD00E9A9B7 /* descriptors.json */; };
 		93E977712C4FCCE3009CCABC /* IosOonimkallBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93E977702C4FCCE3009CCABC /* IosOonimkallBridge.swift */; };
 		A0BFEE644239A9C4B4F518F9 /* Pods_NewsMediaScan.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D64CB7120DD6292730C16110 /* Pods_NewsMediaScan.framework */; };
 		A63D4DAB2DEF80E322CD2A82 /* Pods_OONIProbe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD59ED7E2702C84FF0455021 /* Pods_OONIProbe.framework */; };
@@ -38,20 +36,6 @@
 			remoteGlobalIDString = 7555FF7A242A565900829871;
 			remoteInfo = OONIProbe;
 		};
-		7746A3E72D7ED04F00C007B6 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7555FF73242A565900829871 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 79FBD0092C5A70AF004E041C;
-			remoteInfo = NewsMediaScan;
-		};
-		7746A46C2D80383D00C007B6 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 7555FF73242A565900829871 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 7555FF7A242A565900829871;
-			remoteInfo = OONIProbe;
-		};
 		7746A46E2D80383D00C007B6 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7555FF73242A565900829871 /* Project object */;
@@ -333,7 +317,6 @@
 			);
 			dependencies = (
 				7746A3E32D7D895200C007B6 /* PBXTargetDependency */,
-				7746A3E82D7ED04F00C007B6 /* PBXTargetDependency */,
 			);
 			fileSystemSynchronizedGroups = (
 				7746A3DD2D7D895200C007B6 /* iosAppUITests */,
@@ -356,7 +339,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				7746A46B2D80383D00C007B6 /* PBXTargetDependency */,
 				7746A46D2D80383D00C007B6 /* PBXTargetDependency */,
 			);
 			fileSystemSynchronizedGroups = (
@@ -462,7 +444,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */,
-				93D3BF652C6B70AD00E9A9B7 /* descriptors.json in Resources */,
 				058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -494,7 +475,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				79FBD0132C5A70AF004E041C /* Preview Assets.xcassets in Resources */,
-				93D3BF662C6B70AD00E9A9B7 /* descriptors.json in Resources */,
 				79FBD0142C5A70AF004E041C /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -779,16 +759,6 @@
 			target = 7555FF7A242A565900829871 /* OONIProbe */;
 			targetProxy = 7746A3E22D7D895200C007B6 /* PBXContainerItemProxy */;
 		};
-		7746A3E82D7ED04F00C007B6 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 79FBD0092C5A70AF004E041C /* NewsMediaScan */;
-			targetProxy = 7746A3E72D7ED04F00C007B6 /* PBXContainerItemProxy */;
-		};
-		7746A46B2D80383D00C007B6 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 7555FF7A242A565900829871 /* OONIProbe */;
-			targetProxy = 7746A46C2D80383D00C007B6 /* PBXContainerItemProxy */;
-		};
 		7746A46D2D80383D00C007B6 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 79FBD0092C5A70AF004E041C /* NewsMediaScan */;
diff --git a/iosApp/iosApp/iOSApp.swift b/iosApp/iosApp/iOSApp.swift
@@ -16,6 +16,11 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                                           showAlertAfterCurrentVersionHasBeenReleasedForDays: 0)
         siren.wail()
 
+        let launchArguments = ProcessInfo.processInfo.arguments
+
+        if (launchArguments.contains("--skipOnboarding")){
+            UserDefaults.standard.set(false, forKey: "first_run") // skip onboarding
+        }
         return true
     }
 
diff --git a/iosApp/iosAppUITests/iosAppUITests.swift b/iosApp/iosAppUITests/iosAppUITests.swift

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import androidx.compose.material3.Text`
`10`	`10`	`import androidx.compose.runtime.Composable`
`11`	`11`	`import androidx.compose.runtime.getValue`
`12`	`12`	`import androidx.compose.ui.Modifier`
	`13`	`+import androidx.compose.ui.platform.testTag`
`13`	`14`	`import androidx.compose.ui.text.style.TextAlign`
`14`	`15`	`import androidx.compose.ui.unit.dp`
`15`	`16`	`import androidx.navigation.NavController`
`@@ -57,7 +58,7 @@ fun BottomNavigationBar(navController: NavController) {`
`57`	`58`	`indicatorColor = MaterialTheme.colorScheme.primaryContainer,`
`58`	`59`	`selectedIconColor = MaterialTheme.colorScheme.onPrimaryContainer,`
`59`	`60`	`),`
`60`		`- modifier = customMinHeightModifier,`
	`61`	`+ modifier = customMinHeightModifier.testTag(screen.route),`
`61`	`62`	`)`
`62`	`63`	`}`
`63`	`64`	`}`