master
Koitharu 9 months ago
parent 5ac9bad728
commit 83d5f8e378
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7

@ -21,8 +21,8 @@ android {
applicationId 'org.koitharu.kotatsu' applicationId 'org.koitharu.kotatsu'
minSdk = 21 minSdk = 21
targetSdk = 36 targetSdk = 36
versionCode = 1024 versionCode = 1025
versionName = '9.1' versionName = '9.1.1'
generatedDensities = [] generatedDensities = []
testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner' testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
ksp { ksp {

@ -183,6 +183,8 @@ fun View.setTooltipCompat(tooltip: CharSequence?) {
} }
} }
fun View.setTooltipCompat(@StringRes tooltipResId: Int) = setTooltipCompat(context.getString(tooltipResId))
val Toolbar.menuView: ActionMenuView? val Toolbar.menuView: ActionMenuView?
get() { get() {
menu // to call ensureMenu() menu // to call ensureMenu()

@ -11,6 +11,7 @@ import androidx.core.view.isVisible
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
import org.koitharu.kotatsu.R import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.util.ext.getQuantityStringSafe 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.ItemCategoriesAllBinding
import org.koitharu.kotatsu.databinding.ItemCategoryBinding import org.koitharu.kotatsu.databinding.ItemCategoryBinding
import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesListListener import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesListListener
@ -91,6 +92,13 @@ fun allCategoriesAD(
R.drawable.ic_eye_off R.drawable.ic_eye_off
}, },
) )
binding.imageViewVisible.setTooltipCompat(
if (item.isVisible) {
R.string.hide
} else {
R.string.show
},
)
binding.coversView.setCoversAsync(item.covers) binding.coversView.setCoversAsync(item.covers)
} }
} }

@ -1,15 +1,18 @@
package org.koitharu.kotatsu.main.ui package org.koitharu.kotatsu.main.ui
import android.os.Bundle import android.os.Bundle
import android.view.Gravity
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.widget.FrameLayout
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.annotation.IdRes import androidx.annotation.IdRes
import androidx.core.view.isEmpty import androidx.core.view.isEmpty
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.view.iterator import androidx.core.view.iterator
import androidx.core.view.size import androidx.core.view.size
import androidx.core.view.updateLayoutParams
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
@ -66,6 +69,9 @@ class MainNavigationDelegate(
navBar.setOnItemSelectedListener(this) navBar.setOnItemSelectedListener(this)
navBar.setOnItemReselectedListener(this) navBar.setOnItemReselectedListener(this)
navRailHeader?.run { navRailHeader?.run {
root.updateLayoutParams<FrameLayout.LayoutParams> {
gravity = Gravity.TOP or Gravity.CENTER
}
val horizontalPadding = (navBar as NavigationRailView).itemActiveIndicatorMarginHorizontal val horizontalPadding = (navBar as NavigationRailView).itemActiveIndicatorMarginHorizontal
root.setPadding(horizontalPadding, 0, horizontalPadding, 0) root.setPadding(horizontalPadding, 0, horizontalPadding, 0)
buttonExpand.setOnClickListener(this@MainNavigationDelegate) buttonExpand.setOnClickListener(this@MainNavigationDelegate)
@ -295,6 +301,9 @@ class MainNavigationDelegate(
if (value) { if (value) {
navBar.expand() navBar.expand()
navRailHeader?.run { navRailHeader?.run {
root.updateLayoutParams<FrameLayout.LayoutParams> {
gravity = Gravity.TOP or Gravity.START
}
railFab.extend() railFab.extend()
buttonExpand.setImageResource(R.drawable.ic_drawer_menu_open) buttonExpand.setImageResource(R.drawable.ic_drawer_menu_open)
buttonExpand.setContentDescriptionAndTooltip(R.string.collapse) buttonExpand.setContentDescriptionAndTooltip(R.string.collapse)
@ -304,6 +313,9 @@ class MainNavigationDelegate(
} else { } else {
navBar.collapse() navBar.collapse()
navRailHeader?.run { navRailHeader?.run {
root.updateLayoutParams<FrameLayout.LayoutParams> {
gravity = Gravity.TOP or Gravity.CENTER
}
railFab.shrink() railFab.shrink()
buttonExpand.setImageResource(R.drawable.ic_drawer_menu) buttonExpand.setImageResource(R.drawable.ic_drawer_menu)
buttonExpand.setContentDescriptionAndTooltip(R.string.expand) buttonExpand.setContentDescriptionAndTooltip(R.string.expand)

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

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

Loading…
Cancel
Save