From dd0677c25d85900dc4de1d7c8f5d39ef88f14502 Mon Sep 17 00:00:00 2001 From: Kevin Whitaker Date: Mon, 20 Apr 2015 20:27:49 -0400 Subject: [PATCH] Start adding in achievement functions. --- .../CampaignDetailsActivity.java | 2 ++ .../adapters/CampaignDetailsAdapter.java | 18 +++++++++++++----- .../PartyAchievementsHeaderViewHolder.java | 10 ++++++++++ .../main/res/layout/dialog_new_achievement.xml | 7 +++++++ .../layout/item_partyachievements_header.xml | 14 ++++++++++++++ .../src/main/res/values/ids.xml | 2 ++ 6 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/PartyAchievementsHeaderViewHolder.java create mode 100644 MiceAndMysticsTracker/src/main/res/layout/dialog_new_achievement.xml create mode 100644 MiceAndMysticsTracker/src/main/res/layout/item_partyachievements_header.xml 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 47d4dde..9c8d23c 100644 --- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java +++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java @@ -67,6 +67,8 @@ public class CampaignDetailsActivity extends RecyclerViewActivity { Intent managePlayers = new Intent(this,PlayerManagerActivity.class); startActivity(managePlayers); return true; + } else if (id == R.id.action_add_party_achievement) { + return true; } return super.onOptionsItemSelected(item); 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 30b3b1b..aefad7d 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 @@ -10,9 +10,9 @@ import com.eyecreate.miceandmystics.miceandmystics.R; import com.eyecreate.miceandmystics.miceandmystics.model.*; import com.eyecreate.miceandmystics.miceandmystics.model.Character; import com.eyecreate.miceandmystics.miceandmystics.model.Enums.CharacterNames; -import com.eyecreate.miceandmystics.miceandmystics.model.Enums.CharacterType; import com.eyecreate.miceandmystics.miceandmystics.viewholders.CampaignDetailsViewHolder; import com.eyecreate.miceandmystics.miceandmystics.viewholders.CampaignHeaderViewHolder; +import com.eyecreate.miceandmystics.miceandmystics.viewholders.PartyAchievementsHeaderViewHolder; import java.util.UUID; @@ -30,8 +30,12 @@ public class CampaignDetailsAdapter extends RecyclerView.Adapter + + + \ No newline at end of file diff --git a/MiceAndMysticsTracker/src/main/res/layout/item_partyachievements_header.xml b/MiceAndMysticsTracker/src/main/res/layout/item_partyachievements_header.xml new file mode 100644 index 0000000..fcf6d5d --- /dev/null +++ b/MiceAndMysticsTracker/src/main/res/layout/item_partyachievements_header.xml @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/MiceAndMysticsTracker/src/main/res/values/ids.xml b/MiceAndMysticsTracker/src/main/res/values/ids.xml index 7f22ad5..d11c6df 100644 --- a/MiceAndMysticsTracker/src/main/res/values/ids.xml +++ b/MiceAndMysticsTracker/src/main/res/values/ids.xml @@ -2,4 +2,6 @@ + + \ No newline at end of file -- GitLab