- Updated to 1.6.4

lighttigerXIV · Jul 11, 2023 · 0700d0a · 0700d0a
1 parent 2e0f28c
commit 0700d0a
Show file tree

Hide file tree

Showing 62 changed files with 1,558 additions and 910 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.lighttigerxiv.simple.mp"
         minSdk 26
         targetSdk 33
-        versionCode 15
-        versionName "BETA-1.6.3"
+        versionCode 16
+        versionName "BETA-1.6.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/release/app-release.apk → app/release/SimpleMP-BETA-1.6.4.apk b/app/release/app-release.apk → app/release/SimpleMP-BETA-1.6.4.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 15,
-      "versionName": "BETA-1.6.3",
+      "versionCode": 16,
+      "versionName": "BETA-1.6.4",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/lighttigerxiv/simple/mp/compose/activities/main/ActivityMain.kt b/app/src/main/java/com/lighttigerxiv/simple/mp/compose/activities/main/ActivityMain.kt
@@ -16,15 +16,19 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.platform.LocalContext
@@ -38,6 +42,7 @@ import com.lighttigerxiv.simple.mp.compose.R
 import com.lighttigerxiv.simple.mp.compose.activities.setup.ActivitySetup
 import com.lighttigerxiv.simple.mp.compose.data.variables.ImageSizes
 import com.lighttigerxiv.simple.mp.compose.data.variables.Routes
+import com.lighttigerxiv.simple.mp.compose.data.variables.SMALL_SPACING
 import com.lighttigerxiv.simple.mp.compose.functions.getAppString
 import com.lighttigerxiv.simple.mp.compose.functions.getImage
 import com.lighttigerxiv.simple.mp.compose.functions.getSurfaceColor
@@ -58,7 +63,9 @@ import com.lighttigerxiv.simple.mp.compose.screens.main.settings.SettingsScreen
 import com.lighttigerxiv.simple.mp.compose.screens.main.settings.SettingsScreenVM
 import com.lighttigerxiv.simple.mp.compose.screens.main.settings.themes.ThemesScreen
 import com.lighttigerxiv.simple.mp.compose.settings.SettingsVM
-import com.lighttigerxiv.simple.mp.compose.ui.composables.spacers.SmallHeightSpacer
+import com.lighttigerxiv.simple.mp.compose.ui.composables.CustomText
+import com.lighttigerxiv.simple.mp.compose.ui.composables.spacers.SmallVerticalSpacer
+import com.lighttigerxiv.simple.mp.compose.ui.composables.spacers.SmallHorizontalSpacer
 import com.lighttigerxiv.simple.mp.compose.ui.theme.ComposeSimpleMPTheme
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
@@ -102,6 +109,8 @@ class MainActivity : ComponentActivity() {
 
                     val rootNavController = rememberNavController()
                     val loadingSongs = vm.loadingSongs.collectAsState().value
+                    val songCount = vm.songCount.collectAsState().value
+                    val indexedSongsCount = vm.indexedSongsCount.collectAsState().value
                     val context = LocalContext.current
 
 
@@ -110,7 +119,7 @@ class MainActivity : ComponentActivity() {
                             .fillMaxSize()
                             .background(vm.surfaceColor.collectAsState().value)
                     ) {
-                        if(loadingSongs){
+                        if (loadingSongs) {
 
                             rememberSystemUiController().setStatusBarColor(vm.surfaceColor.collectAsState().value)
 
@@ -127,21 +136,48 @@ class MainActivity : ComponentActivity() {
                                     modifier = Modifier
                                         .width(200.dp)
                                         .height(200.dp),
-                                    bitmap = remember{ getImage(context,R.drawable.play_empty, ImageSizes.LARGE).asImageBitmap() },
+                                    bitmap = remember { getImage(context, R.drawable.play_empty, ImageSizes.LARGE).asImageBitmap() },
                                     contentDescription = null,
                                     colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary)
                                 )
 
-                                SmallHeightSpacer()
+                                SmallVerticalSpacer()
 
-                                LinearProgressIndicator(
-                                    modifier = Modifier.width(200.dp),
-                                    color = MaterialTheme.colorScheme.primary,
-                                    trackColor = MaterialTheme.colorScheme.surfaceVariant
-                                )
+                                Row(
+                                    modifier = Modifier
+                                        .clip(CircleShape)
+                                        .background(MaterialTheme.colorScheme.surfaceVariant)
+                                        .padding(SMALL_SPACING),
+                                    horizontalArrangement = Arrangement.Center,
+                                    verticalAlignment = Alignment.CenterVertically
+                                ) {
+
+                                    if(indexedSongsCount != songCount){
+                                        CustomText(text = indexedSongsCount.toString())
+
+                                        SmallHorizontalSpacer()
+
+                                        LinearProgressIndicator(
+                                            modifier = Modifier.width(120.dp),
+                                            color = MaterialTheme.colorScheme.primary,
+                                            trackColor = MaterialTheme.colorScheme.surfaceVariant
+                                        )
+
+                                        SmallHorizontalSpacer()
+
+                                        CustomText(text = songCount.toString())
+                                    } else{
+
+                                        LinearProgressIndicator(
+                                            modifier = Modifier.width(200.dp),
+                                            color = MaterialTheme.colorScheme.primary,
+                                            trackColor = MaterialTheme.colorScheme.surfaceVariant
+                                        )
+                                    }
+                                }
                             }
 
-                        } else{
+                        } else {
 
                             NavHost(
                                 modifier = Modifier