eyecreate/MiceAndMysticsTracker
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Abilities and Achievements should now rely on enum name for identification, but display current string resource in ui.

Browse Source
This commit is contained in:
Kevin Whitaker
2016-02-16 22:22:01 -05:00
parent d137e91c98
commit 2322ddc289
6 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java
View File

@@ -133,7 +133,7 @@ public class CampaignDetailsActivity extends RecyclerViewActivity {
RealmList<Achievement> currentPartyAchievements = MiceAndMysticsApplication.getRealmInstance().where(Campaign.class).equalTo("campaignName",campaign.getCampaignName()).findFirst().getPartyStoryAchievements();
boolean hasAlready = false;
for (Achievement achievement:currentPartyAchievements) {
if(achievementSpinner.getSelectedItem().toString().equals(achievement.getAchievementName())){
if(((com.eyecreate.miceandmystics.miceandmystics.model.Enums.Achievement)achievementSpinner.getSelectedItem()).name().equals(achievement.getAchievementName())){
hasAlready = true;
}
}

2
MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CharacterDetailsActivity.java
View File

@@ -76,7 +76,7 @@ public class CharacterDetailsActivity extends RecyclerViewActivity {
.setPositiveButton("Add", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
RealmResults<Character> duplicates = MiceAndMysticsApplication.getRealmInstance().where(Character.class).equalTo("abilities.abilityName",abilitySpinner.getSelectedItem().toString()).equalTo("uuid",currentCharacter.getUuid()).findAll();
RealmResults<Character> duplicates = MiceAndMysticsApplication.getRealmInstance().where(Character.class).equalTo("abilities.abilityName", ((Abilities) abilitySpinner.getSelectedItem()).name()).equalTo("uuid", currentCharacter.getUuid()).findAll();
if(duplicates.size()==0) {
((CharacterDetailsAdapter) getAdapter()).addAbility((Abilities) abilitySpinner.getSelectedItem());
} else {

2
MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java
View File

@@ -107,7 +107,7 @@ public class CampaignDetailsAdapter extends RecyclerView.Adapter<RecyclerView.Vi
MiceAndMysticsApplication.getRealmInstance().beginTransaction();
Achievement realmAchievement = MiceAndMysticsApplication.getRealmInstance().createObject(Achievement.class);
realmAchievement.setUuid(UUID.randomUUID().toString());
realmAchievement.setAchievementName(achievement.displayName());
realmAchievement.setAchievementName(achievement.name());
currentCampaign.getPartyStoryAchievements().add(realmAchievement);
MiceAndMysticsApplication.getRealmInstance().commitTransaction();
fullRefresh();

20
MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/Achievement.java
View File

@@ -1,27 +1,27 @@
package com.eyecreate.miceandmystics.miceandmystics.model.Enums;
import com.eyecreate.miceandmystics.miceandmystics.MiceAndMysticsApplication;
import com.eyecreate.miceandmystics.miceandmystics.R;
public enum Achievement {
Miz_Maggie("Miz Maggie", R.mipmap.mizmaggie),
Vanestras_Brush("Vanestra's Brush",R.mipmap.vanbrush),
King("King",R.mipmap.king),
Cats_Horn_Claw("Cat's Horn Claw",R.mipmap.catclaw), //not sure if it matters this is the claw and not the horn side.
Catnip("Catnip",R.mipmap.catnip);
Miz_Maggie(R.string.ach_name_maggie, R.mipmap.mizmaggie),
Vanestras_Brush(R.string.ach_name_van_brush,R.mipmap.vanbrush),
King(R.string.ach_name_king,R.mipmap.king),
Cats_Horn_Claw(R.string.ach_name_horn_claw,R.mipmap.catclaw), //not sure if it matters this is the claw and not the horn side.
Catnip(R.string.ach_name_catnip,R.mipmap.catnip);
private String displayName;
private int displayName;
private int displayResource;
Achievement(String displayName,int resource) {
Achievement(int displayName,int resource) {
this.displayName = displayName;
this.displayResource = resource;
}
public String displayName() { return displayName; }
public String displayName() { return MiceAndMysticsApplication.getInstance().getString(displayName); }
public int getDisplayResource() { return displayResource; }
@Override public String toString() { return displayName; }
public static Achievement valueOfDisplayName(String valuedDisplayName) {return Achievement.valueOf(valuedDisplayName.replace(" ","_").replace("'",""));}
@Override public String toString() { return displayName(); }
}

7
MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CharacterAbilityViewHolder.java
View File

@@ -25,12 +25,7 @@ public class CharacterAbilityViewHolder extends RecyclerView.ViewHolder implemen
}
public void bindHolder(Ability ability) {
try {
abilityName.setText(Abilities.valueOf(ability.getAbilityName()).toString());
} catch(IllegalArgumentException e) {
//This is a workaround if ability doesn't exist. This is likely due to using old stored data.
abilityName.setText(ability.getAbilityName());
}
abilityName.setText(Abilities.valueOf(ability.getAbilityName()).toString());
uuid = ability.getUuid();
}

4
MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/PartyAchievementViewHolder.java
View File

@@ -28,8 +28,8 @@ public class PartyAchievementViewHolder extends RecyclerView.ViewHolder implemen
public void bindHolder(Achievement achievement) {
this.boundAchievement = achievement;
achievementName.setText(achievement.getAchievementName());
achievementIcon.setImageResource(com.eyecreate.miceandmystics.miceandmystics.model.Enums.Achievement.valueOfDisplayName(achievement.getAchievementName()).getDisplayResource());
achievementName.setText(com.eyecreate.miceandmystics.miceandmystics.model.Enums.Achievement.valueOf(achievement.getAchievementName()).displayName());
achievementIcon.setImageResource(com.eyecreate.miceandmystics.miceandmystics.model.Enums.Achievement.valueOf(achievement.getAchievementName()).getDisplayResource());
}
@Override