Merge pull request 'chore/mock-multiplatform' (#86) from chore/mock-multiplatform into master

Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/86

.drone.yml

@@ -11,7 +11,7 @@ steps:
       - ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\""
       - echo "---------------------------------------------------------"
       - echo "Building..."
-      - ./gradlew :androidApp:build -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
+      - ./gradlew build -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
       - echo "---------------------------------------------------------"
       - echo "Testing..."
       - echo "---------------------------------------------------------"

androidApp/build.gradle.kts

@@ -58,7 +58,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    compileSdk = 31
+    compileSdk = 32
     buildToolsVersion = "31.0.0"
     buildFeatures {
         viewBinding = true
@@ -66,7 +66,7 @@ android {
     defaultConfig {
         applicationId = "bou.amine.apps.readerforselfossv2.android"
         minSdk = 21
-        targetSdk = 31
+        targetSdk = 32
         versionCode = versionCodeFromGit()
         versionName = versionNameFromGit()
 
@@ -79,6 +79,11 @@ android {
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+    packagingOptions {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
     buildTypes {
         getByName("release") {
             isMinifyEnabled = true
@@ -98,9 +103,6 @@ android {
             dimension = "build"
         }
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
     namespace = "bou.amine.apps.readerforselfossv2.android"
 
 }
@@ -114,13 +116,6 @@ dependencies {
 
     implementation("androidx.preference:preference-ktx:1.1.1")
 
-    // Testing
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0-alpha02")
-    androidTestImplementation("androidx.test:runner:1.3.1-alpha02")
-    // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
-    androidTestImplementation("androidx.test.espresso:espresso-contrib:3.4.0-alpha02")
-    // Espresso-intents for validation and stubbing of Intents
-    androidTestImplementation("androidx.test.espresso:espresso-intents:3.4.0-alpha02")
     implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))
 
     // Android Support
@@ -188,9 +183,6 @@ dependencies {
 
     implementation("androidx.core:core-ktx:1.8.0")
 
-    // implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
-    // implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
-    // implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
 
     // Network information
@@ -198,4 +190,23 @@ dependencies {
 
     // SQLDELIGHT
     implementation("com.squareup.sqldelight:android-driver:1.5.3")
+
+    //test
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("io.mockk:mockk:1.12.0")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+}
+
+tasks.withType<Test> {
+    outputs.upToDateWhen { false }
+    useJUnit()
+    testLogging {
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+        events = setOf(
+            org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED,
+            org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED,
+            org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR
+        )
+        showStandardStreams = true
+    }
 }

androidApp/proguard-rules.pro

@@ -90,3 +90,5 @@
 # @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
 -keepattributes RuntimeVisibleAnnotations,AnnotationDefault
 
+-dontwarn io.mockk.**
+-keep class io.mockk.** { *; }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt

@@ -93,6 +93,9 @@ class LoginActivity : AppCompatActivity(), DIAware {
     }
 
     private fun goToMain() {
+        CoroutineScope(Dispatchers.Main).launch {
+            repository.updateApiVersion()
+        }
         val intent = Intent(this, HomeActivity::class.java)
         startActivity(intent)
         finish()

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt

@@ -14,6 +14,7 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
 import androidx.preference.PreferenceManager
 import bou.amine.apps.readerforselfossv2.DI.networkModule
+import bou.amine.apps.readerforselfossv2.android.utils.network.isNetworkAccessible
 import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
 import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
@@ -28,6 +29,7 @@ import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import org.kodein.di.*
 
@@ -37,7 +39,7 @@ class MyApp : MultiDexApplication(), DIAware {
         import(networkModule)
         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
-        bind<Repository>() with singleton { Repository(instance(), instance(), connectivityStatus, instance()) }
+        bind<Repository>() with singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
         bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
         bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
     }
@@ -47,6 +49,9 @@ class MyApp : MultiDexApplication(), DIAware {
     private val connectivityStatus: ConnectivityStatus by instance()
     private val driverFactory: DriverFactory by instance()
 
+    // TODO: handle with the "previous" way
+    private val isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(true)
+
     override fun onCreate() {
         super.onCreate()
         Napier.base(DebugAntilog())

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt

@@ -354,6 +354,7 @@ class ArticleFragment : Fragment(), DIAware {
         binding.webcontent.settings.javaScriptEnabled = false
 
         binding.webcontent.webViewClient = object : WebViewClient() {
+            @Deprecated("Deprecated in Java")
             override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
                 if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
                     requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
@@ -361,6 +362,7 @@ class ArticleFragment : Fragment(), DIAware {
                 return true
             }
 
+            @Deprecated("Deprecated in Java")
             override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
                 val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
                 if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {

build.gradle.kts

@@ -1,21 +1,19 @@
 buildscript {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
-        classpath("com.android.tools.build:gradle:7.3.0")
-
-        // sonarquve
-        classpath("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513")
-
         // SqlDelight
         classpath("com.squareup.sqldelight:gradle-plugin:1.5.3")
     }
 }
 
+plugins {
+    //trick: for the same plugin versions in all sub-modules
+    id("com.android.application").version("7.3.1").apply(false)
+    id("com.android.library").version("7.3.1").apply(false)
+    kotlin("android").version("1.7.20").apply(false)
+    kotlin("multiplatform").version("1.7.20").apply(false)
+    id("org.sonarqube").version("3.4.0.2513").apply(false)
+}
+
 apply(plugin = "org.sonarqube")
 
 allprojects {
@@ -27,6 +25,7 @@ allprojects {
     }
 }
 
+
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }

gradle.properties

@@ -11,14 +11,27 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Tue Mar 22 16:50:00 CET 2022
+#Gradle
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+
+#Kotlin
 kotlin.code.style=official
-kotlin.mpp.enableCInteropCommonization=true
+
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+#Android
-kotlin.native.enableDependencyPropagation=false
 android.useAndroidX=true
+kotlin.native.enableDependencyPropagation=false
+#android.nonTransitiveRClass=true
 android.enableJetifier=true
+
+
+#MPP
+kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.enableGranularSourceSetsMetadata=true
+
+
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
+kotlin.native.cacheKind.iosX64=none
 pushCache=true
+

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -1,383 +1,383 @@
-    // !$*UTF8*$!
+// !$*UTF8*$!
-    {
+{
-    	archiveVersion = 1;
+	archiveVersion = 1;
-    	classes = {
+	classes = {
-    	};
+	};
-    	objectVersion = 50;
+	objectVersion = 50;
-    	objects = {
+	objects = {
 
-    /* Begin PBXBuildFile section */
+/* Begin PBXBuildFile section */
-058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
+		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
-058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
+		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
-    		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
+		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
-    		7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
+		7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
-    /* End PBXBuildFile section */
+/* End PBXBuildFile section */
 
-    /* Begin PBXCopyFilesBuildPhase section */
+/* Begin PBXCopyFilesBuildPhase section */
-    		7555FFB4242A642300829871 /* Embed Frameworks */ = {
+		7555FFB4242A642300829871 /* Embed Frameworks */ = {
-    			isa = PBXCopyFilesBuildPhase;
+			isa = PBXCopyFilesBuildPhase;
-    			buildActionMask = 2147483647;
+			buildActionMask = 2147483647;
-    			dstPath = "";
+			dstPath = "";
-    			dstSubfolderSpec = 10;
+			dstSubfolderSpec = 10;
-    			files = (
+			files = (
-    			);
+			);
-    			name = "Embed Frameworks";
+			name = "Embed Frameworks";
-    			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 0;
-    		};
+		};
-    /* End PBXCopyFilesBuildPhase section */
+/* End PBXCopyFilesBuildPhase section */
 
-    /* Begin PBXFileReference section */
+/* Begin PBXFileReference section */
-    		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
+		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
-    		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
+		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
-    		7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
-    		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
-    		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-    /* End PBXFileReference section */
+/* End PBXFileReference section */
 
-    /* Begin PBXFrameworksBuildPhase section */
+/* Begin PBXFrameworksBuildPhase section */
-    		7555FF78242A565900829871 /* Frameworks */ = {
+		7555FF78242A565900829871 /* Frameworks */ = {
-    			isa = PBXFrameworksBuildPhase;
+			isa = PBXFrameworksBuildPhase;
-    			buildActionMask = 2147483647;
+			buildActionMask = 2147483647;
-    			files = (
+			files = (
-    			);
+			);
-    			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 0;
-    		};
+		};
-    /* End PBXFrameworksBuildPhase section */
+/* End PBXFrameworksBuildPhase section */
 
-    /* Begin PBXGroup section */
+/* Begin PBXGroup section */
-    		058557D7273AAEEB004C7B11 /* Preview Content */ = {
+		058557D7273AAEEB004C7B11 /* Preview Content */ = {
-	isa = PBXGroup;
+			isa = PBXGroup;
-	children = (
+			children = (
-		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */,
+				058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */,
-	);
+			);
-	path = "Preview Content";
+			path = "Preview Content";
-	sourceTree = "<group>";
+			sourceTree = "<group>";
-};
+		};
-    		7555FF72242A565900829871 = {
+		7555FF72242A565900829871 = {
-    			isa = PBXGroup;
+			isa = PBXGroup;
-    			children = (
+			children = (
-    				7555FF7D242A565900829871 /* iosApp */,
+				7555FF7D242A565900829871 /* iosApp */,
-    				7555FF7C242A565900829871 /* Products */,
+				7555FF7C242A565900829871 /* Products */,
-    				7555FFB0242A642200829871 /* Frameworks */,
+				7555FFB0242A642200829871 /* Frameworks */,
-    			);
+			);
-    			sourceTree = "<group>";
+			sourceTree = "<group>";
-    		};
+		};
-    		7555FF7C242A565900829871 /* Products */ = {
+		7555FF7C242A565900829871 /* Products */ = {
-    			isa = PBXGroup;
+			isa = PBXGroup;
-    			children = (
+			children = (
-    				7555FF7B242A565900829871 /* iosApp.app */,
+				7555FF7B242A565900829871 /* iosApp.app */,
-    			);
+			);
-    			name = Products;
+			name = Products;
-    			sourceTree = "<group>";
+			sourceTree = "<group>";
-    		};
+		};
-    		7555FF7D242A565900829871 /* iosApp */ = {
+		7555FF7D242A565900829871 /* iosApp */ = {
-    			isa = PBXGroup;
+			isa = PBXGroup;
-    			children = (
+			children = (
-    				058557BA273AAA24004C7B11 /* Assets.xcassets */,
+				058557BA273AAA24004C7B11 /* Assets.xcassets */,
-    				7555FF82242A565900829871 /* ContentView.swift */,
+				7555FF82242A565900829871 /* ContentView.swift */,
-    				7555FF8C242A565B00829871 /* Info.plist */,
+				7555FF8C242A565B00829871 /* Info.plist */,
-    				2152FB032600AC8F00CF470E /* iOSApp.swift */,
+				2152FB032600AC8F00CF470E /* iOSApp.swift */,
-		058557D7273AAEEB004C7B11 /* Preview Content */,
+				058557D7273AAEEB004C7B11 /* Preview Content */,
-    			);
+			);
-    			path = iosApp;
+			path = iosApp;
-    			sourceTree = "<group>";
+			sourceTree = "<group>";
-    		};
+		};
-    		7555FFB0242A642200829871 /* Frameworks */ = {
+		7555FFB0242A642200829871 /* Frameworks */ = {
-    			isa = PBXGroup;
+			isa = PBXGroup;
-    			children = (
+			children = (
-    			);
+			);
-    			name = Frameworks;
+			name = Frameworks;
-    			sourceTree = "<group>";
+			sourceTree = "<group>";
-    		};
+		};
-    /* End PBXGroup section */
+/* End PBXGroup section */
 
-    /* Begin PBXNativeTarget section */
+/* Begin PBXNativeTarget section */
-    		7555FF7A242A565900829871 /* iosApp */ = {
+		7555FF7A242A565900829871 /* iosApp */ = {
-    			isa = PBXNativeTarget;
+			isa = PBXNativeTarget;
-    			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */;
+			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */;
-    			buildPhases = (
+			buildPhases = (
-    				7555FFB5242A651A00829871 /* ShellScript */,
+				7555FFB5242A651A00829871 /* ShellScript */,
-    				7555FF77242A565900829871 /* Sources */,
+				7555FF77242A565900829871 /* Sources */,
-    				7555FF78242A565900829871 /* Frameworks */,
+				7555FF78242A565900829871 /* Frameworks */,
-    				7555FF79242A565900829871 /* Resources */,
+				7555FF79242A565900829871 /* Resources */,
-    				7555FFB4242A642300829871 /* Embed Frameworks */,
+				7555FFB4242A642300829871 /* Embed Frameworks */,
-    			);
+			);
-    			buildRules = (
+			buildRules = (
-    			);
+			);
-    			dependencies = (
+			dependencies = (
-    			);
+			);
-    			name = iosApp;
+			name = iosApp;
-    			productName = iosApp;
+			productName = iosApp;
-    			productReference = 7555FF7B242A565900829871 /* iosApp.app */;
+			productReference = 7555FF7B242A565900829871 /* iosApp.app */;
-    			productType = "com.apple.product-type.application";
+			productType = "com.apple.product-type.application";
-    		};
+		};
-    /* End PBXNativeTarget section */
+/* End PBXNativeTarget section */
 
-    /* Begin PBXProject section */
+/* Begin PBXProject section */
-    		7555FF73242A565900829871 /* Project object */ = {
+		7555FF73242A565900829871 /* Project object */ = {
-    			isa = PBXProject;
+			isa = PBXProject;
-    			attributes = {
+			attributes = {
-    				LastSwiftUpdateCheck = 1130;
+				LastSwiftUpdateCheck = 1130;
-    				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1130;
-    				ORGANIZATIONNAME = orgName;
+				ORGANIZATIONNAME = orgName;
-    				TargetAttributes = {
+				TargetAttributes = {
-    					7555FF7A242A565900829871 = {
+					7555FF7A242A565900829871 = {
-    						CreatedOnToolsVersion = 11.3.1;
+						CreatedOnToolsVersion = 11.3.1;
-    					};
+					};
-    				};
+				};
-    			};
+			};
-    			buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */;
+			buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */;
-    			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 9.3";
-    			developmentRegion = en;
+			developmentRegion = en;
-    			hasScannedForEncodings = 0;
+			hasScannedForEncodings = 0;
-    			knownRegions = (
+			knownRegions = (
-    				en,
+				en,
-    				Base,
+				Base,
-    			);
+			);
-    			mainGroup = 7555FF72242A565900829871;
+			mainGroup = 7555FF72242A565900829871;
-    			productRefGroup = 7555FF7C242A565900829871 /* Products */;
+			productRefGroup = 7555FF7C242A565900829871 /* Products */;
-    			projectDirPath = "";
+			projectDirPath = "";
-    			projectRoot = "";
+			projectRoot = "";
-    			targets = (
+			targets = (
-    				7555FF7A242A565900829871 /* iosApp */,
+				7555FF7A242A565900829871 /* iosApp */,
-    			);
+			);
-    		};
+		};
-    /* End PBXProject section */
+/* End PBXProject section */
 
-    /* Begin PBXResourcesBuildPhase section */
+/* Begin PBXResourcesBuildPhase section */
-    		7555FF79242A565900829871 /* Resources */ = {
+		7555FF79242A565900829871 /* Resources */ = {
-    			isa = PBXResourcesBuildPhase;
+			isa = PBXResourcesBuildPhase;
-    			buildActionMask = 2147483647;
+			buildActionMask = 2147483647;
-    			files = (
+			files = (
-		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */,
+				058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */,
-		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */,
+				058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */,
-    			);
+			);
-    			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 0;
-    		};
+		};
-    /* End PBXResourcesBuildPhase section */
+/* End PBXResourcesBuildPhase section */
 
-    /* Begin PBXShellScriptBuildPhase section */
+/* Begin PBXShellScriptBuildPhase section */
-    		7555FFB5242A651A00829871 /* ShellScript */ = {
+		7555FFB5242A651A00829871 /* ShellScript */ = {
-    			isa = PBXShellScriptBuildPhase;
+			isa = PBXShellScriptBuildPhase;
-    			buildActionMask = 2147483647;
+			buildActionMask = 2147483647;
-    			files = (
+			files = (
-    			);
+			);
-    			inputFileListPaths = (
+			inputFileListPaths = (
-    			);
+			);
-    			inputPaths = (
+			inputPaths = (
-    			);
+			);
-    			outputFileListPaths = (
+			outputFileListPaths = (
-    			);
+			);
-    			outputPaths = (
+			outputPaths = (
-    			);
+			);
-    			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 0;
-    			shellPath = /bin/sh;
+			shellPath = /bin/sh;
-    			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
+			shellScript = "cd \"$SRCROOT/..\"\n./gradlew :shared:embedAndSignAppleFrameworkForXcode\n";
-    		};
+		};
-    /* End PBXShellScriptBuildPhase section */
+/* End PBXShellScriptBuildPhase section */
 
-    /* Begin PBXSourcesBuildPhase section */
+/* Begin PBXSourcesBuildPhase section */
-    		7555FF77242A565900829871 /* Sources */ = {
+		7555FF77242A565900829871 /* Sources */ = {
-    			isa = PBXSourcesBuildPhase;
+			isa = PBXSourcesBuildPhase;
-    			buildActionMask = 2147483647;
+			buildActionMask = 2147483647;
-    			files = (
+			files = (
-    				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
+				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
-    				7555FF83242A565900829871 /* ContentView.swift in Sources */,
+				7555FF83242A565900829871 /* ContentView.swift in Sources */,
-    			);
+			);
-    			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 0;
-    		};
+		};
-    /* End PBXSourcesBuildPhase section */
+/* End PBXSourcesBuildPhase section */
 
-    /* Begin XCBuildConfiguration section */
+/* Begin XCBuildConfiguration section */
-    		7555FFA3242A565B00829871 /* Debug */ = {
+		7555FFA3242A565B00829871 /* Debug */ = {
-    			isa = XCBuildConfiguration;
+			isa = XCBuildConfiguration;
-    			buildSettings = {
+			buildSettings = {
-    				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = NO;
-    				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NONNULL = YES;
-    				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-    				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-    				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_CXX_LIBRARY = "libc++";
-    				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_MODULES = YES;
-    				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
-    				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
-    				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-    				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
-    				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_COMMA = YES;
-    				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
-    				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-    				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-    				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-    				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
-    				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
-    				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
-    				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
-    				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-    				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-    				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-    				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-    				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-    				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-    				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
-    				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-    				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-    				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
-    				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-    				COPY_PHASE_STRIP = NO;
+				COPY_PHASE_STRIP = NO;
-    				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-    				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
-    				ENABLE_TESTABILITY = YES;
+				ENABLE_TESTABILITY = YES;
-    				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
-    				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
-    				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
-    				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_OPTIMIZATION_LEVEL = 0;
-    				GCC_PREPROCESSOR_DEFINITIONS = (
+				GCC_PREPROCESSOR_DEFINITIONS = (
-    					"DEBUG=1",
+					"DEBUG=1",
-    					"$(inherited)",
+					"$(inherited)",
-    				);
+				);
-    				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-    				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-    				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
-    				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-    				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
-    				GCC_WARN_UNUSED_VARIABLE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
-    				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
-    				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-    				MTL_FAST_MATH = YES;
+				MTL_FAST_MATH = YES;
-    				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = YES;
-    				SDKROOT = iphoneos;
+				SDKROOT = iphoneos;
-    				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-    				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-    			};
+			};
-    			name = Debug;
+			name = Debug;
-    		};
+		};
-    		7555FFA4242A565B00829871 /* Release */ = {
+		7555FFA4242A565B00829871 /* Release */ = {
-    			isa = XCBuildConfiguration;
+			isa = XCBuildConfiguration;
-    			buildSettings = {
+			buildSettings = {
-    				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = NO;
-    				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NONNULL = YES;
-    				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-    				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-    				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_CXX_LIBRARY = "libc++";
-    				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_MODULES = YES;
-    				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
-    				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
-    				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-    				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
-    				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_COMMA = YES;
-    				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
-    				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-    				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-    				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-    				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
-    				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
-    				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
-    				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
-    				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-    				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-    				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-    				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-    				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-    				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-    				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
-    				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-    				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-    				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
-    				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-    				COPY_PHASE_STRIP = NO;
+				COPY_PHASE_STRIP = NO;
-    				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-    				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_NS_ASSERTIONS = NO;
-    				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
-    				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
-    				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
-    				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-    				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-    				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
-    				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-    				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
-    				GCC_WARN_UNUSED_VARIABLE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
-    				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
-    				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_ENABLE_DEBUG_INFO = NO;
-    				MTL_FAST_MATH = YES;
+				MTL_FAST_MATH = YES;
-    				SDKROOT = iphoneos;
+				SDKROOT = iphoneos;
-    				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_COMPILATION_MODE = wholemodule;
-    				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
-    				VALIDATE_PRODUCT = YES;
+				VALIDATE_PRODUCT = YES;
-    			};
+			};
-    			name = Release;
+			name = Release;
-    		};
+		};
-    		7555FFA6242A565B00829871 /* Debug */ = {
+		7555FFA6242A565B00829871 /* Debug */ = {
-    			isa = XCBuildConfiguration;
+			isa = XCBuildConfiguration;
-    			buildSettings = {
+			buildSettings = {
-    				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-    				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_STYLE = Automatic;
-		DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
-    				ENABLE_PREVIEWS = YES;
+				ENABLE_PREVIEWS = YES;
-    				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-    				INFOPLIST_FILE = iosApp/Info.plist;
+				INFOPLIST_FILE = iosApp/Info.plist;
-    				LD_RUNPATH_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = (
-    					"$(inherited)",
+					"$(inherited)",
-    					"@executable_path/Frameworks",
+					"@executable_path/Frameworks",
-    				);
+				);
-    				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = (
-    					"$(inherited)",
+					"$(inherited)",
-    					"-framework",
+					"-framework",
-    					shared,
+					shared,
-    				);
+				);
-    				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp;
+				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp;
-    				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
-    				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.0;
-    				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2";
-    			};
+			};
-    			name = Debug;
+			name = Debug;
-    		};
+		};
-    		7555FFA7242A565B00829871 /* Release */ = {
+		7555FFA7242A565B00829871 /* Release */ = {
-    			isa = XCBuildConfiguration;
+			isa = XCBuildConfiguration;
-    			buildSettings = {
+			buildSettings = {
-    				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-    				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_STYLE = Automatic;
-    				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
-    				ENABLE_PREVIEWS = YES;
+				ENABLE_PREVIEWS = YES;
-    				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-    				INFOPLIST_FILE = iosApp/Info.plist;
+				INFOPLIST_FILE = iosApp/Info.plist;
-    				LD_RUNPATH_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = (
-    					"$(inherited)",
+					"$(inherited)",
-    					"@executable_path/Frameworks",
+					"@executable_path/Frameworks",
-    				);
+				);
-    				OTHER_LDFLAGS = (
+				OTHER_LDFLAGS = (
-    					"$(inherited)",
+					"$(inherited)",
-    					"-framework",
+					"-framework",
-    					shared,
+					shared,
-    				);
+				);
-    				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp;
+				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp;
-    				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
-    				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.0;
-    				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1,2";
-    			};
+			};
-    			name = Release;
+			name = Release;
-    		};
+		};
-    /* End XCBuildConfiguration section */
+/* End XCBuildConfiguration section */
 
-    /* Begin XCConfigurationList section */
+/* Begin XCConfigurationList section */
-    		7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = {
+		7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = {
-    			isa = XCConfigurationList;
+			isa = XCConfigurationList;
-    			buildConfigurations = (
+			buildConfigurations = (
-    				7555FFA3242A565B00829871 /* Debug */,
+				7555FFA3242A565B00829871 /* Debug */,
-    				7555FFA4242A565B00829871 /* Release */,
+				7555FFA4242A565B00829871 /* Release */,
-    			);
+			);
-    			defaultConfigurationIsVisible = 0;
+			defaultConfigurationIsVisible = 0;
-    			defaultConfigurationName = Release;
+			defaultConfigurationName = Release;
-    		};
+		};
-    		7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = {
+		7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = {
-    			isa = XCConfigurationList;
+			isa = XCConfigurationList;
-    			buildConfigurations = (
+			buildConfigurations = (
-    				7555FFA6242A565B00829871 /* Debug */,
+				7555FFA6242A565B00829871 /* Debug */,
-    				7555FFA7242A565B00829871 /* Release */,
+				7555FFA7242A565B00829871 /* Release */,
-    			);
+			);
-    			defaultConfigurationIsVisible = 0;
+			defaultConfigurationIsVisible = 0;
-    			defaultConfigurationName = Release;
+			defaultConfigurationName = Release;
-    		};
+		};
-    /* End XCConfigurationList section */
+/* End XCConfigurationList section */
-    	};
+	};
-    	rootObject = 7555FF73242A565900829871 /* Project object */;
+	rootObject = 7555FF73242A565900829871 /* Project object */;
-    }
+}

iosApp/iosApp/ContentView.swift

@@ -2,12 +2,9 @@ import SwiftUI
 import shared
 
 struct ContentView: View {
-    let greet = Greeting().greeting()
-
-    let toto = SelfossApi().getItems()
 
 	var body: some View {
-		Text(greet)
+		Text("ototot")
 	}
 }
 

settings.gradle.kts

@@ -8,6 +8,14 @@ pluginManagement {
     }
 }
 
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+
 buildCache {
     remote<HttpBuildCache> {
         url = uri("http://18.0.0.7:3071/cache/")

shared/build.gradle.kts

@@ -18,7 +18,7 @@ kotlin {
     listOf(
         iosX64(),
         iosArm64(),
-        //iosSimulatorArm64() sure all ios dependencies support this target
+        // iosSimulatorArm64()
     ).forEach {
         it.binaries.framework {
             baseName = "shared"
@@ -40,14 +40,11 @@ kotlin {
                 implementation("org.kodein.di:kodein-di:7.12.0")
 
                 //Settings
-                implementation("com.russhwolf:multiplatform-settings-no-arg:0.9")
+                implementation("com.russhwolf:multiplatform-settings-no-arg:1.0.0-RC")
 
                 //Logging
                 implementation("io.github.aakira:napier:2.6.1")
 
-                // Network information
-                implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")
-
                 // Sql
                 implementation(SqlDelight.runtime)
             }
@@ -56,8 +53,6 @@ kotlin {
             dependencies {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
-                implementation("io.mockk:mockk:1.12.0")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
             }
         }
         val androidMain by getting {
@@ -76,39 +71,36 @@ kotlin {
         }
         val iosX64Main by getting
         val iosArm64Main by getting
-        //val iosSimulatorArm64Main by getting
+        // val iosSimulatorArm64Main by getting
         val iosMain by creating {
             dependsOn(commonMain)
             iosX64Main.dependsOn(this)
             iosArm64Main.dependsOn(this)
-            //iosSimulatorArm64Main.dependsOn(this)
+            // iosSimulatorArm64Main.dependsOn(this)
 
-            // Sql
             dependencies {
                 implementation(SqlDelight.native)
+                implementation("io.ktor:ktor-client-ios:2.1.1")
             }
         }
         val iosX64Test by getting
         val iosArm64Test by getting
-        //val iosSimulatorArm64Test by getting
+        // val iosSimulatorArm64Test by getting
         val iosTest by creating {
             dependsOn(commonTest)
             iosX64Test.dependsOn(this)
             iosArm64Test.dependsOn(this)
-            dependencies {
+            // iosSimulatorArm64Test.dependsOn(this)
-                implementation("io.ktor:ktor-client-ios:2.1.1")
-            }
-            //iosSimulatorArm64Test.dependsOn(this)
         }
     }
 }
 
 android {
-    compileSdk = 31
+    compileSdk = 32
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 31
+        targetSdk = 32
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -117,10 +109,11 @@ android {
     namespace = "bou.amine.apps.readerforselfossv2"
 }
 
+
+
 sqldelight {
     database("ReaderForSelfossDB") {
         packageName = "bou.amine.apps.readerforselfossv2.dao"
         sourceFolders = listOf("sqldelight")
     }
 }
-

shared/src/androidMain/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt

@@ -1,5 +1,6 @@
 package bou.amine.apps.readerforselfossv2.utils
 
+import android.os.Build
 import android.text.format.DateUtils
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import java.time.Instant
@@ -15,10 +16,18 @@ actual class DateUtils actual constructor(actual val appSettingsService: AppSett
         val FORMATTERV1 = "yyyy-MM-dd HH:mm:ss"
 
         return if (appSettingsService.getApiVersion() >= 4) {
-            OffsetDateTime.parse(dateString).toInstant().toEpochMilli()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                OffsetDateTime.parse(dateString).toInstant().toEpochMilli()
+            } else {
+                TODO("VERSION.SDK_INT < O")
+            }
         } else {
-            LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(FORMATTERV1)).toInstant(
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                ZoneOffset.UTC).toEpochMilli()
+                LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(FORMATTERV1)).toInstant(
+                    ZoneOffset.UTC).toEpochMilli()
+            } else {
+                TODO("VERSION.SDK_INT < O")
+            }
         }
     }
 
@@ -26,11 +35,15 @@ actual class DateUtils actual constructor(actual val appSettingsService: AppSett
 
         val date = parseDate(dateString)
 
-        return " " + DateUtils.getRelativeTimeSpanString(
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            date,
+            " " + DateUtils.getRelativeTimeSpanString(
-            Instant.now().toEpochMilli(),
+                date,
-            DateUtils.MINUTE_IN_MILLIS,
+                Instant.now().toEpochMilli(),
-            DateUtils.FORMAT_ABBREV_RELATIVE
+                DateUtils.MINUTE_IN_MILLIS,
-        )
+                DateUtils.FORMAT_ABBREV_RELATIVE
+            )
+        } else {
+            TODO("VERSION.SDK_INT < O")
+        }
     }
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -6,17 +6,16 @@ import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.rest.SelfossApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.*
-import com.github.ln_12.library.ConnectivityStatus
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 
-class Repository(private val api: SelfossApi, private val appSettingsService: AppSettingsService, connectivityStatus: ConnectivityStatus, private val db: ReaderForSelfossDB) {
+class Repository(private val api: SelfossApi, private val appSettingsService: AppSettingsService, val isConnectionAvailable: MutableStateFlow<Boolean>, private val db: ReaderForSelfossDB) {
 
     var items = ArrayList<SelfossModel.Item>()
-    val isConnectionAvailable = connectivityStatus.isNetworkConnected
     var connectionMonitored = false
 
     var baseUrl = appSettingsService.getBaseUrl()
@@ -40,16 +39,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
     private var fetchedSources = false
     private var fetchedTags = false
 
-    init {
-        // TODO: Dispatchers.IO not available in KMM, an alternative solution should be found
-        connectivityStatus.start()
-        runBlocking {
-            updateApiVersion()
-            dateUtils = DateUtils(appSettingsService)
-            reloadBadges()
-        }
-    }
-
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
         // TODO: Use the updatedSince parameter
         var fetchedItems: SelfossModel.StatusAndData<List<SelfossModel.Item>> = SelfossModel.StatusAndData.error()
@@ -383,9 +372,6 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
             try {
                 val response = api.login()
                 result = response.isSuccess == true
-                if (result) {
-                    updateApiVersion()
-                }
             } catch (cause: Throwable) {
                 Napier.e(cause.stackTraceToString(), tag = "RepositoryImpl.updateRemote")
             }
@@ -399,7 +385,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         api.refreshLoginInformation()
     }
 
-    private suspend fun updateApiVersion() {
+    suspend fun updateApiVersion() {
         val apiMajorVersion = appSettingsService.getApiVersion()
 
         if (isNetworkAvailable()) {
@@ -408,6 +394,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
                 appSettingsService.updateApiVersion(fetchedVersion.data.getApiMajorVersion())
             }
         }
+        dateUtils = DateUtils(appSettingsService)
     }
 
     fun isNetworkAvailable() = isConnectionAvailable.value && !offlineOverride

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt

@@ -54,8 +54,8 @@ class AppSettingsService {
         return _apiVersion
     }
 
-    fun refreshApiVersion() {
+    private fun refreshApiVersion() {
-        _apiVersion = settings.getInt("apiVersionMajor", -1)
+        _apiVersion = settings.getInt(API_VERSION_MAJOR, -1)
     }
 
     fun getBaseUrl(): String {
@@ -86,8 +86,8 @@ class AppSettingsService {
         return _itemsNumber!!
     }
 
-    fun refreshItemsNumber() {
+    private fun refreshItemsNumber() {
-        _itemsNumber = settings.getString("prefer_api_items_number", "20").toInt()
+        _itemsNumber = settings.getString(API_ITEMS_NUMBER, "20").toInt()
     }
 
     fun getApiTimeout(): Long {
@@ -98,24 +98,24 @@ class AppSettingsService {
     }
 
     private fun refreshApiTimeout() {
-        val settingsTimeout = settings.getLong("api_timeout", HttpTimeout.INFINITE_TIMEOUT_MS)
+        val settingsTimeout = settings.getLong(API_TIMEOUT, HttpTimeout.INFINITE_TIMEOUT_MS)
         _apiTimeout = if (settingsTimeout > 0) settingsTimeout else HttpTimeout.INFINITE_TIMEOUT_MS
     }
 
     private fun refreshBaseUrl() {
-        _baseUrl = settings.getString("url", "")
+        _baseUrl = settings.getString(BASE_URL, "")
     }
 
     private fun refreshUsername() {
-        _userName = settings.getString("login", "")
+        _userName = settings.getString(LOGIN, "")
     }
 
     private fun refreshPassword() {
-        _password = settings.getString("password", "")
+        _password = settings.getString(PASSWORD, "")
     }
 
     private fun refreshArticleViewerEnabled() {
-        _articleViewer = settings.getBoolean("prefer_article_viewer", true)
+        _articleViewer = settings.getBoolean(PREFER_ARTICLE_VIEWER, true)
     }
 
     fun isArticleViewerEnabled(): Boolean {
@@ -125,7 +125,7 @@ class AppSettingsService {
         return _articleViewer == true
     }
     private fun refreshShouldBeCardViewEnabled() {
-        _shouldBeCardView = settings.getBoolean("card_view_active", false)
+        _shouldBeCardView = settings.getBoolean(CARD_VIEW_ACTIVE, false)
     }
 
     fun isCardViewEnabled(): Boolean {
@@ -135,7 +135,7 @@ class AppSettingsService {
         return _shouldBeCardView == true
     }
     private fun refreshDisplayUnreadCountEnabled() {
-        _displayUnreadCount = settings.getBoolean("display_unread_count", true)
+        _displayUnreadCount = settings.getBoolean(DISPLAY_UNREAD_COUNT, true)
     }
 
     fun isDisplayUnreadCountEnabled(): Boolean {
@@ -145,7 +145,7 @@ class AppSettingsService {
         return _displayUnreadCount == true
     }
     private fun refreshDisplayAllCountEnabled() {
-        _displayAllCount = settings.getBoolean("display_other_count", false)
+        _displayAllCount = settings.getBoolean(DISPLAY_OTHER_COUNT, false)
     }
 
     fun isDisplayAllCountEnabled(): Boolean {
@@ -155,7 +155,7 @@ class AppSettingsService {
         return _displayAllCount == true
     }
     private fun refreshFullHeightCardsEnabled() {
-        _fullHeightCards = settings.getBoolean("full_height_cards", false)
+        _fullHeightCards = settings.getBoolean(FULL_HEIGHT_CARDS, false)
     }
 
     fun isFullHeightCardsEnabled(): Boolean {
@@ -165,7 +165,7 @@ class AppSettingsService {
         return _fullHeightCards == true
     }
     private fun refreshUpdateSourcesEnabled() {
-        _updateSources = settings.getBoolean("update_sources", true)
+        _updateSources = settings.getBoolean(UPDATE_SOURCES, true)
     }
 
     fun isUpdateSourcesEnabled(): Boolean {
@@ -175,7 +175,7 @@ class AppSettingsService {
         return _updateSources == true
     }
     private fun refreshPeriodicRefreshEnabled() {
-        _periodicRefresh = settings.getBoolean("periodic_refresh", false)
+        _periodicRefresh = settings.getBoolean(PERIODIC_REFRESH, false)
     }
 
     fun isPeriodicRefreshEnabled(): Boolean {
@@ -186,7 +186,7 @@ class AppSettingsService {
     }
 
     private fun refreshRefreshWhenChargingOnlyEnabled() {
-        _refreshWhenChargingOnly = settings.getBoolean("refresh_when_charging", false)
+        _refreshWhenChargingOnly = settings.getBoolean(REFRESH_WHEN_CHARGING, false)
     }
 
     fun isRefreshWhenChargingOnlyEnabled(): Boolean {
@@ -197,22 +197,22 @@ class AppSettingsService {
     }
 
     private fun refreshRefreshMinutes() {
-        _refreshMinutes = settings.getString("periodic_refresh_minutes", "360").toLong()
+        _refreshMinutes = settings.getString(PERIODIC_REFRESH_MINUTES, "360").toLong()
         if (_refreshMinutes <= 15) {
             _refreshMinutes = 15
         }
     }
 
     fun getRefreshMinutes(): Long {
-        if (_refreshMinutes != null) {
+        if (_refreshMinutes != 360L) {
             refreshRefreshMinutes()
         }
         return _refreshMinutes
     }
 
     private fun refreshHiddenTags() {
-        if (settings.getString("hidden_tags", "").isNotEmpty()) {
+        if (settings.getString(HIDDEN_TAGS, "").isNotEmpty()) {
-            _hiddenTags = settings.getString("hidden_tags", "").replace("\\s".toRegex(), "").split(",")
+            _hiddenTags = settings.getString(HIDDEN_TAGS, "").replace("\\s".toRegex(), "").split(",")
         }
     }
 
@@ -224,7 +224,7 @@ class AppSettingsService {
     }
 
     private fun refreshInfiniteLoadingEnabled() {
-        _infiniteLoading = settings.getBoolean("infinite_loading", false)
+        _infiniteLoading = settings.getBoolean(INFINITE_LOADING, false)
     }
 
     fun isInfiniteLoadingEnabled(): Boolean {
@@ -235,7 +235,7 @@ class AppSettingsService {
     }
 
     private fun refreshItemCachingEnabled() {
-        _itemsCaching = settings.getBoolean("items_caching", false)
+        _itemsCaching = settings.getBoolean(ITEMS_CACHING, false)
     }
 
     fun isItemCachingEnabled(): Boolean {
@@ -246,7 +246,7 @@ class AppSettingsService {
     }
 
     private fun refreshNotifyNewItemsEnabled() {
-        _notifyNewItems = settings.getBoolean("notify_new_items", false)
+        _notifyNewItems = settings.getBoolean(NOTIFY_NEW_ITEMS, false)
     }
 
     fun isNotifyNewItemsEnabled(): Boolean {
@@ -258,7 +258,7 @@ class AppSettingsService {
 
 
     private fun refreshMarkOnScrollEnabled() {
-        _markOnScroll = settings.getBoolean("mark_on_scroll", false)
+        _markOnScroll = settings.getBoolean(MARK_ON_SCROLL, false)
     }
 
     fun isMarkOnScrollEnabled(): Boolean {
@@ -270,7 +270,7 @@ class AppSettingsService {
 
 
     private fun refreshActiveAllignment() {
-        _activeAlignment = settings.getInt("text_align", JUSTIFY)
+        _activeAlignment = settings.getInt(TEXT_ALIGN, JUSTIFY)
     }
 
     fun getActiveAllignment(): Int {
@@ -281,12 +281,12 @@ class AppSettingsService {
     }
 
     fun changeAllignment(allignment: Int) {
-        settings.putInt("text_align", allignment)
+        settings.putInt(TEXT_ALIGN, allignment)
         _activeAlignment = allignment
     }
 
     private fun refreshFontSize() {
-        _fontSize = settings.getString("reader_font_size", "16").toInt()
+        _fontSize = settings.getString(READER_FONT_SIZE, "16").toInt()
     }
 
     fun getFontSize(): Int {
@@ -297,7 +297,7 @@ class AppSettingsService {
     }
 
     private fun refreshStaticBarEnabled() {
-        _staticBar = settings.getBoolean("reader_static_bar", false)
+        _staticBar = settings.getBoolean(READER_STATIC_BAR, false)
     }
 
     fun isStaticBarEnabled(): Boolean {
@@ -308,11 +308,11 @@ class AppSettingsService {
     }
 
     private fun refreshFont() {
-        _font = settings.getString("reader_font", "")
+        _font = settings.getString(READER_FONT, "")
     }
 
     fun getFont(): String {
-        if (_font != null) {
+        if (_font.isEmpty()) {
             refreshFont()
         }
         return _font
@@ -353,21 +353,21 @@ class AppSettingsService {
         login: String,
         password: String
     ) {
-        settings.putString("url", url)
+        settings.putString(BASE_URL, url)
-        settings.putString("login", login)
+        settings.putString(LOGIN, login)
-        settings.putString("password", password)
+        settings.putString(PASSWORD, password)
         refreshApiSettings()
     }
 
     fun resetLoginInformation() {
-        settings.remove("url")
+        settings.remove(BASE_URL)
-        settings.remove("login")
+        settings.remove(LOGIN)
-        settings.remove("password")
+        settings.remove(PASSWORD)
         refreshApiSettings()
     }
 
     fun updateApiVersion(apiMajorVersion: Int) {
-        settings.putInt("apiVersionMajor", apiMajorVersion)
+        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
         refreshApiVersion()
     }
 
@@ -378,7 +378,7 @@ class AppSettingsService {
     }
 
     fun disableArticleViewer() {
-        settings.putBoolean("prefer_article_viewer", false)
+        settings.putBoolean(PREFER_ARTICLE_VIEWER, false)
         refreshArticleViewerEnabled()
     }
 
@@ -396,5 +396,53 @@ class AppSettingsService {
         const val JUSTIFY = 1
 
         const val ALIGN_LEFT = 2
+
+        const val API_VERSION_MAJOR = "apiVersionMajor"
+
+        const val API_ITEMS_NUMBER = "prefer_api_items_number"
+
+        const val API_TIMEOUT = "api_timeout"
+
+        const val BASE_URL = "url"
+
+        const val LOGIN = "login"
+
+        const val PASSWORD = "password"
+
+        const val PREFER_ARTICLE_VIEWER = "prefer_article_viewer"
+
+        const val CARD_VIEW_ACTIVE = "card_view_active"
+
+        const val DISPLAY_UNREAD_COUNT = "display_unread_count"
+
+        const val DISPLAY_OTHER_COUNT = "display_other_count"
+
+        const val FULL_HEIGHT_CARDS = "full_height_cards"
+
+        const val UPDATE_SOURCES = "update_sources"
+
+        const val PERIODIC_REFRESH = "periodic_refresh"
+
+        const val REFRESH_WHEN_CHARGING = "refresh_when_charging"
+
+        const val READER_FONT = "reader_font"
+
+        const val READER_STATIC_BAR = "reader_static_bar"
+
+        const val READER_FONT_SIZE = "reader_font_size"
+
+        const val TEXT_ALIGN = "text_align"
+
+        const val MARK_ON_SCROLL = "mark_on_scroll"
+
+        const val NOTIFY_NEW_ITEMS = "notify_new_items"
+
+        const val PERIODIC_REFRESH_MINUTES = "periodic_refresh_minutes"
+
+        const val HIDDEN_TAGS = "hidden_tags"
+
+        const val INFINITE_LOADING = "infinite_loading"
+
+        const val ITEMS_CACHING = "items_caching"
     }
 }

shared/src/iosTest/kotlin/bou/amine/apps/readerforselfossv2/iosTest.kt

@@ -1,12 +0,0 @@
-package bou.amine.apps.readerforselfossv2
-
-import kotlin.test.Test
-import kotlin.test.assertTrue
-
-class IosGreetingTest {
-
-    @Test
-    fun testExample() {
-        assertTrue(Greeting().greeting().contains("iOS"), "Check iOS is mentioned")
-    }
-}