diff --git a/app/src/main/java/com/kamron/pogoiv/Pokefly.java b/app/src/main/java/com/kamron/pogoiv/Pokefly.java
index ddcbfa6fa..e4a90890b 100644
--- a/app/src/main/java/com/kamron/pogoiv/Pokefly.java
+++ b/app/src/main/java/com/kamron/pogoiv/Pokefly.java
@@ -225,6 +225,8 @@ public class Pokefly extends Service {
TextView exResCandy;
@BindView(R.id.exResLevel)
TextView exResLevel;
+ @BindView(R.id.resultsPokedexNumber)
+ TextView resultPokedexNumber;
@BindView(R.id.resultsPokemonName)
TextView resultsPokemonName;
@BindView(R.id.resultsCombinations)
@@ -1336,6 +1338,7 @@ private void populatePrevScanNarrowing() {
* Shows the name and level of the pokemon in the results dialog.
*/
private void populateResultsHeader(IVScanResult ivScanResult) {
+ resultPokedexNumber.setText("#" + ivScanResult.pokemon.pokedexNumber);
resultsPokemonName.setText(ivScanResult.pokemon.toString());
resultsPokemonLevel.setText(getString(R.string.level_num, ivScanResult.estimatedPokemonLevel.toString()));
}
diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/IVPopupButton.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/IVPopupButton.java
index e1aa1758d..dcbda50e6 100644
--- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/IVPopupButton.java
+++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/IVPopupButton.java
@@ -107,9 +107,9 @@ public void showQuickIVPreviewLook(IVScanResult ivrs) {
int low = ivrs.getLowestIVCombination().percentPerfect;
int high = ivrs.getHighestIVCombination().percentPerfect;
if (ivrs.getCount() == 1 || high == low) { // display something like "IV: 98%"
- setText(ivrs.pokemon.name + "\nIV: " + low + "%");
+ setText(String.format("#%d %s\nIV: %d%%", ivrs.pokemon.pokedexNumber, ivrs.pokemon.name, low));
} else { // display something like "IV: 55 - 87%"
- setText(ivrs.pokemon.name + "\nIV: " + low + " - " + high + "%");
+ setText(String.format("#%d %s\nIV: %d - %d%%", ivrs.pokemon.pokedexNumber, ivrs.pokemon.name, low, high));
}
if (ivrs.rangeIVScan) {
setText(getText() + "*");
diff --git a/app/src/main/java/com/kamron/pogoiv/scanlogic/Pokemon.java b/app/src/main/java/com/kamron/pogoiv/scanlogic/Pokemon.java
index 4acd32ced..2bc26bd31 100644
--- a/app/src/main/java/com/kamron/pogoiv/scanlogic/Pokemon.java
+++ b/app/src/main/java/com/kamron/pogoiv/scanlogic/Pokemon.java
@@ -51,6 +51,7 @@ public String getCharacter() {
private final String displayName;
public final int number; //index number in resources, pokedex number - 1
+ public final int pokedexNumber;
public final int baseAttack;
public final int baseDefense;
public final int baseStamina;
@@ -62,6 +63,7 @@ public Pokemon(String name, String displayName, int number, int baseAttack, int
this.name = name;
this.displayName = displayName;
this.number = number;
+ this.pokedexNumber = number + 1;
this.baseAttack = baseAttack;
this.baseDefense = baseDefense;
this.baseStamina = baseStamina;
diff --git a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonShareHandler.java b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonShareHandler.java
index 254cffed9..60539c901 100644
--- a/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonShareHandler.java
+++ b/app/src/main/java/com/kamron/pogoiv/scanlogic/PokemonShareHandler.java
@@ -22,7 +22,7 @@ public class PokemonShareHandler {
public void spreadResultIntent(Pokefly pokefly, IVScanResult ivScan,String uniquePokemonID) {
JSONObject jsonPokemon = new JSONObject();
try {
- jsonPokemon.put("PokemonId", ivScan.pokemon.number + 1);
+ jsonPokemon.put("PokemonId", ivScan.pokemon.pokedexNumber);
jsonPokemon.put("AtkMin", ivScan.lowAttack);
jsonPokemon.put("AtkMax", ivScan.highAttack);
jsonPokemon.put("DefMin", ivScan.lowDefense);
diff --git a/app/src/main/java/com/kamron/pogoiv/widgets/PokemonSpinnerAdapter.java b/app/src/main/java/com/kamron/pogoiv/widgets/PokemonSpinnerAdapter.java
index 8ea0555f8..c06b71ee9 100644
--- a/app/src/main/java/com/kamron/pogoiv/widgets/PokemonSpinnerAdapter.java
+++ b/app/src/main/java/com/kamron/pogoiv/widgets/PokemonSpinnerAdapter.java
@@ -64,7 +64,7 @@ private View getCustomView(int position, ViewGroup parent) {
TextView row = (TextView) inflater.inflate(textViewResourceId, parent, false);
Pokemon pokemon = pokemons.get(position);
- String text = String.format("#%d %s", pokemon.number + 1, pokemon.toString());
+ String text = String.format("#%d %s", pokemon.pokedexNumber, pokemon.toString());
int padding = GuiUtil.dpToPixels(5, context);
row.setPadding(padding, 0, 0, padding);
diff --git a/app/src/main/res/layout/dialog_results.xml b/app/src/main/res/layout/dialog_results.xml
index 7763923c7..6d33c8c06 100644
--- a/app/src/main/res/layout/dialog_results.xml
+++ b/app/src/main/res/layout/dialog_results.xml
@@ -17,6 +17,15 @@
android:orientation="horizontal"
android:baselineAligned="true">
+
+