From 105bce104254148acc7dfcda3c3392aaa3e344fb Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Sat, 30 Jan 2021 14:22:58 +0800
Subject: [PATCH] Fix crash on Android 8.0

---
 .../lsposed/manager/ui/activity/MainActivity.java    | 12 ++++++------
 app/src/main/res/values-night/colors.xml             |  1 -
 app/src/main/res/values/attrs.xml                    |  2 --
 app/src/main/res/values/colors.xml                   |  4 +---
 app/src/main/res/values/colors_md2.xml               |  1 -
 app/src/main/res/values/styles.xml                   |  5 -----
 6 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java
index 6f118d0a..4a850c17 100644
--- a/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java
+++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java
@@ -30,12 +30,6 @@ public class MainActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
-        getWindow().getDecorView().post(() -> {
-            if (Light.setLightSourceAlpha(getWindow().getDecorView(), 0.01f, 0.029f)) {
-                binding.status.setElevation(24);
-                binding.modules.setElevation(12);
-            }
-        });
         binding.modules.setOnClickListener(v -> {
             Intent intent = new Intent();
             intent.setClass(getApplicationContext(), ModulesActivity.class);
@@ -91,6 +85,12 @@ public class MainActivity extends BaseActivity {
 
     @Override
     protected void onResume() {
+        getWindow().getDecorView().post(() -> {
+            if (Light.setLightSourceAlpha(getWindow().getDecorView(), 0.01f, 0.029f)) {
+                binding.status.setElevation(24);
+                binding.modules.setElevation(12);
+            }
+        });
         super.onResume();
         binding.modulesSummary.setText(String.format(getString(R.string.ModulesDetail), ModuleUtil.getInstance().getEnabledModules().size()));
     }
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 3ed7e8e7..6b6b9163 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -5,5 +5,4 @@
     <color name="colorPrimaryDark">#2E2E2E</color>
     <color name="colorActionBar">#383838</color>
     <color name="navigationBarColor">#B3000000</color>
-    <color name="colorStickyHeader">#EA303030</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index b514607e..a753f01f 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="colorActionBar" format="color" />
-    <attr name="colorStickyHeader" format="color" />
     <attr name="listItemBackground" format="reference" />
     <attr name="roundBackground" format="reference" />
     <attr name="actionBarTheme" format="reference" />
     <attr name="modulesHorizontalPadding" format="dimension" />
-    <attr name="downloadVerticalPadding" format="dimension" />
     <attr name="actionBarPopupTheme" format="reference" />
     <attr name="tabLayoutTheme" format="reference" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8e056802..524f4f65 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,8 +9,6 @@
     <color name="warning">@color/red_500</color>
     <color name="download_status_update_available">#4CAF50</color>
     <color name="amber_500">#FFC107</color>
-    <color name="navigationBarColor">?colorPrimary</color>
-    <color name="colorStickyHeader">#eafafafa</color>
-    <color name="ic_launcher_background">#35C0CA</color>
+    <color name="navigationBarColor">@color/colorPrimary</color>
     <color name="navigationBarColorBlack">@android:color/black</color>
 </resources>
diff --git a/app/src/main/res/values/colors_md2.xml b/app/src/main/res/values/colors_md2.xml
index 2b856bdb..1cf5aa46 100644
--- a/app/src/main/res/values/colors_md2.xml
+++ b/app/src/main/res/values/colors_md2.xml
@@ -5,6 +5,5 @@
     <color name="colorPrimaryDark_md2">#fff</color>
     <color name="colorAccent_md2">@color/material_blue_700</color>
     <color name="colorActionBar_md2">#fff</color>
-    <color name="colorStickyHeader_md2">#eaffffff</color>
     <color name="selectorTransparency_md2">#34ffffff</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d194bdaa..7eca4bcc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,9 +7,7 @@
         <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="modulesHorizontalPadding">8dp</item>
-        <item name="downloadVerticalPadding">16dp</item>
         <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
         <item name="android:colorBackground">@color/colorBackground</item>
         <item name="android:windowBackground">@color/colorBackground</item>
@@ -55,11 +53,9 @@
     <style name="ThemeOverlay.Md2">
         <item name="colorPrimaryDark">@color/colorPrimaryDark_md2</item>
         <item name="colorActionBar">@color/colorActionBar_md2</item>
-        <item name="colorStickyHeader">@color/colorStickyHeader_md2</item>
         <item name="android:colorBackground">@color/colorBackground_md2</item>
         <item name="android:windowBackground">@color/colorBackground_md2</item>
         <item name="modulesHorizontalPadding">16dp</item>
-        <item name="downloadVerticalPadding">12dp</item>
         <item name="listItemBackground">@drawable/item_background_md2</item>
         <item name="roundBackground">@drawable/item_background_md2</item>
         <item name="liftOnScroll">true</item>
@@ -82,7 +78,6 @@
         <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>