From 83d5f8e378c222e12181257878241cb3b8e8966e Mon Sep 17 00:00:00 2001 From: Koitharu Date: Tue, 5 Aug 2025 15:44:01 +0300 Subject: [PATCH] UI fixes --- app/build.gradle | 4 ++-- .../org/koitharu/kotatsu/core/util/ext/View.kt | 2 ++ .../favourites/ui/categories/adapter/CategoryAD.kt | 8 ++++++++ .../kotatsu/main/ui/MainNavigationDelegate.kt | 12 ++++++++++++ app/src/main/res/xml/pref_backup_periodic.xml | 5 ++--- gradle/libs.versions.toml | 4 ++-- 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2121b0290..abc69713b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { applicationId 'org.koitharu.kotatsu' minSdk = 21 targetSdk = 36 - versionCode = 1024 - versionName = '9.1' + versionCode = 1025 + versionName = '9.1.1' generatedDensities = [] testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner' ksp { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt index 7f57f9a6b..be4d63880 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt @@ -183,6 +183,8 @@ fun View.setTooltipCompat(tooltip: CharSequence?) { } } +fun View.setTooltipCompat(@StringRes tooltipResId: Int) = setTooltipCompat(context.getString(tooltipResId)) + val Toolbar.menuView: ActionMenuView? get() { menu // to call ensureMenu() diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt index 01f701e7e..787c79fe6 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt @@ -11,6 +11,7 @@ import androidx.core.view.isVisible import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding import org.koitharu.kotatsu.R import org.koitharu.kotatsu.core.util.ext.getQuantityStringSafe +import org.koitharu.kotatsu.core.util.ext.setTooltipCompat import org.koitharu.kotatsu.databinding.ItemCategoriesAllBinding import org.koitharu.kotatsu.databinding.ItemCategoryBinding import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesListListener @@ -91,6 +92,13 @@ fun allCategoriesAD( R.drawable.ic_eye_off }, ) + binding.imageViewVisible.setTooltipCompat( + if (item.isVisible) { + R.string.hide + } else { + R.string.show + }, + ) binding.coversView.setCoversAsync(item.covers) } } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt index d5cb08d8b..cbf76eeb1 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainNavigationDelegate.kt @@ -1,15 +1,18 @@ package org.koitharu.kotatsu.main.ui import android.os.Bundle +import android.view.Gravity import android.view.Menu import android.view.MenuItem import android.view.View +import android.widget.FrameLayout import androidx.activity.OnBackPressedCallback import androidx.annotation.IdRes import androidx.core.view.isEmpty import androidx.core.view.isVisible import androidx.core.view.iterator import androidx.core.view.size +import androidx.core.view.updateLayoutParams import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.lifecycle.LifecycleOwner @@ -66,6 +69,9 @@ class MainNavigationDelegate( navBar.setOnItemSelectedListener(this) navBar.setOnItemReselectedListener(this) navRailHeader?.run { + root.updateLayoutParams { + gravity = Gravity.TOP or Gravity.CENTER + } val horizontalPadding = (navBar as NavigationRailView).itemActiveIndicatorMarginHorizontal root.setPadding(horizontalPadding, 0, horizontalPadding, 0) buttonExpand.setOnClickListener(this@MainNavigationDelegate) @@ -295,6 +301,9 @@ class MainNavigationDelegate( if (value) { navBar.expand() navRailHeader?.run { + root.updateLayoutParams { + gravity = Gravity.TOP or Gravity.START + } railFab.extend() buttonExpand.setImageResource(R.drawable.ic_drawer_menu_open) buttonExpand.setContentDescriptionAndTooltip(R.string.collapse) @@ -304,6 +313,9 @@ class MainNavigationDelegate( } else { navBar.collapse() navRailHeader?.run { + root.updateLayoutParams { + gravity = Gravity.TOP or Gravity.CENTER + } railFab.shrink() buttonExpand.setImageResource(R.drawable.ic_drawer_menu) buttonExpand.setContentDescriptionAndTooltip(R.string.expand) diff --git a/app/src/main/res/xml/pref_backup_periodic.xml b/app/src/main/res/xml/pref_backup_periodic.xml index 946a1850c..c56942dac 100644 --- a/app/src/main/res/xml/pref_backup_periodic.xml +++ b/app/src/main/res/xml/pref_backup_periodic.xml @@ -51,17 +51,16 @@ app:isPreferenceVisible="false" /> + android:title="@string/send_backups_telegram" />