This commit is contained in:
Koitharu
2025-08-05 15:44:01 +03:00
parent 5ac9bad728
commit 83d5f8e378
6 changed files with 28 additions and 7 deletions

View File

@@ -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 {

View File

@@ -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()

View File

@@ -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)
}
}

View File

@@ -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<FrameLayout.LayoutParams> {
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<FrameLayout.LayoutParams> {
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<FrameLayout.LayoutParams> {
gravity = Gravity.TOP or Gravity.CENTER
}
railFab.shrink()
buttonExpand.setImageResource(R.drawable.ic_drawer_menu)
buttonExpand.setContentDescriptionAndTooltip(R.string.expand)

View File

@@ -51,17 +51,16 @@
app:isPreferenceVisible="false" />
<PreferenceCategory
android:key="backup_periodic_tg"
android:title="@string/telegram_integration"
app:isPreferenceVisible="false"
android:key="backup_periodic_tg"
tools:isPreferenceVisible="true">
<SwitchPreferenceCompat
android:defaultValue="false"
android:dependency="backup_periodic"
android:key="backup_periodic_tg_enabled"
android:title="@string/send_backups_telegram"
app:allowDividerAbove="true" />
android:title="@string/send_backups_telegram" />
<EditTextPreference
android:dependency="backup_periodic_tg_enabled"

View File

@@ -34,12 +34,12 @@ material = "1.14.0-alpha03"
moshi = "1.15.2"
okhttp = "4.12.0"
okio = "3.12.0"
parsers = "74d0951d3d"
parsers = "db9a7161f4"
preference = "1.2.1"
recyclerview = "1.4.0"
room = "2.7.2"
serialization = "1.8.1"
ssiv = "5132f1e609"
ssiv = "376930523c"
swiperefreshlayout = "1.1.0"
testRules = "1.6.1"
testRunner = "1.6.2"