Clear settings on logout (#395)

* Send a single article to ArticleFragment

* Allow using the internal browser

CHANGELOG.md

@@ -44,6 +44,8 @@
 
 - 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.

app/build.gradle

@@ -32,17 +32,20 @@ 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
-    buildToolsVersion '30.0.3'
+    buildToolsVersion '31.0.0'
     buildFeatures {
         viewBinding true
     }
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 31
         versionCode versionCodeFromGit()
         versionName versionNameFromGit()
@@ -91,6 +94,8 @@ android {
 }
 
 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'
@@ -108,19 +113,23 @@ dependencies {
     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.work:work-runtime-ktx:2.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
-    implementation 'org.jsoup:jsoup:1.13.1'
+    implementation 'org.jsoup:jsoup:1.14.3'
+
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
 
     //multidex
     implementation 'androidx.multidex:multidex:2.0.1'
 
     // About
-    implementation('com.mikepenz:aboutlibraries:6.2.0@aar') {
-        transitive = true
-    }
+    implementation 'com.mikepenz:aboutlibraries-core:8.9.4'
+    implementation 'com.mikepenz:aboutlibraries:8.9.4'
+    implementation "com.mikepenz:aboutlibraries-definitions:8.9.4"
 
     // Async
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
 
     // Retrofit + http logging + okhttp
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@@ -129,35 +138,35 @@ dependencies {
     implementation 'com.burgstaller:okhttp-digest:2.5'
 
     // Material-ish things
-    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
-    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
+    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.2.0'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
     // glide
-    implementation 'com.github.bumptech.glide:glide:4.1.1'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'
 
     // Drawer
-    implementation 'co.zsmb:materialdrawer-kt:2.0.2'
+    implementation 'com.mikepenz:materialdrawer:8.4.4'
 
     // Themes
     implementation 'com.52inc:scoops:1.0.0'
-    implementation 'com.jaredrummler:colorpicker:1.0.2'
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
     implementation 'com.github.rubensousa:floatingtoolbar:1.5.1'
 
     // Pager
-    implementation 'me.relex:circleindicator:2.0.0@aar'
+    implementation 'me.relex:circleindicator:2.1.6'
+    implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
 
     //PhotoView
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
-    implementation 'androidx.core:core-ktx:1.7.0-beta02'
+    implementation 'androidx.core:core-ktx:1.7.0-rc01'
 
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-rc01"
     implementation "androidx.lifecycle:lifecycle-common-java8:2.4.0-rc01"
 
-    implementation "androidx.room:room-ktx:2.4.0-alpha05"
-    kapt "androidx.room:room-compiler:2.4.0-alpha05"
+    implementation "androidx.room:room-ktx:2.4.0-beta01"
+    kapt "androidx.room:room-compiler:2.4.0-beta01"
 
     implementation "android.arch.work:work-runtime-ktx:$work_version"
 }

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

@@ -0,0 +1,31 @@
+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/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt

@@ -2,9 +2,8 @@ package apps.amine.bou.readerforselfoss
 
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.appcompat.app.AppCompatActivity
 import android.view.View
@@ -50,38 +49,24 @@ class AddSourceActivity : AppCompatActivity() {
 
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-        }
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
 
         val drawable = binding.nameInput.background
-        drawable.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
+        drawable.setTint(appColors.colorAccent)
 
 
         // TODO: clean
-        if(Build.VERSION.SDK_INT > 16) {
-            binding.nameInput.background = drawable
-        } else{
-            binding.nameInput.setBackgroundDrawable(drawable)
-        }
+        binding.nameInput.background = drawable
 
         val drawable1 = binding.sourceUri.background
-        drawable1.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
+        drawable1.setTint(appColors.colorAccent)
 
-        if(Build.VERSION.SDK_INT > 16) {
-            binding.sourceUri.background = drawable1
-        } else{
-            binding.sourceUri.setBackgroundDrawable(drawable1)
-        }
+        binding.sourceUri.background = drawable1
 
         val drawable2 = binding.tags.background
-        drawable2.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
+        drawable2.setTint(appColors.colorAccent)
 
-        if(Build.VERSION.SDK_INT > 16) {
-            binding.tags.background = drawable2
-        } else{
-            binding.tags.setBackgroundDrawable(drawable2)
-        }
+        binding.tags.background = drawable2
 
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)

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

@@ -4,21 +4,23 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Color
-import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.ImageView
 import android.widget.Toast
+import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.MenuItemCompat
 import androidx.core.view.doOnNextLayout
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.recyclerview.widget.*
 import androidx.room.Room
 import androidx.work.Constraints
@@ -48,23 +50,26 @@ import apps.amine.bou.readerforselfoss.utils.longHash
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
 import apps.amine.bou.readerforselfoss.utils.persistence.toView
-import co.zsmb.materialdrawerkt.builders.accountHeader
-import co.zsmb.materialdrawerkt.builders.drawer
-import co.zsmb.materialdrawerkt.builders.footer
-import co.zsmb.materialdrawerkt.draweritems.badgeable.primaryItem
-import co.zsmb.materialdrawerkt.draweritems.profile.profile
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
 import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
 import com.mikepenz.aboutlibraries.LibsBuilder
-import com.mikepenz.materialdrawer.Drawer
 import com.mikepenz.materialdrawer.holder.BadgeStyle
+import com.mikepenz.materialdrawer.holder.ColorHolder
 import com.mikepenz.materialdrawer.holder.StringHolder
 import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
+import com.mikepenz.materialdrawer.model.ProfileDrawerItem
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
+import com.mikepenz.materialdrawer.model.interfaces.*
+import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
+import com.mikepenz.materialdrawer.util.DrawerImageLoader
+import com.mikepenz.materialdrawer.util.addStickyFooterItem
+import com.mikepenz.materialdrawer.util.updateBadge
+import com.mikepenz.materialdrawer.widget.AccountHeaderView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -95,7 +100,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private var displayAllCount = false
     private var fullHeightCards: Boolean = false
     private var itemsNumber: Int = 200
-    private var elementsShown: Int = 0
+    private var elementsShown: Int = 1
     private var maybeTagFilter: Tag? = null
     private var maybeSourceFilter: Source? = null
     private var maybeSearchFilter: String? = null
@@ -116,7 +121,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private lateinit var tabNewBadge: TextBadgeItem
     private lateinit var tabArchiveBadge: TextBadgeItem
     private lateinit var tabStarredBadge: TextBadgeItem
-    private lateinit var drawer: Drawer
     private lateinit var api: SelfossApi
     private lateinit var customTabActivityHelper: CustomTabActivityHelper
     private lateinit var editor: SharedPreferences.Editor
@@ -166,6 +170,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         handleThemeBinding()
 
         setSupportActionBar(binding.toolBar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setHomeButtonEnabled(true)
+        val mDrawerToggle = ActionBarDrawerToggle(this, binding.drawerContainer, binding.toolBar, R.string.material_drawer_open, R.string.material_drawer_close)
+        binding.drawerContainer.addDrawerListener(mDrawerToggle)
+        mDrawerToggle.syncState()
 
         db = Room.databaseBuilder(
             applicationContext,
@@ -330,20 +339,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private fun getApiMajorVersion() {
         api.apiVersion.enqueue(object : Callback<ApiVersion> {
             override fun onFailure(call: Call<ApiVersion>, t: Throwable) {
-                if (apiVersionMajor >= 4) {
-                    Config.dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
-                }
+                Config.apiVersion = apiVersionMajor
             }
 
             override fun onResponse(call: Call<ApiVersion>, response: Response<ApiVersion>) {
                 if(response.body() != null) {
                     val version = response.body() as ApiVersion
                     apiVersionMajor = version.getApiMajorVersion()
-                    sharedPref.edit().putInt("apiVersionMajor", apiVersionMajor).commit()
+                    sharedPref.edit().putInt("apiVersionMajor", apiVersionMajor).apply()
 
-                    if (apiVersionMajor >= 4) {
-                        Config.dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
-                    }
+                    Config.apiVersion = apiVersionMajor
                 }
             }
         })
@@ -430,9 +435,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     private fun handleThemeBinding() {
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-        }
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
     }
 
     private fun handleThemeUpdate() {
@@ -440,67 +443,84 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         val scoop = Scoop.getInstance()
         scoop.update(Toppings.PRIMARY.value, appColors.colorPrimary)
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            scoop.update(Toppings.PRIMARY_DARK.value, appColors.colorPrimaryDark)
-        }
+        scoop.update(Toppings.PRIMARY_DARK.value, appColors.colorPrimaryDark)
     }
 
     private fun handleDrawer() {
+        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
+            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
+                Glide.with(this@HomeActivity)
+                        .asBitmap()
+                        .load(uri)
+                        .apply(RequestOptions()
+                                .placeholder(R.mipmap.ic_launcher)
+                                .fallback(R.mipmap.ic_launcher)
+                                .fitCenter())
+                        .into(imageView)
+            }
+
+            override fun cancel(imageView: ImageView) {
+                Glide.with(this@HomeActivity).clear(imageView)
+            }
+        })
+
+        val drawerListener = object : DrawerLayout.DrawerListener {
+            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
+            }
+
+            override fun onDrawerOpened(drawerView: View) {
+                binding.bottomBar.hide()
+            }
+
+            override fun onDrawerClosed(drawerView: View) {
+                binding.bottomBar.show()
+            }
+
+            override fun onDrawerStateChanged(newState: Int) {
+            }
+
+        }
+
+        binding.drawerContainer.addDrawerListener(drawerListener)
+
         displayAccountHeader =
                 PreferenceManager.getDefaultSharedPreferences(this)
                     .getBoolean("account_header_displaying", false)
 
-        drawer = drawer {
-            rootViewRes = R.id.drawer_layout
-            toolbar = binding.toolBar
-            actionBarDrawerToggleEnabled = true
-            actionBarDrawerToggleAnimated = true
-            showOnFirstLaunch = true
-            onSlide { _, p1 ->
-                binding.bottomBar.alpha = (1 - p1)
-            }
-            onClosed {
-                binding.bottomBar.show()
-            }
-            onOpened {
-                binding.bottomBar.hide()
-            }
-
-            if (displayAccountHeader) {
-                accountHeader {
-                    background = R.drawable.bg
-                    profile(settings.getString("url", "")!!) {
-                        iconDrawable = resources.getDrawable(R.mipmap.ic_launcher)
-                    }
-                    selectionListEnabledForSingleProfile = false
+        binding.mainDrawer.addStickyFooterItem(
+            PrimaryDrawerItem().apply {
+                nameRes = R.string.drawer_report_bug
+                iconRes = R.drawable.ic_bug_report_black_24dp
+                isIconTinted = true
+                onDrawerItemClickListener = { _, _, _ ->
+                    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Config.trackerUrl))
+                    startActivity(browserIntent)
+                    false
                 }
-            }
+            })
 
-            footer {
-                primaryItem(R.string.drawer_report_bug) {
-                    icon = R.drawable.ic_bug_report_black_24dp
-                    iconTintingEnabled = true
-                    onClick { _ ->
-                        val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Config.trackerUrl))
-                        startActivity(browserIntent)
-                        false
-                    }
+        binding.mainDrawer.addStickyFooterItem(
+            PrimaryDrawerItem().apply {
+                nameRes = R.string.title_activity_settings
+                iconRes = R.drawable.ic_settings_black_24dp
+                isIconTinted = true
+                onDrawerItemClickListener = { _, _, _ ->
+                    startActivity(Intent(this@HomeActivity, SettingsActivity::class.java))
+                    false
                 }
+            })
 
-                primaryItem(R.string.title_activity_settings) {
-                    icon = R.drawable.ic_settings_black_24dp
-                    iconTintingEnabled = true
-                    onClick { _ ->
-                        startActivityForResult(
-                            Intent(
-                                this@HomeActivity,
-                                SettingsActivity::class.java
-                            ),
-                            MENU_PREFERENCES
-                        )
-                        false
+        if (displayAccountHeader) {
+            AccountHeaderView(this).apply {
+                attachToSliderView(binding.mainDrawer)
+                addProfiles(
+                    ProfileDrawerItem().apply {
+                        nameText = settings.getString("url", "").toString()
+                        setBackgroundResource(R.drawable.bg)
+                        iconRes = R.mipmap.ic_launcher
+                        selectionListEnabledForSingleProfile = false
                     }
-                }
+                )
             }
         }
     }
@@ -511,10 +531,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             fun handleTags(maybeTags: List<Tag>?) {
                 if (maybeTags == null) {
                     if (loadedFromCache) {
-                        drawer.addItem(
+                        binding.mainDrawer.itemAdapter.add(
                             SecondaryDrawerItem()
-                                .withName(getString(R.string.drawer_error_loading_tags))
-                                .withSelectable(false)
+                                .apply { nameRes = R.string.drawer_error_loading_tags; isSelectable = false }
                         )
                     }
                 } else {
@@ -523,39 +542,38 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         .sortedBy { it.unread == 0 }
                     tagsBadge = filteredTags.map {
                         val gd = GradientDrawable()
-                        val color = try {
+                        val gdColor = try {
                             Color.parseColor(it.color)
                         } catch (e: IllegalArgumentException) {
                             appColors.colorPrimary
                         }
 
-                        gd.setColor(color)
+                        gd.setColor(gdColor)
                         gd.shape = GradientDrawable.RECTANGLE
                         gd.setSize(30, 30)
                         gd.cornerRadius = 30F
-                        var drawerItem =
+                        val drawerItem =
                             PrimaryDrawerItem()
-                                .withName(it.tag)
-                                .withIdentifier(it.tag.longHash())
-                                .withIcon(gd)
-                                .withBadgeStyle(
-                                    BadgeStyle().withTextColor(Color.WHITE)
-                                        .withColor(appColors.colorAccent)
-                                )
-                                .withOnDrawerItemClickListener { _, _, _ ->
-                                    allItems = ArrayList()
-                                    maybeTagFilter = it
-                                    SharedItems.tagFilter = it.tag
-                                    getElementsAccordingToTab()
-                                    fetchOnEmptyList()
-                                    false
-                                }
+                                .apply {
+                                    nameText = it.getTitleDecoded()
+                                    identifier = it.tag.longHash()
+                                    iconDrawable = gd
+                                    badgeStyle = BadgeStyle().apply {
+                                        textColor = ColorHolder.fromColor(Color.WHITE)
+                                        color = ColorHolder.fromColor(appColors.colorAccent) }
+                                    onDrawerItemClickListener = { _,_,_ ->
+                                        allItems = ArrayList()
+                                        maybeTagFilter = it
+                                        SharedItems.tagFilter = it.tag
+                                        getElementsAccordingToTab()
+                                        fetchOnEmptyList()
+                                        false
+                                    } }
                         if (it.unread > 0) {
-                            drawerItem = drawerItem.withBadge("${it.unread}")
+                            drawerItem.badgeText = it.unread.toString()
                         }
-                        drawer.addItem(
-                            drawerItem
-                        )
+
+                        binding.mainDrawer.itemAdapter.add(drawerItem)
 
                         (it.tag.longHash() to it.unread)
                     }.toMap()
@@ -565,10 +583,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             fun handleHiddenTags(maybeTags: List<Tag>?) {
                 if (maybeTags == null) {
                     if (loadedFromCache) {
-                        drawer.addItem(
-                            SecondaryDrawerItem()
-                                .withName(getString(R.string.drawer_error_loading_tags))
-                                .withSelectable(false)
+                        binding.mainDrawer.itemAdapter.add(
+                            SecondaryDrawerItem().apply {
+                                nameRes = R.string.drawer_error_loading_tags
+                                isSelectable = false
+                            }
                         )
                     }
                 } else {
@@ -576,39 +595,37 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         maybeTags.filter { hiddenTags.contains(it.tag) }
                     tagsBadge = filteredHiddenTags.map {
                         val gd = GradientDrawable()
-                        val color = try {
+                        val gdColor = try {
                             Color.parseColor(it.color)
                         } catch (e: IllegalArgumentException) {
                             appColors.colorPrimary
                         }
 
-                        gd.setColor(color)
+                        gd.setColor(gdColor)
                         gd.shape = GradientDrawable.RECTANGLE
                         gd.setSize(30, 30)
                         gd.cornerRadius = 30F
-                        var drawerItem =
-                            PrimaryDrawerItem()
-                                .withName(it.tag)
-                                .withIdentifier(it.tag.longHash())
-                                .withIcon(gd)
-                                .withBadgeStyle(
-                                    BadgeStyle().withTextColor(Color.WHITE)
-                                        .withColor(appColors.colorAccent)
-                                )
-                                .withOnDrawerItemClickListener { _, _, _ ->
+                        val drawerItem =
+                            PrimaryDrawerItem().apply {
+                                nameText = it.getTitleDecoded()
+                                identifier = it.tag.longHash()
+                                iconDrawable = gd
+                                badgeStyle = BadgeStyle().apply {
+                                    textColor = ColorHolder.fromColor(Color.WHITE)
+                                    color = ColorHolder.fromColor(appColors.colorAccent) }
+                                onDrawerItemClickListener = { _,_,_ ->
                                     allItems = ArrayList()
                                     maybeTagFilter = it
                                     SharedItems.tagFilter = it.tag
                                     getElementsAccordingToTab()
                                     fetchOnEmptyList()
                                     false
-                                }
+                                } }
+
                         if (it.unread > 0) {
-                            drawerItem = drawerItem.withBadge("${it.unread}")
+                            drawerItem.badgeText = it.unread.toString()
                         }
-                        drawer.addItem(
-                            drawerItem
-                        )
+                        binding.mainDrawer.itemAdapter.add(drawerItem)
 
                         (it.tag.longHash() to it.unread)
                     }.toMap()
@@ -618,51 +635,43 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             fun handleSources(maybeSources: List<Source>?) {
                 if (maybeSources == null) {
                     if (loadedFromCache) {
-                        drawer.addItem(
-                            SecondaryDrawerItem()
-                                .withName(getString(R.string.drawer_error_loading_sources))
-                                .withSelectable(false)
+                        binding.mainDrawer.itemAdapter.add(
+                            SecondaryDrawerItem().apply {
+                                nameRes = R.string.drawer_error_loading_sources
+                                isSelectable = false
+                            }
                         )
                     }
                 } else {
-                    for (tag in maybeSources) {
-                        val item = PrimaryDrawerItem()
-                                .withName(tag.getTitleDecoded())
-                                .withIdentifier(tag.id.toLong())
-                                .withOnDrawerItemClickListener { _, _, _ ->
-                                    allItems = ArrayList()
-                                    maybeSourceFilter = tag
-                                    SharedItems.sourceIDFilter = tag.id.toLong()
-                                    SharedItems.sourceFilter = tag.title
-                                    getElementsAccordingToTab()
-                                    fetchOnEmptyList()
-                                    false
-                                }
-                        if (tag.getIcon(this@HomeActivity).isNotBlank()) {
-                            thread {
-                                try {
-                                    item.withIcon(BitmapDrawable(resources, Glide.with(this@HomeActivity).asBitmap().load(tag.getIcon(this@HomeActivity)).submit(100, 100).get()))
-                                } catch (e: Exception) {
-                                }
+                    for (source in maybeSources) {
+                        val item = PrimaryDrawerItem().apply {
+                            nameText = source.getTitleDecoded()
+                            identifier = source.id.toLong()
+                            iconUrl = source.getIcon(this@HomeActivity)
+                            onDrawerItemClickListener = { _,_,_ ->
+                                allItems = ArrayList()
+                                maybeSourceFilter = source
+                                SharedItems.sourceIDFilter = source.id.toLong()
+                                SharedItems.sourceFilter = source.title
+                                getElementsAccordingToTab()
+                                fetchOnEmptyList()
+                                false
                             }
-                        } else {
-                            item.withIcon(R.mipmap.ic_launcher)
                         }
-                        drawer.addItem(item)
-
+                        binding.mainDrawer.itemAdapter.add(item)
                     }
                 }
             }
 
-            drawer.removeAllItems()
+            binding.mainDrawer.itemAdapter.clear()
             if (maybeDrawerData != null) {
-                drawer.addItem(
-                    SecondaryDrawerItem()
-                        .withName(getString(R.string.drawer_item_filters))
-                        .withSelectable(false)
-                        .withIdentifier(DRAWER_ID_FILTERS)
-                        .withBadge(getString(R.string.drawer_action_clear))
-                        .withOnDrawerItemClickListener { _, _, _ ->
+                binding.mainDrawer.itemAdapter.add(
+                    SecondaryDrawerItem().apply {
+                        nameRes = R.string.drawer_item_filters
+                        isSelectable = false
+                        identifier = DRAWER_ID_FILTERS
+                        badgeRes = R.string.drawer_action_clear
+                        onDrawerItemClickListener = { _,_,_ ->
                             allItems = ArrayList()
                             maybeSourceFilter = null
                             SharedItems.sourceFilter = null
@@ -673,55 +682,59 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                             fetchOnEmptyList()
                             false
                         }
+                    }
                 )
                 if (hiddenTags.isNotEmpty()) {
-                    drawer.addItem(DividerDrawerItem())
-                    drawer.addItem(
-                        SecondaryDrawerItem()
-                            .withName(getString(R.string.drawer_item_hidden_tags))
-                            .withIdentifier(DRAWER_ID_HIDDEN_TAGS)
-                            .withSelectable(false)
+                    binding.mainDrawer.itemAdapter.add(
+                        DividerDrawerItem(),
+                        SecondaryDrawerItem().apply {
+                            nameRes = R.string.drawer_item_hidden_tags
+                            identifier = DRAWER_ID_HIDDEN_TAGS
+                            isSelectable = false
+                        }
                     )
                     handleHiddenTags(maybeDrawerData.tags)
                 }
-                drawer.addItem(DividerDrawerItem())
-                drawer.addItem(
-                    SecondaryDrawerItem()
-                        .withName(getString(R.string.drawer_item_tags))
-                        .withIdentifier(DRAWER_ID_TAGS)
-                        .withSelectable(false)
+                binding.mainDrawer.itemAdapter.add(
+                    DividerDrawerItem(),
+                    SecondaryDrawerItem().apply {
+                        nameRes = R.string.drawer_item_tags
+                        identifier = DRAWER_ID_TAGS
+                        isSelectable = false
+                    }
                 )
                 handleTags(maybeDrawerData.tags)
-                drawer.addItem(DividerDrawerItem())
-                drawer.addItem(
-                    SecondaryDrawerItem()
-                        .withName(getString(R.string.drawer_item_sources))
-                        .withIdentifier(DRAWER_ID_TAGS)
-                        .withBadge(getString(R.string.drawer_action_edit))
-                        .withSelectable(false)
-                        .withOnDrawerItemClickListener { _, _, _ ->
-                            startActivity(Intent(this, SourcesActivity::class.java))
+                binding.mainDrawer.itemAdapter.add(
+                    DividerDrawerItem(),
+                    SecondaryDrawerItem().apply {
+                        nameRes = R.string.drawer_item_sources
+                        identifier = DRAWER_ID_SOURCES
+                        isSelectable = false
+                        badgeRes = R.string.drawer_action_edit
+                        onDrawerItemClickListener = { v,_,_ ->
+                            startActivity(Intent(v!!.context, SourcesActivity::class.java))
                             false
                         }
+                    }
                 )
                 handleSources(maybeDrawerData.sources)
-                drawer.addItem(DividerDrawerItem())
-                drawer.addItem(
-                    PrimaryDrawerItem()
-                        .withName(R.string.action_about)
-                        .withSelectable(false)
-                        .withIcon(R.drawable.ic_info_outline_white_24dp)
-                        .withIconTintingEnabled(true)
-                        .withOnDrawerItemClickListener { _, _, _ ->
+                binding.mainDrawer.itemAdapter.add(
+                    DividerDrawerItem(),
+                    PrimaryDrawerItem().apply {
+                        nameRes = R.string.action_about
+                        isSelectable = false
+                        iconRes = R.drawable.ic_info_outline_white_24dp
+                        isIconTinted = true
+                        onDrawerItemClickListener = { _,_,_ ->
                             LibsBuilder()
                                 .withAboutIconShown(true)
                                 .withAboutVersionShown(true)
                                 .start(this@HomeActivity)
                             false
                         }
+                    }
                 )
 
-
                 if (!loadedFromCache) {
                     if (maybeDrawerData.tags != null) {
                         thread {
@@ -741,17 +754,17 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 }
             } else {
                 if (!loadedFromCache) {
-                    drawer.addItem(
-                        PrimaryDrawerItem()
-                            .withName(getString(R.string.no_tags_loaded))
-                            .withIdentifier(DRAWER_ID_TAGS)
-                            .withSelectable(false)
-                    )
-                    drawer.addItem(
-                        PrimaryDrawerItem()
-                            .withName(getString(R.string.no_sources_loaded))
-                            .withIdentifier(DRAWER_ID_SOURCES)
-                            .withSelectable(false)
+                    binding.mainDrawer.itemAdapter.add(
+                        PrimaryDrawerItem().apply {
+                            nameRes = R.string.no_tags_loaded
+                            identifier = DRAWER_ID_TAGS
+                            isSelectable = false
+                        },
+                        PrimaryDrawerItem().apply {
+                            nameRes = R.string.no_sources_loaded
+                            identifier = DRAWER_ID_SOURCES
+                            isSelectable = false
+                        }
                     )
                 }
             }
@@ -802,14 +815,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
             }
         }
 
-        drawer.addItem(
-            PrimaryDrawerItem().withName(getString(R.string.drawer_loading)).withSelectable(
-                false
-            )
+        binding.mainDrawer.itemAdapter.add(
+            PrimaryDrawerItem().apply {
+                nameRes = R.string.drawer_loading
+                isSelectable = false
+            }
         )
 
         thread {
-            var drawerData = DrawerData(db.drawerDataDao().tags().map { it.toView() },
+            val drawerData = DrawerData(db.drawerDataDao().tags().map { it.toView() },
                                         db.drawerDataDao().sources().map { it.toView() })
             runOnUiThread {
                 handleDrawerData(drawerData, loadedFromCache = true)
@@ -1095,9 +1109,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
 
     private fun reloadTagsBadges() {
         tagsBadge.forEach {
-            drawer.updateBadge(it.key, StringHolder("${it.value}"))
+            binding.mainDrawer.updateBadge(it.key, StringHolder(it.value.toString()))
         }
-        drawer.resetDrawerContent()
+        binding.mainDrawer.resetDrawerContent()
     }
 
     private fun calculateNoOfColumns(): Int {
@@ -1127,7 +1141,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
     override fun onActivityResult(req: Int, result: Int, data: Intent?) {
         when (req) {
             MENU_PREFERENCES -> {
-                drawer.closeDrawer()
+                //drawer.closeDrawer()
                 recreate()
             }
             else -> super.onActivityResult(req, result, data)

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

@@ -3,8 +3,9 @@ package apps.amine.bou.readerforselfoss
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
 import apps.amine.bou.readerforselfoss.databinding.ActivityImageBinding
 import apps.amine.bou.readerforselfoss.fragments.ImageFragment
 
@@ -28,8 +29,8 @@ class ImageActivity : AppCompatActivity() {
         allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
         position = intent.getIntExtra("position", 0)
 
-        binding.pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
-        binding.pager.currentItem = position
+        binding.pager.adapter = ScreenSlidePagerAdapter(this)
+        binding.pager.setCurrentItem(position, false)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -43,14 +44,10 @@ class ImageActivity : AppCompatActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-    private inner class ScreenSlidePagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm, FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
 
-        override fun getCount(): Int {
-            return allImages.size
-        }
+        override fun getItemCount(): Int = allImages.size
 
-        override fun getItem(position: Int): ImageFragment {
-            return ImageFragment.newInstance(allImages[position])
-        }
+        override fun createFragment(position: Int): Fragment = ImageFragment.newInstance(allImages[position])
     }
 }

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

@@ -14,15 +14,13 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
-import android.widget.Toast
+import androidx.preference.PreferenceManager
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.databinding.ActivityLoginBinding
 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
@@ -54,7 +52,7 @@ class LoginActivity : AppCompatActivity() {
 
         handleBaseUrlFail()
 
-        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        settings = PreferenceManager.getDefaultSharedPreferences(applicationContext)
         userIdentifier = settings.getString("unique_id", "")!!
 
         editor = settings.edit()
@@ -91,16 +89,16 @@ class LoginActivity : AppCompatActivity() {
             isWithLogin = !isWithLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            binding.loginLayout.visibility = visi
-            binding.passwordLayout.visibility = visi
+            binding.loginView.visibility = visi
+            binding.passwordView.visibility = visi
         }
 
         binding.withHttpLogin.setOnCheckedChangeListener { _, b ->
             isWithHTTPLogin = !isWithHTTPLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            binding.httpLoginInput.visibility = visi
-            binding.httpPasswordInput.visibility = visi
+            binding.httpLoginView.visibility = visi
+            binding.httpPasswordView.visibility = visi
         }
     }
 
@@ -111,9 +109,8 @@ class LoginActivity : AppCompatActivity() {
             alertDialog.setMessage(getString(R.string.base_url_error))
             alertDialog.setButton(
                 AlertDialog.BUTTON_NEUTRAL,
-                "OK",
-                { dialog, _ -> dialog.dismiss() }
-            )
+                "OK"
+            ) { dialog, _ -> dialog.dismiss() }
             alertDialog.show()
         }
     }
@@ -154,9 +151,8 @@ class LoginActivity : AppCompatActivity() {
                 alertDialog.setMessage(getString(R.string.text_wrong_url))
                 alertDialog.setButton(
                     AlertDialog.BUTTON_NEUTRAL,
-                    "OK",
-                    { dialog, _ -> dialog.dismiss() }
-                )
+                    "OK"
+                ) { dialog, _ -> dialog.dismiss() }
                 alertDialog.show()
                 inValidCount = 0
             }

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

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

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

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

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

@@ -2,53 +2,38 @@ package apps.amine.bou.readerforselfoss
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.graphics.drawable.ColorDrawable
-import android.os.Build
+import android.graphics.Color
 import android.os.Bundle
-import android.preference.PreferenceManager
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
-import androidx.core.content.ContextCompat
-import androidx.viewpager.widget.ViewPager
+import androidx.preference.PreferenceManager
 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.fragment.app.FragmentActivity
 import androidx.room.Room
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
 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
 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() {
 
     private var markOnScroll: Boolean = false
     private var currentItem: Int = 0
     private lateinit var userIdentifier: String
+    private lateinit var appColors: AppColors
 
     private lateinit var api: SelfossApi
 
@@ -59,12 +44,15 @@ class ReaderActivity : AppCompatActivity() {
     private lateinit var binding: ActivityReaderBinding
 
     private var activeAlignment: Int = 1
-    val JUSTIFY = 1
-    val ALIGN_LEFT = 2
+    private val JUSTIFY = 1
+    private val ALIGN_LEFT = 2
 
     private fun showMenuItem(willAddToFavorite: Boolean) {
-        toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite
-        toolbarMenu.findItem(R.id.unsave).isVisible = !willAddToFavorite
+        if (willAddToFavorite) {
+            toolbarMenu.findItem(R.id.star).icon.setTint(Color.WHITE)
+        } else {
+            toolbarMenu.findItem(R.id.star).icon.setTint(Color.RED)
+        }
     }
 
     private fun canFavorite() {
@@ -79,6 +67,7 @@ class ReaderActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        appColors = AppColors(this)
         binding = ActivityReaderBinding.inflate(layoutInflater)
         val view = binding.root
 
@@ -91,9 +80,7 @@ class ReaderActivity : AppCompatActivity() {
 
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-        }
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
 
         setSupportActionBar(binding.toolBar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -124,33 +111,14 @@ class ReaderActivity : AppCompatActivity() {
 
         readItem(allItems[currentItem])
 
-        binding.pager.adapter =
-                ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
-        binding.pager.currentItem = currentItem
+        binding.pager.adapter = ScreenSlidePagerAdapter(this)
+        binding.pager.setCurrentItem(currentItem, false)
     }
 
     override fun onResume() {
         super.onResume()
 
-        notifyAdapter()
-
-        binding.pager.setPageTransformer(true, DepthPageTransformer())
-        (binding.indicator as CircleIndicator).setViewPager(binding.pager)
-
-        binding.pager.addOnPageChangeListener(
-            object : ViewPager.SimpleOnPageChangeListener() {
-
-                override fun onPageSelected(position: Int) {
-
-                    if (allItems[position].starred) {
-                        canRemoveFromFavorite()
-                    } else {
-                        canFavorite()
-                    }
-                    readItem(allItems[position])
-                }
-            }
-        )
+        binding.indicator.setViewPager(binding.pager)
     }
 
     private fun readItem(item: Item) {
@@ -159,46 +127,22 @@ class ReaderActivity : AppCompatActivity() {
             }
     }
 
-    private fun notifyAdapter() {
-        (binding.pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        if (markOnScroll) {
-            binding.pager.clearOnPageChangeListeners()
-        }
-    }
-
     override fun onSaveInstanceState(oldInstanceState: Bundle) {
         super.onSaveInstanceState(oldInstanceState)
         oldInstanceState.clear()
     }
 
-    private inner class ScreenSlidePagerAdapter(fm: FragmentManager, val appColors: AppColors) :
-        FragmentStatePagerAdapter(fm) {
+    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) :
+        FragmentStateAdapter(fa) {
 
-        override fun getCount(): Int {
-            return allItems.size
-        }
 
-        override fun getItem(position: Int): ArticleFragment {
-            return ArticleFragment.newInstance(position, allItems)
-        }
+        override fun getItemCount(): Int = allItems.size
 
-        override fun startUpdate(container: ViewGroup) {
-            super.startUpdate(container)
+        override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position])
 
-            container.background = ColorDrawable(
-                ContextCompat.getColor(
-                    this@ReaderActivity,
-                    appColors.colorBackground
-                )
-            )
-        }
     }
 
-    fun alignmentMenu(showJustify: Boolean) {
+    private fun alignmentMenu(showJustify: Boolean) {
         toolbarMenu.findItem(R.id.align_left).isVisible = !showJustify
         toolbarMenu.findItem(R.id.align_justify).isVisible = showJustify
     }
@@ -208,7 +152,7 @@ class ReaderActivity : AppCompatActivity() {
         inflater.inflate(R.menu.reader_menu, menu)
         toolbarMenu = menu
 
-        if (!allItems.isEmpty() && allItems[currentItem].starred) {
+        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
             canRemoveFromFavorite()
         } else {
             canFavorite()
@@ -219,6 +163,22 @@ class ReaderActivity : AppCompatActivity() {
             alignmentMenu(true)
         }
 
+        binding.pager.registerOnPageChangeCallback(
+                object : ViewPager2.OnPageChangeCallback() {
+
+                    override fun onPageSelected(position: Int) {
+                        super.onPageSelected(position)
+
+                        if (allItems[position].starred) {
+                            canRemoveFromFavorite()
+                        } else {
+                            canFavorite()
+                        }
+                        readItem(allItems[position])
+                    }
+                }
+        )
+
         return true
     }
 
@@ -226,13 +186,11 @@ class ReaderActivity : AppCompatActivity() {
         fun afterSave() {
             allItems[binding.pager.currentItem] =
                     allItems[binding.pager.currentItem].toggleStar()
-            notifyAdapter()
             canRemoveFromFavorite()
         }
 
         fun afterUnsave() {
             allItems[binding.pager.currentItem] = allItems[binding.pager.currentItem].toggleStar()
-            notifyAdapter()
             canFavorite()
         }
 
@@ -241,62 +199,23 @@ class ReaderActivity : AppCompatActivity() {
                 onBackPressed()
                 return true
             }
-            R.id.save -> {
-                if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.starrItem(allItems[binding.pager.currentItem].id)
-                        .enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                                afterSave()
-                            }
-
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                Toast.makeText(
-                                    baseContext,
-                                    R.string.cant_mark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
+            R.id.star -> {
+                if (allItems[binding.pager.currentItem].starred) {
+                    SharedItems.unstarItem(
+                        this@ReaderActivity,
+                        api,
+                        db,
+                        allItems[binding.pager.currentItem]
+                    )
+                    afterUnsave()
                 } else {
-                    thread {
-                        db.actionsDao().insertAllActions(ActionEntity(allItems[binding.pager.currentItem].id, false, false, true, false))
-                        afterSave()
-                    }
-                }
-            }
-            R.id.unsave -> {
-                if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.unstarrItem(allItems[binding.pager.currentItem].id)
-                        .enqueue(object : Callback<SuccessResponse> {
-                            override fun onResponse(
-                                call: Call<SuccessResponse>,
-                                response: Response<SuccessResponse>
-                            ) {
-                                afterUnsave()
-                            }
-
-                            override fun onFailure(
-                                call: Call<SuccessResponse>,
-                                t: Throwable
-                            ) {
-                                Toast.makeText(
-                                    baseContext,
-                                    R.string.cant_unmark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
-                } else {
-                    thread {
-                        db.actionsDao().insertAllActions(ActionEntity(allItems[binding.pager.currentItem].id, false, false, false, true))
-                        afterUnsave()
-                    }
+                    SharedItems.starItem(
+                        this@ReaderActivity,
+                        api,
+                        db,
+                        allItems[binding.pager.currentItem]
+                    )
+                    afterSave()
                 }
             }
             R.id.align_left -> {

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

@@ -3,16 +3,14 @@ package apps.amine.bou.readerforselfoss
 import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
-import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.adapters.SourcesListAdapter
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Source
-import apps.amine.bou.readerforselfoss.databinding.ActivityImageBinding
 import apps.amine.bou.readerforselfoss.databinding.ActivitySourcesBinding
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
@@ -30,18 +28,16 @@ class SourcesActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         appColors = AppColors(this@SourcesActivity)
-
-        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)
-        }
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+
+        super.onCreate(savedInstanceState)
+
+        setContentView(view)
 
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -75,7 +71,7 @@ class SourcesActivity : AppCompatActivity() {
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = mLayoutManager
 
-        if (this@SourcesActivity.isNetworkAccessible(this@SourcesActivity.findViewById(R.id.recyclerView))) {
+        if (this@SourcesActivity.isNetworkAccessible(binding.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

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

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

@@ -5,7 +5,6 @@ import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.databinding.ListItemBinding
@@ -49,25 +48,14 @@ 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/api/selfoss/SelfossModels.kt

@@ -14,6 +14,8 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
 import com.google.gson.annotations.SerializedName
+import java.util.*
+import kotlin.collections.ArrayList
 
 private fun constructUrl(config: Config?, path: String, file: String?): String {
     return if (file.isEmptyOrNullOrNullString()) {
@@ -30,7 +32,11 @@ data class Tag(
     @SerializedName("tag") val tag: String,
     @SerializedName("color") val color: String,
     @SerializedName("unread") val unread: Int
-)
+) {
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(tag).toString()
+    }
+}
 
 class SuccessResponse(@SerializedName("success") val success: Boolean) {
     val isSuccess: Boolean
@@ -151,14 +157,14 @@ data class Item(
     }
 
     fun getImages() : ArrayList<String> {
-        var allImages = ArrayList<String>()
+        val allImages = ArrayList<String>()
 
         for ( image in Jsoup.parse(content).getElementsByTag("img")) {
             val url = image.attr("src")
-            if (url.toLowerCase().contains(".jpg") ||
-                    url.toLowerCase().contains(".jpeg") ||
-                    url.toLowerCase().contains(".png") ||
-                    url.toLowerCase().contains(".webp"))
+            if (url.lowercase(Locale.US).contains(".jpg") ||
+                    url.lowercase(Locale.US).contains(".jpeg") ||
+                    url.lowercase(Locale.US).contains(".png") ||
+                    url.lowercase(Locale.US).contains(".webp"))
             {
                 allImages.add(url)
             }

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

@@ -4,7 +4,8 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.preference.PreferenceManager
+import android.os.Build
+import androidx.preference.PreferenceManager
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationCompat.PRIORITY_LOW
@@ -117,8 +118,12 @@ override fun doWork(): Result {
                     val intent = Intent(context, MainActivity::class.java).apply {
                         flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                     }
-                    val pendingIntent: PendingIntent =
-                        PendingIntent.getActivity(context, 0, intent, 0)
+                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        PendingIntent.FLAG_IMMUTABLE
+                    } else {
+                        0
+                    }
+                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
 
                     val newItemsNotification =
                         NotificationCompat.Builder(applicationContext, Config.newItemsChannelId)

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

@@ -9,18 +9,16 @@ import android.graphics.Bitmap
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.view.*
 import android.webkit.*
 import android.widget.Toast
-import androidx.browser.customtabs.CustomTabsIntent
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import androidx.fragment.app.Fragment
-import androidx.core.content.ContextCompat
 import androidx.core.widget.NestedScrollView
 import androidx.appcompat.app.AlertDialog
+import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.res.ResourcesCompat
 import androidx.room.Room
 import apps.amine.bou.readerforselfoss.ImageActivity
@@ -49,14 +47,14 @@ import retrofit2.Callback
 import retrofit2.Response
 import java.net.MalformedURLException
 import java.net.URL
+import java.util.*
 import java.util.concurrent.ExecutionException
 import kotlin.collections.ArrayList
 
 class ArticleFragment : Fragment() {
-    private lateinit var pageNumber: Number
     private var fontSize: Int = 16
-    private lateinit var allItems: ArrayList<Item>
-    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null;
+    private lateinit var item: Item
+    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null
     private lateinit var url: String
     private lateinit var contentText: String
     private lateinit var contentSource: String
@@ -77,6 +75,7 @@ class ArticleFragment : Fragment() {
     private var typeface: Typeface? = null
     private var resId: Int = 0
     private var font = ""
+    private var staticBar = false
 
     override fun onStop() {
         super.onStop()
@@ -91,8 +90,7 @@ class ArticleFragment : Fragment() {
 
         super.onCreate(savedInstanceState)
 
-        pageNumber = requireArguments().getInt(ARG_POSITION)
-        allItems = requireArguments().getParcelableArrayList<Item>(ARG_ITEMS) as ArrayList<Item>
+        item = requireArguments().getParcelable(ARG_ITEMS)!!
 
         db = Room.databaseBuilder(
             requireContext(),
@@ -104,20 +102,21 @@ class ArticleFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         try {
             _binding = FragmentArticleBinding.inflate(inflater, container, false)
 
-            url = allItems[pageNumber.toInt()].getLinkDecoded()
-            contentText = allItems[pageNumber.toInt()].content
-            contentTitle = allItems[pageNumber.toInt()].getTitleDecoded()
-            contentImage = allItems[pageNumber.toInt()].getThumbnail(requireActivity())
-            contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
-            allImages = allItems[pageNumber.toInt()].getImages()
+            url = item.getLinkDecoded()
+            contentText = item.content
+            contentTitle = item.getTitleDecoded()
+            contentImage = item.getThumbnail(requireActivity())
+            contentSource = item.sourceAndDateText()
+            allImages = item.getImages()
 
             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()) {
@@ -162,26 +161,18 @@ class ArticleFragment : Fragment() {
                 object : FloatingToolbar.ItemClickListener {
                     override fun onItemClick(item: MenuItem) {
                         when (item.itemId) {
-                            R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
+                            R.id.more_action -> getContentFromMercury(customTabsIntent)
                             R.id.share_action -> requireActivity().shareLink(url, contentTitle)
-                            R.id.open_action -> requireActivity().openItemUrl(
-                                allItems,
-                                pageNumber.toInt(),
-                                url,
-                                customTabsIntent,
-                                false,
-                                false,
-                                requireActivity()
-                            )
+                            R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
                             R.id.unread_action -> if (context != null) {
-                                if (allItems[pageNumber.toInt()].unread) {
+                                if (this@ArticleFragment.item.unread) {
                                     SharedItems.readItem(
                                         context!!,
                                         api,
                                         db,
-                                        allItems[pageNumber.toInt()]
+                                            this@ArticleFragment.item
                                     )
-                                    allItems[pageNumber.toInt()].unread = false
+                                    this@ArticleFragment.item.unread = false
                                     Toast.makeText(
                                         context,
                                         R.string.marked_as_read,
@@ -192,9 +183,9 @@ class ArticleFragment : Fragment() {
                                         context!!,
                                         api,
                                         db,
-                                        allItems[pageNumber.toInt()]
+                                            this@ArticleFragment.item
                                     )
-                                    allItems[pageNumber.toInt()].unread = true
+                                    this@ArticleFragment.item.unread = true
                                     Toast.makeText(
                                         context,
                                         R.string.marked_as_unread,
@@ -211,13 +202,18 @@ class ArticleFragment : Fragment() {
                 }
             )
 
+            if (staticBar) {
+                fab.hide()
+                floatingToolbar.show()
+            }
+
             binding.source.text = contentSource
             if (typeface != null) {
                 binding.source.typeface = typeface
             }
 
             if (contentText.isEmptyOrNullOrNullString()) {
-                getContentFromMercury(customTabsIntent, prefs)
+                getContentFromMercury(customTabsIntent)
             } else {
                 binding.titleView.text = contentTitle
                 if (typeface != null) {
@@ -242,9 +238,14 @@ class ArticleFragment : Fragment() {
             binding.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                     if (scrollY > oldScrollY) {
+                        floatingToolbar.hide()
                         fab.hide()
                     } else {
-                        if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
+                        if (staticBar) {
+                            floatingToolbar.show()
+                        } else {
+                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
+                        }
                     }
                 }
             )
@@ -254,11 +255,11 @@ class ArticleFragment : Fragment() {
                 .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
                 .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
                 .setPositiveButton(android.R.string.ok
-                ) { dialog, which ->
+                ) { _, _ ->
                     val sharedPref = PreferenceManager.getDefaultSharedPreferences(requireContext())
                     val editor = sharedPref.edit()
                     editor.putBoolean("prefer_article_viewer", false)
-                    editor.commit()
+                    editor.apply()
                     requireActivity().finish()
                 }
                 .create()
@@ -281,10 +282,7 @@ class ArticleFragment : Fragment() {
         }
     }
 
-    private fun getContentFromMercury(
-        customTabsIntent: CustomTabsIntent,
-        prefs: SharedPreferences
-    ) {
+    private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
         if ((context != null && requireContext().isNetworkAccessible(null)) || context == null) {
             binding.progressBar.visibility = View.VISIBLE
             val parser = MercuryApi()
@@ -379,42 +377,12 @@ class ArticleFragment : Fragment() {
 
         binding.webcontent.settings.standardFontFamily = a.getString(0)
         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)
-            }
-        }
 
-        val stringTextColor: String = if (textColor != null) {
-            String.format("#%06X", 0xFFFFFF and textColor)
+        // TODO: Set the color strings programmatically
+        val (stringTextColor, stringBackgroundColor) = if (appColors.isDarkTheme) {
+            Pair("#FFFFFF", "#303030")
         } else {
-            "#000000"
-        }
-
-        val stringBackgroundColor = if (backgroundColor != null) {
-            String.format("#%06X", 0xFFFFFF and backgroundColor)
-        } else {
-            "#FFFFFF"
+            Pair("#212121", "#FAFAFA")
         }
 
         binding.webcontent.settings.useWideViewPort = true
@@ -431,19 +399,19 @@ class ArticleFragment : Fragment() {
 
             override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
                 val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                if (url.toLowerCase().contains(".jpg") || url.toLowerCase().contains(".jpeg")) {
+                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {
                     try {
                         val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                         return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
                     }catch ( e : ExecutionException) {}
                 }
-                else if (url.toLowerCase().contains(".png")) {
+                else if (url.lowercase(Locale.US).contains(".png")) {
                     try {
                         val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                         return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
                     }catch ( e : ExecutionException) {}
                 }
-                else if (url.toLowerCase().contains(".webp")) {
+                else if (url.lowercase(Locale.US).contains(".webp")) {
                     try {
                         val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                         return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
@@ -462,12 +430,8 @@ class ArticleFragment : Fragment() {
 
         binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            binding.webcontent.settings.layoutAlgorithm =
-                    WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
-        } else {
-            binding.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
-        }
+        binding.webcontent.settings.layoutAlgorithm =
+                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 
         var baseUrl: String? = null
 
@@ -549,29 +513,22 @@ class ArticleFragment : Fragment() {
 
     private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
         binding.progressBar.visibility = View.GONE
-        requireActivity().openItemUrl(
-            allItems,
-            pageNumber.toInt(),
-            url,
-            customTabsIntent,
-            true,
-            false,
-            requireActivity()
+        requireActivity().openItemUrlInternalBrowser(
+                url,
+                customTabsIntent,
+                requireActivity()
         )
     }
 
     companion object {
-        private const val ARG_POSITION = "position"
         private const val ARG_ITEMS = "items"
 
         fun newInstance(
-            position: Int,
-            allItems: ArrayList<Item>
+                item: Item
         ): ArticleFragment {
             val fragment = ArticleFragment()
             val args = Bundle()
-            args.putInt(ARG_POSITION, position)
-            args.putParcelableArrayList(ARG_ITEMS, allItems)
+            args.putParcelable(ARG_ITEMS, item)
             fragment.arguments = args
             return fragment
         }

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

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

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

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

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

@@ -0,0 +1,221 @@
+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,14 +1,9 @@
 package apps.amine.bou.readerforselfoss.themes
 
 import android.app.Activity
-import android.content.Context
-import android.preference.PreferenceManager
 import androidx.annotation.ColorInt
-import androidx.appcompat.view.ContextThemeWrapper
-import android.util.TypedValue
+import androidx.preference.PreferenceManager
 import apps.amine.bou.readerforselfoss.R
-import android.view.LayoutInflater
-import android.view.ViewGroup
 
 class AppColors(a: Activity) {
 
@@ -16,7 +11,6 @@ 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
@@ -55,22 +49,13 @@ class AppColors(a: Activity) {
             R.color.darkBackground
         } else {
             a.setTheme(R.style.NoBar)
-            android.R.color.background_light
+            R.color.grey_50
         }
 
         textColor = if (isDarkTheme) {
-            R.color.md_white_1000
+            R.color.white
         } else {
-            R.color.md_grey_900
+            R.color.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/transformers/DepthPageTransformer.kt

@@ -1,43 +0,0 @@
-package apps.amine.bou.readerforselfoss.transformers
-
-import androidx.viewpager.widget.ViewPager
-import android.view.View
-
-class DepthPageTransformer : ViewPager.PageTransformer {
-
-    override fun transformPage(view: View, position: Float) {
-        val pageWidth = view.width
-
-        when {
-            position < -1 -> // [-Infinity,-1)
-                // This page is way off-screen to the left.
-                view.alpha = 0F
-            position <= 0 -> { // [-1,0]
-                // Use the default slide transition when moving to the left page
-                view.alpha = 1F
-                view.translationX = 0F
-                view.scaleX = 1F
-                view.scaleY = 1F
-            }
-            position <= 1 -> { // (0,1]
-                // Fade the page out.
-                view.alpha = 1 - position
-
-                // Counteract the default slide transition
-                view.translationX = pageWidth * -position
-
-                // Scale the page down (between MIN_SCALE and 1)
-                val scaleFactor = MIN_SCALE + (1 - MIN_SCALE) * (1 - Math.abs(position))
-                view.scaleX = scaleFactor
-                view.scaleY = scaleFactor
-            }
-            else -> // (1,+Infinity]
-                // This page is way off-screen to the right.
-                view.alpha = 0F
-        }
-    }
-
-    companion object {
-        private val MIN_SCALE = 0.75f
-    }
-}

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

@@ -13,7 +13,7 @@ fun String.longHash(): Long {
     val chars = this.toCharArray()
 
     for (i in 0 until l) {
-        h = 31 * h + chars[i].toLong()
+        h = 31 * h + chars[i].code.toLong()
     }
     return h
 }

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

@@ -4,11 +4,12 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
 import apps.amine.bou.readerforselfoss.LoginActivity
 
 class Config(c: Context) {
 
-    val settings: SharedPreferences = c.getSharedPreferences(settingsName, Context.MODE_PRIVATE)
+    val settings: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(c)
 
     val baseUrl: String
         get() = settings.getString("url", "")!!
@@ -40,18 +41,17 @@ class Config(c: Context) {
 
         const val newItemsChannelId = "new-items-channel-id"
 
-        var dateTimeFormatter = "yyyy-MM-dd HH:mm:ss"
+        var apiVersion = 0
 
+        /* Execute logout and clear all settings to default */
         fun logoutAndRedirect(
             c: Context,
             callingActivity: Activity,
             editor: SharedPreferences.Editor,
             baseUrlFail: Boolean = false
         ): Boolean {
-            editor.remove("url")
-            editor.remove("login")
-            editor.remove("password")
-            editor.apply()
+            val settings = PreferenceManager.getDefaultSharedPreferences(c)
+            settings.edit().clear().commit()
             val intent = Intent(c, LoginActivity::class.java)
             if (baseUrlFail) {
                 intent.putExtra("baseUrlFail", baseUrlFail)

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

@@ -0,0 +1,31 @@
+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,16 +1,12 @@
 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 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.isEmpty() }.toTypedArray()) {
+    for (s in this.split(" ".toRegex()).filter { it.isNotEmpty() }.toTypedArray()) {
         try {
             textDrawable.append(s[0])
         } catch (e: StringIndexOutOfBoundsException) {
@@ -20,17 +16,7 @@ fun String.toTextDrawableString(c: Context): String {
 }
 
 fun Item.sourceAndDateText(): String {
-    val formattedDate: String = try {
-        " " + DateUtils.getRelativeTimeSpanString(
-            SimpleDateFormat(Config.dateTimeFormatter).parse(this.datetime).time,
-            Date().time,
-            DateUtils.MINUTE_IN_MILLIS,
-            DateUtils.FORMAT_ABBREV_RELATIVE
-        )
-    } catch (e: ParseException) {
-        e.printStackTrace()
-        ""
-    }
+    val formattedDate = parseRelativeDate(this.datetime)
 
     return this.getSourceTitle() + formattedDate
 }

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

@@ -7,6 +7,7 @@ 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
@@ -26,12 +27,17 @@ fun Context.buildCustomTabsIntent(): CustomTabsIntent {
 
     val actionIntent = Intent(Intent.ACTION_SEND)
     actionIntent.type = "text/plain"
-    val createPendingShareIntent: PendingIntent = PendingIntent.getActivity(
-        this,
-        0,
-        actionIntent,
+    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        PendingIntent.FLAG_IMMUTABLE
+    } else {
         0
-    )
+    }
+    val createPendingShareIntent: PendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            actionIntent,
+            pflags
+        )
 
     val intentBuilder = CustomTabsIntent.Builder()
 
@@ -80,19 +86,30 @@ fun Context.openItemUrlInternally(
         intent.putExtra("currentItem", currentItem)
         app.startActivity(intent)
     } else {
-        try {
-            CustomTabActivityHelper.openCustomTab(
+        this.openItemUrlInternalBrowser(
+                linkDecoded,
+                customTabsIntent,
+                app)
+    }
+}
+
+fun Context.openItemUrlInternalBrowser(
+        linkDecoded: String,
+        customTabsIntent: CustomTabsIntent,
+        app: Activity
+) {
+    try {
+        CustomTabActivityHelper.openCustomTab(
                 app,
                 customTabsIntent,
                 Uri.parse(linkDecoded)
-            ) { _, uri ->
-                val intent = Intent(Intent.ACTION_VIEW, uri)
-                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                startActivity(intent)
-            }
-        } catch (e: Exception) {
-            openInBrowser(linkDecoded, app)
+        ) { _, uri ->
+            val intent = Intent(Intent.ACTION_VIEW, uri)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            startActivity(intent)
         }
+    } catch (e: Exception) {
+        openInBrowser(linkDecoded, app)
     }
 }
 
@@ -115,7 +132,7 @@ fun Context.openItemUrl(
     } else {
         if (!internalBrowser) {
             openInBrowser(linkDecoded, app)
-        } else {
+        } else if (articleViewer) {
             this.openItemUrlInternally(
                 allItems,
                 currentItem,
@@ -124,6 +141,12 @@ fun Context.openItemUrl(
                 articleViewer,
                 app
             )
+        } else {
+            this.openItemUrlInternalBrowser(
+                    linkDecoded,
+                    customTabsIntent,
+                    app
+            )
         }
     }
 }

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

@@ -291,6 +291,92 @@ object SharedItems {
         }
     }
 
+    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]
@@ -312,7 +398,7 @@ object SharedItems {
     }
 
     private fun sortItems() {
-        val tmpItems = ArrayList(items.sortedByDescending { SimpleDateFormat(Config.dateTimeFormatter).parse((it.datetime)) })
+        val tmpItems = ArrayList(items.sortedByDescending { parseDate(it.datetime) })
         items = tmpItems
     }
 }

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

@@ -0,0 +1,8 @@
+<?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_info_white_24dp.xml

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

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

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

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

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

@@ -1,5 +0,0 @@
-<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="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <com.google.android.material.appbar.AppBarLayout
@@ -55,7 +55,8 @@
                 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"
@@ -67,7 +68,9 @@
                 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"
@@ -76,10 +79,12 @@
                 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"
@@ -91,7 +96,9 @@
                 android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/sourceUri"
                 android:hint="@string/add_source_hint_tags"
-                android:inputType="text"/>
+                android:textColorHint="?android:textColorPrimary"
+                android:inputType="text"
+                android:autofillHints="false" />
 
             <Spinner
                 android:layout_width="match_parent"
@@ -100,7 +107,8 @@
                 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,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<androidx.drawerlayout.widget.DrawerLayout
     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"
@@ -36,51 +37,43 @@
 
                 </com.google.android.material.appbar.AppBarLayout>
 
-                <FrameLayout
-                    android:id="@+id/drawer_layout"
-                    xmlns:android="http://schemas.android.com/apk/res/android"
-                    xmlns:tools="http://schemas.android.com/tools"
+                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                    android:id="@+id/swipeRefreshLayout"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-                        android:id="@+id/swipeRefreshLayout"
+                    <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent">
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:background="?android:attr/windowBackground">
 
-                        <LinearLayout
+                        <TextView
+                            android:id="@+id/emptyText"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:orientation="vertical"
-                            android:background="?android:attr/windowBackground">
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            android:paddingTop="100dp"
+                            android:text="@string/nothing_here"
+                            android:textAlignment="center"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                            android:background="@android:color/transparent"
+                            android:visibility="gone" />
 
-                            <TextView
-                                android:id="@+id/emptyText"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:gravity="fill"
-                                android:paddingTop="100dp"
-                                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
+                            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.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>
 
-                    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-                </FrameLayout>
             </LinearLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -90,4 +83,11 @@
             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_image.xml

@@ -21,7 +21,7 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager.widget.ViewPager
+    <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"

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

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

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

@@ -22,7 +22,7 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager.widget.ViewPager
+    <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -33,7 +33,7 @@
         app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
 
-    <me.relex.circleindicator.CircleIndicator
+    <me.relex.circleindicator.CircleIndicator3
         android:id="@+id/indicator"
         android:layout_width="match_parent"
         android:layout_height="20dp"

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

@@ -0,0 +1,22 @@
+<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,14 +31,13 @@
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom|right"
-        android:src="@drawable/ic_add_white_24dp"
+        android:layout_gravity="end|bottom|end"
+        app:srcCompat="@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:layout_marginRight="16dp"/>
+        android:contentDescription="@string/add_source" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -16,7 +16,8 @@
     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"
@@ -65,6 +66,7 @@
                 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"
@@ -79,6 +81,7 @@
                 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" />
@@ -92,20 +95,22 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
 
-                <com.like.LikeButton
+                <ImageButton
                     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"
-                    app:icon_size="22dp"
-                    app:icon_type="heart" />
+                    android:scaleType="centerCrop"
+                    app:srcCompat="@drawable/ic_menu_heart_60dp"
+                    app:tint="@color/ic_menu_heart_color" />
 
                 <ImageButton
                     android:id="@+id/shareBtn"
@@ -121,8 +126,8 @@
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/ic_share_black_24dp"
-                    android:tint="?android:attr/textColorPrimary" />
+                    app:srcCompat="@drawable/ic_share_black_24dp"
+                    app:tint="?android:attr/textColorPrimary" />
 
                 <ImageButton
                     android:id="@+id/browserBtn"
@@ -138,8 +143,8 @@
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/ic_open_in_browser_black_24dp"
-                    android:tint="?android:attr/textColorPrimary" />
+                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
+                    app:tint="?android:attr/textColorPrimary" />
 
             </RelativeLayout>
 

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?android:colorBackground"
     android:descendantFocusability="blocksDescendants">
 
     <androidx.core.widget.NestedScrollView
@@ -33,7 +34,7 @@
                 android:layout_marginLeft="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginRight="16dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="12sp"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -65,6 +66,7 @@
                 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,7 +12,8 @@
         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"
@@ -29,11 +30,14 @@
         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"
@@ -46,10 +50,13 @@
         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

@@ -1,15 +0,0 @@
-<?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,55 +1,50 @@
 <?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"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginStart="16dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginLeft="16dp"
         android:layout_width="36dp"
-        android:layout_height="36dp"/>
+        android:layout_height="36dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="17dp"
         android:id="@+id/sourceTitle"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/itemImage"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
+        android:layout_width="0dp"
+        android:layout_height="17dp"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:gravity="start"
+        android:maxLines="1"
+        android:textAlignment="textStart"
         android:textSize="13sp"
-        android:textAlignment="viewStart"
-        tools:text="source title "
-        android:gravity="start" />
+        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" />
 
     <Button
         android:id="@+id/deleteBtn"
-        android:background="@drawable/ic_remove_circle_outline_black_24dp"
         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"
         android:backgroundTint="?android:textColorSecondary"
         android:elevation="4dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/remove_source"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="16dp"
-        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"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -15,14 +15,8 @@
         android:title="@string/reader_text_align_justify" />
 
     <item
-        android:id="@+id/unsave"
-        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:id="@+id/star"
+        android:icon="@drawable/ic_menu_heart_60dp"
         android:title="@string/add_to_favs_reader"
         android:visible="true"
         app:showAsAction="ifRoom" />

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

@@ -162,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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">Check for new sources and tags</string>
-    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="pref_switch_update_sources">Vérifier les nouvelles sources et 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="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,4 +162,8 @@
     <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="title_activity_login">"Acceder"</string>
+    <string name="app_name">"Lector para selfoss"</string>
+    <string name="title_activity_login">"Conectar"</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 HTTP?"</string>
+    <string name="withHttpLoginSwitch">"É preciso iniciar sesión?"</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">Check for new sources and tags</string>
-    <string name="pref_switch_update_sources_summary">Disable this if your server is receiving excessive amounts of database queries.</string>
+    <string name="pref_switch_update_sources">Comproba novas fontes e etiquetas</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="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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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,4 +162,8 @@
     <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

@@ -5,8 +5,9 @@
     <color name="colorAccent">#FFff5722</color>
     <color name="colorAccentDark">#FFbf360c</color>
     <color name="pink">#FFe91e63</color>
-    <color name="white">#FFFFFFFF</color>
+    <color name="white">#FFFFFF</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>
@@ -19,5 +20,5 @@
 
     <color name="cardBackgroundColor">#FFFFFFFF</color>
     <color name="materialDrawerHeaderSelectionText">#212121</color>
-    <color name="darkBackground">#FF303030</color>
+    <color name="darkBackground">#303030</color>
 </resources>

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

@@ -165,4 +165,8 @@
     <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,41 +4,70 @@
         <item name="android:windowBackground">@drawable/background_splash</item>
     </style>
 
-    <style name="NoBar" parent="MaterialDrawerTheme.Light">
+    <style name="NoBar" parent="Theme.MaterialComponents.Light.NoActionBar">
         <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/md_grey_50</item>
-        <item name="android:textColorPrimary">@color/md_grey_900</item>
-        <item name="android:textColorSecondary">@color/md_grey_400</item>
-        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+        <item name="android:colorBackground">@color/grey_50</item>
+        <item name="colorSurface">@color/grey_50</item>
+        <item name="android:textColorPrimary">@color/grey_900</item>
+        <item name="android:textColorSecondary">@color/grey_400</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="MaterialDrawerTheme">
+    <style name="NoBarDark" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <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/md_grey_800</item>
+        <item name="cardBackgroundColor">@color/grey_800</item>
         <item name="android:colorBackground">@color/darkBackground</item>
-        <item name="bnbBackgroundColor">@color/md_grey_900</item>
-        <item name="android:textColorPrimary">@color/md_white_1000</item>
-        <item name="android:textColorSecondary">@color/md_grey_600</item>
-        <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+        <item name="colorSurface">@color/darkBackground</item>
+        <item name="alertDialogTheme">@style/AlertDialogDark</item>
+        <item name="bnbBackgroundColor">@color/grey_900</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/grey_600</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>
+
+    <!-- Alert dialog Theme -->
+
+    <style name="AlertDialogDark" parent="Theme.MaterialComponents.Dialog">
+        <item name="android:background">@color/darkBackground</item>
+    </style>
+
 </resources>

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

@@ -1,9 +1,11 @@
-<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,4 +1,5 @@
-<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">
@@ -10,7 +11,8 @@
         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=""
@@ -18,12 +20,14 @@
         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">
 
@@ -33,14 +37,24 @@
         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">
@@ -50,29 +64,34 @@
         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

@@ -1,57 +0,0 @@
-<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,13 +1,17 @@
 <?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

@@ -0,0 +1,35 @@
+<?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,7 +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">
+
     <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" />
@@ -10,6 +12,7 @@
         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" />
@@ -18,6 +21,7 @@
         android:dependency="periodic_refresh"
         android:defaultValue="360"
         android:inputType="number"
+        app:iconSpaceReserved="false"
         android:key="periodic_refresh_minutes"
         android:selectAllOnFocus="true"
         android:singleLine="true"
@@ -25,18 +29,21 @@
 
     <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,29 +1,35 @@
 <?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.ColorPreference
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
         android:defaultValue="@color/colorPrimary"
         android:key="color_primary"
+        app:iconSpaceReserved="false"
         android:title="Primary color"/>
 
-    <com.jaredrummler.android.colorpicker.ColorPreference
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
         android:defaultValue="@color/colorPrimaryDark"
         android:key="color_primary_dark"
+        app:iconSpaceReserved="false"
         android:title="Primary dark color"/>
 
-    <com.jaredrummler.android.colorpicker.ColorPreference
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
         android:defaultValue="@color/colorAccent"
         android:key="color_accent"
+        app:iconSpaceReserved="false"
         android:title="Accent color"/>
 
-    <com.jaredrummler.android.colorpicker.ColorPreference
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
         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,7 +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">
     <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" />
@@ -10,6 +12,7 @@
         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" />
@@ -18,5 +21,6 @@
         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

@@ -12,23 +12,19 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven {
-            url "https://jitpack.io"
-        }
+        maven { url "https://www.jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         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()
     }
 }