diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index e16086e5b..e5c802aa5 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -7,9 +7,9 @@ import androidx.preference.PreferenceManager import com.tfcporciuncula.flow.FlowSharedPreferences import com.tfcporciuncula.flow.Preference import eu.kanade.tachiyomi.R -import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_COMPACT_GRID import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_COMPACT_GRID import eu.kanade.tachiyomi.data.track.TrackService import eu.kanade.tachiyomi.data.track.anilist.Anilist import java.io.File diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt index 7b1292ebb..68982fea4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationController.kt @@ -25,8 +25,7 @@ import uy.kohesive.injekt.api.get class MigrationController : NucleusController(), FlexibleAdapter.OnItemClickListener, - SourceAdapter.OnSelectClickListener, - SourceAdapter.OnAutoClickListener, + SourceAdapter.OnAllClickListener, MigrationInterface { private var adapter: FlexibleAdapter>? = null @@ -122,11 +121,7 @@ class MigrationController : return false } - override fun onSelectClick(position: Int) { - onItemClick(view, position) - } - - override fun onAutoClick(position: Int) { + override fun onAllClick(position: Int) { val item = adapter?.getItem(position) as? SourceItem ?: return launchUI { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceAdapter.kt index 15e90a28d..e09ada28a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceAdapter.kt @@ -21,28 +21,16 @@ class SourceAdapter(val controller: MigrationController) : setDisplayHeadersAtStartUp(true) } - /** - * Listener for browse item clicks. - */ - val selectClickListener: OnSelectClickListener? = controller - - /** - * Listener which should be called when user clicks select. - */ - interface OnSelectClickListener { - fun onSelectClick(position: Int) - } - /** * Listener for auto item clicks. */ - val autoClickListener: OnAutoClickListener? = controller + val allClickListener: OnAllClickListener? = controller /** * Listener which should be called when user clicks select. */ - interface OnAutoClickListener { - fun onAutoClick(position: Int) + interface OnAllClickListener { + fun onAllClick(position: Int) } override fun updateDataSet(items: MutableList>?) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceHolder.kt index d1fb505e8..fdc94778e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/SourceHolder.kt @@ -1,10 +1,10 @@ package eu.kanade.tachiyomi.ui.browse.migration import android.view.View -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder +import eu.kanade.tachiyomi.util.view.gone import io.github.mthli.slice.Slice import kotlinx.android.synthetic.main.source_main_controller_card_item.card import kotlinx.android.synthetic.main.source_main_controller_card_item.image @@ -24,13 +24,10 @@ class SourceHolder(view: View, override val adapter: SourceAdapter) : get() = card init { - source_latest.text = "Auto" - source_browse.setText(R.string.select) - source_browse.setOnClickListener { - adapter.selectClickListener?.onSelectClick(bindingAdapterPosition) - } + source_browse.gone() + source_latest.text = "All" source_latest.setOnClickListener { - adapter.autoClickListener?.onAutoClick(bindingAdapterPosition) + adapter.allClickListener?.onAllClick(bindingAdapterPosition) } } diff --git a/app/src/main/res/values/strings_extra.xml b/app/src/main/res/values/strings_extra.xml index d6ea2863e..e9e697fc3 100644 --- a/app/src/main/res/values/strings_extra.xml +++ b/app/src/main/res/values/strings_extra.xml @@ -15,7 +15,6 @@ Search manually Migrate now Copy now - Comfortable grid