tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.6.2 - Alpha4 - 修复代码编辑器页面菜单项图标及文字的着色异常

Browse Source
This commit is contained in:
SuperMonster003
2025-03-11 20:49:07 +08:00
parent d355964591
commit 0487cf2a60
13 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/activity_display_scrollable_content.xml
View File

@@ -33,7 +33,7 @@
</org.autojs.autojs.ui.common.NestedOuterScrollView>
<org.autojs.autojs.theme.widget.ThemeColorFloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -41,8 +41,6 @@
android:layout_alignParentEnd="true"
android:layout_margin="16dp"
android:contentDescription="@string/content_description_fab_for_display_manifest"
app:backgroundTint="?attr/colorPrimary"
android:tint="@color/toolbar_text"
android:src="@android:drawable/ic_menu_more" />
</RelativeLayout>

6
app/src/main/res/layout/activity_manage_key_store.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout 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">
@@ -15,8 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="13dp"
android:theme="@style/ToolBarStyle" />
android:paddingEnd="6dp"
android:theme="@style/ToolBarStyle"
tools:ignore="RtlSymmetry" />
</com.google.android.material.appbar.AppBarLayout>

5
app/src/main/res/layout/fragment_debug_toolbar.xml
View File

@@ -11,7 +11,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_debug_step_over"
app:icon_color="@color/toolbar_text"
app:text="@string/text_debug_step_over"/>
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -19,7 +18,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_debug_step_into"
app:icon_color="@color/toolbar_text"
app:text="@string/text_debug_step_into"/>
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -27,7 +25,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_debug_step_out"
app:icon_color="@color/toolbar_text"
app:text="@string/text_debug_step_out"/>
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -35,7 +32,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_play_arrow_white_48dp"
app:icon_color="@color/toolbar_text"
app:text="@string/text_debug_resume_script"/>
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -43,7 +39,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_close_white_48dp"
app:icon_color="@color/toolbar_text"
app:text="@string/text_stop"/>
</LinearLayout>

4
app/src/main/res/layout/fragment_normal_toolbar.xml
View File

@@ -11,7 +11,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_play_arrow_white_48dp"
app:icon_color="@color/toolbar_text"
app:text="@string/text_run_simplified" />
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -19,7 +18,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_undo_white_48dp"
app:icon_color="@color/toolbar_text"
app:text="@string/text_undo_simplified" />
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -27,7 +25,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_redo_white_48dp"
app:icon_color="@color/toolbar_text"
app:text="@string/text_redo_simplified" />
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -36,7 +33,6 @@
android:layout_height="match_parent"
android:enabled="false"
app:icon="@drawable/ic_save_white_48dp"
app:icon_color="@color/toolbar_text"
app:text="@string/text_save_simplified" />
</LinearLayout>

4
app/src/main/res/layout/fragment_search_toolbar.xml
View File

@@ -11,7 +11,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_ali_replace"
app:icon_color="@color/toolbar_text"
app:text="@string/text_replace_simplified"/>
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -19,7 +18,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_ali_up"
app:icon_color="@color/toolbar_text"
app:text="@string/text_find_prev_simplified"/>
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -27,7 +25,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_ali_down"
app:icon_color="@color/toolbar_text"
app:text="@string/text_find_next_simplified"/>
<org.autojs.autojs.ui.widget.ToolbarMenuItem
@@ -35,7 +32,6 @@
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_close_white_48dp"
app:icon_color="@color/toolbar_text"
app:text="@string/text_cancel_simplified"/>
</LinearLayout>

1
app/src/main/res/values-night/colors.xml
View File

@@ -54,7 +54,6 @@
<color name="tab_selected_text">#111214</color>
<color name="toolbar_text">@color/night_day</color>
<color name="toolbar_disabled">#6E292929</color>
<color name="prefTextColorPrimary">#9A9A9A</color>
<color name="prefTextColorSecondary">#808080</color>

1
app/src/main/res/values/attrs.xml
View File

@@ -47,7 +47,6 @@
<declare-styleable name="ToolbarMenuItem">
<attr name="text" format="string|reference" />
<attr name="icon" />
<attr name="icon_color" format="color|reference" />
</declare-styleable>
<declare-styleable name="RoundCheckboxWithText">

5
app/src/main/res/values/colors.xml
View File

@@ -132,9 +132,12 @@
<color name="tab_selected_text_dark">#111214</color>
<color name="toolbar_text">@color/night_day</color>
<color name="toolbar_menu_item_enabled_light">@color/night</color>
<color name="toolbar_menu_item_enabled_dark">@color/dawn</color>
<color name="toolbar_menu_item_disabled_light">#6EE0E0E0</color>
<color name="toolbar_menu_item_disabled_dark">#6E292929</color>
<color name="fab_tint_light">@color/night</color>
<color name="fab_tint_dark">@color/day</color>
<color name="toolbar_disabled">#6EE0E0E0</color>
<color name="prefTextColorPrimary">#282C2F</color>
<color name="prefTextColorSecondary">#9DA0A2</color>