diff --git a/apk/app-release.apk b/apk/app-release.apk
new file mode 100644
index 00000000..162b5138
Binary files /dev/null and b/apk/app-release.apk differ
diff --git a/apk/app-release_7zip_aligned_signed.apk b/apk/app-release_7zip_aligned_signed.apk
deleted file mode 100644
index 4f5dc1e5..00000000
Binary files a/apk/app-release_7zip_aligned_signed.apk and /dev/null differ
diff --git a/app/and_res_guard.gradle b/app/and_res_guard.gradle
deleted file mode 100644
index 1eed6f3d..00000000
--- a/app/and_res_guard.gradle
+++ /dev/null
@@ -1,81 +0,0 @@
-apply plugin: 'AndResGuard'
-andResGuard {
- mappingFile = null
- use7zip = true
- useSign = true
- keepRoot = false
- compressFilePattern = [
- "*.png",
- "*.jpg",
- "*.jpeg",
- "*.gif",
- "resources.arsc"
- ]
- whiteList = [
- // your icon
- "R.drawable.ic_favorite_black_24dp",
- "R.drawable.ic_collections_black_24dp",
- "R.drawable.ic_account_blog_black_24dp",
- "R.drawable.ic_bug_report_black_24dp",
- "R.drawable.ic_github_black_24dp",
- "R.drawable.ic_message_black_24dp",
- "R.drawable.bottom_item",
- "R.drawable.color_progressbar",
- "R.drawable.edit_gray_radus",
- "R.drawable.ic_account_circle_black_24dp",
- "R.drawable.ic_baseline_history_24",
- "R.drawable.ic_bug_report_black_24dp",
- "R.drawable.ic_collections_black_24dp",
- "R.drawable.ic_equalizer_black_24dp",
- "R.drawable.ic_favorite_border_black_24dp",
- "R.drawable.ic_launcher_background",
- "R.drawable.ic_launcher_foreground",
- "R.drawable.ic_message_black_24dp",
- "R.drawable.ic_more_vert_black_24dp",
- "R.drawable.ic_navigate_next_black_24dp",
- "R.drawable.btn_login_bg",
- "R.drawable.btn_login_normal",
- "R.drawable.btn_login_pressed",
- "R.drawable.btn_exit_login_bg",
- "R.drawable.btn_exit_login_normal",
- "R.drawable.btn_exit_login_pressed",
- "R.drawable.profile_list_bg",
- "R.drawable.btn_right_right_bg",
- "R.drawable.ic_equalizer_black_pressed_24dp",
- "R.drawable.ic_head",
- "R.drawable.ic_nav_discover_actived",
- "R.drawable.ic_nav_discover_normal",
- "R.drawable.ic_nav_my_normal",
- "R.drawable.ic_nav_my_pressed",
- "R.drawable.ic_nav_news_actived",
- "R.drawable.ic_nav_news_normal",
- "R.drawable.ic_nav_tweet_actived",
- "R.drawable.ic_nav_tweet_normal",
- "R.drawable.img_cardview_bg.9",
- "R.drawable.img_nomal_head",
- "R.drawable.img_welcome",
- "R.drawable.btn",
- "R.drawable.img_back",
- "R.drawable.bad_network_image",
- "R.drawable.logo_reverse",
- "R.drawable.no_content_image",
- "R.mipmap.phone_login_button",
- "R.mipmap.phone_login_button_pressed",
- // for fabric
- "R.string.com.crashlytics.*",
- // for google-services.json
- "R.string.google_app_id",
- "R.string.gcm_defaultSenderId",
- "R.string.default_web_client_id",
- "R.string.ga_trackingId",
- "R.string.firebase_database_url",
- "R.string.google_api_key",
- "R.string.google_crash_reporting_api_key",
-
- ]
-
- sevenzip {
- artifact = 'com.tencent.mm:SevenZip:1.2.10'
- //path = "/usr/local/bin/7za"
- }
-}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5d62bd48..2944d29c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,6 @@ plugins {
id 'kotlin-kapt'
id 'dagger.hilt.android.plugin'
}
-apply from: 'and_res_guard.gradle'//压缩apk
android {
signingConfigs {
@@ -16,7 +15,6 @@ android {
}
}
compileSdkVersion cfgs.compileSdkVersion
- buildToolsVersion cfgs.buildToolsVersion
defaultConfig {
applicationId "com.zj.play"
@@ -50,6 +48,11 @@ android {
buildFeatures {
viewBinding true
}
+
+ lintOptions {
+ disable "Instantiatable"
+ }
+
}
dependencies {
@@ -67,8 +70,8 @@ dependencies {
//implementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
// hilt
- implementation 'com.google.dagger:hilt-android:2.40.5'
- kapt 'com.google.dagger:hilt-android-compiler:2.40.5'
+ implementation "com.google.dagger:hilt-android:$hilt_version"
+ kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
implementation 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03'
kapt 'androidx.hilt:hilt-compiler:1.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a739951d..4eb113c6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
-
+
@@ -63,6 +63,7 @@
@@ -74,6 +75,7 @@
android:name="android.app.shortcuts"
android:resource="@xml/shortcuts" />
+