diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 0000000..7fb8ed0 --- /dev/null +++ b/.idea/codeStyleSettings.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 16d6a81..1c1e956 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -23,7 +23,7 @@ - + diff --git a/MiceAndMysticsTracker/MiceAndMysticsTracker.iml b/MiceAndMysticsTracker/MiceAndMysticsTracker.iml index 64069d9..af25f06 100644 --- a/MiceAndMysticsTracker/MiceAndMysticsTracker.iml +++ b/MiceAndMysticsTracker/MiceAndMysticsTracker.iml @@ -86,6 +86,7 @@ + diff --git a/MiceAndMysticsTracker/build.gradle b/MiceAndMysticsTracker/build.gradle index 589c6b2..d386bb8 100644 --- a/MiceAndMysticsTracker/build.gradle +++ b/MiceAndMysticsTracker/build.gradle @@ -40,4 +40,5 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) 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' } diff --git a/MiceAndMysticsTracker/src/main/AndroidManifest.xml b/MiceAndMysticsTracker/src/main/AndroidManifest.xml index 5644878..2cc88f1 100644 --- a/MiceAndMysticsTracker/src/main/AndroidManifest.xml +++ b/MiceAndMysticsTracker/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:name=".MiceAndMysticsApplication" android:theme="@style/AppTheme" > - - + diff --git a/MiceAndMysticsTracker/src/main/res/menu/menu_campaign.xml b/MiceAndMysticsTracker/src/main/res/menu/menu_campaign.xml index 83ab055..8ee70ae 100644 --- a/MiceAndMysticsTracker/src/main/res/menu/menu_campaign.xml +++ b/MiceAndMysticsTracker/src/main/res/menu/menu_campaign.xml @@ -2,8 +2,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" tools:context=".CampaignActivity"> - + diff --git a/MiceAndMysticsTracker/src/main/res/values/colors.xml b/MiceAndMysticsTracker/src/main/res/values/colors.xml new file mode 100644 index 0000000..2919396 --- /dev/null +++ b/MiceAndMysticsTracker/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + #940008 + #630808 + #663300 + #FBEDBE + \ No newline at end of file diff --git a/MiceAndMysticsTracker/src/main/res/values/strings.xml b/MiceAndMysticsTracker/src/main/res/values/strings.xml index f663030..fda3460 100644 --- a/MiceAndMysticsTracker/src/main/res/values/strings.xml +++ b/MiceAndMysticsTracker/src/main/res/values/strings.xml @@ -1,6 +1,4 @@ - Mice and Mystics Campaign Tracker + Mice and Mystics Tracker - Hello world! - Settings diff --git a/MiceAndMysticsTracker/src/main/res/values/styles.xml b/MiceAndMysticsTracker/src/main/res/values/styles.xml index 766ab99..63d8da6 100644 --- a/MiceAndMysticsTracker/src/main/res/values/styles.xml +++ b/MiceAndMysticsTracker/src/main/res/values/styles.xml @@ -1,8 +1,17 @@ - + +