From 758661f5fb4caf2252a06fb0409b0968a48afe98 Mon Sep 17 00:00:00 2001
From: Amine <aminecmi@gmail.com>
Date: Mon, 5 Jun 2017 18:49:41 +0200
Subject: [PATCH] Fixed #16, fixes #17 and fixes #19

---
 CHANGELOG.md                                         |  2 +-
 app/build.gradle                                     |  4 ++--
 .../apps/amine/bou/readerforselfoss/HomeActivity.kt  | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02328fe..1ae7d3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-**1.5.0.3 to 1.5.0.5**
+**1.5.0.3 to 1.5.0.6**
 
 - Added a drawer for filtering sources and tags.
 
diff --git a/app/build.gradle b/app/build.gradle
index 4d946c7..5566121 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         applicationId "apps.amine.bou.readerforselfoss"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 1505
-        versionName "1.5.0.5"
+        versionCode 1506
+        versionName "1.5.0.6"
 
         // Enabling multidex support.
         multiDexEnabled true
diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
index b906069..d1aebdb 100644
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@@ -167,7 +167,7 @@ class HomeActivity : AppCompatActivity() {
                             .withAboutIconShown(true)
                             .withAboutVersionShown(true)
                             .start(this@HomeActivity)
-                    false
+                    true
                 })
         drawer!!.addStickyFooterItem(
             PrimaryDrawerItem()
@@ -175,7 +175,7 @@ class HomeActivity : AppCompatActivity() {
                 .withIcon(R.drawable.ic_settings)
                 .withOnDrawerItemClickListener { _, _, _ ->
                     startActivityForResult(Intent(this@HomeActivity, SettingsActivity::class.java), MENU_PREFERENCES)
-                    false
+                    true
                 }
         )
 
@@ -186,7 +186,7 @@ class HomeActivity : AppCompatActivity() {
             fun handleTags(maybeTags: List<Tag>?) {
                 if (maybeTags == null) {
                     if (loadedFromCache)
-                        drawer!!.addItem(PrimaryDrawerItem().withName(getString(R.string.drawer_error_loading_tags)))
+                        drawer!!.addItem(PrimaryDrawerItem().withName(getString(R.string.drawer_error_loading_tags)).withSelectable(false))
                 }
                 else {
                     for (tag in maybeTags) {
@@ -213,7 +213,7 @@ class HomeActivity : AppCompatActivity() {
             fun handleSources(maybeSources: List<Sources>?) {
                 if (maybeSources == null) {
                     if (loadedFromCache)
-                        drawer!!.addItem(PrimaryDrawerItem().withName(getString(R.string.drawer_error_loading_sources)))
+                        drawer!!.addItem(PrimaryDrawerItem().withName(getString(R.string.drawer_error_loading_sources)).withSelectable(false))
                 }
                 else
                     for (tag in maybeSources)
@@ -234,6 +234,7 @@ class HomeActivity : AppCompatActivity() {
                 drawer!!.addItem(
                     PrimaryDrawerItem()
                         .withName(getString(R.string.drawer_item_filters))
+                        .withSelectable(false)
                         .withIdentifier(DRAWER_ID_FILTERS)
                         .withBadge(getString(R.string.drawer_action_clear))
                         .withOnDrawerItemClickListener { _, _, _ ->
@@ -249,6 +250,7 @@ class HomeActivity : AppCompatActivity() {
                         .withName(getString(R.string.drawer_item_sources))
                         .withIdentifier(DRAWER_ID_TAGS)
                         .withBadge(getString(R.string.drawer_action_edit))
+                        .withSelectable(false)
                         .withOnDrawerItemClickListener { _, _, _ ->
                             startActivity(Intent(this, SourcesActivity::class.java))
                             false
@@ -257,8 +259,6 @@ class HomeActivity : AppCompatActivity() {
                 handleSources(maybeDrawerData.sources)
 
 
-                drawer!!.addItem(DividerDrawerItem())
-
                 if (!loadedFromCache)
                     Reservoir.putAsync("drawerData", maybeDrawerData, object : ReservoirPutCallback {
                         override fun onSuccess() {}