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 47d4dde20870bdfe6cd54ed265f1cb2121748f76..9c8d23cb513426c7d38f8da414f93e4750092ebf 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 30b3b1b41778b8777e010ebc2898c1c5fa8f2314..aefad7d23158d0d1852ba80797bf773d3b22ce96 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 0000000000000000000000000000000000000000..fcf6d5d436f964764843d85752546f5b3b62168f --- /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 7f22ad5d8baabdf2b322414959a6f4090b02ad0a..d11c6dfdb9012346613d5622db3db87f5d451938 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