Store api version and select correct date formatter when offline.

CHANGELOG.md

@@ -42,10 +42,6 @@
 
 - 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,12 +36,3 @@ 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,21 +32,18 @@ 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 31
+    compileSdkVersion 30
-    buildToolsVersion '31.0.0'
+    buildToolsVersion '30.0.3'
     buildFeatures {
         viewBinding true
     }
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
-        minSdkVersion 21
+        minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 30
         versionCode versionCodeFromGit()
         versionName versionNameFromGit()
 
@@ -71,14 +68,11 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            shrinkResources true
+            shrinkResources false
             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"
@@ -88,14 +82,9 @@ 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'
@@ -106,66 +95,60 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // Android Support
-    implementation "androidx.appcompat:appcompat:1.4.0-beta01"
+    implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
-    implementation 'com.google.android.material:material:1.5.0-alpha04'
+    implementation 'com.google.android.material:material:1.3.0-beta01'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0-alpha01'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
     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.annotation:annotation:1.2.0"
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha2'
-    implementation 'androidx.work:work-runtime-ktx:2.7.0'
+    implementation 'org.jsoup:jsoup:1.13.1'
-    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-core:8.9.4'
+    implementation('com.mikepenz:aboutlibraries:6.2.0@aar') {
-    implementation 'com.mikepenz:aboutlibraries:8.9.4'
+        transitive = true
-    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.9.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.burgstaller:okhttp-digest:2.5'
+    implementation 'com.burgstaller:okhttp-digest:1.12'
 
     // Material-ish things
-    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.2.0'
+    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
+    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
     // glide
-    kapt 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation 'com.github.bumptech.glide:glide:4.1.1'
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'
 
     // Drawer
-    implementation 'com.mikepenz:materialdrawer:8.4.4'
+    implementation 'co.zsmb:materialdrawer-kt:2.0.2'
 
     // Themes
     implementation 'com.52inc:scoops:1.0.0'
-    implementation 'com.jaredrummler:colorpicker:1.1.0'
+    implementation 'com.jaredrummler:colorpicker:1.0.2'
     implementation 'com.github.rubensousa:floatingtoolbar:1.5.1'
 
     // Pager
-    implementation 'me.relex:circleindicator:2.1.6'
+    implementation 'me.relex:circleindicator:2.0.0@aar'
 
     //PhotoView
-    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
 
-    implementation 'androidx.core:core-ktx:1.7.0-rc01'
+    implementation 'androidx.core:core-ktx:1.5.0-alpha05'
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-livedata:2.3.0-rc01"
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.4.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.3.0-rc01"
 
-    implementation "androidx.room:room-ktx:2.4.0-beta01"
+    implementation "androidx.room:room-runtime:2.3.0-alpha04"
-    kapt "androidx.room:room-compiler:2.4.0-beta01"
+    kapt "androidx.room:room-compiler:2.3.0-alpha04"
 
     implementation "android.arch.work:work-runtime-ktx:$work_version"
 }

app/src/androidTest/java/apps/amine/bou/readerforselfoss/DateUtilsTest.kt

@@ -1,31 +0,0 @@
-package apps.amine.bou.readerforselfoss
-
-import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.parseDate
-import org.junit.Test
-
-class DateUtilsTest {
-
-    @Test
-    fun parseDateV4() {
-
-        Config.apiVersion = 4
-        val dateString = "2013-04-07T13:43:00+01:00"
-
-        val milliseconds = parseDate(dateString).toEpochMilli()
-        val correctMilliseconds : Long = 1365338580000
-
-        assert(milliseconds == correctMilliseconds)
-    }
-
-    @Test
-    fun parseDateV1() {
-        Config.apiVersion = 0
-        val dateString = "2013-04-07 13:43:00"
-
-        val milliseconds = parseDate(dateString).toEpochMilli()
-        val correctMilliseconds = 1365342180000
-
-        assert(milliseconds == correctMilliseconds)
-    }
-}

app/src/main/AndroidManifest.xml

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

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

@@ -14,6 +14,7 @@ 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
@@ -21,6 +22,7 @@ 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
@@ -89,16 +91,16 @@ class LoginActivity : AppCompatActivity() {
             isWithLogin = !isWithLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            binding.loginView.visibility = visi
+            binding.loginLayout.visibility = visi
-            binding.passwordView.visibility = visi
+            binding.passwordLayout.visibility = visi
         }
 
         binding.withHttpLogin.setOnCheckedChangeListener { _, b ->
             isWithHTTPLogin = !isWithHTTPLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            binding.httpLoginView.visibility = visi
+            binding.httpLoginInput.visibility = visi
-            binding.httpPasswordView.visibility = visi
+            binding.httpPasswordInput.visibility = visi
         }
     }
 
@@ -109,8 +111,9 @@ class LoginActivity : AppCompatActivity() {
             alertDialog.setMessage(getString(R.string.base_url_error))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK"
+                "OK",
-            ) { dialog, _ -> dialog.dismiss() }
+                { dialog, _ -> dialog.dismiss() }
+            )
             alertDialog.show()
         }
     }
@@ -151,8 +154,9 @@ class LoginActivity : AppCompatActivity() {
                 alertDialog.setMessage(getString(R.string.text_wrong_url))
                 alertDialog.setButton(
                     AlertDialog.BUTTON_NEUTRAL,
-                    "OK"
+                    "OK",
-                ) { dialog, _ -> dialog.dismiss() }
+                    { dialog, _ -> dialog.dismiss() }
+                )
                 alertDialog.show()
                 inValidCount = 0
             }

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

@@ -2,7 +2,9 @@ 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

@@ -3,12 +3,15 @@ package apps.amine.bou.readerforselfoss
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
+import android.content.SharedPreferences
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
-import androidx.preference.PreferenceManager
+import android.preference.PreferenceManager
 import android.widget.ImageView
 import androidx.multidex.MultiDexApplication
+import apps.amine.bou.readerforselfoss.api.selfoss.ApiVersion
+import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import com.bumptech.glide.Glide
@@ -16,10 +19,20 @@ import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerImageLoader
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 import java.util.UUID.randomUUID
 
+var dateTimeFormatter = "yyyy-MM-dd HH:mm:ss"
+
 class MyApp : MultiDexApplication() {
     private lateinit var config: Config
+    private lateinit var api: SelfossApi
+    private lateinit var settings: SharedPreferences
+    private lateinit var sharedPref: SharedPreferences
+
+    private var apiVersionMajor: Int = 0
 
     override fun onCreate() {
         super.onCreate()
@@ -39,6 +52,19 @@ class MyApp : MultiDexApplication() {
         tryToHandleBug()
 
         handleNotificationChannels()
+
+        sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
+        apiVersionMajor = sharedPref.getInt("apiVersionMajor", 0)
+        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+
+        api = SelfossApi(
+                this,
+                null,
+                settings.getBoolean("isSelfSignedCert", false),
+                sharedPref.getString("api_timeout", "-1")!!.toLong()
+        )
+
+        getApiMajorVersion()
     }
 
     private fun handleNotificationChannels() {
@@ -60,18 +86,23 @@ 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)
             }
         })
@@ -98,4 +129,24 @@ class MyApp : MultiDexApplication() {
             }
         }
     }
+
+    private fun getApiMajorVersion() {
+        api.apiVersion.enqueue(object : Callback<ApiVersion> {
+            override fun onFailure(call: Call<ApiVersion>, t: Throwable) {
+                if (apiVersionMajor >= 4) {
+                    dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
+                }
+            }
+
+            override fun onResponse(call: Call<ApiVersion>, response: Response<ApiVersion>) {
+                val version = response.body() as ApiVersion
+                apiVersionMajor = version.getApiMajorVersion()
+                sharedPref.edit().putInt("apiVersionMajor", apiVersionMajor).commit()
+
+                if (apiVersionMajor >= 4) {
+                    dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
+                }
+            }
+        })
+    }
 }

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

@@ -2,13 +2,10 @@ 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 androidx.preference.PreferenceManager
+import android.preference.PreferenceManager
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.core.content.ContextCompat
@@ -17,12 +14,17 @@ 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
@@ -30,10 +32,16 @@ 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.SharedItems
+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.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() {
 
@@ -54,11 +62,8 @@ class ReaderActivity : AppCompatActivity() {
     val ALIGN_LEFT = 2
 
     private fun showMenuItem(willAddToFavorite: Boolean) {
-        if (willAddToFavorite) {
+        toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite
-            toolbarMenu.findItem(R.id.star).icon.colorFilter = PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP)
+        toolbarMenu.findItem(R.id.unsave).isVisible = !willAddToFavorite
-        } else {
-            toolbarMenu.findItem(R.id.star).icon.colorFilter = PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
-        }
     }
 
     private fun canFavorite() {
@@ -85,7 +90,9 @@ class ReaderActivity : AppCompatActivity() {
 
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+        }
 
         setSupportActionBar(binding.toolBar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -139,16 +146,42 @@ class ReaderActivity : AppCompatActivity() {
                     } else {
                         canFavorite()
                     }
-                    readItem(allItems[position])
+                    readItem(allItems[binding.pager.currentItem])
                 }
             }
         )
     }
 
-    private fun readItem(item: Item) {
+    fun readItem(item: Item) {
         if (markOnScroll) {
-                SharedItems.readItem(applicationContext, api, db, item)
+            thread {
+                db.itemsDao().delete(item.toEntity())
             }
+            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() {
@@ -233,23 +266,62 @@ class ReaderActivity : AppCompatActivity() {
                 onBackPressed()
                 return true
             }
-            R.id.star -> {
+            R.id.save -> {
-                if (allItems[binding.pager.currentItem].starred) {
+                if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    SharedItems.unstarItem(
+                    api.starrItem(allItems[binding.pager.currentItem].id)
-                        this@ReaderActivity,
+                        .enqueue(object : Callback<SuccessResponse> {
-                        api,
+                            override fun onResponse(
-                        db,
+                                call: Call<SuccessResponse>,
-                        allItems[binding.pager.currentItem]
+                                response: Response<SuccessResponse>
-                    )
+                            ) {
-                    afterUnsave()
+                                afterSave()
+                            }
+
+                            override fun onFailure(
+                                call: Call<SuccessResponse>,
+                                t: Throwable
+                            ) {
+                                Toast.makeText(
+                                    baseContext,
+                                    R.string.cant_mark_favortie,
+                                    Toast.LENGTH_SHORT
+                                ).show()
+                            }
+                        })
                 } else {
-                    SharedItems.starItem(
+                    thread {
-                        this@ReaderActivity,
+                        db.actionsDao().insertAllActions(ActionEntity(allItems[binding.pager.currentItem].id, false, false, true, false))
-                        api,
+                        afterSave()
-                        db,
+                    }
-                        allItems[binding.pager.currentItem]
+                }
-                    )
+            }
-                    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()
+                    }
                 }
             }
             R.id.align_left -> {

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

@@ -3,14 +3,16 @@ 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 androidx.preference.PreferenceManager
+import android.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
@@ -29,16 +31,18 @@ class SourcesActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         appColors = AppColors(this@SourcesActivity)
 
-        val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-
         super.onCreate(savedInstanceState)
         binding = ActivitySourcesBinding.inflate(layoutInflater)
         val view = binding.root
 
         setContentView(view)
 
+        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)
+        }
+
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
@@ -71,7 +75,7 @@ class SourcesActivity : AppCompatActivity() {
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
-        if (this@SourcesActivity.isNetworkAccessible(binding.recyclerView)) {
+        if (this@SourcesActivity.isNetworkAccessible(this@SourcesActivity.findViewById(R.id.recyclerView))) {
             api.sources.enqueue(object : Callback<List<Source>> {
                 override fun onResponse(
                     call: Call<List<Source>>,

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

@@ -2,25 +2,29 @@ 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.isNetworkAvailable
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
@@ -29,6 +33,12 @@ 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,
@@ -58,15 +68,24 @@ class ItemCardAdapter(
         with(holder) {
             val itm = items[position]
 
-            binding.favButton.isSelected = itm.starred
-            binding.title.text = itm.getTitleDecoded()
 
+            binding.favButton.isLiked = itm.starred
+            binding.title.text = itm.getTitleDecoded()
+            binding.title.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
             binding.title.setOnTouchListener(LinkOnTouchListener())
 
             binding.title.setLinkTextColor(appColors.colorAccent)
 
             binding.sourceTitleAndDate.text = itm.sourceAndDateText()
 
+            binding.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
+
             if (!fullHeightCards) {
                 binding.itemImage.maxHeight = imageMaxHeight
                 binding.itemImage.scaleType = ScaleType.CENTER_CROP
@@ -93,6 +112,8 @@ class ItemCardAdapter(
             } else {
                 c.circularBitmapDrawable(config, itm.getIcon(c), binding.sourceImage)
             }
+
+            binding.favButton.isLiked = itm.starred
         }
     }
 
@@ -102,36 +123,82 @@ class ItemCardAdapter(
 
     inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
         init {
+            binding.root.setCardBackgroundColor(appColors.cardBackgroundColor)
             handleClickListeners()
             handleCustomTabActions()
         }
 
         private fun handleClickListeners() {
 
-            binding.favButton.setOnClickListener {
+            binding.favButton.setOnLikeListener(object : OnLikeListener {
-                val item = items[bindingAdapterPosition]
+                override fun liked(likeButton: LikeButton) {
-                if (isNetworkAvailable(c)) {
+                    val (id) = items[bindingAdapterPosition]
-                    if (item.starred) {
+                    if (c.isNetworkAccessible(null)) {
-                        SharedItems.unstarItem(c, api, db, item)
+                        api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
-                        item.starred = false
+                            override fun onResponse(
-                        binding.favButton.isSelected = false
+                                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 {
-                        SharedItems.starItem(c, api, db, item)
+                        thread {
-                        item.starred = true
+                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, true, false))
-                        binding.favButton.isSelected = true
+                        }
                     }
                 }
+
+                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 {
+                val item = items[bindingAdapterPosition]
+                c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
             }
 
-                binding.shareBtn.setOnClickListener {
+            binding.browserBtn.setOnClickListener {
-                    val item = items[bindingAdapterPosition]
+                c.openInBrowserAsNewTask(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,11 +2,22 @@ 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
@@ -16,11 +27,19 @@ 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(
@@ -48,14 +67,25 @@ class ItemListAdapter(
         with(holder) {
             val itm = items[position]
 
+
             binding.title.text = itm.getTitleDecoded()
 
+            binding.title.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
+
             binding.title.setOnTouchListener(LinkOnTouchListener())
 
             binding.title.setLinkTextColor(appColors.colorAccent)
 
             binding.sourceTitleAndDate.text = itm.sourceAndDateText()
 
+            binding.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
+
             if (itm.getThumbnail(c).isEmpty()) {
 
                 if (itm.getIcon(c).isEmpty()) {

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

@@ -2,16 +2,25 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.graphics.Color
-import android.widget.TextView
+import com.google.android.material.snackbar.Snackbar
 import androidx.recyclerview.widget.RecyclerView
+import android.widget.TextView
+import android.widget.Toast
 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.SharedItems
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import com.google.android.material.snackbar.Snackbar
+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
 
 abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapter<VH>() {
     abstract var items: ArrayList<Item>
@@ -23,8 +32,8 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
     abstract val config: Config
     abstract val updateItems: (ArrayList<Item>) -> Unit
 
-    fun updateAllItems() {
+    fun updateAllItems(newItems: ArrayList<Item>) {
-        items = SharedItems.focusedItems
+        items = newItems
         notifyDataSetChanged()
         updateItems(items)
     }
@@ -37,11 +46,34 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                 Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
-                SharedItems.unreadItem(app, api, db, i)
+                items.add(position, i)
-                if (SharedItems.displayedItems == "unread") {
+                thread {
-                    addItemAtIndex(i, position)
+                    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)
+                        }
+                    })
                 } else {
-                    notifyItemChanged(position)
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
+                    }
                 }
             }
 
@@ -51,7 +83,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
         s.show()
     }
 
-    private fun markSnackbar(position: Int) {
+    private fun markSnackbar(i: Item, position: Int) {
         val s = Snackbar
             .make(
                 app.findViewById(R.id.coordLayout),
@@ -59,13 +91,34 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                 Snackbar.LENGTH_LONG
             )
             .setAction(R.string.undo_string) {
-                SharedItems.readItem(app, api, db, items[position])
+                items.add(position, i)
-                items = SharedItems.focusedItems
+                thread {
-                if (SharedItems.displayedItems == "unread") {
+                    db.itemsDao().delete(i.toEntity())
-                    notifyItemRemoved(position)
+                }
-                    updateItems(items)
+                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)
+                        }
+                    })
                 } else {
-                    notifyItemChanged(position)
+                    thread {
+                        db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
+                    }
                 }
             }
 
@@ -76,30 +129,99 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
     }
 
     fun handleItemAtIndex(position: Int) {
-        if (SharedItems.unreadItemStatusAtIndex(position)) {
+        if (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]
-        SharedItems.readItem(app, api, db, i)
+        items.remove(i)
-        if (SharedItems.displayedItems == "unread") {
+        notifyItemRemoved(position)
-            items.remove(i)
+        updateItems(items)
-            notifyItemRemoved(position)
+
-            updateItems(items)
+        thread {
-        } else {
+            db.itemsDao().delete(i.toEntity())
-            notifyItemChanged(position)
+        }
+
+        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())
+                    }
+                }
+            })
+        } else {
+            thread {
+                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
+            }
         }
-        unmarkSnackbar(i, position)
     }
 
     private fun unreadItemAtIndex(position: Int) {
-        SharedItems.unreadItem(app, api, db, items[position])
+        val i = items[position]
-        notifyItemChanged(position)
+        items.remove(i)
-        markSnackbar(position)
+        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))
+            }
+        }
     }
 
     fun addItemAtIndex(item: Item, position: Int) {

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

@@ -3,7 +3,6 @@ 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
@@ -14,8 +13,6 @@ 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
@@ -70,7 +67,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
@@ -105,7 +102,7 @@ class SelfossApi(
         httpClient
                 .addInterceptor { chain ->
                     val res = chain.proceed(chain.request())
-                    if (res.code == timeoutCode) {
+                    if (res.code() == timeoutCode) {
                         throw SocketTimeoutException("timeout")
                     }
                     res
@@ -119,7 +116,7 @@ class SelfossApi(
                         Response.Builder()
                                 .code(timeoutCode)
                                 .protocol(Protocol.HTTP_2)
-                                .body("".toResponseBody("text/plain".toMediaTypeOrNull()))
+                                .body(ResponseBody.create(MediaType.parse("text/plain"), ""))
                                 .message("")
                                 .request(request)
                                 .build()
@@ -145,50 +142,54 @@ class SelfossApi(
     fun login(): Call<SuccessResponse> =
         service.loginToSelfoss(config.userLogin, config.userPassword)
 
-    suspend fun readItems(
+    fun readItems(
+        tag: String?,
+        sourceId: Long?,
+        search: String?,
         itemsNumber: Int,
         offset: Int
-    ): retrofit2.Response<List<Item>> =
+    ): Call<List<Item>> =
-        getItems("read", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
+        getItems("read", tag, sourceId, search, itemsNumber, offset)
 
-    suspend fun newItems(
+    fun newItems(
+        tag: String?,
+        sourceId: Long?,
+        search: String?,
         itemsNumber: Int,
         offset: Int
-    ): retrofit2.Response<List<Item>> =
+    ): Call<List<Item>> =
-        getItems("unread", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
+        getItems("unread", tag, sourceId, search, itemsNumber, offset)
 
-    suspend fun starredItems(
+    fun starredItems(
+        tag: String?,
+        sourceId: Long?,
+        search: String?,
         itemsNumber: Int,
         offset: Int
-    ): retrofit2.Response<List<Item>> =
+    ): Call<List<Item>> =
-        getItems("starred", SharedItems.tagFilter, SharedItems.sourceIDFilter, SharedItems.searchFilter, itemsNumber, offset)
+        getItems("starred", tag, sourceId, search, itemsNumber, offset)
 
     fun allItems(): Call<List<Item>> =
         service.allItems(userName, password)
 
-    suspend fun allNewItems(): retrofit2.Response<List<Item>> =
+    fun allNewItems(): Call<List<Item>> =
             getItems("unread", null, null, null, 200, 0)
 
-    suspend fun allReadItems(): retrofit2.Response<List<Item>> =
+    fun allReadItems(): Call<List<Item>> =
             getItems("read", null, null, null, 200, 0)
 
-    suspend fun allStarredItems(): retrofit2.Response<List<Item>> =
+    fun allStarredItems(): Call<List<Item>> =
-        getItems("read", null, null, null, 200, 0)
+            getItems("read", null, null, null, 200, 0)
 
-    private suspend fun getItems(
+    private fun getItems(
         type: String,
         tag: String?,
         sourceId: Long?,
         search: String?,
         items: Int,
         offset: Int
-    ): retrofit2.Response<List<Item>> =
+    ): Call<List<Item>> =
-        service.getItems(type, tag, sourceId, search, null, userName, password, items, offset)
+        service.getItems(type, tag, sourceId, search, 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)
@@ -196,7 +197,7 @@ class SelfossApi(
     fun unmarkItem(itemId: String): Call<SuccessResponse> =
         service.unmarkAsRead(itemId, userName, password)
 
-    suspend fun readAll(ids: List<String>): SuccessResponse =
+    fun readAll(ids: List<String>): Call<SuccessResponse> =
         service.markAllAsRead(ids, userName, password)
 
     fun starrItem(itemId: String): Call<SuccessResponse> =
@@ -205,7 +206,8 @@ class SelfossApi(
     fun unstarrItem(itemId: String): Call<SuccessResponse> =
         service.unstarr(itemId, userName, password)
 
-    suspend fun stats(): retrofit2.Response<Stats> = service.stats(userName, password)
+    val stats: Call<Stats>
+        get() = service.stats(userName, password)
 
     val tags: Call<List<Tag>>
         get() = service.tags(userName, password)
@@ -233,13 +235,4 @@ 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

@@ -1,134 +0,0 @@
-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,11 +30,7 @@ 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
@@ -53,8 +49,8 @@ data class Spout(
 )
 
 data class ApiVersion(
-        @SerializedName("version") val version: String?,
+        @SerializedName("version") val version: String,
-        @SerializedName("apiversion") val apiversion: String?
+        @SerializedName("apiversion") val apiversion: String
 ) {
     fun getApiMajorVersion() : Int {
         var versionNumber = 0
@@ -92,7 +88,7 @@ data class Item(
     @SerializedName("datetime") val datetime: String,
     @SerializedName("title") val title: String,
     @SerializedName("content") val content: String,
-    @SerializedName("unread") var unread: Boolean,
+    @SerializedName("unread") val 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,7 +1,6 @@
 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
@@ -17,17 +16,16 @@ internal interface SelfossService {
     fun loginToSelfoss(@Query("username") username: String, @Query("password") password: String): Call<SuccessResponse>
 
     @GET("items")
-    suspend fun getItems(
+    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
-    ): Response<List<Item>>
+    ): Call<List<Item>>
 
     @GET("items")
     fun allItems(
@@ -53,11 +51,11 @@ internal interface SelfossService {
 
     @FormUrlEncoded
     @POST("mark")
-    suspend fun markAllAsRead(
+    fun markAllAsRead(
         @Field("ids[]") ids: List<String>,
         @Query("username") username: String,
         @Query("password") password: String
-    ): SuccessResponse
+    ): Call<SuccessResponse>
 
     @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("starr/{id}")
@@ -76,10 +74,10 @@ internal interface SelfossService {
     ): Call<SuccessResponse>
 
     @GET("stats")
-    suspend fun stats(
+    fun stats(
         @Query("username") username: String,
         @Query("password") password: String
-    ): Response<Stats>
+    ): Call<Stats>
 
     @GET("tags")
     fun tags(
@@ -126,16 +124,4 @@ 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,8 +4,7 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.os.Build
+import android.preference.PreferenceManager
-import androidx.preference.PreferenceManager
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationCompat.PRIORITY_LOW
@@ -14,19 +13,16 @@ 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.SharedItems
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAvailable
+import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -37,103 +33,123 @@ import kotlin.concurrent.thread
 class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params) {
     lateinit var db: AppDatabase
 
-override fun doWork(): Result {
+    override fun doWork(): Result {
-    val settings =
+        if (context.isNetworkAccessible(null)) {
-        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()
-        )
 
-        if (isNetworkAvailable(context)) {
+            val notificationManager =
+                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-            CoroutineScope(Dispatchers.IO).launch {
+            val notification = NotificationCompat.Builder(applicationContext, Config.syncChannelId)
-                val notificationManager =
+                .setContentTitle(context.getString(R.string.loading_notification_title))
-                    applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+                .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 notification =
+            notificationManager.notify(1, notification.build())
-                    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)
 
-                notificationManager.notify(1, notification.build())
+            val settings =
+                this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context)
+            val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
 
-                val notifyNewItems = sharedPref.getBoolean("notify_new_items", false)
+            db = Room.databaseBuilder(
+                applicationContext,
+                AppDatabase::class.java, "selfoss-database"
+            ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
 
-                db = Room.databaseBuilder(
+            val api = SelfossApi(
-                    applicationContext,
+                this.context,
-                    AppDatabase::class.java, "selfoss-database"
+                null,
-                ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3)
+                settings.getBoolean("isSelfSignedCert", false),
-                    .addMigrations(MIGRATION_3_4).build()
+                sharedPref.getString("api_timeout", "-1")!!.toLong()
+            )
 
+            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(
+                        action.read -> doAndReportOnFail(api.markItem(action.articleId), action)
-                            api.markItem(action.articleId),
+                        action.unread -> doAndReportOnFail(api.unmarkItem(action.articleId), action)
-                            action
+                        action.starred -> doAndReportOnFail(api.starrItem(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(notifyNewItems: Boolean, notificationManager: NotificationManager) {
+    private fun storeItems(response: Response<List<Item>>, newItems: Boolean, notifyNewItems: Boolean, notificationManager: NotificationManager) {
-        CoroutineScope(Dispatchers.IO).launch {
+        thread {
-                val apiItems = SharedItems.items
+            if (response.body() != null) {
+                val apiItems = (response.body() as ArrayList<Item>)
 
+                if (newItems) {
+                    db.itemsDao().deleteAllItems()
+                }
+                db.itemsDao()
+                        .insertAllItems(*(apiItems.map { it.toEntity() }).toTypedArray())
 
                 val newSize = apiItems.filter { it.unread }.size
-                if (notifyNewItems && newSize > 0) {
+                if (newItems && notifyNewItems && newSize > 0) {
 
                     val intent = Intent(context, MainActivity::class.java).apply {
                         flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                     }
-                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
-                        PendingIntent.FLAG_IMMUTABLE
-                    } else {
-                        0
-                    }
-                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
 
-                    val newItemsNotification =
+                    val newItemsNotification = NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
-                        NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)
                             .setContentTitle(context.getString(R.string.new_items_notification_title))
-                            .setContentText(
+                            .setContentText(context.getString(R.string.new_items_notification_text, newSize))
-                                context.getString(
-                                    R.string.new_items_notification_text,
-                                    newSize
-                                )
-                            )
                             .setPriority(PRIORITY_DEFAULT)
                             .setChannelId(Config.newItemsChannelId)
                             .setContentIntent(pendingIntent)
@@ -145,6 +161,7 @@ override fun doWork(): Result {
                     }
                 }
                 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 androidx.preference.PreferenceManager
+import android.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,17 +28,25 @@ 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.*
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 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
@@ -50,6 +58,7 @@ 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
@@ -76,7 +85,6 @@ 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()
@@ -118,7 +126,6 @@ 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()) {
@@ -174,33 +181,25 @@ class ArticleFragment : Fragment() {
                                 false,
                                 requireActivity()
                             )
-                            R.id.unread_action -> if (context != null) {
+                            R.id.unread_action -> if ((context != null && requireContext().isNetworkAccessible(null)) || context == null) {
-                                if (allItems[pageNumber.toInt()].unread) {
+                                api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
-                                    SharedItems.readItem(
+                                    object : Callback<SuccessResponse> {
-                                        context!!,
+                                        override fun onResponse(
-                                        api,
+                                            call: Call<SuccessResponse>,
-                                        db,
+                                            response: Response<SuccessResponse>
-                                        allItems[pageNumber.toInt()]
+                                        ) {
-                                    )
+                                        }
-                                    allItems[pageNumber.toInt()].unread = false
+
-                                    Toast.makeText(
+                                        override fun onFailure(
-                                        context,
+                                            call: Call<SuccessResponse>,
-                                        R.string.marked_as_read,
+                                            t: Throwable
-                                        Toast.LENGTH_LONG
+                                        ) {
-                                    ).show()
+                                        }
-                                } else {
+                                    }
-                                    SharedItems.unreadItem(
+                                )
-                                        context!!,
+                            } else {
-                                        api,
+                                thread {
-                                        db,
+                                    db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
-                                        allItems[pageNumber.toInt()]
-                                    )
-                                    allItems[pageNumber.toInt()].unread = true
-                                    Toast.makeText(
-                                        context,
-                                        R.string.marked_as_unread,
-                                        Toast.LENGTH_LONG
-                                    ).show()
                                 }
                             }
                             else -> Unit
@@ -212,11 +211,6 @@ class ArticleFragment : Fragment() {
                 }
             )
 
-            if (staticBar) {
-                fab.hide()
-                floatingToolbar.show()
-            }
-
             binding.source.text = contentSource
             if (typeface != null) {
                 binding.source.typeface = typeface
@@ -248,14 +242,9 @@ class ArticleFragment : Fragment() {
             binding.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                     if (scrollY > oldScrollY) {
-                        floatingToolbar.hide()
                         fab.hide()
                     } else {
-                        if (staticBar) {
+                        if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
-                            floatingToolbar.show()
-                        } else {
-                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
-                        }
                     }
                 }
             )
@@ -392,12 +381,24 @@ class ArticleFragment : Fragment() {
         binding.webcontent.visibility = View.VISIBLE
         val (textColor, backgroundColor) = if (appColors.isDarkTheme) {
             if (context != null) {
+                binding.webcontent.setBackgroundColor(
+                    ContextCompat.getColor(
+                        requireContext(),
+                        R.color.dark_webview
+                    )
+                )
                 Pair(ContextCompat.getColor(requireContext(), R.color.dark_webview_text), ContextCompat.getColor(requireContext(), R.color.dark_webview))
             } else {
                 Pair(null, null)
             }
         } else {
             if (context != null) {
+                binding.webcontent.setBackgroundColor(
+                    ContextCompat.getColor(
+                        requireContext(),
+                        R.color.light_webview
+                    )
+                )
                 Pair(ContextCompat.getColor(requireContext(), R.color.light_webview_text), ContextCompat.getColor(requireContext(), R.color.light_webview))
             } else {
                 Pair(null, null)
@@ -461,8 +462,12 @@ class ArticleFragment : Fragment() {
 
         binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
-        binding.webcontent.settings.layoutAlgorithm =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
+            binding.webcontent.settings.layoutAlgorithm =
+                    WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
+        } else {
+            binding.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
+        }
 
         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")
-    suspend fun actions(): List<ActionEntity>
+    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")
-    suspend fun items(): List<ItemEntity>
+    fun items(): List<ItemEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAllItems(vararg items: ItemEntity)
+    fun insertAllItems(vararg items: ItemEntity)
 
     @Query("DELETE FROM items")
-    suspend fun deleteAllItems()
+    fun deleteAllItems()
 
     @Delete
-    suspend fun delete(item: ItemEntity)
+    fun delete(item: ItemEntity)
 
     @Update
-    suspend fun updateItem(item: ItemEntity)
+    fun updateItem(item: ItemEntity)
 }

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

@@ -0,0 +1,142 @@
+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

@@ -0,0 +1,345 @@
+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

@@ -1,221 +0,0 @@
-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.databinding.ActivitySettingsBinding
-import apps.amine.bou.readerforselfoss.themes.Toppings
-import apps.amine.bou.readerforselfoss.utils.Config
-import com.ftinc.scoop.Scoop
-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)
-        }
-        val binding = ActivitySettingsBinding.inflate(layoutInflater)
-
-        val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-
-        setContentView(binding.root)
-        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(binding.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

@@ -1,9 +1,14 @@
 package apps.amine.bou.readerforselfoss.themes
 
 import android.app.Activity
+import android.content.Context
+import android.preference.PreferenceManager
 import androidx.annotation.ColorInt
-import androidx.preference.PreferenceManager
+import androidx.appcompat.view.ContextThemeWrapper
+import android.util.TypedValue
 import apps.amine.bou.readerforselfoss.R
+import android.view.LayoutInflater
+import android.view.ViewGroup
 
 class AppColors(a: Activity) {
 
@@ -11,6 +16,7 @@ class AppColors(a: Activity) {
     @ColorInt val colorPrimaryDark: Int
     @ColorInt val colorAccent: Int
     @ColorInt val colorAccentDark: Int
+    @ColorInt val cardBackgroundColor: Int
     @ColorInt val colorBackground: Int
     @ColorInt val textColor: Int
     val isDarkTheme: Boolean
@@ -53,9 +59,18 @@ class AppColors(a: Activity) {
         }
 
         textColor = if (isDarkTheme) {
-            R.color.white
+            R.color.md_white_1000
         } else {
-            R.color.grey_900
+            R.color.md_grey_900
         }
+
+        val wrapper = Context::class.java
+        val method = wrapper!!.getMethod("getThemeResId")
+        method.isAccessible = true
+
+        val typedCardBackground = TypedValue()
+        a.theme.resolveAttribute(R.attr.cardBackgroundColor, typedCardBackground, true)
+
+        cardBackgroundColor = typedCardBackground.data
     }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt

@@ -40,8 +40,6 @@ class Config(c: Context) {
 
         const val newItemsChannelId = "new-items-channel-id"
 
-        var apiVersion = 0
-
         fun logoutAndRedirect(
             c: Context,
             callingActivity: Activity,
@@ -51,7 +49,6 @@ class Config(c: Context) {
             editor.remove("url")
             editor.remove("login")
             editor.remove("password")
-            editor.remove("apiVersionMajor")
             editor.apply()
             val intent = Intent(c, LoginActivity::class.java)
             if (baseUrlFail) {

app/src/main/java/apps/amine/bou/readerforselfoss/utils/DateUtils.kt

@@ -1,31 +0,0 @@
-package apps.amine.bou.readerforselfoss.utils
-
-import android.text.format.DateUtils
-import java.time.Instant
-import java.time.LocalDateTime
-import java.time.OffsetDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-
-fun parseDate(dateString: String): Instant {
-
-    val FORMATTERV1 = "yyyy-MM-dd HH:mm:ss"
-
-    return if (Config.apiVersion >= 4) {
-        OffsetDateTime.parse(dateString).toInstant()
-    } else {
-        LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(FORMATTERV1)).toInstant(ZoneOffset.UTC)
-    }
-}
-
-fun parseRelativeDate(dateString: String): String {
-
-    val date = parseDate(dateString)
-
-    return " " + DateUtils.getRelativeTimeSpanString(
-            date.toEpochMilli(),
-            Instant.now().toEpochMilli(),
-            DateUtils.MINUTE_IN_MILLIS,
-            DateUtils.FORMAT_ABBREV_RELATIVE
-    )
-}

app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt

@@ -1,12 +1,17 @@
 package apps.amine.bou.readerforselfoss.utils
 
 import android.content.Context
+import android.text.format.DateUtils
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossTagType
+import apps.amine.bou.readerforselfoss.dateTimeFormatter
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.*
 
 fun String.toTextDrawableString(c: Context): String {
     val textDrawable = StringBuilder()
-    for (s in this.split(" ".toRegex()).filter { it.isNotEmpty() }.toTypedArray()) {
+    for (s in this.split(" ".toRegex()).filter { !it.isEmpty() }.toTypedArray()) {
         try {
             textDrawable.append(s[0])
         } catch (e: StringIndexOutOfBoundsException) {
@@ -16,7 +21,17 @@ fun String.toTextDrawableString(c: Context): String {
 }
 
 fun Item.sourceAndDateText(): String {
-    val formattedDate = parseRelativeDate(this.datetime)
+    val formattedDate: String = try {
+        " " + DateUtils.getRelativeTimeSpanString(
+            SimpleDateFormat(dateTimeFormatter).parse(this.datetime).time,
+            Date().time,
+            DateUtils.MINUTE_IN_MILLIS,
+            DateUtils.FORMAT_ABBREV_RELATIVE
+        )
+    } catch (e: ParseException) {
+        e.printStackTrace()
+        ""
+    }
 
     return this.getSourceTitle() + formattedDate
 }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt

@@ -7,7 +7,6 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.net.Uri
-import android.os.Build
 import android.text.Spannable
 import android.text.style.ClickableSpan
 import androidx.browser.customtabs.CustomTabsIntent
@@ -21,23 +20,17 @@ import apps.amine.bou.readerforselfoss.ReaderActivity
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import okhttp3.HttpUrl
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
 fun Context.buildCustomTabsIntent(): CustomTabsIntent {
 
     val actionIntent = Intent(Intent.ACTION_SEND)
     actionIntent.type = "text/plain"
-    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        PendingIntent.FLAG_IMMUTABLE
-    } else {
-        0
-    }
     val createPendingShareIntent: PendingIntent = PendingIntent.getActivity(
-            this,
+        this,
-            0,
+        0,
-            actionIntent,
+        actionIntent,
-            pflags
+        0
-        )
+    )
 
     val intentBuilder = CustomTabsIntent.Builder()
 
@@ -81,7 +74,6 @@ fun Context.openItemUrlInternally(
 ) {
     if (articleViewer) {
         ReaderActivity.allItems = allItems
-        SharedItems.position = currentItem
         val intent = Intent(this, ReaderActivity::class.java)
         intent.putExtra("currentItem", currentItem)
         app.startActivity(intent)
@@ -145,13 +137,13 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
 }
 
 fun String.isUrlValid(): Boolean =
-    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
+    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
 
 fun String.isBaseUrlValid(ctx: Context): Boolean {
-    val baseUrl = this.toHttpUrlOrNull()
+    val baseUrl = HttpUrl.parse(this)
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {
-        val pathSegments = baseUrl.pathSegments
+        val pathSegments = baseUrl.pathSegments()
         existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
     }
 

app/src/main/java/apps/amine/bou/readerforselfoss/utils/SharedItems.kt

@@ -1,404 +0,0 @@
-package apps.amine.bou.readerforselfoss.utils
-
-import android.content.Context
-import android.widget.Toast
-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.utils.persistence.toEntity
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.persistence.toView
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.text.SimpleDateFormat
-import kotlin.concurrent.thread
-
-/*
-* Singleton class that contains the articles fetched from Selfoss, it allows sharing the items list
-* between Activities and Fragments
-*/
-object SharedItems {
-    var items: ArrayList<Item> = arrayListOf<Item>()
-        get() {
-            return ArrayList(field)
-        }
-        set(value) {
-            field = ArrayList(value)
-        }
-    var focusedItems: ArrayList<Item> = arrayListOf<Item>()
-        get() {
-            return ArrayList(field)
-        }
-        set(value) {
-            field = ArrayList(value)
-        }
-    var position = 0
-        set(value) {
-            field = when {
-                value < 0 -> 0
-                value > items.size -> items.size
-                else -> value
-            }
-        }
-    var displayedItems: String = "unread"
-        set(value) {
-            field = when (value) {
-                "all" -> "all"
-                "unread" -> "unread"
-                "read" -> "read"
-                "starred" -> "starred"
-                else -> "all"
-            }
-        }
-
-    var searchFilter: String? = null
-    var sourceIDFilter: Long? = null
-    var sourceFilter: String? = null
-    var tagFilter: String? = null
-    var itemsCaching = false
-
-    var fetchedUnread = false
-    var fetchedAll = false
-    var fetchedStarred = false
-
-    var badgeUnread = -1
-    var badgeAll = -1
-    var badgeStarred = -1
-
-    /**
-     * Add new items to the SharedItems list
-     *
-     * The new items are considered more updated than the ones already in the list.
-     * The old items present in the new list are discarded and replaced by the new ones.
-     * Items are compared according to the selfoss id, which should always be unique.
-     */
-    fun appendNewItems(newItems: ArrayList<Item>) {
-        var tmpItems = items
-        if (tmpItems != newItems) {
-            tmpItems = tmpItems.filter { item -> newItems.find { it.id == item.id } == null } as ArrayList<Item>
-            tmpItems.addAll(newItems)
-            items = tmpItems
-
-            sortItems()
-            getFocusedItems()
-        }
-    }
-
-    fun refreshFocusedItems(newItems: ArrayList<Item>) {
-        val tmpItems = items
-        tmpItems.removeAll(focusedItems)
-
-        appendNewItems(newItems)
-    }
-
-    suspend fun clearDBItems(db: AppDatabase) {
-        db.itemsDao().deleteAllItems()
-    }
-
-    suspend fun updateDatabase(db: AppDatabase) {
-        if (itemsCaching) {
-            if (items.isEmpty()) {
-                getFromDB(db)
-            }
-            db.itemsDao().deleteAllItems()
-            db.itemsDao().insertAllItems(*(items.map { it.toEntity() }).toTypedArray())
-        }
-    }
-
-    fun filter() {
-        fun filterSearch(item: Item): Boolean {
-            return if (!searchFilter.isEmptyOrNullOrNullString()) {
-                var matched = item.title.contains(searchFilter.toString(), true)
-                matched = matched || item.content.contains(searchFilter.toString(), true)
-                matched = matched || item.sourcetitle.contains(searchFilter.toString(), true)
-                matched
-            } else {
-                true
-            }
-        }
-
-        var tmpItems = focusedItems
-        if (tagFilter != null) {
-            tmpItems = tmpItems.filter { it.tags.tags.contains(tagFilter.toString()) } as ArrayList<Item>
-        }
-        if (searchFilter != null) {
-            tmpItems = tmpItems.filter { filterSearch(it) } as ArrayList<Item>
-        }
-        if (sourceFilter != null) {
-            tmpItems = tmpItems.filter { it.sourcetitle == sourceFilter } as ArrayList<Item>
-        }
-        focusedItems = tmpItems
-    }
-
-    private fun getFocusedItems() {
-        when (displayedItems) {
-            "all" -> getAll()
-            "unread" -> getUnRead()
-            "read" -> getRead()
-            "starred" -> getStarred()
-            else -> getUnRead()
-        }
-    }
-
-    fun getUnRead() {
-        displayedItems = "unread"
-        focusedItems = items.filter { item -> item.unread } as ArrayList<Item>
-        filter()
-    }
-
-    fun getRead() {
-        displayedItems = "read"
-        focusedItems = items.filter { item -> !item.unread } as ArrayList<Item>
-        filter()
-    }
-
-    fun getStarred() {
-        displayedItems = "starred"
-        focusedItems = items.filter { item -> item.starred } as ArrayList<Item>
-        filter()
-    }
-
-    fun getAll() {
-        displayedItems = "all"
-        focusedItems = items
-        filter()
-    }
-
-    suspend fun getFromDB(db: AppDatabase) {
-        if (itemsCaching) {
-                    val dbItems = db.itemsDao().items().map { it.toView() } as ArrayList<Item>
-                    appendNewItems(dbItems)
-        }
-    }
-
-    private fun removeItemAtIndex(index: Int) {
-        val i = focusedItems[index]
-        val tmpItems = focusedItems
-        tmpItems.remove(i)
-        focusedItems = tmpItems
-    }
-
-    fun addItemAtIndex(newItem: Item, index: Int) {
-        val tmpItems = focusedItems
-        tmpItems.add(index, newItem)
-        focusedItems = tmpItems
-    }
-
-    fun readItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
-        if (items.contains(item)) {
-            position = items.indexOf(item)
-            readItemAtPosition(app, api, db)
-        }
-    }
-
-    fun readItems(db: AppDatabase, ids: List<String>) {
-        for (id in ids) {
-            val match = items.filter { it -> it.id == id }
-            if (match.isNotEmpty() && match.size == 1) {
-                position = items.indexOf(match[0])
-                val tmpItems = items
-                tmpItems[position].unread = false
-                items = tmpItems
-                resetDBItem(db)
-                badgeUnread--
-            }
-        }
-    }
-
-    private fun readItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
-        val i = items[position]
-
-        if (app.isNetworkAccessible(null)) {
-            api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                        call: Call<SuccessResponse>,
-                        response: Response<SuccessResponse>
-                ) {
-
-                    val tmpItems = items
-                    tmpItems[position].unread = false
-                    items = tmpItems
-
-                    resetDBItem(db)
-                    getFocusedItems()
-                    badgeUnread--
-                }
-
-                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                    Toast.makeText(
-                            app,
-                            app.getString(R.string.cant_mark_read),
-                            Toast.LENGTH_SHORT
-                    ).show()
-                }
-            })
-        } else if (itemsCaching) {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, true, false, false, false))
-            }
-        }
-
-        if (position > items.size) {
-            position -= 1
-        }
-    }
-
-    fun unreadItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
-        if (items.contains(item) && !item.unread) {
-            position = items.indexOf(item)
-            unreadItemAtPosition(app, api, db)
-        }
-    }
-
-    private fun unreadItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
-        val i = items[position]
-
-        if (app.isNetworkAccessible(null)) {
-            api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-
-                    val tmpItems = items
-                    tmpItems[position].unread = true
-                    items = tmpItems
-
-                    resetDBItem(db)
-                    getFocusedItems()
-                    badgeUnread++
-                }
-
-                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                    Toast.makeText(
-                        app,
-                        app.getString(R.string.cant_mark_unread),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            })
-        } else if (itemsCaching) {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, false, true, false, false))
-            }
-        }
-    }
-
-    fun starItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
-        if (items.contains(item) && !item.starred) {
-            position = items.indexOf(item)
-            starItemAtPosition(app, api, db)
-        }
-    }
-
-    private fun starItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
-        val i = items[position]
-
-        if (app.isNetworkAccessible(null)) {
-            api.starrItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-                    val tmpItems = items
-                    tmpItems[position].starred = true
-                    items = tmpItems
-
-                    resetDBItem(db)
-                    getFocusedItems()
-                    badgeStarred++
-                }
-
-                override fun onFailure(
-                    call: Call<SuccessResponse>,
-                    t: Throwable
-                ) {
-                    Toast.makeText(
-                        app,
-                        app.getString(R.string.cant_mark_favortie),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            })
-        } else {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, false, false, true, false))
-            }
-        }
-    }
-
-    fun unstarItem(app: Context, api: SelfossApi, db: AppDatabase, item: Item) {
-        if (items.contains(item) && item.starred) {
-            position = items.indexOf(item)
-            unstarItemAtPosition(app, api, db)
-        }
-    }
-
-    private fun unstarItemAtPosition(app: Context, api: SelfossApi, db: AppDatabase) {
-        val i = items[position]
-
-        if (app.isNetworkAccessible(null)) {
-            api.unstarrItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-                    val tmpItems = items
-                    tmpItems[position].starred = false
-                    items = tmpItems
-
-                    resetDBItem(db)
-                    getFocusedItems()
-                    badgeStarred--
-                }
-
-                override fun onFailure(
-                    call: Call<SuccessResponse>,
-                    t: Throwable
-                ) {
-                    Toast.makeText(
-                        app,
-                        app.getString(R.string.cant_unmark_favortie),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            })
-        } else {
-            thread {
-                db.actionsDao().insertAllActions(ActionEntity(i.id, false, false, false, true))
-            }
-        }
-    }
-
-    private fun resetDBItem(db: AppDatabase) {
-        if (itemsCaching) {
-            val i = items[position]
-            CoroutineScope(Dispatchers.IO).launch {
-                db.itemsDao().delete(i.toEntity())
-                db.itemsDao().insertAllItems(i.toEntity())
-            }
-        }
-    }
-
-    fun unreadItemStatusAtIndex(position: Int): Boolean {
-        return focusedItems[position].unread
-    }
-
-    fun computeBadges() {
-        badgeUnread = items.filter { item -> item.unread }.size
-        badgeStarred = items.filter { item -> item.starred }.size
-        badgeAll = items.size
-    }
-
-    private fun sortItems() {
-        val tmpItems = ArrayList(items.sortedByDescending { parseDate(it.datetime) })
-        items = tmpItems
-    }
-}

app/src/main/java/apps/amine/bou/readerforselfoss/utils/network/NetworkUtils.kt

@@ -3,8 +3,7 @@ package apps.amine.bou.readerforselfoss.utils.network
 import android.content.Context
 import android.graphics.Color
 import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
+import android.net.NetworkInfo
-import android.os.Build
 import android.view.View
 import android.widget.TextView
 import apps.amine.bou.readerforselfoss.R
@@ -15,7 +14,9 @@ var view: View? = null
 lateinit var s: Snackbar
 
 fun Context.isNetworkAccessible(v: View?, overrideOffline: Boolean = false): Boolean {
-    val networkIsAccessible = isNetworkAvailable(this)
+    val cm = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+    val activeNetwork: NetworkInfo? = cm.activeNetworkInfo
+    val networkIsAccessible = activeNetwork != null && activeNetwork.isConnectedOrConnecting
 
     if (v != null && (!networkIsAccessible || overrideOffline) && (!snackBarShown || v != view)) {
         view = v
@@ -41,24 +42,4 @@ fun Context.isNetworkAccessible(v: View?, overrideOffline: Boolean = false): Boo
         s.dismiss()
     }
     return if(overrideOffline) overrideOffline else networkIsAccessible
-}
-
-fun isNetworkAvailable(context: Context): Boolean {
-    val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-         val network = connectivityManager.activeNetwork ?: return false
-         val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
-
-         return when {
-             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> true
-             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
-             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
-             networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
-             else -> false
-         }
-    } else {
-        val network = connectivityManager.activeNetworkInfo ?: return false
-         return network.isConnectedOrConnecting
-    }
 }

app/src/main/res/color/ic_menu_heart_color.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:color="@color/red"/>
-
-    <item android:state_selected="false"
-        android:color="?android:attr/textColorPrimary" />
-</selector>

app/src/main/res/drawable/ic_baseline_white_eye_24dp.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
-</vector>

app/src/main/res/drawable/ic_fiber_new_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM8.5,15L7.3,15l-2.55,-3.5L4.75,15L3.5,15L3.5,9h1.25l2.5,3.5L7.25,9L8.5,9v6zM13.5,10.26L11,10.26v1.12h2.5v1.26L11,12.64v1.11h2.5L13.5,15h-4L9.5,9h4v1.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1L14.5,9h1.25v4.51h1.13L16.88,9.99h1.25v3.51h1.12L19.25,9h1.25v5z"/>
+</vector>

app/src/main/res/drawable/ic_info_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>

app/src/main/res/drawable/ic_menu_heart_60dp.xml

@@ -1,5 +0,0 @@
-<vector android:height="54.751434dp" android:viewportHeight="18.756023"
-    android:viewportWidth="20.554007" android:width="60dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF"
-        android:pathData="m5.7968,14.6109c-2.7907,-2.7367 -4.4957,-4.7131 -5.018,-5.8165 -2.102,-4.4408 0.2424,-8.7943 4.7357,-8.7943 1.635,0 2.7056,0.425 3.9688,1.5755l0.7937,0.723 0.7937,-0.723c1.2631,-1.1505 2.3337,-1.5755 3.9688,-1.5755 4.4933,0 6.8377,4.3535 4.7357,8.7943 -0.5223,1.1035 -2.2274,3.0799 -5.018,5.8165 -2.3248,2.2798 -4.3409,4.1451 -4.4802,4.1451 -0.1393,0 -2.1554,-1.8653 -4.4802,-4.1451z" android:strokeWidth="0.0933392"/>
-</vector>

app/src/main/res/drawable/ic_search_black_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>

app/src/main/res/drawable/ic_settings_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>

app/src/main/res/drawable/ic_signal_wifi_off_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"/>
+</vector>

app/src/main/res/drawable/ic_widgets_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z"/>
+</vector>

app/src/main/res/layout/activity_add_source.xml

@@ -7,7 +7,7 @@
     tools:context="apps.amine.bou.readerforselfoss.AddSourceActivity">
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
@@ -55,8 +55,7 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginStart="16dp"
                 app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginLeft="16dp"
+                android:layout_marginLeft="16dp"/>
-                android:gravity="center_horizontal" />
 
             <EditText
                 android:layout_width="match_parent"
@@ -68,9 +67,7 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 android:inputType="text"
-                android:hint="@string/add_source_hint_name"
+                android:hint="@string/add_source_hint_name"/>
-                android:textColorHint="?android:textColorPrimary"
-                android:autofillHints="false" />
 
             <EditText
                 android:layout_width="match_parent"
@@ -79,12 +76,10 @@
                 android:ems="10"
                 android:id="@+id/sourceUri"
                 android:hint="@string/add_source_hint_url"
-                android:textColorHint="?android:textColorPrimary"
                 android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/nameInput"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"/>
-                android:autofillHints="false" />
 
             <EditText
                 android:layout_width="match_parent"
@@ -96,9 +91,7 @@
                 android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/sourceUri"
                 android:hint="@string/add_source_hint_tags"
-                android:textColorHint="?android:textColorPrimary"
+                android:inputType="text"/>
-                android:inputType="text"
-                android:autofillHints="false" />
 
             <Spinner
                 android:layout_width="match_parent"
@@ -107,8 +100,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/tags"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_height="40dp"
+                android:layout_height="40dp"/>
-                android:theme="@style/App.Spinner"/>
 
             <Button
                 android:text="@string/add_source_save"

app/src/main/res/layout/activity_home.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawerContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="apps.amine.bou.readerforselfoss.HomeActivity"
@@ -37,43 +36,51 @@
 
                 </com.google.android.material.appbar.AppBarLayout>
 
-                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                <FrameLayout
-                    android:id="@+id/swipeRefreshLayout"
+                    android:id="@+id/drawer_layout"
+                    xmlns:android="http://schemas.android.com/apk/res/android"
+                    xmlns:tools="http://schemas.android.com/tools"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <LinearLayout
+                    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                        android:id="@+id/swipeRefreshLayout"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        android:layout_height="match_parent">
-                        android:orientation="vertical"
-                        android:background="?android:attr/windowBackground">
 
-                        <TextView
+                        <LinearLayout
-                            android:id="@+id/emptyText"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
+                            android:layout_height="match_parent"
-                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
-                            android:paddingTop="100dp"
+                            android:background="?android:attr/windowBackground">
-                            android:text="@string/nothing_here"
-                            android:textAlignment="center"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                            android:background="@android:color/transparent"
-                            android:visibility="gone" />
 
-                        <androidx.recyclerview.widget.RecyclerView
+                            <TextView
-                            android:id="@+id/recyclerView"
+                                android:id="@+id/emptyText"
-                            android:layout_width="match_parent"
+                                android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
+                                android:layout_height="wrap_content"
-                            android:background="@android:color/transparent"
+                                android:gravity="fill"
-                            android:clipToPadding="false"
+                                android:paddingTop="100dp"
-                            android:paddingBottom="60dp"
+                                android:text="@string/nothing_here"
-                            android:scrollbars="vertical"
+                                android:textAlignment="center"
-                            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                            tools:listitem="@layout/list_item"/>
+                                android:background="@android:color/transparent"
-                    </LinearLayout>
+                                android:visibility="gone" />
 
-                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/recyclerView"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@android:color/transparent"
+                                android:clipToPadding="false"
+                                android:paddingBottom="60dp"
+                                android:scrollbars="vertical"
+                                app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                                tools:listitem="@layout/list_item"/>
+                        </LinearLayout>
 
+                    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+                </FrameLayout>
             </LinearLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -83,11 +90,4 @@
             android:layout_width="match_parent"
             android:layout_height="60dp"/>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
+</RelativeLayout>
-    <com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
-        android:id="@+id/mainDrawer"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true" />
-</androidx.drawerlayout.widget.DrawerLayout>

app/src/main/res/layout/activity_login.xml

@@ -45,69 +45,98 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/urlView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/prompt_url"
+                    android:id="@+id/urlLayout"
-                    android:imeOptions="actionUnspecified"
+                    >
-                    android:importantForAutofill="no"
-                    android:inputType="textUri"
-                    android:maxLines="1" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                    <EditText
+                        android:id="@+id/urlView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/prompt_url"
+                        android:imeOptions="actionUnspecified"
+                        android:inputType="textUri"
+                        android:maxLines="1" />
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <Switch
                     android:text="@string/withLoginSwitch"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:id="@+id/withLogin"
                     android:layout_weight="1"/>
 
-                <EditText
+                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/loginView"
+                    android:id="@+id/loginLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:autofillHints="username"
+                    android:visibility="gone">
-                    android:hint="@string/prompt_login"
-                    android:inputType="text"
-                    android:maxLines="1"
-                    android:visibility="gone" />
 
-                <EditText
+                    <AutoCompleteTextView
-                    android:id="@+id/passwordView"
+                        android:id="@+id/loginView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/prompt_login"
+                        android:inputType="text"
+                        android:maxLines="1" />
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/passwordLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:autofillHints="password"
+                    android:visibility="gone">
-                    android:hint="@string/prompt_password"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:visibility="gone" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                    <EditText
+                        android:id="@+id/passwordView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/prompt_password"
+                        android:inputType="textPassword"
+                        android:maxLines="1" />
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <Switch
                     android:id="@+id/withHttpLogin"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="@string/withHttpLoginSwitch" />
 
-                <EditText
+                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/httpLoginView"
+                    android:id="@+id/httpLoginInput"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:autofillHints="username"
+                    android:visibility="gone">
-                    android:hint="@string/prompt_http_login"
-                    android:inputType="text"
-                    android:visibility="gone" />
 
-                <EditText
+                    <EditText
-                    android:id="@+id/httpPasswordView"
+                        android:inputType="text"
+                        android:id="@+id/httpLoginView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/prompt_http_login" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/httpPasswordInput"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:autofillHints="password"
+                    android:visibility="gone">
-                    android:hint="@string/prompt_http_password"
-                    android:inputType="textPassword"
-                    android:visibility="gone" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                    <EditText
+                        android:id="@+id/httpPasswordView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/prompt_http_password"
+                        android:inputType="textPassword" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <Switch
                     android:id="@+id/withSelfhostedCert"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -126,8 +155,8 @@
                     style="?android:textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
                     android:layout_marginBottom="16dp"
+                    android:layout_marginTop="16dp"
                     android:text="@string/action_sign_in"
                     android:textStyle="bold" />
 

app/src/main/res/layout/activity_settings.xml

@@ -1,22 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ToolBarStyle" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-        android:id="@+id/settings"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>

app/src/main/res/layout/activity_sources.xml

@@ -31,13 +31,14 @@
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom|end"
+        android:layout_gravity="end|bottom|right"
-        app:srcCompat="@drawable/ic_add_white_24dp"
+        android:src="@drawable/ic_add_white_24dp"
         android:paddingBottom="@dimen/activity_vertical_margin"
         android:paddingTop="@dimen/activity_vertical_margin"
         android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_marginBottom="16dp"
         android:layout_marginEnd="16dp"
-        android:contentDescription="@string/add_source" />
+        android:layout_marginRight="16dp"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/card_item.xml

@@ -16,8 +16,7 @@
     app:layout_constraintTop_toTopOf="parent"
     card_view:cardElevation="2dp"
     card_view:cardUseCompatPadding="true"
-    card_view:layout_constraintBottom_toBottomOf="parent"
+    card_view:layout_constraintBottom_toBottomOf="parent">
-    app:cardBackgroundColor="?cardBackgroundColor">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -66,7 +65,6 @@
                 android:gravity="start"
                 android:textAlignment="viewStart"
                 android:textStyle="bold"
-                android:textColor="?android:textColorPrimary"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toRightOf="@+id/sourceImage"
                 app:layout_constraintRight_toRightOf="parent"
@@ -81,7 +79,6 @@
                 android:gravity="start"
                 android:textAlignment="viewStart"
                 android:textSize="14sp"
-                android:textColor="?android:textColorPrimary"
                 app:layout_constraintLeft_toLeftOf="@+id/title"
                 app:layout_constraintTop_toBottomOf="@+id/title"
                 tools:text="Google Actualité Il y a 5h" />
@@ -95,22 +92,20 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
 
-                <ImageButton
+                <com.like.LikeButton
                     android:id="@+id/favButton"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
+
                     android:layout_centerVertical="true"
                     android:layout_marginEnd="8dp"
                     android:layout_marginRight="8dp"
-                    android:adjustViewBounds="true"
-                    android:background="@android:color/transparent"
                     android:elevation="5dp"
                     android:padding="4dp"
-                    android:scaleType="centerCrop"
+                    app:icon_size="22dp"
-                    app:srcCompat="@drawable/ic_menu_heart_60dp"
+                    app:icon_type="heart" />
-                    app:tint="@color/ic_menu_heart_color" />
 
                 <ImageButton
                     android:id="@+id/shareBtn"
@@ -126,8 +121,8 @@
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_share_black_24dp"
+                    android:src="@drawable/ic_share_black_24dp"
-                    app:tint="?android:attr/textColorPrimary" />
+                    android:tint="?android:attr/textColorPrimary" />
 
                 <ImageButton
                     android:id="@+id/browserBtn"
@@ -143,8 +138,8 @@
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
+                    android:src="@drawable/ic_open_in_browser_black_24dp"
-                    app:tint="?android:attr/textColorPrimary" />
+                    android:tint="?android:attr/textColorPrimary" />
 
             </RelativeLayout>
 

app/src/main/res/layout/fragment_article.xml

@@ -33,7 +33,7 @@
                 android:layout_marginLeft="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginRight="16dp"
-                android:textColor="?android:textColorSecondary"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textSize="12sp"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -65,7 +65,6 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="24dp"
                 android:paddingBottom="48dp"
-                android:background="?android:colorBackground"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"

app/src/main/res/layout/list_item.xml

@@ -12,8 +12,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="21dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
-        android:layout_marginLeft="8dp" />
 
     <TextView
         android:id="@+id/title"
@@ -30,14 +29,11 @@
         android:textAllCaps="false"
         android:textSize="16sp"
         android:textStyle="bold"
-        android:textColor="?android:textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Titre"
+        tools:text="Titre" />
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="16dp" />
 
     <TextView
         android:id="@+id/sourceTitleAndDate"
@@ -50,13 +46,10 @@
         android:maxLines="1"
         android:textAlignment="viewStart"
         android:textSize="14sp"
-        android:textColor="?android:textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Google Actualité Il y a 5h"
+        tools:text="Google Actualité Il y a 5h" />
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="16dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/settings_toolbar.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.AppBarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:theme="@style/ToolBarStyle"
+        app:popupTheme="?attr/toolbarPopupTheme" />
+
+</com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/source_list_item.xml

@@ -1,50 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="48dp">
-    android:orientation="vertical">
 
 
     <ImageView
         android:id="@+id/itemImage"
-        android:layout_width="36dp"
+        app:layout_constraintTop_toTopOf="parent"
-        android:layout_height="36dp"
-        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginStart="16dp"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginLeft="16dp"
+        android:layout_width="36dp"
+        android:layout_height="36dp"/>
 
     <TextView
-        android:id="@+id/sourceTitle"
+        android:layout_width="wrap_content"
-        android:layout_width="0dp"
         android:layout_height="17dp"
-        android:layout_marginStart="8dp"
+        android:id="@+id/sourceTitle"
-        android:ellipsize="end"
-        android:gravity="start"
-        android:maxLines="1"
-        android:textAlignment="textStart"
-        android:textSize="13sp"
-        android:textColor="?android:textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
-        app:layout_constraintStart_toEndOf="@+id/itemImage"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="source title" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/itemImage"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:textSize="13sp"
+        android:textAlignment="viewStart"
+        tools:text="source title "
+        android:gravity="start" />
 
     <Button
         android:id="@+id/deleteBtn"
-        style="@style/Widget.AppCompat.Button.Borderless"
-        android:layout_width="34dp"
-        android:layout_height="34dp"
-        android:layout_marginEnd="8dp"
         android:background="@drawable/ic_remove_circle_outline_black_24dp"
+        style="@style/Widget.AppCompat.Button.Borderless"
         android:backgroundTint="?android:textColorSecondary"
         android:elevation="4dp"
-        android:contentDescription="@string/remove_source"
+        android:layout_marginTop="16dp"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginBottom="16dp"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginEnd="16dp"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginRight="16dp"
+        android:layout_marginStart="8dp"
+        app:layout_constraintLeft_toRightOf="@+id/sourceTitle"
+        android:layout_marginLeft="8dp"
+        app:layout_constraintHorizontal_bias="1.0"
+        android:layout_width="34dp"
+        android:layout_height="34dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/reader_menu.xml

@@ -15,8 +15,14 @@
         android:title="@string/reader_text_align_justify" />
 
     <item
-        android:id="@+id/star"
+        android:id="@+id/unsave"
-        android:icon="@drawable/ic_menu_heart_60dp"
+        android:icon="@drawable/heart_on"
+        android:title="@string/remove_to_favs_reader"
+        android:visible="true"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/save"
+        android:icon="@drawable/heart_off"
         android:title="@string/add_to_favs_reader"
         android:visible="true"
         app:showAsAction="ifRoom" />

app/src/main/res/menu/reader_toolbar.xml

@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/unread_action"
-        android:icon="@drawable/ic_baseline_white_eye_24dp"
+        android:icon="@drawable/ic_fiber_new_white_24dp"
         android:title="@string/unmark"
         app:showAsAction="ifRoom" />
 
@@ -17,6 +17,7 @@
     <item
         android:id="@+id/open_action"
         android:icon="@drawable/ic_open_in_browser_white_24dp"
+        android:iconTint="@color/white"
         android:title="@string/reader_action_open"
         app:showAsAction="ifRoom" />
 

app/src/main/res/values-ca-rES/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-de-rDE/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-es-rES/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Alinear a la izquierda</string>
     <string name="reader_text_align_justify">Justificado</string>
     <string name="settings_reader_font">Modo lectura</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-fa-rIR/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-fr-rFR/strings.xml

@@ -139,8 +139,8 @@
     <string name="pref_switch_items_caching_off">Les articles ne seront pas enregistrés et l\'application ne sera pas utilisable hors ligne.</string>
     <string name="pref_switch_items_caching_on">Les articles seront enregistrés et l\'application sera utilisable hors ligne.</string>
     <string name="pref_switch_items_caching">Sauvegarder les articles pour une utilisation hors ligne</string>
-    <string name="pref_switch_update_sources">Vérifier les nouvelles sources et tags</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
-    <string name="pref_switch_update_sources_summary">Désactivez cette option si votre serveur reçoit trop de requêtes.</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Hors connexion !</string>
     <string name="pref_switch_periodic_refresh">Synchroniser les articles</string>
     <string name="pref_switch_periodic_refresh_off">Les articles ne seront pas synchronisés en arrière plan</string>
@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Aligner à gauche</string>
     <string name="reader_text_align_justify">Justifier le texte</string>
     <string name="settings_reader_font">Police du lecteur d\'articles</string>
-    <string name="reader_static_bar_title">Barre statique pour le visionneur d\'articles</string>
-    <string name="reader_static_bar_on">La barre sera affichée</string>
-    <string name="reader_static_bar_off">La barre sera affichée grâce au bouton</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-gl-rES/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="app_name">"Lector para selfoss"</string>
+    <string name="app_name">"Lector para Selfoss"</string>
-    <string name="title_activity_login">"Conectar"</string>
+    <string name="title_activity_login">"Acceder"</string>
     <string name="prompt_password">"Contrasinal"</string>
     <string name="prompt_http_password">"Contrasinal HTTP"</string>
     <string name="action_sign_in">"Ir"</string>
@@ -9,7 +9,7 @@
     <string name="error_field_required">"Campo requirido"</string>
     <string name="prompt_url">"URL"</string>
     <string name="withLoginSwitch">"É preciso iniciar sesión?"</string>
-    <string name="withHttpLoginSwitch">"É preciso iniciar sesión?"</string>
+    <string name="withHttpLoginSwitch">"É preciso iniciar sesión HTTP?"</string>
     <string name="login_url_problem">"Ups! Pode que precises engadir un \"/\" o final da URL."</string>
     <string name="prompt_login">"Nome de usuario"</string>
     <string name="prompt_http_login">"Nome de usuario HTTP"</string>
@@ -139,8 +139,8 @@
     <string name="pref_switch_items_caching_off">Os artigos non se gardaran na memoria do dispositivo e non se poderá utilizar a aplicación sen conexión.</string>
     <string name="pref_switch_items_caching_on">Os artigos gardaranse na memoria do dispositivo e estarán dispoñibles sen conexión.</string>
     <string name="pref_switch_items_caching">Gardar elementos para uso sen conexión</string>
-    <string name="pref_switch_update_sources">Comproba novas fontes e etiquetas</string>
+    <string name="pref_switch_update_sources">Check for new sources and tags</string>
-    <string name="pref_switch_update_sources_summary">Deshabilita isto se o teu servidor está recibindo demasiadas peticións de base de datos.</string>
+    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
     <string name="no_network_connectivity">Non conectado!</string>
     <string name="pref_switch_periodic_refresh">Sincronizar artigos</string>
     <string name="pref_switch_periodic_refresh_off">Os artigos non se sincronizarán coa aplicación de fondo</string>
@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Aliñar á esquerda</string>
     <string name="reader_text_align_justify">Xustificado</string>
     <string name="settings_reader_font">Modo lector</string>
-    <string name="reader_static_bar_title">Barra inferior estática na vista de artigos</string>
-    <string name="reader_static_bar_on">A barra inferior mostrarase sempre</string>
-    <string name="reader_static_bar_off">A barra inferior pode mostrarse a través do botón flotante</string>
-    <string name="remove_source">Eliminar fonte</string>
 </resources>

app/src/main/res/values-in-rID/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-it-rIT/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-ko-rKR/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-nl-rNL/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-si-rLK/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-tr-rTR/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">左对齐</string>
     <string name="reader_text_align_justify">左右对齐</string>
     <string name="settings_reader_font">阅读器字体</string>
-    <string name="reader_static_bar_title">文章查看器中的静态底部栏</string>
-    <string name="reader_static_bar_on">底部栏将始终显示</string>
-    <string name="reader_static_bar_off">底部栏可以通过浮动按钮显示</string>
-    <string name="remove_source">删除源</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -162,8 +162,4 @@
     <string name="reader_text_align_left">Align left</string>
     <string name="reader_text_align_justify">Justify</string>
     <string name="settings_reader_font">Reader font</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values/colors.xml

@@ -7,7 +7,6 @@
     <color name="pink">#FFe91e63</color>
     <color name="white">#FFFFFFFF</color>
     <color name="black">#FF000000</color>
-    <color name="red">#FF0000</color>
     <color name="refresh_progress_1">@color/colorAccentDark</color>
     <color name="refresh_progress_2">@color/colorAccent</color>
     <color name="refresh_progress_3">@color/pink</color>

app/src/main/res/values/strings.xml

@@ -165,8 +165,4 @@
     <string name="settings_reader_font">Reader font</string>
     <string name="open_sans_font_id" translatable="false">open_sans</string>
     <string name="roboto_font_id" translatable="false">roboto</string>
-    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
-    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
-    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
-    <string name="remove_source">Remove source</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -4,63 +4,41 @@
         <item name="android:windowBackground">@drawable/background_splash</item>
     </style>
 
-    <style name="NoBar" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="NoBar" parent="MaterialDrawerTheme.Light">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorAccentDark">@color/colorAccentDark</item>
         <item name="cardBackgroundColor">@color/white</item>
-        <item name="android:colorBackground">@color/grey_50</item>
+        <item name="android:colorBackground">@color/md_grey_50</item>
-        <item name="colorSurface">@color/grey_50</item>
+        <item name="android:textColorPrimary">@color/md_grey_900</item>
-        <item name="android:textColorPrimary">@color/grey_900</item>
+        <item name="android:textColorSecondary">@color/md_grey_400</item>
-        <item name="android:textColorSecondary">@color/grey_400</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
-        <item name="materialDrawerStyle">@style/App.materialDrawerStyle</item>
-        <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-        <item name="preferenceTheme">@style/PreferenceStyle</item>
     </style>
 
-    <style name="NoBarDark" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="NoBarDark" parent="MaterialDrawerTheme">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorAccentDark">@color/colorAccentDark</item>
-        <item name="cardBackgroundColor">@color/grey_800</item>
+        <item name="cardBackgroundColor">@color/md_grey_800</item>
         <item name="android:colorBackground">@color/darkBackground</item>
-        <item name="colorSurface">@color/darkBackground</item>
+        <item name="bnbBackgroundColor">@color/md_grey_900</item>
-        <item name="bnbBackgroundColor">@color/grey_900</item>
+        <item name="android:textColorPrimary">@color/md_white_1000</item>
-        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/md_grey_600</item>
-        <item name="android:textColorSecondary">@color/grey_600</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
-        <item name="materialDrawerStyle">@style/App.materialDrawerStyle</item>
-        <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="preferenceTheme">@style/PreferenceStyle</item>
     </style>
 
     <!-- ToolBar -->
     <style name="ToolBarStyle" parent="Theme.AppCompat">
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:textColorSecondary">@color/white</item>
+        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
         <item name="actionMenuTextColor">@color/white</item>
         <!--<item name="actionOverflowButtonStyle">@style/ActionButtonOverflowStyle</item>
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>-->
     </style>
 
-    <!-- Material Drawer Theme -->
-    <style name="App.materialDrawerStyle" parent="@style/Widget.MaterialDrawerStyle">
-        <item name="materialDrawerPrimaryIcon">?android:textColorPrimary</item>
-        <item name="materialDrawerSecondaryIcon">?android:textColorPrimary</item>
-        <item name="materialDrawerSecondaryText">?android:textColorPrimary</item>
-    </style>
-      
-    <!-- Preference Theme -->
-    <style name="PreferenceStyle" parent="@style/PreferenceThemeOverlay">
-        <item name="android:tint">?android:textColorPrimary</item>
-    </style>
-
-    <!-- Spinner Theme -->
-    <style name="App.Spinner" parent="Widget.AppCompat.Light.DropDownItem.Spinner">
-        <item name="android:textColor">?android:textColorPrimary</item>
-    </style>
-
 </resources>

app/src/main/res/xml/pref_experimental.xml

@@ -1,11 +1,9 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
     <EditTextPreference
         android:inputType="number"
         android:key="api_timeout"
         android:selectAllOnFocus="true"
         android:singleLine="true"
-        android:title="@string/pref_api_timeout"
+        android:title="@string/pref_api_timeout" />
-        app:iconSpaceReserved="false"/>
 
 </PreferenceScreen>

app/src/main/res/xml/pref_general.xml

@@ -1,5 +1,4 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
         android:title="@string/pref_selfoss_category">
@@ -11,8 +10,7 @@
         android:key="prefer_api_items_number"
         android:selectAllOnFocus="true"
         android:singleLine="true"
-        android:title="@string/pref_api_items_number_title"
+        android:title="@string/pref_api_items_number_title" />
-        app:iconSpaceReserved="false"/>
 
     <EditTextPreference
         android:defaultValue=""
@@ -20,14 +18,12 @@
         android:key="hidden_tags"
         android:selectAllOnFocus="true"
         android:singleLine="true"
-        android:title="@string/pref_hidden_tags"
+        android:title="@string/pref_hidden_tags" />
-        app:iconSpaceReserved="false"/>
 
     <SwitchPreference
         android:defaultValue="false"
         android:key="infinite_loading"
-        android:title="@string/pref_general_infinite_loading_title"
+        android:title="@string/pref_general_infinite_loading_title" />
-        app:iconSpaceReserved="false"/>
     <PreferenceCategory
         android:title="@string/pref_general_category_links">
 
@@ -37,24 +33,14 @@
         android:key="prefer_internal_browser"
         android:summaryOff="@string/pref_general_internal_browser_off"
         android:summaryOn="@string/pref_general_internal_browser_on"
-        android:title="@string/pref_general_internal_browser_title"
+        android:title="@string/pref_general_internal_browser_title" />
-        app:iconSpaceReserved="false"/>
     <SwitchPreference
         android:defaultValue="true"
         android:dependency="prefer_internal_browser"
         android:key="prefer_article_viewer"
         android:summaryOff="@string/prefer_article_viewer_off"
         android:summaryOn="@string/prefer_article_viewer_on"
-        android:title="@string/prefer_article_viewer_title"
+        android:title="@string/prefer_article_viewer_title" />
-        app:iconSpaceReserved="false"/>
-    <SwitchPreference
-        android:defaultValue="false"
-        android:dependency="prefer_article_viewer"
-        android:key="reader_static_bar"
-        android:summaryOff="@string/reader_static_bar_off"
-        android:summaryOn="@string/reader_static_bar_on"
-        android:title="@string/reader_static_bar_title"
-        app:iconSpaceReserved="false"/>
 
     <PreferenceCategory
         android:title="@string/pref_general_category_displaying">
@@ -64,34 +50,29 @@
         android:defaultValue="false"
         android:key="account_header_displaying"
         android:summary="@string/display_header_drawer_summary"
-        android:title="@string/display_header_drawer_title"
+        android:title="@string/display_header_drawer_title" />
-        app:iconSpaceReserved="false"/>
     <SwitchPreference
         android:defaultValue="false"
         android:key="card_view_active"
         android:summaryOff="@string/pref_switch_card_view_off"
         android:summaryOn="@string/pref_switch_card_view_on"
-        android:title="@string/pref_switch_card_view_title"
+        android:title="@string/pref_switch_card_view_title" />
-        app:iconSpaceReserved="false"/>
     <SwitchPreference
         android:defaultValue="false"
         android:dependency="card_view_active"
         android:key="full_height_cards"
         android:summaryOff="@string/card_height_off"
         android:summaryOn="@string/card_height_on"
-        android:title="@string/card_height_title"
+        android:title="@string/card_height_title" />
-        app:iconSpaceReserved="false"/>
     <SwitchPreference
         android:defaultValue="true"
         android:key="display_unread_count"
         android:summaryOn="@string/switch_unread_count"
-        android:title="@string/switch_unread_count_title"
+        android:title="@string/switch_unread_count_title" />
-        app:iconSpaceReserved="false"/>
     <SwitchPreference
         android:defaultValue="false"
         android:dependency="display_unread_count"
         android:key="display_other_count"
-        android:title="@string/display_all_counts_title"
+        android:title="@string/display_all_counts_title" />
-        app:iconSpaceReserved="false"/>
 
 </PreferenceScreen>

app/src/main/res/xml/pref_headers.xml

@@ -0,0 +1,57 @@
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <header
+        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$GeneralPreferenceFragment"
+        android:icon="@drawable/ic_settings_black_24dp"
+        android:title="@string/pref_header_general">
+        <extra
+            android:name="iconDark"
+            android:value="ic_settings_white_24dp"/>
+    </header>
+
+    <header
+        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ArticleViewerPreferenceFragment"
+        android:icon="@drawable/ic_chrome_reader_mode_black_24dp"
+        android:title="@string/pref_header_viewer">
+        <extra
+            android:name="iconDark"
+            android:value="ic_chrome_reader_mode_white_24dp"/>
+    </header>
+
+    <header
+        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$OfflinePreferenceFragment"
+        android:icon="@drawable/ic_signal_wifi_off_black_24dp"
+        android:title="@string/pref_header_offline">
+        <extra
+            android:name="iconDark"
+            android:value="ic_signal_wifi_off_white_24dp"/>
+    </header>
+
+    <header
+        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ThemePreferenceFragment"
+        android:icon="@drawable/ic_color_lens_black_24dp"
+        android:title="@string/pref_header_theme">
+        <extra
+            android:name="iconDark"
+            android:value="ic_color_lens_white_24dp"/>
+    </header>
+
+    <header
+        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$LinksPreferenceFragment"
+        android:icon="@drawable/ic_info_black_24dp"
+        android:title="@string/pref_header_links">
+        <extra
+            android:name="iconDark"
+            android:value="ic_info_white_24dp"/>
+    </header>
+
+    <header
+        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ExperimentalPreferenceFragment"
+        android:icon="@drawable/ic_widgets_black_24dp"
+        android:title="@string/pref_header_experimental">
+        <extra
+            android:name="iconDark"
+            android:value="ic_widgets_white_24dp"/>
+    </header>
+
+</preference-headers>

app/src/main/res/xml/pref_links.xml

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference android:title="@string/issue_tracker_link"
                 android:summary="@string/issue_tracker_summary"
-                android:key="trackerLink"
+                android:key="trackerLink" />
-                app:iconSpaceReserved="false"/>
 
     <Preference android:title="@string/source_code"
-        android:key="sourceLink"
+        android:key="sourceLink" />
-        app:iconSpaceReserved="false"/>
 
     <Preference android:title="@string/translation"
-        android:key="translation"
+        android:key="translation" />
-        app:iconSpaceReserved="false"/>
 </PreferenceScreen>

app/src/main/res/xml/pref_main.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/title_activity_settings">
-
-    <Preference
-        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$GeneralPreferenceFragment"
-        android:title="@string/pref_header_general"
-        android:icon="@drawable/ic_settings_black_24dp" />
-
-    <Preference
-        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ArticleViewerPreferenceFragment"
-        android:title="@string/pref_header_viewer"
-        android:icon="@drawable/ic_chrome_reader_mode_black_24dp" />
-
-    <Preference
-        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$OfflinePreferenceFragment"
-        android:title="@string/pref_header_offline"
-        android:icon="@drawable/ic_signal_wifi_off_black_24dp" />
-
-    <Preference
-        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ThemePreferenceFragment"
-        android:title="@string/pref_header_theme"
-        android:icon="@drawable/ic_color_lens_black_24dp" />
-
-    <Preference
-        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$LinksPreferenceFragment"
-        android:title="@string/pref_header_links"
-        android:icon="@drawable/ic_info_black_24dp" />
-
-    <Preference
-        android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ExperimentalPreferenceFragment"
-        android:title="@string/pref_header_experimental"
-        android:icon="@drawable/ic_widgets_black_24dp" />
-
-</PreferenceScreen>

app/src/main/res/xml/pref_offline.xml

@@ -1,9 +1,7 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
     <SwitchPreference
         android:defaultValue="false"
         android:key="items_caching"
-        app:iconSpaceReserved="false"
         android:summaryOff="@string/pref_switch_items_caching_off"
         android:summaryOn="@string/pref_switch_items_caching_on"
         android:title="@string/pref_switch_items_caching" />
@@ -12,7 +10,6 @@
         android:defaultValue="false"
         android:key="periodic_refresh"
         android:dependency="items_caching"
-        app:iconSpaceReserved="false"
         android:summaryOff="@string/pref_switch_periodic_refresh_off"
         android:summaryOn="@string/pref_switch_periodic_refresh_on"
         android:title="@string/pref_switch_periodic_refresh" />
@@ -21,7 +18,6 @@
         android:dependency="periodic_refresh"
         android:defaultValue="360"
         android:inputType="number"
-        app:iconSpaceReserved="false"
         android:key="periodic_refresh_minutes"
         android:selectAllOnFocus="true"
         android:singleLine="true"
@@ -29,21 +25,18 @@
 
     <SwitchPreference
         android:defaultValue="false"
-        app:iconSpaceReserved="false"
         android:key="refresh_when_charging"
         android:dependency="periodic_refresh"
         android:title="@string/pref_switch_refresh_when_charging" />
 
     <SwitchPreference
         android:defaultValue="false"
-        app:iconSpaceReserved="false"
         android:key="notify_new_items"
         android:dependency="periodic_refresh"
         android:title="@string/pref_switch_notify_new_items" />
 
     <SwitchPreference
         android:defaultValue="true"
-        app:iconSpaceReserved="false"
         android:key="update_sources"
         android:summary="@string/pref_switch_update_sources_summary"
         android:title="@string/pref_switch_update_sources" />

app/src/main/res/xml/pref_theme.xml

@@ -1,35 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
     <!-- TODO translate this file -->
 
     <SwitchPreference
         android:defaultValue="false"
         android:key="dark_theme"
-        app:iconSpaceReserved="false"
         android:title="Dark theme" />
 
-    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+    <com.jaredrummler.android.colorpicker.ColorPreference
         android:defaultValue="@color/colorPrimary"
         android:key="color_primary"
-        app:iconSpaceReserved="false"
         android:title="Primary color"/>
 
-    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+    <com.jaredrummler.android.colorpicker.ColorPreference
         android:defaultValue="@color/colorPrimaryDark"
         android:key="color_primary_dark"
-        app:iconSpaceReserved="false"
         android:title="Primary dark color"/>
 
-    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+    <com.jaredrummler.android.colorpicker.ColorPreference
         android:defaultValue="@color/colorAccent"
         android:key="color_accent"
-        app:iconSpaceReserved="false"
         android:title="Accent color"/>
 
-    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+    <com.jaredrummler.android.colorpicker.ColorPreference
         android:defaultValue="@color/colorAccentDark"
         android:key="color_accent_dark"
-        app:iconSpaceReserved="false"
         android:title="Accent dark color"/>
 </PreferenceScreen>

app/src/main/res/xml/pref_viewer.xml

@@ -1,9 +1,7 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
     <SwitchPreference
         android:defaultValue="false"
         android:key="mark_on_scroll"
-        app:iconSpaceReserved="false"
         android:summaryOff="@string/pref_switch_actions_pager_scroll_off"
         android:summaryOn="@string/pref_switch_actions_pager_scroll_on"
         android:title="@string/pref_switch_actions_pager_scroll" />
@@ -12,7 +10,6 @@
         android:defaultValue="16"
         android:inputType="number"
         android:key="reader_font_size"
-        app:iconSpaceReserved="false"
         android:selectAllOnFocus="true"
         android:singleLine="true"
         android:title="@string/pref_content_reader_font_size" />
@@ -21,6 +18,5 @@
         android:entries="@array/preloaded_fonts_values"
         android:entryValues="@array/preloaded_fonts_keys"
         android:key="reader_font"
-        app:iconSpaceReserved="false"
         android:title="@string/settings_reader_font" />
 </PreferenceScreen>

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.5.31'
+        kotlin_version = '1.4.21'
         android_version = '1.0.0'
         androidx_version = '1.1.0-alpha05'
         lifecycle_version = '2.2.0-alpha01'
@@ -12,19 +12,23 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url "https://www.jitpack.io" }
+        maven {
+            url "https://jitpack.io"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
+        // For likebutton only
+        maven { url "https://jitpack.io" }
+
         google()
         jcenter()
-        maven { url "https://www.jitpack.io" }
         mavenCentral()
     }
 }
@@ -33,4 +37,14 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-project.ext.preDexLibs = !project.hasProperty('disablePreDex')
+project.ext.preDexLibs = !project.hasProperty('disablePreDex')
+
+subprojects {
+    project.plugins.whenPluginAdded { plugin ->
+        if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        } else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        }
+    }
+}

gradle.properties

@@ -16,5 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 org.gradle.caching=true
+android.enableD8=true
 android.useAndroidX=true
 android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip