Optimize code

peiniwan · Jun 2, 2022 · e9db54c · e9db54c
1 parent 5cb9c18
commit e9db54c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/longan-design/build.gradle b/longan-design/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -28,12 +26,9 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    compileOptions {
-        kotlinOptions.freeCompilerArgs += ['-module-name', "longan_design"]
-    }
-
     kotlinOptions {
         jvmTarget = '1.8'
+        freeCompilerArgs += ['-module-name', "longan_design"]
     }
 }
 

diff --git a/longan/build.gradle b/longan/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -27,11 +25,11 @@ android {
         coreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
-        kotlinOptions.freeCompilerArgs += ['-module-name', "longan"]
     }
 
     kotlinOptions {
         jvmTarget = '1.8'
+        freeCompilerArgs += ['-module-name', "longan"]
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
         freeCompilerArgs += "-Xcontext-receivers"
     }

diff --git a/longan/src/main/java/com/dylanc/longan/Application.kt b/longan/src/main/java/com/dylanc/longan/Application.kt
@@ -52,9 +52,10 @@ inline val appVersionName: String get() = packageInfo.versionName
 
 inline val appVersionCode: Long get() = PackageInfoCompat.getLongVersionCode(packageInfo)
 
-inline val isAppDebug: Boolean
-  get() = application.packageManager.getApplicationInfo(packageName, 0).flags and
-      ApplicationInfo.FLAG_DEBUGGABLE != 0
+inline val isAppDebug: Boolean get() = application.isAppDebug
+
+inline val Application.isAppDebug: Boolean
+  get() = packageManager.getApplicationInfo(packageName, 0).flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
 
 inline val isAppDarkMode: Boolean
   get() = (application.resources.configuration.uiMode and UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES

diff --git a/longan/src/main/java/com/dylanc/longan/Network.kt b/longan/src/main/java/com/dylanc/longan/Network.kt
@@ -159,12 +159,11 @@ class WifiListLiveData @RequiresPermission(allOf = [ACCESS_WIFI_STATE, CHANGE_WI
 
   private val wifiScanReceiver = object : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
-      val success = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M ||
         intent.getBooleanExtra(WifiManager.EXTRA_RESULTS_UPDATED, false)
-      } else {
-        true
+      ) {
+        value = wifiManager.scanResults
       }
-      value = if (success) wifiManager.scanResults else null
     }
   }
 }
diff --git a/longan/src/main/java/com/dylanc/longan/TextView.kt b/longan/src/main/java/com/dylanc/longan/TextView.kt
@@ -53,7 +53,7 @@ fun TextView.addUnderline() {
   paint.flags = Paint.UNDERLINE_TEXT_FLAG
 }
 
-fun TextView.transparentHighlightColor(){
+fun TextView.transparentHighlightColor() {
   highlightColor = Color.TRANSPARENT
 }
 
@@ -62,8 +62,8 @@ fun TextView.startCountDown(
   secondInFuture: Int = 60,
   onTick: TextView.(secondUntilFinished: Int) -> Unit,
   onFinish: TextView.() -> Unit,
-) {
-  val countDownTimer = object : CountDownTimer(secondInFuture * 1000L, 1000) {
+): CountDownTimer =
+  object : CountDownTimer(secondInFuture * 1000L, 1000) {
     override fun onTick(millisUntilFinished: Long) {
       isEnabled = false
       onTick((millisUntilFinished / 1000f).roundToInt())
@@ -73,12 +73,12 @@ fun TextView.startCountDown(
       isEnabled = true
       this@startCountDown.onFinish()
     }
+  }.also { countDownTimer ->
+    countDownTimer.start()
+    lifecycleOwner.doOnLifecycle(onDestroy = {
+      countDownTimer.cancel()
+    })
   }
-  countDownTimer.start()
-  lifecycleOwner.doOnLifecycle(onDestroy = {
-    countDownTimer.cancel()
-  })
-}
 
 fun TextView.enableWhenOtherTextNotEmpty(vararg textViews: TextView) =
   enableWhenOtherTextChanged(*textViews) { textViews.all { it.isTextNotEmpty() } }