소스 검색

During folder creating wont allow to user to press create button when folder name empty in initial phase

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 9 달 전
부모
커밋
72fc1d0def
2개의 변경된 파일8개의 추가작업 그리고 5개의 파일을 삭제
  1. 7 5
      app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.kt
  2. 1 0
      app/src/main/res/values/strings.xml

+ 7 - 5
app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.kt

@@ -71,14 +71,16 @@ class CreateFolderDialogFragment : DialogFragment(), DialogInterface.OnClickList
         val dialog = dialog
 
         if (dialog is AlertDialog) {
-            positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE) as MaterialButton
-            val negativeButton = dialog.getButton(AlertDialog.BUTTON_NEGATIVE) as MaterialButton
-
+            positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE) as? MaterialButton
             positiveButton?.let {
+                it.isEnabled = false
                 viewThemeUtils.material.colorMaterialButtonPrimaryTonal(it)
             }
 
-            viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(negativeButton)
+            val negativeButton = dialog.getButton(AlertDialog.BUTTON_NEGATIVE) as? MaterialButton
+            negativeButton?.let {
+                viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(it)
+            }
         }
     }
 
@@ -128,7 +130,7 @@ class CreateFolderDialogFragment : DialogFragment(), DialogInterface.OnClickList
             FileNameValidator.checkFileName(newFileName, getOCCapability(), requireContext(), fileNames)
 
         val errorMessage = when {
-            newFileName.isEmpty() -> null
+            newFileName.isEmpty() -> getString(R.string.folder_name_empty)
             fileNameValidatorResult != null -> fileNameValidatorResult
             else -> null
         }

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -371,6 +371,7 @@
     <string name="filename_forbidden_characters">Forbidden characters: / \\ &lt; &gt; : " | ? *</string>
     <string name="filename_forbidden_charaters_from_server">Filename contains at least one invalid character</string>
     <string name="filename_empty">Filename cannot be empty</string>
+    <string name="folder_name_empty">Folder name cannot be empty</string>
     <string name="label_empty">Label cannot be empty</string>
     <string name="wait_a_moment">Wait a moment…</string>
     <string name="wait_checking_credentials">Checking stored credentials</string>