Merge pull request #54 from GuoXiCheng/dev

update
GuoXiCheng · Oct 10, 2023 · e5a5f45 · e5a5f45
2 parents bd17d76 + b61286f
commit e5a5f45
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 166 deletions.
diff --git a/apk/SKIP-v1.3.2.apk b/apk/SKIP-v1.3.2.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 24
         targetSdk 32
         versionCode 1
-        versionName "1.3.1"
+        versionName "1.3.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/com/android/skip/MainActivity.kt b/app/src/main/java/com/android/skip/MainActivity.kt
@@ -439,14 +439,8 @@ fun PageFooter() {
                     end = 6
                 )
                 append(" | ")
-                append("Document")
-                addStringAnnotation(
-                    tag = "URL",
-                    annotation = "https://guoxicheng.github.io/SKIP-Docs/1-introduction",
-                    start = 9,
-                    end = 18
-                )
-                append(" | Version " + BuildConfig.VERSION_NAME)
+                append(RectManager.getMaxRect())
+                append(" | version " + BuildConfig.VERSION_NAME)
             }
         }
         ClickableText(

diff --git a/app/src/main/java/com/android/skip/Mobile.kt b/app/src/main/java/com/android/skip/Mobile.kt
diff --git a/app/src/main/java/com/android/skip/MyUtils.kt b/app/src/main/java/com/android/skip/MyUtils.kt
@@ -76,10 +76,10 @@ object MyUtils {
                 override fun onCompleted(gestureDescription: GestureDescription) {
                     super.onCompleted(gestureDescription)
 
-                    if (AnalyticsManager.isShowToast()) {
-                        ToastManager.showToast(accessibilityService, "已为您跳过广告")
-                        AnalyticsManager.setShowToastCount()
-                    }
+//                    if (AnalyticsManager.isShowToast()) {
+//                        ToastManager.showToast(accessibilityService, "已为您跳过广告")
+//                        AnalyticsManager.setShowToastCount()
+//                    }
 
                 }
             },

diff --git a/app/src/main/java/com/android/skip/manager/RectManager.kt b/app/src/main/java/com/android/skip/manager/RectManager.kt
@@ -20,4 +20,8 @@ object RectManager {
         rect.set(actualX - 1, actualY - 1, actualX + 1, actualY + 1)
         return rect
     }
+
+    fun getMaxRect(): String {
+        return "${maxRectX}x${maxRectY}"
+    }
 }
diff --git a/app/src/main/java/com/android/skip/node/NodeRect.kt b/app/src/main/java/com/android/skip/node/NodeRect.kt
diff --git a/app/src/main/java/com/android/skip/service/MyAccessibilityService.kt b/app/src/main/java/com/android/skip/service/MyAccessibilityService.kt
@@ -35,7 +35,6 @@ class MyAccessibilityService : AccessibilityService() {
                 }
             }
 
-            Log.i("SKIPS", p0?.className.toString())
         } catch (e: Exception) {
             Log.d("SKIPS", e.message.toString())
         } finally {
@@ -64,14 +63,6 @@ class MyAccessibilityService : AccessibilityService() {
         return true
     }
 
-//    private fun isStartUpPage(): Boolean {
-//        val countCallBack = NodeCount()
-//        countCallBack.cleanCount()
-//        val currentNode = getCurrentRootNode()
-//        recursionNodes(currentNode, countCallBack)
-//        return countCallBack.getCount() < SkipConfigManager.getStartPageNodeCount(currentNode.packageName.toString())
-//    }
-
     override fun onInterrupt() {}
 
 }
diff --git a/app/src/main/res/drawable-v24/backend_lock.jpg b/app/src/main/res/drawable-v24/backend_lock.jpg
diff --git a/app/src/main/res/drawable-v24/disabled.png b/app/src/main/res/drawable-v24/disabled.png
diff --git a/app/src/main/res/drawable-v24/enabled.png b/app/src/main/res/drawable-v24/enabled.png
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -2,12 +2,10 @@
 <resources>
     <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="teal_500">#FFB2DEDF</color>
-    <color name="grey">#FF808080</color>
     <color name="green">#FF32A061</color>
 </resources>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#32A060</color>
-</resources>
+<resources></resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,7 +2,4 @@
     <string name="app_name">SKIP</string>
     <string name="activity_main">SKIP</string>
     <string name="accessibility_description">若无障碍服务发生故障，可以关闭后再打开。</string>
-    <string name="attention">注意事项</string>
-    <string name="attention_content">由于无障碍服务会在应用进程结束后自动关闭，因此需要开启应用后台运行权限</string>
-    <string name="operation">操作方式</string>
 </resources>