From dafbd43463d6278f5af953d2b4fa3b4876e75dad Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@gmail.com>
Date: Tue, 16 Feb 2016 22:39:07 -0500
Subject: [PATCH] Character names are now able to be localized.

---
 .../CampaignDetailsActivity.java              |  2 +-
 .../model/Enums/CharacterNames.java           | 20 ++++++++++++-------
 .../CampaignDetailsViewHolder.java            |  2 +-
 3 files changed, 15 insertions(+), 9 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 3d5eae7..9cc92fd 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java
@@ -165,7 +165,7 @@ public class CampaignDetailsActivity extends RecyclerViewActivity {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
                         if(playerSpinner.getSelectedItem() != null) {
-                            ((CampaignDetailsAdapter) getAdapter()).addCharacter(CharacterNames.valueOf(charSpinner.getSelectedItem().toString()), MiceAndMysticsApplication.getRealmInstance().where(Player.class).equalTo("playerName", playerSpinner.getSelectedItem().toString()).findFirst());
+                            ((CampaignDetailsAdapter) getAdapter()).addCharacter(((CharacterNames)charSpinner.getSelectedItem()), MiceAndMysticsApplication.getRealmInstance().where(Player.class).equalTo("playerName", playerSpinner.getSelectedItem().toString()).findFirst());
                         } else {
                             Toast.makeText(CampaignDetailsActivity.this,"No player selected. Maybe try making one first.",Toast.LENGTH_LONG).show();
                         }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CharacterNames.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CharacterNames.java
index bba1bb6..e0c3846 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CharacterNames.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CharacterNames.java
@@ -1,24 +1,30 @@
 package com.eyecreate.miceandmystics.miceandmystics.model.Enums;
 
+import com.eyecreate.miceandmystics.miceandmystics.MiceAndMysticsApplication;
 import com.eyecreate.miceandmystics.miceandmystics.R;
 
 public enum CharacterNames {
 
-    Collin(new CharacterType[]{CharacterType.Warrior,CharacterType.Leader}, R.mipmap.collin),
-    Filch(new CharacterType[]{CharacterType.Scamp},R.mipmap.filch),
-    Lily(new CharacterType[]{CharacterType.Archer},R.mipmap.lily),
-    Maginos(new CharacterType[]{CharacterType.Mystic,CharacterType.Maginos},R.mipmap.maginos),
-    Nez(new CharacterType[]{CharacterType.Tinkerer,CharacterType.Warrior},R.mipmap.nez),
-    Tilda(new CharacterType[]{CharacterType.Healer},R.mipmap.tilda);
+    Collin(R.string.char_name_collin,new CharacterType[]{CharacterType.Warrior,CharacterType.Leader}, R.mipmap.collin),
+    Filch(R.string.char_name_filch,new CharacterType[]{CharacterType.Scamp},R.mipmap.filch),
+    Lily(R.string.char_name_lily,new CharacterType[]{CharacterType.Archer},R.mipmap.lily),
+    Maginos(R.string.char_name_maginos,new CharacterType[]{CharacterType.Mystic,CharacterType.Maginos},R.mipmap.maginos),
+    Nez(R.string.char_name_nez,new CharacterType[]{CharacterType.Tinkerer,CharacterType.Warrior},R.mipmap.nez),
+    Tilda(R.string.char_name_tilda,new CharacterType[]{CharacterType.Healer},R.mipmap.tilda);
 
     private CharacterType[] types;
     private int drawableIcon;
+    private int displayName;
 
-    CharacterNames(CharacterType[] types,int drawableIcon) {
+    CharacterNames(int displayName,CharacterType[] types,int drawableIcon) {
+        this.displayName = displayName;
         this.types = types;
         this.drawableIcon = drawableIcon;
     }
 
     public CharacterType[] characterTypes() { return types; }
     public int getDrawableRes() {return drawableIcon;}
+    public String displayName() { return MiceAndMysticsApplication.getInstance().getString(displayName); }
+
+    @Override public String toString() { return displayName(); }
 }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignDetailsViewHolder.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignDetailsViewHolder.java
index 9c56aa3..a327e09 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignDetailsViewHolder.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignDetailsViewHolder.java
@@ -33,7 +33,7 @@ public class CampaignDetailsViewHolder extends RecyclerView.ViewHolder implement
 
     public void bindModel(Character character) {
         boundCharacter = character;
-        characterName.setText(character.getCharacterName());
+        characterName.setText(CharacterNames.valueOf(character.getCharacterName()).displayName());
         playerName.setText(character.getControllingPlayer().getPlayerName());
         characterIcon.setImageResource(CharacterNames.valueOf(character.getCharacterName()).getDrawableRes());
     }
-- 
GitLab