Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-19 00:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix cutoff ripple for extension install cancel button

Browse Source
This commit is contained in:
arkon 2021-11-07 09:49:40 -05:00
parent f28dd4f4de
commit abf31f4a79
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
View File

@ -6,7 +6,7 @@ import coil.clear
import coil.load import coil.load
import eu.davidea.viewholders.FlexibleViewHolder import eu.davidea.viewholders.FlexibleViewHolder
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.ExtensionCardItemBinding import eu.kanade.tachiyomi.databinding.ExtensionItemBinding
import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.extension.model.Extension
import eu.kanade.tachiyomi.extension.model.InstallStep import eu.kanade.tachiyomi.extension.model.InstallStep
import eu.kanade.tachiyomi.util.system.LocaleHelper import eu.kanade.tachiyomi.util.system.LocaleHelper
@ -14,7 +14,7 @@ import eu.kanade.tachiyomi.util.system.LocaleHelper
class ExtensionHolder(view: View, val adapter: ExtensionAdapter) : class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
FlexibleViewHolder(view, adapter) { FlexibleViewHolder(view, adapter) {
private val binding = ExtensionCardItemBinding.bind(view) private val binding = ExtensionItemBinding.bind(view)
init { init {
binding.extButton.setOnClickListener { binding.extButton.setOnClickListener {
@ -28,7 +28,7 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
fun bind(item: ExtensionItem) { fun bind(item: ExtensionItem) {
val extension = item.extension val extension = item.extension
binding.extTitle.text = extension.name binding.name.text = extension.name
binding.version.text = extension.versionName binding.version.text = extension.versionName
binding.lang.text = LocaleHelper.getSourceDisplayName(extension.lang, itemView.context) binding.lang.text = LocaleHelper.getSourceDisplayName(extension.lang, itemView.context)
binding.warning.text = when { binding.warning.text = when {
@ -39,11 +39,11 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
else -> "" else -> ""
}.uppercase() }.uppercase()
binding.image.clear() binding.icon.clear()
if (extension is Extension.Available) { if (extension is Extension.Available) {
binding.image.load(extension.iconUrl) binding.icon.load(extension.iconUrl)
} else { } else {
extension.getApplicationIcon(itemView.context)?.let { binding.image.setImageDrawable(it) } extension.getApplicationIcon(itemView.context)?.let { binding.icon.setImageDrawable(it) }
} }
bindButtons(item) bindButtons(item)
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionItem.kt
View File

@ -27,7 +27,7 @@ data class ExtensionItem(
* Returns the layout resource of this item. * Returns the layout resource of this item.
*/ */
override fun getLayoutRes(): Int { override fun getLayoutRes(): Int {
return R.layout.extension_card_item return R.layout.extension_item
} }
/** /**

18
app/src/main/res/layout/extension_card_item.xml → app/src/main/res/layout/extension_item.xml
View File

@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="64dp"
android:layout_marginEnd="16dp" android:background="@drawable/list_item_selector_background"
android:background="@drawable/list_item_selector_background"> android:paddingEnd="16dp">
<ImageView <ImageView
android:id="@+id/image" android:id="@+id/icon"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:paddingStart="16dp" android:paddingStart="16dp"
@ -21,7 +21,7 @@
tools:src="@mipmap/ic_launcher_round" /> tools:src="@mipmap/ic_launcher_round" />
<TextView <TextView
android:id="@+id/ext_title" android:id="@+id/name"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
@ -30,7 +30,7 @@
android:textAppearance="?attr/textAppearanceBody2" android:textAppearance="?attr/textAppearanceBody2"
app:layout_constraintBottom_toTopOf="@id/lang" app:layout_constraintBottom_toTopOf="@id/lang"
app:layout_constraintEnd_toStartOf="@id/ext_button" app:layout_constraintEnd_toStartOf="@id/ext_button"
app:layout_constraintStart_toEndOf="@id/image" app:layout_constraintStart_toEndOf="@id/icon"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" app:layout_constraintVertical_chainStyle="packed"
tools:text="Batoto" /> tools:text="Batoto" />
@ -42,8 +42,8 @@
android:maxLines="1" android:maxLines="1"
android:textAppearance="?attr/textAppearanceCaption" android:textAppearance="?attr/textAppearanceCaption"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/image" app:layout_constraintStart_toEndOf="@id/icon"
app:layout_constraintTop_toBottomOf="@+id/ext_title" app:layout_constraintTop_toBottomOf="@+id/name"
tools:text="English" tools:text="English"
tools:visibility="visible" /> tools:visibility="visible" />
@ -55,7 +55,7 @@
android:maxLines="1" android:maxLines="1"
android:textAppearance="?attr/textAppearanceCaption" android:textAppearance="?attr/textAppearanceCaption"
app:layout_constraintStart_toEndOf="@id/lang" app:layout_constraintStart_toEndOf="@id/lang"
app:layout_constraintTop_toBottomOf="@+id/ext_title" app:layout_constraintTop_toBottomOf="@+id/name"
tools:text="Version" /> tools:text="Version" />
<TextView <TextView
@ -67,7 +67,7 @@
android:textAppearance="?attr/textAppearanceCaption" android:textAppearance="?attr/textAppearanceCaption"
android:textColor="?attr/colorError" android:textColor="?attr/colorError"
app:layout_constraintStart_toEndOf="@id/version" app:layout_constraintStart_toEndOf="@id/version"
app:layout_constraintTop_toBottomOf="@+id/ext_title" app:layout_constraintTop_toBottomOf="@+id/name"
tools:text="Warning" /> tools:text="Warning" />
<Button <Button