Remove card backgrounds from browse lists

2024-10-01 06:49:52 +02:00 · 2020-09-26 19:03:46 -04:00 · 2020-09-26 19:03:46 -04:00 · a3c598a3e1
commit a3c598a3e1
parent 9ce8c5c160
15 changed files with 144 additions and 334 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -234,7 +234,6 @@ dependencies {
    implementation 'eu.davidea:flexible-adapter-ui:1.0.0'
    implementation 'com.nononsenseapps:filepicker:2.5.2'
    implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0'
-    implementation 'com.github.mthli:Slice:v1.3'
    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
    implementation 'com.github.carlosesco:DirectionalViewPager:a844dbca0a'

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/SlicedHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/SlicedHolder.kt
@ -1,70 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.holder
-
-import android.view.View
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.flexibleadapter.items.ISectionable
-import eu.kanade.tachiyomi.util.system.dpToPx
-import io.github.mthli.slice.Slice
-
-interface SlicedHolder {
-
-    val slice: Slice
-
-    val adapter: FlexibleAdapter<IFlexible<*>>
-
-    val viewToSlice: View
-
-    fun setCardEdges(item: ISectionable<*, *>) {
-        // Position of this item in its header. Defaults to 0 when header is null.
-        var position = 0
-
-        // Number of items in the header of this item. Defaults to 1 when header is null.
-        var count = 1
-
-        if (item.header != null) {
-            val sectionItems = adapter.getSectionItems(item.header)
-            position = sectionItems.indexOf(item)
-            count = sectionItems.size
-        }
-
-        when {
-            // Only one item in the card
-            count == 1 -> applySlice(2f, topRect = false, bottomRect = false, topShadow = true, bottomShadow = true)
-            // First item of the card
-            position == 0 -> applySlice(2f, topRect = false, bottomRect = true, topShadow = true, bottomShadow = false)
-            // Last item of the card
-            position == count - 1 -> applySlice(2f, topRect = true, bottomRect = false, topShadow = false, bottomShadow = true)
-            // Middle item
-            else -> applySlice(0f, topRect = false, bottomRect = false, topShadow = false, bottomShadow = false)
-        }
-    }
-
-    private fun applySlice(
-        radius: Float,
-        topRect: Boolean,
-        bottomRect: Boolean,
-        topShadow: Boolean,
-        bottomShadow: Boolean
-    ) {
-        val margin = margin
-
-        slice.setRadius(radius)
-        slice.showLeftTopRect(topRect)
-        slice.showRightTopRect(topRect)
-        slice.showLeftBottomRect(bottomRect)
-        slice.showRightBottomRect(bottomRect)
-        setMargins(margin, if (topShadow) margin else 0, margin, if (bottomShadow) margin else 0)
-    }
-
-    private fun setMargins(left: Int, top: Int, right: Int, bottom: Int) {
-        if (viewToSlice.layoutParams is ViewGroup.MarginLayoutParams) {
-            val p = viewToSlice.layoutParams as ViewGroup.MarginLayoutParams
-            p.setMargins(left, top, right, bottom)
-        }
-    }
-
-    val margin
-        get() = 8.dpToPx
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/SourceDividerItemDecoration.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/SourceDividerItemDecoration.kt
@ -1,48 +0,0 @@
-package eu.kanade.tachiyomi.ui.browse
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.graphics.drawable.Drawable
-import android.view.View
-import androidx.core.view.marginBottom
-import androidx.recyclerview.widget.RecyclerView
-
-class SourceDividerItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
-
-    private val divider: Drawable
-
-    init {
-        val a = context.obtainStyledAttributes(intArrayOf(android.R.attr.listDivider))
-        divider = a.getDrawable(0)!!
-        a.recycle()
-    }
-
-    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-        val childCount = parent.childCount
-        for (i in 0 until childCount - 1) {
-            val child = parent.getChildAt(i)
-            val holder = parent.getChildViewHolder(child)
-            if (holder is SourceListItem &&
-                parent.getChildViewHolder(parent.getChildAt(i + 1)) is SourceListItem
-            ) {
-                val top = child.bottom + child.marginBottom
-                val bottom = top + divider.intrinsicHeight
-                val left = parent.paddingStart + holder.margin
-                val right = parent.width - parent.paddingEnd - holder.margin
-
-                divider.setBounds(left, top, right, bottom)
-                divider.draw(c)
-            }
-        }
-    }
-
-    override fun getItemOffsets(
-        outRect: Rect,
-        view: View,
-        parent: RecyclerView,
-        state: RecyclerView.State
-    ) {
-        outRect.set(0, 0, 0, divider.intrinsicHeight)
-    }
-}
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/SourceListItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/SourceListItem.kt
@ -1,5 +0,0 @@
-package eu.kanade.tachiyomi.ui.browse
-
-import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder
-
-interface SourceListItem : SlicedHolder
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
@ -18,7 +18,6 @@ import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.BrowseController
-import eu.kanade.tachiyomi.ui.browse.SourceDividerItemDecoration
 import eu.kanade.tachiyomi.ui.browse.extension.details.ExtensionDetailsController
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
@ -76,7 +75,6 @@ open class ExtensionController :
        // Create recycler and set adapter.
        binding.recycler.layoutManager = LinearLayoutManager(view.context)
        binding.recycler.adapter = adapter
-        binding.recycler.addItemDecoration(SourceDividerItemDecoration(view.context))
        adapter?.fastScroller = binding.fastScroller
    }

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
@ -6,11 +6,7 @@ import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.InstallStep
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import eu.kanade.tachiyomi.ui.base.holder.SlicedHolder
-import eu.kanade.tachiyomi.ui.browse.SourceListItem
 import eu.kanade.tachiyomi.util.system.LocaleHelper
-import io.github.mthli.slice.Slice
-import kotlinx.android.synthetic.main.extension_card_item.card
 import kotlinx.android.synthetic.main.extension_card_item.ext_button
 import kotlinx.android.synthetic.main.extension_card_item.ext_title
 import kotlinx.android.synthetic.main.extension_card_item.image
@ -18,17 +14,8 @@ import kotlinx.android.synthetic.main.extension_card_item.lang
 import kotlinx.android.synthetic.main.extension_card_item.version
 import kotlinx.android.synthetic.main.extension_card_item.warning

-class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
-    BaseFlexibleViewHolder(view, adapter),
-    SourceListItem,
-    SlicedHolder {
-
-    override val slice = Slice(card).apply {
-        setColor(adapter.cardBackground)
-    }
-
-    override val viewToSlice: View
-        get() = card
+class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
+    BaseFlexibleViewHolder(view, adapter) {

    init {
        ext_button.setOnClickListener {
@ -38,7 +25,6 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :

    fun bind(item: ExtensionItem) {
        val extension = item.extension
-        setCardEdges(item)

        ext_title.text = extension.name
        version.text = extension.versionName
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt
@ -10,7 +10,6 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.databinding.MigrationMangaControllerBinding
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
-import eu.kanade.tachiyomi.ui.browse.SourceDividerItemDecoration
 import eu.kanade.tachiyomi.ui.browse.migration.search.SearchController

 class MigrationMangaController :
@ -54,7 +53,6 @@ class MigrationMangaController :
        adapter = FlexibleAdapter<IFlexible<*>>(null, this)
        binding.recycler.layoutManager = LinearLayoutManager(view.context)
        binding.recycler.adapter = adapter
-        binding.recycler.addItemDecoration(SourceDividerItemDecoration(view.context))
        adapter?.fastScroller = binding.fastScroller
    }

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
@ -8,7 +8,6 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.databinding.MigrationSourcesControllerBinding
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
-import eu.kanade.tachiyomi.ui.browse.SourceDividerItemDecoration
 import eu.kanade.tachiyomi.ui.browse.migration.manga.MigrationMangaController

 class MigrationSourcesController :
@ -32,7 +31,6 @@ class MigrationSourcesController :
        adapter = SourceAdapter(this)
        binding.recycler.layoutManager = LinearLayoutManager(view.context)
        binding.recycler.adapter = adapter
-        binding.recycler.addItemDecoration(SourceDividerItemDecoration(view.context))
        adapter?.fastScroller = binding.fastScroller
    }

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt
@ -3,28 +3,14 @@ package eu.kanade.tachiyomi.ui.browse.migration.sources
 import android.view.View
 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.ui.browse.SourceListItem
-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
 import kotlinx.android.synthetic.main.source_main_controller_card_item.title

-class SourceHolder(view: View, override val adapter: SourceAdapter) :
-    BaseFlexibleViewHolder(view, adapter),
-    SourceListItem,
-    SlicedHolder {
-
-    override val slice = Slice(card).apply {
-        setColor(adapter.cardBackground)
-    }
-
-    override val viewToSlice: View
-        get() = card
+class SourceHolder(view: View, val adapter: SourceAdapter) :
+    BaseFlexibleViewHolder(view, adapter) {

    fun bind(item: SourceItem) {
        val source = item.source
-        setCardEdges(item)

        // Set source name
        title.text = source.name
--- 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
@ -30,7 +30,6 @@ import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.requestPermissionsSafe
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.BrowseController
-import eu.kanade.tachiyomi.ui.browse.SourceDividerItemDecoration
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
 import eu.kanade.tachiyomi.ui.browse.source.latest.LatestUpdatesController
@ -93,7 +92,6 @@ class SourceController :
        // Create recycler and set adapter.
        binding.recycler.layoutManager = LinearLayoutManager(view.context)
        binding.recycler.adapter = adapter
-        binding.recycler.addItemDecoration(SourceDividerItemDecoration(view.context))
        adapter?.fastScroller = binding.fastScroller

        requestPermissionsSafe(arrayOf(WRITE_EXTERNAL_STORAGE), 301)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt
@ -6,28 +6,15 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.LocalSource
 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.ui.browse.SourceListItem
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.view.setVectorCompat
-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
 import kotlinx.android.synthetic.main.source_main_controller_card_item.pin
 import kotlinx.android.synthetic.main.source_main_controller_card_item.source_latest
 import kotlinx.android.synthetic.main.source_main_controller_card_item.title

-class SourceHolder(private val view: View, override val adapter: SourceAdapter) :
-    BaseFlexibleViewHolder(view, adapter),
-    SourceListItem,
-    SlicedHolder {
-
-    override val slice = Slice(card).apply {
-        setColor(adapter.cardBackground)
-    }
-
-    override val viewToSlice: View
-        get() = card
+class SourceHolder(private val view: View, val adapter: SourceAdapter) :
+    BaseFlexibleViewHolder(view, adapter) {

    init {
        source_latest.setOnClickListener {
@ -41,7 +28,6 @@ class SourceHolder(private val view: View, override val adapter: SourceAdapter)

    fun bind(item: SourceItem) {
        val source = item.source
-        setCardEdges(item)

        // Set source name
        title.text = source.name
--- a/app/src/main/res/layout/extension_card_item.xml
+++ b/app/src/main/res/layout/extension_card_item.xml
@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/card"
-        android:layout_width="match_parent"
    android:layout_height="64dp"
-        android:background="@drawable/list_item_selector">
+    android:background="@drawable/list_item_selector_background">

    <ImageView
        android:id="@+id/image"
@ -88,7 +83,4 @@
        app:layout_constraintTop_toTopOf="parent"
        tools:text="Details" />

-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>
-
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/source_main_controller_card_header.xml
+++ b/app/src/main/res/layout/source_main_controller_card_header.xml
@ -6,13 +6,15 @@

    <TextView
        android:id="@+id/title"
-        style="@style/TextAppearance.Regular.SubHeading"
+        style="@style/TextAppearance.Regular.SubHeading.Secondary"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-medium"
        android:paddingStart="@dimen/material_component_text_fields_padding_above_and_below_label"
        android:paddingTop="8dp"
        android:paddingEnd="@dimen/material_component_text_fields_padding_above_and_below_label"
        android:paddingBottom="8dp"
+        android:textAllCaps="true"
        tools:text="Title" />

 </FrameLayout>
--- a/app/src/main/res/layout/source_main_controller_card_item.xml
+++ b/app/src/main/res/layout/source_main_controller_card_item.xml
@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/card"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/material_component_lists_two_line_height"
-        android:background="@drawable/list_item_selector">
+    android:layout_height="64dp"
+    android:background="@drawable/list_item_selector_background">

    <ImageView
        android:id="@+id/image"
        android:layout_width="0dp"
        android:layout_height="0dp"
-            android:padding="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="8dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintDimensionRatio="1:1"
        app:layout_constraintStart_toStartOf="parent"
@ -69,6 +65,4 @@
        app:srcCompat="@drawable/ic_push_pin_24dp"
        tools:visibility="visible" />

-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -80,11 +80,7 @@
    </style>

    <style name="TextAppearance.Regular.SubHeading">
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="TextAppearance.Regular.SubHeading.Upper">
-        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">14sp</item>
    </style>

    <style name="TextAppearance.Regular.SubHeading.Secondary">