Merge pull request #94 from aashishksahu/bug-fix

Bug fix
aashishksahu · Sep 28, 2024 · fa39916 · fa39916
2 parents c65b10d + f48fb9c
commit fa39916
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 16 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
 
         minSdk 29
         targetSdk 34
-        versionCode 36
-        versionName "2.0.5"
+        versionCode 37
+        versionName "2.0.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/org/privacymatters/safespace/main/MainActivityViewModel.kt b/app/src/main/java/org/privacymatters/safespace/main/MainActivityViewModel.kt
@@ -246,6 +246,7 @@ class MainActivityViewModel(private val application: Application) : AndroidViewM
                     ops.deleteFile(item)
                 }
             }
+            clearSelection()
             getItems()
         }
     }

diff --git a/app/src/main/java/org/privacymatters/safespace/main/ui/BottomAppBar.kt b/app/src/main/java/org/privacymatters/safespace/main/ui/BottomAppBar.kt
@@ -52,6 +52,7 @@ class BottomAppBar(private val activity: MainnActivity) {
     private val createFolderShowDialog = mutableStateOf(false)
     private val createNoteShowDialog = mutableStateOf(false)
     private val renameShowDialog = mutableStateOf(false)
+    private val namePattern = Regex("[~`!@#\$%^&*()+=|\\\\:;\"'>?/<,\\[\\]{}]")
     private var name: String = ""
 
     @Composable
@@ -137,8 +138,8 @@ class BottomAppBar(private val activity: MainnActivity) {
                         )
                         if (showDialog.value) {
                             Prompt(
-                                onConfirmation = {
-                                    if (name.isNotEmpty()) {
+                                onConfirmation = { isValid ->
+                                    if (name.isNotEmpty() && isValid) {
                                         try {
                                             activity.viewModel.createFolder(name)
                                         } catch (e: Exception) {
@@ -183,8 +184,8 @@ class BottomAppBar(private val activity: MainnActivity) {
                         )
                         if (showDialog.value) {
                             Prompt(
-                                onConfirmation = {
-                                    if (name.isNotEmpty()) {
+                                onConfirmation = { isValid ->
+                                    if (name.isNotEmpty() && isValid) {
                                         val noteFile = activity.viewModel.createTextNote(name)
                                         val documentViewIntent = Intent(
                                             activity.application, TextDocumentView::class.java
@@ -294,8 +295,8 @@ class BottomAppBar(private val activity: MainnActivity) {
                             )
                             if (showDialog.value) {
                                 Prompt(
-                                    onConfirmation = {
-                                        if (name.isNotEmpty()) {
+                                    onConfirmation = { isValid ->
+                                        if (name.isNotEmpty() && isValid) {
 
                                             if (!activity.viewModel.renameFile(name)) {
                                                 showMessage(activity.getString(R.string.generic_error))
@@ -525,11 +526,13 @@ class BottomAppBar(private val activity: MainnActivity) {
 
     @Composable
     fun Prompt(
-        onConfirmation: () -> Unit, onDismiss: () -> Unit, dialogTitle: String, okBtnText: String
+        onConfirmation: (Boolean) -> Unit,
+        onDismiss: () -> Unit,
+        dialogTitle: String,
+        okBtnText: String
     ) {
         val textFieldContent = remember { mutableStateOf(TextFieldValue(name)) }
         val isValid = remember { mutableStateOf(true) }
-        val namePattern = Regex("[~`!@#\$%^&*()+=|\\\\:;\"'>?/<,\\[\\]{}]")
 
         AlertDialog(title = {
             Text(text = dialogTitle)
@@ -573,7 +576,7 @@ class BottomAppBar(private val activity: MainnActivity) {
             onDismiss()
             textFieldContent.value = TextFieldValue("")
         }, confirmButton = {
-            TextButton(onClick = { onConfirmation() }) {
+            TextButton(onClick = { onConfirmation(isValid.value) }) {
                 Text(text = okBtnText)
             }
         })

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.5.2' apply false
-    id 'com.android.library' version '8.5.2' apply false
+    id 'com.android.application' version '8.6.0' apply false
+    id 'com.android.library' version '8.6.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/37.txt b/fastlane/metadata/android/en-US/changelogs/37.txt
@@ -0,0 +1,2 @@
+* Fixed an issue where files were created with special characters
+* fixed selection counter
-Original file line number
+Diff line change
@@ Expand Up @@
                         ops.deleteFile(item)
                     }
                 }
+                clearSelection()
                 getItems()
             }
         }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Fixed an issue where files were created with special characters
		* fixed selection counter