Fix login activity layout

* Upgrade minSdk

* Add changelog entry about the upgrade

* Remove obsolete version checks

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,6 +32,9 @@ 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
     }
@@ -42,7 +45,7 @@ android {
     }
     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'
@@ -111,15 +116,17 @@ dependencies {
     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') {
+    implementation 'com.mikepenz:aboutlibraries-core:8.9.4'
-        transitive = true
+    implementation 'com.mikepenz:aboutlibraries:8.9.4'
-    }
+    implementation "com.mikepenz:aboutlibraries-definitions:8.9.4"
 
     // Async
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
@@ -131,7 +138,7 @@ dependencies {
     implementation 'com.burgstaller:okhttp-digest:2.5'
 
     // Material-ish things
-    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
+    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.2.0'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
     // glide
@@ -143,14 +150,14 @@ dependencies {
 
     // Themes
     implementation 'com.52inc:scoops:1.0.0'
-    implementation 'com.jaredrummler:colorpicker:1.0.2'
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
     implementation 'com.github.rubensousa:floatingtoolbar:1.5.1'
 
     // Pager
-    implementation 'me.relex:circleindicator:2.0.0@aar'
+    implementation 'me.relex:circleindicator:2.1.6'
 
     //PhotoView
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
     implementation 'androidx.core:core-ktx:1.7.0-rc01'
 

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

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

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

@@ -7,9 +7,8 @@ import android.graphics.Color
 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
@@ -171,8 +170,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
         handleThemeBinding()
 
         setSupportActionBar(binding.toolBar)
-        supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar!!.setHomeButtonEnabled(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()
@@ -340,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.apiVersion = apiVersionMajor
-                    Config.dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
-                }
             }
 
             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.apiVersion = apiVersionMajor
-                        Config.dateTimeFormatter = "yyyy-MM-dd'T'HH:mm:ssXXX"
-                    }
                 }
             }
         })
@@ -440,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() {
@@ -450,9 +443,7 @@ 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() {
@@ -514,13 +505,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                 iconRes = R.drawable.ic_settings_black_24dp
                 isIconTinted = true
                 onDrawerItemClickListener = { _, _, _ ->
-                    startActivityForResult(
+                    startActivity(Intent(this@HomeActivity, SettingsActivity::class.java))
-                        Intent(
-                            this@HomeActivity,
-                            SettingsActivity::class.java
-                        ),
-                        MENU_PREFERENCES
-                    )
                     false
                 }
             })

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

@@ -14,7 +14,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
-import android.widget.Toast
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.databinding.ActivityLoginBinding
@@ -22,7 +21,6 @@ import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import retrofit2.Call
 import retrofit2.Callback
@@ -91,16 +89,16 @@ class LoginActivity : AppCompatActivity() {
             isWithLogin = !isWithLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            binding.loginLayout.visibility = visi
+            binding.loginView.visibility = visi
-            binding.passwordLayout.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.httpLoginView.visibility = visi
-            binding.httpPasswordInput.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",
+                "OK"
-                { dialog, _ -> dialog.dismiss() }
+            ) { 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",
+                    "OK"
-                    { dialog, _ -> dialog.dismiss() }
+                ) { 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

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

@@ -8,7 +8,7 @@ import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.core.content.ContextCompat
@@ -85,9 +85,7 @@ class ReaderActivity : AppCompatActivity() {
 
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-        }
 
         setSupportActionBar(binding.toolBar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)

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

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

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

@@ -5,7 +5,7 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationCompat.PRIORITY_LOW

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

@@ -9,9 +9,8 @@ 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
@@ -77,6 +76,7 @@ class ArticleFragment : Fragment() {
     private var typeface: Typeface? = null
     private var resId: Int = 0
     private var font = ""
+    private var staticBar = false
 
     override fun onStop() {
         super.onStop()
@@ -118,6 +118,7 @@ class ArticleFragment : Fragment() {
             prefs = PreferenceManager.getDefaultSharedPreferences(activity)
             editor = prefs.edit()
             fontSize = prefs.getString("reader_font_size", "16")!!.toInt()
+            staticBar = prefs.getBoolean("reader_static_bar", false)
 
             font = prefs.getString("reader_font", "")!!
             if (font.isNotEmpty()) {
@@ -211,6 +212,11 @@ class ArticleFragment : Fragment() {
                 }
             )
 
+            if (staticBar) {
+                fab.hide()
+                floatingToolbar.show()
+            }
+
             binding.source.text = contentSource
             if (typeface != null) {
                 binding.source.typeface = typeface
@@ -242,9 +248,14 @@ class ArticleFragment : Fragment() {
             binding.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                     if (scrollY > oldScrollY) {
+                        floatingToolbar.hide()
                         fab.hide()
                     } else {
-                        if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
+                        if (staticBar) {
+                            floatingToolbar.show()
+                        } else {
+                            if (floatingToolbar.isShowing) floatingToolbar.hide() else fab.show()
+                        }
                     }
                 }
             )
@@ -462,12 +473,8 @@ class ArticleFragment : Fragment() {
 
         binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        binding.webcontent.settings.layoutAlgorithm =
-            binding.webcontent.settings.layoutAlgorithm =
+                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
-                    WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
-        } else {
-            binding.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
-        }
 
         var baseUrl: String? = null
 

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

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

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

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

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

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

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

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

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

@@ -40,7 +40,7 @@ class Config(c: Context) {
 
         const val newItemsChannelId = "new-items-channel-id"
 
-        var dateTimeFormatter = "yyyy-MM-dd HH:mm:ss"
+        var apiVersion = 0
 
         fun logoutAndRedirect(
             c: Context,

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 {
+    val formattedDate = parseRelativeDate(this.datetime)
-        " " + DateUtils.getRelativeTimeSpanString(
-            SimpleDateFormat(Config.dateTimeFormatter).parse(this.datetime).time,
-            Date().time,
-            DateUtils.MINUTE_IN_MILLIS,
-            DateUtils.FORMAT_ABBREV_RELATIVE
-        )
-    } catch (e: ParseException) {
-        e.printStackTrace()
-        ""
-    }
 
     return this.getSourceTitle() + formattedDate
 }

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

@@ -398,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/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_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_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
+                <com.google.android.material.switchmaterial.SwitchMaterial
-                        android:id="@+id/urlView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_url"
-                        android:imeOptions="actionUnspecified"
-                        android:inputType="textUri"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <Switch
                     android:text="@string/withLoginSwitch"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:id="@+id/withLogin"
                     android:layout_weight="1"/>
 
-                <com.google.android.material.textfield.TextInputLayout
+                <EditText
-                    android:id="@+id/loginLayout"
+                    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
+                <EditText
-                        android:id="@+id/loginView"
+                    android:id="@+id/passwordView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_login"
-                        android:inputType="text"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/passwordLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone">
+                    android:autofillHints="password"
+                    android:hint="@string/prompt_password"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    android:visibility="gone" />
 
-                    <EditText
+                <com.google.android.material.switchmaterial.SwitchMaterial
-                        android:id="@+id/passwordView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_password"
-                        android:inputType="textPassword"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <Switch
                     android:id="@+id/withHttpLogin"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="@string/withHttpLoginSwitch" />
 
-                <com.google.android.material.textfield.TextInputLayout
+                <EditText
-                    android:id="@+id/httpLoginInput"
+                    android:id="@+id/httpLoginView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
-                    android:visibility="gone">
+                    android:autofillHints="username"
+                    android:hint="@string/prompt_http_login"
+                    android:inputType="text"
+                    android:visibility="gone" />
 
-                    <EditText
+                <EditText
-                        android:inputType="text"
+                    android:id="@+id/httpPasswordView"
-                        android:id="@+id/httpLoginView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_http_login" />
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/httpPasswordInput"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
-                    android:visibility="gone">
+                    android:autofillHints="password"
+                    android:hint="@string/prompt_http_password"
+                    android:inputType="textPassword"
+                    android:visibility="gone" />
 
-                    <EditText
+                <com.google.android.material.switchmaterial.SwitchMaterial
-                        android:id="@+id/httpPasswordView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_http_password"
-                        android:inputType="textPassword" />
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <Switch
                     android:id="@+id/withSelfhostedCert"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -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_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/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/values-ca-rES/strings.xml

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </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">Vérifier les nouvelles sources et 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_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,7 @@
     <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>
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="app_name">"Lector para Selfoss"</string>
+    <string name="app_name">"Lector para selfoss"</string>
-    <string name="title_activity_login">"Acceder"</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">Comproba novas fontes e etiquetas</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_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,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -162,4 +162,7 @@
     <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>
 </resources>

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

@@ -165,4 +165,7 @@
     <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>
 </resources>

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

@@ -14,9 +14,10 @@
         <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/Widget.MaterialDrawerStyle</item>
+        <item name="materialDrawerStyle">@style/App.materialDrawerStyle</item>
         <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="preferenceTheme">@style/PreferenceStyle</item>
     </style>
 
     <style name="NoBarDark" parent="Theme.MaterialComponents.DayNight.NoActionBar">
@@ -30,9 +31,10 @@
         <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/Widget.MaterialDrawerStyle</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 -->
@@ -44,4 +46,16 @@
         <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>
+
 </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,9 +12,7 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven {
+        maven { url "https://www.jitpack.io" }
-            url "https://jitpack.io"
-        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.3'
@@ -24,11 +22,9 @@ buildscript {
 
 allprojects {
     repositories {
-        // For likebutton only
-        maven { url "https://jitpack.io" }
-
         google()
         jcenter()
+        maven { url "https://www.jitpack.io" }
         mavenCentral()
     }
 }