diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt index cae0565e7..a2ba8831b 100644 --- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt +++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt @@ -48,8 +48,10 @@ fun categoryAD( binding.imageViewCover2, ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76)) ) - binding.imageViewCover2.backgroundTintList = ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76)) - binding.imageViewCover3.backgroundTintList = ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 153)) + binding.imageViewCover2.backgroundTintList = + ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76)) + binding.imageViewCover3.backgroundTintList = + ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 153)) val fallback = ColorDrawable(Color.TRANSPARENT) val coverViews = arrayOf(binding.imageViewCover1, binding.imageViewCover2, binding.imageViewCover3) val imageRequests = arrayOfNulls(coverViews.size) @@ -63,11 +65,15 @@ fun categoryAD( imageRequests.forEach { it?.dispose() } binding.imageViewHandle.isVisible = item.isReorderMode binding.textViewTitle.text = item.category.title - binding.textViewSubtitle.text = context.resources.getQuantityString( - R.plurals.items, - item.mangaCount, - item.mangaCount, - ) + binding.textViewSubtitle.text = if (item.mangaCount == 0) { + getString(R.string.empty) + } else { + context.resources.getQuantityString( + R.plurals.items, + item.mangaCount, + item.mangaCount, + ) + } repeat(coverViews.size) { i -> imageRequests[i] = coverViews[i].newImageRequest(item.covers.getOrNull(i)) .placeholder(R.drawable.ic_placeholder) diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/tools/ToolsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/tools/ToolsFragment.kt index da3cbbe8c..3c09bb442 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/tools/ToolsFragment.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/tools/ToolsFragment.kt @@ -9,6 +9,7 @@ import androidx.core.view.updatePadding import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.BaseFragment import org.koitharu.kotatsu.databinding.FragmentToolsBinding +import org.koitharu.kotatsu.download.ui.DownloadsActivity import org.koitharu.kotatsu.settings.AppUpdateChecker import org.koitharu.kotatsu.settings.SettingsActivity @@ -23,6 +24,7 @@ class ToolsFragment : BaseFragment(), View.OnClickListener override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding.buttonSettings.setOnClickListener(this) + binding.buttonDownloads.setOnClickListener(this) binding.cardUpdate.root.setOnClickListener(this) binding.cardUpdate.buttonDownload.setOnClickListener(this) } @@ -30,6 +32,7 @@ class ToolsFragment : BaseFragment(), View.OnClickListener override fun onClick(v: View) { when (v.id) { R.id.button_settings -> startActivity(SettingsActivity.newIntent(v.context)) + R.id.button_downloads -> startActivity(DownloadsActivity.newIntent(v.context)) } } diff --git a/app/src/main/res/layout/layout_app_update.xml b/app/src/main/res/layout/layout_app_update.xml index 520f9ef05..046ba497a 100644 --- a/app/src/main/res/layout/layout_app_update.xml +++ b/app/src/main/res/layout/layout_app_update.xml @@ -42,11 +42,11 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/margin_normal" android:layout_marginTop="@dimen/margin_small" + android:text="@string/new_version_s" android:textAppearance="?attr/textAppearanceBodyMedium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/icon" - app:layout_constraintTop_toBottomOf="@id/textPrimary" - tools:text="@string/new_version_s" /> + app:layout_constraintTop_toBottomOf="@id/textPrimary" />