Updated to androidx.

2018-09-24 22:12:44 +02:00
30 changed files with 371 additions and 434 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -24,8 +24,6 @@ def versionNameFromGit() {
    return gitVersion()
 }

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

 apply plugin: 'kotlin-android'
@ -38,7 +36,7 @@ android {
        targetCompatibility JavaVersion.VERSION_1_8
    }
    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '28.0.2'
    defaultConfig {
        applicationId "apps.amine.bou.readerforselfoss"
        minSdkVersion 16
@ -87,22 +85,22 @@ android {

 dependencies {
    // Testing
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta02'
-    androidTestImplementation 'androidx.test:runner:1.1.0-beta02'
+    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 'androidx.test.espresso:espresso-contrib:3.1.0-beta02'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-alpha4'
    // Espresso-intents for validation and stubbing of Intents
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-beta02'
+    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 "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.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
@ -112,7 +110,7 @@ dependencies {
    implementation 'agency.tango.android:material-intro-screen:0.0.5'

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

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

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

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

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

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

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

    // Pager
-    implementation 'me.relex:circleindicator:2.0.0@aar'
+    implementation 'me.relex:circleindicator:1.2.2@aar'

    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"
+    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
@ -7,17 +7,14 @@ 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
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
@ -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
@ -18,23 +18,19 @@ 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.Source
+import apps.amine.bou.readerforselfoss.api.selfoss.Sources
 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
@ -45,13 +41,14 @@ 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
@ -67,12 +64,9 @@ 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
@ -99,7 +93,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var itemsNumber: Int = 200
    private var elementsShown: Int = 0
    private var maybeTagFilter: Tag? = null
-    private var maybeSourceFilter: Source? = null
+    private var maybeSourceFilter: Sources? = null
    private var maybeSearchFilter: String? = null
    private var userIdentifier: String = ""
    private var displayAccountHeader: Boolean = false
@ -107,6 +101,7 @@ 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
@ -118,7 +113,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private lateinit var appColors: AppColors
    private var offset: Int = 0
    private var firstVisible: Int = 0
-    private lateinit var recyclerViewScrollListener: RecyclerView.OnScrollListener
+    private var recyclerViewScrollListener: RecyclerView.OnScrollListener? = null
    private lateinit var settings: SharedPreferences

    private var recyclerAdapter: RecyclerView.Adapter<*>? = null
@ -127,11 +122,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var badgeAll: Int = -1
    private var badgeFavs: Int = -1

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

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

    override fun onStart() {
        super.onStart()
@ -152,12 +146,6 @@ 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)
@ -385,7 +373,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)
        }
    }
@ -395,7 +383,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)
        }
    }
@ -519,8 +507,7 @@ 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 {
@ -556,7 +543,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                }
            }

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


                if (!loadedFromCache) {
-                    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())
-                        }
-                    }
+                    Reservoir.putAsync(
+                        "drawerData", maybeDrawerData, object : ReservoirPutCallback {
+                            override fun onSuccess() {
+                            }
+
+                            override fun onFailure(p0: Exception?) {
+                            }
+                        })
                }
            } else {
                if (!loadedFromCache) {
@ -689,13 +671,13 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

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

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

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

-        thread {
-            var drawerData = DrawerData(db.drawerDataDao().tags().map { it.toView() },
-                                        db.drawerDataDao().sources().map { it.toView() })
-            handleDrawerData(drawerData, loadedFromCache = true)
-            drawerApiCalls(drawerData)
-        }
+        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)
+                }
+            })
    }

    private fun reloadLayoutManager() {
@ -746,10 +734,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
        when (currentManager) {
            is StaggeredGridLayoutManager ->
                if (!shouldBeCardView) {
-                    layoutManager = GridLayoutManager(
-                        this,
-                        calculateNoOfColumns()
-                    )
+                    layoutManager = GridLayoutManager(this, calculateNoOfColumns())
                    recyclerView.layoutManager = layoutManager
                }
            is GridLayoutManager ->
@ -765,10 +750,7 @@ 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(
@ -822,27 +804,31 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    }

    private fun handleInfiniteScroll() {
-        recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(localRecycler: RecyclerView, dx: Int, dy: Int) {
-                if (localRecycler != null && dy > 0) {
-                    val manager = recyclerView.layoutManager
-                    val lastVisibleItem: Int = when (manager) {
-                        is StaggeredGridLayoutManager -> manager.findLastCompletelyVisibleItemPositions(
-                            null
-                        ).last()
-                        is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
-                        else -> 0
-                    }
+        if (recyclerViewScrollListener == null) {
+            recyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
+                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(
+                                null
+                            ).last()
+                            is GridLayoutManager -> manager.findLastCompletelyVisibleItemPosition()
+                            else -> 0
+                        }

-                    if (lastVisibleItem == (items.size - 1) && items.size < maxItemNumber()) {
-                        getElementsAccordingToTab(appendResults = true)
+                        if (lastVisibleItem == (items.size - 1) && items.size < maxItemNumber()) {
+                            getElementsAccordingToTab(appendResults = true)
+                        }
                    }
                }
            }
        }

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

    private fun mayBeEmpty() =
@ -874,8 +860,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(
@ -889,7 +875,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,8 +7,8 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.preference.PreferenceManager
-import androidx.appcompat.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
@ -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/MyApp.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
@ -1,12 +1,14 @@
 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 androidx.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
 import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
@ -47,6 +49,8 @@ class MyApp : MultiDexApplication() {

        initAmplify()

+        initCache()
+
        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
        if (prefs.getString("unique_id", "").isEmpty()) {
            val editor = prefs.edit()
@ -76,6 +80,14 @@ 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
@ -101,7 +101,8 @@ class ReaderActivity : AppCompatActivity() {
        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() {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@ -6,11 +6,11 @@ import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
 import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
 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.Source
+import apps.amine.bou.readerforselfoss.api.selfoss.Sources
 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<Source> = ArrayList()
+        var items: ArrayList<Sources> = ArrayList()

        recyclerView.setHasFixedSize(true)
        recyclerView.layoutManager = mLayoutManager

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

-            override fun onFailure(call: Call<List<Source>>, t: Throwable) {
+            override fun onFailure(call: Call<List<Sources>>, t: Throwable) {
                Toast.makeText(
                    this@SourcesActivity,
                    R.string.cant_get_sources,
--- 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,7 +2,6 @@ package apps.amine.bou.readerforselfoss.adapters

 import android.app.Activity
 import android.graphics.Color
-import com.google.android.material.snackbar.Snackbar
 import androidx.recyclerview.widget.RecyclerView
 import android.widget.TextView
 import android.widget.Toast
@ -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
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt
@ -10,7 +10,7 @@ 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.Source
+import apps.amine.bou.readerforselfoss.api.selfoss.Sources
 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<Source>,
+    private val items: ArrayList<Sources>,
    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<Source>>
+    val sources: Call<List<Sources>>
        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 Source(
+data class Sources(
    @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<Source>>
+    ): Call<List<Sources>>

    @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
@ -1,9 +1,11 @@
 package apps.amine.bou.readerforselfoss.fragments

 import android.content.Context
+import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.graphics.drawable.ColorDrawable
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
@ -12,6 +14,7 @@ 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
@ -55,6 +58,7 @@ class ArticleFragment : Fragment() {
    private lateinit var contentSource: String
    private lateinit var contentImage: String
    private lateinit var contentTitle: String
+    private var showMalformedUrl: Boolean = false
    private lateinit var editor: SharedPreferences.Editor
    private lateinit var fab: FloatingActionButton
    private lateinit var appColors: AppColors
@ -93,6 +97,7 @@ class ArticleFragment : Fragment() {
        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)
@ -228,13 +233,7 @@ class ArticleFragment : Fragment() {
                        if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
                            try {
                                rootView.titleView.text = response.body()!!.title
-                                try {
-                                    // Note: Mercury may return relative urls... If it does the url val will not be changed.
-                                    URL(response.body()!!.url)
-                                    url = response.body()!!.url
-                                } catch (e: MalformedURLException) {
-                                    ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
-                                }
+                                url = response.body()!!.url
                            } catch (e: Exception) {
                                if (context != null) {
                                    ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
@ -363,46 +362,73 @@ class ArticleFragment : Fragment() {
            val itemUrl = URL(url)
            baseUrl = itemUrl.protocol + "://" + itemUrl.host
        } catch (e: MalformedURLException) {
-            ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
+            if (showMalformedUrl && context != null) {
+                val alertDialog = AlertDialog.Builder(context!!).create()
+                alertDialog.setTitle("Error")
+                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, _ ->
+
+                    // 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)
+
+                    dialog.dismiss()
+                }
+                alertDialog.setButton(
+                    AlertDialog.BUTTON_NEUTRAL,
+                    "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()
+                }
+                alertDialog.show()
+            }
        }

        rootView.webcontent.loadDataWithBaseURL(
            baseUrl,
-            """<html>
-                |<head>
-                |   <style>
-                |      img {
-                |        display: inline-block;
-                |        height: auto;
-                |        width: 100%;
-                |        max-width: 100%;
-                |      }
-                |      a {
-                |        color: $stringColor !important;
-                |      }
-                |      *:not(a) {
-                |        color: $stringTextColor;
-                |      }
-                |      * {
-                |        font-size: ${fontSize.toPx}px;
-                |        text-align: justify;
-                |        word-break: break-word;
-                |        overflow:hidden;
-                |      }
-                |      a, pre, code {
-                |        text-align: left;
-                |      }
-                |      pre, code {
-                |        white-space: pre-wrap;
-                |        width:100%;
-                |        background-color: $stringBackgroundColor;
-                |      }
-                |   </style>
-                |</head>
-                |<body>
-                |   $c
-                |</body>""".trimMargin(),
-            "text/html",
+            """<style>
+                |img {
+                |  display: inline-block;
+                |  height: auto;
+                |  width: 100%;
+                |  max-width: 100%;
+                |}
+                |a {
+                |  color: $stringColor !important;
+                |}
+                |*:not(a) {
+                |  color: $stringTextColor;
+                |}
+                |* {
+                |  font-size: ${fontSize.toPx}px;
+                |  text-align: justify;
+                |  word-break: break-word;
+                |  overflow:hidden;
+                |}
+                |a, pre, code {
+                |  text-align: left;
+                |}
+                |pre, code {
+                |  white-space: pre-wrap;
+                |  width:100%;
+                |  background-color: $stringBackgroundColor;
+                |}</style>$c""".trimMargin(),
+            "text/html; charset=utf-8",
            "utf-8",
            null
        )
--- 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
@ -1,37 +0,0 @@
-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
@ -1,12 +0,0 @@
-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
@ -1,33 +0,0 @@
-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
@ -7,7 +7,6 @@ import android.preference.PreferenceActivity;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.android.material.appbar.AppBarLayout;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
@ -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/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 androidx.annotation.ColorInt
-import androidx.appcompat.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/utils/ScrollAwareFABBehavior.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt
@ -0,0 +1,54 @@
+package apps.amine.bou.readerforselfoss.utils
+
+import android.content.Context
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.floatingactionbutton.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/CustomTabsHelper.java
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabsHelper.java
@ -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/persistence/EntitiesUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/persistence/EntitiesUtils.kt
@ -1,41 +0,0 @@
-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/card_item.xml
+++ b/app/src/main/res/layout/card_item.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.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"
@ -146,4 +146,4 @@
        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.constraintlayout.widget.ConstraintLayout>

-</androidx.cardview.widget.CardView>
+</androidx.appcompat.widget.CardView>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="app_name">"Lettore RSS per Selfoss"</string>
-  <string name="title_activity_login">"Accedi"</string>
+  <string name="app_name">"Reader for Selfoss"</string>
+  <string name="title_activity_login">"Log in"</string>
  <string name="prompt_password">"Password"</string>
-  <string name="prompt_http_password">"Password HTTP"</string>
-  <string name="action_sign_in">"Vai"</string>
-  <string name="error_invalid_password">"La password non è sufficientemente lunga"</string>
-  <string name="error_field_required">"Campo obbligatorio"</string>
-  <string name="prompt_url">"URL"</string>
-  <string name="withLoginSwitch">"È richiesto l'accesso?"</string>
-  <string name="withHttpLoginSwitch">"Accesso HTTP necessario?"</string>
-  <string name="login_url_problem">"Oops. Potrebbe essere necessario aggiungere un \"/\" alla fine dell'url."</string>
-  <string name="prompt_login">"Nome utente"</string>
-  <string name="prompt_http_login">"Nome utente HTTP"</string>
-  <string name="label_share">"Condividi"</string>
-  <string name="readAll">"Segna tutte come lette"</string>
-  <string name="action_disconnect">"Scollegati"</string>
-  <string name="title_activity_settings">"Impostazioni"</string>
-  <string name="pref_header_general">"Generali"</string>
-  <string name="pref_switch_actions_tap_title">"Tap sugli articoli"</string>
+  <string name="prompt_http_password">"HTTP Password"</string>
+  <string name="action_sign_in">"Go"</string>
+  <string name="error_invalid_password">"Password not long enough"</string>
+  <string name="error_field_required">"Field required"</string>
+  <string name="prompt_url">"Url"</string>
+  <string name="withLoginSwitch">"Login required ?"</string>
+  <string name="withHttpLoginSwitch">"HTTP Login required ?"</string>
+  <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
+  <string name="prompt_login">"Username"</string>
+  <string name="prompt_http_login">"HTTP Username"</string>
+  <string name="label_share">"Share"</string>
+  <string name="readAll">"Read all"</string>
+  <string name="action_disconnect">"Disconnect"</string>
+  <string name="title_activity_settings">"Settings"</string>
+  <string name="pref_header_general">"General"</string>
+  <string name="pref_switch_actions_tap_title">"Tap action on the articles"</string>
  <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
  <string name="add_source_hint_url">"Link"</string>
-  <string name="add_source_hint_name">"Nome"</string>
-  <string name="add_source">"Aggiungi una fonte"</string>
-  <string name="add_source_save">"Salva"</string>
-  <string name="wrong_infos">"Controlla nuovamente i dati."</string>
+  <string name="add_source_hint_name">"Name"</string>
+  <string name="add_source">"Add a source"</string>
+  <string name="add_source_save">"Save"</string>
+  <string name="wrong_infos">"Check your details again."</string>
  <string name="all_posts_not_read">"All posts weren't read"</string>
-  <string name="all_posts_read">"Tutti i messaggi sono stati letti"</string>
-  <string name="cant_get_favs">"Non è possibile ottenere i preferiti"</string>
-  <string name="cant_get_new_elements">"Non è possibile ottenere nuovi articoli"</string>
+  <string name="all_posts_read">"All posts were read"</string>
+  <string name="cant_get_favs">"Can't get favorites"</string>
+  <string name="cant_get_new_elements">"Can't get new articles"</string>
  <string name="cant_get_read">"Can't get read articles"</string>
-  <string name="nothing_here">"Non c'è niente qui"</string>
-  <string name="tab_new">"Nuovi"</string>
-  <string name="tab_read">"Tutti"</string>
-  <string name="tab_favs">"Preferiti"</string>
-  <string name="action_about">"Informazioni"</string>
-  <string name="marked_as_read">"Articolo letto"</string>
-  <string name="undo_string">"Annulla"</string>
-  <string name="addStringNoUrl">"Autenticati per aggiungere fonti."</string>
+  <string name="nothing_here">"Nothing here"</string>
+  <string name="tab_new">"New"</string>
+  <string name="tab_read">"All"</string>
+  <string name="tab_favs">"Favorites"</string>
+  <string name="action_about">"About"</string>
+  <string name="marked_as_read">"Item read"</string>
+  <string name="undo_string">"Undo"</string>
+  <string name="addStringNoUrl">"Log in to add sources."</string>
  <string name="cant_get_sources">"Can't get sources list."</string>
  <string name="cant_create_source">"Can't create source."</string>
  <string name="cant_get_spouts">"Can't get spouts list."</string>
-  <string name="form_not_complete">"Il modulo non è completo"</string>
+  <string name="form_not_complete">"The form is not complete"</string>
  <string name="pref_header_links">"Links"</string>
-  <string name="issue_tracker_link">"Traccia problemi"</string>
-  <string name="issue_tracker_summary">"Segnalare un bug o richiedere una nuova funzionalità"</string>
-  <string name="warning_wrong_url">"ATTENZIONE"</string>
-  <string name="pref_switch_card_view_title">"Visualizzazione a schede"</string>
+  <string name="issue_tracker_link">"Issue Tracker"</string>
+  <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
+  <string name="warning_wrong_url">"WARNING"</string>
+  <string name="pref_switch_card_view_title">"Card View"</string>
  <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
  <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
  <string name="share">"Share"</string>
@ -92,32 +92,32 @@
  <string name="intro_hello_title">"Hi there !"</string>
  <string name="intro_hello_message">"Thanks for downloading the app !"</string>
  <string name="intro_needs_selfoss_title">"Before you start…"</string>
-  <string name="intro_needs_selfoss_message">"Non è possibile utilizzare l'app senza un'istanza di Selfoss."</string>
-  <string name="intro_needs_selfoss_link">"Che cosa è Selfoss?"</string>
-  <string name="intro_all_set_title">"Tutto pronto!"</string>
+  <string name="intro_needs_selfoss_message">"You can't use the app without a Selfoss instance."</string>
+  <string name="intro_needs_selfoss_link">"What is Selfoss ?"</string>
+  <string name="intro_all_set_title">"All set !"</string>
  <string name="intro_all_set_message">"You are ready to use the app. Don't forget to go to the settings page to configure your app, and where you'll find some useful links."</string>
-  <string name="card_height_title">Schede a piena altezza</string>
+  <string name="card_height_title">Full height cards</string>
  <string name="card_height_on">Cards height will adjust to its content</string>
  <string name="card_height_off">Card height will be fixed</string>
-  <string name="source_code">Codice sorgente</string>
-  <string name="cant_mark_read">Impossibile contrassegnare l\'articolo come già letto</string>
-  <string name="drawer_error_loading_tags">Errore nel caricamento dei tag…</string>
-  <string name="drawer_error_loading_sources">Errore nel caricamento delle fonti…</string>
-  <string name="drawer_item_filters">Filtri</string>
-  <string name="drawer_action_clear">cancella</string>
+  <string name="source_code">Source code</string>
+  <string name="cant_mark_read">Can\'t mark article as read</string>
+  <string name="drawer_error_loading_tags">Error loading tags…</string>
+  <string name="drawer_error_loading_sources">Error loading sources…</string>
+  <string name="drawer_item_filters">Filters</string>
+  <string name="drawer_action_clear">clear</string>
  <string name="drawer_item_tags">Tags</string>
-  <string name="drawer_item_sources">Fonti</string>
-  <string name="drawer_action_edit">modifica</string>
+  <string name="drawer_item_sources">Sources</string>
+  <string name="drawer_action_edit">edit</string>
  <string name="cache_drawer_error" tools:keep="@string/cache_drawer_error">Couldn\'t cache your drawer data</string>
-  <string name="no_tags_loaded">Nessun tag caricato</string>
+  <string name="no_tags_loaded">No tags loaded</string>
  <string name="no_sources_loaded">No sources loaded</string>
-  <string name="drawer_loading">Caricamento…</string>
-  <string name="menu_home_search">Cerca</string>
-  <string name="can_delete_source">Non è possibile eliminare la fonte…</string>
+  <string name="drawer_loading">Loading …</string>
+  <string name="menu_home_search">Search</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
  <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
-  <string name="pref_header_theme">Temi</string>
-  <string name="default_theme">Predefinito</string>
-  <string name="default_dark_theme">Predefinito (Scuro)</string>
+  <string name="pref_header_theme">Themes</string>
+  <string name="default_theme">Default</string>
+  <string name="default_dark_theme">Default/Dark</string>
  <string name="pref_header_debug">Debug</string>
  <string name="login_debug_title">Activate to log login errors</string>
  <string name="login_debug_on">Any error on the login page will be logged</string>
@ -125,9 +125,9 @@
  <string name="login_menu_debug">Debug</string>
  <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
  <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
-  <string name="pref_selfoss_category">Api di Selfoss</string>
-  <string name="pref_api_items_number_title">Numero di elementi caricati</string>
-  <string name="pref_hidden_tags">Tag nascosti</string>
+  <string name="pref_selfoss_category">Selfoss Api</string>
+  <string name="pref_api_items_number_title">Loaded items number</string>
+  <string name="pref_hidden_tags">Hidden Tags</string>
  <string name="read_debug_title">Read articles appearing as unread ?</string>
  <string name="read_debug_off">No log when marking an item as read</string>
  <string name="read_debug_on">Api calls will be logged when marking an article as read</string>
@ -139,9 +139,9 @@
  <string name="login_everything_on">This will log every api call for debug purpose.</string>
  <string name="login_everything_off">No api call will be logged</string>
  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
-  <string name="translation">Traduzioni</string>
+  <string name="translation">Translation</string>
  <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
-  <string name="drawer_report_bug">Segnala un bug</string>
+  <string name="drawer_report_bug">Report a bug</string>
  <string name="items_number_should_be_number">The items number should be an integer.</string>
  <string name="reader_action_more">Read more</string>
  <string name="reader_action_open">Open in browser</string>
@ -168,5 +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">Segna come non letto</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
@ -2,61 +2,61 @@
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
  <string name="app_name">"Reader for Selfoss"</string>
-  <string name="title_activity_login">"로그인"</string>
-  <string name="prompt_password">"비밀번호"</string>
-  <string name="prompt_http_password">"HTTP 암호"</string>
+  <string name="title_activity_login">"Log in"</string>
+  <string name="prompt_password">"Password"</string>
+  <string name="prompt_http_password">"HTTP Password"</string>
  <string name="action_sign_in">"Go"</string>
-  <string name="error_invalid_password">"패스워드가 짧습니다."</string>
-  <string name="error_field_required">"필수 항목"</string>
+  <string name="error_invalid_password">"Password not long enough"</string>
+  <string name="error_field_required">"Field required"</string>
  <string name="prompt_url">"Url"</string>
-  <string name="withLoginSwitch">"로그인이 필요합니까?"</string>
-  <string name="withHttpLoginSwitch">"HTTP 로그인이 필요 합니까?"</string>
-  <string name="login_url_problem">"죄송합니다. Url의 끝에 \"/\"를 추가할 필요가 있습니다."</string>
-  <string name="prompt_login">"사용자 이름"</string>
-  <string name="prompt_http_login">"HTTP 사용자 이름"</string>
-  <string name="label_share">"공유"</string>
-  <string name="readAll">"모두 읽기"</string>
-  <string name="action_disconnect">"연결 해제"</string>
-  <string name="title_activity_settings">"설정"</string>
-  <string name="pref_header_general">"일반"</string>
-  <string name="pref_switch_actions_tap_title">"기사에 탭 액션"</string>
-  <string name="add_source_hint_tags">"태그1, 태그2, 태그3"</string>
-  <string name="add_source_hint_url">"링크"</string>
-  <string name="add_source_hint_name">"이름"</string>
-  <string name="add_source">"소스 추가"</string>
-  <string name="add_source_save">"저장"</string>
-  <string name="wrong_infos">"세부 정보를 다시 확인하세요."</string>
-  <string name="all_posts_not_read">"모든 게시물을 읽지 않았습니다."</string>
-  <string name="all_posts_read">"모든 게시물을 읽었습니다."</string>
-  <string name="cant_get_favs">"즐겨찾기를 가져올 수 없습니다."</string>
-  <string name="cant_get_new_elements">"새로운 기사를 가져올 수 없습니다."</string>
-  <string name="cant_get_read">"읽은 기사를 가져올 수 없습니다."</string>
-  <string name="nothing_here">"비어있음"</string>
-  <string name="tab_new">"새로운"</string>
-  <string name="tab_read">"전체"</string>
-  <string name="tab_favs">"즐겨찾기"</string>
-  <string name="action_about">"정보"</string>
-  <string name="marked_as_read">"항목 읽기"</string>
-  <string name="undo_string">"실행 취소"</string>
-  <string name="addStringNoUrl">"로그인 소스를 추가 해야 합니다."</string>
-  <string name="cant_get_sources">"소스 리스트를 얻을 수 없습니다."</string>
-  <string name="cant_create_source">"소스를 만들 수 없습니다."</string>
-  <string name="cant_get_spouts">"Spouts 목록을 가져올 수 없습니다."</string>
-  <string name="form_not_complete">"양식이 완료되지 않았습니다."</string>
-  <string name="pref_header_links">"링크"</string>
-  <string name="issue_tracker_link">"이슈 트래커"</string>
-  <string name="issue_tracker_summary">"버그를 보고 하거나 새기능에 대해 요청하세요."</string>
-  <string name="warning_wrong_url">"경고"</string>
-  <string name="pref_switch_card_view_title">"카드 형식 보기"</string>
-  <string name="cant_mark_favortie">"좋아하는 문서를 마크할 수 없습니다."</string>
-  <string name="cant_unmark_favortie">"좋아하는 항목에서 제거할 수 없습니다."</string>
-  <string name="share">"공유"</string>
-  <string name="rating_prompt_title">"이 앱에 만족하십니까?"</string>
-  <string name="rating_prompt_yes">"예!"</string>
-  <string name="rating_prompt_no">"설마..."</string>
-  <string name="rating_prompt_feedback_title">"이유를 우리에게 말해줄 수 있습니까?"</string>
-  <string name="rating_prompt_feedback_yes">"OK!"</string>
-  <string name="rating_prompt_feedback_no">"나중에"</string>
+  <string name="withLoginSwitch">"Login required ?"</string>
+  <string name="withHttpLoginSwitch">"HTTP Login required ?"</string>
+  <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
+  <string name="prompt_login">"Username"</string>
+  <string name="prompt_http_login">"HTTP Username"</string>
+  <string name="label_share">"Share"</string>
+  <string name="readAll">"Read all"</string>
+  <string name="action_disconnect">"Disconnect"</string>
+  <string name="title_activity_settings">"Settings"</string>
+  <string name="pref_header_general">"General"</string>
+  <string name="pref_switch_actions_tap_title">"Tap action on the articles"</string>
+  <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+  <string name="add_source_hint_url">"Link"</string>
+  <string name="add_source_hint_name">"Name"</string>
+  <string name="add_source">"Add a source"</string>
+  <string name="add_source_save">"Save"</string>
+  <string name="wrong_infos">"Check your details again."</string>
+  <string name="all_posts_not_read">"All posts weren't read"</string>
+  <string name="all_posts_read">"All posts were read"</string>
+  <string name="cant_get_favs">"Can't get favorites"</string>
+  <string name="cant_get_new_elements">"Can't get new articles"</string>
+  <string name="cant_get_read">"Can't get read articles"</string>
+  <string name="nothing_here">"Nothing here"</string>
+  <string name="tab_new">"New"</string>
+  <string name="tab_read">"All"</string>
+  <string name="tab_favs">"Favorites"</string>
+  <string name="action_about">"About"</string>
+  <string name="marked_as_read">"Item read"</string>
+  <string name="undo_string">"Undo"</string>
+  <string name="addStringNoUrl">"Log in to add sources."</string>
+  <string name="cant_get_sources">"Can't get sources list."</string>
+  <string name="cant_create_source">"Can't create source."</string>
+  <string name="cant_get_spouts">"Can't get spouts list."</string>
+  <string name="form_not_complete">"The form is not complete"</string>
+  <string name="pref_header_links">"Links"</string>
+  <string name="issue_tracker_link">"Issue Tracker"</string>
+  <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
+  <string name="warning_wrong_url">"WARNING"</string>
+  <string name="pref_switch_card_view_title">"Card View"</string>
+  <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
+  <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
+  <string name="share">"Share"</string>
+  <string name="rating_prompt_title">"Enjoying the app ?"</string>
+  <string name="rating_prompt_yes">"Yes !"</string>
+  <string name="rating_prompt_no">"Not really …"</string>
+  <string name="rating_prompt_feedback_title">"Can you tell us why ?"</string>
+  <string name="rating_prompt_feedback_yes">"OK !"</string>
+  <string name="rating_prompt_feedback_no">"Not now."</string>
  <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
  <string name="rating_prompt_rating_yes">"Sure !"</string>
  <string name="rating_prompt_rating_no">"Not right now."</string>
--- 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.jaredrummler.android.colorpicker.ColorPreference
+    <com.jrummyapps.android.colorpicker.ColorPreference
        android:defaultValue="@color/colorPrimary"
        android:key="color_primary"
        android:title="Primary color"/>

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

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

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

-        google()
+        maven { url 'https://maven.google.com' }
        jcenter()
        mavenCentral()
    }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,4 +1,4 @@
-#Tue Sep 25 20:41:54 CEST 2018
+#Mon Sep 24 20:50:58 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME