Develop - Code refactor and optimization, Battery widget improvements

app/build.gradle.kts

@@ -8,19 +8,24 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 kotlin {
     compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
+        jvmTarget.set(JvmTarget.JVM_21)
         freeCompilerArgs.add("-Xannotation-default-target=param-property")
+        optIn.addAll(
+            "androidx.compose.material3.ExperimentalMaterial3Api",
+            "androidx.compose.material3.ExperimentalMaterial3ExpressiveApi",
+            "androidx.compose.foundation.ExperimentalFoundationApi"
+        )
     }
 }
 
 android {
     namespace = "com.sameerasw.essentials"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId = "com.sameerasw.essentials"
         minSdk = 26
-        targetSdk = 36
+        targetSdk = 37
         versionCode = 43
         versionName = "14.0"
 
@@ -58,8 +63,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
     buildFeatures {
         compose = true
@@ -83,7 +88,7 @@ dependencies {
     implementation("androidx.core:core-splashscreen:1.0.1")
 
     // Force latest Material3 1.5.0-alpha17 for new MaterialShapes
-    implementation("androidx.compose.material3:material3:1.5.0-alpha17")
+    implementation("androidx.compose.material3:material3:1.5.0-alpha19")
 
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.graphics)

app/src/main/java/com/sameerasw/essentials/AppLockActivity.kt

@@ -7,26 +7,30 @@ import android.os.Bundle
 import android.util.Log
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
 import androidx.biometric.BiometricPrompt
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
 import androidx.core.content.ContextCompat
-import androidx.appcompat.app.AppCompatActivity
+import coil.compose.AsyncImage
 import com.sameerasw.essentials.services.tiles.ScreenOffAccessibilityService
 import com.sameerasw.essentials.ui.theme.EssentialsTheme
 import java.util.concurrent.Executor
@@ -159,7 +163,7 @@ class AppLockActivity : AppCompatActivity() {
             putExtra("package_name", packageToLock)
         }
         sendBroadcast(intent)
-        
+
         val accessibilityIntent = Intent(this, ScreenOffAccessibilityService::class.java).apply {
             action = "APP_AUTHENTICATED"
             putExtra("package_name", packageToLock)

app/src/main/java/com/sameerasw/essentials/AppUpdatesActivity.kt

@@ -8,6 +8,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -46,7 +47,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.sameerasw.essentials.ui.components.ReusableTopAppBar
 import com.sameerasw.essentials.ui.components.cards.TrackedRepoCard
@@ -260,7 +260,12 @@ class AppUpdatesActivity : AppCompatActivity() {
                             modifier = Modifier.padding(bottom = 16.dp, end = 16.dp),
                             containerColor = MaterialTheme.colorScheme.primaryContainer,
                             contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
-                            elevation = androidx.compose.material3.FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp)
+                            elevation = androidx.compose.material3.FloatingActionButtonDefaults.elevation(
+                                0.dp,
+                                0.dp,
+                                0.dp,
+                                0.dp
+                            )
                         ) {
                             androidx.compose.material3.Icon(
                                 painter = painterResource(id = R.drawable.rounded_add_24),
@@ -299,15 +304,15 @@ class AppUpdatesActivity : AppCompatActivity() {
                             horizontalAlignment = Alignment.CenterHorizontally,
                             verticalArrangement = Arrangement.Center
                         ) {
-                            androidx.compose.material3.Text(
+                            Text(
                                 text = stringResource(R.string.msg_no_repos_tracked),
                                 style = MaterialTheme.typography.bodyLarge,
                                 color = MaterialTheme.colorScheme.onSurfaceVariant
                             )
 
                             Spacer(modifier = Modifier.height(32.dp))
 
-                            androidx.compose.material3.Text(
+                            Text(
                                 text = stringResource(R.string.label_apps),
                                 style = MaterialTheme.typography.titleMedium,
                                 modifier = Modifier.padding(bottom = 12.dp),
@@ -334,7 +339,7 @@ class AppUpdatesActivity : AppCompatActivity() {
                             // Pending Section
                             if (pending.isNotEmpty()) {
                                 item {
-                                    androidx.compose.material3.Text(
+                                    Text(
                                         text = "${stringResource(R.string.label_pending)} (${pending.size})",
                                         style = MaterialTheme.typography.titleMedium,
                                         modifier = Modifier.padding(start = 16.dp, bottom = 8.dp),
@@ -383,7 +388,7 @@ class AppUpdatesActivity : AppCompatActivity() {
                             // Up-to-date Section
                             if (upToDate.isNotEmpty()) {
                                 item {
-                                    androidx.compose.material3.Text(
+                                    Text(
                                         text = "${stringResource(R.string.label_up_to_date)} (${upToDate.size})",
                                         style = MaterialTheme.typography.titleMedium,
                                         modifier = Modifier.padding(start = 16.dp, bottom = 8.dp),
@@ -441,7 +446,7 @@ class AppUpdatesActivity : AppCompatActivity() {
                             // Not Installed Section
                             if (notInstalled.isNotEmpty()) {
                                 item {
-                                    androidx.compose.material3.Text(
+                                    Text(
                                         text = "${stringResource(R.string.label_not_installed)} (${notInstalled.size})",
                                         style = MaterialTheme.typography.titleMedium,
                                         modifier = Modifier.padding(start = 16.dp, bottom = 8.dp),
@@ -489,7 +494,7 @@ class AppUpdatesActivity : AppCompatActivity() {
 
                             // Apps Section
                             item {
-                                androidx.compose.material3.Text(
+                                Text(
                                     text = stringResource(R.string.label_apps),
                                     style = MaterialTheme.typography.titleMedium,
                                     modifier = Modifier.padding(start = 16.dp, bottom = 8.dp),

app/src/main/java/com/sameerasw/essentials/EssentialsApp.kt

@@ -4,16 +4,12 @@ import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.widget.Toast
 import com.sameerasw.essentials.data.repository.SettingsRepository
 import com.sameerasw.essentials.utils.ShizukuUtils
-import io.sentry.Sentry
 import io.sentry.android.core.SentryAndroid
 
 class EssentialsApp : Application() {
@@ -27,11 +23,11 @@ class EssentialsApp : Application() {
     override fun onCreate() {
         super.onCreate()
         context = applicationContext
-        
+
         try {
             resources?.configuration
         } catch (e: Exception) {
-            
+
         }
 
         ShizukuUtils.initialize()
@@ -70,12 +66,17 @@ class EssentialsApp : Application() {
         if (mode == "off") return
 
         SentryAndroid.init(this) { options ->
-            options.dsn = "https://e105699467efe3a43a16bfbad3a63b33@o4510996760887296.ingest.de.sentry.io/4510996763312208"
+            options.dsn =
+                "https://e105699467efe3a43a16bfbad3a63b33@o4510996760887296.ingest.de.sentry.io/4510996763312208"
             options.isEnabled = true
-            
+
             options.setBeforeSend { event, _ ->
                 Handler(Looper.getMainLooper()).post {
-                    Toast.makeText(this@EssentialsApp, R.string.sentry_crash_toast, Toast.LENGTH_LONG).show()
+                    Toast.makeText(
+                        this@EssentialsApp,
+                        R.string.sentry_crash_toast,
+                        Toast.LENGTH_LONG
+                    ).show()
                 }
                 event
             }