Merge pull request #109 from GuoXiCheng/main

pre-release

.github/workflows/ci.yml

@@ -26,6 +26,10 @@ jobs:
       run: |
         cp app/src/main/assets/skip_config.yaml dist/
 
+    - name: SKIP Config V2
+      run: |
+        cp app/src/main/assets/skip_config_v2.yaml dist/
+
     - name: Deploy
       uses: peaceiris/actions-gh-pages@v3
       with:

.gitignore

@@ -50,6 +50,7 @@ captures/
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
+.idea/
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.

app/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.android.skip"
@@ -47,9 +47,14 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    namespace 'com.android.skip'
 }
 
 dependencies {
+    implementation "com.google.accompanist:accompanist-drawablepainter:0.28.0"
+    implementation "androidx.datastore:datastore-preferences:1.0.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
     implementation 'org.yaml:snakeyaml:1.29'
     implementation 'com.google.code.gson:gson:2.8.9'
@@ -63,8 +68,8 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
     implementation 'androidx.activity:activity-compose:1.3.1'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
     debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"

app/src/main/AndroidManifest.xml

@@ -1,23 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.skip">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.OneClick"
-        android:networkSecurityConfig="@xml/network_security_config"
+        android:theme="@style/AppTheme"
         tools:targetApi="31">
+        <activity
+            android:name=".WhitelistActivity"
+            android:exported="false" />
+        <activity
+            android:name=".KeepAliveActivity"
+            android:exported="false" />
+        <activity
+            android:name=".BaseActivity"
+            android:exported="false" />
+        <activity
+            android:name=".SettingsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".AboutActivity"
+            android:exported="false" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -30,11 +44,11 @@
         </provider>
 
         <activity
-            android:name="com.android.skip.MainActivity"
+            android:name=".NewMainActivity"
+            android:excludeFromRecents="true"
             android:exported="true"
             android:label="@string/activity_main"
-            android:excludeFromRecents="true"
-            android:theme="@style/Theme.OneClick">
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -43,7 +57,7 @@
         </activity>
 
         <service
-            android:name="com.android.skip.service.MyAccessibilityService"
+            android:name=".service.MyAccessibilityService"
             android:exported="true"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>

app/src/main/assets/skip_config.yaml

@@ -33,7 +33,7 @@
   skip_text: 关闭
 
 # 爱奇艺极速版
-- package_name: com.qiyi.video.lite 
+- package_name: com.qiyi.video.lite
   skip_text: 关闭
 
 # 腾讯微云