.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 build -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
+      - ./gradlew :androidApp: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 = 32
+    compileSdk = 31
     buildToolsVersion = "31.0.0"
     buildFeatures {
         viewBinding = true
@@ -66,7 +66,7 @@ android {
     defaultConfig {
         applicationId = "bou.amine.apps.readerforselfossv2.android"
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 31
         versionCode = versionCodeFromGit()
         versionName = versionNameFromGit()
 
@@ -79,11 +79,6 @@ android {
         // tests
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
-    packagingOptions {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
     buildTypes {
         getByName("release") {
             isMinifyEnabled = true
@@ -103,6 +98,9 @@ android {
             dimension = "build"
         }
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
     namespace = "bou.amine.apps.readerforselfossv2.android"
 
 }
@@ -116,6 +114,13 @@ 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
@@ -183,6 +188,9 @@ 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
@@ -190,23 +198,4 @@ 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,5 +90,3 @@
 # @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,9 +93,6 @@ 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,7 +14,6 @@ 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
@@ -29,7 +28,6 @@ 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.*
 
@@ -39,7 +37,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(), isConnectionAvailable, instance()) }
+        bind<Repository>() with singleton { Repository(instance(), instance(), connectivityStatus, instance()) }
         bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
         bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
     }
@@ -49,9 +47,6 @@ 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,7 +354,6 @@ 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)))
@@ -362,7 +361,6 @@ 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,19 +1,21 @@
 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 {
@@ -25,7 +27,6 @@ allprojects {
     }
 }
 
-
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }

gradle.properties

@@ -11,27 +11,14 @@
 # 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
-
-#Android
-android.useAndroidX=true
-kotlin.native.enableDependencyPropagation=false
-#android.nonTransitiveRClass=true
-android.enableJetifier=true
-
-
-#MPP
 kotlin.mpp.enableCInteropCommonization=true
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+kotlin.native.enableDependencyPropagation=false
+android.useAndroidX=true
+android.enableJetifier=true
 kotlin.mpp.enableGranularSourceSetsMetadata=true
-
-
 org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
-kotlin.native.cacheKind.iosX64=none
 pushCache=true
-

iosApp/iosApp/ContentView.swift

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

settings.gradle.kts

@@ -8,14 +8,6 @@ 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()
+        //iosSimulatorArm64() sure all ios dependencies support this target
     ).forEach {
         it.binaries.framework {
             baseName = "shared"
@@ -40,11 +40,14 @@ kotlin {
                 implementation("org.kodein.di:kodein-di:7.12.0")
 
                 //Settings
-                implementation("com.russhwolf:multiplatform-settings-no-arg:1.0.0-RC")
+                implementation("com.russhwolf:multiplatform-settings-no-arg:0.9")
 
                 //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)
             }
@@ -53,6 +56,8 @@ 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 {
@@ -78,9 +83,9 @@ kotlin {
             iosArm64Main.dependsOn(this)
             //iosSimulatorArm64Main.dependsOn(this)
 
+            // Sql
             dependencies {
                 implementation(SqlDelight.native)
-                implementation("io.ktor:ktor-client-ios:2.1.1")
             }
         }
         val iosX64Test by getting
@@ -90,17 +95,20 @@ kotlin {
             dependsOn(commonTest)
             iosX64Test.dependsOn(this)
             iosArm64Test.dependsOn(this)
+            dependencies {
+                implementation("io.ktor:ktor-client-ios:2.1.1")
+            }
             //iosSimulatorArm64Test.dependsOn(this)
         }
     }
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 31
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 31
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -109,11 +117,10 @@ 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,6 +1,5 @@
 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
@@ -16,18 +15,10 @@ actual class DateUtils actual constructor(actual val appSettingsService: AppSett
         val FORMATTERV1 = "yyyy-MM-dd HH:mm:ss"
 
         return if (appSettingsService.getApiVersion() >= 4) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             OffsetDateTime.parse(dateString).toInstant().toEpochMilli()
         } else {
-                TODO("VERSION.SDK_INT < O")
-            }
-        } else {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(FORMATTERV1)).toInstant(
                 ZoneOffset.UTC).toEpochMilli()
-            } else {
-                TODO("VERSION.SDK_INT < O")
-            }
         }
     }
 
@@ -35,15 +26,11 @@ actual class DateUtils actual constructor(actual val appSettingsService: AppSett
 
         val date = parseDate(dateString)
 
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            " " + DateUtils.getRelativeTimeSpanString(
+        return " " + DateUtils.getRelativeTimeSpanString(
             date,
             Instant.now().toEpochMilli(),
             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,16 +6,17 @@ 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, val isConnectionAvailable: MutableStateFlow<Boolean>, private val db: ReaderForSelfossDB) {
+class Repository(private val api: SelfossApi, private val appSettingsService: AppSettingsService, connectivityStatus: ConnectivityStatus, private val db: ReaderForSelfossDB) {
 
     var items = ArrayList<SelfossModel.Item>()
+    val isConnectionAvailable = connectivityStatus.isNetworkConnected
     var connectionMonitored = false
 
     var baseUrl = appSettingsService.getBaseUrl()
@@ -39,6 +40,16 @@ 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()
@@ -372,6 +383,9 @@ 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")
             }
@@ -385,7 +399,7 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         api.refreshLoginInformation()
     }
 
-    suspend fun updateApiVersion() {
+    private suspend fun updateApiVersion() {
         val apiMajorVersion = appSettingsService.getApiVersion()
 
         if (isNetworkAvailable()) {
@@ -394,7 +408,6 @@ 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
     }
 
-    private fun refreshApiVersion() {
-        _apiVersion = settings.getInt(API_VERSION_MAJOR, -1)
+    fun refreshApiVersion() {
+        _apiVersion = settings.getInt("apiVersionMajor", -1)
     }
 
     fun getBaseUrl(): String {
@@ -86,8 +86,8 @@ class AppSettingsService {
         return _itemsNumber!!
     }
 
-    private fun refreshItemsNumber() {
-        _itemsNumber = settings.getString(API_ITEMS_NUMBER, "20").toInt()
+    fun refreshItemsNumber() {
+        _itemsNumber = settings.getString("prefer_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(BASE_URL, "")
+        _baseUrl = settings.getString("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 != 360L) {
+        if (_refreshMinutes != null) {
             refreshRefreshMinutes()
         }
         return _refreshMinutes
     }
 
     private fun refreshHiddenTags() {
-        if (settings.getString(HIDDEN_TAGS, "").isNotEmpty()) {
-            _hiddenTags = settings.getString(HIDDEN_TAGS, "").replace("\\s".toRegex(), "").split(",")
+        if (settings.getString("hidden_tags", "").isNotEmpty()) {
+            _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.isEmpty()) {
+        if (_font != null) {
             refreshFont()
         }
         return _font
@@ -353,21 +353,21 @@ class AppSettingsService {
         login: String,
         password: String
     ) {
-        settings.putString(BASE_URL, url)
-        settings.putString(LOGIN, login)
-        settings.putString(PASSWORD, password)
+        settings.putString("url", url)
+        settings.putString("login", login)
+        settings.putString("password", password)
         refreshApiSettings()
     }
 
     fun resetLoginInformation() {
-        settings.remove(BASE_URL)
-        settings.remove(LOGIN)
-        settings.remove(PASSWORD)
+        settings.remove("url")
+        settings.remove("login")
+        settings.remove("password")
         refreshApiSettings()
     }
 
     fun updateApiVersion(apiMajorVersion: Int) {
-        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
+        settings.putInt("apiVersionMajor", apiMajorVersion)
         refreshApiVersion()
     }
 
@@ -378,7 +378,7 @@ class AppSettingsService {
     }
 
     fun disableArticleViewer() {
-        settings.putBoolean(PREFER_ARTICLE_VIEWER, false)
+        settings.putBoolean("prefer_article_viewer", false)
         refreshArticleViewerEnabled()
     }
 
@@ -396,53 +396,5 @@ 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

@@ -0,0 +1,12 @@
+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")
+    }
+}