Explorar el Código

Use same header layout for sources/extensions/migration

arkon hace 4 años
padre
commit
e24ddb9106

+ 1 - 1
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionGroupHolder.kt

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import kotlinx.android.synthetic.main.extension_card_header.title
+import kotlinx.android.synthetic.main.source_main_controller_card_header.title
 
 class ExtensionGroupHolder(view: View, adapter: FlexibleAdapter<*>) :
     BaseFlexibleViewHolder(view, adapter) {

+ 1 - 1
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionGroupItem.kt

@@ -19,7 +19,7 @@ data class ExtensionGroupItem(val name: String, val size: Int, val showSize: Boo
      * Returns the layout resource of this item.
      */
     override fun getLayoutRes(): Int {
-        return R.layout.extension_card_header
+        return R.layout.source_main_controller_card_header
     }
 
     /**

+ 1 - 1
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/LangHolder.kt

@@ -4,7 +4,7 @@ import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import eu.kanade.tachiyomi.util.system.LocaleHelper
-import kotlinx.android.synthetic.main.source_main_controller_card.title
+import kotlinx.android.synthetic.main.source_main_controller_card_header.title
 
 class LangHolder(view: View, adapter: FlexibleAdapter<*>) :
     BaseFlexibleViewHolder(view, adapter) {

+ 1 - 1
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/LangItem.kt

@@ -18,7 +18,7 @@ data class LangItem(val code: String) : AbstractHeaderItem<LangHolder>() {
      * Returns the layout resource of this item.
      */
     override fun getLayoutRes(): Int {
-        return R.layout.source_main_controller_card
+        return R.layout.source_main_controller_card_header
     }
 
     /**

+ 2 - 2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/SelectionHeader.kt

@@ -7,7 +7,7 @@ import eu.davidea.flexibleadapter.items.AbstractHeaderItem
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import kotlinx.android.synthetic.main.source_main_controller_card.title
+import kotlinx.android.synthetic.main.source_main_controller_card_header.title
 
 /**
  * Item that contains the selection header.
@@ -18,7 +18,7 @@ class SelectionHeader : AbstractHeaderItem<SelectionHeader.Holder>() {
      * Returns the layout resource of this item.
      */
     override fun getLayoutRes(): Int {
-        return R.layout.source_main_controller_card
+        return R.layout.source_main_controller_card_header
     }
 
     /**

+ 1 - 1
app/src/main/res/layout/extension_controller.xml

@@ -14,7 +14,7 @@
             android:id="@+id/ext_recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:listitem="@layout/extension_card_header" />
+            tools:listitem="@layout/source_main_controller_card_header" />
 
     </eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout>
 

+ 1 - 1
app/src/main/res/layout/source_main_controller.xml

@@ -9,7 +9,7 @@
         android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:listitem="@layout/source_main_controller_card" />
+        tools:listitem="@layout/source_main_controller_card_header" />
 
     <eu.davidea.fastscroller.FastScroller
         android:id="@+id/fast_scroller"

+ 0 - 17
app/src/main/res/layout/source_main_controller_card.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextAppearance.Regular.SubHeading"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        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"
-        tools:text="Title" />
-
-</FrameLayout>

+ 0 - 0
app/src/main/res/layout/extension_card_header.xml → app/src/main/res/layout/source_main_controller_card_header.xml