Fix login activity layout

* Upgrade minSdk

* Add changelog entry about the upgrade

* Remove obsolete version checks

CHANGELOG.md

@@ -42,6 +42,10 @@
 
 - Closing #322. App crashed because of svg images.
 
+- Closing #236. New sources can be added in Selfoss 2.19.
+
+- Dropped support for android 4, the last version supporting it is v1721030811
+
 **1.6.x**
 
 - Handling hidden tags.

README.md

@@ -36,3 +36,12 @@ If you are a user, you can still create new issues. I'll fix them when I can.
 - [See what I'm doing](https://github.com/aminecmi/ReaderforSelfoss/projects/1)
 - [Create an issue, or request a new feature](https://github.com/aminecmi/ReaderforSelfoss/issues)
 - [Help translation the app](https://crowdin.com/project/readerforselfoss)
+
+## Contributors (Alphabetical order) ❤️
+
+- [@aancel](https://github.com/aancel)
+- [@Binnette](https://github.com/Binnette)
+- [@davidoskky](https://github.com/davidoskky)
+- [@hectorgabucio](https://github.com/hectorgabucio)
+- [@licaon-kter](https://github.com/licaon-kter)
+- [@sergey-babkin](https://github.com/sergey-babkin)

app/build.gradle

@@ -32,18 +32,21 @@ apply plugin: 'kotlin-kapt'
 
 android {
     compileOptions {
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    compileSdkVersion 31
+    buildToolsVersion '31.0.0'
     buildFeatures {
         viewBinding true
     }
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion 21
+        targetSdkVersion 31
         versionCode versionCodeFromGit()
         versionName versionNameFromGit()
 
@@ -68,11 +71,14 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            shrinkResources false
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
         debug {
+            buildConfigField "String", "LOGIN_URL", appLoginUrl
+            buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
+            buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
         }
     }
     flavorDimensions "build"
@@ -82,9 +88,14 @@ android {
             dimension "build"
         }
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 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'
@@ -95,60 +106,66 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // Android Support
-    implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
-    implementation 'com.google.android.material:material:1.3.0-beta01'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
+    implementation "androidx.appcompat:appcompat:1.4.0-beta01"
+    implementation 'com.google.android.material:material:1.5.0-alpha04'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0-alpha01'
     implementation "androidx.legacy:legacy-support-v4:$android_version"
     implementation 'androidx.vectordrawable:vectordrawable:1.2.0-alpha02'
     implementation "androidx.browser:browser:1.3.0"
     implementation "androidx.cardview:cardview:$android_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha2'
-    implementation 'org.jsoup:jsoup:1.13.1'
+    implementation "androidx.annotation:annotation:1.2.0"
+    implementation 'androidx.work:work-runtime-ktx:2.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'org.jsoup:jsoup:1.14.3'
+
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
 
     //multidex
     implementation 'androidx.multidex:multidex:2.0.1'
 
     // About
-    implementation('com.mikepenz:aboutlibraries:6.2.0@aar') {
-        transitive = true
-    }
+    implementation 'com.mikepenz:aboutlibraries-core:8.9.4'
+    implementation 'com.mikepenz:aboutlibraries:8.9.4'
+    implementation "com.mikepenz:aboutlibraries-definitions:8.9.4"
+
+    // Async
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
 
     // Retrofit + http logging + okhttp
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.burgstaller:okhttp-digest:1.12'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.burgstaller:okhttp-digest:2.5'
 
     // Material-ish things
-    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
-    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
+    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.2.0'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
     // glide
-    implementation 'com.github.bumptech.glide:glide:4.1.1'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'
 
     // Drawer
-    implementation 'co.zsmb:materialdrawer-kt:2.0.2'
+    implementation 'com.mikepenz:materialdrawer:8.4.4'
 
     // Themes
     implementation 'com.52inc:scoops:1.0.0'
-    implementation 'com.jaredrummler:colorpicker:1.0.2'
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
     implementation 'com.github.rubensousa:floatingtoolbar:1.5.1'
 
     // Pager
-    implementation 'me.relex:circleindicator:2.0.0@aar'
+    implementation 'me.relex:circleindicator:2.1.6'
 
     //PhotoView
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
-    implementation 'androidx.core:core-ktx:1.5.0-alpha05'
+    implementation 'androidx.core:core-ktx:1.7.0-rc01'
 
-    implementation "androidx.lifecycle:lifecycle-livedata:2.3.0-rc01"
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.3.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.4.0-rc01"
 
-    implementation "androidx.room:room-runtime:2.3.0-alpha04"
-    kapt "androidx.room:room-compiler:2.3.0-alpha04"
+    implementation "androidx.room:room-ktx:2.4.0-beta01"
+    kapt "androidx.room:room-compiler:2.4.0-beta01"
 
     implementation "android.arch.work:work-runtime-ktx:$work_version"
 }

app/src/main/AndroidManifest.xml

@@ -15,7 +15,8 @@
         android:theme="@style/NoBar">
         <activity
             android:name=".MainActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -48,7 +49,8 @@
         </activity>
         <activity
             android:name=".AddSourceActivity"
-            android:parentActivityName=".SourcesActivity">
+            android:parentActivityName=".SourcesActivity"
+            android:exported="true">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".SourcesActivity" />

app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt

@@ -2,9 +2,8 @@ package apps.amine.bou.readerforselfoss
 
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.appcompat.app.AppCompatActivity
 import android.view.View
@@ -50,38 +49,24 @@ class AddSourceActivity : AppCompatActivity() {
 
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-        }
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
 
         val drawable = binding.nameInput.background
         drawable.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
 
 
         // TODO: clean
-        if(Build.VERSION.SDK_INT > 16) {
-            binding.nameInput.background = drawable
-        } else{
-            binding.nameInput.setBackgroundDrawable(drawable)
-        }
+        binding.nameInput.background = drawable
 
         val drawable1 = binding.sourceUri.background
         drawable1.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
 
-        if(Build.VERSION.SDK_INT > 16) {
-            binding.sourceUri.background = drawable1
-        } else{
-            binding.sourceUri.setBackgroundDrawable(drawable1)
-        }
+        binding.sourceUri.background = drawable1
 
         val drawable2 = binding.tags.background
         drawable2.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
 
-        if(Build.VERSION.SDK_INT > 16) {
-            binding.tags.background = drawable2
-        } else{
-            binding.tags.setBackgroundDrawable(drawable2)
-        }
+        binding.tags.background = drawable2
 
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -206,42 +191,78 @@ class AddSourceActivity : AppCompatActivity() {
 
     private fun handleSaveSource(tags: EditText, title: String, url: String, api: SelfossApi) {
 
-        val sourceDetailsAvailable =
+        val sourceDetailsUnavailable =
             title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
 
-        if (sourceDetailsAvailable) {
-            Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
-        } else {
-            api.createSource(
-                title,
-                url,
-                mSpoutsValue!!,
-                tags.text.toString(),
-                ""
-            ).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-                    if (response.body() != null && response.body()!!.isSuccess) {
-                        finish()
-                    } else {
+        when {
+            sourceDetailsUnavailable -> {
+                Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
+            }
+            PreferenceManager.getDefaultSharedPreferences(this).getInt("apiVersionMajor", 0) > 1 -> {
+                val tagList = tags.text.toString().split(",").map { it.trim() }
+                api.createSourceApi2(
+                    title,
+                    url,
+                    mSpoutsValue!!,
+                    tagList,
+                    ""
+                ).enqueue(object : Callback<SuccessResponse> {
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (response.body() != null && response.body()!!.isSuccess) {
+                            finish()
+                        } else {
+                            Toast.makeText(
+                                this@AddSourceActivity,
+                                R.string.cant_create_source,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+
+                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
                         Toast.makeText(
                             this@AddSourceActivity,
                             R.string.cant_create_source,
                             Toast.LENGTH_SHORT
                         ).show()
                     }
-                }
+                })
+            }
+            else -> {
+                api.createSource(
+                    title,
+                    url,
+                    mSpoutsValue!!,
+                    tags.text.toString(),
+                    ""
+                ).enqueue(object : Callback<SuccessResponse> {
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (response.body() != null && response.body()!!.isSuccess) {
+                            finish()
+                        } else {
+                            Toast.makeText(
+                                this@AddSourceActivity,
+                                R.string.cant_create_source,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
 
-                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                    Toast.makeText(
-                        this@AddSourceActivity,
-                        R.string.cant_create_source,
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            })
+                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        Toast.makeText(
+                            this@AddSourceActivity,
+                            R.string.cant_create_source,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                })
+            }
         }
     }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt

@@ -14,7 +14,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
-import android.widget.Toast
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.databinding.ActivityLoginBinding
@@ -22,7 +21,6 @@ import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import retrofit2.Call
 import retrofit2.Callback
@@ -91,16 +89,16 @@ class LoginActivity : AppCompatActivity() {
             isWithLogin = !isWithLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            binding.loginLayout.visibility = visi
-            binding.passwordLayout.visibility = visi
+            binding.loginView.visibility = visi
+            binding.passwordView.visibility = visi
         }
 
         binding.withHttpLogin.setOnCheckedChangeListener { _, b ->
             isWithHTTPLogin = !isWithHTTPLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            binding.httpLoginInput.visibility = visi
-            binding.httpPasswordInput.visibility = visi
+            binding.httpLoginView.visibility = visi
+            binding.httpPasswordView.visibility = visi
         }
     }
 
@@ -111,9 +109,8 @@ class LoginActivity : AppCompatActivity() {
             alertDialog.setMessage(getString(R.string.base_url_error))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK",
-                { dialog, _ -> dialog.dismiss() }
-            )
+                "OK"
+            ) { dialog, _ -> dialog.dismiss() }
             alertDialog.show()
         }
     }
@@ -154,9 +151,8 @@ class LoginActivity : AppCompatActivity() {
                 alertDialog.setMessage(getString(R.string.text_wrong_url))
                 alertDialog.setButton(
                     AlertDialog.BUTTON_NEUTRAL,
-                    "OK",
-                    { dialog, _ -> dialog.dismiss() }
-                )
+                    "OK"
+                ) { dialog, _ -> dialog.dismiss() }
                 alertDialog.show()
                 inValidCount = 0
             }

app/src/main/java/apps/amine/bou/readerforselfoss/MainActivity.kt

@@ -2,9 +2,7 @@ package apps.amine.bou.readerforselfoss
 
 import android.content.Intent
 import android.os.Bundle
-import android.preference.PreferenceManager
 import androidx.appcompat.app.AppCompatActivity
-import apps.amine.bou.readerforselfoss.databinding.ActivityAddSourceBinding
 import apps.amine.bou.readerforselfoss.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {

app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt

@@ -6,7 +6,7 @@ import android.content.Context
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.widget.ImageView
 import androidx.multidex.MultiDexApplication
 import apps.amine.bou.readerforselfoss.utils.Config
@@ -60,23 +60,18 @@ class MyApp : MultiDexApplication() {
 
     private fun initDrawerImageLoader() {
         DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
-            override fun set(
-                imageView: ImageView?,
-                uri: Uri?,
-                placeholder: Drawable?,
-                tag: String?
-            ) {
+            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
                 Glide.with(imageView?.context)
                     .loadMaybeBasicAuth(config, uri.toString())
                     .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
                     .into(imageView)
             }
 
-            override fun cancel(imageView: ImageView?) {
+            override fun cancel(imageView: ImageView) {
                 Glide.with(imageView?.context).clear(imageView)
             }
 
-            override fun placeholder(ctx: Context?, tag: String?): Drawable {
+            override fun placeholder(ctx: Context, tag: String?): Drawable {
                 return baseContext.resources.getDrawable(R.mipmap.ic_launcher)
             }
         })

app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt

@@ -2,10 +2,13 @@ package apps.amine.bou.readerforselfoss
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.core.content.ContextCompat
@@ -14,17 +17,12 @@ import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
 import androidx.room.Room
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.databinding.ActivityImageBinding
 import apps.amine.bou.readerforselfoss.databinding.ActivityReaderBinding
 import apps.amine.bou.readerforselfoss.fragments.ArticleFragment
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
@@ -32,16 +30,10 @@ import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
-import apps.amine.bou.readerforselfoss.utils.succeeded
+import apps.amine.bou.readerforselfoss.utils.SharedItems
 import apps.amine.bou.readerforselfoss.utils.toggleStar
 import com.ftinc.scoop.Scoop
 import me.relex.circleindicator.CircleIndicator
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import kotlin.concurrent.thread
 
 class ReaderActivity : AppCompatActivity() {
 
@@ -62,8 +54,11 @@ class ReaderActivity : AppCompatActivity() {
     val ALIGN_LEFT = 2
 
     private fun showMenuItem(willAddToFavorite: Boolean) {
-        toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite
-        toolbarMenu.findItem(R.id.unsave).isVisible = !willAddToFavorite
+        if (willAddToFavorite) {
+            toolbarMenu.findItem(R.id.star).icon.colorFilter = PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP)
+        } else {
+            toolbarMenu.findItem(R.id.star).icon.colorFilter = PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
+        }
     }
 
     private fun canFavorite() {
@@ -90,9 +85,7 @@ class ReaderActivity : AppCompatActivity() {
 
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-        }
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
 
         setSupportActionBar(binding.toolBar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -146,42 +139,16 @@ class ReaderActivity : AppCompatActivity() {
                     } else {
                         canFavorite()
                     }
-                    readItem(allItems[binding.pager.currentItem])
+                    readItem(allItems[position])
                 }
             }
         )
     }
 
-    fun readItem(item: Item) {
+    private fun readItem(item: Item) {
         if (markOnScroll) {
-            thread {
-                db.itemsDao().delete(item.toEntity())
+                SharedItems.readItem(applicationContext, api, db, item)
             }
-            if (this@ReaderActivity.isNetworkAccessible(this@ReaderActivity.findViewById(R.id.reader_activity_view))) {
-                api.markItem(item.id).enqueue(
-                    object : Callback<SuccessResponse> {
-                        override fun onResponse(
-                            call: Call<SuccessResponse>,
-                            response: Response<SuccessResponse>
-                        ) {
-                        }
-
-                        override fun onFailure(
-                            call: Call<SuccessResponse>,
-                            t: Throwable
-                        ) {
-                            thread {
-                                db.itemsDao().insertAllItems(item.toEntity())
-                            }
-                        }
-                    }
-                )
-            } else {
-                thread {
-                    db.actionsDao().insertAllActions(ActionEntity(item.id, true, false, false, false))
-                }
-            }
-        }
     }
 
     private fun notifyAdapter() {
@@ -266,62 +233,23 @@ class ReaderActivity : AppCompatActivity() {
                 onBackPressed()
                 return true
             }
-            R.id.save -> {
-                if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.starrItem(allItems[binding.pager.currentItem].id)
-                        .enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                                afterSave()
-                            }
-
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                Toast.makeText(
-                                    baseContext,
-                                    R.string.cant_mark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
+            R.id.star -> {
+                if (allItems[binding.pager.currentItem].starred) {
+                    SharedItems.unstarItem(
+                        this@ReaderActivity,
+                        api,
+                        db,
+                        allItems[binding.pager.currentItem]
+                    )
+                    afterUnsave()
                 } else {
-                    thread {
-                        db.actionsDao().insertAllActions(ActionEntity(allItems[binding.pager.currentItem].id, false, false, true, false))
-                        afterSave()
-                    }
-                }
-            }
-            R.id.unsave -> {
-                if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.unstarrItem(allItems[binding.pager.currentItem].id)
-                        .enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                                afterUnsave()
-                            }
-
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                Toast.makeText(
-                                    baseContext,
-                                    R.string.cant_unmark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
-                } else {
-                    thread {
-                        db.actionsDao().insertAllActions(ActionEntity(allItems[binding.pager.currentItem].id, false, false, false, true))
-                        afterUnsave()
-                    }
+                    SharedItems.starItem(
+                        this@ReaderActivity,
+                        api,
+                        db,
+                        allItems[binding.pager.currentItem]
+                    )
+                    afterSave()
                 }
             }
             R.id.align_left -> {

app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt

@@ -3,16 +3,14 @@ package apps.amine.bou.readerforselfoss
 import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
-import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.adapters.SourcesListAdapter
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Source
-import apps.amine.bou.readerforselfoss.databinding.ActivityImageBinding
 import apps.amine.bou.readerforselfoss.databinding.ActivitySourcesBinding
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
@@ -39,9 +37,7 @@ class SourcesActivity : AppCompatActivity() {
 
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-        }
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
 
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt

@@ -2,29 +2,26 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.content.Context
-import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView.ScaleType
-import android.widget.Toast
 import androidx.core.content.ContextCompat
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.databinding.CardItemBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
+import apps.amine.bou.readerforselfoss.utils.SharedItems
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAvailable
 import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
@@ -33,12 +30,6 @@ import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.bumptech.glide.Glide
-import com.like.LikeButton
-import com.like.OnLikeListener
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import kotlin.concurrent.thread
 
 class ItemCardAdapter(
     override val app: Activity,
@@ -68,13 +59,13 @@ class ItemCardAdapter(
         with(holder) {
             val itm = items[position]
 
-
-            binding.favButton.isLiked = itm.starred
+            binding.favButton.isSelected = itm.starred
             binding.title.text = itm.getTitleDecoded()
             binding.title.setTextColor(ContextCompat.getColor(
                     c,
                     appColors.textColor
             ))
+
             binding.title.setOnTouchListener(LinkOnTouchListener())
 
             binding.title.setLinkTextColor(appColors.colorAccent)
@@ -112,8 +103,6 @@ class ItemCardAdapter(
             } else {
                 c.circularBitmapDrawable(config, itm.getIcon(c), binding.sourceImage)
             }
-
-            binding.favButton.isLiked = itm.starred
         }
     }
 
@@ -130,75 +119,30 @@ class ItemCardAdapter(
 
         private fun handleClickListeners() {
 
-            binding.favButton.setOnLikeListener(object : OnLikeListener {
-                override fun liked(likeButton: LikeButton) {
-                    val (id) = items[bindingAdapterPosition]
-                    if (c.isNetworkAccessible(null)) {
-                        api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                            }
-
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                binding.favButton.isLiked = false
-                                Toast.makeText(
-                                    c,
-                                    R.string.cant_mark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
-                    } else {
-                        thread {
-                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, true, false))
-                        }
-                    }
-                }
-
-                override fun unLiked(likeButton: LikeButton) {
-                    val (id) = items[bindingAdapterPosition]
-                    if (c.isNetworkAccessible(null)) {
-                        api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                            }
-
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                binding.favButton.isLiked = true
-                                Toast.makeText(
-                                    c,
-                                    R.string.cant_unmark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
-                    } else {
-                        thread {
-                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, false, true))
-                        }
-                    }
-                }
-            })
-
-            binding.shareBtn.setOnClickListener {
+            binding.favButton.setOnClickListener {
                 val item = items[bindingAdapterPosition]
-                c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
+                if (isNetworkAvailable(c)) {
+                    if (item.starred) {
+                        SharedItems.unstarItem(c, api, db, item)
+                        item.starred = false
+                        binding.favButton.isSelected = false
+                    } else {
+                        SharedItems.starItem(c, api, db, item)
+                        item.starred = true
+                        binding.favButton.isSelected = true
+                    }
+                }
             }
 
-            binding.browserBtn.setOnClickListener {
-                c.openInBrowserAsNewTask(items[bindingAdapterPosition])
+                binding.shareBtn.setOnClickListener {
+                    val item = items[bindingAdapterPosition]
+                    c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
+                }
+
+                binding.browserBtn.setOnClickListener {
+                    c.openInBrowserAsNewTask(items[bindingAdapterPosition])
+                }
             }
-        }
 
         private fun handleCustomTabActions() {
             val customTabsIntent = c.buildCustomTabsIntent()

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt

@@ -2,22 +2,12 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.content.Context
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
-import android.text.Spannable
-import android.text.style.ClickableSpan
-import android.util.TypedValue
 import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
-import android.widget.Toast
 import androidx.core.content.ContextCompat
-import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.databinding.ListItemBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.themes.AppColors
@@ -27,19 +17,11 @@ import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
-import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
-import apps.amine.bou.readerforselfoss.utils.shareLink
 import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
-import com.like.LikeButton
-import com.like.OnLikeListener
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.util.*
 import kotlin.collections.ArrayList
 
 class ItemListAdapter(

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt

@@ -2,25 +2,16 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.graphics.Color
-import com.google.android.material.snackbar.Snackbar
-import androidx.recyclerview.widget.RecyclerView
 import android.widget.TextView
-import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
-import apps.amine.bou.readerforselfoss.utils.succeeded
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import kotlin.concurrent.thread
+import apps.amine.bou.readerforselfoss.utils.SharedItems
+import com.google.android.material.snackbar.Snackbar
 
 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>() {
     abstract var items: ArrayList<Item>
@@ -32,8 +23,8 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
     abstract val config: Config
     abstract val updateItems: (ArrayList<Item>) -> Unit
 
-    fun updateAllItems(newItems: ArrayList<Item>) {
-        items = newItems
+    fun updateAllItems() {
+        items = SharedItems.focusedItems
         notifyDataSetChanged()
         updateItems(items)
     }
@@ -46,34 +37,11 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                 Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
-                items.add(position, i)
-                thread {
-                    db.itemsDao().insertAllItems(i.toEntity())
-                }
-                notifyItemInserted(position)
-                updateItems(items)
-
-                if (app.isNetworkAccessible(null)) {
-                    api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(
-                            call: Call<SuccessResponse>,
-                            response: Response<SuccessResponse>
-                        ) {
-                        }
-
-                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                            items.remove(i)
-                            thread {
-                                db.itemsDao().delete(i.toEntity())
-                            }
-                            notifyItemRemoved(position)
-                            updateItems(items)
-                        }
-                    })
+                SharedItems.unreadItem(app, api, db, i)
+                if (SharedItems.displayedItems == "unread") {
+                    addItemAtIndex(i, position)
                 } else {
-                    thread {
-                        db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
-                    }
+                    notifyItemChanged(position)
                 }
             }
 
@@ -83,7 +51,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    private fun markSnackbar(i: Item, position: Int) {
+    private fun markSnackbar(position: Int) {
         val s = Snackbar
             .make(
                 app.findViewById(R.id.coordLayout),
@@ -91,34 +59,13 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                 Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
-                items.add(position, i)
-                thread {
-                    db.itemsDao().delete(i.toEntity())
-                }
-                notifyItemInserted(position)
-                updateItems(items)
-
-                if (app.isNetworkAccessible(null)) {
-                    api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(
-                            call: Call<SuccessResponse>,
-                            response: Response<SuccessResponse>
-                        ) {
-                        }
-
-                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                            items.remove(i)
-                            thread {
-                                db.itemsDao().insertAllItems(i.toEntity())
-                            }
-                            notifyItemRemoved(position)
-                            updateItems(items)
-                        }
-                    })
+                SharedItems.readItem(app, api, db, items[position])
+                items = SharedItems.focusedItems
+                if (SharedItems.displayedItems == "unread") {
+                    notifyItemRemoved(position)
+                    updateItems(items)
                 } else {
-                    thread {
-                        db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
-                    }
+                    notifyItemChanged(position)
                 }
             }
 
@@ -129,99 +76,30 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
     }
 
     fun handleItemAtIndex(position: Int) {
-        if (unreadItemStatusAtIndex(position)) {
+        if (SharedItems.unreadItemStatusAtIndex(position)) {
             readItemAtIndex(position)
         } else {
             unreadItemAtIndex(position)
         }
     }
 
-    fun unreadItemStatusAtIndex(position: Int): Boolean {
-        return items[position].unread
-    }
-
     private fun readItemAtIndex(position: Int) {
         val i = items[position]
-        items.remove(i)
-        notifyItemRemoved(position)
-        updateItems(items)
-
-        thread {
-            db.itemsDao().delete(i.toEntity())
-        }
-
-        if (app.isNetworkAccessible(null)) {
-            api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-
-                    unmarkSnackbar(i, position)
-                }
-
-                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                    Toast.makeText(
-                        app,
-                        app.getString(R.string.cant_mark_read),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    items.add(position, i)
-                    notifyItemInserted(position)
-                    updateItems(items)
-
-                    thread {
-                        db.itemsDao().insertAllItems(i.toEntity())
-                    }
-                }
-            })
+        SharedItems.readItem(app, api, db, i)
+        if (SharedItems.displayedItems == "unread") {
+            items.remove(i)
+            notifyItemRemoved(position)
+            updateItems(items)
         } else {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
-            }
+            notifyItemChanged(position)
         }
+        unmarkSnackbar(i, position)
     }
 
     private fun unreadItemAtIndex(position: Int) {
-        val i = items[position]
-        items.remove(i)
-        notifyItemRemoved(position)
-        updateItems(items)
-
-        thread {
-            db.itemsDao().insertAllItems(i.toEntity())
-        }
-
-        if (app.isNetworkAccessible(null)) {
-            api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-
-                    markSnackbar(i, position)
-                }
-
-                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                    Toast.makeText(
-                        app,
-                        app.getString(R.string.cant_mark_unread),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    items.add(i)
-                    notifyItemInserted(position)
-                    updateItems(items)
-
-                    thread {
-                        db.itemsDao().delete(i.toEntity())
-                    }
-                }
-            })
-        } else {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
-            }
-        }
+        SharedItems.unreadItem(app, api, db, items[position])
+        notifyItemChanged(position)
+        markSnackbar(position)
     }
 
     fun addItemAtIndex(item: Item, position: Int) {

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt

@@ -3,6 +3,7 @@ package apps.amine.bou.readerforselfoss.api.selfoss
 import android.app.Activity
 import android.content.Context
 import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.SharedItems
 import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
 import com.burgstaller.okhttp.AuthenticationCacheInterceptor
 import com.burgstaller.okhttp.CachingAuthenticatorDecorator
@@ -13,6 +14,8 @@ import com.burgstaller.okhttp.digest.Credentials
 import com.burgstaller.okhttp.digest.DigestAuthenticator
 import com.google.gson.GsonBuilder
 import okhttp3.*
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.ResponseBody.Companion.toResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Call
 import retrofit2.Retrofit
@@ -67,7 +70,7 @@ class SelfossApi(
                     val request: Request = chain.request()
                     val response: Response = chain.proceed(request)
 
-                    if (response.code() == 408) {
+                    if (response.code == 408) {
                         return response
                     }
                     return response
@@ -102,7 +105,7 @@ class SelfossApi(
         httpClient
                 .addInterceptor { chain ->
                     val res = chain.proceed(chain.request())
-                    if (res.code() == timeoutCode) {
+                    if (res.code == timeoutCode) {
                         throw SocketTimeoutException("timeout")
                     }
                     res
@@ -116,7 +119,7 @@ class SelfossApi(
                         Response.Builder()
                                 .code(timeoutCode)
                                 .protocol(Protocol.HTTP_2)
-                                .body(ResponseBody.create(MediaType.parse("text/plain"), ""))
+                                .body("".toResponseBody("text/plain".toMediaTypeOrNull()))
                                 .message("")
                                 .request(request)
                                 .build()
@@ -142,54 +145,50 @@ class SelfossApi(
     fun login(): Call<SuccessResponse> =
         service.loginToSelfoss(config.userLogin, config.userPassword)
 
-    fun readItems(
-        tag: String?,
-        sourceId: Long?,
-        search: String?,
+    suspend fun readItems(
         itemsNumber: Int,
         offset: Int
-    ): Call<List<Item>> =
-        getItems("read", tag, sourceId, search, itemsNumber, offset)
+    ): retrofit2.Response<List<Item>> =
+        getItems("read", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
 
-    fun newItems(
-        tag: String?,
-        sourceId: Long?,
-        search: String?,
+    suspend fun newItems(
         itemsNumber: Int,
         offset: Int
-    ): Call<List<Item>> =
-        getItems("unread", tag, sourceId, search, itemsNumber, offset)
+    ): retrofit2.Response<List<Item>> =
+        getItems("unread", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
 
-    fun starredItems(
-        tag: String?,
-        sourceId: Long?,
-        search: String?,
+    suspend fun starredItems(
         itemsNumber: Int,
         offset: Int
-    ): Call<List<Item>> =
-        getItems("starred", tag, sourceId, search, itemsNumber, offset)
+    ): retrofit2.Response<List<Item>> =
+        getItems("starred", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
 
     fun allItems(): Call<List<Item>> =
         service.allItems(userName, password)
 
-    fun allNewItems(): Call<List<Item>> =
+    suspend fun allNewItems(): retrofit2.Response<List<Item>> =
             getItems("unread", null, null, null, 200, 0)
 
-    fun allReadItems(): Call<List<Item>> =
+    suspend fun allReadItems(): retrofit2.Response<List<Item>> =
             getItems("read", null, null, null, 200, 0)
 
-    fun allStarredItems(): Call<List<Item>> =
-            getItems("read", null, null, null, 200, 0)
+    suspend fun allStarredItems(): retrofit2.Response<List<Item>> =
+        getItems("read", null, null, null, 200, 0)
 
-    private fun getItems(
+    private suspend fun getItems(
         type: String,
         tag: String?,
         sourceId: Long?,
         search: String?,
         items: Int,
         offset: Int
-    ): Call<List<Item>> =
-        service.getItems(type, tag, sourceId, search, userName, password, items, offset)
+    ): retrofit2.Response<List<Item>> =
+        service.getItems(type, tag, sourceId, search, null, userName, password, items, offset)
+
+    suspend fun updateItems(
+        updatedSince: String
+    ): retrofit2.Response<List<Item>> =
+        service.getItems("read", null, null, null, updatedSince, userName, password, 200, 0)
 
     fun markItem(itemId: String): Call<SuccessResponse> =
         service.markAsRead(itemId, userName, password)
@@ -197,7 +196,7 @@ class SelfossApi(
     fun unmarkItem(itemId: String): Call<SuccessResponse> =
         service.unmarkAsRead(itemId, userName, password)
 
-    fun readAll(ids: List<String>): Call<SuccessResponse> =
+    suspend fun readAll(ids: List<String>): SuccessResponse =
         service.markAllAsRead(ids, userName, password)
 
     fun starrItem(itemId: String): Call<SuccessResponse> =
@@ -206,8 +205,7 @@ class SelfossApi(
     fun unstarrItem(itemId: String): Call<SuccessResponse> =
         service.unstarr(itemId, userName, password)
 
-    val stats: Call<Stats>
-        get() = service.stats(userName, password)
+    suspend fun stats(): retrofit2.Response<Stats> = service.stats(userName, password)
 
     val tags: Call<List<Tag>>
         get() = service.tags(userName, password)
@@ -235,4 +233,13 @@ class SelfossApi(
         filter: String
     ): Call<SuccessResponse> =
         service.createSource(title, url, spout, tags, filter, userName, password)
+
+    fun createSourceApi2(
+        title: String,
+        url: String,
+        spout: String,
+        tags: List<String>,
+        filter: String
+    ): Call<SuccessResponse> =
+        service.createSourceApi2(title, url, spout, tags, filter, userName, password)
 }

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossFetching.kt

@@ -0,0 +1,134 @@
+package apps.amine.bou.readerforselfoss.api.selfoss
+
+import android.content.Context
+import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
+import apps.amine.bou.readerforselfoss.utils.SharedItems
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAvailable
+import kotlinx.coroutines.*
+import retrofit2.Response
+
+suspend fun getAndStoreAllItems(context: Context, api: SelfossApi, db: AppDatabase) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        launch {
+            try {
+                enqueueArticles(api.allNewItems(), db, true)
+            } catch (e: Throwable) {}
+        }
+        launch {
+            try {
+                enqueueArticles(api.allReadItems(), db, false)
+            } catch (e: Throwable) {}
+        }
+        launch {
+            try {
+                enqueueArticles(api.allStarredItems(), db, false)
+            } catch (e: Throwable) {}
+        }
+    } else {
+        launch { SharedItems.updateDatabase(db) }
+    }
+}
+
+suspend fun updateItems(context: Context, api: SelfossApi, db: AppDatabase) = coroutineScope {
+    if (isNetworkAvailable(context)) {
+        launch {
+            try {
+                enqueueArticles(api.updateItems(SharedItems.items[0].datetime), db, true)
+            } catch (e: Throwable) {}
+        }
+    }
+}
+
+suspend fun refreshFocusedItems(context: Context, api: SelfossApi, db: AppDatabase) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        val response = when (SharedItems.displayedItems) {
+            "read" -> api.readItems(200, 0)
+            "unread" -> api.newItems(200, 0)
+            "starred" -> api.starredItems(200, 0)
+            else -> api.readItems(200, 0)
+        }
+
+        if (response.isSuccessful) {
+            SharedItems.refreshFocusedItems(response.body() as ArrayList<Item>)
+            SharedItems.updateDatabase(db)
+        }
+    }
+}
+
+suspend fun getReadItems(context: Context, api: SelfossApi, db: AppDatabase, offset: Int) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+            try {
+                enqueueArticles(api.readItems( 200, offset), db, false)
+                SharedItems.fetchedAll = true
+                SharedItems.updateDatabase(db)
+            } catch (e: Throwable) {}
+    }
+}
+
+suspend fun getUnreadItems(context: Context, api: SelfossApi, db: AppDatabase, offset: Int) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        try {
+            if (!SharedItems.fetchedUnread) {
+                SharedItems.clearDBItems(db)
+            }
+            enqueueArticles(api.newItems(200, offset), db, false)
+            SharedItems.fetchedUnread = true
+        } catch (e: Throwable) {}
+    }
+    SharedItems.updateDatabase(db)
+}
+
+suspend fun getStarredItems(context: Context, api: SelfossApi, db: AppDatabase, offset: Int) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        try {
+            enqueueArticles(api.starredItems(200, offset), db, false)
+            SharedItems.fetchedStarred = true
+            SharedItems.updateDatabase(db)
+        } catch (e: Throwable) {
+        }
+    }
+}
+
+suspend fun readAll(context: Context, api: SelfossApi, db: AppDatabase): Boolean {
+    var success = false
+    if (isNetworkAvailable(context)) {
+        try {
+            val ids = SharedItems.focusedItems.map { it.id }
+            if (ids.isNotEmpty()) {
+                val result = api.readAll(ids)
+                SharedItems.readItems(db, ids)
+                success = result.isSuccess
+            }
+        } catch (e: Throwable) {}
+    }
+    return success
+}
+
+suspend fun reloadBadges(context: Context, api: SelfossApi) = withContext(Dispatchers.IO) {
+    if (isNetworkAvailable(context)) {
+        try {
+            val response = api.stats()
+
+            if (response.isSuccessful) {
+                val badges = response.body()
+                SharedItems.badgeUnread = badges!!.unread
+                SharedItems.badgeAll = badges.total
+                SharedItems.badgeStarred = badges.starred
+            }
+        } catch (e: Throwable) {}
+    } else {
+        SharedItems.computeBadges()
+    }
+}
+
+private fun enqueueArticles(response: Response<List<Item>>, db: AppDatabase, clearDatabase: Boolean) {
+        if (response.isSuccessful) {
+            if (clearDatabase) {
+                CoroutineScope(Dispatchers.IO).launch {
+                    SharedItems.clearDBItems(db)
+                }
+            }
+            val allItems = response.body() as ArrayList<Item>
+            SharedItems.appendNewItems(allItems)
+        }
+}

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt

@@ -30,7 +30,11 @@ data class Tag(
     @SerializedName("tag") val tag: String,
     @SerializedName("color") val color: String,
     @SerializedName("unread") val unread: Int
-)
+) {
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(tag).toString()
+    }
+}
 
 class SuccessResponse(@SerializedName("success") val success: Boolean) {
     val isSuccess: Boolean
@@ -88,7 +92,7 @@ data class Item(
     @SerializedName("datetime") val datetime: String,
     @SerializedName("title") val title: String,
     @SerializedName("content") val content: String,
-    @SerializedName("unread") val unread: Boolean,
+    @SerializedName("unread") var unread: Boolean,
     @SerializedName("starred") var starred: Boolean,
     @SerializedName("thumbnail") val thumbnail: String?,
     @SerializedName("icon") val icon: String?,

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossService.kt

@@ -1,6 +1,7 @@
 package apps.amine.bou.readerforselfoss.api.selfoss
 
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.DELETE
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded
@@ -16,16 +17,17 @@ internal interface SelfossService {
     fun loginToSelfoss(@Query("username") username: String, @Query("password") password: String): Call<SuccessResponse>
 
     @GET("items")
-    fun getItems(
+    suspend fun getItems(
         @Query("type") type: String,
         @Query("tag") tag: String?,
         @Query("source") source: Long?,
         @Query("search") search: String?,
+        @Query("updatedsince") updatedSince: String?,
         @Query("username") username: String,
         @Query("password") password: String,
         @Query("items") items: Int,
         @Query("offset") offset: Int
-    ): Call<List<Item>>
+    ): Response<List<Item>>
 
     @GET("items")
     fun allItems(
@@ -51,11 +53,11 @@ internal interface SelfossService {
 
     @FormUrlEncoded
     @POST("mark")
-    fun markAllAsRead(
+    suspend fun markAllAsRead(
         @Field("ids[]") ids: List<String>,
         @Query("username") username: String,
         @Query("password") password: String
-    ): Call<SuccessResponse>
+    ): SuccessResponse
 
     @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("starr/{id}")
@@ -74,10 +76,10 @@ internal interface SelfossService {
     ): Call<SuccessResponse>
 
     @GET("stats")
-    fun stats(
+    suspend fun stats(
         @Query("username") username: String,
         @Query("password") password: String
-    ): Call<Stats>
+    ): Response<Stats>
 
     @GET("tags")
     fun tags(
@@ -124,4 +126,16 @@ internal interface SelfossService {
         @Query("username") username: String,
         @Query("password") password: String
     ): Call<SuccessResponse>
+
+    @FormUrlEncoded
+    @POST("source")
+    fun createSourceApi2(
+        @Field("title") title: String,
+        @Field("url") url: String,
+        @Field("spout") spout: String,
+        @Field("tags[]") tags: List<String>,
+        @Field("filter") filter: String,
+        @Query("username") username: String,
+        @Query("password") password: String
+    ): Call<SuccessResponse>
 }

app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt

@@ -4,7 +4,8 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.preference.PreferenceManager
+import android.os.Build
+import androidx.preference.PreferenceManager
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationCompat.PRIORITY_LOW
@@ -13,16 +14,19 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import apps.amine.bou.readerforselfoss.MainActivity
 import apps.amine.bou.readerforselfoss.R
-import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
+import apps.amine.bou.readerforselfoss.api.selfoss.getAndStoreAllItems
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
+import apps.amine.bou.readerforselfoss.utils.SharedItems
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAvailable
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -33,123 +37,103 @@ import kotlin.concurrent.thread
 class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params) {
     lateinit var db: AppDatabase
 
-    override fun doWork(): Result {
-        if (context.isNetworkAccessible(null)) {
+override fun doWork(): Result {
+    val settings =
+        this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+    val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
+    val periodicRefresh = sharedPref.getBoolean("periodic_refresh", false)
+    if (periodicRefresh) {
+        val api = SelfossApi(
+            this.context,
+            null,
+            settings.getBoolean("isSelfSignedCert", false),
+            sharedPref.getString("api_timeout", "-1")!!.toLong()
+        )
 
-            val notificationManager =
-                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        if (isNetworkAvailable(context)) {
 
-            val notification = NotificationCompat.Builder(applicationContext, Config.syncChannelId)
-                .setContentTitle(context.getString(R.string.loading_notification_title))
-                .setContentText(context.getString(R.string.loading_notification_text))
-                .setOngoing(true)
-                .setPriority(PRIORITY_LOW)
-                .setChannelId(Config.syncChannelId)
-                .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+            CoroutineScope(Dispatchers.IO).launch {
+                val notificationManager =
+                    applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-            notificationManager.notify(1, notification.build())
+                val notification =
+                    NotificationCompat.Builder(applicationContext, Config.syncChannelId)
+                        .setContentTitle(context.getString(R.string.loading_notification_title))
+                        .setContentText(context.getString(R.string.loading_notification_text))
+                        .setOngoing(true)
+                        .setPriority(PRIORITY_LOW)
+                        .setChannelId(Config.syncChannelId)
+                        .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
 
-            val settings =
-                this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-            val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
-            val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
+                notificationManager.notify(1, notification.build())
 
-            db = Room.databaseBuilder(
-                applicationContext,
-                AppDatabase::class.java, "selfoss-database"
-            ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
+                val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
 
-            val api = SelfossApi(
-                this.context,
-                null,
-                settings.getBoolean("isSelfSignedCert", false),
-                sharedPref.getString("api_timeout", "-1")!!.toLong()
-            )
+                db = Room.databaseBuilder(
+                    applicationContext,
+                    AppDatabase::class.java, "selfoss-database"
+                ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3)
+                    .addMigrations(MIGRATION_3_4).build()
 
-            api.allNewItems().enqueue(object : Callback<List<Item>> {
-                override fun onFailure(call: Call<List<Item>>, t: Throwable) {
-                    Timer("", false).schedule(4000) {
-                        notificationManager.cancel(1)
-                    }
-                }
-
-                override fun onResponse(
-                    call: Call<List<Item>>,
-                    response: Response<List<Item>>
-                ) {
-                    storeItems(response, true, notifyNewItems, notificationManager)
-                }
-            })
-            api.allReadItems().enqueue(object : Callback<List<Item>> {
-                override fun onFailure(call: Call<List<Item>>, t: Throwable) {
-                    Timer("", false).schedule(4000) {
-                        notificationManager.cancel(1)
-                    }
-                }
-
-                override fun onResponse(
-                        call: Call<List<Item>>,
-                        response: Response<List<Item>>
-                ) {
-                    storeItems(response, false, notifyNewItems, notificationManager)
-                }
-            })
-            api.allStarredItems().enqueue(object : Callback<List<Item>> {
-                override fun onFailure(call: Call<List<Item>>, t: Throwable) {
-                    Timer("", false).schedule(4000) {
-                        notificationManager.cancel(1)
-                    }
-                }
-
-                override fun onResponse(
-                        call: Call<List<Item>>,
-                        response: Response<List<Item>>
-                ) {
-                    storeItems(response, false, notifyNewItems, notificationManager)
-                }
-            })
-
-            thread {
                 val actions = db.actionsDao().actions()
 
                 actions.forEach { action ->
                     when {
-                        action.read -> doAndReportOnFail(api.markItem(action.articleId), action)
-                        action.unread -> doAndReportOnFail(api.unmarkItem(action.articleId), action)
-                        action.starred -> doAndReportOnFail(api.starrItem(action.articleId), action)
+                        action.read -> doAndReportOnFail(
+                            api.markItem(action.articleId),
+                            action
+                        )
+                        action.unread -> doAndReportOnFail(
+                            api.unmarkItem(action.articleId),
+                            action
+                        )
+                        action.starred -> doAndReportOnFail(
+                            api.starrItem(action.articleId),
+                            action
+                        )
                         action.unstarred -> doAndReportOnFail(
                             api.unstarrItem(action.articleId),
                             action
                         )
                     }
                 }
+
+                getAndStoreAllItems(context, api, db)
+                SharedItems.updateDatabase(db)
+                storeItems(notifyNewItems, notificationManager)
             }
         }
-        return Result.success()
     }
+    return Result.success()
+}
 
-    private fun storeItems(response: Response<List<Item>>, newItems: Boolean, notifyNewItems: Boolean, notificationManager: NotificationManager) {
-        thread {
-            if (response.body() != null) {
-                val apiItems = (response.body() as ArrayList<Item>)
+    private fun storeItems(notifyNewItems: Boolean, notificationManager: NotificationManager) {
+        CoroutineScope(Dispatchers.IO).launch {
+                val apiItems = SharedItems.items
 
-                if (newItems) {
-                    db.itemsDao().deleteAllItems()
-                }
-                db.itemsDao()
-                        .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
 
                 val newSize = apiItems.filter { it.unread }.size
-                if (newItems && notifyNewItems && newSize > 0) {
+                if (notifyNewItems && newSize > 0) {
 
                     val intent = Intent(context, MainActivity::class.java).apply {
                         flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                     }
-                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
+                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        PendingIntent.FLAG_IMMUTABLE
+                    } else {
+                        0
+                    }
+                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
 
-                    val newItemsNotification = NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
+                    val newItemsNotification =
+                        NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
                             .setContentTitle(context.getString(R.string.new_items_notification_title))
-                            .setContentText(context.getString(R.string.new_items_notification_text, newSize))
+                            .setContentText(
+                                context.getString(
+                                    R.string.new_items_notification_text,
+                                    newSize
+                                )
+                            )
                             .setPriority(PRIORITY_DEFAULT)
                             .setChannelId(Config.newItemsChannelId)
                             .setContentIntent(pendingIntent)
@@ -161,7 +145,6 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                     }
                 }
                 apiItems.map { it.preloadImages(context) }
-            }
             Timer("", false).schedule(4000) {
                 notificationManager.cancel(1)
             }

app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt

@@ -9,11 +9,11 @@ import android.graphics.Bitmap
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.view.*
 import android.webkit.*
+import android.widget.Toast
 import androidx.browser.customtabs.CustomTabsIntent
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import androidx.fragment.app.Fragment
@@ -28,25 +28,17 @@ import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.databinding.FragmentArticleBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.themes.AppColors
-import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
+import apps.amine.bou.readerforselfoss.utils.*
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import apps.amine.bou.readerforselfoss.utils.glide.getBitmapInputStream
-import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.openItemUrl
-import apps.amine.bou.readerforselfoss.utils.shareLink
-import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
-import apps.amine.bou.readerforselfoss.utils.succeeded
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
@@ -58,7 +50,6 @@ import java.net.MalformedURLException
 import java.net.URL
 import java.util.concurrent.ExecutionException
 import kotlin.collections.ArrayList
-import kotlin.concurrent.thread
 
 class ArticleFragment : Fragment() {
     private lateinit var pageNumber: Number
@@ -85,6 +76,7 @@ class ArticleFragment : Fragment() {
     private var typeface: Typeface? = null
     private var resId: Int = 0
     private var font = ""
+    private var staticBar = false
 
     override fun onStop() {
         super.onStop()
@@ -126,6 +118,7 @@ class ArticleFragment : Fragment() {
             prefs = PreferenceManager.getDefaultSharedPreferences(activity)
             editor = prefs.edit()
             fontSize = prefs.getString("reader_font_size", "16")!!.toInt()
+            staticBar = prefs.getBoolean("reader_static_bar", false)
 
             font = prefs.getString("reader_font", "")!!
             if (font.isNotEmpty()) {
@@ -181,25 +174,33 @@ class ArticleFragment : Fragment() {
                                 false,
                                 requireActivity()
                             )
-                            R.id.unread_action -> if ((context != null && requireContext().isNetworkAccessible(null)) || context == null) {
-                                api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
-                                    object : Callback<SuccessResponse> {
-                                        override fun onResponse(
-                                            call: Call<SuccessResponse>,
-                                            response: Response<SuccessResponse>
-                                        ) {
-                                        }
-
-                                        override fun onFailure(
-                                            call: Call<SuccessResponse>,
-                                            t: Throwable
-                                        ) {
-                                        }
-                                    }
-                                )
-                            } else {
-                                thread {
-                                    db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
+                            R.id.unread_action -> if (context != null) {
+                                if (allItems[pageNumber.toInt()].unread) {
+                                    SharedItems.readItem(
+                                        context!!,
+                                        api,
+                                        db,
+                                        allItems[pageNumber.toInt()]
+                                    )
+                                    allItems[pageNumber.toInt()].unread = false
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_read,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                } else {
+                                    SharedItems.unreadItem(
+                                        context!!,
+                                        api,
+                                        db,
+                                        allItems[pageNumber.toInt()]
+                                    )
+                                    allItems[pageNumber.toInt()].unread = true
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_unread,
+                                        Toast.LENGTH_LONG
+                                    ).show()
                                 }
                             }
                             else -> Unit
@@ -211,6 +212,11 @@ class ArticleFragment : Fragment() {
                 }
             )
 
+            if (staticBar) {
+                fab.hide()
+                floatingToolbar.show()
+            }
+
             binding.source.text = contentSource
             if (typeface != null) {
                 binding.source.typeface = typeface
@@ -242,9 +248,14 @@ class ArticleFragment : Fragment() {
             binding.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                     if (scrollY > oldScrollY) {
+                        floatingToolbar.hide()
                         fab.hide()
                     } else {
-                        if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
+                        if (staticBar) {
+                            floatingToolbar.show()
+                        } else {
+                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
+                        }
                     }
                 }
             )
@@ -462,12 +473,8 @@ class ArticleFragment : Fragment() {
 
         binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            binding.webcontent.settings.layoutAlgorithm =
-                    WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
-        } else {
-            binding.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
-        }
+        binding.webcontent.settings.layoutAlgorithm =
+                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 
         var baseUrl: String? = null
 

app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/ActionsDao.kt

@@ -10,7 +10,7 @@ import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 @Dao
 interface ActionsDao {
     @Query("SELECT * FROM actions order by id asc")
-    fun actions(): List<ActionEntity>
+    suspend fun actions(): List<ActionEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertAllActions(vararg actions: ActionEntity)

app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/ItemsDao.kt

@@ -13,17 +13,17 @@ import androidx.room.Update
 @Dao
 interface ItemsDao {
     @Query("SELECT * FROM items order by id desc")
-    fun items(): List<ItemEntity>
+    suspend fun items(): List<ItemEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAllItems(vararg items: ItemEntity)
+    suspend fun insertAllItems(vararg items: ItemEntity)
 
     @Query("DELETE FROM items")
-    fun deleteAllItems()
+    suspend fun deleteAllItems()
 
     @Delete
-    fun delete(item: ItemEntity)
+    suspend fun delete(item: ItemEntity)
 
     @Update
-    fun updateItem(item: ItemEntity)
+    suspend fun updateItem(item: ItemEntity)
 }

app/src/main/java/apps/amine/bou/readerforselfoss/settings/AppCompatPreferenceActivity.java

@@ -1,142 +0,0 @@
-package apps.amine.bou.readerforselfoss.settings;
-
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceActivity;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import com.google.android.material.appbar.AppBarLayout;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.Toolbar;
-import android.view.LayoutInflater;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import com.ftinc.scoop.Scoop;
-
-import apps.amine.bou.readerforselfoss.R;
-import apps.amine.bou.readerforselfoss.themes.AppColors;
-import apps.amine.bou.readerforselfoss.themes.Toppings;
-
-
-/**
- * A {@link PreferenceActivity} which implements and proxies the necessary calls
- * to be used with AppCompat.
- */
-public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
-
-    private AppCompatDelegate mDelegate;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        new AppColors(this);
-
-        getDelegate().installViewFactory();
-        getDelegate().onCreate(savedInstanceState);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-
-        LinearLayout root = (LinearLayout) findViewById(android.R.id.list).getParent().getParent().getParent();
-        AppBarLayout bar = (AppBarLayout) LayoutInflater.from(this).inflate(R.layout.settings_toolbar, root, false);
-        Toolbar toolbar = bar.findViewById(R.id.toolbar);
-
-        Scoop scoop = Scoop.getInstance();
-        scoop.bind(this, Toppings.PRIMARY.getValue(), toolbar);
-        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.getValue());
-        }
-
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setDisplayShowHomeEnabled(true);
-
-        root.addView(bar, 0);
-
-        getDelegate().onPostCreate(savedInstanceState);
-    }
-
-    ActionBar getSupportActionBar() {
-        return getDelegate().getSupportActionBar();
-    }
-
-    public void setSupportActionBar(@Nullable Toolbar toolbar) {
-        getDelegate().setSupportActionBar(toolbar);
-    }
-
-    @NonNull
-    @Override
-    public MenuInflater getMenuInflater() {
-        return getDelegate().getMenuInflater();
-    }
-
-    @Override
-    public void setContentView(@LayoutRes int layoutResID) {
-        getDelegate().setContentView(layoutResID);
-    }
-
-    @Override
-    public void setContentView(View view) {
-        getDelegate().setContentView(view);
-    }
-
-    @Override
-    public void setContentView(View view, ViewGroup.LayoutParams params) {
-        getDelegate().setContentView(view, params);
-    }
-
-    @Override
-    public void addContentView(View view, ViewGroup.LayoutParams params) {
-        getDelegate().addContentView(view, params);
-    }
-
-    @Override
-    protected void onPostResume() {
-        super.onPostResume();
-        getDelegate().onPostResume();
-    }
-
-    @Override
-    protected void onTitleChanged(CharSequence title, int color) {
-        super.onTitleChanged(title, color);
-        getDelegate().setTitle(title);
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        getDelegate().onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        getDelegate().onStop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        getDelegate().onDestroy();
-    }
-
-    @Override
-    public void invalidateOptionsMenu() {
-        getDelegate().invalidateOptionsMenu();
-    }
-
-    private AppCompatDelegate getDelegate() {
-        if (mDelegate == null) {
-            mDelegate = AppCompatDelegate.create(this, null);
-        }
-        return mDelegate;
-    }
-}

app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java

@@ -1,345 +0,0 @@
-package apps.amine.bou.readerforselfoss.settings;
-
-
-import android.annotation.TargetApi;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-import android.preference.SwitchPreference;
-import androidx.appcompat.app.ActionBar;
-import android.text.Editable;
-import android.text.InputFilter;
-import android.text.Spanned;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import java.util.List;
-
-import apps.amine.bou.readerforselfoss.R;
-import apps.amine.bou.readerforselfoss.themes.AppColors;
-import apps.amine.bou.readerforselfoss.utils.Config;
-
-
-/**
- * A {@link PreferenceActivity} that presents a set of application settings. On
- * handset devices, settings are presented as a single list. On tablets,
- * settings are split by category, with category headers shown to the left of
- * the list of settings.
- * <p>
- * See <a href="http://developer.android.com/design/patterns/settings.html">
- * Android Design: Settings</a> for design guidelines and the <a
- * href="http://developer.android.com/guide/topics/ui/settings.html">Settings
- * API Guide</a> for more information on developing a Settings UI.
- */
-public class SettingsActivity extends AppCompatPreferenceActivity {
-    /**
-     * A preference value change listener that updates the preference's summary
-     * to reflect its new value.
-     */
-    private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() {
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object value) {
-            String stringValue = value.toString();
-            preference.setSummary(stringValue);
-            return true;
-        }
-    };
-
-    /**
-     * Helper method to determine if the device has an extra-large screen. For
-     * example, 10" tablets are extra-large.
-     */
-    private static boolean isXLargeTablet(Context context) {
-        return (context.getResources().getConfiguration().screenLayout
-                & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
-    }
-
-    /**
-     * Binds a preference's summary to its value. More specifically, when the
-     * preference's value is changed, its summary (line of text below the
-     * preference title) is updated to reflect the value. The summary is also
-     * immediately updated upon calling this method. The exact display format is
-     * dependent on the type of preference.
-     *
-     * @see #sBindPreferenceSummaryToValueListener
-     */
-    private static void bindPreferenceSummaryToValue(Preference preference) {
-        // Set the listener to watch for value changes.
-        preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
-
-        // Trigger the listener immediately with the preference's
-        // current value.
-        sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
-                PreferenceManager
-                        .getDefaultSharedPreferences(preference.getContext())
-                        .getString(preference.getKey(), ""));
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        new AppColors(this);
-        super.onCreate(savedInstanceState);
-        setupActionBar();
-    }
-
-    /**
-     * Set up the {@link android.app.ActionBar}, if the API is available.
-     */
-    private void setupActionBar() {
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            // Show the Up button in the action bar.
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean onIsMultiPane() {
-        return isXLargeTablet(this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public void onBuildHeaders(List<Header> target) {
-        loadHeadersFromResource(R.xml.pref_headers, target);
-
-        AppColors appColors = new AppColors(this);
-        if (appColors != null && appColors.isDarkTheme()) {
-            for (Header header : target) {
-                tryLoadIconDark(header);
-            }
-        }
-    }
-
-    private void tryLoadIconDark(Header header){
-        try{
-            if (header.fragmentArguments != null) {
-                String iconDark = header.fragmentArguments.getString("iconDark");
-                int iconDarkId = getResources().getIdentifier(iconDark, "drawable", getPackageName());
-                if (iconDarkId != 0) {
-                    header.iconRes = iconDarkId;
-                }
-            }
-        } catch (Exception e) {
-            Log.e("SettingsActivity", "Can not load dark icon", e);
-        }
-    }
-
-    /**
-     * This method stops fragment injection in malicious applications.
-     * Make sure to deny any unknown fragments here.
-     */
-    @Override
-    protected boolean isValidFragment(String fragmentName) {
-        return PreferenceFragment.class.getName().equals(fragmentName)
-                || GeneralPreferenceFragment.class.getName().equals(fragmentName)
-                || ArticleViewerPreferenceFragment.class.getName().equals(fragmentName)
-                || OfflinePreferenceFragment.class.getName().equals(fragmentName)
-                || ExperimentalPreferenceFragment.class.getName().equals(fragmentName)
-                || LinksPreferenceFragment.class.getName().equals(fragmentName)
-                || ThemePreferenceFragment.class.getName().equals(fragmentName);
-    }
-
-    /**
-     * This fragment shows general preferences only. It is used when the
-     * activity is showing a two-pane settings UI.
-     */
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class GeneralPreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_general);
-            setHasOptionsMenu(true);
-
-            EditTextPreference itemsNumber = (EditTextPreference) findPreference("prefer_api_items_number");
-            itemsNumber.getEditText().setFilters(new InputFilter[]{
-                    new InputFilter() {
-
-                        @Override
-                        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
-                            try {
-                                int input = Integer.parseInt(dest.toString() + source.toString());
-                                if (input <= 200 && input > 0)
-                                    return null;
-                            } catch (NumberFormatException nfe) {
-                                Toast.makeText(getActivity(), R.string.items_number_should_be_number, Toast.LENGTH_LONG).show();
-                            }
-                            return "";
-                        }
-                    }
-            });
-
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class ArticleViewerPreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_viewer);
-            setHasOptionsMenu(true);
-
-            final EditTextPreference fontSize = (EditTextPreference) findPreference("reader_font_size");
-            fontSize.getEditText().addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
-
-                @Override
-                public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
-
-                @Override
-                public void afterTextChanged(Editable editable) {
-                    try {
-                        fontSize.getEditText().setTextSize(Integer.parseInt(editable.toString()));
-                    } catch (NumberFormatException e) {}
-                }
-            });
-            fontSize.getEditText().setFilters(new InputFilter[]{
-                    new InputFilter() {
-
-                        @Override
-                        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
-                            try {
-                                int input = Integer.parseInt(dest.toString() + source.toString());
-                                if (input > 0)
-                                    return null;
-                            } catch (NumberFormatException nfe) {}
-                            return "";
-                        }
-                    }
-            });
-        }
-    }
-
-    /**
-     * This fragment shows general preferences only. It is used when the
-     * activity is showing a two-pane settings UI.
-     */
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class LinksPreferenceFragment extends PreferenceFragment {
-        public void openUrl(Uri uri) {
-            Intent browserIntent = new Intent(Intent.ACTION_VIEW, uri);
-            startActivity(browserIntent);
-        }
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_links);
-            setHasOptionsMenu(true);
-
-            findPreference("trackerLink").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    openUrl(Uri.parse(Config.trackerUrl));
-                    return true;
-                }
-            });
-
-            findPreference("sourceLink").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    openUrl(Uri.parse(Config.sourceUrl));
-                    return false;
-                }
-            });
-
-            findPreference("translation").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    openUrl(Uri.parse(Config.translationUrl));
-                    return false;
-                }
-            });
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class ThemePreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_theme);
-            setHasOptionsMenu(true);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == R.id.clear) {
-                SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getActivity());
-                SharedPreferences.Editor editor = pref.edit();
-                editor.remove("color_primary");
-                editor.remove("color_primary_dark");
-                editor.remove("color_accent");
-                editor.remove("color_accent_dark");
-                editor.remove("dark_theme");
-                editor.apply();
-                getActivity().recreate();
-            }
-            return super.onOptionsItemSelected(item);
-        }
-
-        @Override
-        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-            inflater.inflate(R.menu.settings_theme, menu);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class OfflinePreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_offline);
-            setHasOptionsMenu(true);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class ExperimentalPreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_experimental);
-            setHasOptionsMenu(true);
-        }
-    }
-
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if (id == android.R.id.home) {
-            super.onBackPressed();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}

app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.kt

@@ -0,0 +1,212 @@
+package apps.amine.bou.readerforselfoss.settings
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.text.*
+import androidx.preference.EditTextPreference
+import androidx.preference.PreferenceManager
+import android.view.*
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.addTextChangedListener
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import apps.amine.bou.readerforselfoss.R
+import apps.amine.bou.readerforselfoss.utils.Config
+import java.lang.NumberFormatException
+
+private const val TITLE_TAG = "settingsActivityTitle"
+
+class SettingsActivity : AppCompatActivity(),
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("dark_theme", false)) {
+            setTheme(R.style.NoBarDark)
+        }
+        setContentView(R.layout.activity_settings)
+        if (savedInstanceState == null) {
+            supportFragmentManager
+                    .beginTransaction()
+                    .replace(R.id.settings, MainPreferenceFragment())
+                    .commit()
+        } else {
+            title = savedInstanceState.getCharSequence(TITLE_TAG)
+        }
+        supportFragmentManager.addOnBackStackChangedListener {
+            if (supportFragmentManager.backStackEntryCount == 0) {
+                setTitle(R.string.title_activity_settings)
+            }
+        }
+
+        setSupportActionBar(findViewById(R.id.toolbar))
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.title = title
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        // Save current activity title so we can set it again after a configuration change
+        outState.putCharSequence(TITLE_TAG, title)
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        if (supportFragmentManager.popBackStackImmediate()) {
+            supportActionBar?.title = getText(R.string.title_activity_settings)
+            return true
+        }
+        return super.onSupportNavigateUp()
+    }
+
+    override fun onPreferenceStartFragment(
+            caller: PreferenceFragmentCompat,
+            pref: Preference
+    ): Boolean {
+        // Instantiate the new Fragment
+        val args = pref.extras
+        val fragment = supportFragmentManager.fragmentFactory.instantiate(
+                classLoader,
+                pref.fragment
+        ).apply {
+            arguments = args
+            setTargetFragment(caller, 0)
+        }
+        // Replace the existing Fragment with the new Fragment
+        supportFragmentManager.beginTransaction()
+                .replace(R.id.settings, fragment)
+                .addToBackStack(null)
+                .commit()
+        title = pref.title
+        supportActionBar?.title = title
+        return true
+    }
+
+    class MainPreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_main, rootKey)
+        }
+    }
+
+    class GeneralPreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_general, rootKey)
+
+            val editTextPreference = preferenceManager.findPreference<EditTextPreference>("prefer_api_items_number")
+            editTextPreference?.setOnBindEditTextListener { editText ->
+                editText.inputType = InputType.TYPE_CLASS_NUMBER
+                editText.filters = arrayOf(
+                        InputFilter { source, _, _, dest, _, _ ->
+                            try {
+                                val input: Int = (dest.toString() + source.toString()).toInt()
+                                if (input in 1..200) return@InputFilter null
+                            } catch (nfe: NumberFormatException) {
+                                Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
+                            }
+                            ""
+                        }
+                )
+            }
+        }
+    }
+
+    class ArticleViewerPreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_viewer, rootKey)
+
+            val fontSize = preferenceManager.findPreference<EditTextPreference>("reader_font_size")
+            fontSize?.setOnBindEditTextListener { editText ->
+                editText.inputType = InputType.TYPE_CLASS_NUMBER
+                editText.addTextChangedListener { object : TextWatcher {
+                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
+                    override fun afterTextChanged(editable: Editable) {
+                        try {
+                            editText.textSize = editable.toString().toInt().toFloat()
+                        } catch (e: NumberFormatException) {
+                        }
+                    }
+                } }
+                editText.filters = arrayOf(
+                        InputFilter { source, _, _, dest, _, _ ->
+                            try {
+                                val input = (dest.toString() + source.toString()).toInt()
+                                if (input > 0) return@InputFilter null
+                            } catch (nfe: NumberFormatException) {
+                            }
+                            ""
+                        }
+                )
+            }
+        }
+    }
+
+    class OfflinePreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_offline, rootKey)
+        }
+    }
+
+    class ThemePreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_theme, rootKey)
+            setHasOptionsMenu(true)
+        }
+
+        override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+            super.onCreateOptionsMenu(menu, inflater)
+            inflater.inflate(R.menu.settings_theme, menu)
+        }
+
+        override fun onOptionsItemSelected(item: MenuItem): Boolean {
+            val id = item.itemId
+            if (id == R.id.clear) {
+                val pref = PreferenceManager.getDefaultSharedPreferences(activity)
+                val editor = pref.edit()
+                editor.remove("color_primary")
+                editor.remove("color_primary_dark")
+                editor.remove("color_accent")
+                editor.remove("color_accent_dark")
+                editor.remove("dark_theme")
+                editor.apply()
+                requireActivity().recreate()
+            }
+            return super.onOptionsItemSelected(item)
+        }
+    }
+
+    class LinksPreferenceFragment : PreferenceFragmentCompat() {
+        private fun openUrl(uri: Uri?) {
+            val browserIntent = Intent(Intent.ACTION_VIEW, uri)
+            startActivity(browserIntent)
+        }
+
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_links, rootKey)
+
+            preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(Config.trackerUrl))
+                true
+            }
+
+            preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(Config.sourceUrl))
+                false
+            }
+
+            preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                openUrl(Uri.parse(Config.translationUrl))
+                false
+            }
+        }
+    }
+
+    class ExperimentalPreferenceFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.pref_experimental, rootKey)
+        }
+    }
+}

app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt

@@ -2,7 +2,7 @@ package apps.amine.bou.readerforselfoss.themes
 
 import android.app.Activity
 import android.content.Context
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.annotation.ColorInt
 import androidx.appcompat.view.ContextThemeWrapper
 import android.util.TypedValue