From 18621d5c36bb589290ae21a1006eb24d818c0a0b Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@gmail.com>
Date: Tue, 16 Feb 2016 22:30:21 -0500
Subject: [PATCH] campaign types now use localized strings.

---
 .../miceandmystics/CampaignActivity.java           |  2 +-
 .../miceandmystics/adapters/CampaignAdapter.java   |  2 +-
 .../miceandmystics/model/Enums/CampaignType.java   | 14 ++++++++------
 .../viewholders/CampaignHeaderViewHolder.java      |  3 ++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignActivity.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignActivity.java
index 597bfff..16dbe4b 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignActivity.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignActivity.java
@@ -63,7 +63,7 @@ public class CampaignActivity extends RecyclerViewActivity {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
                         if(((EditText) dialogView.findViewById(R.id.campaign_name)).getText().length()>0) {
-                            ((CampaignAdapter) getAdapter()).addItem(((EditText) dialogView.findViewById(R.id.campaign_name)).getText().toString(), CampaignType.valueOfDisplayName(typeSpinner.getSelectedItem().toString()));
+                            ((CampaignAdapter) getAdapter()).addItem(((EditText) dialogView.findViewById(R.id.campaign_name)).getText().toString(), CampaignType.valueOf(((CampaignType)typeSpinner.getSelectedItem()).name()));
                         } else {
                             Toast.makeText(CampaignActivity.this,"Can not have blank name!",Toast.LENGTH_LONG).show();
                         }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java
index 4a3b0ce..6ecdb92 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/adapters/CampaignAdapter.java
@@ -39,7 +39,7 @@ public class CampaignAdapter extends RecyclerView.Adapter<CampaignViewHolder> {
         MiceAndMysticsApplication.getRealmInstance().beginTransaction();
         com.eyecreate.miceandmystics.miceandmystics.model.Campaign campaign = new com.eyecreate.miceandmystics.miceandmystics.model.Campaign();
         campaign.setCampaignName(campaignName);
-        campaign.setCampaignType(type.displayName());
+        campaign.setCampaignType(type.name());
         MiceAndMysticsApplication.getRealmInstance().copyToRealm(campaign);
         MiceAndMysticsApplication.getRealmInstance().commitTransaction();
         fullRefresh();
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CampaignType.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CampaignType.java
index 6ae3414..c1eda32 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CampaignType.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CampaignType.java
@@ -1,16 +1,18 @@
 package com.eyecreate.miceandmystics.miceandmystics.model.Enums;
 
+import com.eyecreate.miceandmystics.miceandmystics.MiceAndMysticsApplication;
+import com.eyecreate.miceandmystics.miceandmystics.R;
+
 public enum CampaignType {
-    Sorrow_and_Remembrance("Sorrow and Remembrance");
+    Sorrow_and_Remembrance(R.string.campaign_name_s_a_r);
 
-    private String displayName;
+    private int displayName;
 
-    CampaignType(String name) {
+    CampaignType(int name) {
         this.displayName = name;
     }
 
-    public String displayName() { return displayName; }
+    public String displayName() { return MiceAndMysticsApplication.getInstance().getString(displayName); }
 
-    @Override public String toString() { return displayName; }
-    public static CampaignType valueOfDisplayName(String valuedDisplayName) {return CampaignType.valueOf(valuedDisplayName.replace(" ","_"));}
+    @Override public String toString() { return displayName(); }
 }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignHeaderViewHolder.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignHeaderViewHolder.java
index 9b1a2e4..c80e85d 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignHeaderViewHolder.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignHeaderViewHolder.java
@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.TextView;
 import com.eyecreate.miceandmystics.miceandmystics.R;
 import com.eyecreate.miceandmystics.miceandmystics.model.Campaign;
+import com.eyecreate.miceandmystics.miceandmystics.model.Enums.CampaignType;
 
 public class CampaignHeaderViewHolder extends RecyclerView.ViewHolder {
 
@@ -18,6 +19,6 @@ public class CampaignHeaderViewHolder extends RecyclerView.ViewHolder {
 
     public void bindModel(Campaign campaign) {
         campaignName.setText(campaign.getCampaignName());
-        campaignType.setText(campaign.getCampaignType());
+        campaignType.setText(CampaignType.valueOf(campaign.getCampaignType()).displayName());
     }
 }
-- 
GitLab