diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 0000000000000000000000000000000000000000..7fb8ed00def85cd0fa9e3692d2786fc224c2273e --- /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 16d6a8133ae79df088f4df223370d1ca076dc91c..1c1e956bdf8e7a33b71a08d42a96c0892cf1432d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -23,7 +23,7 @@ - + diff --git a/MiceAndMysticsTracker/MiceAndMysticsTracker.iml b/MiceAndMysticsTracker/MiceAndMysticsTracker.iml index 64069d96de338f287f7914774cadb14aa93dc819..af25f06d111120823af36202f62cd71617ef48b3 100644 --- a/MiceAndMysticsTracker/MiceAndMysticsTracker.iml +++ b/MiceAndMysticsTracker/MiceAndMysticsTracker.iml @@ -86,6 +86,7 @@ + diff --git a/MiceAndMysticsTracker/build.gradle b/MiceAndMysticsTracker/build.gradle index 589c6b24280b23bca87e03ea1193804594fefe0b..d386bb8cc20feb7f86c0b7069baaf9cd4421b66f 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 5644878a06a496580ca6feb2564914f2a53cc1a9..2cc88f1f71368507b17cd9def28b606354d1f856 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 83ab05569cd5429b23d4e8df2b56a3c20857bb1f..8ee70aeac67e9016e98590e4f6cd272e4954f0bb 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 0000000000000000000000000000000000000000..291939611d62e5483bb7908aef3fa4bbe05bc8a0 --- /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 f6630300b226236f027339397c2fb1a09184d577..fda3460b437fe72c2d99be40eaf2c570b322e99f 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 766ab9930487aebdf634594950b22d39b44d8125..63d8da64f1c3e5094257897672510fb54339e8cd 100644 --- a/MiceAndMysticsTracker/src/main/res/values/styles.xml +++ b/MiceAndMysticsTracker/src/main/res/values/styles.xml @@ -1,8 +1,17 @@ - + +