Project: Remove blur effect & Add -dontobfuscate in proguard

Signed-off-by: Fung Gwo <fython@163.com>

Author: fython

mobile/build.gradle

@@ -32,6 +32,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             pseudoLocalesEnabled true
         }
+        debug {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            pseudoLocalesEnabled true
+        }
     }
     sourceSets {
         main {
@@ -90,7 +96,6 @@ dependencies {
     implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.0-andx-3'
     implementation 'moe.feng:MaterialStepperView:0.2.4.2'
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
-    implementation 'io.alterac.blurkit:blurkit:1.0.0'
 
     // Utils
     api 'moe.feng:AlipayZeroSdk:1.1'

mobile/proguard-rules.pro

@@ -1,7 +1,5 @@
 -ignorewarn
-
--dontwarn com.tencent.bugly.**
--keep public class com.tencent.bugly.** {*;}
+-dontobfuscate
 -optimizations !code/simplification/arithmetic
 -optimizationpasses 5
 
@@ -32,14 +30,11 @@
 -keep class info.papdt.express.helper.widget.** {*;}
 -keep class info.papdt.express.helper.model.** {*;}
 -keep class info.papdt.express.helper.dao.** {*;}
--keep class info.papdt.express.helper.asynctask.** {*;}
 -keep class info.papdt.express.helper.api.** {*;}
 -keep class info.papdt.express.helper.receiver.** {*;}
 -keep class info.papdt.express.helper.services.** {*;}
 -keep class android.support.** {*;}
 -keep class me.dm7.** {*;}
--keep class com.roughlike.** {*;}
--keep class com.rengwuxian.** {*;}
 -keep class okio.** {*;}
 -keep class com.google.** {*;}
 -keep class moe.feng.alipay.zerosdk.** {*;}

mobile/src/main/kotlin/info/papdt/express/helper/Application.kt

@@ -16,7 +16,6 @@ import info.papdt.express.helper.services.ClipboardDetectService
 import info.papdt.express.helper.support.MaterialColorGenerator
 import info.papdt.express.helper.support.Settings
 import info.papdt.express.helper.support.SettingsInstance
-import io.alterac.blurkit.BlurKit
 import io.fabric.sdk.android.Fabric
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -45,7 +44,6 @@ class Application : MultiDexApplication() {
 		// Init Widget components
 		MaterialIcon.init(this)
 		MaterialColorGenerator.init(this)
-		BlurKit.init(this)
 
 		// Init CrashReport
 		Fabric.with(this, Crashlytics())

mobile/src/main/kotlin/info/papdt/express/helper/support/PTSettings.kt

@@ -29,11 +29,6 @@ class PTSettings(context: Context): SharedPreferencesProvider(context, "settings
 
 	var usingNewDatabase by booleanValue(defValue = false)
 
-	var enableAddDialogBackgroundBlur by booleanValue(
-            // Default disabled in pre-O devices
-			defValue = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-	)
-
     var lastFilter by intValue(defValue = HomePackageListAdapter.FILTER_ON_THE_WAY)
 
     var lastSortBy by intValue(defValue = HomePackageListAdapter.SORT_BY_UPDATE_TIME)

mobile/src/main/kotlin/info/papdt/express/helper/ui/HomeActivity.kt

@@ -36,7 +36,6 @@ import info.papdt.express.helper.support.SettingsInstance
 import info.papdt.express.helper.ui.adapter.HomeToolbarSpinnerAdapter
 import info.papdt.express.helper.ui.adapter.HomePackageListAdapter
 import info.papdt.express.helper.ui.common.AbsActivity
-import io.alterac.blurkit.FixedBlurLayout
 import moe.feng.common.stepperview.VerticalStepperItemView
 import moe.feng.kotlinyan.common.*
 
@@ -99,20 +98,9 @@ class HomeActivity : AbsActivity(), OnRefreshListener {
     private val scanButton by lazy<View> { findViewById(R.id.scan_button) }
     private val moreButton by lazy<View> { findViewById(R.id.more_button) }
     private val bottomSheet by lazy<View> { findViewById(R.id.bottom_sheet_add_package) }
-    private val bottomSheetBackgroundBlur by lazy<FixedBlurLayout> {
-        findViewById(R.id.bottom_sheet_background_blur)
+    private val bottomSheetBackground by lazy<View> {
+        findViewById(R.id.bottom_sheet_background)
     }
-    private val bottomSheetBackgroundNormal by lazy<View> {
-        findViewById(R.id.bottom_sheet_background_normal)
-    }
-    private val bottomSheetBackground: View
-        get() {
-            return if (SettingsInstance.enableAddDialogBackgroundBlur) {
-                bottomSheetBackgroundBlur
-            } else {
-                bottomSheetBackgroundNormal
-            }
-        }
 
     private val moreMenu: PopupMenu by lazy {
         PopupMenu(this, moreButton).also {
@@ -207,16 +195,6 @@ class HomeActivity : AbsActivity(), OnRefreshListener {
             tempFilterCategory = if (it.title.isEmpty()) null else it.title
             updateSearchDialogViewsValue()
         }, action = ChooseCategoryDialog.ACTION_CHOOSE_CATEGORY)
-        if (SettingsInstance.enableAddDialogBackgroundBlur) {
-            bottomSheetBackgroundBlur.startBlur()
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        if (SettingsInstance.enableAddDialogBackgroundBlur) {
-            bottomSheetBackgroundBlur.pauseBlur()
-        }
     }
 
     private fun showBottomSheetBackground() {
@@ -552,14 +530,8 @@ class HomeActivity : AbsActivity(), OnRefreshListener {
         override fun onSlide(v: View, slideOffset: Float) {
             val progress = if (slideOffset.isNaN())
                 1f else 1f + Math.max(slideOffset, -1f)
-            if (SettingsInstance.enableAddDialogBackgroundBlur) {
-                bottomSheetBackgroundBlur.post {
-                    bottomSheetBackgroundBlur.alpha = progress
-                }
-            } else {
-                bottomSheetBackgroundNormal.post {
-                    bottomSheetBackgroundNormal.alpha = progress * 0.35f
-                }
+            bottomSheetBackground.post {
+                bottomSheetBackground.alpha = progress * 0.35f
             }
             bottomSheetBackground.postInvalidate()
         }
@@ -603,10 +575,6 @@ class HomeActivity : AbsActivity(), OnRefreshListener {
             val layoutManager = recyclerView.layoutManager!! as LinearLayoutManager
             val shouldLift = layoutManager.findFirstCompletelyVisibleItemPosition() != 0
 
-            if (SettingsInstance.enableAddDialogBackgroundBlur) {
-                bottomSheetBackgroundBlur.postInvalidate()
-            }
-
             if (animatorDirection != shouldLift) {
                 if (elevationAnimator?.isRunning == true) {
                     elevationAnimator?.cancel()

mobile/src/main/kotlin/info/papdt/express/helper/ui/fragment/settings/SettingsUi.kt

@@ -6,7 +6,6 @@ import info.papdt.express.helper.support.Settings
 import info.papdt.express.helper.support.SettingsInstance
 import moe.shizuku.preference.ListPreference
 import moe.shizuku.preference.Preference
-import moe.shizuku.preference.SwitchPreference
 
 class SettingsUi : AbsPrefFragment(), Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
 
@@ -15,8 +14,6 @@ class SettingsUi : AbsPrefFragment(), Preference.OnPreferenceChangeListener, Pre
             by PreferenceProperty("night_mode")
     private val mPrefShowTipsAgain: Preference?
             by NullablePreferenceProperty("show_tips_again")
-    private val mPrefBlurOnAddDialogBg: SwitchPreference
-            by PreferenceProperty("enable_blur_on_add_dialog_background")
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.settings_ui)
@@ -26,12 +23,9 @@ class SettingsUi : AbsPrefFragment(), Preference.OnPreferenceChangeListener, Pre
             mPrefNightMode.setValueIndex(target)
         }
 
-        mPrefBlurOnAddDialogBg.isChecked = SettingsInstance.enableAddDialogBackgroundBlur
-
         // UI
         mPrefNightMode.onPreferenceChangeListener = this
         mPrefShowTipsAgain?.onPreferenceClickListener = this
-        mPrefBlurOnAddDialogBg.onPreferenceChangeListener = this
     }
 
     override fun onPreferenceClick(pref: Preference): Boolean {
@@ -55,10 +49,6 @@ class SettingsUi : AbsPrefFragment(), Preference.OnPreferenceChangeListener, Pre
                 makeRestartTips()
                 true
             }
-            mPrefBlurOnAddDialogBg -> {
-                SettingsInstance.enableAddDialogBackgroundBlur = newValue as Boolean
-                true
-            }
             else -> false
         }
     }