null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improves library badges when small font (#1278)

Browse source 
* Fix icon not displayed for series type

* Minor fix library badges

* Revert change for setSelection
This commit is contained in:
nzoba 2022-05-31 23:45:21 +02:00 • committed by GitHub
parent 781208d999
commit 7be308d75d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
View file

@ -50,7 +50,7 @@ class EditMangaDialog : DialogController {
private var willResetCover = false
lateinit var binding: EditMangaDialogBinding
val langauges = mutableListOf<String>()
private val languages = mutableListOf<String>()
private val infoController
get() = targetController as MangaDetailsController
@ -108,8 +108,8 @@ class EditMangaDialog : DialogController {
val extensionManager: ExtensionManager by injectLazy()
val activeLangs = preferences.enabledLanguages().get()
langauges.add("")
langauges.addAll(
languages.add("")
languages.addAll(
extensionManager.availableExtensions.groupBy { it.lang }.keys
.sortedWith(
compareBy(
@ -120,12 +120,12 @@ class EditMangaDialog : DialogController {
.filter { it != "all" },
)
binding.mangaLang.setEntries(
langauges.map {
languages.map {
LocaleHelper.getSourceDisplayName(it, binding.root.context)
},
)
binding.mangaLang.setSelection(
langauges.indexOf(LocalSource.getMangaLang(manga, binding.root.context))
languages.indexOf(LocalSource.getMangaLang(manga, binding.root.context))
.takeIf { it > -1 } ?: 0,
)
} else {
@ -345,7 +345,7 @@ class EditMangaDialog : DialogController {
binding.mangaGenresTags.tags,
binding.mangaStatus.selectedPosition,
if (binding.resetsReadingMode.isVisible) binding.seriesType.selectedPosition + 1 else null,
langauges.getOrNull(binding.mangaLang.selectedPosition),
languages.getOrNull(binding.mangaLang.selectedPosition),
willResetCover,
)
}

19
app/src/main/res/layout/unread_download_badge.xml
View file

@ -8,6 +8,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardElevation="0dp"
app:cardBackgroundColor="@android:color/transparent"
android:layout_marginStart="2dp"
android:layout_marginTop="5dp"
android:visibility="gone"
@ -51,15 +52,15 @@
<androidx.constraintlayout.widget.Barrier
android:id="@+id/bottom_text_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_height="0dp"
app:barrierDirection="bottom"
app:constraint_referenced_ids="download_text,unread_text" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/top_text_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_height="0dp"
app:barrierDirection="top"
app:constraint_referenced_ids="download_text,unread_text" />
@ -67,7 +68,7 @@
android:id="@+id/download_text"
style="?textAppearanceCaption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:background="?colorTertiary"
android:gravity="center"
android:maxLines="1"
@ -76,6 +77,7 @@
android:textColor="@color/download_badge_text"
android:textSize="13sp"
android:visibility="gone"
app:layout_constraintHeight_min="wrap"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/lang_image"
app:layout_constraintTop_toTopOf="parent"
@ -99,7 +101,7 @@
android:id="@+id/unread_text"
style="?textAppearanceCaption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:background="?attr/colorSecondary"
android:gravity="center"
android:maxLines="1"
@ -108,10 +110,11 @@
android:textColor="?colorOnSecondary"
android:textSize="13sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/download_text"
app:layout_constraintHeight_min="wrap"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/download_text"
app:layout_constraintTop_toTopOf="@+id/download_text"
app:layout_constraintTop_toTopOf="parent"
tools:text="20"
tools:visibility="visible"
tools:paddingStart="2dp"/>