Migration

* New translations strings.xml (Sinhala)

* New translations strings.xml (Sinhala)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Catalan)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Traditional)

* New translations strings.xml (Galician)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Indonesian)

* New translations strings.xml (Persian)

* New translations strings.xml (Sinhala)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Catalan)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Traditional)

* New translations strings.xml (Galician)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Indonesian)

* New translations strings.xml (Persian)

* New translations strings.xml (Sinhala)

* New translations strings.xml (French)

Co-authored-by: Amine Bou <aminecmi@gmail.com>

CHANGELOG.md

@@ -36,6 +36,14 @@
 
 - Closing #178. Expending images on tap.
 
+- Closing #323. Old issue with textview not having the right color.
+
+- Closing #324. Svg images loading crashes the app.
+
+- Closing #322. App crashed because of svg images.
+
+- Closing #236. New sources can be added in Selfoss 2.19.
+
 **1.6.x**
 
 - Handling hidden tags.
@@ -56,6 +64,8 @@
 
 - Fixes #215, #208.
 
+- Fixes #328.
+
 **1.5.7.x**
 
 - Added confirmation to the mark as read and update menues.

README.md

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

app/build.gradle

@@ -30,19 +30,20 @@ apply plugin: 'kotlin-android'
 
 apply plugin: 'kotlin-kapt'
 
-apply plugin: 'kotlin-android-extensions'
-
 android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    compileSdkVersion 31
+    buildToolsVersion '31.0.0'
+    buildFeatures {
+        viewBinding true
+    }
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode versionCodeFromGit()
         versionName versionNameFromGit()
 
@@ -67,11 +68,14 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            shrinkResources false
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
         debug {
+            buildConfigField "String", "LOGIN_URL", appLoginUrl
+            buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
+            buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
         }
     }
     flavorDimensions "build"
@@ -81,6 +85,9 @@ android {
             dimension "build"
         }
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
@@ -94,14 +101,16 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // Android Support
-    implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
-    implementation 'com.google.android.material:material:1.3.0-beta01'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0-beta01'
+    implementation "androidx.appcompat:appcompat:1.4.0-beta01"
+    implementation 'com.google.android.material:material:1.5.0-alpha04'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0-alpha01'
     implementation "androidx.legacy:legacy-support-v4:$android_version"
     implementation 'androidx.vectordrawable:vectordrawable:1.2.0-alpha02'
     implementation "androidx.browser:browser:1.3.0"
     implementation "androidx.cardview:cardview:$android_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0-alpha2'
+    implementation "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'
 
     //multidex
@@ -112,23 +121,25 @@ dependencies {
         transitive = true
     }
 
+    // Async
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
+
     // Retrofit + http logging + okhttp
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.burgstaller:okhttp-digest:1.12'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.burgstaller:okhttp-digest:2.5'
 
     // Material-ish things
     implementation 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
-    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
     implementation 'com.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'
@@ -141,13 +152,13 @@ dependencies {
     //PhotoView
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
 
-    implementation 'androidx.core:core-ktx:1.5.0-alpha05'
+    implementation 'androidx.core:core-ktx:1.7.0-rc01'
 
-    implementation "androidx.lifecycle:lifecycle-livedata:2.3.0-rc01"
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.3.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.4.0-rc01"
 
-    implementation "androidx.room:room-runtime:2.3.0-alpha04"
-    kapt "androidx.room:room-compiler:2.3.0-alpha04"
+    implementation "androidx.room:room-ktx:2.4.0-beta01"
+    kapt "androidx.room:room-compiler:2.4.0-beta01"
 
     implementation "android.arch.work:work-runtime-ktx:$work_version"
 }

app/src/main/AndroidManifest.xml

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

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

@@ -23,11 +23,11 @@ import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import com.ftinc.scoop.Scoop
-import kotlinx.android.synthetic.main.activity_add_source.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import android.graphics.PorterDuff
+import apps.amine.bou.readerforselfoss.databinding.ActivityAddSourceBinding
 
 
 
@@ -37,50 +37,53 @@ class AddSourceActivity : AppCompatActivity() {
     private lateinit var api: SelfossApi
 
     private lateinit var appColors: AppColors
+    private lateinit var binding: ActivityAddSourceBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         appColors = AppColors(this@AddSourceActivity)
 
         super.onCreate(savedInstanceState)
+        binding = ActivityAddSourceBinding.inflate(layoutInflater)
+        val view = binding.root
 
-        setContentView(R.layout.activity_add_source)
+        setContentView(view)
 
         val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, toolbar)
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
         if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
         }
 
-        val drawable = nameInput.background
+        val drawable = binding.nameInput.background
         drawable.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
 
 
         // TODO: clean
         if(Build.VERSION.SDK_INT > 16) {
-            nameInput.background = drawable
+            binding.nameInput.background = drawable
         } else{
-            nameInput.setBackgroundDrawable(drawable)
+            binding.nameInput.setBackgroundDrawable(drawable)
         }
 
-        val drawable1 = sourceUri.background
+        val drawable1 = binding.sourceUri.background
         drawable1.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
 
         if(Build.VERSION.SDK_INT > 16) {
-            sourceUri.background = drawable1
+            binding.sourceUri.background = drawable1
         } else{
-            sourceUri.setBackgroundDrawable(drawable1)
+            binding.sourceUri.setBackgroundDrawable(drawable1)
         }
 
-        val drawable2 = tags.background
+        val drawable2 = binding.tags.background
         drawable2.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)
 
         if(Build.VERSION.SDK_INT > 16) {
-            tags.background = drawable2
+            binding.tags.background = drawable2
         } else{
-            tags.setBackgroundDrawable(drawable2)
+            binding.tags.setBackgroundDrawable(drawable2)
         }
 
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
@@ -98,12 +101,12 @@ class AddSourceActivity : AppCompatActivity() {
             mustLoginToAddSource()
         }
 
-        maybeGetDetailsFromIntentSharing(intent, sourceUri, nameInput)
+        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)
 
-        saveBtn.setTextColor(appColors.colorAccent)
+        binding.saveBtn.setTextColor(appColors.colorAccent)
 
-        saveBtn.setOnClickListener {
-            handleSaveSource(tags, nameInput.text.toString(), sourceUri.text.toString(), api!!)
+        binding.saveBtn.setOnClickListener {
+            handleSaveSource(binding.tags, binding.nameInput.text.toString(), binding.sourceUri.text.toString(), api)
         }
     }
 
@@ -114,7 +117,7 @@ class AddSourceActivity : AppCompatActivity() {
         if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid(this@AddSourceActivity)) {
             mustLoginToAddSource()
         } else {
-            handleSpoutsSpinner(spoutsSpinner, api, progress, formContainer)
+            handleSpoutsSpinner(binding.spoutsSpinner, api, binding.progress, binding.formContainer)
         }
     }
 
@@ -203,42 +206,78 @@ class AddSourceActivity : AppCompatActivity() {
 
     private fun handleSaveSource(tags: EditText, title: String, url: String, api: SelfossApi) {
 
-        val sourceDetailsAvailable =
+        val sourceDetailsUnavailable =
             title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
 
-        if (sourceDetailsAvailable) {
-            Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
-        } else {
-            api.createSource(
-                title,
-                url,
-                mSpoutsValue!!,
-                tags.text.toString(),
-                ""
-            ).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(
-                    call: Call<SuccessResponse>,
-                    response: Response<SuccessResponse>
-                ) {
-                    if (response.body() != null && response.body()!!.isSuccess) {
-                        finish()
-                    } else {
+        when {
+            sourceDetailsUnavailable -> {
+                Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
+            }
+            PreferenceManager.getDefaultSharedPreferences(this).getInt("apiVersionMajor", 0) > 1 -> {
+                val tagList = tags.text.toString().split(",").map { it.trim() }
+                api.createSourceApi2(
+                    title,
+                    url,
+                    mSpoutsValue!!,
+                    tagList,
+                    ""
+                ).enqueue(object : Callback<SuccessResponse> {
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (response.body() != null && response.body()!!.isSuccess) {
+                            finish()
+                        } else {
+                            Toast.makeText(
+                                this@AddSourceActivity,
+                                R.string.cant_create_source,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+
+                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
                         Toast.makeText(
                             this@AddSourceActivity,
                             R.string.cant_create_source,
                             Toast.LENGTH_SHORT
                         ).show()
                     }
-                }
+                })
+            }
+            else -> {
+                api.createSource(
+                    title,
+                    url,
+                    mSpoutsValue!!,
+                    tags.text.toString(),
+                    ""
+                ).enqueue(object : Callback<SuccessResponse> {
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (response.body() != null && response.body()!!.isSuccess) {
+                            finish()
+                        } else {
+                            Toast.makeText(
+                                this@AddSourceActivity,
+                                R.string.cant_create_source,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
 
-                override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                    Toast.makeText(
-                        this@AddSourceActivity,
-                        R.string.cant_create_source,
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            })
+                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        Toast.makeText(
+                            this@AddSourceActivity,
+                            R.string.cant_create_source,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                })
+            }
         }
     }
 }

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

@@ -5,27 +5,31 @@ import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
+import apps.amine.bou.readerforselfoss.databinding.ActivityImageBinding
 import apps.amine.bou.readerforselfoss.fragments.ImageFragment
-import kotlinx.android.synthetic.main.activity_reader.*
 
 class ImageActivity : AppCompatActivity() {
     private lateinit var allImages : ArrayList<String>
     private var position : Int = 0
 
+    private lateinit var binding: ActivityImageBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ActivityImageBinding.inflate(layoutInflater)
+        val view = binding.root
 
-        setContentView(R.layout.activity_image)
+        setContentView(view)
 
-        setSupportActionBar(toolBar)
+        setSupportActionBar(binding.toolBar)
         supportActionBar?.setDisplayShowTitleEnabled(false)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        allImages = intent.getStringArrayListExtra("allImages")
+        allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
         position = intent.getIntExtra("position", 0)
 
-        pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
-        pager.currentItem = position
+        binding.pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
+        binding.pager.currentItem = position
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

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

@@ -17,13 +17,13 @@ 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
 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 kotlinx.android.synthetic.main.activity_login.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -39,15 +39,18 @@ class LoginActivity : AppCompatActivity() {
     private lateinit var editor: SharedPreferences.Editor
     private lateinit var userIdentifier: String
     private lateinit var appColors: AppColors
+    private lateinit var binding: ActivityLoginBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         appColors = AppColors(this@LoginActivity)
 
         super.onCreate(savedInstanceState)
+        binding = ActivityLoginBinding.inflate(layoutInflater)
+        val view = binding.root
 
-        setContentView(R.layout.activity_login)
+        setContentView(view)
 
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
 
         handleBaseUrlFail()
 
@@ -65,14 +68,14 @@ class LoginActivity : AppCompatActivity() {
 
     private fun handleActions() {
 
-        withSelfhostedCert.setOnCheckedChangeListener { _, b ->
+        binding.withSelfhostedCert.setOnCheckedChangeListener { _, b ->
             isWithSelfSignedCert = !isWithSelfSignedCert
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            warningText.visibility = visi
+            binding.warningText.visibility = visi
         }
 
-        passwordView.setOnEditorActionListener(
+        binding.passwordView.setOnEditorActionListener(
             TextView.OnEditorActionListener { _, id, _ ->
                 if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
                     attemptLogin()
@@ -82,22 +85,22 @@ class LoginActivity : AppCompatActivity() {
             }
         )
 
-        signInButton.setOnClickListener { attemptLogin() }
+        binding.signInButton.setOnClickListener { attemptLogin() }
 
-        withLogin.setOnCheckedChangeListener { _, b ->
+        binding.withLogin.setOnCheckedChangeListener { _, b ->
             isWithLogin = !isWithLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            loginLayout.visibility = visi
-            passwordLayout.visibility = visi
+            binding.loginLayout.visibility = visi
+            binding.passwordLayout.visibility = visi
         }
 
-        withHttpLogin.setOnCheckedChangeListener { _, b ->
+        binding.withHttpLogin.setOnCheckedChangeListener { _, b ->
             isWithHTTPLogin = !isWithHTTPLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            httpLoginInput.visibility = visi
-            httpPasswordInput.visibility = visi
+            binding.httpLoginInput.visibility = visi
+            binding.httpPasswordInput.visibility = visi
         }
     }
 
@@ -124,25 +127,25 @@ class LoginActivity : AppCompatActivity() {
     private fun attemptLogin() {
 
         // Reset errors.
-        urlView.error = null
-        loginView.error = null
-        httpLoginView.error = null
-        passwordView.error = null
-        httpPasswordView.error = null
+        binding.urlView.error = null
+        binding.loginView.error = null
+        binding.httpLoginView.error = null
+        binding.passwordView.error = null
+        binding.httpPasswordView.error = null
 
         // Store values at the time of the login attempt.
-        val url = urlView.text.toString()
-        val login = loginView.text.toString()
-        val httpLogin = httpLoginView.text.toString()
-        val password = passwordView.text.toString()
-        val httpPassword = httpPasswordView.text.toString()
+        val url = binding.urlView.text.toString()
+        val login = binding.loginView.text.toString()
+        val httpLogin = binding.httpLoginView.text.toString()
+        val password = binding.passwordView.text.toString()
+        val httpPassword = binding.httpPasswordView.text.toString()
 
         var cancel = false
         var focusView: View? = null
 
         if (!url.isBaseUrlValid(this@LoginActivity)) {
-            urlView.error = getString(R.string.login_url_problem)
-            focusView = urlView
+            binding.urlView.error = getString(R.string.login_url_problem)
+            focusView = binding.urlView
             cancel = true
             inValidCount++
             if (inValidCount == 3) {
@@ -161,28 +164,28 @@ class LoginActivity : AppCompatActivity() {
 
         if (isWithLogin) {
             if (TextUtils.isEmpty(password)) {
-                passwordView.error = getString(R.string.error_invalid_password)
-                focusView = passwordView
+                binding.passwordView.error = getString(R.string.error_invalid_password)
+                focusView = binding.passwordView
                 cancel = true
             }
 
             if (TextUtils.isEmpty(login)) {
-                loginView.error = getString(R.string.error_field_required)
-                focusView = loginView
+                binding.loginView.error = getString(R.string.error_field_required)
+                focusView = binding.loginView
                 cancel = true
             }
         }
 
         if (isWithHTTPLogin) {
             if (TextUtils.isEmpty(httpPassword)) {
-                httpPasswordView.error = getString(R.string.error_invalid_password)
-                focusView = httpPasswordView
+                binding.httpPasswordView.error = getString(R.string.error_invalid_password)
+                focusView = binding.httpPasswordView
                 cancel = true
             }
 
             if (TextUtils.isEmpty(httpLogin)) {
-                httpLoginView.error = getString(R.string.error_field_required)
-                focusView = httpLoginView
+                binding.httpLoginView.error = getString(R.string.error_field_required)
+                focusView = binding.httpLoginView
                 cancel = true
             }
         }
@@ -216,11 +219,11 @@ class LoginActivity : AppCompatActivity() {
                         editor.remove("password")
                         editor.remove("httpPassword")
                         editor.apply()
-                        urlView.error = getString(R.string.wrong_infos)
-                        loginView.error = getString(R.string.wrong_infos)
-                        passwordView.error = getString(R.string.wrong_infos)
-                        httpLoginView.error = getString(R.string.wrong_infos)
-                        httpPasswordView.error = getString(R.string.wrong_infos)
+                        binding.urlView.error = getString(R.string.wrong_infos)
+                        binding.loginView.error = getString(R.string.wrong_infos)
+                        binding.passwordView.error = getString(R.string.wrong_infos)
+                        binding.httpLoginView.error = getString(R.string.wrong_infos)
+                        binding.httpPasswordView.error = getString(R.string.wrong_infos)
                         showProgress(false)
                     }
 
@@ -248,28 +251,28 @@ class LoginActivity : AppCompatActivity() {
     private fun showProgress(show: Boolean) {
         val shortAnimTime = resources.getInteger(android.R.integer.config_shortAnimTime)
 
-        loginForm.visibility = if (show) View.GONE else View.VISIBLE
-        loginForm
+        binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
+        binding.loginForm
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
                 if (show) 0F else 1F
             ).setListener(object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
-                loginForm.visibility = if (show) View.GONE else View.VISIBLE
+                binding.loginForm.visibility = if (show) View.GONE else View.VISIBLE
             }
         }
         )
 
-        loginProgress.visibility = if (show) View.VISIBLE else View.GONE
-        loginProgress
+        binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.loginProgress
             .animate()
             .setDuration(shortAnimTime.toLong())
             .alpha(
                 if (show) 1F else 0F
             ).setListener(object : AnimatorListenerAdapter() {
             override fun onAnimationEnd(animation: Animator) {
-                loginProgress.visibility = if (show) View.VISIBLE else View.GONE
+                binding.loginProgress.visibility = if (show) View.VISIBLE else View.GONE
             }
         }
         )

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

@@ -4,12 +4,18 @@ 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() {
+    private lateinit var binding: ActivityMainBinding
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        val view = binding.root
+        setContentView(view)
 
         val intent = Intent(this, LoginActivity::class.java)
 

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

@@ -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,6 +2,9 @@ package apps.amine.bou.readerforselfoss
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
@@ -14,15 +17,12 @@ import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
 import androidx.room.Room
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.ActivityReaderBinding
 import apps.amine.bou.readerforselfoss.fragments.ArticleFragment
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
@@ -30,17 +30,10 @@ import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.persistence.toEntity
-import apps.amine.bou.readerforselfoss.utils.succeeded
+import apps.amine.bou.readerforselfoss.utils.SharedItems
 import apps.amine.bou.readerforselfoss.utils.toggleStar
 import com.ftinc.scoop.Scoop
-import kotlinx.android.synthetic.main.activity_reader.*
 import me.relex.circleindicator.CircleIndicator
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import kotlin.concurrent.thread
 
 class ReaderActivity : AppCompatActivity() {
 
@@ -54,14 +47,18 @@ class ReaderActivity : AppCompatActivity() {
 
     private lateinit var db: AppDatabase
     private lateinit var prefs: SharedPreferences
+    private lateinit var binding: ActivityReaderBinding
 
     private var activeAlignment: Int = 1
     val JUSTIFY = 1
     val ALIGN_LEFT = 2
 
     private fun showMenuItem(willAddToFavorite: Boolean) {
-        toolbarMenu.findItem(R.id.save).isVisible = willAddToFavorite
-        toolbarMenu.findItem(R.id.unsave).isVisible = !willAddToFavorite
+        if (willAddToFavorite) {
+            toolbarMenu.findItem(R.id.star).icon.colorFilter = PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP)
+        } else {
+            toolbarMenu.findItem(R.id.star).icon.colorFilter = PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
+        }
     }
 
     private fun canFavorite() {
@@ -76,8 +73,10 @@ class ReaderActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ActivityReaderBinding.inflate(layoutInflater)
+        val view = binding.root
 
-        setContentView(R.layout.activity_reader)
+        setContentView(view)
 
         db = Room.databaseBuilder(
             applicationContext,
@@ -85,12 +84,12 @@ class ReaderActivity : AppCompatActivity() {
         ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
 
         val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, toolBar)
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
         }
 
-        setSupportActionBar(toolBar)
+        setSupportActionBar(binding.toolBar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
@@ -119,9 +118,9 @@ class ReaderActivity : AppCompatActivity() {
 
         readItem(allItems[currentItem])
 
-        pager.adapter =
+        binding.pager.adapter =
                 ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
-        pager.currentItem = currentItem
+        binding.pager.currentItem = currentItem
     }
 
     override fun onResume() {
@@ -129,10 +128,10 @@ class ReaderActivity : AppCompatActivity() {
 
         notifyAdapter()
 
-        pager.setPageTransformer(true, DepthPageTransformer())
-        (indicator as CircleIndicator).setViewPager(pager)
+        binding.pager.setPageTransformer(true, DepthPageTransformer())
+        (binding.indicator as CircleIndicator).setViewPager(binding.pager)
 
-        pager.addOnPageChangeListener(
+        binding.pager.addOnPageChangeListener(
             object : ViewPager.SimpleOnPageChangeListener() {
 
                 override fun onPageSelected(position: Int) {
@@ -142,58 +141,32 @@ class ReaderActivity : AppCompatActivity() {
                     } else {
                         canFavorite()
                     }
-                    readItem(allItems[pager.currentItem])
+                    readItem(allItems[position])
                 }
             }
         )
     }
 
-    fun readItem(item: Item) {
+    private fun readItem(item: Item) {
         if (markOnScroll) {
-            thread {
-                db.itemsDao().delete(item.toEntity())
+                SharedItems.readItem(applicationContext, api, db, item)
             }
-            if (this@ReaderActivity.isNetworkAccessible(this@ReaderActivity.findViewById(R.id.reader_activity_view))) {
-                api.markItem(item.id).enqueue(
-                    object : Callback<SuccessResponse> {
-                        override fun onResponse(
-                            call: Call<SuccessResponse>,
-                            response: Response<SuccessResponse>
-                        ) {
-                        }
-
-                        override fun onFailure(
-                            call: Call<SuccessResponse>,
-                            t: Throwable
-                        ) {
-                            thread {
-                                db.itemsDao().insertAllItems(item.toEntity())
-                            }
-                        }
-                    }
-                )
-            } else {
-                thread {
-                    db.actionsDao().insertAllActions(ActionEntity(item.id, true, false, false, false))
-                }
-            }
-        }
     }
 
     private fun notifyAdapter() {
-        (pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
+        (binding.pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
     }
 
     override fun onPause() {
         super.onPause()
         if (markOnScroll) {
-            pager.clearOnPageChangeListeners()
+            binding.pager.clearOnPageChangeListeners()
         }
     }
 
     override fun onSaveInstanceState(oldInstanceState: Bundle) {
         super.onSaveInstanceState(oldInstanceState)
-        oldInstanceState!!.clear()
+        oldInstanceState.clear()
     }
 
     private inner class ScreenSlidePagerAdapter(fm: FragmentManager, val appColors: AppColors) :
@@ -245,14 +218,14 @@ class ReaderActivity : AppCompatActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         fun afterSave() {
-            allItems[pager.currentItem] =
-                    allItems[pager.currentItem].toggleStar()
+            allItems[binding.pager.currentItem] =
+                    allItems[binding.pager.currentItem].toggleStar()
             notifyAdapter()
             canRemoveFromFavorite()
         }
 
         fun afterUnsave() {
-            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+            allItems[binding.pager.currentItem] = allItems[binding.pager.currentItem].toggleStar()
             notifyAdapter()
             canFavorite()
         }
@@ -262,62 +235,23 @@ class ReaderActivity : AppCompatActivity() {
                 onBackPressed()
                 return true
             }
-            R.id.save -> {
-                if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.starrItem(allItems[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[pager.currentItem].id, false, false, true, false))
-                        afterSave()
-                    }
-                }
-            }
-            R.id.unsave -> {
-                if (this@ReaderActivity.isNetworkAccessible(null)) {
-                    api.unstarrItem(allItems[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[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

@@ -12,12 +12,13 @@ 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
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import com.ftinc.scoop.Scoop
-import kotlinx.android.synthetic.main.activity_sources.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -25,31 +26,34 @@ import retrofit2.Response
 class SourcesActivity : AppCompatActivity() {
 
     private lateinit var appColors: AppColors
+    private lateinit var binding: ActivitySourcesBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         appColors = AppColors(this@SourcesActivity)
 
         super.onCreate(savedInstanceState)
+        binding = ActivitySourcesBinding.inflate(layoutInflater)
+        val view = binding.root
 
-        setContentView(R.layout.activity_sources)
+        setContentView(view)
 
         val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, toolbar)
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
         if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
         }
 
-        setSupportActionBar(toolbar)
+        setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        fab.rippleColor = appColors.colorAccentDark
-        fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
+        binding.fab.rippleColor = appColors.colorAccentDark
+        binding.fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
     }
 
     override fun onStop() {
         super.onStop()
-        recyclerView.clearOnScrollListeners()
+        binding.recyclerView.clearOnScrollListeners()
     }
 
     override fun onResume() {
@@ -68,8 +72,8 @@ class SourcesActivity : AppCompatActivity() {
         )
         var items: ArrayList<Source> = ArrayList()
 
-        recyclerView.setHasFixedSize(true)
-        recyclerView.layoutManager = mLayoutManager
+        binding.recyclerView.setHasFixedSize(true)
+        binding.recyclerView.layoutManager = mLayoutManager
 
         if (this@SourcesActivity.isNetworkAccessible(this@SourcesActivity.findViewById(R.id.recyclerView))) {
             api.sources.enqueue(object : Callback<List<Source>> {
@@ -81,7 +85,7 @@ class SourcesActivity : AppCompatActivity() {
                         items = response.body() as ArrayList<Source>
                     }
                     val mAdapter = SourcesListAdapter(this@SourcesActivity, items, api)
-                    recyclerView.adapter = mAdapter
+                    binding.recyclerView.adapter = mAdapter
                     mAdapter.notifyDataSetChanged()
                     if (items.isEmpty()) {
                         Toast.makeText(
@@ -102,7 +106,7 @@ class SourcesActivity : AppCompatActivity() {
             })
         }
 
-        fab.setOnClickListener {
+        binding.fab.setOnClickListener {
             startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
         }
     }

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

@@ -2,28 +2,26 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.content.Context
-import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView.ScaleType
-import android.widget.Toast
 import androidx.core.content.ContextCompat
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.CardItemBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.LinkOnTouchListener
+import apps.amine.bou.readerforselfoss.utils.SharedItems
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
-import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
+import apps.amine.bou.readerforselfoss.utils.network.isNetworkAvailable
 import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
@@ -32,17 +30,6 @@ import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.bumptech.glide.Glide
-import com.like.LikeButton
-import com.like.OnLikeListener
-import kotlinx.android.synthetic.main.card_item.view.*
-import kotlinx.android.synthetic.main.card_item.view.itemImage
-import kotlinx.android.synthetic.main.card_item.view.sourceTitleAndDate
-import kotlinx.android.synthetic.main.card_item.view.title
-import kotlinx.android.synthetic.main.list_item.view.*
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import kotlin.concurrent.thread
 
 class ItemCardAdapter(
     override val app: Activity,
@@ -64,153 +51,108 @@ class ItemCardAdapter(
         c.resources.getDimension(R.dimen.card_image_max_height).toInt()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(R.layout.card_item, parent, false) as CardView
-        return ViewHolder(v)
+        val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val itm = items[position]
+        with(holder) {
+            val itm = items[position]
 
+            binding.favButton.isSelected = itm.starred
+            binding.title.text = itm.getTitleDecoded()
+            binding.title.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
 
-        holder.mView.favButton.isLiked = itm.starred
-        holder.mView.title.text = itm.getTitleDecoded()
-        holder.mView.title.setTextColor(ContextCompat.getColor(
-                c,
-                appColors.textColor
-        ))
-        holder.mView.title.setOnTouchListener(LinkOnTouchListener())
+            binding.title.setOnTouchListener(LinkOnTouchListener())
 
-        holder.mView.title.setLinkTextColor(appColors.colorAccent)
+            binding.title.setLinkTextColor(appColors.colorAccent)
 
-        holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
 
-        holder.mView.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
-                c,
-                appColors.textColor
-        ))
+            binding.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
 
-        if (!fullHeightCards) {
-            holder.mView.itemImage.maxHeight = imageMaxHeight
-            holder.mView.itemImage.scaleType = ScaleType.CENTER_CROP
+            if (!fullHeightCards) {
+                binding.itemImage.maxHeight = imageMaxHeight
+                binding.itemImage.scaleType = ScaleType.CENTER_CROP
+            }
+
+            if (itm.getThumbnail(c).isEmpty()) {
+                binding.itemImage.visibility = View.GONE
+                Glide.with(c).clear(binding.itemImage)
+                binding.itemImage.setImageDrawable(null)
+            } else {
+                binding.itemImage.visibility = View.VISIBLE
+                c.bitmapCenterCrop(config, itm.getThumbnail(c), binding.itemImage)
+            }
+
+            if (itm.getIcon(c).isEmpty()) {
+                val color = generator.getColor(itm.getSourceTitle())
+
+                val drawable =
+                        TextDrawable
+                                .builder()
+                                .round()
+                                .build(itm.getSourceTitle().toTextDrawableString(c), color)
+                binding.sourceImage.setImageDrawable(drawable)
+            } else {
+                c.circularBitmapDrawable(config, itm.getIcon(c), binding.sourceImage)
+            }
         }
-
-        if (itm.getThumbnail(c).isEmpty()) {
-            holder.mView.itemImage.visibility = View.GONE
-            Glide.with(c).clear(holder.mView.itemImage)
-            holder.mView.itemImage.setImageDrawable(null)
-        } else {
-            holder.mView.itemImage.visibility = View.VISIBLE
-            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
-        }
-
-        if (itm.getIcon(c).isEmpty()) {
-            val color = generator.getColor(itm.getSourceTitle())
-
-            val drawable =
-                TextDrawable
-                    .builder()
-                    .round()
-                    .build(itm.getSourceTitle().toTextDrawableString(c), color)
-            holder.mView.sourceImage.setImageDrawable(drawable)
-        } else {
-            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.sourceImage)
-        }
-
-        holder.mView.favButton.isLiked = itm.starred
     }
 
     override fun getItemCount(): Int {
         return items.size
     }
 
-    inner class ViewHolder(val mView: CardView) : RecyclerView.ViewHolder(mView) {
+    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
         init {
-            mView.setCardBackgroundColor(appColors.cardBackgroundColor)
+            binding.root.setCardBackgroundColor(appColors.cardBackgroundColor)
             handleClickListeners()
             handleCustomTabActions()
         }
 
         private fun handleClickListeners() {
 
-            mView.favButton.setOnLikeListener(object : OnLikeListener {
-                override fun liked(likeButton: LikeButton) {
-                    val (id) = items[adapterPosition]
-                    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
-                            ) {
-                                mView.favButton.isLiked = false
-                                Toast.makeText(
-                                    c,
-                                    R.string.cant_mark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
+            binding.favButton.setOnClickListener {
+                val item = items[bindingAdapterPosition]
+                if (isNetworkAvailable(c)) {
+                    if (item.starred) {
+                        SharedItems.unstarItem(c, api, db, item)
+                        item.starred = false
+                        binding.favButton.isSelected = false
                     } else {
-                        thread {
-                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, true, false))
-                        }
+                        SharedItems.starItem(c, api, db, item)
+                        item.starred = true
+                        binding.favButton.isSelected = true
                     }
                 }
+            }
 
-                override fun unLiked(likeButton: LikeButton) {
-                    val (id) = items[adapterPosition]
-                    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
-                            ) {
-                                mView.favButton.isLiked = true
-                                Toast.makeText(
-                                    c,
-                                    R.string.cant_unmark_favortie,
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                            }
-                        })
-                    } else {
-                        thread {
-                            db.actionsDao().insertAllActions(ActionEntity(id, false, false, false, true))
-                        }
-                    }
+                binding.shareBtn.setOnClickListener {
+                    val item = items[bindingAdapterPosition]
+                    c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
                 }
-            })
 
-            mView.shareBtn.setOnClickListener {
-                val item = items[adapterPosition]
-                c.shareLink(item.getLinkDecoded(), item.getTitleDecoded())
+                binding.browserBtn.setOnClickListener {
+                    c.openInBrowserAsNewTask(items[bindingAdapterPosition])
+                }
             }
 
-            mView.browserBtn.setOnClickListener {
-                c.openInBrowserAsNewTask(items[adapterPosition])
-            }
-        }
-
         private fun handleCustomTabActions() {
             val customTabsIntent = c.buildCustomTabsIntent()
             helper.bindCustomTabsService(app)
 
-            mView.setOnClickListener {
+            binding.root.setOnClickListener {
                 c.openItemUrl(
                     items,
-                    adapterPosition,
-                    items[adapterPosition].getLinkDecoded(),
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
                     customTabsIntent,
                     internalBrowser,
                     articleViewer,

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

@@ -2,22 +2,13 @@ package apps.amine.bou.readerforselfoss.adapters
 
 import android.app.Activity
 import android.content.Context
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
-import android.text.Spannable
-import android.text.style.ClickableSpan
-import android.util.TypedValue
 import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
-import android.widget.Toast
 import androidx.core.content.ContextCompat
-import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.ListItemBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
@@ -26,20 +17,11 @@ import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
-import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
-import apps.amine.bou.readerforselfoss.utils.shareLink
 import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
-import com.like.LikeButton
-import com.like.OnLikeListener
-import kotlinx.android.synthetic.main.list_item.view.*
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.util.*
 import kotlin.collections.ArrayList
 
 class ItemListAdapter(
@@ -59,59 +41,57 @@ class ItemListAdapter(
     private val c: Context = app.baseContext
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(
-            R.layout.list_item,
-            parent,
-            false
-        ) as ConstraintLayout
-        return ViewHolder(v)
+        val binding = ListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val itm = items[position]
+        with(holder) {
+            val itm = items[position]
 
 
-        holder.mView.title.text = itm.getTitleDecoded()
+            binding.title.text = itm.getTitleDecoded()
 
-        holder.mView.title.setTextColor(ContextCompat.getColor(
-                c,
-                appColors.textColor
-        ))
+            binding.title.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
 
-        holder.mView.title.setOnTouchListener(LinkOnTouchListener())
+            binding.title.setOnTouchListener(LinkOnTouchListener())
 
-        holder.mView.title.setLinkTextColor(appColors.colorAccent)
+            binding.title.setLinkTextColor(appColors.colorAccent)
 
-        holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()
 
-        holder.mView.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
-                c,
-                appColors.textColor
-        ))
+            binding.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))
 
-        if (itm.getThumbnail(c).isEmpty()) {
+            if (itm.getThumbnail(c).isEmpty()) {
 
-            if (itm.getIcon(c).isEmpty()) {
-                val color = generator.getColor(itm.getSourceTitle())
+                if (itm.getIcon(c).isEmpty()) {
+                    val color = generator.getColor(itm.getSourceTitle())
 
-                val drawable =
-                    TextDrawable
-                        .builder()
-                        .round()
-                        .build(itm.getSourceTitle().toTextDrawableString(c), color)
+                    val drawable =
+                            TextDrawable
+                                    .builder()
+                                    .round()
+                                    .build(itm.getSourceTitle().toTextDrawableString(c), color)
 
-                holder.mView.itemImage.setImageDrawable(drawable)
+                    binding.itemImage.setImageDrawable(drawable)
+                } else {
+                    c.circularBitmapDrawable(config, itm.getIcon(c), binding.itemImage)
+                }
             } else {
-                c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
+                c.bitmapCenterCrop(config, itm.getThumbnail(c), binding.itemImage)
             }
-        } else {
-            c.bitmapCenterCrop(config, itm.getThumbnail(c), holder.mView.itemImage)
         }
     }
 
     override fun getItemCount(): Int = items.size
 
-    inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root) {
 
         init {
             handleCustomTabActions()
@@ -121,11 +101,11 @@ class ItemListAdapter(
             val customTabsIntent = c.buildCustomTabsIntent()
             helper.bindCustomTabsService(app)
 
-            mView.setOnClickListener {
+            binding.root.setOnClickListener {
                 c.openItemUrl(
                     items,
-                    adapterPosition,
-                    items[adapterPosition].getLinkDecoded(),
+                    bindingAdapterPosition,
+                    items[bindingAdapterPosition].getLinkDecoded(),
                     customTabsIntent,
                     internalBrowser,
                     articleViewer,

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

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

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

@@ -12,13 +12,13 @@ import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.SourceListItemBinding
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
 import com.amulyakhare.textdrawable.TextDrawable
 import com.amulyakhare.textdrawable.util.ColorGenerator
-import kotlinx.android.synthetic.main.source_list_item.view.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -31,14 +31,11 @@ class SourcesListAdapter(
     private val c: Context = app.baseContext
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private lateinit var config: Config
+    private lateinit var binding: SourceListItemBinding
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(
-            R.layout.source_list_item,
-            parent,
-            false
-        ) as ConstraintLayout
-        return ViewHolder(v)
+        binding = SourceListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding.root)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -53,12 +50,12 @@ class SourcesListAdapter(
                     .builder()
                     .round()
                     .build(itm.getTitleDecoded().toTextDrawableString(c), color)
-            holder.mView.itemImage.setImageDrawable(drawable)
+            binding.itemImage.setImageDrawable(drawable)
         } else {
-            c.circularBitmapDrawable(config, itm.getIcon(c), holder.mView.itemImage)
+            c.circularBitmapDrawable(config, itm.getIcon(c), binding.itemImage)
         }
 
-        holder.mView.sourceTitle.text = itm.getTitleDecoded()
+        binding.sourceTitle.text = itm.getTitleDecoded()
     }
 
     override fun getItemCount(): Int = items.size

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

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

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

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

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

@@ -30,7 +30,11 @@ data class Tag(
     @SerializedName("tag") val tag: String,
     @SerializedName("color") val color: String,
     @SerializedName("unread") val unread: Int
-)
+) {
+    fun getTitleDecoded(): String {
+        return Html.fromHtml(tag).toString()
+    }
+}
 
 class SuccessResponse(@SerializedName("success") val success: Boolean) {
     val isSuccess: Boolean
@@ -48,6 +52,19 @@ data class Spout(
     @SerializedName("description") val description: String
 )
 
+data class ApiVersion(
+        @SerializedName("version") val version: String?,
+        @SerializedName("apiversion") val apiversion: String?
+) {
+    fun getApiMajorVersion() : Int {
+        var versionNumber = 0
+        if (apiversion != null) {
+            versionNumber = apiversion.substringBefore(".").toInt()
+        }
+        return versionNumber
+    }
+}
+
 data class Source(
     @SerializedName("id") val id: String,
     @SerializedName("title") val title: String,
@@ -75,7 +92,7 @@ data class Item(
     @SerializedName("datetime") val datetime: String,
     @SerializedName("title") val title: String,
     @SerializedName("content") val content: String,
-    @SerializedName("unread") val unread: Boolean,
+    @SerializedName("unread") var unread: Boolean,
     @SerializedName("starred") var starred: Boolean,
     @SerializedName("thumbnail") val thumbnail: String?,
     @SerializedName("icon") val icon: String?,
@@ -141,7 +158,14 @@ data class Item(
         var allImages = ArrayList<String>()
 
         for ( image in Jsoup.parse(content).getElementsByTag("img")) {
-            allImages.add(image.attr("src"))
+            val url = image.attr("src")
+            if (url.toLowerCase().contains(".jpg") ||
+                    url.toLowerCase().contains(".jpeg") ||
+                    url.toLowerCase().contains(".png") ||
+                    url.toLowerCase().contains(".webp"))
+            {
+                allImages.add(url)
+            }
         }
         return allImages
     }
@@ -149,7 +173,7 @@ data class Item(
     fun preloadImages(context: Context) : Boolean {
         val imageUrls = this.getImages()
 
-        val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+        val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL).timeout(10000)
 
 
         try {
@@ -157,7 +181,7 @@ data class Item(
                 if ( URLUtil.isValidUrl(url)) {
                     val image = Glide.with(context).asBitmap()
                             .apply(glideOptions)
-                            .load(url).submit().get()
+                            .load(url).submit()
                 }
             }
         } catch (e : Error) {

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

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

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

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

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

@@ -14,6 +14,7 @@ import android.os.Bundle
 import android.preference.PreferenceManager
 import android.view.*
 import android.webkit.*
+import android.widget.Toast
 import androidx.browser.customtabs.CustomTabsIntent
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import androidx.fragment.app.Fragment
@@ -28,43 +29,35 @@ import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import apps.amine.bou.readerforselfoss.databinding.FragmentArticleBinding
 import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
-import apps.amine.bou.readerforselfoss.persistence.entities.ActionEntity
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_1_2
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.themes.AppColors
-import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
+import apps.amine.bou.readerforselfoss.utils.*
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import apps.amine.bou.readerforselfoss.utils.glide.getBitmapInputStream
-import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import apps.amine.bou.readerforselfoss.utils.openItemUrl
-import apps.amine.bou.readerforselfoss.utils.shareLink
-import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
-import apps.amine.bou.readerforselfoss.utils.succeeded
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
 import com.github.rubensousa.floatingtoolbar.FloatingToolbar
-import kotlinx.android.synthetic.main.fragment_article.view.*
 import retrofit2.Call
 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
-import kotlin.concurrent.thread
 
 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 var mCustomTabActivityHelper: CustomTabActivityHelper? = null
     private lateinit var url: String
     private lateinit var contentText: String
     private lateinit var contentSource: String
@@ -77,14 +70,15 @@ class ArticleFragment : Fragment() {
     private lateinit var db: AppDatabase
     private lateinit var textAlignment: String
     private lateinit var config: Config
-
-    private var rootView: ViewGroup? = null
+    private var _binding: FragmentArticleBinding? = null
+    private val binding get() = _binding!!
 
     private lateinit var prefs: SharedPreferences
 
     private var typeface: Typeface? = null
     private var resId: Int = 0
     private var font = ""
+    private var staticBar = false
 
     override fun onStop() {
         super.onStop()
@@ -94,16 +88,16 @@ class ArticleFragment : Fragment() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        appColors = AppColors(activity!!)
-        config = Config(activity!!)
+        appColors = AppColors(requireActivity())
+        config = Config(requireActivity())
 
         super.onCreate(savedInstanceState)
 
-        pageNumber = arguments!!.getInt(ARG_POSITION)
-        allItems = arguments!!.getParcelableArrayList<Item>(ARG_ITEMS) as ArrayList<Item>
+        pageNumber = requireArguments().getInt(ARG_POSITION)
+        allItems = requireArguments().getParcelableArrayList<Item>(ARG_ITEMS) as ArrayList<Item>
 
         db = Room.databaseBuilder(
-            context!!,
+            requireContext(),
             AppDatabase::class.java, "selfoss-database"
         ).addMigrations(MIGRATION_1_2).addMigrations(MIGRATION_2_3).addMigrations(MIGRATION_3_4).build()
     }
@@ -112,29 +106,29 @@ class ArticleFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         try {
-            rootView = inflater
-                .inflate(R.layout.fragment_article, container, false) as ViewGroup
+            _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(activity!!)
+            contentImage = allItems[pageNumber.toInt()].getThumbnail(requireActivity())
             contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
             allImages = allItems[pageNumber.toInt()].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()) {
-                resId = context!!.resources.getIdentifier(font, "font", context!!.packageName)
+                resId = requireContext().resources.getIdentifier(font, "font", requireContext().packageName)
                 typeface = try {
-                    ResourcesCompat.getFont(context!!, resId)!!
+                    ResourcesCompat.getFont(requireContext(), resId)!!
                 } catch (e: java.lang.Exception) {
-                    // ACRA.getErrorReporter().maybeHandleSilentException(Throwable("Font loading issue: ${e.message}"), context!!)
+                    // ACRA.getErrorReporter().maybeHandleSilentException(Throwable("Font loading issue: ${e.message}"), requireContext())
                     // Just to be sure
                     null
                 }
@@ -142,27 +136,27 @@ class ArticleFragment : Fragment() {
 
             refreshAlignment()
 
-            val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+            val settings = requireActivity().getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
 
             val api = SelfossApi(
-                context!!,
-                activity!!,
+                requireContext(),
+                requireActivity(),
                 settings.getBoolean("isSelfSignedCert", false),
                 prefs.getString("api_timeout", "-1")!!.toLong()
             )
 
-            fab = rootView!!.fab
+            fab = binding.fab
 
             fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
 
             fab.rippleColor = appColors.colorAccentDark
 
-            val floatingToolbar: FloatingToolbar = rootView!!.floatingToolbar
+            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
             floatingToolbar.attachFab(fab)
 
             floatingToolbar.background = ColorDrawable(appColors.colorAccent)
 
-            val customTabsIntent = activity!!.buildCustomTabsIntent()
+            val customTabsIntent = requireActivity().buildCustomTabsIntent()
             mCustomTabActivityHelper = CustomTabActivityHelper()
             mCustomTabActivityHelper!!.bindCustomTabsService(activity)
 
@@ -171,36 +165,44 @@ class ArticleFragment : Fragment() {
                 object : FloatingToolbar.ItemClickListener {
                     override fun onItemClick(item: MenuItem) {
                         when (item.itemId) {
-                            R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
-                            R.id.share_action -> activity!!.shareLink(url, contentTitle)
-                            R.id.open_action -> activity!!.openItemUrl(
+                            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,
-                                activity!!
+                                requireActivity()
                             )
-                            R.id.unread_action -> if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
-                                api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
-                                    object : Callback<SuccessResponse> {
-                                        override fun onResponse(
-                                            call: Call<SuccessResponse>,
-                                            response: Response<SuccessResponse>
-                                        ) {
-                                        }
-
-                                        override fun onFailure(
-                                            call: Call<SuccessResponse>,
-                                            t: Throwable
-                                        ) {
-                                        }
-                                    }
-                                )
-                            } else {
-                                thread {
-                                    db.actionsDao().insertAllActions(ActionEntity(allItems[pageNumber.toInt()].id, false, true, false, false))
+                            R.id.unread_action -> if (context != null) {
+                                if (allItems[pageNumber.toInt()].unread) {
+                                    SharedItems.readItem(
+                                        context!!,
+                                        api,
+                                        db,
+                                        allItems[pageNumber.toInt()]
+                                    )
+                                    allItems[pageNumber.toInt()].unread = false
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_read,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                } else {
+                                    SharedItems.unreadItem(
+                                        context!!,
+                                        api,
+                                        db,
+                                        allItems[pageNumber.toInt()]
+                                    )
+                                    allItems[pageNumber.toInt()].unread = true
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_unread,
+                                        Toast.LENGTH_LONG
+                                    ).show()
                                 }
                             }
                             else -> Unit
@@ -212,61 +214,76 @@ class ArticleFragment : Fragment() {
                 }
             )
 
-            rootView!!.source.text = contentSource
+            if (staticBar) {
+                fab.hide()
+                floatingToolbar.show()
+            }
+
+            binding.source.text = contentSource
             if (typeface != null) {
-                rootView!!.source.typeface = typeface
+                binding.source.typeface = typeface
             }
 
             if (contentText.isEmptyOrNullOrNullString()) {
-                getContentFromMercury(customTabsIntent, prefs)
+                getContentFromMercury(customTabsIntent)
             } else {
-                rootView!!.titleView.text = contentTitle
+                binding.titleView.text = contentTitle
                 if (typeface != null) {
-                    rootView!!.titleView.typeface = typeface
+                    binding.titleView.typeface = typeface
                 }
 
                 htmlToWebview()
 
                 if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                    rootView!!.imageView.visibility = View.VISIBLE
+                    binding.imageView.visibility = View.VISIBLE
                     Glide
-                        .with(context!!)
+                        .with(requireContext())
                         .asBitmap()
                         .loadMaybeBasicAuth(config, contentImage)
                         .apply(RequestOptions.fitCenterTransform())
-                        .into(rootView!!.imageView)
+                        .into(binding.imageView)
                 } else {
-                    rootView!!.imageView.visibility = View.GONE
+                    binding.imageView.visibility = View.GONE
                 }
             }
 
-            rootView!!.nestedScrollView.setOnScrollChangeListener(
+            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()
+                        }
                     }
                 }
             )
 
         } catch (e: InflateException) {
-            AlertDialog.Builder(context!!)
-                .setMessage(context!!.getString(R.string.webview_dialog_issue_message))
-                .setTitle(context!!.getString(R.string.webview_dialog_issue_title))
+            AlertDialog.Builder(requireContext())
+                .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(context!!)
+                ) { _, _ ->
+                    val sharedPref = PreferenceManager.getDefaultSharedPreferences(requireContext())
                     val editor = sharedPref.edit()
                     editor.putBoolean("prefer_article_viewer", false)
-                    editor.commit()
-                    activity!!.finish()
+                    editor.apply()
+                    requireActivity().finish()
                 }
                 .create()
                 .show()
         }
 
-        return rootView
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
     }
 
     private fun refreshAlignment() {
@@ -278,11 +295,10 @@ class ArticleFragment : Fragment() {
     }
 
     private fun getContentFromMercury(
-        customTabsIntent: CustomTabsIntent,
-        prefs: SharedPreferences
+            customTabsIntent: CustomTabsIntent
     ) {
-        if ((context != null && context!!.isNetworkAccessible(null)) || context == null) {
-            rootView!!.progressBar.visibility = View.VISIBLE
+        if ((context != null && requireContext().isNetworkAccessible(null)) || context == null) {
+            binding.progressBar.visibility = View.VISIBLE
             val parser = MercuryApi()
 
             parser.parseUrl(url).enqueue(
@@ -295,9 +311,9 @@ class ArticleFragment : Fragment() {
                         try {
                             if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
                                 try {
-                                    rootView!!.titleView.text = response.body()!!.title
+                                    binding.titleView.text = response.body()!!.title
                                     if (typeface != null) {
-                                        rootView!!.titleView.typeface = typeface
+                                        binding.titleView.typeface = typeface
                                     }
                                     try {
                                         // Note: Mercury may return relative urls... If it does the url val will not be changed.
@@ -317,44 +333,32 @@ class ArticleFragment : Fragment() {
 
                                 try {
                                     if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty() && context != null) {
-                                        rootView!!.imageView.visibility = View.VISIBLE
+                                        binding.imageView.visibility = View.VISIBLE
                                         try {
                                             Glide
-                                                .with(context!!)
+                                                .with(requireContext())
                                                 .asBitmap()
                                                 .loadMaybeBasicAuth(config, response.body()!!.lead_image_url.orEmpty())
                                                 .apply(RequestOptions.fitCenterTransform())
-                                                .into(rootView!!.imageView)
+                                                .into(binding.imageView)
                                         } catch (e: Exception) {
                                         }
                                     } else {
-                                        rootView!!.imageView.visibility = View.GONE
+                                        binding.imageView.visibility = View.GONE
                                     }
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
+                                } catch (e: Exception) { }
 
                                 try {
-                                    rootView!!.nestedScrollView.scrollTo(0, 0)
+                                    binding.nestedScrollView.scrollTo(0, 0)
 
-                                    rootView!!.progressBar.visibility = View.GONE
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
+                                    binding.progressBar.visibility = View.GONE
+                                } catch (e: Exception) { }
                             } else {
                                 try {
                                     openInBrowserAfterFailing(customTabsIntent)
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
+                                } catch (e: Exception) { }
                             }
-                        } catch (e: Exception) {
-                            if (context != null) {
-                            }
-                        }
+                        } catch (e: Exception) { }
                     }
 
                     override fun onFailure(
@@ -370,32 +374,32 @@ class ArticleFragment : Fragment() {
         val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)
 
         val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
-        val a: TypedArray = context!!.obtainStyledAttributes(resId, attrs)
+        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
 
 
-        rootView!!.webcontent.settings.standardFontFamily = a.getString(0)
-        rootView!!.webcontent.visibility = View.VISIBLE
+        binding.webcontent.settings.standardFontFamily = a.getString(0)
+        binding.webcontent.visibility = View.VISIBLE
         val (textColor, backgroundColor) = if (appColors.isDarkTheme) {
             if (context != null) {
-                rootView!!.webcontent.setBackgroundColor(
+                binding.webcontent.setBackgroundColor(
                     ContextCompat.getColor(
-                        context!!,
+                        requireContext(),
                         R.color.dark_webview
                     )
                 )
-                Pair(ContextCompat.getColor(context!!, R.color.dark_webview_text), ContextCompat.getColor(context!!, 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) {
-                rootView!!.webcontent.setBackgroundColor(
+                binding.webcontent.setBackgroundColor(
                     ContextCompat.getColor(
-                        context!!,
+                        requireContext(),
                         R.color.light_webview
                     )
                 )
-                Pair(ContextCompat.getColor(context!!, R.color.light_webview_text), ContextCompat.getColor(context!!, R.color.light_webview))
+                Pair(ContextCompat.getColor(requireContext(), R.color.light_webview_text), ContextCompat.getColor(requireContext(), R.color.light_webview))
             } else {
                 Pair(null, null)
             }
@@ -413,36 +417,41 @@ class ArticleFragment : Fragment() {
             "#FFFFFF"
         }
 
-        rootView!!.webcontent.settings.useWideViewPort = true
-        rootView!!.webcontent.settings.loadWithOverviewMode = true
-        rootView!!.webcontent.settings.javaScriptEnabled = false
+        binding.webcontent.settings.useWideViewPort = true
+        binding.webcontent.settings.loadWithOverviewMode = true
+        binding.webcontent.settings.javaScriptEnabled = false
 
-        rootView!!.webcontent.webViewClient = object : WebViewClient() {
+        binding.webcontent.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
-                if (rootView!!.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                    rootView!!.context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
                 }
                 return true
             }
 
             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.ROOT).contains(".jpg") || url.lowercase(Locale.ROOT).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.ROOT).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.ROOT).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))
+                        val compressFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                           Bitmap.CompressFormat.WEBP_LOSSLESS
+                        } else {
+                            Bitmap.CompressFormat.WEBP
+                        }
+                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, compressFormat))
                     }catch ( e : ExecutionException) {}
                 }
 
@@ -456,13 +465,13 @@ class ArticleFragment : Fragment() {
             }
         })
 
-        rootView!!.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
+        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            rootView!!.webcontent.settings.layoutAlgorithm =
+            binding.webcontent.settings.layoutAlgorithm =
                     WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
         } else {
-            rootView!!.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
+            binding.webcontent.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
         }
 
         var baseUrl: String? = null
@@ -491,7 +500,7 @@ class ArticleFragment : Fragment() {
             ""
         }
 
-        rootView!!.webcontent.loadDataWithBaseURL(
+        binding.webcontent.loadDataWithBaseURL(
             baseUrl,
             """<html>
                 |<head>
@@ -544,15 +553,15 @@ class ArticleFragment : Fragment() {
     }
 
     private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
-        rootView!!.progressBar.visibility = View.GONE
-        activity!!.openItemUrl(
+        binding.progressBar.visibility = View.GONE
+        requireActivity().openItemUrl(
             allItems,
             pageNumber.toInt(),
             url,
             customTabsIntent,
             true,
             false,
-            activity!!
+            requireActivity()
         )
     }
 
@@ -574,10 +583,10 @@ class ArticleFragment : Fragment() {
     }
 
     fun performClick(): Boolean {
-        if (rootView!!.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-                rootView!!.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
+        if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
 
-            val position : Int = allImages.indexOf(rootView!!.webcontent.hitTestResult.extra)
+            val position : Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
 
             val intent = Intent(activity, ImageActivity::class.java)
             intent.putExtra("allImages", allImages)

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

@@ -4,35 +4,43 @@ import android.os.Bundle
 import android.view.*
 import androidx.fragment.app.Fragment
 import apps.amine.bou.readerforselfoss.R
+import apps.amine.bou.readerforselfoss.databinding.FragmentImageBinding
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
-import kotlinx.android.synthetic.main.fragment_image.view.*
 
 class ImageFragment : Fragment() {
 
     private lateinit var imageUrl : String
     private val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
+    private var _binding: FragmentImageBinding? = null
+    private val binding get() = _binding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        imageUrl = arguments!!.getString("imageUrl")!!
+        imageUrl = requireArguments().getString("imageUrl")!!
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view : View = inflater.inflate(R.layout.fragment_image, container, false)
+        _binding = FragmentImageBinding.inflate(inflater, container, false)
+        val view = binding?.root
 
-        view.photoView.visibility = View.VISIBLE
+        binding!!.photoView.visibility = View.VISIBLE
         Glide.with(activity)
                 .asBitmap()
                 .apply(glideOptions)
                 .load(imageUrl)
-                .into(view.photoView)
+                .into(binding!!.photoView)
 
         return view
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     companion object {
         private const val ARG_IMAGE = "imageUrl"
 

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

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

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

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

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

@@ -2,28 +2,21 @@ 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;
@@ -54,13 +47,10 @@ 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;
-        }
+    private static final Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = (preference, value) -> {
+        String stringValue = value.toString();
+        preference.setSummary(stringValue);
+        return true;
     };
 
     /**
@@ -128,7 +118,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
         loadHeadersFromResource(R.xml.pref_headers, target);
 
         AppColors appColors = new AppColors(this);
-        if (appColors != null && appColors.isDarkTheme()) {
+        if (appColors.isDarkTheme()) {
             for (Header header : target) {
                 tryLoadIconDark(header);
             }
@@ -178,19 +168,15 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 
             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 "";
+                    (source, start, end, dest, dstart, 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 "";
                     }
             });
 
@@ -214,24 +200,18 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                 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) {}
+                public void afterTextChanged(Editable editable) throws NumberFormatException {
+                    fontSize.getEditText().setTextSize(Integer.parseInt(editable.toString()));
                 }
             });
             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 "";
-                        }
+                    (source, start, end, dest, dstart, dend) -> {
+                        try {
+                            int input = Integer.parseInt(dest.toString() + source.toString());
+                            if (input > 0)
+                                return null;
+                        } catch (NumberFormatException ignored) {}
+                        return "";
                     }
             });
         }
@@ -254,28 +234,19 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             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("trackerLink").setOnPreferenceClickListener(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("sourceLink").setOnPreferenceClickListener(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;
-                }
+            findPreference("translation").setOnPreferenceClickListener(preference -> {
+                openUrl(Uri.parse(Config.translationUrl));
+                return false;
             });
         }
     }

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

@@ -2,13 +2,11 @@ package apps.amine.bou.readerforselfoss.themes
 
 import android.app.Activity
 import android.content.Context
+import android.os.Build
 import android.preference.PreferenceManager
 import androidx.annotation.ColorInt
-import androidx.appcompat.view.ContextThemeWrapper
 import android.util.TypedValue
 import apps.amine.bou.readerforselfoss.R
-import android.view.LayoutInflater
-import android.view.ViewGroup
 
 class AppColors(a: Activity) {
 
@@ -24,26 +22,49 @@ class AppColors(a: Activity) {
     init {
         val sharedPref = PreferenceManager.getDefaultSharedPreferences(a)
 
-        colorPrimary =
-                sharedPref.getInt(
-                    "color_primary",
-                    a.resources.getColor(R.color.colorPrimary)
-                )
-        colorPrimaryDark =
-                sharedPref.getInt(
-                    "color_primary_dark",
-                    a.resources.getColor(R.color.colorPrimaryDark)
-                )
-        colorAccent =
-                sharedPref.getInt(
-                    "color_accent",
-                    a.resources.getColor(R.color.colorAccent)
-                )
-        colorAccentDark =
-                sharedPref.getInt(
-                    "color_accent_dark",
-                    a.resources.getColor(R.color.colorAccentDark)
-                )
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            colorPrimary =
+                    sharedPref.getInt(
+                        "color_primary",
+                        a.resources.getColor(R.color.colorPrimary, a.theme)
+                    )
+            colorPrimaryDark =
+                    sharedPref.getInt(
+                            "color_primary_dark",
+                            a.resources.getColor(R.color.colorPrimaryDark, a.theme)
+                    )
+            colorAccent =
+                    sharedPref.getInt(
+                            "color_accent",
+                            a.resources.getColor(R.color.colorAccent, a.theme)
+                    )
+            colorAccentDark =
+                    sharedPref.getInt(
+                            "color_accent_dark",
+                            a.resources.getColor(R.color.colorAccentDark, a.theme)
+                    )
+        } else {
+            colorPrimary =
+                    sharedPref.getInt(
+                            "color_primary",
+                            a.resources.getColor(R.color.colorPrimary)
+                    )
+            colorPrimaryDark =
+                    sharedPref.getInt(
+                            "color_primary_dark",
+                            a.resources.getColor(R.color.colorPrimaryDark)
+                    )
+            colorAccent =
+                    sharedPref.getInt(
+                            "color_accent",
+                            a.resources.getColor(R.color.colorAccent)
+                    )
+            colorAccentDark =
+                    sharedPref.getInt(
+                            "color_accent_dark",
+                            a.resources.getColor(R.color.colorAccentDark)
+                    )
+        }
         isDarkTheme =
                 sharedPref.getBoolean(
                     "dark_theme",
@@ -59,13 +80,13 @@ class AppColors(a: Activity) {
         }
 
         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")
+        val method = wrapper.getMethod("getThemeResId")
         method.isAccessible = true
 
         val typedCardBackground = TypedValue()

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

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

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

@@ -22,7 +22,7 @@ fun String.toTextDrawableString(c: Context): String {
 fun Item.sourceAndDateText(): String {
     val formattedDate: String = try {
         " " + DateUtils.getRelativeTimeSpanString(
-            SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(this.datetime).time,
+            SimpleDateFormat(Config.dateTimeFormatter).parse(this.datetime).time,
             Date().time,
             DateUtils.MINUTE_IN_MILLIS,
             DateUtils.FORMAT_ABBREV_RELATIVE

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
@@ -20,17 +21,23 @@ import apps.amine.bou.readerforselfoss.ReaderActivity
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
 fun Context.buildCustomTabsIntent(): CustomTabsIntent {
 
     val actionIntent = Intent(Intent.ACTION_SEND)
     actionIntent.type = "text/plain"
-    val 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()
 
@@ -74,6 +81,7 @@ fun Context.openItemUrlInternally(
 ) {
     if (articleViewer) {
         ReaderActivity.allItems = allItems
+        SharedItems.position = currentItem
         val intent = Intent(this, ReaderActivity::class.java)
         intent.putExtra("currentItem", currentItem)
         app.startActivity(intent)
@@ -137,13 +145,13 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
 }
 
 fun String.isUrlValid(): Boolean =
-    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
+    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
 
 fun String.isBaseUrlValid(ctx: Context): Boolean {
-    val baseUrl = HttpUrl.parse(this)
+    val baseUrl = this.toHttpUrlOrNull()
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {
-        val pathSegments = baseUrl.pathSegments()
+        val pathSegments = baseUrl.pathSegments
         existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
     }
 

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

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

app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnection.java

@@ -13,7 +13,7 @@ import java.lang.ref.WeakReference;
  */
 public class ServiceConnection extends CustomTabsServiceConnection {
     // A weak reference to the ServiceConnectionCallback to avoid leaking it.
-    private WeakReference<ServiceConnectionCallback> mConnectionCallback;
+    private final WeakReference<ServiceConnectionCallback> mConnectionCallback;
 
     public ServiceConnection(ServiceConnectionCallback connectionCallback) {
         mConnectionCallback = new WeakReference<>(connectionCallback);

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

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

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

@@ -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_baseline_white_eye_24dp.xml

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

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

@@ -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="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM8.5,15L7.3,15l-2.55,-3.5L4.75,15L3.5,15L3.5,9h1.25l2.5,3.5L7.25,9L8.5,9v6zM13.5,10.26L11,10.26v1.12h2.5v1.26L11,12.64v1.11h2.5L13.5,15h-4L9.5,9h4v1.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1L14.5,9h1.25v4.51h1.13L16.88,9.99h1.25v3.51h1.12L19.25,9h1.25v5z"/>
-</vector>

app/src/main/res/drawable/ic_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/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_sources.xml

@@ -31,8 +31,8 @@
         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"

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

@@ -92,20 +92,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 +123,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 +140,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

@@ -94,13 +94,13 @@
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom|right"
+            android:layout_gravity="end|bottom|end"
             android:layout_marginBottom="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
             android:paddingBottom="@dimen/activity_vertical_margin"
             android:paddingTop="@dimen/activity_vertical_margin"
-            android:src="@drawable/ic_add_white_24dp"
+            app:srcCompat="@drawable/ic_add_white_24dp"
             app:backgroundTint="?attr/colorAccent"
             app:fabSize="mini"
             app:rippleColor="?attr/colorAccentDark" />

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/menu/reader_toolbar.xml

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

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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Els articles no es guardaran a la memòria del dispositiu i l\'aplicació no es podrà utilitzar sense connexió.</string>
     <string name="pref_switch_items_caching_on">Els articles es guardaran a la memòria del dispositiu i es podran utilitzar sense connexió.</string>
     <string name="pref_switch_items_caching">Guarda els elements per utilitzar-los sense connexió</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="no_network_connectivity">Sense connexió!</string>
     <string name="pref_switch_periodic_refresh">Sincronitza els articles</string>
     <string name="pref_switch_periodic_refresh_off">Els articles no se sincronitzaran en segon pla</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Nicht verbunden !</string>
     <string name="pref_switch_periodic_refresh">Synchronisiere Artikel</string>
     <string name="pref_switch_periodic_refresh_off">Artikel werden nicht im Hintergrund synchronisiert</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Los artículos no se guardarán en la memoria del dispositivo y la aplicación no se podrá utilizar sin conexión.</string>
     <string name="pref_switch_items_caching_on">Los artículos se guardarán en la memoria del dispositivo y se utilizarán para el uso sin conexión.</string>
     <string name="pref_switch_items_caching">Guardar elementos para uso sin 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="no_network_connectivity">Sin conexión!</string>
     <string name="pref_switch_periodic_refresh">Sincronizar artículos</string>
     <string name="pref_switch_periodic_refresh_off">Los artículos no se sincronizarán en segundo plano</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Les articles ne seront pas enregistrés et l\'application ne sera pas utilisable hors ligne.</string>
     <string name="pref_switch_items_caching_on">Les articles seront enregistrés et l\'application sera utilisable hors ligne.</string>
     <string name="pref_switch_items_caching">Sauvegarder les articles pour une utilisation hors ligne</string>
+    <string name="pref_switch_update_sources">Vérifier les nouvelles sources et tags</string>
+    <string name="pref_switch_update_sources_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>
@@ -160,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

@@ -139,6 +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="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>
@@ -160,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">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-in-rID/strings.xml

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">文章不会被保存到设备内存，应用程序在离线时将无法阅读它们</string>
     <string name="pref_switch_items_caching_on">文章将被保存到设备内存并可在离线时使用</string>
     <string name="pref_switch_items_caching">保存项目以便离线使用</string>
+    <string name="pref_switch_update_sources">检查新来源和标签</string>
+    <string name="pref_switch_update_sources_summary">如果你的服务器接收过多的数据库查询，请禁用此功能。</string>
     <string name="no_network_connectivity">未连接！</string>
     <string name="pref_switch_periodic_refresh">同步文章</string>
     <string name="pref_switch_periodic_refresh_off">文章将不会在后台同步</string>
@@ -160,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">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-rTW/strings.xml

@@ -139,6 +139,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -160,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/colors.xml

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

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

@@ -140,6 +140,8 @@
     <string name="pref_switch_items_caching_off">Articles won\'t be saved to the device memory, and the app won\'t be usable offline.</string>
     <string name="pref_switch_items_caching_on">Articles will be saved to the device memory and will be used for offline use.</string>
     <string name="pref_switch_items_caching">Save items for offline use</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="no_network_connectivity">Not connected !</string>
     <string name="pref_switch_periodic_refresh">Sync articles</string>
     <string name="pref_switch_periodic_refresh_off">Articles will not be synced in the background</string>
@@ -163,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

@@ -4,30 +4,34 @@
         <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/Widget.MaterialDrawerStyle</item>
+        <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</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="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="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
         <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
 
@@ -35,7 +39,6 @@
     <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>-->

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

@@ -41,6 +41,13 @@
         android:summaryOff="@string/prefer_article_viewer_off"
         android:summaryOn="@string/prefer_article_viewer_on"
         android:title="@string/prefer_article_viewer_title" />
+    <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" />
 
     <PreferenceCategory
         android:title="@string/pref_general_category_displaying">

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

@@ -34,4 +34,10 @@
         android:key="notify_new_items"
         android:dependency="periodic_refresh"
         android:title="@string/pref_switch_notify_new_items" />
+
+    <SwitchPreference
+        android:defaultValue="true"
+        android:key="update_sources"
+        android:summary="@string/pref_switch_update_sources_summary"
+        android:title="@string/pref_switch_update_sources" />
 </PreferenceScreen>

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.4.21'
+        kotlin_version = '1.5.31'
         android_version = '1.0.0'
         androidx_version = '1.1.0-alpha05'
         lifecycle_version = '2.2.0-alpha01'
@@ -17,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -37,14 +37,4 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-project.ext.preDexLibs = !project.hasProperty('disablePreDex')
-
-subprojects {
-    project.plugins.whenPluginAdded { plugin ->
-        if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
-            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
-        } else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
-            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
-        }
-    }
-}
+project.ext.preDexLibs = !project.hasProperty('disablePreDex')

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,13 @@
+A new RSS reader for <a href="http://selfoss.aditu.de/">selfoss</a>.
+
+What it does:
+
+<ul>
+  <li>Fetches read, unread, and favorite feeds.</li>
+  <li>Marking as read, marking as favorite.</li>
+  <li>Manage selfoss sources from the app.</li>
+  <li>Add an RSS feed from within the app, or by sharing a link from your browser.</li>
+  <li>Choose between multiple light and dark themes.</li>
+</ul>
+
+PS: It only works with Selfoss

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1,3 @@
+A new RSS reader for <a href="http://selfoss.aditu.de/">selfoss</a>.
+
+It connects to your selfoss instance (works only with selfoss, and can't work without it), and you'll be able to read and manage all your RSS feeds.

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+Reader for Selfoss

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

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