diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/SelectActionBar.kt b/app/src/main/java/io/legato/kazusa/ui/widget/SelectActionBar.kt index 187b76f44..f2e38c3c6 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/SelectActionBar.kt +++ b/app/src/main/java/io/legato/kazusa/ui/widget/SelectActionBar.kt @@ -8,13 +8,7 @@ import android.widget.FrameLayout import androidx.annotation.MenuRes import androidx.annotation.StringRes import androidx.appcompat.widget.PopupMenu -import io.legato.kazusa.R import io.legato.kazusa.databinding.ViewSelectActionBarBinding -//import io.legado.app.lib.theme.accentColor -//import io.legado.app.lib.theme.bottomBackground -//import io.legado.app.lib.theme.getPrimaryTextColor -//import io.legado.app.lib.theme.getSecondaryDisabledTextColor -import io.legato.kazusa.utils.applyNavigationBarPadding import io.legato.kazusa.utils.visible @@ -24,10 +18,6 @@ class SelectActionBar @JvmOverloads constructor( attrs: AttributeSet? = null ) : FrameLayout(context, attrs) { -// private val bgIsLight = ColorUtils.isColorLight(context.bottomBackground) -// private val primaryTextColor = context.getPrimaryTextColor(bgIsLight) -// private val disabledColor = context.getSecondaryDisabledTextColor(bgIsLight) - private var callBack: CallBack? = null private var selMenu: PopupMenu? = null private val binding = ViewSelectActionBarBinding @@ -35,12 +25,7 @@ class SelectActionBar @JvmOverloads constructor( init { if (!isInEditMode) { -// setBackgroundColor(context.bottomBackground) -// //elevation = context.elevation -// binding.cbSelectedAll.setTextColor(primaryTextColor) -// TintHelper.setTint(binding.cbSelectedAll, context.accentColor, !bgIsLight) -// binding.ivMenuMore.setColorFilter(disabledColor, PorterDuff.Mode.SRC_IN) - binding.cbSelectedAll.setOnCheckedChangeListener { buttonView, isChecked -> + binding.cbSelectedAll.addOnCheckedChangeListener { buttonView, isChecked -> if (buttonView.isPressed) { callBack?.selectAll(isChecked) } @@ -52,7 +37,6 @@ class SelectActionBar @JvmOverloads constructor( selMenu?.show() } } - applyNavigationBarPadding() } } @@ -94,19 +78,9 @@ class SelectActionBar @JvmOverloads constructor( } //重置全选的文字 - if (cbSelectedAll.isChecked) { - cbSelectedAll.text = context.getString( - R.string.select_cancel_count, - selectCount, - allCount - ) - } else { - cbSelectedAll.text = context.getString( - R.string.select_all_count, - selectCount, - allCount - ) - } + tvCount.text = selectCount.toString() + tvCountAll.text = allCount.toString() + setMenuClickable(selectCount > 0) } diff --git a/app/src/main/res/layout/view_select_action_bar.xml b/app/src/main/res/layout/view_select_action_bar.xml index d9e02061f..569e861e2 100644 --- a/app/src/main/res/layout/view_select_action_bar.xml +++ b/app/src/main/res/layout/view_select_action_bar.xml @@ -1,54 +1,88 @@ - - - + + android:layout_gravity="center" + android:orientation="horizontal"> - + - + + + + + + + + android:checkable="true" + android:focusable="true" + app:icon="@drawable/ic_select_all" + style="@style/Widget.Material3Expressive.Button.IconButton.Outlined" /> + app:icon="@drawable/ic_select_invert" + android:layout_marginEnd="4dp" /> - + - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/app/version.properties b/app/version.properties index e997488d8..4d8a1580f 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,4 +1,4 @@ VERSION_MAJOR=3 VERSION_MINOR=25 VERSION_PATCH=10 -VERSION_SUFFIX=-beta.1 \ No newline at end of file +VERSION_SUFFIX=-beta.3 \ No newline at end of file