Merge pull request #216 from oskomonzon/UI_changes

Multiple small fixes
farkam135 · Aug 27, 2016 · fb0c37e · fb0c37e
2 parents cda2406 + 274bf79
commit fb0c37e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/app/src/main/java/com/kamron/pogoiv/Pokefly.java b/app/src/main/java/com/kamron/pogoiv/Pokefly.java
@@ -552,14 +552,22 @@ public void decrementLevelExpanded() {
 
     @OnClick(R.id.btnCheckIv)
     public void checkIv() {
+
+        // Check for valid parameters before attempting to do anything else.-
+        try{
+            pokemonHP = Integer.parseInt(pokemonHPEdit.getText().toString());
+            pokemonCP = Integer.parseInt(pokemonCPEdit.getText().toString());
+        }
+        catch(NumberFormatException e){
+            Toast.makeText(this, R.string.missing_inputs, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
         if (batterySaver && !screenshotDir.isEmpty()) {
-            if (GoIVSettings.getSettings(getBaseContext()).getDeleteScreenshots())
+            if (GoIVSettings.getSettings(getBaseContext()).getDeleteScreenshots()) {
                 getContentResolver().delete(screenshotUri, MediaStore.Files.FileColumns.DATA + "=?", new String[]{screenshotDir});
+            }
         }
-        pokemonHP = Integer.parseInt(pokemonHPEdit.getText().toString());
-        pokemonCP = Integer.parseInt(pokemonCPEdit.getText().toString());
-        initialButtonsLayout.setVisibility(View.GONE);
-        onCheckButtonsLayout.setVisibility(View.VISIBLE);
 
         int selectedPokemon = pokemonList.getSelectedItemPosition();
         Pokemon pokemon = pokeCalculator.get(selectedPokemon);
@@ -578,6 +586,12 @@ public void checkIv() {
             ivScanResult.refineByHighest(attCheckbox.isChecked(), defCheckbox.isChecked(), staCheckbox.isChecked());
         }
 
+        // If no possible combinations, inform the user and abort.
+        if(ivScanResult.getCount()==0){
+            Toast.makeText(this, R.string.ivtext_no_possibilities, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
         addToRangeToClipboardIfSettingOn(ivScanResult);
         populateResultsBox(ivScanResult);
         boolean enableCompare = IVScanResult.scanContainer.twoScanAgo != null;
@@ -587,6 +601,8 @@ public void checkIv() {
         resultsBox.setVisibility(View.VISIBLE);
         inputBox.setVisibility(View.GONE);
 
+        initialButtonsLayout.setVisibility(View.GONE);
+        onCheckButtonsLayout.setVisibility(View.VISIBLE);
     }
 
     /**

diff --git a/app/src/main/res/layout/dialog_input.xml b/app/src/main/res/layout/dialog_input.xml
@@ -58,6 +58,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/red"
                 android:text="XX"
+                android:maxLength="4"
                 android:textAlignment="center"
                 android:inputType="number"/>
 
@@ -87,6 +88,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/red"
                 android:text="XX"
+                android:maxLength="4"
                 android:textAlignment="center"
                 android:inputType="number"/>
 

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -58,4 +58,6 @@
     <string name="defense">Defensa</string>
     <string name="stamina_hp">PS</string>
     <string name="refine_no_progress">El refinamiento no mejoró los r</string>
+    <string name="missing_inputs">Datos incompletos. Por favor completa los campos PC y PS.</string>
+    <string name="ivtext_no_possibilities">No hay combinaciones de IV para estos datos. Por favor verifique la información.</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -65,4 +65,6 @@
     <string name="attack">Attack</string>
     <string name="defense">Defense</string>
     <string name="stamina_hp">HP</string>
+    <string name="missing_inputs">Missing data. Please fill CP and HP inputs.</string>
+    <string name="ivtext_no_possibilities">There are no IV possible combinations for this input. Please double check the information.</string>
 </resources>