-
Notifications
You must be signed in to change notification settings - Fork 115
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor login #583
Open
FernandoTBarros
wants to merge
51
commits into
Wolfsblvt:develop
Choose a base branch
from
FernandoTBarros:refactorLogin
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Refactor login #583
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[email protected]:FernandoTBarros/BlossomsPokemonGoManager.git into itemRequiredEvolve Conflicts: pom.xml src/me/corriekay/pokegoutil/data/enums/PokeColumn.java
evolution Refactoring search bar using proper rowFilter by Java Maintaining selection after search or after operations like refresh, transfer and evolve
itemRequiredEvolve Conflicts: src/me/corriekay/pokegoutil/data/enums/PokeColumn.java src/me/corriekay/pokegoutil/utils/windows/PokemonTable.java
decrease class complexity and fixing some codeclimate issues.
hash endpoint to the last one
Updating PokeGOAPI for updating Hash Key login to the last version Including two new buttons for favorite yes or no
Configuring checkstyle SuppresionCommentFilter for the NullPointerException in PokemonTableModel class Erasing some throws tag in javadoc comment
Turning on JavaFX nature again.
…ir own column now. Left statements in code but commented so this could later be re-enabled through boolean flag when column hiding becomes an option or through a preference setting to collapse the two columns back into a single column. Minor modification to show DPS Column using 2 decimals like it was shown in the movetype columns before.
…ithout_ and candy count _with_ "Transfer After Evolve" enabled, separated by a "/". The use of a separator character requires the column type to be changed from NULLABLE_INT to STRING. However, this poses a problem when sorting as this would position 10's and 20's, etc. together with 1's and 2's and so forth. To prevent this the first value in front of the "/" character needs to be treated as an integer type during sort. To allow for this, a new column type "NUMBER_STRING" is defined and linked to a dedicated comparator. This comparator then looks for the "/" character and if found, splits the string into two parts of which the first part is than converted back to integer during the sort comparison. The split variables receiving the separated values are pre-initialized with "-1" for the parts preceding a possibly present "/", so that for pokémon which cannot be evolved, the NO_VALUE_SIGN is sorted separately from those with a zero count.
…ype. Also fixed abbreviateType to check for an empty type variable instead of "none" since that already got stripped in the call to PokemonUtils.formatType(). This makes the discussion what to return in case no second type is present a moot issue, as the code already would have returned "__" had the if check in abbreviateType been correct in the first place.
…ame length and 1's, 2's and 3's don't get shown next to '10's, 20's and 30's when sorting on pokémon level
Changed all occurences of either "pokemon" or "pokemons" to "Pokémon" since A) it's a name so should start with a capital B) both single and plural forms are spelled the same C) it should be consistent throughout BPGM Changed an accidental { to [ in the rename pattern length indicator for IV_STAM_UNI Changed some message prompts to make "Multi" a conditional part in the message, showing only if there is more than 1 Pokémon transfered.
…e_2% patterns where a mix of Move and Move Type. While returning the Type they were treated as Moves during formatting, which made the example look incorrect. Ghost did not get returned as "Gh" but as "gh" for a non-STAB move and "GH" for a STAB move. To correct for this omission I've added two rename patterns, e.g. %move_1% and %move_2% and applied the STAB logic to these returned abbreviations instead of to the move type patterns. These now get returned as intended (i.e. first character in uppercase, second character in lowercase) Also took the opportunity to correct a spelling error (Eletric -> Electric)
Instead of adding the HP Left as a separate column, I opted to combine it with the Full HP value in same way as I did with the dual evolvable count values. Since I also wasn't happy with the left-aligned display of these values and right-aligned looking just as ugly, I also added a new renderer for the NUMBER_STRING columntype to make it show its values centered.
…olumn defaults to using the Full HP part on the right in the NUMBER_STRING comparator since sorting on Health yields the same result as sorting on HP Left.
…t list. It is required for the centered display of the NUMBER_STRING columns
…able dual value column through checking which first sort key is stored in config.json. If that is the HP column and the useFullHP config setting is not changed through manual editing, sorting will be done on full HP value. If consecutive mons have an equal Full HP value, then the HP Left value is sorted for mons with same Full HP value.
Changes in columns
…msPokemonGoManager.git into refactorLogin
open Fixing codeclimate issues Hability to configure unicode icons in config.json file
Conflicts: pom.xml src/main/resources/version.txt src/me/corriekay/pokegoutil/data/managers/AccountManager.java src/me/corriekay/pokegoutil/utils/helpers/LoginHelper.java
FernandoTBarros
added
bug
bugfix
duplicate
enhancement
needs code review
refactoring
and removed
bug
duplicate
labels
Apr 8, 2017
Buttons to help new users.
JavaFX and Swing on the new login dialog. Maybe I try to get it back when I have time!
Returning the abbreviation in uppercase with STAB and in lowercase if no STAB. Corrected HP rename pattern to only return the full HP.
Reverted %move_type_1% and %move_type_2% back to old behavior.
And refactoring from PokemonMeta to getItemTemplates()
Updated POM to use the new API with encryption update.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Creating a login window to facilitate entering login information and hash key without needing to configure through config.json file
Changes in columns made by @just-Addict
Updating endpoint and API to the latest forced version by Niantic
Ability to configure Unicode icons in config.json file