From 2322ddc28949fb33ae33b5782dc67e452b516000 Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@gmail.com>
Date: Tue, 16 Feb 2016 22:22:01 -0500
Subject: [PATCH] Abilities and Achievements should now rely on enum name for
 identification, but display current string resource in ui.

---
 .../CampaignDetailsActivity.java              |  2 +-
 .../CharacterDetailsActivity.java             |  2 +-
 .../adapters/CampaignDetailsAdapter.java      |  2 +-
 .../model/Enums/Achievement.java              | 20 +++++++++----------
 .../CharacterAbilityViewHolder.java           |  7 +------
 .../PartyAchievementViewHolder.java           |  4 ++--
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java
index c908252..3d5eae7 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java
@@ -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;
                             }
                         }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CharacterDetailsActivity.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CharacterDetailsActivity.java
index 67e54e5..bfe0163 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CharacterDetailsActivity.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CharacterDetailsActivity.java
@@ -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 {
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java
index e6cb42b..9410ec1 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignDetailsAdapter.java
@@ -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();
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/Achievement.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/Achievement.java
index a71f62a..34c5159 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/Achievement.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/Achievement.java
@@ -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(); }
 }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CharacterAbilityViewHolder.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CharacterAbilityViewHolder.java
index e90a155..603b3bd 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CharacterAbilityViewHolder.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CharacterAbilityViewHolder.java
@@ -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();
     }
 
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/PartyAchievementViewHolder.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/PartyAchievementViewHolder.java
index 40cd994..8cb2bd5 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/PartyAchievementViewHolder.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/PartyAchievementViewHolder.java
@@ -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
-- 
GitLab