From 4a9151e4aa99a1edccf381f7251eacb8cf4cb41d Mon Sep 17 00:00:00 2001
From: inorichi <len@kanade.eu>
Date: Thu, 23 Nov 2017 18:38:51 +0100
Subject: [PATCH] Release 0.6.4

---
 app/build.gradle                                   |  4 ++--
 .../tachiyomi/ui/catalogue/CatalogueController.kt  |  2 +-
 .../ui/setting/SettingsGeneralController.kt        |  4 ++--
 app/src/main/res/raw/changelog_release.xml         | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9385300e1..4994c0755 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,8 +38,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 26
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 26
-        versionName "0.6.3"
+        versionCode 27
+        versionName "0.6.4"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt
index e9b79b108..2df28474e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt
@@ -101,7 +101,7 @@ open class CatalogueController(bundle: Bundle) :
     }
 
     override fun getTitle(): String? {
-        return presenter.source.toString()
+        return presenter.source.name
     }
 
     override fun createPresenter(): CataloguePresenter {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index 8719f746d..71e573f7d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -29,8 +29,8 @@ class SettingsGeneralController : SettingsController() {
         listPreference {
             key = Keys.lang
             titleRes = R.string.pref_language
-            entryValues = arrayOf("", "bg", "de", "en", "es", "fr", "it", "lv", "nl", "pl", "pt",
-                    "pt-BR", "ru", "vi")
+            entryValues = arrayOf("", "ar", "bg", "de", "en", "es", "fr", "id", "it", "lv", "ms",
+                    "nl", "pl", "pt", "pt-BR", "ru", "vi")
             entries = entryValues.map { value ->
                 val locale = LocaleHelper.getLocaleFromString(value.toString())
                 locale?.getDisplayName(locale)?.capitalize() ?:
diff --git a/app/src/main/res/raw/changelog_release.xml b/app/src/main/res/raw/changelog_release.xml
index 5a980679d..a7897d3c3 100644
--- a/app/src/main/res/raw/changelog_release.xml
+++ b/app/src/main/res/raw/changelog_release.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
+    <changelogversion versionName="v0.6.4" changeDate="">
+        <changelogtext>Added a global search feature with a new catalogue screen.</changelogtext>
+
+        <changelogtext>Added an option to show downloaded chapters badges in the library.</changelogtext>
+
+        <changelogtext>Added an scrollbar in the chapter list.</changelogtext>
+
+        <changelogtext>Fixed some issues with bundled catalogues.</changelogtext>
+
+        <changelogtext>Changed the page indicator in the reader to support devices with rounded corners.</changelogtext>
+
+        <changelogtext>Crash fixes.</changelogtext>
+    </changelogversion>
+
     <changelogversion versionName="v0.6.3" changeDate="">
         <changelogtext>Fixed a crash when retrying a page.</changelogtext>