Disable entering 0 in count fields (#476)

onyxvd · web-flow · commit a75d606f3127 · 2025-03-13T13:17:25.000+02:00
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/ui/fragment/NewBirdsEntryRequiredFormFragment.java b/app/src/main/java/org/bspb/smartbirds/pro/ui/fragment/NewBirdsEntryRequiredFormFragment.java
@@ -21,6 +21,7 @@
 import org.bspb.smartbirds.pro.prefs.BirdPrefs;
 import org.bspb.smartbirds.pro.prefs.CommonPrefs;
 import org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput;
+import org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput;
 import org.bspb.smartbirds.pro.ui.views.SingleChoiceFormInput;
 import org.bspb.smartbirds.pro.ui.views.SwitchFormInput;
 
@@ -41,7 +42,7 @@ public class NewBirdsEntryRequiredFormFragment extends BaseFormFragment {
 
     SingleChoiceFormInput countUnits;
     SingleChoiceFormInput countType;
-    DecimalNumberFormInput count;
+    PositiveDecimalNumberFormInput count;
     DecimalNumberFormInput countMin;
     DecimalNumberFormInput countMax;
     SwitchFormInput confidential;
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/ui/fragment/NewHerptileEntryRequiredFormFragment.java b/app/src/main/java/org/bspb/smartbirds/pro/ui/fragment/NewHerptileEntryRequiredFormFragment.java
@@ -11,7 +11,7 @@
 import org.bspb.smartbirds.pro.R;
 import org.bspb.smartbirds.pro.prefs.CommonPrefs;
 import org.bspb.smartbirds.pro.prefs.HerptilePrefs;
-import org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput;
+import org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput;
 import org.bspb.smartbirds.pro.ui.views.SingleChoiceFormInput;
 import org.bspb.smartbirds.pro.ui.views.SwitchFormInput;
 
@@ -24,7 +24,7 @@
 public class NewHerptileEntryRequiredFormFragment extends BaseFormFragment {
 
     SingleChoiceFormInput habitat;
-    DecimalNumberFormInput count;
+    PositiveDecimalNumberFormInput count;
     SwitchFormInput confidential;
 
     HerptilePrefs prefs;
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/ui/fragment/NewMammalEntryRequiredFormFragment.java b/app/src/main/java/org/bspb/smartbirds/pro/ui/fragment/NewMammalEntryRequiredFormFragment.java
@@ -11,7 +11,7 @@
 import org.bspb.smartbirds.pro.R;
 import org.bspb.smartbirds.pro.prefs.CommonPrefs;
 import org.bspb.smartbirds.pro.prefs.MammalPrefs;
-import org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput;
+import org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput;
 import org.bspb.smartbirds.pro.ui.views.SingleChoiceFormInput;
 import org.bspb.smartbirds.pro.ui.views.SwitchFormInput;
 
@@ -24,7 +24,7 @@
 public class NewMammalEntryRequiredFormFragment extends BaseFormFragment {
 
     SingleChoiceFormInput habitat;
-    DecimalNumberFormInput count;
+    PositiveDecimalNumberFormInput count;
     SwitchFormInput confidential;
 
     MammalPrefs prefs;
@@ -97,7 +97,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
     @Override
     protected void initViews() {
         super.initViews();
-        
+
         habitat = requireView().findViewById(R.id.form_herp_habitat);
         count = requireView().findViewById(R.id.form_herp_count);
         confidential = requireView().findViewById(R.id.form_mammals_confidential);
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/ui/fragment/NewThreatsEntryRequiredFormFragment.java b/app/src/main/java/org/bspb/smartbirds/pro/ui/fragment/NewThreatsEntryRequiredFormFragment.java
@@ -14,7 +14,7 @@
 import org.bspb.smartbirds.pro.R;
 import org.bspb.smartbirds.pro.prefs.CommonPrefs;
 import org.bspb.smartbirds.pro.ui.utils.FormsConfig;
-import org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput;
+import org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput;
 import org.bspb.smartbirds.pro.ui.views.SingleChoiceConfigFormInput;
 import org.bspb.smartbirds.pro.ui.views.SingleChoiceConfigRadioFormInput;
 import org.bspb.smartbirds.pro.ui.views.SingleChoiceFormInput;
@@ -42,7 +42,7 @@ public static NewThreatsEntryRequiredFormFragment newInstance(boolean isNewEntry
     SingleChoiceFormInput category;
     SingleChoiceConfigFormInput classInput;
     SingleChoiceFormInput species;
-    DecimalNumberFormInput count;
+    PositiveDecimalNumberFormInput count;
     SingleChoiceFormInput estimate;
     SingleChoiceConfigRadioFormInput poisonedType;
     SingleChoiceFormInput stateCarcass;
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/ui/views/FormBirdsRow.java b/app/src/main/java/org/bspb/smartbirds/pro/ui/views/FormBirdsRow.java
@@ -26,7 +26,7 @@ public class FormBirdsRow extends LinearLayout implements SingleChoiceFormInput.
     protected SingleChoiceFormInput species;
     protected SingleChoiceFormInput countUnits;
     protected SingleChoiceFormInput countType;
-    protected DecimalNumberFormInput count;
+    protected PositiveDecimalNumberFormInput count;
     protected DecimalNumberFormInput countMin;
     protected DecimalNumberFormInput countMax;
 
diff --git a/app/src/main/java/org/bspb/smartbirds/pro/ui/views/SumDecimalNumberFormInput.java b/app/src/main/java/org/bspb/smartbirds/pro/ui/views/SumDecimalNumberFormInput.java
@@ -1,5 +1,7 @@
 package org.bspb.smartbirds.pro.ui.views;
 
+import static android.text.TextUtils.isEmpty;
+
 import android.content.Context;
 import android.text.Editable;
 import android.text.method.DigitsKeyListener;
@@ -10,8 +12,6 @@
 
 import java.util.regex.Pattern;
 
-import static android.text.TextUtils.isEmpty;
-
 /**
  * Input field for numbers that will be summed together.
  * Ime actions Go / Next are replaced with + sign. When a number is chosen then pressing the
@@ -21,7 +21,7 @@
  * <p>
  * Created by Ilian Georgiev.
  */
-public class SumDecimalNumberFormInput extends DecimalNumberFormInput {
+public class SumDecimalNumberFormInput extends PositiveDecimalNumberFormInput {
 
     private static final String PLUS = "+";
     private static final String PLUS_PATTERN = Pattern.quote(PLUS);
@@ -47,6 +47,8 @@ public SumDecimalNumberFormInput(Context context, AttributeSet attrs, int defSty
         setImeOptions(EditorInfo.IME_ACTION_NEXT | EditorInfo.IME_FLAG_NO_FULLSCREEN | EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_FLAG_NAVIGATE_NEXT);
         setImeActionLabel(context.getText(R.string.sum_decimal_number_form_input_plus), EditorInfo.IME_ACTION_NEXT);
         setKeyListener(DigitsKeyListener.getInstance("0123456789+"));
+
+        setIncludeZero(false);
     }
 
     @Override
diff --git a/app/src/main/kotlin/org/bspb/smartbirds/pro/ui/views/PositiveDecimalNumberFormInput.kt b/app/src/main/kotlin/org/bspb/smartbirds/pro/ui/views/PositiveDecimalNumberFormInput.kt
@@ -2,13 +2,48 @@ package org.bspb.smartbirds.pro.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
+import androidx.core.content.withStyledAttributes
 import org.bspb.smartbirds.pro.R
 
-class PositiveDecimalNumberFormInput : TextFormInput {
+open class PositiveDecimalNumberFormInput : TextFormInput {
+
+    var includeZero = true
 
     constructor(context: Context) : this(context, null)
 
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, R.attr.positiveDecimalNumberFormInputStyle)
 
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+    constructor(context: Context, attrs: AttributeSet?) : this(
+        context,
+        attrs,
+        R.attr.positiveDecimalNumberFormInputStyle
+    )
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    ) {
+        context.withStyledAttributes(
+            attrs,
+            R.styleable.PositiveDecimalNumberFormInput,
+            defStyleAttr,
+            0
+        ) {
+            includeZero = getBoolean(R.styleable.PositiveDecimalNumberFormInput_includeZero, true)
+        }
+    }
+
+    override fun onTextChanged(
+        text: CharSequence?,
+        start: Int,
+        lengthBefore: Int,
+        lengthAfter: Int,
+    ) {
+        super.onTextChanged(text, start, lengthBefore, lengthAfter)
+        text?.let {
+            if (it.contentEquals("0") && !includeZero) {
+                setText("")
+            }
+        }
+    }
 }
diff --git a/app/src/main/res/layout-land/fragment_monitoring_form_new_herptile_required_entry.xml b/app/src/main/res/layout-land/fragment_monitoring_form_new_herptile_required_entry.xml
@@ -92,14 +92,15 @@
                     android:layout_height="wrap_content"
                     android:layout_span="2">
 
-                    <org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput
+                    <org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput
                         android:id="@+id/form_herp_count"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/monitoring_herp_count"
                         android:tag="@string/tag_count"
                         android:text="1"
                         app:required="true"
+                        app:includeZero="false"
                         tools:ignore="HardcodedText" />
                 </com.google.android.material.textfield.TextInputLayout>
             </TableRow>
diff --git a/app/src/main/res/layout-land/fragment_monitoring_form_new_invertebrates_entry.xml b/app/src/main/res/layout-land/fragment_monitoring_form_new_invertebrates_entry.xml
@@ -92,14 +92,15 @@
                     android:layout_height="wrap_content"
                     android:layout_span="2">
 
-                    <org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput
+                    <org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput
                         android:id="@+id/form_invertebrates_count"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/monitoring_herp_count"
                         android:tag="@string/tag_count"
                         android:text="1"
                         app:required="true"
+                        app:includeZero="false"
                         tools:ignore="HardcodedText" />
                 </com.google.android.material.textfield.TextInputLayout>
             </TableRow>
diff --git a/app/src/main/res/layout-land/fragment_monitoring_form_new_mammal_required_entry.xml b/app/src/main/res/layout-land/fragment_monitoring_form_new_mammal_required_entry.xml
@@ -92,14 +92,15 @@
                     android:layout_height="wrap_content"
                     android:layout_span="2">
 
-                    <org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput
+                    <org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput
                         android:id="@+id/form_herp_count"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/monitoring_herp_count"
                         android:tag="@string/tag_count"
                         android:text="1"
                         app:required="true"
+                        app:includeZero="false"
                         tools:ignore="HardcodedText" />
                 </com.google.android.material.textfield.TextInputLayout>
             </TableRow>
diff --git a/app/src/main/res/layout-land/fragment_monitoring_form_new_plants_required_entry.xml b/app/src/main/res/layout-land/fragment_monitoring_form_new_plants_required_entry.xml
@@ -95,12 +95,13 @@
                     android:layout_height="wrap_content"
                     android:layout_span="4">
 
-                    <org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput
+                    <org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput
                         android:id="@+id/form_plants_count"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/monitoring_plants_count"
-                        android:tag="@string/tag_count" />
+                        android:tag="@string/tag_count"
+                        app:includeZero="false" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/fragment_monitoring_form_new_herptile_required_entry.xml b/app/src/main/res/layout/fragment_monitoring_form_new_herptile_required_entry.xml
@@ -95,14 +95,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput
+            <org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput
                 android:id="@+id/form_herp_count"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/monitoring_herp_count"
                 android:tag="@string/tag_count"
                 android:text="1"
                 app:required="true"
+                app:includeZero="false"
                 tools:ignore="HardcodedText" />
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_monitoring_form_new_invertebrates_entry.xml b/app/src/main/res/layout/fragment_monitoring_form_new_invertebrates_entry.xml
@@ -101,14 +101,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput
+                <org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput
                     android:id="@+id/form_invertebrates_count"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/monitoring_herp_count"
                     android:tag="@string/tag_count"
                     android:text="1"
                     app:required="true"
+                    app:includeZero="false"
                     tools:ignore="HardcodedText" />
             </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_monitoring_form_new_mammal_required_entry.xml b/app/src/main/res/layout/fragment_monitoring_form_new_mammal_required_entry.xml
@@ -95,14 +95,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput
+            <org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput
                 android:id="@+id/form_herp_count"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/monitoring_herp_count"
                 android:tag="@string/tag_count"
                 android:text="1"
                 app:required="true"
+                app:includeZero="false"
                 tools:ignore="HardcodedText" />
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_monitoring_form_new_plants_required_entry.xml b/app/src/main/res/layout/fragment_monitoring_form_new_plants_required_entry.xml
@@ -96,12 +96,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <org.bspb.smartbirds.pro.ui.views.DecimalNumberFormInput
+            <org.bspb.smartbirds.pro.ui.views.PositiveDecimalNumberFormInput
                 android:id="@+id/form_plants_count"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/monitoring_plants_count"
-                android:tag="@string/tag_count" />
+                android:tag="@string/tag_count"
+                app:includeZero="false" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <View style="@style/GroupSeparator" />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -39,6 +39,7 @@
         <enum name="horizontal" value="0" />
         <enum name="vertical" value="1" />
     </attr>
+    <attr name="includeZero" format="boolean" />
 
     <!-- Stylable attributes for SingleChoiceFormInput -->
     <declare-styleable name="SingleChoiceFormInput">
@@ -89,4 +90,8 @@
         <attr name="orientation" />
         <attr name="singleSelection" />
     </declare-styleable>
+
+    <declare-styleable name="PositiveDecimalNumberFormInput">
+        <attr name="includeZero" />
+    </declare-styleable>
 </resources>
