Merge pull request #101 from aashishksahu/bug-fix

Bug fix
aashishksahu · Oct 28, 2024 · 0af6133 · 0af6133
2 parents fa39916 + 6630c5c
commit 0af6133
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 21 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
 
         minSdk 29
         targetSdk 34
-        versionCode 37
-        versionName "2.0.6"
+        versionCode 38
+        versionName "2.0.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/org/privacymatters/safespace/main/ui/ItemList.kt b/app/src/main/java/org/privacymatters/safespace/main/ui/ItemList.kt
@@ -99,7 +99,7 @@ class ItemList(private val activity: MainnActivity) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier
-                .padding(top = 5.dp)
+//                .padding(10.dp)
                 .combinedClickable(
                     onClick = {
                         openItem(item)
@@ -114,9 +114,9 @@ class ItemList(private val activity: MainnActivity) {
         ) {
             GlideImage(
                 modifier = Modifier
-                    .size(64.dp)
+                    .size(84.dp)
                     .padding(10.dp)
-                    .clip(RoundedCornerShape(8.dp))
+                    .clip(RoundedCornerShape(12.dp))
                     .background(MaterialTheme.colorScheme.primary),
                 model = File(activity.viewModel.getIconPath(item.name)).canonicalPath,
                 contentDescription = activity.getString(R.string.file_icon_description),
@@ -126,14 +126,14 @@ class ItemList(private val activity: MainnActivity) {
             )
             Column(
                 modifier = Modifier
-                    .padding(10.dp)
+                    .padding(end=10.dp, top = 10.dp, bottom = 10.dp)
             ) {
                 val (name, ext) = Utils.getFileNameAndExtension(item.name)
 
                 Text(
                     text = name,
                     style = MaterialTheme.typography.titleMedium,
-                    maxLines = 2,
+                    maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
                     color = if (item.isSelected) MaterialTheme.colorScheme.onSecondary else MaterialTheme.colorScheme.onBackground
                 )
@@ -143,6 +143,10 @@ class ItemList(private val activity: MainnActivity) {
                         .fillMaxWidth()
                         .padding(top = 10.dp)
                 ) {
+                        Text(
+                            text = Utils.convertLongToDate(item.lastModified),
+                            color = if (item.isSelected) MaterialTheme.colorScheme.onSecondary else MaterialTheme.colorScheme.onBackground,
+                        )
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         Text(
                             text = Utils.getSize(item.size),
@@ -163,10 +167,6 @@ class ItemList(private val activity: MainnActivity) {
                             fontWeight = FontWeight.Bold
                         )
                     }
-                    Text(
-                        text = Utils.convertLongToDate(item.lastModified),
-                        color = if (item.isSelected) MaterialTheme.colorScheme.onSecondary else MaterialTheme.colorScheme.onBackground,
-                    )
                 }
             }
         }
@@ -179,7 +179,7 @@ class ItemList(private val activity: MainnActivity) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier
-                .padding(top = 5.dp)
+//                .padding(10.dp)
                 .combinedClickable(
                     onClick = {
                         openItem(item)
@@ -194,21 +194,22 @@ class ItemList(private val activity: MainnActivity) {
         ) {
             Image(
                 modifier = Modifier
-                    .size(64.dp)
+                    .size(84.dp)
                     .padding(10.dp)
-                    .clip(RoundedCornerShape(8.dp))
+                    .clip(RoundedCornerShape(12.dp))
+                    .clip(RoundedCornerShape(12.dp))
                     .background(MaterialTheme.colorScheme.primary),
                 painter = painterResource(R.drawable.folder_36dp),
                 contentDescription = activity.getString(R.string.file_folder_placeholder)
             )
             Column(
                 modifier = Modifier
-                    .padding(10.dp)
+                    .padding(end=10.dp, top = 10.dp, bottom = 10.dp)
             ) {
                 Text(
                     text = item.name,
                     style = MaterialTheme.typography.titleMedium,
-                    maxLines = 2,
+                    maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
                     color = if (item.isSelected) MaterialTheme.colorScheme.onSecondary else MaterialTheme.colorScheme.onBackground
                 )

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.6.0' apply false
-    id 'com.android.library' version '8.6.0' apply false
+    id 'com.android.application' version '8.7.1' apply false
+    id 'com.android.library' version '8.7.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/38.txt b/fastlane/metadata/android/en-US/changelogs/38.txt
@@ -0,0 +1 @@
+Minor UI changes and bug fixes
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 #Sat Apr 20 11:27:52 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists