From 0896917f4d80ba687e3f633373107ae6cc186be3 Mon Sep 17 00:00:00 2001 From: Alessandro Lo-Presti Date: Thu, 3 May 2018 17:14:59 +0200 Subject: [PATCH 01/10] Added setting to enable/disable moveset info --- app/src/main/java/com/kamron/pogoiv/GoIVSettings.java | 3 +++ app/src/main/res/values-cs/strings.xml | 2 ++ app/src/main/res/values-de/strings.xml | 4 +++- app/src/main/res/values-es/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values-pt/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 4 +++- app/src/main/res/xml/settings.xml | 6 ++++++ 9 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java b/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java index a40056c9e..f03086bd1 100644 --- a/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java +++ b/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java @@ -43,6 +43,7 @@ public class GoIVSettings { public static final String SEND_CRASH_REPORTS = "sendCrashReports"; public static final String AUTO_UPDATE_ENABLED = "autoUpdateEnabled"; public static final String POKESPAM_ENABLED = "pokeSpamEnabled"; + public static final String MOVESET_ENABLED = "movesetEnabled"; public static final String TEAM_NAME = "teamName"; public static final String APPRAISAL_WINDOW_POSITION = "appraisalWindowPosition"; public static final String MOVESET_WINDOW_POSITION = "movesetWindowPosition"; @@ -284,6 +285,8 @@ public boolean isPokeSpamEnabled() { return prefs.getBoolean(POKESPAM_ENABLED, false); } + public boolean isMovesetEnabled() { return prefs.getBoolean(MOVESET_ENABLED, true); } + public boolean shouldAutoOpenExpandedAppraise() { return prefs.getBoolean(AUTO_OPEN_APPRAISE_DIALOGUE, false); } diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 750de1481..02a0b2ccc 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -59,4 +59,6 @@ Jméno Pokémona Náhled Přemísti okno táhnutím tohoto držáku. + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 85b04246d..aba8c117b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -93,5 +93,7 @@ …sehen lassen Hut ab! die besten …gesehen - + + + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 56b8ac671..1c0d73881 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -270,4 +270,6 @@ Email con información sobre el error para desarrolladores Email de informe de error Videotutorial recalibración + + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index eb4fceb04..248e1cda0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -132,4 +132,6 @@ Fonctionnalités optionnelles Mode de GoIV Paramètres peu intéressants + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9f98ccd26..d7cef5bb7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -301,4 +301,6 @@ "Agg. a coda" "Svuota coda" Esporta coda a PokeBattler + + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 5b97006ab..38ee0c138 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -34,4 +34,6 @@ Procurar actualizações Verificar se alguma actualização está disponível Pesquisa falhou, por favor deslize para cima e tente de novo! + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e963b54ff..3dd695fac 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - + Setup Instructions Starting GoIV for the first time:\n\nEnter your trainer info.\n\nPress the GRANT PERMISSION button and accept all prompts.\n\nPress start. @@ -311,4 +311,6 @@ "Add to queue" "Clear queue" Export Queue to PokeBattler + Enable moveset tab + Allows you to hide the moveset information diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index 4ffa7fa62..58d8f2399 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -67,6 +67,12 @@ android:summary="@string/pokespam_setting_summary" android:title="@string/pokespam_setting_title"/> + + Date: Thu, 3 May 2018 17:19:16 +0200 Subject: [PATCH 02/10] Set visibility to moveset tab based on setting --- .../fractions/IVResultFraction.java | 18 ++++++++++++++++++ .../fractions/PowerUpFraction.java | 17 +++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/IVResultFraction.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/IVResultFraction.java index f3f95deb7..82f7cffa5 100644 --- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/IVResultFraction.java +++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/IVResultFraction.java @@ -5,8 +5,10 @@ import android.util.DisplayMetrics; import android.view.View; import android.widget.LinearLayout; +import android.widget.RadioButton; import android.widget.TextView; +import com.kamron.pogoiv.GoIVSettings; import com.kamron.pogoiv.Pokefly; import com.kamron.pogoiv.R; import com.kamron.pogoiv.scanlogic.PokemonShareHandler; @@ -55,6 +57,8 @@ public class IVResultFraction extends Fraction { @BindView(R.id.resultsMaxPercentage) TextView resultsMaxPercentage; + @BindView(R.id.movesetButton) + RadioButton movesetButton; private Context context; private Pokefly pokefly; @@ -86,6 +90,7 @@ public int getLayoutResId() { populateMultipleIVMatch(); } setResultScreenPercentageRange(); //color codes the result + showMovesetInfoBasedOnSettings(); } @Override public void onDestroy() { @@ -233,6 +238,19 @@ private void setResultScreenPercentageRange() { } } + /** + * showMovesetInfoBasedOnSettings + * Shows moveset button based on setting + */ + private void showMovesetInfoBasedOnSettings() { + //enable/disable visibility based on setting + if (GoIVSettings.getInstance(pokefly).isMovesetEnabled()) { + movesetButton.setVisibility(View.VISIBLE); + } else { + movesetButton.setVisibility(View.GONE); + } + } + /** * Creates an intent to share the result of the pokemon scan, and closes the overlay. */ diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/PowerUpFraction.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/PowerUpFraction.java index c0c59632d..7346f8995 100644 --- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/PowerUpFraction.java +++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/PowerUpFraction.java @@ -11,6 +11,7 @@ import android.view.View; import android.widget.AdapterView; import android.widget.LinearLayout; +import android.widget.RadioButton; import android.widget.SeekBar; import android.widget.Spinner; import android.widget.TextView; @@ -72,6 +73,8 @@ public class PowerUpFraction extends Fraction { @BindView(R.id.exResCandy) TextView exResCandy; + @BindView(R.id.movesetButton) + RadioButton movesetButton; private Context context; private Pokefly pokefly; @@ -97,6 +100,7 @@ public PowerUpFraction(@NonNull Pokefly pokefly) { createExtendedResultEvolutionSpinner(); adjustSeekbarsThumbs(); populateAdvancedInformation(); + showMovesetInfoBasedOnSettings(); } @Override public void onDestroy() { @@ -150,6 +154,19 @@ public void populateAdvancedInformation() { setAndCalculatePokeSpamText(Pokefly.scanResult); } + /** + * showMovesetInfoBasedOnSettings + * Shows moveset button based on setting + */ + private void showMovesetInfoBasedOnSettings() { + //enable/disable visibility based on setting + if (GoIVSettings.getInstance(pokefly).isMovesetEnabled()) { + movesetButton.setVisibility(View.VISIBLE); + } else { + movesetButton.setVisibility(View.GONE); + } + } + /** * Initialize the pokemon spinner in the evolution and powerup box in the result window, and return picked pokemon. *

From d1775358ebd0c47dae707f184f9846ca2a6c4392 Mon Sep 17 00:00:00 2001 From: Alessandro Lo-Presti Date: Thu, 3 May 2018 20:39:34 +0200 Subject: [PATCH 03/10] Hide movesets from clipboardtokenhandler when movesets are disabled --- .../ClipboardModifierParentFragment.java | 15 +++++++++++++++ .../clipboardlogic/ClipboardTokenCollection.java | 16 ++++++++++------ .../clipboardlogic/ClipboardTokenHandler.java | 2 +- .../adapters/TokensShowcaseAdapter.java | 2 +- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/kamron/pogoiv/activities/ClipboardModifierParentFragment.java b/app/src/main/java/com/kamron/pogoiv/activities/ClipboardModifierParentFragment.java index 1093ff7fc..fbfec42f7 100644 --- a/app/src/main/java/com/kamron/pogoiv/activities/ClipboardModifierParentFragment.java +++ b/app/src/main/java/com/kamron/pogoiv/activities/ClipboardModifierParentFragment.java @@ -59,6 +59,21 @@ public View onCreateView(@NonNull LayoutInflater inflater, return view; } + @Override + //Pressed return button - in the case when coming back from settings screen after movesets have been enable/disabled + public void onResume() { + super.onResume(); + + if (viewPager != null) + { + ClipboardResultMode[] resultModesEnabled = getResultModesEnabled(); + ModePagerAdapter pagerAdapter = new ModePagerAdapter(getChildFragmentManager(), resultModesEnabled); + if (pagerAdapter != null) { + viewPager.setAdapter(pagerAdapter); + } + } + } + @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); diff --git a/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenCollection.java b/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenCollection.java index e85db5f0f..95085d008 100644 --- a/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenCollection.java +++ b/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenCollection.java @@ -1,5 +1,8 @@ package com.kamron.pogoiv.clipboardlogic; +import android.content.Context; + +import com.kamron.pogoiv.GoIVSettings; import com.kamron.pogoiv.clipboardlogic.tokens.BaseStatToken; import com.kamron.pogoiv.clipboardlogic.tokens.CPMaxToken; import com.kamron.pogoiv.clipboardlogic.tokens.CPMissingAtFourty; @@ -37,7 +40,7 @@ public class ClipboardTokenCollection { - public static ArrayList getSamples() { + public static ArrayList getSamples(Context context) { ArrayList tokens = new ArrayList<>(); @@ -124,11 +127,12 @@ public static ArrayList getSamples() { tokens.add(new HexIVToken()); //hex representation of iv (ex A4B) ///////////////////////////////////////////////////////// - - //Moveset////////////////////////////////////// - tokens.add(new MovesetInitialsToken(1)); - tokens.add(new MovesetInitialsToken(2)); - + //enable/disable visibility based on setting + if (GoIVSettings.getInstance(context).isMovesetEnabled()) { + //Moveset////////////////////////////////////// + tokens.add(new MovesetInitialsToken(1)); + tokens.add(new MovesetInitialsToken(2)); + } //Separators tokens.add(new SeparatorToken("⚔")); diff --git a/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenHandler.java b/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenHandler.java index 65fbf22ed..3e27922c6 100644 --- a/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenHandler.java +++ b/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenHandler.java @@ -102,7 +102,7 @@ private ArrayList initializeTokensFromSettings(String storedSett ArrayList saveTo = new ArrayList<>(); String[] tokenRepresentationArray = storedSetting.split("\\."); - ArrayList exampleTokens = ClipboardTokenCollection.getSamples(); + ArrayList exampleTokens = ClipboardTokenCollection.getSamples(context); for (String representation : tokenRepresentationArray) { // for all saved tokens diff --git a/app/src/main/java/com/kamron/pogoiv/widgets/recyclerviews/adapters/TokensShowcaseAdapter.java b/app/src/main/java/com/kamron/pogoiv/widgets/recyclerviews/adapters/TokensShowcaseAdapter.java index 66f56881e..fbd14ee18 100644 --- a/app/src/main/java/com/kamron/pogoiv/widgets/recyclerviews/adapters/TokensShowcaseAdapter.java +++ b/app/src/main/java/com/kamron/pogoiv/widgets/recyclerviews/adapters/TokensShowcaseAdapter.java @@ -37,7 +37,7 @@ public TokensShowcaseAdapter(Context context, boolean evolvedVariant, } private void rebuildDataSet() { - final ArrayList possibleTokens = ClipboardTokenCollection.getSamples(); + final ArrayList possibleTokens = ClipboardTokenCollection.getSamples(context); // Separate tokens into their categories. The map associates every category to its list of tokens. itemCount = 0; From ddefeb78a442b9a57c5fe2e41a0409e92b2f7f9a Mon Sep 17 00:00:00 2001 From: Alessandro Lo-Presti Date: Thu, 3 May 2018 22:06:23 +0200 Subject: [PATCH 04/10] Load moveset information only when necessary --- .../com/kamron/pogoiv/PoGoApplication.java | 4 +++- .../main/java/com/kamron/pogoiv/Pokefly.java | 23 +++++++++++++------ .../ocrhelper/OcrHelper.java | 23 +++++++++++-------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/kamron/pogoiv/PoGoApplication.java b/app/src/main/java/com/kamron/pogoiv/PoGoApplication.java index b4723d826..d60707756 100644 --- a/app/src/main/java/com/kamron/pogoiv/PoGoApplication.java +++ b/app/src/main/java/com/kamron/pogoiv/PoGoApplication.java @@ -27,6 +27,8 @@ public void onCreate() { FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/Lato-Medium.ttf"); FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/Lato-Medium.ttf"); - MovesetsManager.init(this); + if (GoIVSettings.getInstance(this).isMovesetEnabled()) { + MovesetsManager.init(this); + } } } diff --git a/app/src/main/java/com/kamron/pogoiv/Pokefly.java b/app/src/main/java/com/kamron/pogoiv/Pokefly.java index 41b9f9f89..5087e8457 100644 --- a/app/src/main/java/com/kamron/pogoiv/Pokefly.java +++ b/app/src/main/java/com/kamron/pogoiv/Pokefly.java @@ -268,7 +268,9 @@ public void onCreate() { clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); sharedPref = getSharedPreferences(PREF_USER_CORRECTIONS, Context.MODE_PRIVATE); - MovesetsManager.init(this); + if (isMovesetEnabled()) { + MovesetsManager.init(this); + } LocalBroadcastManager.getInstance(this).registerReceiver(displayInfo, new IntentFilter(ACTION_SEND_INFO)); LocalBroadcastManager.getInstance(this).registerReceiver(processBitmap, @@ -323,6 +325,10 @@ public int onStartCommand(Intent intent, int flags, int startId) { return START_REDELIVER_INTENT; } + private boolean isMovesetEnabled() { + return GoIVSettings.getInstance(this).isMovesetEnabled(); + } + private void setupDisplaySizeInfo() { ScanPoint arcInit = new ScanPoint((int) (displayMetrics.widthPixels * 0.5), (int) Math.floor(displayMetrics.heightPixels * 0.35664)); @@ -772,13 +778,16 @@ public void onReceive(Context context, Intent intent) { screenShotPath = null; } - String moveFast = intent.getStringExtra(KEY_SEND_MOVESET_QUICK); - String moveCharge = intent.getStringExtra(KEY_SEND_MOVESET_CHARGE); - if (moveFast == null || moveCharge == null) { - moveFast = ""; - moveCharge = ""; + String moveFast = ""; + String moveCharge = ""; + if (isMovesetEnabled()) { + moveFast = intent.getStringExtra(KEY_SEND_MOVESET_QUICK); + moveCharge = intent.getStringExtra(KEY_SEND_MOVESET_CHARGE); + if (moveFast == null || moveCharge == null) { + moveFast = ""; + moveCharge = ""; + } } - double estimatedPokemonLevelMin = intent.getDoubleExtra(KEY_SEND_INFO_LEVEL_LOWER, 1); double estimatedPokemonLevelMax = intent.getDoubleExtra(KEY_SEND_INFO_LEVEL_HIGHER, 1); diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ocrhelper/OcrHelper.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ocrhelper/OcrHelper.java index def6b4a3b..babd22d6e 100644 --- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ocrhelper/OcrHelper.java +++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ocrhelper/OcrHelper.java @@ -57,6 +57,7 @@ public class OcrHelper { private static String nidoUngendered; private static TessBaseAPI tesseract = null; private static boolean isPokeSpamEnabled; + private static boolean isMovesetEnabled; private static LruCache ocrCache; private static LruCache appraisalCache; private static boolean candyWordFirst; @@ -100,6 +101,7 @@ public static synchronized OcrHelper init(@NonNull Context context, GoIVSettings settings = GoIVSettings.getInstance(context); isPokeSpamEnabled = settings.isPokeSpamEnabled(); + isMovesetEnabled = settings.isMovesetEnabled(); Map appraisalMap = settings.loadAppraisalCache(); for (Map.Entry entry : appraisalMap.entrySet()) { @@ -1130,15 +1132,18 @@ public ScanData scanPokemon(@NonNull GoIVSettings settings, } Optional evolutionCost = getPokemonEvolutionCostFromImg(pokemonImage, ScanArea.calibratedFromSettings(POKEMON_EVOLUTION_COST_AREA, settings)); - Pair moveset = getMovesetFromImg(pokemonImage, - estimatedLevelRange, - ScanArea.calibratedFromSettings(POKEMON_POWER_UP_CANDY_COST, settings), - ScanArea.calibratedFromSettings(POKEMON_EVOLUTION_COST_AREA, settings)); - String moveFast = null; - String moveCharge = null; - if (moveset != null) { - moveFast = moveset.first; - moveCharge = moveset.second; + + String moveFast = ""; + String moveCharge = ""; + if (isMovesetEnabled) { + Pair moveset = getMovesetFromImg(pokemonImage, + estimatedLevelRange, + ScanArea.calibratedFromSettings(POKEMON_POWER_UP_CANDY_COST, settings), + ScanArea.calibratedFromSettings(POKEMON_EVOLUTION_COST_AREA, settings)); + if (moveset != null) { + moveFast = moveset.first; + moveCharge = moveset.second; + } } String uniqueIdentifier = name + type + candyName + hp.toString() + cp .toString() + powerUpStardustCost.toString() + powerUpCandyCost.toString(); From bd3574030c4141150084f6e44577d8916668132d Mon Sep 17 00:00:00 2001 From: Alessandro Lo-Presti Date: Fri, 4 May 2018 16:09:37 +0200 Subject: [PATCH 05/10] Fix code styling issues --- app/src/main/java/com/kamron/pogoiv/GoIVSettings.java | 4 +++- .../pogoiv/pokeflycomponents/fractions/IVResultFraction.java | 2 +- .../pogoiv/pokeflycomponents/fractions/PowerUpFraction.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java b/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java index f03086bd1..25160ce5b 100644 --- a/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java +++ b/app/src/main/java/com/kamron/pogoiv/GoIVSettings.java @@ -285,7 +285,9 @@ public boolean isPokeSpamEnabled() { return prefs.getBoolean(POKESPAM_ENABLED, false); } - public boolean isMovesetEnabled() { return prefs.getBoolean(MOVESET_ENABLED, true); } + public boolean isMovesetEnabled() { + return prefs.getBoolean(MOVESET_ENABLED, true); + } public boolean shouldAutoOpenExpandedAppraise() { return prefs.getBoolean(AUTO_OPEN_APPRAISE_DIALOGUE, false); diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/IVResultFraction.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/IVResultFraction.java index 82f7cffa5..4bfb8e57a 100644 --- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/IVResultFraction.java +++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/IVResultFraction.java @@ -239,7 +239,7 @@ private void setResultScreenPercentageRange() { } /** - * showMovesetInfoBasedOnSettings + * showMovesetInfoBasedOnSettings. * Shows moveset button based on setting */ private void showMovesetInfoBasedOnSettings() { diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/PowerUpFraction.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/PowerUpFraction.java index 7346f8995..9e551f8bb 100644 --- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/PowerUpFraction.java +++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/fractions/PowerUpFraction.java @@ -155,7 +155,7 @@ public void populateAdvancedInformation() { } /** - * showMovesetInfoBasedOnSettings + * showMovesetInfoBasedOnSettings. * Shows moveset button based on setting */ private void showMovesetInfoBasedOnSettings() { From c2b47e158a239cf33dc5ce83afb6f3b453ee7b43 Mon Sep 17 00:00:00 2001 From: Alessandro Lo-Presti Date: Sat, 5 May 2018 22:39:52 +0200 Subject: [PATCH 06/10] Revert "Hide movesets from clipboardtokenhandler when movesets are disabled" This reverts commit c983f8879d63a834c214b20a7b2e629b9ca40faa. --- .../ClipboardModifierParentFragment.java | 15 --------------- .../clipboardlogic/ClipboardTokenCollection.java | 16 ++++++---------- .../clipboardlogic/ClipboardTokenHandler.java | 2 +- .../adapters/TokensShowcaseAdapter.java | 2 +- 4 files changed, 8 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/kamron/pogoiv/activities/ClipboardModifierParentFragment.java b/app/src/main/java/com/kamron/pogoiv/activities/ClipboardModifierParentFragment.java index fbfec42f7..1093ff7fc 100644 --- a/app/src/main/java/com/kamron/pogoiv/activities/ClipboardModifierParentFragment.java +++ b/app/src/main/java/com/kamron/pogoiv/activities/ClipboardModifierParentFragment.java @@ -59,21 +59,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, return view; } - @Override - //Pressed return button - in the case when coming back from settings screen after movesets have been enable/disabled - public void onResume() { - super.onResume(); - - if (viewPager != null) - { - ClipboardResultMode[] resultModesEnabled = getResultModesEnabled(); - ModePagerAdapter pagerAdapter = new ModePagerAdapter(getChildFragmentManager(), resultModesEnabled); - if (pagerAdapter != null) { - viewPager.setAdapter(pagerAdapter); - } - } - } - @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); diff --git a/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenCollection.java b/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenCollection.java index 95085d008..e85db5f0f 100644 --- a/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenCollection.java +++ b/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenCollection.java @@ -1,8 +1,5 @@ package com.kamron.pogoiv.clipboardlogic; -import android.content.Context; - -import com.kamron.pogoiv.GoIVSettings; import com.kamron.pogoiv.clipboardlogic.tokens.BaseStatToken; import com.kamron.pogoiv.clipboardlogic.tokens.CPMaxToken; import com.kamron.pogoiv.clipboardlogic.tokens.CPMissingAtFourty; @@ -40,7 +37,7 @@ public class ClipboardTokenCollection { - public static ArrayList getSamples(Context context) { + public static ArrayList getSamples() { ArrayList tokens = new ArrayList<>(); @@ -127,12 +124,11 @@ public static ArrayList getSamples(Context context) { tokens.add(new HexIVToken()); //hex representation of iv (ex A4B) ///////////////////////////////////////////////////////// - //enable/disable visibility based on setting - if (GoIVSettings.getInstance(context).isMovesetEnabled()) { - //Moveset////////////////////////////////////// - tokens.add(new MovesetInitialsToken(1)); - tokens.add(new MovesetInitialsToken(2)); - } + + //Moveset////////////////////////////////////// + tokens.add(new MovesetInitialsToken(1)); + tokens.add(new MovesetInitialsToken(2)); + //Separators tokens.add(new SeparatorToken("⚔")); diff --git a/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenHandler.java b/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenHandler.java index 3e27922c6..65fbf22ed 100644 --- a/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenHandler.java +++ b/app/src/main/java/com/kamron/pogoiv/clipboardlogic/ClipboardTokenHandler.java @@ -102,7 +102,7 @@ private ArrayList initializeTokensFromSettings(String storedSett ArrayList saveTo = new ArrayList<>(); String[] tokenRepresentationArray = storedSetting.split("\\."); - ArrayList exampleTokens = ClipboardTokenCollection.getSamples(context); + ArrayList exampleTokens = ClipboardTokenCollection.getSamples(); for (String representation : tokenRepresentationArray) { // for all saved tokens diff --git a/app/src/main/java/com/kamron/pogoiv/widgets/recyclerviews/adapters/TokensShowcaseAdapter.java b/app/src/main/java/com/kamron/pogoiv/widgets/recyclerviews/adapters/TokensShowcaseAdapter.java index fbd14ee18..66f56881e 100644 --- a/app/src/main/java/com/kamron/pogoiv/widgets/recyclerviews/adapters/TokensShowcaseAdapter.java +++ b/app/src/main/java/com/kamron/pogoiv/widgets/recyclerviews/adapters/TokensShowcaseAdapter.java @@ -37,7 +37,7 @@ public TokensShowcaseAdapter(Context context, boolean evolvedVariant, } private void rebuildDataSet() { - final ArrayList possibleTokens = ClipboardTokenCollection.getSamples(context); + final ArrayList possibleTokens = ClipboardTokenCollection.getSamples(); // Separate tokens into their categories. The map associates every category to its list of tokens. itemCount = 0; From e618d6f6004a0420ade8c9d9a3a30ac449492241 Mon Sep 17 00:00:00 2001 From: Alessandro Lo-Presti Date: Sat, 5 May 2018 22:42:35 +0200 Subject: [PATCH 07/10] Initialize strings as null instead of empty strings --- app/src/main/java/com/kamron/pogoiv/Pokefly.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/kamron/pogoiv/Pokefly.java b/app/src/main/java/com/kamron/pogoiv/Pokefly.java index 5087e8457..2f5a879f5 100644 --- a/app/src/main/java/com/kamron/pogoiv/Pokefly.java +++ b/app/src/main/java/com/kamron/pogoiv/Pokefly.java @@ -778,8 +778,8 @@ public void onReceive(Context context, Intent intent) { screenShotPath = null; } - String moveFast = ""; - String moveCharge = ""; + String moveFast = null; + String moveCharge = null; if (isMovesetEnabled()) { moveFast = intent.getStringExtra(KEY_SEND_MOVESET_QUICK); moveCharge = intent.getStringExtra(KEY_SEND_MOVESET_CHARGE); From 0bd40c3c23dbb35f798208d2194ccd6ff627e9b7 Mon Sep 17 00:00:00 2001 From: Alessandro Lo-Presti Date: Sat, 5 May 2018 22:47:08 +0200 Subject: [PATCH 08/10] Remove unnecessary method calls --- app/src/main/java/com/kamron/pogoiv/Pokefly.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/kamron/pogoiv/Pokefly.java b/app/src/main/java/com/kamron/pogoiv/Pokefly.java index 2f5a879f5..587a284a9 100644 --- a/app/src/main/java/com/kamron/pogoiv/Pokefly.java +++ b/app/src/main/java/com/kamron/pogoiv/Pokefly.java @@ -268,7 +268,7 @@ public void onCreate() { clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); sharedPref = getSharedPreferences(PREF_USER_CORRECTIONS, Context.MODE_PRIVATE); - if (isMovesetEnabled()) { + if (GoIVSettings.getInstance(this).isMovesetEnabled()) { MovesetsManager.init(this); } @@ -325,10 +325,6 @@ public int onStartCommand(Intent intent, int flags, int startId) { return START_REDELIVER_INTENT; } - private boolean isMovesetEnabled() { - return GoIVSettings.getInstance(this).isMovesetEnabled(); - } - private void setupDisplaySizeInfo() { ScanPoint arcInit = new ScanPoint((int) (displayMetrics.widthPixels * 0.5), (int) Math.floor(displayMetrics.heightPixels * 0.35664)); @@ -778,9 +774,11 @@ public void onReceive(Context context, Intent intent) { screenShotPath = null; } + GoIVSettings settings = GoIVSettings.getInstance(Pokefly.this); + String moveFast = null; String moveCharge = null; - if (isMovesetEnabled()) { + if (settings.isMovesetEnabled()) { moveFast = intent.getStringExtra(KEY_SEND_MOVESET_QUICK); moveCharge = intent.getStringExtra(KEY_SEND_MOVESET_CHARGE); if (moveFast == null || moveCharge == null) { @@ -808,7 +806,6 @@ public void onReceive(Context context, Intent intent) { uniqueID); if (!infoShownReceived) { - GoIVSettings settings = GoIVSettings.getInstance(Pokefly.this); if (!startedInManualScreenshotMode) { infoShownReceived = true; } From d70beb49c52131eb0c341848d306eb656ca8bdca Mon Sep 17 00:00:00 2001 From: Alessandro Lo-Presti Date: Sun, 6 May 2018 18:36:54 +0200 Subject: [PATCH 09/10] Removed empty translations --- app/src/main/res/values-cs/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 3 --- app/src/main/res/values-es/strings.xml | 2 -- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-it/strings.xml | 2 -- app/src/main/res/values-pt/strings.xml | 2 -- 6 files changed, 13 deletions(-) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 02a0b2ccc..750de1481 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -59,6 +59,4 @@ Jméno Pokémona Náhled Přemísti okno táhnutím tohoto držáku. - - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index aba8c117b..fe683c2f5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -93,7 +93,4 @@ …sehen lassen Hut ab! die besten …gesehen - - - diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1c0d73881..56b8ac671 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -270,6 +270,4 @@ Email con información sobre el error para desarrolladores Email de informe de error Videotutorial recalibración - - diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 248e1cda0..eb4fceb04 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -132,6 +132,4 @@ Fonctionnalités optionnelles Mode de GoIV Paramètres peu intéressants - - diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d7cef5bb7..9f98ccd26 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -301,6 +301,4 @@ "Agg. a coda" "Svuota coda" Esporta coda a PokeBattler - - diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 38ee0c138..5b97006ab 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -34,6 +34,4 @@ Procurar actualizações Verificar se alguma actualização está disponível Pesquisa falhou, por favor deslize para cima e tente de novo! - - From 9b9c01c02b0b3def65919d9a390711572c06b402 Mon Sep 17 00:00:00 2001 From: Alessandro Lo-Presti Date: Fri, 1 Jun 2018 10:29:04 +0200 Subject: [PATCH 10/10] Initialize strings as null instead of empty strings --- .../kamron/pogoiv/pokeflycomponents/ocrhelper/OcrHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ocrhelper/OcrHelper.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ocrhelper/OcrHelper.java index babd22d6e..ca141f0fe 100644 --- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ocrhelper/OcrHelper.java +++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ocrhelper/OcrHelper.java @@ -1133,8 +1133,8 @@ public ScanData scanPokemon(@NonNull GoIVSettings settings, Optional evolutionCost = getPokemonEvolutionCostFromImg(pokemonImage, ScanArea.calibratedFromSettings(POKEMON_EVOLUTION_COST_AREA, settings)); - String moveFast = ""; - String moveCharge = ""; + String moveFast = null; + String moveCharge = null; if (isMovesetEnabled) { Pair moveset = getMovesetFromImg(pokemonImage, estimatedLevelRange,