Code cleaning and versions updates.

app/build.gradle

@@ -130,15 +130,15 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 
     // Firebase + crashlytics
-    compile 'com.google.firebase:firebase-core:11.8.0'
-    compile 'com.google.firebase:firebase-config:11.8.0'
-    compile 'com.google.firebase:firebase-invites:11.8.0'
+    compile 'com.google.firebase:firebase-core:12.0.0'
+    compile 'com.google.firebase:firebase-config:12.0.0'
+    compile 'com.google.firebase:firebase-invites:12.0.0'
     compile('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
-        transitive = true;
+        transitive = true
     }
 
     //multidex
-    compile 'com.android.support:multidex:1.0.2'
+    compile 'com.android.support:multidex:1.0.3'
 
     // Intro
     compile 'agency.tango.android:material-intro-screen:0.0.5'

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

@@ -99,7 +99,7 @@ class AddSourceActivity : AppCompatActivity() {
 
                     val itemsStrings = items.map { it.value.name }
                     for ((key, value) in items) {
-                        spoutsKV.put(value.name, key)
+                        spoutsKV[value.name] = key
                     }
 
                     mProgress.visibility = View.GONE

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

@@ -2,7 +2,6 @@ package apps.amine.bou.readerforselfoss
 
 import android.app.Activity
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Color
@@ -52,7 +51,6 @@ import com.anupcowkur.reservoir.ReservoirPutCallback
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
-import com.crashlytics.android.Crashlytics
 import com.crashlytics.android.answers.Answers
 import com.crashlytics.android.answers.InviteEvent
 import com.ftinc.scoop.Scoop
@@ -664,7 +662,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                         recyclerView.layoutManager = layoutManager
                     }
                 } else {
-                    Unit
                 }
         }
     }

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

@@ -79,8 +79,7 @@ class ReaderActivity : AppCompatActivity() {
 
         currentItem = intent.getIntExtra("currentItem", 0)
 
-        var adapter = ScreenSlidePagerAdapter(supportFragmentManager)
-        pager.adapter = adapter
+        pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
         pager.currentItem = currentItem
     }
 

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

@@ -145,7 +145,7 @@ data class Item(
 
         // handle url not starting with http
         if (stringUrl.startsWith("//")) {
-            stringUrl = "http:" + stringUrl
+            stringUrl = "http:$stringUrl"
         }
 
         return stringUrl

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

@@ -1,7 +1,6 @@
 package apps.amine.bou.readerforselfoss.fragments
 
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
@@ -14,13 +13,11 @@ import android.support.v4.app.Fragment
 import android.support.v4.content.ContextCompat
 import android.support.v4.widget.NestedScrollView
 import android.support.v7.app.AlertDialog
-import android.support.v7.view.ContextThemeWrapper
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebSettings
-import android.widget.Toast
 import apps.amine.bou.readerforselfoss.BuildConfig
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi

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

@@ -105,9 +105,8 @@ public class CustomTabActivityHelper implements ServiceConnectionCallback {
         if (mClient == null) return false;
 
         CustomTabsSession session = getSession();
-        if (session == null) return false;
+        return session != null && session.mayLaunchUrl(uri, extras, otherLikelyBundles);
 
-        return session.mayLaunchUrl(uri, extras, otherLikelyBundles);
     }
 
     @Override

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.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"
     android:layout_height="match_parent">
 

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

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.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"
-    xmlns:fab="http://schemas.android.com/apk/res-auto">
+    tools:context="apps.amine.bou.readerforselfoss.SourcesActivity">
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">

app/src/main/res/menu/reader_toolbar.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item