diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aec8790c4..252676369 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -124,7 +124,7 @@ diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt index 7b844a62d..26c79cda5 100644 --- a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt @@ -1,5 +1,6 @@ package io.legato.kazusa.ui.book.read +//import io.legado.app.lib.theme.accentColor import android.annotation.SuppressLint import android.content.Intent import android.content.res.Configuration @@ -34,7 +35,6 @@ import io.legato.kazusa.data.entities.Book import io.legato.kazusa.data.entities.BookChapter import io.legato.kazusa.data.entities.BookProgress import io.legato.kazusa.data.entities.BookSource -import io.legato.kazusa.data.entities.ReplaceRule import io.legato.kazusa.exception.NoStackTraceException import io.legato.kazusa.help.AppWebDav import io.legato.kazusa.help.IntentData @@ -57,7 +57,6 @@ import io.legato.kazusa.help.storage.Backup import io.legato.kazusa.lib.dialogs.SelectItem import io.legato.kazusa.lib.dialogs.alert import io.legato.kazusa.lib.dialogs.selector -//import io.legado.app.lib.theme.accentColor import io.legato.kazusa.model.ReadAloud import io.legato.kazusa.model.ReadBook import io.legato.kazusa.model.analyzeRule.AnalyzeRule @@ -76,7 +75,6 @@ import io.legato.kazusa.ui.book.info.BookInfoActivity import io.legato.kazusa.ui.book.read.config.AutoReadDialog import io.legato.kazusa.ui.book.read.config.BgTextConfigDialog.Companion.BG_COLOR import io.legato.kazusa.ui.book.read.config.BgTextConfigDialog.Companion.TEXT_COLOR -import io.legato.kazusa.ui.book.read.config.MoreConfigDialog import io.legato.kazusa.ui.book.read.config.ReadAloudDialog import io.legato.kazusa.ui.book.read.config.ReadStyleDialog import io.legato.kazusa.ui.book.read.config.TipConfigDialog.Companion.TIP_COLOR @@ -320,10 +318,12 @@ class ReadBookActivity : BaseReadBookActivity(), override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - upSystemUiVisibility() - binding.readView.upStatusBar() + //upSystemUiVisibility() + //binding.readView.upStatusBar() + recreate() } + override fun onTopResumedActivityChanged(isTopResumedActivity: Boolean) { if (!isTopResumedActivity) { ReadBook.cancelPreDownloadTask() diff --git a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/VariableDialog.kt b/app/src/main/java/io/legato/kazusa/ui/widget/dialog/VariableDialog.kt index b4e0859f2..667799e98 100644 --- a/app/src/main/java/io/legato/kazusa/ui/widget/dialog/VariableDialog.kt +++ b/app/src/main/java/io/legato/kazusa/ui/widget/dialog/VariableDialog.kt @@ -1,5 +1,6 @@ package io.legato.kazusa.ui.widget.dialog +//import io.legado.app.lib.theme.primaryColor import android.app.Application import android.os.Bundle import android.view.MenuItem @@ -8,15 +9,14 @@ import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.fragment.app.viewModels import io.legato.kazusa.R -import io.legato.kazusa.base.BaseDialogFragment +import io.legato.kazusa.base.BaseBottomSheetDialogFragment import io.legato.kazusa.base.BaseViewModel import io.legato.kazusa.databinding.DialogVariableBinding -//import io.legado.app.lib.theme.primaryColor import io.legato.kazusa.utils.applyTint import io.legato.kazusa.utils.setLayout import io.legato.kazusa.utils.viewbindingdelegate.viewBinding -class VariableDialog() : BaseDialogFragment(R.layout.dialog_variable, true), +class VariableDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_variable), Toolbar.OnMenuItemClickListener { private val binding by viewBinding(DialogVariableBinding::bind) diff --git a/app/src/main/res/layout/activity_book_info.xml b/app/src/main/res/layout/activity_book_info.xml index 8d147cfcc..9ff13a835 100644 --- a/app/src/main/res/layout/activity_book_info.xml +++ b/app/src/main/res/layout/activity_book_info.xml @@ -350,7 +350,7 @@ android:textColor="?attr/colorOnPrimary" android:contentDescription="@string/reading" app:icon="@drawable/ic_bottom_books" - app:backgroundTint="?attr/colorSecondary" + app:backgroundTint="?attr/colorTertiary" app:iconTint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/activity_book_search.xml b/app/src/main/res/layout/activity_book_search.xml index 539b69d94..ac451e945 100644 --- a/app/src/main/res/layout/activity_book_search.xml +++ b/app/src/main/res/layout/activity_book_search.xml @@ -72,20 +72,27 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:paddingHorizontal="16dp" - android:paddingVertical="8dp"> + android:paddingVertical="4dp"> + + diff --git a/app/src/main/res/layout/activity_search_content.xml b/app/src/main/res/layout/activity_search_content.xml index 1c5700ba9..0a274e23b 100644 --- a/app/src/main/res/layout/activity_search_content.xml +++ b/app/src/main/res/layout/activity_search_content.xml @@ -42,7 +42,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:ellipsize="middle" android:gravity="center_vertical" android:singleLine="true" diff --git a/app/src/main/res/layout/dialog_book_change_source.xml b/app/src/main/res/layout/dialog_book_change_source.xml index b0ca3de51..af7d47166 100644 --- a/app/src/main/res/layout/dialog_book_change_source.xml +++ b/app/src/main/res/layout/dialog_book_change_source.xml @@ -52,7 +52,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:ellipsize="end" android:gravity="center_vertical" android:singleLine="true" diff --git a/app/src/main/res/layout/dialog_chapter_change_source.xml b/app/src/main/res/layout/dialog_chapter_change_source.xml index 24e6e37d8..6a4a4495d 100644 --- a/app/src/main/res/layout/dialog_chapter_change_source.xml +++ b/app/src/main/res/layout/dialog_chapter_change_source.xml @@ -46,7 +46,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:ellipsize="middle" android:gravity="center_vertical" android:paddingLeft="10dp" @@ -58,7 +58,7 @@ android:id="@+id/iv_top" android:layout_width="36dp" android:layout_height="match_parent" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/go_to_top" android:src="@drawable/ic_arrow_drop_up" android:tooltipText="@string/go_to_top" @@ -68,7 +68,7 @@ android:id="@+id/iv_bottom" android:layout_width="36dp" android:layout_height="match_parent" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/go_to_bottom" android:src="@drawable/ic_arrow_drop_down" android:tooltipText="@string/go_to_bottom" @@ -94,7 +94,7 @@ android:id="@+id/iv_hide_toc" android:layout_width="match_parent" android:layout_height="36dp" - android:background="?android:attr/selectableItemBackground" + android:background="?attr/selectableItemBackground" android:src="@drawable/ic_arrow_down" /> diff --git a/app/src/main/res/layout/dialog_read_aloud.xml b/app/src/main/res/layout/dialog_read_aloud.xml index 62ff73113..0a44b5c5c 100644 --- a/app/src/main/res/layout/dialog_read_aloud.xml +++ b/app/src/main/res/layout/dialog_read_aloud.xml @@ -259,7 +259,7 @@ android:id="@+id/ll_catalog" android:layout_width="60dp" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/chapter_list" android:focusable="true" @@ -298,7 +298,7 @@ android:id="@+id/ll_main_menu" android:layout_width="60dp" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/read_aloud" android:focusable="true" @@ -338,7 +338,7 @@ android:id="@+id/ll_to_backstage" android:layout_width="60dp" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/to_backstage" android:focusable="true" @@ -377,7 +377,7 @@ android:id="@+id/ll_setting" android:layout_width="60dp" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/setting" android:focusable="true" diff --git a/app/src/main/res/layout/dialog_read_book_style.xml b/app/src/main/res/layout/dialog_read_book_style.xml index 008e143b6..ed11908dc 100644 --- a/app/src/main/res/layout/dialog_read_book_style.xml +++ b/app/src/main/res/layout/dialog_read_book_style.xml @@ -48,6 +48,7 @@ android:layout_height="36dp" android:layout_width="wrap_content" android:layout_marginStart="8dp" + app:iconSize="16dp" app:icon="@drawable/ic_brightness" app:iconGravity="textStart" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/dialog_url_option_edit.xml b/app/src/main/res/layout/dialog_url_option_edit.xml index c155fea95..2f05c3460 100644 --- a/app/src/main/res/layout/dialog_url_option_edit.xml +++ b/app/src/main/res/layout/dialog_url_option_edit.xml @@ -38,7 +38,7 @@ android:id="@+id/tv_ok" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="12dp" android:text="@string/ok" /> diff --git a/app/src/main/res/layout/dialog_variable.xml b/app/src/main/res/layout/dialog_variable.xml index 74d5c1676..4ad3abd4a 100644 --- a/app/src/main/res/layout/dialog_variable.xml +++ b/app/src/main/res/layout/dialog_variable.xml @@ -1,47 +1,44 @@ - + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="vertical" + tools:ignore="UselessParent"> + + + android:padding="16dp"> - + android:paddingBottom="8dp"> - + + - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/dialog_verification_code_view.xml b/app/src/main/res/layout/dialog_verification_code_view.xml index 14bf69eed..dc9d1046e 100644 --- a/app/src/main/res/layout/dialog_verification_code_view.xml +++ b/app/src/main/res/layout/dialog_verification_code_view.xml @@ -19,7 +19,7 @@ android:id="@+id/verification_code_image_view" android:layout_width="match_parent" android:layout_height="100dp" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:scaleType="fitCenter" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/layout/item_app_log.xml b/app/src/main/res/layout/item_app_log.xml index eb1c229fc..d84bda69f 100644 --- a/app/src/main/res/layout/item_app_log.xml +++ b/app/src/main/res/layout/item_app_log.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="6dp" - android:background="?android:attr/selectableItemBackground" + android:background="?attr/selectableItemBackground" android:orientation="vertical"> diff --git a/app/src/main/res/layout/item_chapter_list.xml b/app/src/main/res/layout/item_chapter_list.xml index 28a73fb29..ec014e5a8 100644 --- a/app/src/main/res/layout/item_chapter_list.xml +++ b/app/src/main/res/layout/item_chapter_list.xml @@ -5,7 +5,7 @@ android:id="@+id/tv_chapter_item" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" + android:background="?attr/selectableItemBackground" android:orientation="vertical" android:paddingHorizontal="16dp" android:paddingVertical="12dp"> diff --git a/app/src/main/res/layout/item_dict_rule.xml b/app/src/main/res/layout/item_dict_rule.xml index dd5f1e810..fc322ba78 100644 --- a/app/src/main/res/layout/item_dict_rule.xml +++ b/app/src/main/res/layout/item_dict_rule.xml @@ -6,13 +6,15 @@ android:gravity="center" android:orientation="horizontal" android:background="?attr/selectableItemBackground" - android:padding="16dp"> + android:paddingHorizontal="8dp" + android:paddingVertical="12dp"> diff --git a/app/src/main/res/layout/item_read_style.xml b/app/src/main/res/layout/item_read_style.xml index c7c3fe650..98f488a4b 100644 --- a/app/src/main/res/layout/item_read_style.xml +++ b/app/src/main/res/layout/item_read_style.xml @@ -2,8 +2,8 @@ diff --git a/app/src/main/res/layout/item_replace_rule.xml b/app/src/main/res/layout/item_replace_rule.xml index 5c1ffbedb..907099a2c 100644 --- a/app/src/main/res/layout/item_replace_rule.xml +++ b/app/src/main/res/layout/item_replace_rule.xml @@ -6,15 +6,15 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="horizontal" - android:padding="8dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" + android:paddingHorizontal="8dp" + android:paddingVertical="12dp" android:background="?attr/selectableItemBackground"> @@ -30,7 +30,7 @@ android:layout_width="36dp" android:layout_height="36dp" android:layout_gravity="center" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/edit" android:padding="6dp" android:src="@drawable/ic_edit" diff --git a/app/src/main/res/layout/item_server_select.xml b/app/src/main/res/layout/item_server_select.xml index 780b11ec2..18014f9c3 100644 --- a/app/src/main/res/layout/item_server_select.xml +++ b/app/src/main/res/layout/item_server_select.xml @@ -21,7 +21,7 @@ android:layout_width="36dp" android:layout_height="36dp" android:layout_gravity="center" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/edit" android:padding="6dp" android:src="@drawable/ic_edit" /> diff --git a/app/src/main/res/layout/item_theme_config.xml b/app/src/main/res/layout/item_theme_config.xml index 06a5e550a..d8f898990 100644 --- a/app/src/main/res/layout/item_theme_config.xml +++ b/app/src/main/res/layout/item_theme_config.xml @@ -23,7 +23,7 @@ android:layout_width="36dp" android:layout_height="36dp" android:layout_gravity="center" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/edit" android:padding="6dp" android:tooltipText="@string/edit" diff --git a/app/src/main/res/layout/item_toc_regex.xml b/app/src/main/res/layout/item_toc_regex.xml index 9a26d1a35..b229cacc3 100644 --- a/app/src/main/res/layout/item_toc_regex.xml +++ b/app/src/main/res/layout/item_toc_regex.xml @@ -32,7 +32,7 @@ android:layout_width="36dp" android:layout_height="36dp" android:layout_gravity="center" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/edit" android:padding="6dp" android:src="@drawable/ic_edit" diff --git a/app/src/main/res/layout/item_txt_toc_rule.xml b/app/src/main/res/layout/item_txt_toc_rule.xml index 6dfca3bb7..7003b6f1d 100644 --- a/app/src/main/res/layout/item_txt_toc_rule.xml +++ b/app/src/main/res/layout/item_txt_toc_rule.xml @@ -7,7 +7,7 @@ android:background="?attr/selectableItemBackground" android:clickable="true" android:focusable="true" - android:paddingHorizontal="16dp" + android:paddingHorizontal="8dp" android:paddingVertical="8dp"> diff --git a/app/src/main/res/layout/view_manga_menu.xml b/app/src/main/res/layout/view_manga_menu.xml index 35bea83ae..3758208ea 100644 --- a/app/src/main/res/layout/view_manga_menu.xml +++ b/app/src/main/res/layout/view_manga_menu.xml @@ -138,7 +138,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/Widget.Material3Expressive.Button.IconButton" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" app:iconTint="?attr/colorPrimary" android:contentDescription="@string/chapter_list" android:maxHeight="24dp" @@ -158,7 +158,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/Widget.Material3Expressive.Button.IconButton" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" app:iconTint="?attr/colorPrimary" android:contentDescription="@string/auto_next_page" android:tooltipText="@string/auto_next_page" @@ -177,7 +177,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/Widget.Material3Expressive.Button.IconButton" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" app:iconTint="?attr/colorPrimary" android:contentDescription="@string/setting" android:maxHeight="24dp" diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml index b9d19f1c2..023b38142 100644 --- a/app/src/main/res/layout/view_read_menu.xml +++ b/app/src/main/res/layout/view_read_menu.xml @@ -195,7 +195,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/Widget.Material3Expressive.Button.IconButton" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" app:iconTint="?attr/colorPrimary" android:contentDescription="@string/search_content" android:tooltipText="@string/search_content" @@ -213,7 +213,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/Widget.Material3Expressive.Button.IconButton" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" app:iconTint="?attr/colorPrimary" android:contentDescription="@string/read_aloud" android:maxHeight="24dp" @@ -232,7 +232,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/Widget.Material3Expressive.Button.IconButton" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" app:iconTint="?attr/colorPrimary" android:contentDescription="@string/chapter_list" android:tooltipText="@string/chapter_list" @@ -252,7 +252,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/Widget.Material3Expressive.Button.IconButton" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" app:iconTint="?attr/colorPrimary" android:contentDescription="@string/auto_next_page" android:tooltipText="@string/auto_next_page" @@ -271,7 +271,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/Widget.Material3Expressive.Button.IconButton" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" app:iconTint="?attr/colorPrimary" android:contentDescription="@string/setting" android:tooltipText="@string/setting" diff --git a/app/src/main/res/layout/view_search_menu.xml b/app/src/main/res/layout/view_search_menu.xml index d902efa0a..4539007fc 100644 --- a/app/src/main/res/layout/view_search_menu.xml +++ b/app/src/main/res/layout/view_search_menu.xml @@ -69,7 +69,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:ellipsize="middle" android:gravity="center_vertical" android:paddingLeft="10dp" @@ -121,7 +121,7 @@ android:id="@+id/ll_search_results" android:layout_width="60dp" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="结果" android:focusable="true" @@ -161,7 +161,7 @@ android:id="@+id/ll_main_menu" android:layout_width="60dp" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/read_aloud" android:focusable="true" @@ -199,7 +199,7 @@ android:id="@+id/ll_search_exit" android:layout_width="60dp" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="退出" android:focusable="true" @@ -237,7 +237,7 @@ - + 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 2c4f66809..9c8ec67de 100644 --- a/app/src/main/res/layout/view_select_action_bar.xml +++ b/app/src/main/res/layout/view_select_action_bar.xml @@ -1,15 +1,12 @@ + android:text="@string/revert_selection" /> + android:minWidth="0dp" + android:visibility="visible" /> \ No newline at end of file diff --git a/app/src/main/res/layout/view_simple_counter.xml b/app/src/main/res/layout/view_simple_counter.xml index 43c801d8c..e06a1a27a 100644 --- a/app/src/main/res/layout/view_simple_counter.xml +++ b/app/src/main/res/layout/view_simple_counter.xml @@ -1,5 +1,6 @@ + android:textColor="?android:attr/textColorSecondary" + tools:ignore="RtlSymmetry" /> @@ -37,6 +39,7 @@ android:layout_width="40dp" android:layout_height="40dp" style="@style/Widget.Material3.Button.IconButton.Filled.Tonal" + android:elevation="2dp" app:backgroundTint="?attr/colorSurfaceContainer" android:contentDescription="@string/reduce" app:icon="@drawable/ic_reduce" @@ -48,14 +51,15 @@ android:layout_height="wrap_content" android:gravity="center" android:layout_weight="1" - android:text="16" - android:textSize="14sp" /> + android:text="@string/text" + android:textSize="12sp" />