WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes

This commit is contained in:
NekoInverter 2020-03-13 18:16:23 +08:00
parent 785f7d261b
commit 244c2d3e94
No known key found for this signature in database
GPG Key ID: 280D6CCCF95715F9
9 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@ -44,8 +44,7 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:launchMode="singleTop"
android:theme="@style/AppThemeMain">
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

5
app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
View File

@ -142,8 +142,9 @@ public class BaseActivity extends AppCompatActivity {
}
theme.applyStyle(resid, false);
}
if (!(this instanceof MainActivity)) {
theme.applyStyle(getCustomTheme(), true);
theme.applyStyle(getCustomTheme(), true);
if (this instanceof MainActivity) {
theme.applyStyle(R.style.ThemeOverlay_ActivityMain, true);
}
theme.applyStyle(getThemeStyleRes(this), true);
// only pass theme style to super, so styled theme will not be overwritten

2
app/src/main/res/layout/sticky_header_download.xml
View File

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorStickyHeader"
android:background="?colorStickyHeader"
android:padding="8dp">
<TextView

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

@ -5,5 +5,5 @@
<color name="colorPrimaryDark">#2E2E2E</color>
<color name="colorActionBar">#383838</color>
<color name="navigationBarColor">#B3000000</color>
<color name="colorStickyHeader">#EA424242</color>
<color name="colorStickyHeader">#EA303030</color>
</resources>

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="navigationBarColor">@android:color/transparent</color>
<color name="navigationBarColorBlack">@android:color/transparent</color>
</resources>

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

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="colorActionBar" format="color" />
<attr name="colorStickyHeader" format="color" />
<attr name="actionBarTheme" format="reference" />
<attr name="actionBarPopupTheme" format="reference" />
<attr name="tabLayoutTheme" format="reference" />

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

@ -12,4 +12,5 @@
<color name="navigationBarColor">?colorPrimary</color>
<color name="colorStickyHeader">#eafafafa</color>
<color name="ic_launcher_background">#35C0CA</color>
<color name="navigationBarColorBlack">@android:color/black</color>
</resources>

17
app/src/main/res/values/styles.xml
View File

@ -7,11 +7,12 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorActionBar">@color/colorActionBar</item>
<item name="colorStickyHeader">@color/colorStickyHeader</item>
<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
<item name="android:colorBackground">@color/colorBackground</item>
<item name="android:windowBackground">@color/colorBackground</item>
<item name="actionBarPopupTheme">@style/AppTheme.PopupOverlay</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">@bool/lightSystemUI</item>
<item name="android:windowLightStatusBar">@bool/lightSystemUI</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/lightSystemUI
</item>
<item name="android:navigationBarColor">@color/navigationBarColor</item>
@ -25,26 +26,28 @@
<item name="android:textColor">?attr/colorOnSurface</item>
</style>
<style name="AppThemeMain" parent="AppTheme">
<item name="colorPrimaryDark">@color/colorBackground</item>
</style>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
<style name="ThemeOverlay" />
<style name="ThemeOverlay.ActionBarPrimaryColor">
<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="android:windowLightStatusBar">false</item>
<item name="tabLayoutTheme">@style/Widget.MaterialComponents.TabLayout.Colored</item>
</style>
<style name="ThemeOverlay.ActivityMain">
<item name="android:windowLightStatusBar">@bool/lightSystemUI</item>
<item name="colorPrimaryDark">@color/colorBackground</item>
</style>
<style name="ThemeOverlay.Black">
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorActionBar">@android:color/black</item>
<item name="android:navigationBarColor">@android:color/black</item>
<item name="android:navigationBarColor">@color/navigationBarColorBlack</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="colorStickyHeader">#ea000000</item>
<item name="tabLayoutTheme">@style/Widget.MaterialComponents.TabLayout</item>
</style>
</resources>

3
app/src/main/res/xml/prefs.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--suppress ALL -->
<?xml version="1.0" encoding="utf-8"?><!--suppress ALL -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory