From 586a431ab3bdf750c67a024e6439b08b0ba046a1 Mon Sep 17 00:00:00 2001 From: Kevin Whitaker Date: Sun, 3 Apr 2016 11:50:48 -0400 Subject: [PATCH] Remove temp migration and bump version for next release. Remove hard coded english text from code and put into resources. Add in official realm migrator due to old version no longer supported. --- .idea/.name | 2 +- .idea/codeStyleSettings.xml | 13 ------- .idea/gradle.xml | 5 ++- .idea/misc.xml | 27 ++++++++++++-- .idea/modules.xml | 4 +- MiceAndMysticsTracker/build.gradle | 8 ++-- .../miceandmystics/CampaignActivity.java | 12 +++--- .../CampaignDetailsActivity.java | 28 +++++++------- .../CharacterDetailsActivity.java | 16 ++++---- .../MiceAndMysticsApplication.java | 13 ++++--- .../miceandmystics/PlayerManagerActivity.java | 2 +- .../miceandmystics/RealmMigrator.java | 13 +++++++ .../adapters/CampaignDetailsAdapter.java | 2 +- .../adapters/PlayerManagerAdapter.java | 18 ++++----- .../miceandmystics/model/Ability.java | 2 + .../miceandmystics/model/Achievement.java | 2 + .../miceandmystics/model/BackpackItem.java | 2 + .../miceandmystics/model/Campaign.java | 2 + .../miceandmystics/model/Character.java | 2 + .../CampaignDetailsViewHolder.java | 6 +-- .../viewholders/CampaignViewHolder.java | 6 +-- .../CharacterAbilityViewHolder.java | 6 +-- .../viewholders/CharacterItemViewHolder.java | 6 +-- .../PartyAchievementViewHolder.java | 6 +-- .../layout/item_character_ability_header.xml | 2 +- .../layout/item_character_items_header.xml | 2 +- .../layout/item_partyachievements_header.xml | 2 +- .../src/main/res/values/strings.xml | 37 +++++++++++++++++++ build.gradle | 2 +- 29 files changed, 160 insertions(+), 88 deletions(-) delete mode 100644 .idea/codeStyleSettings.xml create mode 100644 MiceAndMysticsTracker/src/main/java/com/eyecreate/miceandmystics/miceandmystics/RealmMigrator.java diff --git a/.idea/.name b/.idea/.name index 5b9dbdd..56725f8 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -MiceandMysticsCampaignTracker \ No newline at end of file +MiceAndMysticsTracker \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 7fb8ed0..0000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 98313e8..508bc35 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,9 +3,10 @@