Fix #196.

tomdoeslinux · Aug 9, 2022 · 3dc4f8c · 3dc4f8c
1 parent 9f48c45
commit 3dc4f8c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/...pandabear/pixapencil/activities/canvas/oncreate/menu/CanvasActivity+onMenuItemSelected.kt b/...pandabear/pixapencil/activities/canvas/oncreate/menu/CanvasActivity+onMenuItemSelected.kt
@@ -5,7 +5,6 @@ import android.graphics.Color
 import android.view.MenuItem
 import android.view.ViewGroup
 import android.widget.RadioGroup
-import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.widget.doAfterTextChanged
 import com.android.volley.Request
@@ -78,22 +77,16 @@ fun CanvasActivity.onMenuItemSelected(item: MenuItem): Boolean {
             val fileNameTextInputLayout =
                 exportRootLayout.findViewById<TextInputLayout>(R.id.exportProjectDialogLayout_fileNameTextInputLayout)
 
-            val fileTypeTextView = exportRootLayout.findViewById<TextView>(R.id.textView2)
-            val defaultFileTypeTextViewTopMargin = (fileTypeTextView.layoutParams as ViewGroup.MarginLayoutParams).topMargin
-
             exportRootLayout.post {
                 // We do this so that there is no default top margin, which I personally find it ugly
                 (exportRootLayout.layoutParams as ViewGroup.MarginLayoutParams).topMargin = 0
 
                 fileNameTextInputEditText.setText(projectTitle)
                 fileNameTextInputEditText.doAfterTextChanged {
                     if (it.toString().isNotBlank()) {
-                        fileNameTextInputLayout.error = ""
-                        (fileNameTextInputLayout.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin = 0
-                        (fileTypeTextView.layoutParams as ViewGroup.MarginLayoutParams).topMargin = 0
+                        fileNameTextInputLayout.isErrorEnabled = false
                     } else {
                         fileNameTextInputLayout.error = getString(R.string.exception_invalid_file_name)
-                        (fileTypeTextView.layoutParams as ViewGroup.MarginLayoutParams).topMargin = defaultFileTypeTextViewTopMargin
                     }
                 }
             }
@@ -164,7 +157,6 @@ fun CanvasActivity.onMenuItemSelected(item: MenuItem): Boolean {
                     alertDialog.cancel()
                 } else {
                     fileNameTextInputLayout.error = getString(R.string.exception_invalid_file_name)
-                    (fileTypeTextView.layoutParams as ViewGroup.MarginLayoutParams).topMargin = defaultFileTypeTextViewTopMargin
                 }
             }
         }

diff --git a/.../com/therealbluepandabear/pixapencil/fragments/newcolorpalette/NewColorPaletteFragment.kt b/.../com/therealbluepandabear/pixapencil/fragments/newcolorpalette/NewColorPaletteFragment.kt
@@ -50,7 +50,7 @@ class NewColorPaletteFragment : Fragment(), ActivityFragment {
 
         binding.fragmentNewColorPaletteColorPaletteNameTextInputEditText.doAfterTextChanged {
             if (binding.fragmentNewColorPaletteColorPaletteNameTextInputEditText.text.toString().isNotBlank()) {
-                binding.fragmentNewColorPaletteColorPaletteNameTextInputLayout.error = null
+                binding.fragmentNewColorPaletteColorPaletteNameTextInputLayout.isErrorEnabled = false
             }
         }
 

diff --git a/...albluepandabear/pixapencil/fragments/newproject/NewProjectFragment+setOnClickListeners.kt b/...albluepandabear/pixapencil/fragments/newproject/NewProjectFragment+setOnClickListeners.kt
@@ -21,7 +21,7 @@ private fun NewProjectFragment.checkForTitleError() {
         binding.fragmentNewCanvasProjectTitleTextInputLayout.error = getString(R.string.exception_invalid_project_name)
         invalidTitle = true
     } else {
-        binding.fragmentNewCanvasProjectTitleTextInputLayout.error = null
+        binding.fragmentNewCanvasProjectTitleTextInputLayout.isErrorEnabled = false
         invalidTitle = false
     }
 }
@@ -39,7 +39,7 @@ private fun NewProjectFragment.checkForWidthError() {
         }
 
         else -> {
-            binding.fragmentNewCanvasWidthTextInputLayout.error = null
+            binding.fragmentNewCanvasWidthTextInputLayout.isErrorEnabled = false
             invalidWidth = false
         }
     }
@@ -58,7 +58,7 @@ private fun NewProjectFragment.checkForHeightError() {
         }
 
         else -> {
-            binding.fragmentNewCanvasHeightTextInputLayout.error = null
+            binding.fragmentNewCanvasHeightTextInputLayout.isErrorEnabled = false
             invalidHeight = false
         }
     }

diff --git a/...r/pixapencil/fragments/spraytoolsettings/SprayToolSettingsFragment+setOnClickListeners.kt b/...r/pixapencil/fragments/spraytoolsettings/SprayToolSettingsFragment+setOnClickListeners.kt
@@ -21,7 +21,7 @@ private fun SprayToolSettingsFragment.checkForRadiusError() {
         }
 
         else -> {
-            binding.fragmentSprayToolSettingsRadiusTextInputLayout.error = null
+            binding.fragmentSprayToolSettingsRadiusTextInputLayout.isErrorEnabled = false
             invalidRadius = false
         }
     }
@@ -40,7 +40,7 @@ private fun SprayToolSettingsFragment.checkForStrengthError() {
         }
 
         else -> {
-            binding.fragmentSprayToolSettingsStrengthTextInputLayout.error = null
+            binding.fragmentSprayToolSettingsStrengthTextInputLayout.isErrorEnabled = false
             invalidStrength = false
         }
     }

diff --git a/app/src/main/res/layout/export_project_dialog_layout.xml b/app/src/main/res/layout/export_project_dialog_layout.xml
@@ -11,7 +11,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:hint="File Name"
+        android:hint="@string/exportProjectDialogLayout_file_name_str"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -27,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        android:text="File Type"
+        android:text="@string/exportProjectDialogLayout_file_type_str"
         app:layout_constraintStart_toStartOf="@+id/exportProjectDialogLayout_fileNameTextInputLayout"
         app:layout_constraintTop_toBottomOf="@+id/exportProjectDialogLayout_fileNameTextInputLayout" />
 
@@ -114,7 +114,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        android:text="Resolution"
+        android:text="@string/exportProjectDialogLayout_resolution_str"
         app:layout_constraintStart_toStartOf="@+id/exportProjectDialogLayout_fileNameTextInputLayout"
         app:layout_constraintTop_toBottomOf="@+id/horizontalScrollView" />
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -39,6 +39,10 @@
     <string name="projectDetailsAlertBox_created">Created</string>
     <string name="projectDetailsAlertBox_colors">Colors</string>
 
+    <string name="exportProjectDialogLayout_file_name_str">File Name</string>
+    <string name="exportProjectDialogLayout_file_type_str">File Type</string>
+    <string name="exportProjectDialogLayout_resolution_str">File Type</string>
+
     <!--Other strings-->
     <string name="recentCreationsLayout_subtitle" translatable="false">%1$dx%2$d</string>