yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Move untrusted/obsolete/unofficial extension text

Browse Source
This commit is contained in:
arkon 2020-06-13 17:27:03 -04:00
parent f9baff0e90
commit 150ea29a70
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,6 @@ 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.util.system.LocaleHelper
import eu.kanade.tachiyomi.util.system.getResourceColor
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
@ -16,6 +15,7 @@ import kotlinx.android.synthetic.main.extension_card_item.ext_title
import kotlinx.android.synthetic.main.extension_card_item.image
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),
@ -38,13 +38,14 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
val extension = item.extension
setCardEdges(item)
// Set source name
ext_title.text = extension.name
version.text = extension.versionName
lang.text = if (extension !is Extension.Untrusted) {
LocaleHelper.getSourceDisplayName(extension.lang, itemView.context)
} else {
itemView.context.getString(R.string.ext_untrusted).toUpperCase()
lang.text = LocaleHelper.getSourceDisplayName(extension.lang, itemView.context)
warning.text = when {
extension is Extension.Untrusted -> itemView.context.getString(R.string.ext_untrusted).toUpperCase()
extension is Extension.Installed && extension.isObsolete -> itemView.context.getString(R.string.ext_obsolete).toUpperCase()
extension is Extension.Installed && extension.isUnofficial -> itemView.context.getString(R.string.ext_unofficial).toUpperCase()
else -> null
}
GlideApp.with(itemView.context).clear(image)
@ -63,8 +64,6 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
isEnabled = true
isClickable = true
setTextColor(context.getResourceColor(R.attr.colorAccent))
val extension = item.extension
val installStep = item.installStep
@ -87,16 +86,8 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
extension.hasUpdate -> {
setText(R.string.ext_update)
}
extension.isObsolete -> {
setTextColor(context.getResourceColor(R.attr.colorError))
setText(R.string.ext_obsolete)
}
extension.isUnofficial -> {
setTextColor(context.getResourceColor(R.attr.colorError))
setText(R.string.ext_unofficial)
}
else -> {
setText(R.string.ext_details)
setText(R.string.action_settings)
}
}
} else if (extension is Extension.Untrusted) {

13
app/src/main/res/layout/extension_card_item.xml
View File

@ -64,6 +64,19 @@
app:layout_constraintTop_toBottomOf="@+id/ext_title"
tools:text="Version" />
<TextView
android:id="@+id/warning"
style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:maxLines="1"
android:textColor="?attr/colorError"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@id/version"
app:layout_constraintTop_toBottomOf="@+id/ext_title"
tools:text="Warning" />
<Button
android:id="@+id/ext_button"
style="@style/Theme.Widget.Button"

4
app/src/main/res/layout/extension_detail_controller.xml
View File

@ -10,10 +10,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:background="@color/red_error"
android:background="?attr/colorError"
android:gravity="center"
android:padding="16dp"
android:textColor="@android:color/white"
android:textColor="?attr/colorOnError"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

1
app/src/main/res/values/strings.xml
View File

@ -205,7 +205,6 @@
<!-- Extension section -->
<string name="all_lang">All</string>
<string name="ext_details">Details</string>
<string name="ext_updates_pending">Updates pending</string>
<string name="ext_update">Update</string>
<string name="ext_obsolete">Obsolete</string>