From 9640ffb24ddfb3f557a024c14ec0b89f4ac48622 Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@gmail.com>
Date: Sun, 19 Apr 2015 13:19:22 -0400
Subject: [PATCH] Fix lack of primary keys and start laying out more UI.

---
 .../MiceAndMysticsTracker.iml                 |  1 +
 MiceAndMysticsTracker/build.gradle            |  1 +
 .../src/main/AndroidManifest.xml              | 10 ++++-
 .../CampaignDetailsActivity.java              | 39 +++++++++++++++++++
 .../miceandmystics/model/Ability.java         |  2 +
 .../miceandmystics/model/Achievement.java     |  2 +
 .../miceandmystics/model/BackpackItem.java    |  2 +
 .../miceandmystics/model/Campaign.java        | 11 ++++++
 .../miceandmystics/model/Character.java       |  2 +
 .../miceandmystics/model/Player.java          |  2 +
 .../src/main/res/layout/activity_campaign.xml |  5 ++-
 .../res/layout/activity_campaign_details.xml  | 13 +++++++
 .../main/res/menu/menu_campaign_details.xml   |  9 +++++
 .../src/main/res/values/strings.xml           |  4 ++
 14 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java
 create mode 100644 MiceAndMysticsTracker/src/main/res/layout/activity_campaign_details.xml
 create mode 100644 MiceAndMysticsTracker/src/main/res/menu/menu_campaign_details.xml

diff --git a/MiceAndMysticsTracker/MiceAndMysticsTracker.iml b/MiceAndMysticsTracker/MiceAndMysticsTracker.iml
index af25f06..cd28d7f 100644
--- a/MiceAndMysticsTracker/MiceAndMysticsTracker.iml
+++ b/MiceAndMysticsTracker/MiceAndMysticsTracker.iml
@@ -90,5 +90,6 @@
     <orderEntry type="library" exported="" name="realm-android-0.80.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/MiceAndMysticsTracker/build.gradle b/MiceAndMysticsTracker/build.gradle
index d386bb8..28fe89a 100644
--- a/MiceAndMysticsTracker/build.gradle
+++ b/MiceAndMysticsTracker/build.gradle
@@ -41,4 +41,5 @@ dependencies {
     compile 'com.android.support:appcompat-v7:22.0.0'
     compile 'io.realm:realm-android:0.80.1'
     compile 'uk.co.chrisjenx:calligraphy:2.0.2'
+    compile 'com.android.support:recyclerview-v7:21.0.+'
 }
diff --git a/MiceAndMysticsTracker/src/main/AndroidManifest.xml b/MiceAndMysticsTracker/src/main/AndroidManifest.xml
index 2cc88f1..20ca41e 100644
--- a/MiceAndMysticsTracker/src/main/AndroidManifest.xml
+++ b/MiceAndMysticsTracker/src/main/AndroidManifest.xml
@@ -3,10 +3,10 @@
     package="com.eyecreate.miceandmystics.miceandmystics" >
 
     <application
+        android:name=".MiceAndMysticsApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name=".MiceAndMysticsApplication"
         android:theme="@style/AppTheme" >
         <activity
             android:name=".CampaignActivity"
@@ -17,6 +17,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".CampaignDetailsActivity"
+            android:label="@string/title_activity_campaign_details"
+            android:parentActivityName=".CampaignActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.eyecreate.miceandmystics.miceandmystics.CampaignActivity" />
+        </activity>
     </application>
 
 </manifest>
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java
new file mode 100644
index 0000000..c8b2aad
--- /dev/null
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java
@@ -0,0 +1,39 @@
+package com.eyecreate.miceandmystics.miceandmystics;
+
+import android.support.v7.app.ActionBarActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+
+public class CampaignDetailsActivity extends ActionBarActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_campaign_details);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_campaign_details, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Ability.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Ability.java
index d894e69..9b70223 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Ability.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Ability.java
@@ -1,8 +1,10 @@
 package com.eyecreate.miceandmystics.miceandmystics.model;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Ability extends RealmObject {
+    @PrimaryKey
     private String abilityName;
 
     public String getAbilityName() {
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Achievement.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Achievement.java
index 28fa242..483107d 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Achievement.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Achievement.java
@@ -1,8 +1,10 @@
 package com.eyecreate.miceandmystics.miceandmystics.model;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Achievement extends RealmObject {
+    @PrimaryKey
     private String achievementName;
 
     public String getAchievementName() {
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/BackpackItem.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/BackpackItem.java
index d881f41..f0fa2f0 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/BackpackItem.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/BackpackItem.java
@@ -1,9 +1,11 @@
 package com.eyecreate.miceandmystics.miceandmystics.model;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class BackpackItem extends RealmObject {
     //TODO:Look into seeing if it's worth hard coding these instead of manual entry.
+    @PrimaryKey
     private String itemName;
 
     public String getItemName() {
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Campaign.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Campaign.java
index 580a9ab..e942815 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Campaign.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Campaign.java
@@ -2,8 +2,11 @@ package com.eyecreate.miceandmystics.miceandmystics.model;
 
 import io.realm.RealmList;
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Campaign extends RealmObject {
+    @PrimaryKey
+    private String campaignName;
     private RealmList<Character> currentCharacters;
     private RealmList<Achievement> partyStoryAchievements;
 
@@ -22,4 +25,12 @@ public class Campaign extends RealmObject {
     public void setPartyStoryAchievements(RealmList<Achievement> partyStoryAchievements) {
         this.partyStoryAchievements = partyStoryAchievements;
     }
+
+    public String getCampaignName() {
+        return campaignName;
+    }
+
+    public void setCampaignName(String campaignName) {
+        this.campaignName = campaignName;
+    }
 }
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Character.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Character.java
index 834ddff..4283379 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Character.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Character.java
@@ -2,8 +2,10 @@ package com.eyecreate.miceandmystics.miceandmystics.model;
 
 import io.realm.RealmList;
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Character extends RealmObject {
+    @PrimaryKey
     private String characterName;
     private RealmList<Ability> abilities;
     private RealmList<BackpackItem> storedItems; //Not sure why I made this a list when rulebook says you can only have one xD
diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Player.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Player.java
index 200155b..b26a2c2 100644
--- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Player.java
+++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Player.java
@@ -1,8 +1,10 @@
 package com.eyecreate.miceandmystics.miceandmystics.model;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Player extends RealmObject {
+    @PrimaryKey
     private String playerName;
 
     public String getPlayerName() {
diff --git a/MiceAndMysticsTracker/src/main/res/layout/activity_campaign.xml b/MiceAndMysticsTracker/src/main/res/layout/activity_campaign.xml
index f177fd3..fb6f93b 100644
--- a/MiceAndMysticsTracker/src/main/res/layout/activity_campaign.xml
+++ b/MiceAndMysticsTracker/src/main/res/layout/activity_campaign.xml
@@ -7,6 +7,9 @@
                 android:paddingTop="@dimen/activity_vertical_margin"
                 android:paddingBottom="@dimen/activity_vertical_margin"
                 tools:context=".CampaignActivity">
-
+        <ListView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/campaign_list"/>
 
 </LinearLayout>
diff --git a/MiceAndMysticsTracker/src/main/res/layout/activity_campaign_details.xml b/MiceAndMysticsTracker/src/main/res/layout/activity_campaign_details.xml
new file mode 100644
index 0000000..348efda
--- /dev/null
+++ b/MiceAndMysticsTracker/src/main/res/layout/activity_campaign_details.xml
@@ -0,0 +1,13 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                tools:context="com.eyecreate.miceandmystics.miceandmystics.CampaignDetailsActivity">
+
+
+
+</RelativeLayout>
diff --git a/MiceAndMysticsTracker/src/main/res/menu/menu_campaign_details.xml b/MiceAndMysticsTracker/src/main/res/menu/menu_campaign_details.xml
new file mode 100644
index 0000000..0f3b25c
--- /dev/null
+++ b/MiceAndMysticsTracker/src/main/res/menu/menu_campaign_details.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context="com.eyecreate.miceandmystics.miceandmystics.CampaignDetailsActivity">
+    <item android:id="@+id/action_settings"
+          android:title="@string/action_settings"
+          android:orderInCategory="100"
+          app:showAsAction="never"/>
+</menu>
diff --git a/MiceAndMysticsTracker/src/main/res/values/strings.xml b/MiceAndMysticsTracker/src/main/res/values/strings.xml
index fda3460..b54c939 100644
--- a/MiceAndMysticsTracker/src/main/res/values/strings.xml
+++ b/MiceAndMysticsTracker/src/main/res/values/strings.xml
@@ -1,4 +1,8 @@
 <resources>
     <string name="app_name">Mice and Mystics Tracker</string>
+    <string name="title_activity_campaign_details">CampaignDetailsActivity</string>
+
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
 
 </resources>
-- 
GitLab