Migration ui change, remove select and replace auto with all

This commit is contained in:
Jobobby04 2020-05-25 15:03:10 -04:00
parent 6523826a55
commit a462e508cd
5 changed files with 10 additions and 31 deletions

View File

@ -7,9 +7,9 @@ import androidx.preference.PreferenceManager
import com.tfcporciuncula.flow.FlowSharedPreferences import com.tfcporciuncula.flow.FlowSharedPreferences
import com.tfcporciuncula.flow.Preference import com.tfcporciuncula.flow.Preference
import eu.kanade.tachiyomi.R 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.PreferenceKeys as Keys
import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values 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.TrackService
import eu.kanade.tachiyomi.data.track.anilist.Anilist import eu.kanade.tachiyomi.data.track.anilist.Anilist
import java.io.File import java.io.File

View File

@ -25,8 +25,7 @@ import uy.kohesive.injekt.api.get
class MigrationController : class MigrationController :
NucleusController<MigrationControllerBinding, MigrationPresenter>(), NucleusController<MigrationControllerBinding, MigrationPresenter>(),
FlexibleAdapter.OnItemClickListener, FlexibleAdapter.OnItemClickListener,
SourceAdapter.OnSelectClickListener, SourceAdapter.OnAllClickListener,
SourceAdapter.OnAutoClickListener,
MigrationInterface { MigrationInterface {
private var adapter: FlexibleAdapter<IFlexible<*>>? = null private var adapter: FlexibleAdapter<IFlexible<*>>? = null
@ -122,11 +121,7 @@ class MigrationController :
return false return false
} }
override fun onSelectClick(position: Int) { override fun onAllClick(position: Int) {
onItemClick(view, position)
}
override fun onAutoClick(position: Int) {
val item = adapter?.getItem(position) as? SourceItem ?: return val item = adapter?.getItem(position) as? SourceItem ?: return
launchUI { launchUI {

View File

@ -21,28 +21,16 @@ class SourceAdapter(val controller: MigrationController) :
setDisplayHeadersAtStartUp(true) 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. * Listener for auto item clicks.
*/ */
val autoClickListener: OnAutoClickListener? = controller val allClickListener: OnAllClickListener? = controller
/** /**
* Listener which should be called when user clicks select. * Listener which should be called when user clicks select.
*/ */
interface OnAutoClickListener { interface OnAllClickListener {
fun onAutoClick(position: Int) fun onAllClick(position: Int)
} }
override fun updateDataSet(items: MutableList<IFlexible<*>>?) { override fun updateDataSet(items: MutableList<IFlexible<*>>?) {

View File

@ -1,10 +1,10 @@
package eu.kanade.tachiyomi.ui.browse.migration package eu.kanade.tachiyomi.ui.browse.migration
import android.view.View import android.view.View
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.source.icon
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder
import eu.kanade.tachiyomi.util.view.gone
import io.github.mthli.slice.Slice 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.card
import kotlinx.android.synthetic.main.source_main_controller_card_item.image 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 get() = card
init { init {
source_latest.text = "Auto" source_browse.gone()
source_browse.setText(R.string.select) source_latest.text = "All"
source_browse.setOnClickListener {
adapter.selectClickListener?.onSelectClick(bindingAdapterPosition)
}
source_latest.setOnClickListener { source_latest.setOnClickListener {
adapter.autoClickListener?.onAutoClick(bindingAdapterPosition) adapter.allClickListener?.onAllClick(bindingAdapterPosition)
} }
} }

View File

@ -15,7 +15,6 @@
<string name="action_search_manually">Search manually</string> <string name="action_search_manually">Search manually</string>
<string name="action_migrate_now">Migrate now</string> <string name="action_migrate_now">Migrate now</string>
<string name="action_copy_now">Copy now</string> <string name="action_copy_now">Copy now</string>
<string name="action_display_comfortable_grid">Comfortable grid</string>
<!-- Preferences --> <!-- Preferences -->
<!-- Filter --> <!-- Filter -->