From 5914346ace11e84da3c246334935b84d34383203 Mon Sep 17 00:00:00 2001 From: inorichi Date: Tue, 16 May 2017 14:11:23 +0200 Subject: [PATCH] Remove unused classes and arrays resources --- .../ui/setting/SettingsBackupController.kt | 9 +- .../ui/setting/SettingsDownloadController.kt | 107 ++++++++----- .../widget/DeletingChaptersDialog.kt | 22 --- .../widget/preference/LibraryColumnsDialog.kt | 55 ------- .../preference/SimpleDialogPreference.kt | 11 -- app/src/main/res/values/arrays.xml | 150 ------------------ 6 files changed, 70 insertions(+), 284 deletions(-) delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/widget/DeletingChaptersDialog.kt delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.kt delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/widget/preference/SimpleDialogPreference.kt diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt index 8c6d28dd25..4734e3de74 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt @@ -229,10 +229,15 @@ class SettingsBackupController : SettingsController() { class CreateBackupDialog : DialogController() { override fun onCreateDialog(savedViewState: Bundle?): Dialog { - return MaterialDialog.Builder(activity!!) + val activity = activity!! + val options = arrayOf(R.string.manga, R.string.categories, R.string.chapters, + R.string.track, R.string.history) + .map { activity.getString(it) } + + return MaterialDialog.Builder(activity) .title(R.string.pref_create_backup) .content(R.string.backup_choice) - .items(R.array.backup_options) + .items(options) .itemsDisabledIndices(0) .itemsCallbackMultiChoice(arrayOf(0, 1, 2, 3, 4), { _, positions, _ -> var flags = 0 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 71a6409d0b..e1fa81e5ed 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 @@ -1,9 +1,11 @@ package eu.kanade.tachiyomi.ui.setting import android.app.Activity +import android.app.Dialog import android.content.Intent import android.net.Uri import android.os.Build +import android.os.Bundle import android.os.Environment import android.support.v4.content.ContextCompat import android.support.v7.preference.PreferenceScreen @@ -12,9 +14,13 @@ import com.hippo.unifile.UniFile import com.nononsenseapps.filepicker.FilePickerActivity import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper +import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.getOrDefault +import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.util.DiskUtil import eu.kanade.tachiyomi.widget.CustomLayoutPickerActivity +import uy.kohesive.injekt.Injekt +import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy import java.io.File import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys @@ -30,7 +36,9 @@ class SettingsDownloadController : SettingsController() { key = Keys.downloadsDirectory titleRes = R.string.pref_download_directory onClick { - showDownloadDirectoriesDialog() + val ctrl = DownloadDirectoriesDialog() + ctrl.targetController = this@SettingsDownloadController + ctrl.showDialog(router) } preferences.downloadsDirectory().asObservable() @@ -115,49 +123,6 @@ class SettingsDownloadController : SettingsController() { } } - private fun showDownloadDirectoriesDialog() { - val activity = activity ?: return - - val currentDir = preferences.downloadsDirectory().getOrDefault() - val externalDirs = getExternalFilesDirs() + File(activity.getString(R.string.custom_dir)) - val selectedIndex = externalDirs.map(File::toString).indexOfFirst { it in currentDir } - - MaterialDialog.Builder(activity) - .items(externalDirs) - .itemsCallbackSingleChoice(selectedIndex, { _, _, which, text -> - if (which == externalDirs.lastIndex) { - if (Build.VERSION.SDK_INT < 21) { - // Custom dir selected, open directory selector - val i = Intent(activity, CustomLayoutPickerActivity::class.java) - i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false) - i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true) - i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR) - i.putExtra(FilePickerActivity.EXTRA_START_PATH, currentDir) - - startActivityForResult(i, DOWNLOAD_DIR_PRE_L) - } else { - val i = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE) - startActivityForResult(i, DOWNLOAD_DIR_L) - } - } else { - // One of the predefined folders was selected - val path = Uri.fromFile(File(text.toString())) - preferences.downloadsDirectory().set(path.toString()) - } - true - }) - .show() - } - - private fun getExternalFilesDirs(): List { - val defaultDir = Environment.getExternalStorageDirectory().absolutePath + - File.separator + resources?.getString(R.string.app_name) + - File.separator + "downloads" - - return mutableListOf(File(defaultDir)) + - ContextCompat.getExternalFilesDirs(activity, "").filterNotNull() - } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { when (requestCode) { DOWNLOAD_DIR_PRE_L -> if (data != null && resultCode == Activity.RESULT_OK) { @@ -179,6 +144,60 @@ class SettingsDownloadController : SettingsController() { } } + fun predefinedDirectorySelected(selectedDir: String) { + val path = Uri.fromFile(File(selectedDir)) + preferences.downloadsDirectory().set(path.toString()) + } + + fun customDirectorySelected(currentDir: String) { + if (Build.VERSION.SDK_INT < 21) { + val i = Intent(activity, CustomLayoutPickerActivity::class.java) + i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false) + i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true) + i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR) + i.putExtra(FilePickerActivity.EXTRA_START_PATH, currentDir) + + startActivityForResult(i, DOWNLOAD_DIR_PRE_L) + } else { + val i = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE) + startActivityForResult(i, DOWNLOAD_DIR_L) + } + } + + class DownloadDirectoriesDialog : DialogController() { + + private val preferences: PreferencesHelper = Injekt.get() + + override fun onCreateDialog(savedViewState: Bundle?): Dialog { + val activity = activity!! + val currentDir = preferences.downloadsDirectory().getOrDefault() + val externalDirs = getExternalDirs() + File(activity.getString(R.string.custom_dir)) + val selectedIndex = externalDirs.map(File::toString).indexOfFirst { it in currentDir } + + return MaterialDialog.Builder(activity) + .items(externalDirs) + .itemsCallbackSingleChoice(selectedIndex, { _, _, which, text -> + val target = targetController as? SettingsDownloadController + if (which == externalDirs.lastIndex) { + target?.customDirectorySelected(currentDir) + } else { + target?.predefinedDirectorySelected(text.toString()) + } + true + }) + .build() + } + + private fun getExternalDirs(): List { + val defaultDir = Environment.getExternalStorageDirectory().absolutePath + + File.separator + resources?.getString(R.string.app_name) + + File.separator + "downloads" + + return mutableListOf(File(defaultDir)) + + ContextCompat.getExternalFilesDirs(activity, "").filterNotNull() + } + } + private companion object { const val DOWNLOAD_DIR_PRE_L = 103 const val DOWNLOAD_DIR_L = 104 diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/DeletingChaptersDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/DeletingChaptersDialog.kt deleted file mode 100644 index 4a1d861617..0000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/DeletingChaptersDialog.kt +++ /dev/null @@ -1,22 +0,0 @@ -package eu.kanade.tachiyomi.widget - -import android.app.Dialog -import android.os.Bundle -import android.support.v4.app.DialogFragment -import com.afollestad.materialdialogs.MaterialDialog -import eu.kanade.tachiyomi.R - -class DeletingChaptersDialog : DialogFragment() { - - companion object { - const val TAG = "deleting_dialog" - } - - override fun onCreateDialog(savedState: Bundle?): Dialog { - return MaterialDialog.Builder(activity) - .progress(true, 0) - .content(R.string.deleting) - .build() - } - -} \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.kt deleted file mode 100644 index 1577f424de..0000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.kt +++ /dev/null @@ -1,55 +0,0 @@ -package eu.kanade.tachiyomi.widget.preference - -import android.os.Bundle -import android.support.v7.preference.Preference -import android.support.v7.preference.PreferenceDialogFragmentCompat -import android.view.View -import eu.kanade.tachiyomi.data.preference.PreferencesHelper -import eu.kanade.tachiyomi.data.preference.getOrDefault -import kotlinx.android.synthetic.main.pref_library_columns.view.* -import uy.kohesive.injekt.injectLazy - -class LibraryColumnsDialog : PreferenceDialogFragmentCompat() { - - companion object { - - fun newInstance(preference: Preference): LibraryColumnsDialog { - val fragment = LibraryColumnsDialog() - val bundle = Bundle(1) - bundle.putString("key", preference.key) - fragment.arguments = bundle - return fragment - } - } - - var portrait: Int = 0 - var landscape: Int = 0 - - val preferences: PreferencesHelper by injectLazy() - - override fun onBindDialogView(view: View) { - super.onBindDialogView(view) - - portrait = preferences.portraitColumns().getOrDefault() - landscape = preferences.landscapeColumns().getOrDefault() - - view.portrait_columns.value = portrait - view.landscape_columns.value = landscape - - view.portrait_columns.setOnValueChangedListener { picker, oldValue, newValue -> - portrait = newValue - } - - view.landscape_columns.setOnValueChangedListener { picker, oldValue, newValue -> - landscape = newValue - } - } - - override fun onDialogClosed(positiveResult: Boolean) { - if (positiveResult) { - preferences.portraitColumns().set(portrait) - preferences.landscapeColumns().set(landscape) - } - } - -} diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SimpleDialogPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SimpleDialogPreference.kt deleted file mode 100644 index 7b31db1cbc..0000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/SimpleDialogPreference.kt +++ /dev/null @@ -1,11 +0,0 @@ -package eu.kanade.tachiyomi.widget.preference - -import android.content.Context -import android.support.v7.preference.DialogPreference -import android.support.v7.preference.R.attr -import android.util.AttributeSet - -open class SimpleDialogPreference @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = attr.dialogPreferenceStyle, defStyleRes: Int = 0) : - DialogPreference(context, attrs, defStyleAttr, defStyleRes) { - -} diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index c98f378880..9018a31f7c 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -22,18 +22,6 @@ @string/webtoon_viewer - - 1 - 2 - 3 - - - - @string/light_theme - @string/dark_theme - @string/amoled_theme - - @string/white_background @string/black_background @@ -44,38 +32,6 @@ 1 - - 1 - 2 - 3 - - - - 1 - 2 - 3 - 4 - 5 - - - - @string/disabled - @string/last_read_chapter - @string/second_to_last - @string/third_to_last - @string/fourth_to_last - @string/fifth_to_last - - - - -1 - 0 - 1 - 2 - 3 - 4 - - Image Rapid @@ -134,76 +90,6 @@ 4 - - @string/update_never - @string/update_1hour - @string/update_2hour - @string/update_3hour - @string/update_6hour - @string/update_12hour - @string/update_24hour - @string/update_48hour - - - - 0 - 1 - 2 - 3 - 6 - 12 - 24 - 48 - - - - @string/update_never - @string/update_6hour - @string/update_12hour - @string/update_24hour - @string/update_48hour - @string/update_weekly - - - - 0 - 6 - 12 - 24 - 48 - 168 - - - - @string/wifi - @string/charging - - - - wifi - ac - - - - @string/scale_type_fit_screen - - - - remove - - - - @string/label_library - @string/label_recent_manga - @string/label_recent_updates - - - - 1 - 2 - 3 - - @string/set_as_cover @string/action_share @@ -216,40 +102,4 @@ 2 - - @string/manga - @string/categories - @string/chapters - @string/track - @string/history - - - - 0 - 1 - 2 - 3 - 4 - - - - - bg - en - es - fr - it - pt - ru - vi - - - - @string/default_category_summary - - - - -1 - -