6.6.2 - Alpha5 - 主题色设置页面增加新布局支持 (初步)
This commit is contained in:
SuperMonster003
15
app/src/main/res/drawable/ic_locate.xml
Normal file
15
app/src/main/res/drawable/ic_locate.xml
Normal file
@@ -0,0 +1,15 @@
|
||||
<vector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="20dp"
|
||||
android:height="20dp"
|
||||
android:viewportWidth="20"
|
||||
android:viewportHeight="20">
|
||||
|
||||
<path
|
||||
android:fillColor="@android:color/transparent"
|
||||
android:strokeColor="#09090b"
|
||||
android:strokeWidth="1.8"
|
||||
android:strokeLineCap="round"
|
||||
android:strokeLineJoin="round"
|
||||
android:pathData="M16,10c0,3.3137 -2.6863,6 -6,6m6,-6c0,-3.31371 -2.6863,-6 -6,-6m6,6h3m-9,6c-3.31371,0 -6,-2.6863 -6,-6m6,6v3m-6,-9c0,-3.31371 2.68629,-6 6,-6m-6,6h-3m9,-6v-3m2,9c0,1.1046 -0.8954,2 -2,2s-2,-0.8954 -2,-2 0.8954,-2 2,-2 2,0.8954 2,2z" />
|
||||
</vector>
|
||||
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
@@ -16,16 +17,14 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/MtAppTheme.AppBarOverlay"
|
||||
android:clipToPadding="true"
|
||||
android:fitsSystemWindows="true">
|
||||
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:theme="@style/ToolBarStyle"
|
||||
app:contentInsetStartWithNavigation="@dimen/toolbar_content_inset_start_with_navigation"
|
||||
android:theme="@style/ToolBarStyle"
|
||||
app:popupTheme="@style/MtAppTheme.PopupOverlay"
|
||||
tools:title="@string/text_sample_string" />
|
||||
|
||||
|
||||
41
app/src/main/res/layout/mt_activity_color_select_legacy.xml
Normal file
41
app/src/main/res/layout/mt_activity_color_select_legacy.xml
Normal file
@@ -0,0 +1,41 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<io.codetail.widget.RevealFrameLayout
|
||||
android:id="@+id/appBarContainer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<com.google.android.material.appbar.AppBarLayout
|
||||
android:id="@+id/appBar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/MtAppTheme.AppBarOverlay"
|
||||
android:fitsSystemWindows="true">
|
||||
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
app:contentInsetStartWithNavigation="@dimen/toolbar_content_inset_start_with_navigation"
|
||||
android:theme="@style/ToolBarStyle"
|
||||
app:popupTheme="@style/MtAppTheme.PopupOverlay"
|
||||
tools:title="@string/text_sample_string" />
|
||||
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
|
||||
</io.codetail.widget.RevealFrameLayout>
|
||||
|
||||
<view
|
||||
android:id="@+id/color_setting_recycler_view"
|
||||
class="org.autojs.autojs.theme.app.ColorSettingRecyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</LinearLayout>
|
||||
24
app/src/main/res/menu/menu_color_select.xml
Normal file
24
app/src/main/res/menu/menu_color_select.xml
Normal file
@@ -0,0 +1,24 @@
|
||||
<?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_locate_current_color"
|
||||
android:title="@string/text_locate_current_color"
|
||||
android:icon="@drawable/ic_locate"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_search_color"
|
||||
android:title="@string/text_search_color"
|
||||
android:icon="@drawable/ic_search_white_36dp"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<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>
|
||||
12
app/src/main/res/menu/menu_color_select_legacy.xml
Normal file
12
app/src/main/res/menu/menu_color_select_legacy.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?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>
|
||||
@@ -97,11 +97,14 @@
|
||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
|
||||
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
|
||||
<item name="actionOverflowMenuStyle">@style/OverflowMenu</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
|
||||
<item name="android:textColorPrimary">@color/day_full</item>
|
||||
<item name="android:textColorSecondary">@color/colorAccent</item>
|
||||
<item name="actionOverflowMenuStyle">@style/OverflowMenu</item>
|
||||
</style>
|
||||
|
||||
<style name="MtAppTheme.FullScreen" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||
@@ -112,9 +115,11 @@
|
||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<style name="MtAppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
|
||||
<style name="MtAppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
|
||||
<item name="actionOverflowMenuStyle">@style/OverflowMenu</item>
|
||||
</style>
|
||||
|
||||
<style name="MtAppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
|
||||
<style name="MtAppTheme.PopupOverlay" parent="OverflowMenu">
|
||||
<item name="android:textColorPrimary">@color/day_full</item>
|
||||
</style>
|
||||
|
||||
@@ -144,18 +149,18 @@
|
||||
</style>
|
||||
|
||||
<style name="PopupMenuTheme" parent="AppTheme.PopupOverlay">
|
||||
<item name="android:textColor">@color/day_night</item>
|
||||
<item name="android:tint">@color/day_night</item>
|
||||
<item name="android:textColor">@color/day_night_full</item>
|
||||
<item name="android:tint">@color/day_night_full</item>
|
||||
</style>
|
||||
|
||||
<style name="PopupMenuThemeLight" parent="AppTheme.PopupOverlay">
|
||||
<item name="android:textColor">@color/day</item>
|
||||
<item name="android:tint">@color/day</item>
|
||||
<item name="android:textColor">@color/day_full</item>
|
||||
<item name="android:tint">@color/day_full</item>
|
||||
</style>
|
||||
|
||||
<style name="PopupMenuThemeDark" parent="AppTheme.PopupOverlay">
|
||||
<item name="android:textColor">@color/dusk</item>
|
||||
<item name="android:tint">@color/dusk</item>
|
||||
<item name="android:textColor">@color/night_full</item>
|
||||
<item name="android:tint">@color/night_full</item>
|
||||
</style>
|
||||
|
||||
<style name="SearchViewActionBar" parent="@style/Widget.AppCompat.SearchView.ActionBar" />
|
||||
@@ -164,8 +169,8 @@
|
||||
|
||||
<style name="TextAppearanceEditorTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
|
||||
<item name="android:textSize">@dimen/editor_title_text_size</item>
|
||||
<item name="android:maxLines">2</item>
|
||||
<item name="android:ellipsize">middle</item>
|
||||
<item name="maxLines">2</item>
|
||||
<item name="paddingStart">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearanceMainTitle" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
|
||||
@@ -179,6 +184,8 @@
|
||||
</style>
|
||||
|
||||
<style name="OverflowMenu" parent="Widget.AppCompat.PopupMenu.Overflow">
|
||||
<item name="android:textColor">@color/day_night_full</item>
|
||||
<item name="android:itemBackground">@color/item_background</item>
|
||||
<item name="android:windowDisablePreview">true</item>
|
||||
<item name="overlapAnchor">false</item>
|
||||
<item name="android:dropDownVerticalOffset">5.0dp</item>
|
||||
|
||||
Reference in New Issue
Block a user