Updated to androidx.

Fixes #221
erge branch 'master' of github.com:aminecmi/ReaderforSelfoss
2018-09-24 22:12:44 +02:00 · 2018-09-21 21:39:37 +02:00 · 2018-09-15 16:26:22 +02:00 · 2018-09-15 16:24:29 +02:00 · 2018-09-12 13:16:07 +02:00 · 2018-09-10 20:29:22 +02:00
88 changed files with 442 additions and 389 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,6 +16,8 @@

 - Versions updates.

+- Fixes #215, #208.
+
 **1.5.7.x**

 - Added confirmation to the mark as read and update menues.
--- a/app/build.gradle
+++ b/app/build.gradle
@ -36,11 +36,11 @@ android {
        targetCompatibility JavaVersion.VERSION_1_8
    }
    compileSdkVersion 28
-    buildToolsVersion '28.0.1'
+    buildToolsVersion '28.0.2'
    defaultConfig {
        applicationId "apps.amine.bou.readerforselfoss"
        minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
        versionCode versionCodeFromGit()
        versionName versionNameFromGit()

@ -53,7 +53,7 @@ android {
        vectorDrawables.useSupportLibrary = true

        // tests
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
        release {
@ -66,6 +66,7 @@ android {
            buildConfigField "String", "LOGIN_URL", appLoginUrl
            buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
            buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
+            applicationIdSuffix ".dev"
        }
    }
    flavorDimensions "build"
@ -84,26 +85,26 @@ android {

 dependencies {
    // Testing
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
    // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
-    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-alpha4'
    // Espresso-intents for validation and stubbing of Intents
-    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-alpha4'
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
    // Android Support
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:support-vector-drawable:27.1.1'
-    implementation 'com.android.support:customtabs:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.0.0'
+    implementation 'androidx.browser:browser:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'

    //multidex
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.0'

    // Intro
    implementation 'agency.tango.android:material-intro-screen:0.0.5'
@ -132,7 +133,7 @@ dependencies {
    implementation 'com.github.stkent:amplify:2.1.0'

    // Drawer
-    implementation 'co.zsmb:materialdrawer-kt:1.3.5'
+    implementation 'co.zsmb:materialdrawer-kt:2.0.0'
    implementation 'com.anupcowkur:reservoir:3.1.0'

    // Themes
@ -143,11 +144,11 @@ dependencies {
    // Pager
    implementation 'me.relex:circleindicator:1.2.2@aar'

-    implementation 'androidx.core:core-ktx:0.3'
+    implementation 'androidx.core:core-ktx:1.0.0'

    // Crash
-    implementation 'ch.acra:acra-http:5.1.3'
-    implementation 'ch.acra:acra-dialog:5.1.3'
+    implementation 'ch.acra:acra-http:5.2.0'
+    implementation 'ch.acra:acra-dialog:5.2.0'
 }


--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -75,4 +75,4 @@

 -dontwarn javax.annotation.**

-keep class android.support.v7.widget.SearchView { *; }
+-keep class androidx.appcompat.widget.SearchView { *; }
--- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt
+++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt
@ -2,27 +2,24 @@ package apps.amine.bou.readerforselfoss

 import android.content.Context
 import android.content.Intent
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.closeSoftKeyboard
-import android.support.test.espresso.action.ViewActions.pressBack
-import android.support.test.espresso.action.ViewActions.pressKey
-import android.support.test.espresso.action.ViewActions.typeText
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.contrib.DrawerActions
-import android.support.test.espresso.intent.Intents
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.Intents.times
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.isRoot
-import android.support.test.espresso.matcher.ViewMatchers.withContentDescription
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.pressKey
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.times
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
 import android.view.KeyEvent
 import apps.amine.bou.readerforselfoss.utils.Config
 import org.junit.After
--- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/IntroActivityEspressoTest.kt
+++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/IntroActivityEspressoTest.kt
@ -2,19 +2,19 @@ package apps.amine.bou.readerforselfoss

 import android.content.Context
 import android.content.Intent
-import android.support.test.InstrumentationRegistry.getInstrumentation
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.intent.Intents
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.Intents.times
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry.getInstrumentation
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.times
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
 import apps.amine.bou.readerforselfoss.utils.Config
 import org.junit.After
 import org.junit.Before
--- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt
+++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt
@ -2,25 +2,25 @@ package apps.amine.bou.readerforselfoss

 import android.content.Context
 import android.content.Intent
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.closeSoftKeyboard
-import android.support.test.espresso.action.ViewActions.pressBack
-import android.support.test.espresso.action.ViewActions.typeText
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.intent.Intents
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.Intents.times
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import android.support.test.espresso.matcher.ViewMatchers
-import android.support.test.espresso.matcher.ViewMatchers.isRoot
-import android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.pressBack
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.times
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
 import apps.amine.bou.readerforselfoss.utils.Config
 import com.mikepenz.aboutlibraries.ui.LibsActivity
 import org.junit.After
--- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt
+++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt
@ -3,13 +3,13 @@ package apps.amine.bou.readerforselfoss
 import android.content.Intent
 import android.content.SharedPreferences
 import android.preference.PreferenceManager
-import android.support.test.InstrumentationRegistry.getInstrumentation
-import android.support.test.espresso.intent.Intents
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.Intents.times
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry.getInstrumentation
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.times
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
 import org.junit.After

 import org.junit.Before
--- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt
+++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt
@ -1,7 +1,7 @@
 package apps.amine.bou.readerforselfoss

-import android.support.design.widget.TextInputLayout
-import android.support.test.espresso.matcher.ViewMatchers
+import com.google.android.material.textfield.TextInputLayout
+import androidx.test.espresso.matcher.ViewMatchers
 import android.view.View
 import org.hamcrest.Description
 import org.hamcrest.Matcher
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
@ -4,8 +4,8 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.constraint.ConstraintLayout
-import android.support.v7.app.AppCompatActivity
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.appcompat.app.AppCompatActivity
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@ -22,13 +22,12 @@ 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 androidx.appcompat.widget.Toolbar
+import kotlinx.android.synthetic.main.activity_add_source.*

 class AddSourceActivity : AppCompatActivity() {

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@ -9,16 +9,15 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.v4.view.MenuItemCompat
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.SearchView
-import android.support.v7.widget.StaggeredGridLayoutManager
-import android.support.v7.widget.helper.ItemTouchHelper
-import android.util.Log
+import androidx.core.view.MenuItemCompat
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.appcompat.widget.SearchView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import androidx.recyclerview.widget.ItemTouchHelper
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@ -42,7 +41,6 @@ import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.drawer.CustomUrlPrimaryDrawerItem
 import apps.amine.bou.readerforselfoss.utils.flattenTags
 import apps.amine.bou.readerforselfoss.utils.longHash
-import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 import co.zsmb.materialdrawerkt.builders.accountHeader
 import co.zsmb.materialdrawerkt.builders.drawer
 import co.zsmb.materialdrawerkt.builders.footer
@ -66,7 +64,6 @@ import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
 import kotlinx.android.synthetic.main.activity_home.*
-import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@ -177,13 +174,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
            alertDialog.setButton(
                AlertDialog.BUTTON_NEUTRAL,
-                "OK",
-                { dialog, _ ->
-                    sharedEditor.putBoolean("GDPR_shown", true)
-                    sharedEditor.commit()
-                    dialog.dismiss()
-                }
-            )
+                "OK"
+            ) { dialog, _ ->
+                sharedEditor.putBoolean("GDPR_shown", true)
+                sharedEditor.commit()
+                dialog.dismiss()
+            }
            alertDialog.show()
        }

@ -212,8 +208,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
            ) {
                override fun getSwipeDirs(
-                    recyclerView: RecyclerView?,
-                    viewHolder: RecyclerView.ViewHolder?
+                    recyclerView: RecyclerView,
+                    viewHolder: RecyclerView.ViewHolder
                ): Int =
                    if (elementsShown != UNREAD_SHOWN) {
                        0
@ -242,44 +238,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            is ItemListAdapter -> adapter.removeItemAtIndex(position)
                        }

-                        if (items.size > 0) {
-                            badgeNew--
-                            reloadBadgeContent()
+                        badgeNew--
+                        reloadBadgeContent()

-                            val tagHashes = i.tags.split(",").map { it.longHash() }
-                            tagsBadge = tagsBadge.map {
-                                if (tagHashes.contains(it.key)) {
-                                    (it.key to (it.value - 1))
-                                } else {
-                                    (it.key to it.value)
-                                }
-                            }.toMap()
-                            reloadTagsBadges()
-                        } else {
-                            tabNewBadge.hide()
-                        }
-
-                        val manager = recyclerView.layoutManager
-                        val lastVisibleItem: Int = when (manager) {
-                            is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
-                                null
-                            ).last()
-                            is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
-                            else -> 0
-                        }
-
-                        Log.e("TAGTAG", "$lastVisibleItem === ${items.size} && ${items.size} <= ${maxItemNumber()} && ${!lastFetchDone}x")
-                        if (lastVisibleItem === items.size &&
-                            items.size <= maxItemNumber() &&
-                            !lastFetchDone
-                        ) {
-                            if (maxItemNumber() <= itemsNumber) {
-                                lastFetchDone = true
+                        val tagHashes = i.tags.split(",").map { it.longHash() }
+                        tagsBadge = tagsBadge.map {
+                            if (tagHashes.contains(it.key)) {
+                                (it.key to (it.value - 1))
+                            } else {
+                                (it.key to it.value)
                            }
-                            getElementsAccordingToTab(
-                                appendResults = true,
-                                offsetOverride = lastVisibleItem
-                            )
+                        }.toMap()
+                        reloadTagsBadges()
+
+                        // Just load everythin
+                        if (items.size <= 0) {
+                            getElementsAccordingToTab()
                        }
                    } else {
                        Toast.makeText(
@ -832,8 +806,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private fun handleInfiniteScroll() {
        if (recyclerViewScrollListener == null) {
            recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
-                override fun onScrolled(localRecycler: RecyclerView?, dx: Int, dy: Int) {
-                    if (localRecycler != null && dy > 0) {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    if (recyclerView != null && dy > 0) {
                        val manager = recyclerView.layoutManager
                        val lastVisibleItem: Int = when (manager) {
                            is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
@ -852,7 +826,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
        }

        recyclerView.clearOnScrollListeners()
-        recyclerView.addOnScrollListener(recyclerViewScrollListener)
+        if (recyclerViewScrollListener != null) {
+            recyclerView.addOnScrollListener(recyclerViewScrollListener!!)
+        }
    }

    private fun mayBeEmpty() =
@ -1012,11 +988,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            fullHeightCards,
                            appColors,
                            debugReadingItems,
-                            userIdentifier,
-                            {
-                                updateItems(it)
-                            }
-                        )
+                            userIdentifier
+                        ) {
+                            updateItems(it)
+                        }
            } else {
                recyclerAdapter =
                        ItemListAdapter(
@ -1029,11 +1004,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            articleViewer,
                            debugReadingItems,
                            userIdentifier,
-                            appColors,
-                            {
-                                updateItems(it)
-                            }
-                        )
+                            appColors
+                        ) {
+                            updateItems(it)
+                        }

                recyclerView.addItemDecoration(
                    DividerItemDecoration(
@ -1161,7 +1135,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    override fun onOptionsItemSelected(item: MenuItem): Boolean {
        when (item.itemId) {
            R.id.refresh -> {
-                needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message, {
+                needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                    api.update().enqueue(object : Callback<String> {
                        override fun onResponse(
                            call: Call<String>,
@ -1183,12 +1157,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        }
                    })
                    Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
-                })
+                }
                return true
            }
            R.id.readAll -> {
                if (elementsShown == UNREAD_SHOWN) {
-                    needsConfirmation(R.string.readAll, R.string.markall_dialog_message, {
+                    needsConfirmation(R.string.readAll, R.string.markall_dialog_message) {
                        swipeRefreshLayout.isRefreshing = false
                        val ids = allItems.map { it.id }
                        val itemsByTag: Map<Long, Int> =
@ -1238,7 +1212,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                                )
                                            )
                                        }
-
                                    }

                                    swipeRefreshLayout.isRefreshing = false
@ -1268,7 +1241,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                            ).show()
                        }
                        handleListResult()
-                    })
+                    }
                }
                return true
            }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt
@ -7,8 +7,8 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.v7.app.AppCompatDelegate
 import android.view.View
+import androidx.appcompat.app.AppCompatDelegate

 class IntroActivity : MaterialIntroActivity() {

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
@ -6,8 +6,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
@ -112,9 +112,8 @@ class LoginActivity : AppCompatActivity() {
            alertDialog.setMessage(getString(R.string.base_url_error))
            alertDialog.setButton(
                AlertDialog.BUTTON_NEUTRAL,
-                "OK",
-                { dialog, _ -> dialog.dismiss() }
-            )
+                "OK"
+            ) { dialog, _ -> dialog.dismiss() }
            alertDialog.show()
        }
    }
@ -155,9 +154,8 @@ class LoginActivity : AppCompatActivity() {
                alertDialog.setMessage(getString(R.string.text_wrong_url))
                alertDialog.setButton(
                    AlertDialog.BUTTON_NEUTRAL,
-                    "OK",
-                    { dialog, _ -> dialog.dismiss() }
-                )
+                    "OK"
+                ) { dialog, _ -> dialog.dismiss() }
                alertDialog.show()
                inValidCount = 0
            }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/MainActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MainActivity.kt
@ -3,7 +3,7 @@ package apps.amine.bou.readerforselfoss
 import android.content.Intent
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity

 class MainActivity : AppCompatActivity() {

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
@ -5,8 +5,8 @@ import android.content.SharedPreferences
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.preference.PreferenceManager
-import android.support.multidex.MultiDexApplication
 import android.widget.ImageView
+import androidx.multidex.MultiDexApplication
 import apps.amine.bou.readerforselfoss.utils.Config
 import com.anupcowkur.reservoir.Reservoir
 import com.bumptech.glide.Glide
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
@ -1,16 +1,14 @@
 package apps.amine.bou.readerforselfoss

-import android.content.Context
-import android.content.res.Resources
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentStatePagerAdapter
-import android.support.v4.content.ContextCompat
-import android.support.v4.view.ViewPager
-import android.support.v7.app.AppCompatActivity
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.core.content.ContextCompat
+import androidx.viewpager.widget.ViewPager
+import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import android.view.ViewGroup
@ -22,7 +20,6 @@ import apps.amine.bou.readerforselfoss.fragments.ArticleFragment
 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.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.succeeded
 import apps.amine.bou.readerforselfoss.utils.toggleStar
@ -73,26 +70,27 @@ class ReaderActivity : AppCompatActivity() {
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)

-        val settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        val sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
+        val prefs = PreferenceManager.getDefaultSharedPreferences(this)

-        debugReadingItems = sharedPref.getBoolean("read_debug", false)
-        userIdentifier = sharedPref.getString("unique_id", "")
-        markOnScroll = sharedPref.getBoolean("mark_on_scroll", false)
+        debugReadingItems = prefs.getBoolean("read_debug", false)
+        userIdentifier = prefs.getString("unique_id", "")
+        markOnScroll = prefs.getBoolean("mark_on_scroll", false)
+
+        api = SelfossApi(
+            this,
+            this@ReaderActivity,
+            prefs.getBoolean("isSelfSignedCert", false),
+            prefs.getBoolean("should_log_everything", false)
+        )

        if (allItems.isEmpty()) {
            finish()
        }

-        api = SelfossApi(
-            this,
-            this@ReaderActivity,
-            settings.getBoolean("isSelfSignedCert", false),
-            sharedPref.getBoolean("should_log_everything", false)
-        )
-
        currentItem = intent.getIntExtra("currentItem", 0)

+        readItem(allItems[currentItem].id)
+
        pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
        pager.currentItem = currentItem
    }
@ -100,62 +98,67 @@ class ReaderActivity : AppCompatActivity() {
    override fun onResume() {
        super.onResume()

-        (pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
+        notifyAdapter()

        pager.setPageTransformer(true, DepthPageTransformer())
-        (indicator as CircleIndicator).setViewPager(pager)
+        // TODO: add back the page indicator
+        // (indicator as CircleIndicator).setViewPager(pager as android.support.v4.view.ViewPager)

        pager.addOnPageChangeListener(
            object : ViewPager.SimpleOnPageChangeListener() {
-                var isLastItem = false

                override fun onPageSelected(position: Int) {
-                    isLastItem = (position === (allItems.size - 1))

                    if (allItems[position].starred) {
                        canRemoveFromFavorite()
                    } else {
                        canFavorite()
                    }
-                }
-
-                override fun onPageScrollStateChanged(state: Int) {
-                    if (markOnScroll && (state === ViewPager.SCROLL_STATE_DRAGGING || (state === ViewPager.SCROLL_STATE_IDLE && isLastItem))) {
-                        api.markItem(allItems[pager.currentItem].id).enqueue(
-                            object : Callback<SuccessResponse> {
-                                override fun onResponse(
-                                    call: Call<SuccessResponse>,
-                                    response: Response<SuccessResponse>
-                                ) {
-                                    if (!response.succeeded() && debugReadingItems) {
-                                        val message =
-                                            "message: ${response.message()} " +
-                                                    "response isSuccess: ${response.isSuccessful} " +
-                                                    "response code: ${response.code()} " +
-                                                    "response message: ${response.message()} " +
-                                                    "response errorBody: ${response.errorBody()?.string()} " +
-                                                    "body success: ${response.body()?.success} " +
-                                                    "body isSuccess: ${response.body()?.isSuccess}"
-                                        ACRA.getErrorReporter().maybeHandleSilentException(Exception(message), this@ReaderActivity)
-                                    }
-                                }
-
-                                override fun onFailure(
-                                    call: Call<SuccessResponse>,
-                                    t: Throwable
-                                ) {
-                                    if (debugReadingItems) {
-                                        ACRA.getErrorReporter().maybeHandleSilentException(t, this@ReaderActivity)
-                                    }
-                                }
-                            }
-                        )
-                    }
+                    readItem(allItems[pager.currentItem].id)
                }
            }
        )
    }

+    fun readItem(id: String) {
+        if (markOnScroll) {
+            api.markItem(id).enqueue(
+                object : Callback<SuccessResponse> {
+                    override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                    ) {
+                        if (!response.succeeded() && debugReadingItems) {
+                            val message =
+                                "message: ${response.message()} " +
+                                        "response isSuccess: ${response.isSuccessful} " +
+                                        "response code: ${response.code()} " +
+                                        "response message: ${response.message()} " +
+                                        "response errorBody: ${response.errorBody()?.string()} " +
+                                        "body success: ${response.body()?.success} " +
+                                        "body isSuccess: ${response.body()?.isSuccess}"
+                            ACRA.getErrorReporter()
+                                .maybeHandleSilentException(Exception(message), this@ReaderActivity)
+                        }
+                    }
+
+                    override fun onFailure(
+                        call: Call<SuccessResponse>,
+                        t: Throwable
+                    ) {
+                        if (debugReadingItems) {
+                            ACRA.getErrorReporter().maybeHandleSilentException(t, this@ReaderActivity)
+                        }
+                    }
+                }
+            )
+        }
+    }
+
+    private fun notifyAdapter() {
+        (pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
+    }
+
    override fun onPause() {
        super.onPause()
        if (markOnScroll) {
@ -215,6 +218,7 @@ class ReaderActivity : AppCompatActivity() {
                            response: Response<SuccessResponse>
                        ) {
                            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+                            notifyAdapter()
                            canRemoveFromFavorite()
                        }

@ -238,6 +242,7 @@ class ReaderActivity : AppCompatActivity() {
                            response: Response<SuccessResponse>
                        ) {
                            allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+                            notifyAdapter()
                            canFavorite()
                        }

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@ -5,9 +5,9 @@ import android.content.res.ColorStateList
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
+import androidx.appcompat.app.AppCompatActivity
 import android.widget.Toast
+import androidx.recyclerview.widget.LinearLayoutManager
 import apps.amine.bou.readerforselfoss.adapters.SourcesListAdapter
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Sources
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.adapters

 import android.app.Activity
 import android.content.Context
-import android.support.v7.widget.CardView
-import android.support.v7.widget.RecyclerView
+import androidx.cardview.widget.CardView
+import androidx.recyclerview.widget.RecyclerView
 import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt
@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.adapters

 import android.app.Activity
 import android.content.Context
-import android.support.constraint.ConstraintLayout
-import android.support.v7.widget.RecyclerView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.RecyclerView
 import android.text.Html
 import android.util.TypedValue
 import android.view.LayoutInflater
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt
@ -2,8 +2,7 @@ package apps.amine.bou.readerforselfoss.adapters

 import android.app.Activity
 import android.graphics.Color
-import android.support.design.widget.Snackbar
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.widget.TextView
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
@ -13,6 +12,7 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 import apps.amine.bou.readerforselfoss.utils.succeeded
+import com.google.android.material.snackbar.Snackbar
 import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
@ -62,7 +62,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
            }

        val view = s.view
-        val tv: TextView = view.findViewById(android.support.design.R.id.snackbar_text)
+        val tv: TextView = view.findViewById(com.google.android.material.R.id.snackbar_text)
        tv.setTextColor(Color.WHITE)
        s.show()
    }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt
@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.adapters

 import android.app.Activity
 import android.content.Context
-import android.support.constraint.ConstraintLayout
-import android.support.v7.widget.RecyclerView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Button
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
@ -1,5 +1,6 @@
 package apps.amine.bou.readerforselfoss.fragments

+import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
@ -8,12 +9,12 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.customtabs.CustomTabsIntent
-import android.support.design.widget.FloatingActionButton
-import android.support.v4.app.Fragment
-import android.support.v4.content.ContextCompat
-import android.support.v4.widget.NestedScrollView
-import android.support.v7.app.AlertDialog
+import androidx.browser.customtabs.CustomTabsIntent
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import androidx.fragment.app.Fragment
+import androidx.core.content.ContextCompat
+import androidx.core.widget.NestedScrollView
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@ -23,6 +24,8 @@ import apps.amine.bou.readerforselfoss.R
 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.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
@ -32,6 +35,7 @@ import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
 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 apps.amine.bou.readerforselfoss.utils.toPx
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
@ -90,6 +94,21 @@ class ArticleFragment : Fragment() {
        contentImage = allItems[pageNumber.toInt()].getThumbnail(activity!!)
        contentSource = allItems[pageNumber.toInt()].sourceAndDateText()

+        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
+        editor = prefs.edit()
+        fontSize = prefs.getString("reader_font_size", "14").toInt()
+        showMalformedUrl = prefs.getBoolean("show_error_malformed_url", true)
+
+        val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        val debugReadingItems = prefs.getBoolean("read_debug", false)
+
+        val api = SelfossApi(
+            context!!,
+            activity!!,
+            settings.getBoolean("isSelfSignedCert", false),
+            prefs.getBoolean("should_log_everything", false)
+        )
+
        fab = rootView.fab

        fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
@ -105,11 +124,6 @@ class ArticleFragment : Fragment() {
        mCustomTabActivityHelper = CustomTabActivityHelper()
        mCustomTabActivityHelper.bindCustomTabsService(activity)

-        val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
-        editor = prefs.edit()
-        fontSize = prefs.getString("reader_font_size", "14").toInt()
-        showMalformedUrl = prefs.getBoolean("show_error_malformed_url", true)
-

        floatingToolbar.setClickListener(
            object : FloatingToolbar.ItemClickListener {
@ -126,6 +140,35 @@ class ArticleFragment : Fragment() {
                            false,
                            activity!!
                        )
+                        R.id.unread_action -> api.unmarkItem(allItems[pageNumber.toInt()].id).enqueue(
+                            object : Callback<SuccessResponse> {
+                                override fun onResponse(
+                                    call: Call<SuccessResponse>,
+                                    response: Response<SuccessResponse>
+                                ) {
+                                    if (!response.succeeded() && debugReadingItems) {
+                                        val message =
+                                            "message: ${response.message()} " +
+                                                    "response isSuccess: ${response.isSuccessful} " +
+                                                    "response code: ${response.code()} " +
+                                                    "response message: ${response.message()} " +
+                                                    "response errorBody: ${response.errorBody()?.string()} " +
+                                                    "body success: ${response.body()?.success} " +
+                                                    "body isSuccess: ${response.body()?.isSuccess}"
+                                        ACRA.getErrorReporter().maybeHandleSilentException(Exception(message), activity!!)
+                                    }
+                                }
+
+                                override fun onFailure(
+                                    call: Call<SuccessResponse>,
+                                    t: Throwable
+                                ) {
+                                    if (debugReadingItems) {
+                                        ACRA.getErrorReporter().maybeHandleSilentException(t, activity!!)
+                                    }
+                                }
+                            }
+                        )
                        else -> Unit
                    }
                }
@ -325,36 +368,33 @@ class ArticleFragment : Fragment() {
                alertDialog.setMessage("You are encountering a bug that I can't solve. Can you please contact me to solve the issue, please ?")
                alertDialog.setButton(
                    AlertDialog.BUTTON_POSITIVE,
-                    "Send mail",
-                    { dialog, _ ->
+                    "Send mail"
+                ) { dialog, _ ->

-                        // This won't be translated because it should only be temporary.
-                        val to = Config.feedbackEmail
-                        val subject= "[ReaderForSelfoss MalformedURLException]"
-                        val body= "Please specify the source, item and spout you are using for the url below : \n ${e.message}"
-                        val mailTo = "mailto:" + to + "?&subject=" + Uri.encode(subject) + "&body=" + Uri.encode(body)
+                    // This won't be translated because it should only be temporary.
+                    val to = Config.feedbackEmail
+                    val subject= "[ReaderForSelfoss MalformedURLException]"
+                    val body= "Please specify the source, item and spout you are using for the url below : \n ${e.message}"
+                    val mailTo = "mailto:" + to + "?&subject=" + Uri.encode(subject) + "&body=" + Uri.encode(body)

-                        val emailIntent = Intent(Intent.ACTION_VIEW)
-                        emailIntent.data = Uri.parse(mailTo)
-                        startActivity(emailIntent)
+                    val emailIntent = Intent(Intent.ACTION_VIEW)
+                    emailIntent.data = Uri.parse(mailTo)
+                    startActivity(emailIntent)

-                        dialog.dismiss()
-                    }
-                )
+                    dialog.dismiss()
+                }
                alertDialog.setButton(
                    AlertDialog.BUTTON_NEUTRAL,
-                    "Not now",
-                    { dialog, _ -> dialog.dismiss() }
-                )
+                    "Not now"
+                ) { dialog, _ -> dialog.dismiss() }
                alertDialog.setButton(
                    AlertDialog.BUTTON_NEGATIVE,
-                    "Don't show anymore.",
-                    { dialog, _ ->
-                        editor.putBoolean("show_error_malformed_url", false)
-                        editor.apply()
-                        dialog.dismiss()
-                    }
-                )
+                    "Don't show anymore."
+                ) { dialog, _ ->
+                    editor.putBoolean("show_error_malformed_url", false)
+                    editor.apply()
+                    dialog.dismiss()
+                }
                alertDialog.show()
            }
        }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/AppCompatPreferenceActivity.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/AppCompatPreferenceActivity.java
@ -4,13 +4,12 @@ import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.View;
@ -18,6 +17,7 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;

 import com.ftinc.scoop.Scoop;
+import com.google.android.material.appbar.AppBarLayout;

 import apps.amine.bou.readerforselfoss.R;
 import apps.amine.bou.readerforselfoss.themes.AppColors;
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
@ -19,7 +19,7 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.SwitchPreference;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Spanned;
@ -31,7 +31,6 @@ import android.widget.Toast;

 import java.util.List;

-import apps.amine.bou.readerforselfoss.BuildConfig;
 import apps.amine.bou.readerforselfoss.R;
 import apps.amine.bou.readerforselfoss.themes.AppColors;
 import apps.amine.bou.readerforselfoss.utils.Config;
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt
@ -3,12 +3,9 @@ package apps.amine.bou.readerforselfoss.themes
 import android.app.Activity
 import android.content.Context
 import android.preference.PreferenceManager
-import android.support.annotation.ColorInt
-import android.support.v7.view.ContextThemeWrapper
 import android.util.TypedValue
+import androidx.annotation.ColorInt
 import apps.amine.bou.readerforselfoss.R
-import android.view.LayoutInflater
-import android.view.ViewGroup

 class AppColors(a: Activity) {

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/transformers/DepthPageTransformer.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/transformers/DepthPageTransformer.kt
@ -1,6 +1,6 @@
 package apps.amine.bou.readerforselfoss.transformers

-import android.support.v4.view.ViewPager
+import androidx.viewpager.widget.ViewPager
 import android.view.View

 class DepthPageTransformer : ViewPager.PageTransformer {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
@ -6,7 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.net.Uri
-import android.support.customtabs.CustomTabsIntent
+import androidx.browser.customtabs.CustomTabsIntent
 import android.util.Patterns
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt
@ -1,8 +1,8 @@
 package apps.amine.bou.readerforselfoss.utils

 import android.content.Context
-import android.support.design.widget.CoordinatorLayout
-import android.support.design.widget.FloatingActionButton
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import android.util.AttributeSet
 import android.view.View

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabActivityHelper.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabActivityHelper.java
@ -4,10 +4,10 @@ package apps.amine.bou.readerforselfoss.utils.customtabs;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.customtabs.CustomTabsClient;
-import android.support.customtabs.CustomTabsIntent;
-import android.support.customtabs.CustomTabsServiceConnection;
-import android.support.customtabs.CustomTabsSession;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.browser.customtabs.CustomTabsServiceConnection;
+import androidx.browser.customtabs.CustomTabsSession;

 import java.util.List;

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabsHelper.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabsHelper.java
@ -7,7 +7,7 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
-import android.support.customtabs.CustomTabsService;
+import androidx.browser.customtabs.CustomTabsService;
 import android.text.TextUtils;
 import android.util.Log;

@ -24,7 +24,7 @@ class CustomTabsHelper {
    private static final String DEV_PACKAGE = "com.chrome.dev";
    private static final String LOCAL_PACKAGE = "com.google.android.apps.chrome";
    private static final String EXTRA_CUSTOM_TABS_KEEP_ALIVE =
-            "android.support.customtabs.extra.KEEP_ALIVE";
+            "androidx.browser.customtabs.extra.KEEP_ALIVE";

    private static String sPackageNameToUse;

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnection.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnection.java
@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.utils.customtabs;


 import android.content.ComponentName;
-import android.support.customtabs.CustomTabsClient;
-import android.support.customtabs.CustomTabsServiceConnection;
+import androidx.browser.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsServiceConnection;

 import java.lang.ref.WeakReference;

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnectionCallback.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnectionCallback.java
@ -1,7 +1,7 @@
 package apps.amine.bou.readerforselfoss.utils.customtabs;


-import android.support.customtabs.CustomTabsClient;
+import androidx.browser.customtabs.CustomTabsClient;


 public interface ServiceConnectionCallback {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt
@ -1,7 +1,7 @@
 /* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomBaseViewHolder.java */
 package apps.amine.bou.readerforselfoss.utils.drawer

-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlBasePrimaryDrawerItem.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlBasePrimaryDrawerItem.kt
@ -2,10 +2,10 @@
 package apps.amine.bou.readerforselfoss.utils.drawer

 import android.net.Uri
-import android.support.annotation.ColorInt
-import android.support.annotation.ColorRes
-import android.support.annotation.StringRes
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.annotation.StringRes
+import androidx.recyclerview.widget.RecyclerView

 import com.mikepenz.materialdrawer.holder.ColorHolder
 import com.mikepenz.materialdrawer.holder.ImageHolder
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt
@ -1,8 +1,8 @@
 /* From https://github.com/mikepenz/MaterialDrawer/blob/develop/app/src/main/java/com/mikepenz/materialdrawer/app/drawerItems/CustomUrlPrimaryDrawerItem.java */
 package apps.amine.bou.readerforselfoss.utils.drawer

-import android.support.annotation.LayoutRes
-import android.support.annotation.StringRes
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
 import android.view.View
 import android.widget.TextView
 import apps.amine.bou.readerforselfoss.R
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt
@ -2,7 +2,7 @@ package apps.amine.bou.readerforselfoss.utils.glide

 import android.content.Context
 import android.graphics.Bitmap
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
--- a/app/src/main/res/drawable-hdpi/ic_fiber_new.png
+++ b/app/src/main/res/drawable-hdpi/ic_fiber_new.png
--- a/app/src/main/res/drawable-mdpi/ic_fiber_new.png
+++ b/app/src/main/res/drawable-mdpi/ic_fiber_new.png
--- a/app/src/main/res/drawable-xhdpi/ic_fiber_new.png
+++ b/app/src/main/res/drawable-xhdpi/ic_fiber_new.png
--- a/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png
--- a/app/src/main/res/layout/activity_add_source.xml
+++ b/app/src/main/res/layout/activity_add_source.xml
@ -10,22 +10,22 @@
        android:layout_height="match_parent"
        android:orientation="vertical">

-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?attr/actionBarSize"
                app:theme="@style/ToolBarStyle"
                app:popupTheme="?attr/toolbarPopupTheme" />

-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>



-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
            android:paddingBottom="@dimen/activity_vertical_margin"
            android:paddingLeft="@dimen/activity_horizontal_margin"
            android:paddingRight="@dimen/activity_horizontal_margin"
@ -121,7 +121,7 @@
                android:layout_marginBottom="16dp"
                app:layout_constraintVertical_bias="0.0"/>

-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>

        <ProgressBar
            android:id="@+id/progress"
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@ -30,13 +30,13 @@
        app:prompt_view_background_color="?attr/colorAccent"
        app:prompt_view_thanks_display_time_ms="2000"/>

-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
        android:id="@+id/coordLayout"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_below="@id/promptView">

-        <android.support.design.widget.CoordinatorLayout
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
            android:id="@+id/intern_coordLayout"
            android:layout_width="match_parent"
            android:layout_height="match_parent">
@ -46,18 +46,18 @@
                android:layout_height="match_parent"
                android:orientation="vertical">

-                <android.support.design.widget.AppBarLayout
+                <com.google.android.material.appbar.AppBarLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content">

-                    <android.support.v7.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar
                        android:id="@+id/toolBar"
                        android:layout_width="match_parent"
                        android:layout_height="?attr/actionBarSize"
                        app:theme="@style/ToolBarStyle"
                        app:popupTheme="?attr/toolbarPopupTheme" />

-                </android.support.design.widget.AppBarLayout>
+                </com.google.android.material.appbar.AppBarLayout>

                <FrameLayout
                    android:id="@+id/drawer_layout"
@ -66,7 +66,7 @@
                    android:layout_width="match_parent"
                    android:layout_height="match_parent">

-                    <android.support.v4.widget.SwipeRefreshLayout
+                    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                        android:id="@+id/swipeRefreshLayout"
                        android:layout_width="match_parent"
                        android:layout_height="match_parent">
@ -89,7 +89,7 @@
                                android:background="@color/transparent"
                                android:visibility="gone" />

-                            <android.support.v7.widget.RecyclerView
+                            <androidx.recyclerview.widget.RecyclerView
                                android:id="@+id/recyclerView"
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
@ -100,16 +100,16 @@
                                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
                        </LinearLayout>

-                    </android.support.v4.widget.SwipeRefreshLayout>
+                    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

                </FrameLayout>
            </LinearLayout>

-        </android.support.design.widget.CoordinatorLayout>
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
        <com.ashokvarma.bottomnavigation.BottomNavigationBar
            android:layout_gravity="bottom"
            android:id="@+id/bottomBar"
            android:layout_width="match_parent"
            android:layout_height="60dp"/>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </RelativeLayout>
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@ -6,18 +6,18 @@
    android:gravity="center_horizontal"
    android:orientation="vertical"
    tools:context="apps.amine.bou.readerforselfoss.LoginActivity">
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            app:theme="@style/ToolBarStyle"
            app:popupTheme="?attr/toolbarPopupTheme" />

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
@ -45,7 +45,7 @@
                android:layout_height="wrap_content"
                android:orientation="vertical">

-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:id="@+id/urlLayout"
@ -60,7 +60,7 @@
                        android:inputType="textUri"
                        android:maxLines="1" />

-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>

                <Switch
                    android:text="@string/withLoginSwitch"
@ -69,7 +69,7 @@
                    android:id="@+id/withLogin"
                    android:layout_weight="1"/>

-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                    android:id="@+id/loginLayout"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@ -83,9 +83,9 @@
                        android:inputType="text"
                        android:maxLines="1" />

-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>

-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                    android:id="@+id/passwordLayout"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@ -99,7 +99,7 @@
                        android:inputType="textPassword"
                        android:maxLines="1" />

-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>

                <Switch
                    android:id="@+id/withHttpLogin"
@ -108,7 +108,7 @@
                    android:layout_weight="1"
                    android:text="@string/withHttpLoginSwitch" />

-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                    android:id="@+id/httpLoginInput"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
@ -120,9 +120,9 @@
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:hint="@string/prompt_http_login" />
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>

-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                    android:id="@+id/httpPasswordInput"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
@ -134,7 +134,7 @@
                        android:layout_height="wrap_content"
                        android:hint="@string/prompt_http_password"
                        android:inputType="textPassword" />
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>

                <Switch
                    android:id="@+id/withSelfhostedCert"
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context="apps.amine.bou.readerforselfoss.MainActivity">

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/appBarLayout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@ -12,16 +12,16 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolBar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            app:popupTheme="?attr/toolbarPopupTheme"
            app:theme="@style/ToolBarStyle" />

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
        android:id="@+id/pager"
        android:layout_width="match_parent"
        android:layout_height="0dp"
@ -41,4 +41,4 @@
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="@+id/pager" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/activity_sources.xml
+++ b/app/src/main/res/layout/activity_sources.xml
@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>

-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context="apps.amine.bou.readerforselfoss.SourcesActivity">
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
            app:theme="@style/ToolBarStyle"
            app:popupTheme="?attr/toolbarPopupTheme" />

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/recyclerView"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:scrollbars="vertical"
        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-    </android.support.v7.widget.RecyclerView>
+    </androidx.recyclerview.widget.RecyclerView>

-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
        android:id="@+id/fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@ -42,4 +42,4 @@
        android:layout_marginEnd="16dp"
        android:layout_marginRight="16dp"
        app:layout_behavior="apps.amine.bou.readerforselfoss.utils.ScrollAwareFABBehavior" />
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/card_item.xml
+++ b/app/src/main/res/layout/card_item.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.appcompat.widget.CardView
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:card_view="http://schemas.android.com/apk/res-auto"
@ -18,7 +18,7 @@
    card_view:cardUseCompatPadding="true"
    card_view:layout_constraintBottom_toBottomOf="parent">

-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

@ -34,7 +34,7 @@
            app:srcCompat="@drawable/background_splash"
            card_view:layout_constraintBottom_toTopOf="@+id/constraintLayout" />

-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/constraintLayout"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
@ -143,7 +143,7 @@

            </RelativeLayout>

-        </android.support.constraint.ConstraintLayout>
-    </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>

-</android.support.v7.widget.CardView>
+</androidx.appcompat.widget.CardView>
--- a/app/src/main/res/layout/fragment_article.xml
+++ b/app/src/main/res/layout/fragment_article.xml
@ -1,4 +1,4 @@
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
@ -6,12 +6,12 @@
    android:layout_height="match_parent"
    android:descendantFocusability="blocksDescendants">

-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
        android:id="@+id/nestedScrollView"
        android:layout_width="match_parent"
        android:layout_height="match_parent">

-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent">

@ -70,9 +70,9 @@
                app:layout_constraintTop_toBottomOf="@+id/source"
                tools:visibility="visible" />

-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>

-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>

    <FrameLayout
        android:layout_width="match_parent"
@ -89,7 +89,7 @@
            android:layout_gravity="bottom"
            app:floatingMenu="@menu/reader_toolbar" />

-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
            android:id="@+id/fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@ -123,4 +123,4 @@
            android:progressTint="?attr/colorAccent" />
    </FrameLayout>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/list_item.xml
+++ b/app/src/main/res/layout/list_item.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
@ -115,4 +115,4 @@

    </RelativeLayout>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/settings_toolbar.xml
+++ b/app/src/main/res/layout/settings_toolbar.xml
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout
+<com.google.android.material.appbar.AppBarLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
        app:theme="@style/ToolBarStyle"
        app:popupTheme="?attr/toolbarPopupTheme" />

-</android.support.design.widget.AppBarLayout>
+</com.google.android.material.appbar.AppBarLayout>
--- a/app/src/main/res/layout/source_list_item.xml
+++ b/app/src/main/res/layout/source_list_item.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
@ -52,4 +52,4 @@
        android:layout_width="34dp"
        android:layout_height="34dp"/>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/menu/home_menu.xml
+++ b/app/src/main/res/menu/home_menu.xml
@ -6,13 +6,13 @@
        android:title="@string/menu_home_search"
        android:icon="@drawable/ic_action_search"
        app:showAsAction="ifRoom|collapseActionView"
-        app:actionViewClass="android.support.v7.widget.SearchView" />
+        app:actionViewClass="androidx.appcompat.widget.SearchView" />

    <item android:id="@+id/readAll"
          android:icon="@drawable/ic_done_all_white_24dp"
          android:title="@string/readAll"
          android:orderInCategory="1"
-          app:showAsAction="ifRoom"/>
+          app:showAsAction="always"/>

    <item
        android:id="@+id/refresh"
--- a/app/src/main/res/menu/reader_toolbar.xml
+++ b/app/src/main/res/menu/reader_toolbar.xml
@ -2,6 +2,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

+    <item
+        android:id="@+id/unread_action"
+        android:icon="@drawable/ic_fiber_new"
+        android:title="@string/unmark"
+        app:showAsAction="ifRoom" />
+
    <item
        android:id="@+id/more_action"
        android:icon="@drawable/ic_chrome_reader_mode"
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Registre de depuració (s\'enviarà automàticament)</string>
  <string name="acra_login">Habilita el registre</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -127,7 +127,7 @@
  <string name="self_signed_cert_warning">Por razones de seguridad, los certificados propios no son compatibles por defecto. Activando esto, no seré responsable de cualquier problema de seguridad que encuentre.</string>
  <string name="pref_selfoss_category">Api de Selfoss</string>
  <string name="pref_api_items_number_title">Número de artículos cargados</string>
-  <string name="pref_hidden_tags">Hidden Tags</string>
+  <string name="pref_hidden_tags">Etiquetas ocultas</string>
  <string name="read_debug_title">¿Leer los artículos que aparecen como no leídos?</string>
  <string name="read_debug_off">Sin registro al marcar un elemento como leído</string>
  <string name="read_debug_on">Llamadas a la Api se registrarán al marcar un artículo como leído</string>
@ -167,5 +167,6 @@
  <string name="pref_debug_crash_reports">Informe de fallos</string>
  <string name="pref_debug_debug_logs">Registro de depuración (éstos se enviarán sin diálogo)</string>
  <string name="acra_login">Habilitar el registro</string>
-  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="drawer_item_hidden_tags">Etiquetas ocultas</string>
+  <string name="unmark">Marcar artículo como no leído</string>
 </resources>
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -127,7 +127,7 @@
  <string name="self_signed_cert_warning">Pour des raisons de sécurité, les certificats auto-signés sont désactivés par défaut. En les activant, je ne serais pas responsable de quelconques problèmes de sécurité rencontrés.</string>
  <string name="pref_selfoss_category">Api Selfoss</string>
  <string name="pref_api_items_number_title">Nombre d\'articles chargés</string>
-  <string name="pref_hidden_tags">Hidden Tags</string>
+  <string name="pref_hidden_tags">Tags Cachés</string>
  <string name="read_debug_title">Des articles lus marqués comme non lus ?</string>
  <string name="read_debug_off">Aucun log quand un article est marqué comme lu</string>
  <string name="read_debug_on">Les appels API vont être logués lorsqu\'un article est marqué comme lu</string>
@ -155,7 +155,7 @@
  <string name="markall_dialog_message">Marquer tous les éléments comme lus ?</string>
  <string name="pref_switch_actions_pager_scroll">Marquer comme lu à la navigation.</string>
  <string name="pref_switch_actions_pager_scroll_off">Ne pas marquer les articles comme lus à la navigation.</string>
-  <string name="gdpr_dialog_message">L\'application ne collecte aucune donnée personnelle. Tous les outils d\'anlytics ont été supprimés. Les rapports d\'erreurs sont maintenant optionnels, ainsi que les logs. N\'oubliez pas que les rapports d\'erreurs sont essentiels pour la résolution des bugs (Vous pouvez configurer toute cela dans Paramètres &gt; Debug).</string>
+  <string name="gdpr_dialog_message">L\'application ne collecte aucune donnée personnelle. Tous les outils d\'analytics ont été supprimés. Les rapports d\'erreurs sont maintenant optionnels, ainsi que les logs. N\'oubliez pas que les rapports d\'erreurs sont essentiels pour la résolution des bugs (vous pouvez configurer tout cela dans Paramètres &gt; Debug).</string>
  <string name="gdpr_dialog_title">L\'application ne partage aucune de vos données.</string>
  <string name="crash_dialog_text">Quelque chose s\'est mal passé, S\'il vous plaît, envoyez le rapport au développeur.</string>
  <string name="crash_dialog_comment">Vous pouvez ajouter tous les détails utiles dans le champ de commentaire plus bas. N\'ajoutez aucune information personnelle. Vous pouvez m\'envoyer un email avec votre identifiant de debug, et je vous informerai à la correction du problème.</string>
@ -167,5 +167,6 @@
  <string name="pref_debug_crash_reports">Rapport d\'erreur</string>
  <string name="pref_debug_debug_logs">Log de debug (seront envoyés automatiquement)</string>
  <string name="acra_login">Activer les logs</string>
-  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="drawer_item_hidden_tags">Tags Cachés</string>
+  <string name="unmark">Marquer l\'article comme non lu</string>
 </resources>
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@ -127,7 +127,7 @@
  <string name="self_signed_cert_warning">Por razóns de seguridade, por defecto non se permiten os certificados autoasinados. Activando isto, non serei responsable de calquera problema de seguridade que atopes.</string>
  <string name="pref_selfoss_category">API de Selfoss</string>
  <string name="pref_api_items_number_title">Número de elementos cargados</string>
-  <string name="pref_hidden_tags">Hidden Tags</string>
+  <string name="pref_hidden_tags">Etiquetas ocultas</string>
  <string name="read_debug_title">Ler os artigos que aparecen coma non lidos?</string>
  <string name="read_debug_off">Non rexistrar cando se marca un elemento coma lido</string>
  <string name="read_debug_on">As chamadas á API serán rexistradas cando se marque un artigo coma lido</string>
@ -167,5 +167,6 @@
  <string name="pref_debug_crash_reports">Informes de erros</string>
  <string name="pref_debug_debug_logs">Rexistro de depuración (Estes enviaranse automáticamente)</string>
  <string name="acra_login">Habilitar o rexistro</string>
-  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="drawer_item_hidden_tags">Etiquetas ocultas</string>
+  <string name="unmark">Marcar artículo como non lido</string>
 </resources>
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Log de depuração (Serão enviados sem uma caixa de diálogo)</string>
  <string name="acra_login">Ativar registro de erros</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -168,4 +168,5 @@
  <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
  <string name="acra_login">Enable logging</string>
  <string name="drawer_item_hidden_tags">Hidden Tags</string>
+  <string name="unmark">Mark item as unread</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -171,4 +171,5 @@
    <string name="pref_debug_debug_logs">Debug logging (these will be sent without a dialog)</string>
    <string name="acra_login">Enable logging</string>
    <string name="drawer_item_hidden_tags">Hidden Tags</string>
+    <string name="unmark">Mark item as unread</string>
 </resources>
--- a/build.gradle
+++ b/build.gradle
@ -1,7 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 buildscript {
-    ext.kotlin_version = '1.2.31'
+    ext {
+        kotlin_version = '1.2.51'
+    }
    repositories {
        jcenter()
        google()
@ -10,7 +12,7 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.2.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }
--- a/gradle.properties
+++ b/gradle.properties
@ -16,4 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 org.gradle.caching=true
-android.enableD8=true
+android.enableD8=true
+android.useAndroidX=true
+android.enableJetifier=true
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Tue Mar 27 19:14:12 CEST 2018
+#Mon Sep 24 20:50:58 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
Author	SHA1	Message	Date
Amine	5321becd24	Updated to androidx.	2018-09-24 22:12:44 +02:00
Amine	6a88192e77	Fixes #221	2018-09-21 21:39:37 +02:00
Amine	aa7c630818	erge branch 'master' of github.com:aminecmi/ReaderforSelfoss	2018-09-15 16:26:22 +02:00
Amine	7fb54f14c7	Fixed bug	2018-09-15 16:24:29 +02:00
Amine Bou	3d709c02b7	New Crowdin translations (#219 ) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (Spanish) * New translations strings.xml (Galician)	2018-09-12 13:16:07 +02:00
Amine	339d384561	Changelog.	2018-09-10 20:29:22 +02:00
Amine Bou	50338d51af	New Crowdin translations (#218 ) * New translations strings.xml (French) * New translations strings.xml (French)	2018-09-10 15:17:16 +02:00
Amine Bou	92dbabf899	New Crowdin translations (#217 ) * New translations strings.xml (Catalan) * New translations strings.xml (Japanese) * New translations strings.xml (Vietnamese) * New translations strings.xml (Ukrainian) * New translations strings.xml (Turkish) * New translations strings.xml (Swedish) * New translations strings.xml (Spanish) * New translations strings.xml (Serbian (Cyrillic)) * New translations strings.xml (Russian) * New translations strings.xml (Romanian) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Portuguese) * New translations strings.xml (Polish) * New translations strings.xml (Norwegian) * New translations strings.xml (Korean) * New translations strings.xml (Italian) * New translations strings.xml (Afrikaans) * New translations strings.xml (Indonesian) * New translations strings.xml (Hungarian) * New translations strings.xml (Hebrew) * New translations strings.xml (Greek) * New translations strings.xml (German) * New translations strings.xml (French) * New translations strings.xml (Finnish) * New translations strings.xml (Dutch) * New translations strings.xml (Danish) * New translations strings.xml (Czech) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Arabic) * New translations strings.xml (Galician)	2018-09-09 20:59:34 +02:00
Amine	0043021390	Merge branch 'master' of github.com:aminecmi/ReaderforSelfoss	2018-09-09 20:40:13 +02:00
Amine	70ba9b20da	Items marked as read on open. Closes #208 .	2018-09-09 20:39:27 +02:00
Amine	7fda0a04a1	Fixes #215 .	2018-09-09 19:45:49 +02:00
Amine	3db3157dc9	Trying to fix a strange issue with the loading when hiding items..	2018-09-09 19:44:01 +02:00
Amine Bou	2089fe60ca	New Crowdin translations (#214 ) * New translations strings.xml (Galician) * New translations strings.xml (French) * New translations strings.xml (Spanish)	2018-08-06 15:49:50 +02:00