Merge pull request #233 from GuoXiCheng/refactor

Refactor

.gitignore

@@ -95,4 +95,5 @@ docs/.vitepress/dist
 coverage
 scripts/__tests__/examples/dist
 !scripts/__tests__/examples/dist/.gitkeep
-*.zip
+*.zip
+!capture/*.zip

README.md

@@ -26,4 +26,4 @@ SKIP 是一款免费开源的安卓应用，旨在利用 Android 无障碍服务
 
 ## 许可证
 
-[MIT License](https://github.com/GuoXiCheng/SKIP/blob/main/LICENSE)
+[GNU AFFERO GENERAL PUBLIC LICENSE Version 3](https://github.com/GuoXiCheng/SKIP/blob/main/LICENSE)

app/build.gradle.kts

@@ -0,0 +1,70 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.compose.compiler)
+    id("kotlin-kapt")
+    id("com.google.dagger.hilt.android")
+}
+
+android {
+    namespace = "com.android.skip"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "com.android.skip"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = 2
+        versionName = "3.0.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+            )
+        }
+    }
+    buildFeatures {
+        compose=true
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(libs.snakeyaml)
+    implementation(libs.accompanist.drawablepainter)
+    implementation(libs.androidx.paging.compose)
+    implementation(libs.androidx.paging.runtime)
+    implementation(libs.gson)
+    implementation(libs.utilcodex)
+    implementation(libs.hilt.android)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.runtime.android)
+    implementation(libs.androidx.foundation.android)
+    implementation(libs.androidx.material3.android)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.runtime.livedata)
+    kapt(libs.hilt.android.compiler)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}
+
+kapt {
+    correctErrorTypes = true
+}

app/src/androidTest/java/com/android/skip/ExampleInstrumentedTest.kt

@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.android.oneclick", appContext.packageName)
+        assertEquals("com.android.skip", appContext.packageName)
     }
 }

app/src/main/AndroidManifest.xml

@@ -2,46 +2,35 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     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.QUERY_ALL_PACKAGES"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <application
-        android:name=".SKIPApp"
+        android:name=".MyApp"
         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/AppTheme"
+        android:theme="@style/Theme.SKIP"
         tools:targetApi="31">
         <activity
-            android:name=".WhitelistActivity"
-            android:exported="false" />
-        <activity
-            android:name=".KeepAliveActivity"
-            android:exported="false" />
-        <activity
-            android:name=".BaseActivity"
+            android:name=".ui.whitelist.WhiteListActivity"
             android:exported="false" />
         <activity
-            android:name=".SettingsActivity"
+            android:name=".ui.settings.SettingsActivity"
             android:exported="false" />
         <activity
-            android:name=".AboutActivity"
+            android:name=".ui.alive.AliveActivity"
             android:exported="false" />
-
-        <activity
-            android:name=".LayoutInspectActivity"
-            android:exported="false" />
-
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.android.skip.provider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -50,20 +39,32 @@
         </provider>
 
         <activity
-            android:name=".NewMainActivity"
-            android:excludeFromRecents="true"
-            android:exported="true"
-            android:label="@string/activity_main"
-            android:theme="@style/AppTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            android:name=".ui.record.InspectRecordActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.about.AboutActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.webview.WebViewActivity"
+            android:exported="false" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+        <service
+            android:name=".service.InspectService"
+            android:enabled="true"
+            android:foregroundServiceType="mediaProjection" />
+        <service
+            android:name=".service.MyForegroundService"
+            android:foregroundServiceType="specialUse"
+            android:enabled="true"
+            tools:ignore="ForegroundServicePermission" />
+
+        <activity
+            android:name=".ui.inspect.InspectActivity"
+            android:exported="false" />
 
         <service
             android:name=".service.MyAccessibilityService"
+            android:enabled="true"
             android:exported="true"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
@@ -75,16 +76,15 @@
                 android:resource="@xml/accessibility" />
         </service>
 
-        <service
-            android:name=".service.LayoutInspectService"
-            android:enabled="true"
-            android:foregroundServiceType="mediaProjection"
-            />
+        <activity
+            android:name=".ui.main.MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-        <service
-            android:name=".service.MyForegroundService"
-            android:enabled="true"
-            />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>