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 aac6c20e2280fbc14109d5602e9145281dd50c17..761b5fe1a071a576dedca6a6b989450775ebff70 100644 --- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignActivity.java +++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignActivity.java @@ -22,7 +22,7 @@ public class CampaignActivity extends RecyclerViewActivity { super.onCreate(savedInstanceState); getSupportActionBar().setDisplayShowHomeEnabled(true); getSupportActionBar().setIcon(R.mipmap.ic_launcher); - getSupportActionBar().setDisplayShowTitleEnabled(false); + setTitle("Campaigns"); setLayoutManager(new LinearLayoutManager(this)); setAdapter(new CampaignAdapter()); } 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 f986c21b75e61d72a9c0f703a0b6dc011e81902f..3085bc4a7a0b2e62b2ff1074a4934165acda4070 100644 --- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java +++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/CampaignDetailsActivity.java @@ -24,7 +24,7 @@ public class CampaignDetailsActivity extends RecyclerViewActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setTitle(getIntent().getStringExtra("campaignName")); + setTitle("Game Details"); campaign = MiceAndMysticsApplication.getRealmInstance().where(Campaign.class).equalTo("campaignName",getIntent().getStringExtra("campaignName")).findFirst(); setLayoutManager(new LinearLayoutManager(this)); setAdapter(new CampaignDetailsAdapter(campaign)); diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CharacterNames.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CharacterNames.java index 2315bcb777c7674e67b3fe38c06ed82bb4801cd7..bba1bb6806270c011d9ec4e281dbcbad75e1cd97 100644 --- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CharacterNames.java +++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/model/Enums/CharacterNames.java @@ -1,19 +1,24 @@ package com.eyecreate.miceandmystics.miceandmystics.model.Enums; +import com.eyecreate.miceandmystics.miceandmystics.R; + public enum CharacterNames { - Collin(new CharacterType[]{CharacterType.Warrior,CharacterType.Leader}), - Filch(new CharacterType[]{CharacterType.Scamp}), - Lily(new CharacterType[]{CharacterType.Archer}), - Maginos(new CharacterType[]{CharacterType.Mystic,CharacterType.Maginos}), - Nez(new CharacterType[]{CharacterType.Tinkerer,CharacterType.Warrior}), - Tilda(new CharacterType[]{CharacterType.Healer}); + Collin(new CharacterType[]{CharacterType.Warrior,CharacterType.Leader}, R.mipmap.collin), + Filch(new CharacterType[]{CharacterType.Scamp},R.mipmap.filch), + Lily(new CharacterType[]{CharacterType.Archer},R.mipmap.lily), + Maginos(new CharacterType[]{CharacterType.Mystic,CharacterType.Maginos},R.mipmap.maginos), + Nez(new CharacterType[]{CharacterType.Tinkerer,CharacterType.Warrior},R.mipmap.nez), + Tilda(new CharacterType[]{CharacterType.Healer},R.mipmap.tilda); private CharacterType[] types; + private int drawableIcon; - CharacterNames(CharacterType[] types) { + CharacterNames(CharacterType[] types,int drawableIcon) { this.types = types; + this.drawableIcon = drawableIcon; } public CharacterType[] characterTypes() { return types; } + public int getDrawableRes() {return drawableIcon;} } diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignDetailsViewHolder.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignDetailsViewHolder.java index 37464eea01d59eda71a75bd3cd3ba7efbb58376a..68930bf7dcce35ed836a876162b42fa1f0d18a6b 100644 --- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignDetailsViewHolder.java +++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignDetailsViewHolder.java @@ -9,6 +9,7 @@ import android.widget.TextView; import com.eyecreate.miceandmystics.miceandmystics.R; import com.eyecreate.miceandmystics.miceandmystics.adapters.CampaignDetailsAdapter; import com.eyecreate.miceandmystics.miceandmystics.model.Character; +import com.eyecreate.miceandmystics.miceandmystics.model.Enums.CharacterNames; public class CampaignDetailsViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener,View.OnLongClickListener { @@ -31,7 +32,7 @@ public class CampaignDetailsViewHolder extends RecyclerView.ViewHolder implement boundCharacter = character; characterName.setText(character.getCharacterName()); playerName.setText(character.getControllingPlayer().getPlayerName()); - //TODO:implement character icons one in project. + characterIcon.setImageResource(CharacterNames.valueOf(character.getCharacterName()).getDrawableRes()); } @Override diff --git a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignViewHolder.java b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignViewHolder.java index 69fda61cea0409720bded4a4500700540b265121..ef74ae0e6dec992cf88156e73571ff044be9c362 100644 --- a/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignViewHolder.java +++ b/MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/viewholders/CampaignViewHolder.java @@ -10,9 +10,11 @@ import android.view.MotionEvent; import android.view.View; import android.widget.TextView; import com.echo.holographlibrary.PieGraph; +import com.echo.holographlibrary.PieSlice; import com.eyecreate.miceandmystics.miceandmystics.CampaignDetailsActivity; import com.eyecreate.miceandmystics.miceandmystics.R; import com.eyecreate.miceandmystics.miceandmystics.adapters.CampaignAdapter; +import com.eyecreate.miceandmystics.miceandmystics.model.Enums.CharacterNames; public class CampaignViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener,View.OnLongClickListener { @@ -52,6 +54,36 @@ public class CampaignViewHolder extends RecyclerView.ViewHolder implements View. public void bindModel(com.eyecreate.miceandmystics.miceandmystics.model.Campaign campaign) { campaignName.setText(campaign.getCampaignName()); + characterGraph.setInnerCircleRatio(200); + characterGraph.removeSlices(); + for(com.eyecreate.miceandmystics.miceandmystics.model.Character character:campaign.getCurrentCharacters()){ + PieSlice slice = new PieSlice(); + if(CharacterNames.valueOf(character.getCharacterName()).equals(CharacterNames.Collin)){ + slice.setColor(campaignName.getContext().getResources().getColor(R.color.collin)); + slice.setValue(1); + } else if (CharacterNames.valueOf(character.getCharacterName()).equals(CharacterNames.Filch)) { + slice.setColor(campaignName.getContext().getResources().getColor(R.color.filch)); + slice.setValue(1); + } else if (CharacterNames.valueOf(character.getCharacterName()).equals(CharacterNames.Lily)) { + slice.setColor(campaignName.getContext().getResources().getColor(R.color.lily)); + slice.setValue(1); + } else if (CharacterNames.valueOf(character.getCharacterName()).equals(CharacterNames.Maginos)) { + slice.setColor(campaignName.getContext().getResources().getColor(R.color.maginos)); + slice.setValue(1); + } else if (CharacterNames.valueOf(character.getCharacterName()).equals(CharacterNames.Nez)) { + slice.setColor(campaignName.getContext().getResources().getColor(R.color.nez)); + slice.setValue(1); + } else if (CharacterNames.valueOf(character.getCharacterName()).equals(CharacterNames.Tilda)) { + slice.setColor(campaignName.getContext().getResources().getColor(R.color.tilda)); + slice.setValue(1); + } + characterGraph.addSlice(slice); + } + if(characterGraph.getSlices().size()>1) { + characterGraph.setPadding(10); + } else { + characterGraph.setPadding(1);//seems it won't draw 1 without some sort of padding. + } } @Override diff --git a/MiceAndMysticsTracker/src/main/res/layout/dialog_new_campaign.xml b/MiceAndMysticsTracker/src/main/res/layout/dialog_new_campaign.xml index ff830bd064c9fdc71d01ca7d3b042d516b3bb368..1a2248b48f349a048d305de65784f74c2ae3039d 100644 --- a/MiceAndMysticsTracker/src/main/res/layout/dialog_new_campaign.xml +++ b/MiceAndMysticsTracker/src/main/res/layout/dialog_new_campaign.xml @@ -1,7 +1,7 @@ diff --git a/MiceAndMysticsTracker/src/main/res/layout/item_campaign_details.xml b/MiceAndMysticsTracker/src/main/res/layout/item_campaign_details.xml index d8bdab4ac4eecdedfdc68eadaff012e3e55c2abc..3a02e4260332b32c56a0bfa37e903bf9f87d8f83 100644 --- a/MiceAndMysticsTracker/src/main/res/layout/item_campaign_details.xml +++ b/MiceAndMysticsTracker/src/main/res/layout/item_campaign_details.xml @@ -16,11 +16,13 @@ diff --git a/MiceAndMysticsTracker/src/main/res/layout/simple_spinner_item.xml b/MiceAndMysticsTracker/src/main/res/layout/simple_spinner_item.xml index 34502d4725588759cd185df0c6d99b2a2d52e3d0..0904e858d2b6a8cfc4e95ca082c3008656e25e03 100644 --- a/MiceAndMysticsTracker/src/main/res/layout/simple_spinner_item.xml +++ b/MiceAndMysticsTracker/src/main/res/layout/simple_spinner_item.xml @@ -5,4 +5,5 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="marquee" + android:padding="10dp" android:textAlignment="inherit"/> \ No newline at end of file diff --git a/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/collin.png b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/collin.png new file mode 100644 index 0000000000000000000000000000000000000000..771eb2ceeddcf381c2c67ee3dd7404757e9f4fb0 Binary files /dev/null and b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/collin.png differ diff --git a/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/filch.png b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/filch.png new file mode 100644 index 0000000000000000000000000000000000000000..df533e17b8a3db0c6e0d4b363abc02ed28f731af Binary files /dev/null and b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/filch.png differ diff --git a/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/lily.png b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/lily.png new file mode 100644 index 0000000000000000000000000000000000000000..af8a51749b5d5bda404ae18f3eb7ddd336aa894d Binary files /dev/null and b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/lily.png differ diff --git a/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/maginos.png b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/maginos.png new file mode 100644 index 0000000000000000000000000000000000000000..2a2889a3b5986b5f3931496b047d1f873e42aed3 Binary files /dev/null and b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/maginos.png differ diff --git a/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/nez.png b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/nez.png new file mode 100644 index 0000000000000000000000000000000000000000..0e2d2573150180b705c41103f2386a4c300ed0f5 Binary files /dev/null and b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/nez.png differ diff --git a/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/tilda.png b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/tilda.png new file mode 100644 index 0000000000000000000000000000000000000000..50138efd4be9e6db01f954077ae5899e953fa97d Binary files /dev/null and b/MiceAndMysticsTracker/src/main/res/mipmap-xxhdpi/tilda.png differ diff --git a/MiceAndMysticsTracker/src/main/res/values/colors.xml b/MiceAndMysticsTracker/src/main/res/values/colors.xml index 291939611d62e5483bb7908aef3fa4bbe05bc8a0..f9a6eb6a0d9718f40afd3e9ac13a35794bfd57e4 100644 --- a/MiceAndMysticsTracker/src/main/res/values/colors.xml +++ b/MiceAndMysticsTracker/src/main/res/values/colors.xml @@ -4,4 +4,12 @@ #630808 #663300 #FBEDBE + + + #C00000 + #008000 + #FF8000 + #585858 + #500280 + #C0AA00 \ No newline at end of file