From ede0892cdaefc36d12bcdc6f5c519c75c48c0011 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 11 Apr 2021 20:43:34 -0400
Subject: [PATCH] Cleanup and fixes

---
 .../tachiyomi/data/updater/github/GithubUpdateChecker.kt      | 4 ++--
 .../eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt   | 2 +-
 .../eu/kanade/tachiyomi/ui/browse/source/SourceController.kt  | 2 +-
 app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 1 -
 .../main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 1 -
 .../kanade/tachiyomi/ui/setting/SettingsDownloadController.kt | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt
index 8891e43fc..90e1f12a6 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/github/GithubUpdateChecker.kt
@@ -32,8 +32,8 @@ class GithubUpdateChecker {
                 .parseAs<GithubRelease>()
                 .let {
                     // Check if latest version is different from current version
-        			if (/* SY --> */ isNewVersionSY(it.version) /* SY <-- */) {
-						GithubUpdateResult.NewUpdate(it)
+                    if (/* SY --> */ isNewVersionSY(it.version) /* SY <-- */) {
+                        GithubUpdateResult.NewUpdate(it)
                     } else {
                         GithubUpdateResult.NoNewUpdate()
                     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
index 353fe6dae..60074ba4c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
@@ -32,7 +32,7 @@ internal class ExtensionGithubApi {
                 .let { parseResponse(it) }
         } /* SY --> */ + preferences.extensionRepos().get().flatMap { repoPath ->
             val url = "$BASE_URL$repoPath/repo/"
-        	networkService.client
+            networkService.client
                 .newCall(GET("${url}index.min.json"))
                 .await()
                 .parseAs<JsonArray>()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
index 3eb092123..e9e9e3636 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
@@ -203,7 +203,7 @@ class SourceController(bundle: Bundle? = null) :
 
         items.add(
             Pair(
-                activity.getString(R.string.label_categories),
+                activity.getString(R.string.categories),
                 { addToCategories(item.source) }
             )
         )
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index b9cc2f368..67e235b8d 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -25,7 +25,6 @@ import com.bluelinelabs.conductor.RouterTransaction
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.behavior.HideBottomViewOnScrollBehavior
 import dev.chrisbanes.insetter.applyInsetter
-import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
 import eu.kanade.tachiyomi.data.preference.asImmediateFlow
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index bf754c8e7..873af5aa9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -15,7 +15,6 @@ import android.view.Gravity
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MotionEvent
-import android.view.View
 import android.view.WindowManager
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
index 1607f5e34..7f81eb831 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
@@ -338,7 +338,7 @@ class SettingsDownloadController : SettingsController() {
                 .toIntArray()
 
             return MaterialDialog(activity!!)
-                .title(R.string.pref_download_new_categories)
+                .title(R.string.categories)
                 .listItemsMultiChoice(
                     items = items,
                     initialSelection = preselected