6.6.2 - Alpha5 - 主题色设置页面新布局支持基础功能及新旧布局数据兼容

This commit is contained in:
SuperMonster003
2025-03-27 23:15:41 +08:00
parent 124dea0c0e
commit 1cae3820f9
90 changed files with 1660 additions and 1033 deletions

View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_color_palette"
android:title="@string/text_color_palette"
android:icon="@drawable/ic_color_palette_vector"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_search_color"
android:title="@string/text_search_color"
android:icon="@drawable/ic_search_black_48dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_new_color_library"
android:title="@string/text_new_color_library"
android:icon="@drawable/ic_add_box_black_48dp"
app:showAsAction="never" />
<item
android:id="@+id/action_locate_current_theme_color"
android:title="@string/text_locate_current_theme_color"
android:icon="@drawable/ic_locate"
app:showAsAction="never" />
<item
android:id="@+id/action_toggle_color_select_layout"
android:title="@string/text_switch_to_legacy_layout"
android:icon="@drawable/ic_swap_horiz_black_48dp"
app:showAsAction="never" />
</menu>

View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search_color"
android:title="@string/text_search_color"
android:icon="@drawable/ic_search_black_48dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_locate_current_theme_color"
android:title="@string/text_locate_current_theme_color"
android:icon="@drawable/ic_locate"
app:showAsAction="never" />
</menu>

View File

@@ -3,33 +3,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_color_palette"
android:title="@string/text_color_palette"
android:icon="@drawable/ic_color_palette_vector"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_search_color"
android:title="@string/text_search_color"
android:icon="@drawable/ic_search_black_48dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_new_color_library"
android:title="@string/text_new_color_library"
android:icon="@drawable/ic_add_box_black_48dp"
app:showAsAction="never" />
<item
android:id="@+id/action_locate_current_color"
android:title="@string/text_locate_current_color"
android:icon="@drawable/ic_locate"
app:showAsAction="never" />
<item
android:id="@+id/action_toggle_color_select_layout"
android:title="@string/text_switch_to_legacy_layout"
android:title="@string/text_switch_to_new_layout"
android:icon="@drawable/ic_swap_horiz_black_48dp"
app:showAsAction="never" />

View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_toggle_color_select_layout"
android:title="@string/text_switch_to_new_layout"
android:icon="@drawable/ic_swap_horiz_black_48dp"
app:showAsAction="never" />
</menu>

View File

@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<menu
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_log"
android:icon="@drawable/ic_ali_log"
android:title="@string/text_log"
app:showAsAction="ifRoom" />
android:id="@+id/action_log"
android:icon="@drawable/ic_ali_log"
android:title="@string/text_log"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_search"
android:icon="@drawable/ic_search_black_48dp"
android:title="@string/text_search"
android:imeOptions="actionSearch"
android:inputType="text"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView" />
android:id="@+id/action_search"
android:icon="@drawable/ic_search_black_48dp"
android:title="@string/text_search"
android:imeOptions="actionSearch"
android:inputType="text"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView" />
</menu>