diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt index 6e27b07bd1..8c415ba081 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -73,7 +73,7 @@ object PreferenceKeys { const val lastUsedCategory = "last_used_category" - const val catalogueAsList = "pref_display_catalogue_as_list" + const val catalogueDisplayMode = "pref_display_catalogue_display_mode" const val enabledLanguages = "source_languages" @@ -131,7 +131,7 @@ object PreferenceKeys { const val downloadNewCategories = "download_new_categories" - const val libraryAsList = "pref_display_library_as_list" + const val libraryDisplayMode = "pref_display_library_display_mode" const val lang = "app_language" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt index 3e1a5a3231..19ab786265 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt @@ -15,4 +15,8 @@ object PreferenceValues { const val THEME_DARK_DEFAULT = "default" const val THEME_DARK_BLUE = "blue" const val THEME_DARK_AMOLED = "amoled" + + const val DISPLAY_COMPACT_GRID = 0 + const val DISPLAY_LIST = 1 + const val DISPLAY_COMFORTABLE_GRID = 2 } 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 e893ba3c0d..96ffdd6499 100644 --- 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,6 +7,7 @@ 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.track.TrackService @@ -138,7 +139,7 @@ class PreferencesHelper(val context: Context) { fun lastVersionCode() = flowPrefs.getInt("last_version_code", 0) - fun catalogueAsList() = flowPrefs.getBoolean(Keys.catalogueAsList, false) + fun catalogueDisplayMode() = flowPrefs.getInt(Keys.catalogueDisplayMode, DISPLAY_COMPACT_GRID) fun enabledLanguages() = flowPrefs.getStringSet(Keys.enabledLanguages, setOf("en", Locale.getDefault().language)) @@ -184,7 +185,7 @@ class PreferencesHelper(val context: Context) { fun libraryUpdatePrioritization() = flowPrefs.getInt(Keys.libraryUpdatePrioritization, 0) - fun libraryAsList() = flowPrefs.getBoolean(Keys.libraryAsList, false) + fun libraryDisplayMode() = flowPrefs.getInt(Keys.libraryDisplayMode, DISPLAY_COMPACT_GRID) fun downloadBadge() = flowPrefs.getBoolean(Keys.downloadBadge, false) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt index 88495ba0d2..48fd8579eb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt @@ -22,6 +22,9 @@ import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Category import eu.kanade.tachiyomi.data.database.models.Manga +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_COMFORTABLE_GRID +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_COMPACT_GRID +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_LIST import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.asImmediateFlow import eu.kanade.tachiyomi.databinding.SourceControllerBinding @@ -187,7 +190,7 @@ open class BrowseSourceController(bundle: Bundle) : binding.catalogueView.removeView(oldRecycler) } - val recycler = if (presenter.isListMode) { + val recycler = if (preferences.catalogueDisplayMode().get() == DISPLAY_LIST) { RecyclerView(view.context).apply { id = R.id.recycler layoutManager = LinearLayoutManager(context) @@ -205,7 +208,7 @@ open class BrowseSourceController(bundle: Bundle) : (layoutManager as GridLayoutManager).spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { override fun getSpanSize(position: Int): Int { return when (adapter?.getItemViewType(position)) { - R.layout.source_grid_item, null -> 1 + R.layout.source_grid_item, R.layout.source_comfortable_grid_item, null -> 1 else -> spanCount } } @@ -266,15 +269,13 @@ open class BrowseSourceController(bundle: Bundle) : } ) - // Show next display mode - menu.findItem(R.id.action_display_mode).apply { - val icon = if (presenter.isListMode) { - R.drawable.ic_view_module_24dp - } else { - R.drawable.ic_view_list_24dp - } - setIcon(icon) + val displayItem = when (preferences.catalogueDisplayMode().get()) { + DISPLAY_COMPACT_GRID -> R.id.action_compact_grid + DISPLAY_LIST -> R.id.action_list + DISPLAY_COMFORTABLE_GRID -> R.id.action_comfortable_grid + else -> throw NotImplementedError("Unimplemented display") } + menu.findItem(displayItem).isChecked = true } override fun onPrepareOptionsMenu(menu: Menu) { @@ -290,7 +291,9 @@ open class BrowseSourceController(bundle: Bundle) : override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.action_search -> expandActionViewFromInteraction = true - R.id.action_display_mode -> swapDisplayMode() + R.id.action_compact_grid -> setDisplayMode(DISPLAY_COMPACT_GRID) + R.id.action_list -> setDisplayMode(DISPLAY_LIST) + R.id.action_comfortable_grid -> setDisplayMode(DISPLAY_COMFORTABLE_GRID) R.id.action_open_in_web_view -> openInWebView() R.id.action_local_source_help -> openLocalSourceHelpGuide() } @@ -433,17 +436,19 @@ open class BrowseSourceController(bundle: Bundle) : } /** - * Swaps the current display mode. + * Sets the current display mode. + * + * @param mode the mode to change to */ - private fun swapDisplayMode() { + private fun setDisplayMode(mode: Int) { val view = view ?: return val adapter = adapter ?: return - presenter.swapDisplayMode() - val isListMode = presenter.isListMode + preferences.catalogueDisplayMode().set(mode) + presenter.refreshDisplayMode() activity?.invalidateOptionsMenu() setupRecycler(view) - if (!isListMode || !view.context.connectivityManager.isActiveNetworkMetered) { + if (mode == DISPLAY_LIST || !view.context.connectivityManager.isActiveNetworkMetered) { // Initialize mangas if going to grid view or if over wifi when going to list view val mangas = (0 until adapter.itemCount).mapNotNull { (adapter.getItem(it) as? SourceItem)?.manga diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt index a7aec42790..cce518d2d3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt @@ -87,12 +87,6 @@ open class BrowseSourcePresenter( */ private val mangaDetailSubject = PublishSubject.create>() - /** - * Whether the view is in list mode or not. - */ - var isListMode: Boolean = false - private set - /** * Subscription for the pager. */ @@ -119,7 +113,6 @@ open class BrowseSourcePresenter( query = savedState.getString(::query.name, "") } - isListMode = prefs.catalogueAsList().get() restartPager() } @@ -145,7 +138,7 @@ open class BrowseSourcePresenter( val sourceId = source.id - val catalogueAsList = prefs.catalogueAsList() + val catalogueDisplayMode = prefs.catalogueDisplayMode() // Prepare the pager. pagerSubscription?.let { remove(it) } @@ -153,7 +146,7 @@ open class BrowseSourcePresenter( .observeOn(Schedulers.io()) .map { pair -> pair.first to pair.second.map { networkToLocalManga(it, sourceId) } } .doOnNext { initializeMangas(it.second) } - .map { pair -> pair.first to pair.second.map { SourceItem(it, catalogueAsList) } } + .map { pair -> pair.first to pair.second.map { SourceItem(it, catalogueDisplayMode) } } .observeOn(AndroidSchedulers.mainThread()) .subscribeReplay( { view, (page, mangas) -> @@ -273,12 +266,9 @@ open class BrowseSourcePresenter( } /** - * Changes the active display mode. + * Refreshes the active display mode. */ - fun swapDisplayMode() { - val mode = !isListMode - prefs.catalogueAsList().set(mode) - isListMode = mode + fun refreshDisplayMode() { subscribeToMangaInitializer() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt new file mode 100644 index 0000000000..1b2565ebd3 --- /dev/null +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt @@ -0,0 +1,56 @@ +package eu.kanade.tachiyomi.ui.browse.source.browse + +import android.view.View +import com.bumptech.glide.load.engine.DiskCacheStrategy +import eu.davidea.flexibleadapter.FlexibleAdapter +import eu.kanade.tachiyomi.data.database.models.Manga +import eu.kanade.tachiyomi.data.glide.GlideApp +import eu.kanade.tachiyomi.data.glide.toMangaThumbnail +import eu.kanade.tachiyomi.widget.StateImageViewTarget +import kotlinx.android.synthetic.main.source_comfortable_grid_item.card +import kotlinx.android.synthetic.main.source_comfortable_grid_item.progress +import kotlinx.android.synthetic.main.source_comfortable_grid_item.thumbnail +import kotlinx.android.synthetic.main.source_comfortable_grid_item.title + +/** + * Class used to hold the displayed data of a manga in the catalogue, like the cover or the title. + * All the elements from the layout file "item_source_grid" are available in this class. + * + * @param view the inflated view for this holder. + * @param adapter the adapter handling this holder. + * @constructor creates a new catalogue holder. + */ +class SourceComfortableGridHolder(private val view: View, private val adapter: FlexibleAdapter<*>) : + SourceGridHolder(view, adapter) { + + /** + * Method called from [CatalogueAdapter.onBindViewHolder]. It updates the data for this + * holder with the given manga. + * + * @param manga the manga to bind. + */ + override fun onSetValues(manga: Manga) { + // Set manga title + title.text = manga.title + + // Set alpha of thumbnail. + thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f + + setImage(manga) + } + + override fun setImage(manga: Manga) { + // Setting this via XML doesn't work + card.clipToOutline = true + + GlideApp.with(view.context).clear(thumbnail) + if (!manga.thumbnail_url.isNullOrEmpty()) { + GlideApp.with(view.context) + .load(manga.toMangaThumbnail()) + .diskCacheStrategy(DiskCacheStrategy.DATA) + .centerCrop() + .placeholder(android.R.color.transparent) + .into(StateImageViewTarget(thumbnail, progress)) + } + } +} diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt index 360df59bd8..887debb1d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceGridHolder.kt @@ -20,7 +20,7 @@ import kotlinx.android.synthetic.main.source_grid_item.title * @param adapter the adapter handling this holder. * @constructor creates a new catalogue holder. */ -class SourceGridHolder(private val view: View, private val adapter: FlexibleAdapter<*>) : +open class SourceGridHolder(private val view: View, private val adapter: FlexibleAdapter<*>) : SourceHolder(view, adapter) { /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt index 2cff080efe..50b3ccc539 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt @@ -4,6 +4,7 @@ import android.view.Gravity import android.view.View import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.widget.FrameLayout +import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView import com.tfcporciuncula.flow.Preference import eu.davidea.flexibleadapter.FlexibleAdapter @@ -11,18 +12,20 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Manga +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_COMPACT_GRID +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_LIST import eu.kanade.tachiyomi.widget.AutofitRecyclerView import kotlinx.android.synthetic.main.source_grid_item.view.card import kotlinx.android.synthetic.main.source_grid_item.view.gradient -class SourceItem(val manga: Manga, private val catalogueAsList: Preference) : +class SourceItem(val manga: Manga, private val catalogueDisplayMode: Preference) : AbstractFlexibleItem() { override fun getLayoutRes(): Int { - return if (catalogueAsList.get()) { - R.layout.source_list_item - } else { - R.layout.source_grid_item + return when (catalogueDisplayMode.get()) { + DISPLAY_COMPACT_GRID -> R.layout.source_grid_item + DISPLAY_LIST -> R.layout.source_list_item + else -> R.layout.source_comfortable_grid_item } } @@ -32,15 +35,28 @@ class SourceItem(val manga: Manga, private val catalogueAsList: Preference> +) : LibraryGridHolder(view, adapter) { + + /** + * Method called from [LibraryCategoryAdapter.onBindViewHolder]. It updates the data for this + * holder with the given manga. + * + * @param item the manga item to bind. + */ + override fun onSetValues(item: LibraryItem) { + // Update the title of the manga. + title.text = item.manga.title + + // Update the unread count and its visibility. + with(unread_text) { + visibleIf { item.unreadCount > 0 } + text = item.unreadCount.toString() + } + // Update the download count and its visibility. + with(download_text) { + visibleIf { item.downloadCount > 0 } + text = item.downloadCount.toString() + } + // set local visibility if its local manga + local_text.visibleIf { item.manga.isLocal() } + + // Setting this via XML doesn't work + card.clipToOutline = true + + // Update the cover. + GlideApp.with(view.context).clear(thumbnail) + GlideApp.with(view.context) + .load(item.manga.toMangaThumbnail()) + .diskCacheStrategy(DiskCacheStrategy.RESOURCE) + .centerCrop() + .dontAnimate() + .into(thumbnail) + } +} diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt index a8e3ea1dcc..abcf50d2a3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt @@ -23,7 +23,7 @@ import kotlinx.android.synthetic.main.source_grid_item.unread_text * @param listener a listener to react to single tap and long tap events. * @constructor creates a new library holder. */ -class LibraryGridHolder( +open class LibraryGridHolder( private val view: View, private val adapter: FlexibleAdapter<*> ) : LibraryHolder(view, adapter) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt index 6fd156c92e..053c8657c9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt @@ -4,6 +4,7 @@ import android.view.Gravity import android.view.View import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.widget.FrameLayout +import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView import com.tfcporciuncula.flow.Preference import eu.davidea.flexibleadapter.FlexibleAdapter @@ -12,6 +13,8 @@ import eu.davidea.flexibleadapter.items.IFilterable import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.LibraryManga +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_COMPACT_GRID +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_LIST import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.widget.AutofitRecyclerView import kotlinx.android.synthetic.main.source_grid_item.view.card @@ -19,7 +22,7 @@ import kotlinx.android.synthetic.main.source_grid_item.view.gradient import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -class LibraryItem(val manga: LibraryManga, private val libraryAsList: Preference) : +class LibraryItem(val manga: LibraryManga, private val libraryDisplayMode: Preference) : AbstractFlexibleItem(), IFilterable { private val sourceManager: SourceManager = Injekt.get() @@ -28,24 +31,36 @@ class LibraryItem(val manga: LibraryManga, private val libraryAsList: Preference var unreadCount = -1 override fun getLayoutRes(): Int { - return if (libraryAsList.get()) { - R.layout.source_list_item - } else { - R.layout.source_grid_item + return when (libraryDisplayMode.get()) { + DISPLAY_COMPACT_GRID -> R.layout.source_grid_item + DISPLAY_LIST -> R.layout.source_list_item + else -> R.layout.source_comfortable_grid_item } } override fun createViewHolder(view: View, adapter: FlexibleAdapter>): LibraryHolder { val parent = adapter.recyclerView return if (parent is AutofitRecyclerView) { - view.apply { - val coverHeight = parent.itemWidth / 3 * 4 - card.layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, coverHeight) - gradient.layoutParams = FrameLayout.LayoutParams( - MATCH_PARENT, coverHeight / 2, Gravity.BOTTOM - ) + val coverHeight = parent.itemWidth / 3 * 4 + if (libraryDisplayMode.get() == DISPLAY_COMPACT_GRID) { + view.apply { + card.layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, coverHeight) + gradient.layoutParams = FrameLayout.LayoutParams( + MATCH_PARENT, coverHeight / 2, Gravity.BOTTOM + ) + } + LibraryGridHolder(view, adapter) + } else { + view.apply { + card.layoutParams = ConstraintLayout.LayoutParams( + MATCH_PARENT, coverHeight + ) + gradient.layoutParams = FrameLayout.LayoutParams( + MATCH_PARENT, coverHeight / 2, Gravity.BOTTOM + ) + } + LibraryComfortableGridHolder(view, adapter) } - LibraryGridHolder(view, adapter) } else { LibraryListHolder(view, adapter) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index f004641bb1..467e4f5eda 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -266,10 +266,10 @@ class LibraryPresenter( * value. */ private fun getLibraryMangasObservable(): Observable { - val libraryAsList = preferences.libraryAsList() + val libraryDisplayMode = preferences.libraryDisplayMode() return db.getLibraryMangas().asRxObservable() .map { list -> - list.map { LibraryItem(it, libraryAsList) }.groupBy { it.manga.category } + list.map { LibraryItem(it, libraryDisplayMode) }.groupBy { it.manga.category } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt index a7e96eb67a..c160dcbc91 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt @@ -5,6 +5,9 @@ import android.content.Context import android.util.AttributeSet import android.view.View import eu.kanade.tachiyomi.R +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_COMFORTABLE_GRID +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_COMPACT_GRID +import eu.kanade.tachiyomi.data.preference.PreferenceValues.DISPLAY_LIST import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.widget.ExtendedNavigationView import eu.kanade.tachiyomi.widget.TabbedBottomSheetDialog @@ -183,16 +186,18 @@ class LibrarySettingsSheet( inner class DisplayGroup : Group { private val grid = Item.Radio(R.string.action_display_grid, this) + private val comfortableGrid = Item.Radio(R.string.action_display_comfortable_grid, this) private val list = Item.Radio(R.string.action_display_list, this) override val header = null - override val items = listOf(grid, list) + override val items = listOf(grid, comfortableGrid, list) override val footer = null override fun initModels() { - val asList = preferences.libraryAsList().get() - grid.checked = !asList - list.checked = asList + val mode = preferences.libraryDisplayMode().get() + grid.checked = mode == DISPLAY_COMPACT_GRID + list.checked = mode == DISPLAY_LIST + comfortableGrid.checked = mode == DISPLAY_COMFORTABLE_GRID } override fun onItemClicked(item: Item) { @@ -202,7 +207,13 @@ class LibrarySettingsSheet( item.group.items.forEach { (it as Item.Radio).checked = false } item.checked = true - preferences.libraryAsList().set(item == list) + preferences.libraryDisplayMode().set( + when (item) { + grid -> DISPLAY_COMPACT_GRID + list -> DISPLAY_LIST + else -> DISPLAY_COMFORTABLE_GRID + } + ) item.group.items.forEach { adapter.notifyItemChanged(it) } } diff --git a/app/src/main/res/layout/source_comfortable_grid_item.xml b/app/src/main/res/layout/source_comfortable_grid_item.xml new file mode 100644 index 0000000000..376bd49071 --- /dev/null +++ b/app/src/main/res/layout/source_comfortable_grid_item.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/source_browse.xml b/app/src/main/res/menu/source_browse.xml index 94e3a80cec..e98a68bb42 100644 --- a/app/src/main/res/menu/source_browse.xml +++ b/app/src/main/res/menu/source_browse.xml @@ -10,11 +10,24 @@ app:showAsAction="collapseActionView|ifRoom" /> + app:showAsAction="ifRoom"> + + + + + + + + Migrate Display mode Display - Grid + Compact grid List + Comfortable grid Download badges Unread badges Hide