App was a little slow with livedata.

Still trying to fix the build issue.
Trying to fix build issue.
2018-10-13 10:24:58 +02:00 · 2018-10-13 04:52:55 +02:00 · 2018-10-12 22:50:43 +02:00 · 2018-10-12 22:29:33 +02:00 · 2018-10-12 22:04:47 +02:00 · 2018-10-12 21:01:39 +02:00
55 changed files with 429 additions and 345 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -24,6 +24,8 @@ def versionNameFromGit() {
    return gitVersion()
 }

+apply plugin: 'kotlin-kapt'
+
 apply plugin: 'com.android.application'

 apply plugin: 'kotlin-android'
@ -36,7 +38,7 @@ android {
        targetCompatibility JavaVersion.VERSION_1_8
    }
    compileSdkVersion 28
-    buildToolsVersion '28.0.2'
+    buildToolsVersion '28.0.3'
    defaultConfig {
        applicationId "apps.amine.bou.readerforselfoss"
        minSdkVersion 16
@ -53,7 +55,7 @@ android {
        vectorDrawables.useSupportLibrary = true

        // tests
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
        release {
@ -85,32 +87,32 @@ 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-beta02'
+    androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
    // 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-beta02'
    // 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-beta02'
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
    // Android Support
-    implementation "com.android.support:appcompat-v7:$android_version"
-    implementation "com.android.support:design:$android_version"
-    implementation "com.android.support:recyclerview-v7:$android_version"
-    implementation "com.android.support:support-v4:$android_version"
-    implementation "com.android.support:support-vector-drawable:$android_version"
-    implementation "com.android.support:customtabs:$android_version"
-    implementation "com.android.support:cardview-v7:$android_version"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation "androidx.appcompat:appcompat:$android_version"
+    implementation "com.google.android.material:material:$android_version"
+    implementation "androidx.recyclerview:recyclerview:$android_version"
+    implementation "androidx.legacy:legacy-support-v4:$android_version"
+    implementation "androidx.vectordrawable:vectordrawable:$android_version"
+    implementation "androidx.browser:browser:$android_version"
+    implementation "androidx.cardview:cardview:$android_version"
+    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'

    // About
-    implementation('com.mikepenz:aboutlibraries:6.0.0@aar') {
+    implementation('com.mikepenz:aboutlibraries:6.2.0@aar') {
        transitive = true
    }

@ -121,8 +123,8 @@ dependencies {
    implementation 'com.burgstaller:okhttp-digest:1.12'

    // Material-ish things
-    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.3'
-    implementation 'com.github.jd-alexander:LikeButton:0.2.1'
+    implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.5'
+    implementation 'com.github.jd-alexander:LikeButton:0.2.3'
    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'

    // glide
@ -130,25 +132,30 @@ dependencies {
    implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'

    // Asking politely users to rate the app
-    implementation 'com.github.stkent:amplify:2.1.0'
+    implementation 'com.github.stkent:amplify:2.2.0'

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

    // Themes
    implementation 'com.52inc:scoops:1.0.0'
-    implementation 'com.jrummyapps:colorpicker:2.1.7'
+    implementation 'com.jaredrummler:colorpicker:1.0.2'
    implementation 'com.github.rubensousa:floatingtoolbar:1.5.1'

    // Pager
-    implementation 'me.relex:circleindicator:1.2.2@aar'
+    implementation 'me.relex:circleindicator:2.0.0@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 "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
 }


--- 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,27 @@ 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.pressBack
+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.contrib.DrawerActions
+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.isRoot
+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
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@ -9,29 +9,32 @@ 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 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.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
+import androidx.room.Room
+import androidx.room.RoomDatabase
 import apps.amine.bou.readerforselfoss.adapters.ItemCardAdapter
 import apps.amine.bou.readerforselfoss.adapters.ItemListAdapter
 import apps.amine.bou.readerforselfoss.adapters.ItemsAdapter
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.Sources
+import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.api.selfoss.Stats
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.api.selfoss.Tag
+import apps.amine.bou.readerforselfoss.persistence.database.AppDatabase
 import apps.amine.bou.readerforselfoss.settings.SettingsActivity
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
@ -42,14 +45,13 @@ 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.persistence.toEntity
+import apps.amine.bou.readerforselfoss.utils.persistence.toView
 import co.zsmb.materialdrawerkt.builders.accountHeader
 import co.zsmb.materialdrawerkt.builders.drawer
 import co.zsmb.materialdrawerkt.builders.footer
 import co.zsmb.materialdrawerkt.draweritems.badgeable.primaryItem
 import co.zsmb.materialdrawerkt.draweritems.profile.profile
-import com.anupcowkur.reservoir.Reservoir
-import com.anupcowkur.reservoir.ReservoirGetCallback
-import com.anupcowkur.reservoir.ReservoirPutCallback
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
@ -65,9 +67,12 @@ 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 kotlinx.android.synthetic.main.fragment_article.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import kotlin.concurrent.thread
+
 class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

    private val MENU_PREFERENCES = 12302
@ -94,7 +99,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var itemsNumber: Int = 200
    private var elementsShown: Int = 0
    private var maybeTagFilter: Tag? = null
-    private var maybeSourceFilter: Sources? = null
+    private var maybeSourceFilter: Source? = null
    private var maybeSearchFilter: String? = null
    private var userIdentifier: String = ""
    private var displayAccountHeader: Boolean = false
@ -102,7 +107,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var lastFetchDone: Boolean = false
    private var hiddenTags: List<String> = emptyList()

-
    private lateinit var tabNewBadge: TextBadgeItem
    private lateinit var tabArchiveBadge: TextBadgeItem
    private lateinit var tabStarredBadge: TextBadgeItem
@ -123,10 +127,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var badgeAll: Int = -1
    private var badgeFavs: Int = -1

-
    private lateinit var tagsBadge: Map<Long, Int>

-    data class DrawerData(val tags: List<Tag>?, val sources: List<Sources>?)
+    private lateinit var db: AppDatabase
+
+    data class DrawerData(val tags: List<Tag>?, val sources: List<Source>?)

    override fun onStart() {
        super.onStart()
@ -147,6 +152,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            Amplify.getSharedInstance().promptIfReady(promptView)
        }

+        db = Room.databaseBuilder(
+            applicationContext,
+            AppDatabase::class.java!!, "selfoss-database"
+        ).build()
+
+
        customTabActivityHelper = CustomTabActivityHelper()

        sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
@ -374,7 +385,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private fun handleThemeBinding() {
        val scoop = Scoop.getInstance()
        scoop.bind(this, Toppings.PRIMARY.value, toolBar)
-        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
            scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
        }
    }
@ -384,7 +395,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
        val scoop = Scoop.getInstance()
        scoop.update(Toppings.PRIMARY.value, appColors.colorPrimary)

-        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
            scoop.update(Toppings.PRIMARY_DARK.value, appColors.colorPrimaryDark)
        }
    }
@ -508,7 +519,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        )
                    }
                } else {
-                    val filteredHiddenTags: List<Tag> = maybeTags.filter { hiddenTags.contains(it.tag) }
+                    val filteredHiddenTags: List<Tag> =
+                        maybeTags.filter { hiddenTags.contains(it.tag) }
                    tagsBadge = filteredHiddenTags.map {
                        val gd = GradientDrawable()
                        val color = try {
@ -544,7 +556,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                }
            }

-            fun handleSources(maybeSources: List<Sources>?) {
+            fun handleSources(maybeSources: List<Source>?) {
                if (maybeSources == null) {
                    if (loadedFromCache) {
                        drawer.addItem(
@ -643,14 +655,19 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {


                if (!loadedFromCache) {
-                    Reservoir.putAsync(
-                        "drawerData", maybeDrawerData, object : ReservoirPutCallback {
-                            override fun onSuccess() {
-                            }
-
-                            override fun onFailure(p0: Exception?) {
-                            }
-                        })
+                    if (maybeDrawerData.tags != null) {
+                        thread {
+                            val tagEntities = maybeDrawerData.tags.map { it.toEntity() }
+                            db.drawerDataDao().insertAllTags(*tagEntities.toTypedArray())
+                        }
+                    }
+                    if (maybeDrawerData.sources != null) {
+                        thread {
+                            val sourceEntities =
+                                maybeDrawerData.sources.map { it.toEntity(this@HomeActivity) }
+                            db.drawerDataDao().insertAllSources(*sourceEntities.toTypedArray())
+                        }
+                    }
                }
            } else {
                if (!loadedFromCache) {
@ -672,13 +689,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

        fun drawerApiCalls(maybeDrawerData: DrawerData?) {
            var tags: List<Tag>? = null
-            var sources: List<Sources>?
+            var sources: List<Source>?

            fun sourcesApiCall() {
-                api.sources.enqueue(object : Callback<List<Sources>> {
+                api.sources.enqueue(object : Callback<List<Source>> {
                    override fun onResponse(
-                        call: Call<List<Sources>>?,
-                        response: Response<List<Sources>>
+                        call: Call<List<Source>>?,
+                        response: Response<List<Source>>
                    ) {
                        sources = response.body()
                        val apiDrawerData = DrawerData(tags, sources)
@ -687,7 +704,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        }
                    }

-                    override fun onFailure(call: Call<List<Sources>>?, t: Throwable?) {
+                    override fun onFailure(call: Call<List<Source>>?, t: Throwable?) {
                    }
                })
            }
@ -713,18 +730,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            )
        )

-        val resultType = object : TypeToken<DrawerData>() {}.type
-        Reservoir.getAsync(
-            "drawerData", resultType, object : ReservoirGetCallback<DrawerData> {
-                override fun onSuccess(maybeDrawerData: DrawerData?) {
-                    handleDrawerData(maybeDrawerData, loadedFromCache = true)
-                    drawerApiCalls(maybeDrawerData)
-                }
-
-                override fun onFailure(p0: Exception?) {
-                    drawerApiCalls(null)
-                }
-            })
+        thread {
+            var drawerData = DrawerData(db.drawerDataDao().tags().map { it.toView() },
+                                        db.drawerDataDao().sources().map { it.toView() })
+            handleDrawerData(drawerData, loadedFromCache = true)
+            drawerApiCalls(drawerData)
+        }
    }

    private fun reloadLayoutManager() {
@ -735,7 +746,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
        when (currentManager) {
            is StaggeredGridLayoutManager ->
                if (!shouldBeCardView) {
-                    layoutManager = GridLayoutManager(this, calculateNoOfColumns())
+                    layoutManager = GridLayoutManager(
+                        this,
+                        calculateNoOfColumns()
+                    )
                    recyclerView.layoutManager = layoutManager
                }
            is GridLayoutManager ->
@ -751,7 +765,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            else ->
                if (currentManager == null) {
                    if (!shouldBeCardView) {
-                        layoutManager = GridLayoutManager(this, calculateNoOfColumns())
+                        layoutManager = GridLayoutManager(
+                            this,
+                            calculateNoOfColumns()
+                        )
                        recyclerView.layoutManager = layoutManager
                    } else {
                        layoutManager = StaggeredGridLayoutManager(
@ -857,8 +874,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    }

    private fun filter(tags: String): Boolean {
-      val tagsList = tags.replace("\\s".toRegex(), "").split(",")
-      return tagsList.intersect(hiddenTags).isEmpty()
+        val tagsList = tags.replace("\\s".toRegex(), "").split(",")
+        return tagsList.intersect(hiddenTags).isEmpty()
    }

    private fun doCallTo(
@ -872,7 +889,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                if (shouldUpdate) {
                    items = response.body() as ArrayList<Item>
                    items = items.filter {
-                      maybeTagFilter != null || filter(it.tags)
+                        maybeTagFilter != null || filter(it.tags)
                    } as ArrayList<Item>

                    if (allItems.isEmpty()) {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt
@ -7,7 +7,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.support.v7.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatDelegate
 import android.view.View

 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
--- 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
@ -1,14 +1,12 @@
 package apps.amine.bou.readerforselfoss

 import android.content.Context
-import android.content.SharedPreferences
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.preference.PreferenceManager
-import android.support.multidex.MultiDexApplication
+import androidx.multidex.MultiDexApplication
 import android.widget.ImageView
 import apps.amine.bou.readerforselfoss.utils.Config
-import com.anupcowkur.reservoir.Reservoir
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
@ -49,8 +47,6 @@ class MyApp : MultiDexApplication() {

        initAmplify()

-        initCache()
-
        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
        if (prefs.getString("unique_id", "").isEmpty()) {
            val editor = prefs.edit()
@ -80,14 +76,6 @@ class MyApp : MultiDexApplication() {
            .applyAllDefaultRules()
    }

-    private fun initCache() {
-        try {
-            Reservoir.init(this, 8192) //in bytes
-        } catch (e: IOException) {
-            //failure
-        }
-    }
-
    private fun initDrawerImageLoader() {
        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
            override fun set(
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
@ -4,11 +4,11 @@ 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
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@ -5,12 +5,12 @@ 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 androidx.recyclerview.widget.LinearLayoutManager
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.adapters.SourcesListAdapter
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.Sources
+import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import com.ftinc.scoop.Scoop
@ -61,18 +61,18 @@ class SourcesActivity : AppCompatActivity() {
            prefs.getBoolean("isSelfSignedCert", false),
            prefs.getBoolean("should_log_everything", false)
        )
-        var items: ArrayList<Sources> = ArrayList()
+        var items: ArrayList<Source> = ArrayList()

        recyclerView.setHasFixedSize(true)
        recyclerView.layoutManager = mLayoutManager

-        api.sources.enqueue(object : Callback<List<Sources>> {
+        api.sources.enqueue(object : Callback<List<Source>> {
            override fun onResponse(
-                call: Call<List<Sources>>,
-                response: Response<List<Sources>>
+                call: Call<List<Source>>,
+                response: Response<List<Source>>
            ) {
                if (response.body() != null && response.body()!!.isNotEmpty()) {
-                    items = response.body() as ArrayList<Sources>
+                    items = response.body() as ArrayList<Source>
                }
                val mAdapter = SourcesListAdapter(this@SourcesActivity, items, api)
                recyclerView.adapter = mAdapter
@ -86,7 +86,7 @@ class SourcesActivity : AppCompatActivity() {
                }
            }

-            override fun onFailure(call: Call<List<Sources>>, t: Throwable) {
+            override fun onFailure(call: Call<List<Source>>, t: Throwable) {
                Toast.makeText(
                    this@SourcesActivity,
                    R.string.cant_get_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,8 @@ 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 com.google.android.material.snackbar.Snackbar
+import androidx.recyclerview.widget.RecyclerView
 import android.widget.TextView
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
@ -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,15 +2,15 @@ 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
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
-import apps.amine.bou.readerforselfoss.api.selfoss.Sources
+import apps.amine.bou.readerforselfoss.api.selfoss.Source
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
@ -23,7 +23,7 @@ import retrofit2.Response

 class SourcesListAdapter(
    private val app: Activity,
-    private val items: ArrayList<Sources>,
+    private val items: ArrayList<Source>,
    private val api: SelfossApi
 ) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>() {
    private val c: Context = app.baseContext
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt
@ -159,7 +159,7 @@ class SelfossApi(
    fun update(): Call<String> =
        service.update(userName, password)

-    val sources: Call<List<Sources>>
+    val sources: Call<List<Source>>
        get() = service.sources(userName, password)

    fun deleteSource(id: String): Call<SuccessResponse> =
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
@ -42,7 +42,7 @@ data class Spout(
    @SerializedName("description") val description: String
 )

-data class Sources(
+data class Source(
    @SerializedName("id") val id: String,
    @SerializedName("title") val title: String,
    @SerializedName("tags") val tags: String,
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossService.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossService.kt
@ -95,7 +95,7 @@ internal interface SelfossService {
    fun sources(
        @Query("username") username: String,
        @Query("password") password: String
-    ): Call<List<Sources>>
+    ): Call<List<Source>>

    @DELETE("source/{id}")
    fun deleteSource(
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
@ -7,11 +7,11 @@ import android.graphics.drawable.ColorDrawable
 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 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 android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/DrawerDataDao.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/dao/DrawerDataDao.kt
@ -0,0 +1,37 @@
+package apps.amine.bou.readerforselfoss.persistence.dao
+
+import androidx.lifecycle.LiveData
+import androidx.room.Delete
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import apps.amine.bou.readerforselfoss.persistence.entities.SourceEntity
+import apps.amine.bou.readerforselfoss.persistence.entities.TagEntity
+
+@Dao
+interface DrawerDataDao {
+    @Query("SELECT * FROM tags")
+    fun tags(): List<TagEntity>
+
+    @Query("SELECT * FROM sources")
+    fun sources(): List<SourceEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAllTags(vararg tags: TagEntity)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAllSources(vararg sources: SourceEntity)
+
+    @Query("DELETE FROM tags")
+    fun deleteAllTags()
+
+    @Query("DELETE FROM sources")
+    fun deleteAllSources()
+
+    @Delete
+    fun deleteTag(tag: TagEntity)
+
+    @Delete
+    fun deleteSource(source: SourceEntity)
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/database/AppDatabase.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/database/AppDatabase.kt
@ -0,0 +1,12 @@
+package apps.amine.bou.readerforselfoss.persistence.database
+
+import androidx.room.RoomDatabase
+import androidx.room.Database
+import apps.amine.bou.readerforselfoss.persistence.dao.DrawerDataDao
+import apps.amine.bou.readerforselfoss.persistence.entities.SourceEntity
+import apps.amine.bou.readerforselfoss.persistence.entities.TagEntity
+
+@Database(entities = [TagEntity::class, SourceEntity::class], version = 1)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun drawerDataDao(): DrawerDataDao
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/entities/DrawerDataEntity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/persistence/entities/DrawerDataEntity.kt
@ -0,0 +1,33 @@
+package apps.amine.bou.readerforselfoss.persistence.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "tags")
+data class TagEntity(
+    @PrimaryKey
+    @ColumnInfo(name = "tag")
+    val tag: String,
+    @ColumnInfo(name = "color")
+    val color: String,
+    @ColumnInfo(name = "unread")
+    val unread: Int
+)
+
+@Entity(tableName = "sources")
+data class SourceEntity(
+    @PrimaryKey
+    @ColumnInfo(name = "id")
+    val id: String,
+    @ColumnInfo(name = "title")
+    val title: String,
+    @ColumnInfo(name = "tags")
+    val tags: String,
+    @ColumnInfo(name = "spout")
+    val spout: String,
+    @ColumnInfo(name = "error")
+    val error: String,
+    @ColumnInfo(name = "icon")
+    val icon: String
+)
--- 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,13 @@ 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 com.google.android.material.appbar.AppBarLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.View;
--- 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,8 +3,8 @@ 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 androidx.annotation.ColorInt
+import androidx.appcompat.view.ContextThemeWrapper
 import android.util.TypedValue
 import apps.amine.bou.readerforselfoss.R
 import android.view.LayoutInflater
--- 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,54 +0,0 @@
-package apps.amine.bou.readerforselfoss.utils
-
-import android.content.Context
-import android.support.design.widget.CoordinatorLayout
-import android.support.design.widget.FloatingActionButton
-import android.util.AttributeSet
-import android.view.View
-
-class ScrollAwareFABBehavior(
-    context: Context,
-    attrs: AttributeSet
-) : CoordinatorLayout.Behavior<FloatingActionButton>() {
-
-
-    override fun onStartNestedScroll(
-        coordinatorLayout: CoordinatorLayout,
-        child: FloatingActionButton,
-        directTargetChild: View,
-        target: View,
-        nestedScrollAxes: Int
-    ): Boolean {
-        return true
-    }
-
-    override fun onNestedScroll(
-        coordinatorLayout: CoordinatorLayout,
-        child: FloatingActionButton,
-        target: View,
-        dxConsumed: Int,
-        dyConsumed: Int,
-        dxUnconsumed: Int,
-        dyUnconsumed: Int
-    ) {
-        super.onNestedScroll(
-            coordinatorLayout,
-            child,
-            target,
-            dxConsumed,
-            dyConsumed,
-            dxUnconsumed,
-            dyUnconsumed
-        )
-        if (dyConsumed > 0 && child.visibility == View.VISIBLE) {
-            child.hide(object : FloatingActionButton.OnVisibilityChangedListener() {
-                override fun onHidden(fab: FloatingActionButton?) {
-                    super.onHidden(fab)
-                    fab!!.visibility = View.INVISIBLE
-                }
-            })
-        } else if (dyConsumed < 0 && child.visibility != View.VISIBLE) {
-            child.show()
-        }
-    }
-}
--- 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;

--- 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/java/apps/amine/bou/readerforselfoss/utils/persistence/EntitiesUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/persistence/EntitiesUtils.kt
@ -0,0 +1,41 @@
+package apps.amine.bou.readerforselfoss.utils.persistence
+
+import android.content.Context
+import apps.amine.bou.readerforselfoss.api.selfoss.Source
+import apps.amine.bou.readerforselfoss.api.selfoss.Tag
+import apps.amine.bou.readerforselfoss.persistence.entities.SourceEntity
+import apps.amine.bou.readerforselfoss.persistence.entities.TagEntity
+
+fun TagEntity.toView(): Tag =
+        Tag(
+            this.tag,
+            this.color,
+            this.unread
+        )
+
+fun SourceEntity.toView(): Source =
+        Source(
+            this.id,
+            this.title,
+            this.tags,
+            this.spout,
+            this.error,
+            this.icon
+        )
+
+fun Source.toEntity(context: Context): SourceEntity =
+        SourceEntity(
+            this.id,
+            this.title,
+            this.tags,
+            this.spout,
+            this.error,
+            this.getIcon(context)
+        )
+
+fun Tag.toEntity(): TagEntity =
+        TagEntity(
+            this.tag,
+            this.color,
+            this.unread
+        )
--- 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.cardview.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.cardview.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,7 +6,7 @@
        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"
--- a/app/src/main/res/xml/pref_theme.xml
+++ b/app/src/main/res/xml/pref_theme.xml
@ -7,22 +7,22 @@
        android:key="dark_theme"
        android:title="Dark theme" />

-    <com.jrummyapps.android.colorpicker.ColorPreference
+    <com.jaredrummler.android.colorpicker.ColorPreference
        android:defaultValue="@color/colorPrimary"
        android:key="color_primary"
        android:title="Primary color"/>

-    <com.jrummyapps.android.colorpicker.ColorPreference
+    <com.jaredrummler.android.colorpicker.ColorPreference
        android:defaultValue="@color/colorPrimaryDark"
        android:key="color_primary_dark"
        android:title="Primary dark color"/>

-    <com.jrummyapps.android.colorpicker.ColorPreference
+    <com.jaredrummler.android.colorpicker.ColorPreference
        android:defaultValue="@color/colorAccent"
        android:key="color_accent"
        android:title="Accent color"/>

-    <com.jrummyapps.android.colorpicker.ColorPreference
+    <com.jaredrummler.android.colorpicker.ColorPreference
        android:defaultValue="@color/colorAccentDark"
        android:key="color_accent_dark"
        android:title="Accent dark color"/>
--- a/build.gradle
+++ b/build.gradle
@ -3,11 +3,13 @@
 buildscript {
    ext {
        kotlin_version = '1.2.51'
-        android_version = '28.0.0'
+        android_version = '1.0.0'
+        lifecycle_version = '2.0.0'
+        room_version = '2.1.0-alpha01'
    }
    repositories {
-        jcenter()
        google()
+        jcenter()
        maven {
            url "https://jitpack.io"
        }
@ -23,7 +25,7 @@ allprojects {
        // For likebutton only
        maven { url "https://jitpack.io" }

-        maven { url 'https://maven.google.com' }
+        google()
        jcenter()
        mavenCentral()
    }
--- 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
Author	SHA1	Message	Date
Amine	3b6891c84a	App was a little slow with livedata.	2018-10-13 10:24:58 +02:00
Amine	4901e7174c	Still trying to fix the build issue.	2018-10-13 04:52:55 +02:00
Amine	8d70e68fe2	Trying to fix build issue.	2018-10-12 22:50:43 +02:00
Amine	d3e1527b70	AS changes gradle version to one that does not exist.	2018-10-12 22:29:33 +02:00
Amine	0c201301f2	Replaced reservoir by room.	2018-10-12 22:04:47 +02:00
Amine	6090590f24	Imports cleaning. Libraries update.	2018-10-12 21:01:39 +02:00
Amine	06b88c783d	Auto migration to android x.	2018-10-12 20:36:18 +02:00