👕 code refactor

Author: theapache64

src/main/kotlin/com/theapache64/stackzy/App.kt

@@ -2,10 +2,8 @@ package com.theapache64.stackzy
 
 import com.theapache64.cyclone.core.Application
 import com.theapache64.stackzy.ui.feature.MainActivity
-import com.theapache64.stackzy.util.CommandExecutor
 import com.toxicbakery.logging.Arbor
 import com.toxicbakery.logging.Seedling
-import java.io.File
 
 class App : Application() {
     override fun onCreate() {
@@ -17,6 +15,9 @@ class App : Application() {
     }
 }
 
+/**
+ * The magic beings here
+ */
 fun main() {
     App().onCreate()
 }

src/main/kotlin/com/theapache64/stackzy/ui/common/AlphabetCircle.kt

@@ -13,6 +13,7 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.text.font.FontWeight
 import com.theapache64.stackzy.ui.util.Preview
 
+/*
 fun main() {
     Preview {
         LazyRow {
@@ -22,6 +23,7 @@ fun main() {
         }
     }
 }
+*/
 
 
 @Composable

src/main/kotlin/com/theapache64/stackzy/ui/common/CustomScaffold.kt

@@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp
 import com.theapache64.stackzy.util.R
 
 /**
- * To show a basic content page with title
+ * To show a basic content page
  */
 const val CONTENT_PADDING_VERTICAL = 15
 const val CONTENT_PADDING_HORIZONTAL = 30
@@ -39,12 +39,14 @@ fun CustomScaffold(
             )
     ) {
 
+        // Header
         Row(
             modifier = Modifier
                 .height(60.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
 
+            // Back button
             if (onBackClicked != null) {
                 IconButton(
                     onClick = onBackClicked,
@@ -56,6 +58,7 @@ fun CustomScaffold(
                 }
             }
 
+            // Title and Subtitle
             Column {
                 Text(
                     text = title,
@@ -71,6 +74,7 @@ fun CustomScaffold(
                 }
             }
 
+            // Right slot (Search, Icons etc)
             if (topRightSlot != null) {
                 Box(
                     modifier = Modifier.fillMaxWidth(),
@@ -85,6 +89,7 @@ fun CustomScaffold(
             modifier = Modifier.height(20.dp)
         )
 
+        // Content slot
         content()
     }
 

src/main/kotlin/com/theapache64/stackzy/ui/feature/MainActivity.kt

@@ -29,6 +29,7 @@ class MainActivity : Activity() {
             StackzyTheme(
                 title = R.string.app_name
             ) {
+                // Igniting navigation
                 rootComponent(factory = ::NavHostComponent)
                     .render()
             }

src/main/kotlin/com/theapache64/stackzy/ui/feature/appdetail/AppDetailScreen.kt

@@ -38,6 +38,7 @@ fun AppDetailScreen(
         report!!.appName!!
     }
 
+    // Calculating item width based on screen width
     val appItemWidth = (LocalAppWindow.current.width - (CONTENT_PADDING_HORIZONTAL * 2)) / GRID_SIZE
 
     CustomScaffold(
@@ -52,46 +53,14 @@ fun AppDetailScreen(
             )
         } else {
             if (loadingMessage != null) {
-
-                var enabled by remember { mutableStateOf(true) }
-
-                val alpha = if (enabled) {
-                    0f
-                } else {
-                    360f
-                }
-
-                val animatedValue by animateFloatAsState(
-                    targetValue = alpha,
-                    animationSpec = tween(200),
-                    finishedListener = {
-                        enabled = !enabled
-                    }
-                )
-
-                Box(
-                    modifier = Modifier.fillMaxSize()
-                ) {
-                    Image(
-                        modifier = Modifier
-                            .rotate(animatedValue)
-                            .align(Alignment.Center)
-                            .size(50.dp),
-                        colorFilter = ColorFilter.tint(MaterialTheme.colors.primary),
-                        bitmap = imageResource("drawables/loading.png"),
-                        contentDescription = ""
-                    )
-
-                    LoadingText(
-                        modifier = Modifier.align(Alignment.BottomCenter),
-                        message = loadingMessage!!
-                    )
-                }
+                LoadingAnimation(loadingMessage!!)
             } else if (report != null) {
 
                 if (report!!.libraries.isEmpty()) {
+                    // No libraries found
                     val platform = report!!.platform
                     if (platform is Platform.NativeKotlin || platform is Platform.NativeJava) {
+                        // native platform with libs
                         FullScreenError(
                             title = "We couldn't find any libraries",
                             message = "But don't worry, we're improving our dictionary strength. Please try later",
@@ -146,5 +115,44 @@ fun AppDetailScreen(
         }
 
 
+    }
+}
+
+@Composable
+private fun LoadingAnimation(loadingMessage: String) {
+
+    var enabled by remember { mutableStateOf(true) }
+
+    val alpha = if (enabled) {
+        0f
+    } else {
+        360f
+    }
+
+    val animatedValue by animateFloatAsState(
+        targetValue = alpha,
+        animationSpec = tween(200),
+        finishedListener = {
+            enabled = !enabled
+        }
+    )
+
+    Box(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        Image(
+            modifier = Modifier
+                .rotate(animatedValue)
+                .align(Alignment.Center)
+                .size(50.dp),
+            colorFilter = ColorFilter.tint(MaterialTheme.colors.primary),
+            bitmap = imageResource("drawables/loading.png"),
+            contentDescription = ""
+        )
+
+        LoadingText(
+            modifier = Modifier.align(Alignment.BottomCenter),
+            message = loadingMessage!!
+        )
     }
 }

src/main/kotlin/com/theapache64/stackzy/ui/feature/appdetail/AppDetailViewModel.kt

@@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
+import java.io.File
 import javax.inject.Inject
 
 
@@ -24,7 +25,6 @@ class AppDetailViewModel @Inject constructor(
     private val untrackedLibsRepo: UntrackedLibsRepo
 ) {
 
-
     private val _fatalError = MutableStateFlow<String?>(null)
     val fatalError: StateFlow<String?> = _fatalError
 
@@ -50,8 +50,6 @@ class AppDetailViewModel @Inject constructor(
                     suffix = ".apk"
                 ).toFile()
 
-                println("Path is ${destinationFile.absolutePath}")
-
                 adbRepo.pullFile(
                     androidDevice,
                     apkRemotePath,
@@ -61,21 +59,7 @@ class AppDetailViewModel @Inject constructor(
                         _loadingMessage.value = "Pulling APK $downloadPercentage% ..."
                         try {
                             if (downloadPercentage == 100) {
-                                // Now let's decompile
-                                _loadingMessage.value = R.string.app_detail_loading_decompiling
-                                val decompiledDir = apkToolRepo.decompile(destinationFile)
-
-                                // Analyse
-                                _loadingMessage.value = R.string.app_detail_loading_analysing
-                                val allLibraries = librariesRepo.getCachedLibraries()
-                                require(allLibraries != null) { "Cached libraries are null" }
-
-                                // Report
-                                val report = apkAnalyzerRepo.analyze(decompiledDir, allLibraries)
-
-
-                                _analysisReport.value = report
-                                _loadingMessage.value = null
+                                onApkPulled(destinationFile)
                             }
                         } catch (e: Exception) {
                             e.printStackTrace()
@@ -88,6 +72,23 @@ class AppDetailViewModel @Inject constructor(
         }
     }
 
+    private fun onApkPulled(destinationFile: File) {
+        // Now let's decompile
+        _loadingMessage.value = R.string.app_detail_loading_decompiling
+        val decompiledDir = apkToolRepo.decompile(destinationFile)
+
+        // Analyse
+        _loadingMessage.value = R.string.app_detail_loading_analysing
+        val allLibraries = librariesRepo.getCachedLibraries()
+        require(allLibraries != null) { "Cached libraries are null" }
+
+        // Report
+        val report = apkAnalyzerRepo.analyze(decompiledDir, allLibraries)
+
+        _analysisReport.value = report
+        _loadingMessage.value = null
+    }
+
     /**
      * TODO:
      */

src/main/kotlin/com/theapache64/stackzy/ui/feature/selectapp/SelectAppScreen.kt

@@ -26,6 +26,9 @@ import com.theapache64.stackzy.util.R
 
 private const val GRID_SIZE = 3
 
+/**
+ * To select an application from the selected device
+ */
 @Composable
 fun SelectAppScreen(
     selectAppViewModel: SelectAppViewModel,
@@ -35,8 +38,9 @@ fun SelectAppScreen(
 
     val searchKeyword by selectAppViewModel.searchKeyword.collectAsState()
     val apps by selectAppViewModel.apps.collectAsState()
+
+    // Calculating item width based on screen width
     val appItemWidth = (LocalAppWindow.current.width - (CONTENT_PADDING_HORIZONTAL * 2)) / GRID_SIZE
-    println("Width is $appItemWidth")
 
     CustomScaffold(
         title = R.string.select_app_title,

src/main/kotlin/com/theapache64/stackzy/ui/feature/selectapp/SelectAppViewModel.kt

@@ -13,10 +13,16 @@ class SelectAppViewModel @Inject constructor(
     val adbRepo: AdbRepo
 ) {
 
+    /**
+     * To store all apps instaled in the device (used for search filtering)
+     */
     private var fullApps: List<AndroidApp>? = null
     private val _searchKeyword = MutableStateFlow("")
     val searchKeyword: StateFlow<String> = _searchKeyword
 
+    /**
+     * Filtered apps
+     */
     private val _apps = MutableStateFlow(listOf<AndroidApp>())
     val apps: StateFlow<List<AndroidApp>> = _apps
 
@@ -29,6 +35,8 @@ class SelectAppViewModel @Inject constructor(
 
     fun onSearchKeywordChanged(newKeyword: String) {
         _searchKeyword.value = newKeyword
+
+        // Filtering apps
         _apps.value = fullApps!!.filter { it.appPackage.name.toLowerCase().contains(newKeyword, ignoreCase = true) }
     }
 }

src/main/kotlin/com/theapache64/stackzy/ui/feature/selectdevice/SelectDeviceScreen.kt

@@ -15,6 +15,9 @@ import com.theapache64.stackzy.ui.common.FullScreenError
 import com.theapache64.stackzy.ui.common.Selectable
 import com.theapache64.stackzy.util.R
 
+/**
+ * To select a device from connected devices
+ */
 @Composable
 fun SelectDeviceScreen(
     selectDeviceViewModel: SelectDeviceViewModel,
@@ -48,6 +51,7 @@ fun Content(
             image = imageResource("drawables/no_device.png")
         )
     } else {
+        // Content
         CustomScaffold(
             title = R.string.device_select_the_device
         ) {

src/main/kotlin/com/theapache64/stackzy/ui/feature/selectdevice/SelectDeviceScreenComponent.kt

@@ -8,7 +8,7 @@ import com.theapache64.stackzy.ui.navigation.Component
 import javax.inject.Inject
 
 class SelectDeviceScreenComponent(
-    appComponent : AppComponent,
+    appComponent: AppComponent,
     private val componentContext: ComponentContext,
     private val onDeviceSelected: (AndroidDevice) -> Unit
 ) : Component, ComponentContext by componentContext {
@@ -22,13 +22,13 @@ class SelectDeviceScreenComponent(
 
     @Composable
     override fun render() {
-        // Start watching
+        // Start watching devices
         selectDeviceViewModel.watchConnectedDevices()
 
         SelectDeviceScreen(
             selectDeviceViewModel,
             onDeviceSelected = {
-                // Stop watching
+                // Stop watching devices
                 selectDeviceViewModel.removeConnectionWatcher()
 
                 onDeviceSelected(it)