Main UI features #42
Merged
Main UI features #42
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
# Conflicts: # src/main/java/Database/DataBaseGateway.java
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.
This pull request implements all the features of the main program UI including creating, editing, and deleting decks. This also includes adding and editing cards in a deck. The menu for starting a session has functional option-picking for decks and session type.
In addition, MainUI.java was renamed to Main.java, and MainUIController.java was renamed to MainUI.java. These file name changes bring the main UI files in sync with the naming system of the rest of the UI. DeckUIController.java was merged into the new MainUI.java to eliminate the arbitrary separation between the functions in the two files. This resolves issue #33.
Within MainUI.java, the dummy account data currently in initialize() will need to removed for integration with account UI, and onStartSessionSubmit() will need to be adjusted to forward to the right session UI.