diff --git a/MiceAndMysticsTracker/MiceAndMysticsTracker.iml b/MiceAndMysticsTracker/MiceAndMysticsTracker.iml index af25f06d111120823af36202f62cd71617ef48b3..cd28d7ff4bb7b641d6fb23df2ce3262b89edd419 100644 --- a/MiceAndMysticsTracker/MiceAndMysticsTracker.iml +++ b/MiceAndMysticsTracker/MiceAndMysticsTracker.iml @@ -90,5 +90,6 @@ + \ No newline at end of file diff --git a/MiceAndMysticsTracker/build.gradle b/MiceAndMysticsTracker/build.gradle index d386bb8cc20feb7f86c0b7069baaf9cd4421b66f..28fe89a63d01a6160524df29a037e497752f2c1f 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 2cc88f1f71368507b17cd9def28b606354d1f856..20ca41e016958ab8bef16aed025f55b1a0f177bd 100644 --- a/MiceAndMysticsTracker/src/main/AndroidManifest.xml +++ b/MiceAndMysticsTracker/src/main/AndroidManifest.xml @@ -3,10 +3,10 @@ package="com.eyecreate.miceandmystics.miceandmystics" > + + + 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 0000000000000000000000000000000000000000..c8b2aad7ea3f41c17339c09aa3a3be5142a9c57c --- /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 d894e6912102ebbcb6069e51be1e60bbdee93f44..9b7022308a9b7db097acd7b3c0126512924c002d 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 28fa2425e16911e5022f0bf3f3cbb3035de35cb0..483107d96de047f92fe8b47a98143e105f7dd6d6 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 d881f41e94e7a63e44bc3bf3c90db94afe68acf0..f0fa2f079c7877932f6171f6144d7564ce64a8ef 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 580a9aba1d57fe6cfde923da7068bb16623b4891..e942815688d16b01d242ca189f7c0516e26e80c0 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 currentCharacters; private RealmList partyStoryAchievements; @@ -22,4 +25,12 @@ public class Campaign extends RealmObject { public void setPartyStoryAchievements(RealmList 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 834ddff84c44dc33d5aa7a5ecc1e6aec4476d00a..4283379fd2970d7357c1ffa92354590507795ba6 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 abilities; private RealmList 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 200155bd3354833c5578316d2a6315c1459b6296..b26a2c2f17358f2cd9cc2f34916550eef6ace40c 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 f177fd3cee1318b56cd6a4d6d536626cc623120e..fb6f93b794da56db28bd54b2fe05e3db0ba50a0d 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"> - + 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 0000000000000000000000000000000000000000..348efdaa980c0f123610530ac53b706a5289cdb3 --- /dev/null +++ b/MiceAndMysticsTracker/src/main/res/layout/activity_campaign_details.xml @@ -0,0 +1,13 @@ + + + + + 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 0000000000000000000000000000000000000000..0f3b25cb0ca4d1a179cef81d1c4ab1059333437b --- /dev/null +++ b/MiceAndMysticsTracker/src/main/res/menu/menu_campaign_details.xml @@ -0,0 +1,9 @@ + + + diff --git a/MiceAndMysticsTracker/src/main/res/values/strings.xml b/MiceAndMysticsTracker/src/main/res/values/strings.xml index fda3460b437fe72c2d99be40eaf2c570b322e99f..b54c9399296ae8535f30781ac3d1bca508a06ec3 100644 --- a/MiceAndMysticsTracker/src/main/res/values/strings.xml +++ b/MiceAndMysticsTracker/src/main/res/values/strings.xml @@ -1,4 +1,8 @@ Mice and Mystics Tracker + CampaignDetailsActivity + + Hello world! + Settings