Skip to content
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.

Sign up for GitHub

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

Hotfix (Fixes #62) #63

Merged
merged 17 commits into from
Dec 7, 2017
Merged

Hotfix (Fixes #62) #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cc60e74
Added the dialog for experience.
JayTSmith Dec 5, 2017
e10ef31
Added a helper method for adding experience
JayTSmith Dec 5, 2017
2a6dbce
Added an click event for opening Experience Dialog. Also cleaned up.
JayTSmith Dec 5, 2017
38777e8
Corrected error in updateLevel.
JayTSmith Dec 5, 2017
e74b523
Added functionality for the experience dialog.
JayTSmith Dec 5, 2017
bcd7d2a
Converted from strings to text resources.
JayTSmith Dec 5, 2017
3de016f
Added a dialog in order to select stat to improve for level up.
JayTSmith Dec 6, 2017
021f925
Added functionality for the LevelUpButton and added some comments as …
JayTSmith Dec 6, 2017
ac0d7a7
Called updateGUI rather than update manually.
JayTSmith Dec 6, 2017
0541951
Removed the listener interface, added ability to select a score, also…
JayTSmith Dec 6, 2017
e84219f
Added selected score text view to the code. Added more comments. Rena…
JayTSmith Dec 6, 2017
d32e633
Added the LevelResult dialog. Shows the results of the level up(addit…
JayTSmith Dec 6, 2017
ee87dfb
Added the root dialog field to all of the custom dialogs so that we c…
JayTSmith Dec 6, 2017
0f60d53
Made CharacterSheetFragment a ChangeListener.
JayTSmith Dec 6, 2017
d68ee73
Actually levels up the character this time.
JayTSmith Dec 6, 2017
f77b1fe
Prevented the user from inputting too large a number. (Fixed #62)
JayTSmith Dec 6, 2017
b3e89e3
Merge branch 'master' into develop
JayTSmith Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...s/app/src/main/java/com/example/cis/mazeminotaurs/fragments/ExperienceDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;

import com.example.cis.mazeminotaurs.Portfolio;
import com.example.cis.mazeminotaurs.R;
Expand Down Expand Up @@ -75,8 +76,12 @@ public void onClick(View view) {
String value = mExperienceEdit.getText().toString();
// Stops any empty value from crashing the program.
if (value != null && !value.equals("")) {
mCharClass.addExperience(Integer.valueOf(value));
updateGUI();
try {
mCharClass.addExperience(Integer.valueOf(value));
updateGUI();
} catch (NumberFormatException e) {
Toast.makeText(getContext(), R.string.error_big_experience, Toast.LENGTH_LONG).show();
}
}
}
});
Expand Down
1 change: 1 addition & 0 deletions MazesAndMinotaurs/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,5 @@
<string name="caution_message">Is this okay?</string>
<string name="luck_head">Luck:</string>
<string name="hits_head">Hits:</string>
<string name="error_big_experience">The number in experience is too big.</string>
</resources>