diff --git a/.gitignore b/.gitignore index 80f87efef..6534cc36a 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ Habitica/res/values/secret_strings.xml habitica.properties habitica.resources Habitica/google-services.json +reports/ diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 0a3245e88..bd87e8a71 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,8 +2,8 @@ diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 369f3f083..6d3c1b133 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -14,7 +14,6 @@ buildscript { dependencies { classpath 'io.fabric.tools:gradle:1.21.5' classpath 'me.tatarka:gradle-retrolambda:3.3.1' - classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath('com.noveogroup.android:check:1.2.3') { exclude module: 'checkstyle' @@ -46,11 +45,11 @@ dependencies { compile 'com.squareup.okhttp3:okhttp:3.6.0' compile 'com.squareup.okhttp3:logging-interceptor:3.6.0' //REST API handling - compile('com.squareup.retrofit2:retrofit:2.1.0') { + compile('com.squareup.retrofit2:retrofit:2.2.0') { exclude module: 'okhttp' } - compile 'com.squareup.retrofit2:converter-gson:2.1.0' - compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0' + compile 'com.squareup.retrofit2:converter-gson:2.2.0' + compile 'com.squareup.retrofit2:adapter-rxjava:2.2.0' //Crash Logging releaseCompile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') { @@ -69,10 +68,10 @@ dependencies { compile('com.mikepenz:materialdrawer:5.3.6@aar') { transitive = true } - compile 'com.android.support:appcompat-v7:25.1.1' - compile 'com.android.support:design:25.1.1' - compile 'com.android.support:recyclerview-v7:25.1.1' - compile 'com.android.support:preference-v14:25.1.1' + compile 'com.android.support:appcompat-v7:25.3.0' + compile 'com.android.support:design:25.3.0' + compile 'com.android.support:recyclerview-v7:25.3.0' + compile 'com.android.support:preference-v14:25.3.0' compile 'com.android.support:multidex:1.0.1' //QR Code @@ -110,6 +109,9 @@ dependencies { compile 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar' + // lodash/underscore + compile 'com.github.javadev:underscore:1.23' + //RxJava compile 'io.reactivex:rxandroid:1.2.1' compile 'io.reactivex:rxjava:1.2.0' @@ -138,10 +140,10 @@ dependencies { releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' //Push Notifications - compile 'com.google.firebase:firebase-core:10.0.1' - compile 'com.google.firebase:firebase-messaging:10.0.1' + compile 'com.google.firebase:firebase-core:10.2.0' + compile 'com.google.firebase:firebase-messaging:10.2.0' - compile 'com.google.android.gms:play-services-auth:10.0.1' + compile 'com.google.android.gms:play-services-auth:10.2.0' compile 'org.apmem.tools:layouts:1.10@aar' @@ -153,7 +155,7 @@ dependencies { android { compileSdkVersion 25 - buildToolsVersion '25.0.0' + buildToolsVersion "25.0.2" defaultConfig { applicationId "com.habitrpg.android.habitica" @@ -174,6 +176,7 @@ android { multiDexEnabled true // Disable fabric build ID generation for debug builds ext.enableCrashlytics = false + ext.alwaysUpdateBuildId = false resValue "string", "content_provider", "com.habitrpg.android.habitica.debug.fileprovider" resValue "string", "app_name", "Habitica Debug" } @@ -186,6 +189,15 @@ android { } } + productFlavors { + dev { + minSdkVersion 21 + } + + prod { + } + } + sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -212,7 +224,7 @@ android { dexOptions { preDexLibraries false - javaMaxHeapSize "4g" // Use gig increments depending on needs + javaMaxHeapSize "6g" // Use gig increments depending on needs } lintOptions { @@ -287,7 +299,6 @@ tasks.whenTaskAdded { task -> check { findbugs { skip true } } -apply plugin: 'com.getkeepsafe.dexcount' apply plugin: 'com.android.application' //or apply plugin: 'java' apply plugin: 'me.tatarka.retrolambda' apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/Habitica/res/anim/activity_fade_in.xml b/Habitica/res/anim/activity_fade_in.xml new file mode 100644 index 000000000..3aef1229e --- /dev/null +++ b/Habitica/res/anim/activity_fade_in.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/Habitica/res/anim/activity_fade_out.xml b/Habitica/res/anim/activity_fade_out.xml new file mode 100644 index 000000000..feaf17baa --- /dev/null +++ b/Habitica/res/anim/activity_fade_out.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/Habitica/res/drawable-hdpi/back_arrow_disabled.png b/Habitica/res/drawable-hdpi/back_arrow_disabled.png new file mode 100644 index 000000000..6c91d2bbb Binary files /dev/null and b/Habitica/res/drawable-hdpi/back_arrow_disabled.png differ diff --git a/Habitica/res/drawable-hdpi/back_arrow_enabled.png b/Habitica/res/drawable-hdpi/back_arrow_enabled.png new file mode 100644 index 000000000..2566cd2e6 Binary files /dev/null and b/Habitica/res/drawable-hdpi/back_arrow_enabled.png differ diff --git a/Habitica/res/drawable-hdpi/cloud_1.png b/Habitica/res/drawable-hdpi/cloud_1.png new file mode 100644 index 000000000..2482c6995 Binary files /dev/null and b/Habitica/res/drawable-hdpi/cloud_1.png differ diff --git a/Habitica/res/drawable-hdpi/cloud_2.png b/Habitica/res/drawable-hdpi/cloud_2.png new file mode 100644 index 000000000..e2a19d2cc Binary files /dev/null and b/Habitica/res/drawable-hdpi/cloud_2.png differ diff --git a/Habitica/res/drawable-hdpi/creator_blank_face.png b/Habitica/res/drawable-hdpi/creator_blank_face.png new file mode 100644 index 000000000..a4fdf0a86 Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_blank_face.png differ diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_black.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_black.png new file mode 100644 index 000000000..769bd0a72 Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_black.png differ diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_blue.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_blue.png new file mode 100644 index 000000000..b1341fb0a Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_blue.png differ diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_green.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_green.png new file mode 100644 index 000000000..90da0c03d Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_green.png differ diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_pink.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_pink.png new file mode 100644 index 000000000..3addee53e Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_pink.png differ diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_white.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_white.png new file mode 100644 index 000000000..a76a41ebe Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_white.png differ diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_yellow.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_yellow.png new file mode 100644 index 000000000..4d437cd43 Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_yellow.png differ diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_black.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_black.png new file mode 100644 index 000000000..054beda0b Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_black.png differ diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_blond.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_blond.png new file mode 100644 index 000000000..61d29de1f Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_blond.png differ diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_brown.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_brown.png new file mode 100644 index 000000000..65f0b1147 Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_brown.png differ diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_red.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_red.png new file mode 100644 index 000000000..1dc0fc4ce Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_red.png differ diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_white.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_white.png new file mode 100644 index 000000000..cf36c0f9b Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_white.png differ diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_red.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_red.png new file mode 100644 index 000000000..fbb3cb955 Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_red.png differ diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_3_red.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_red.png new file mode 100644 index 000000000..c3facca91 Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_red.png differ diff --git a/Habitica/res/drawable-hdpi/creator_hills_bg.png b/Habitica/res/drawable-hdpi/creator_hills_bg.png new file mode 100644 index 000000000..922d5a0ee Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hills_bg.png differ diff --git a/Habitica/res/drawable-hdpi/creator_purple_bg.png b/Habitica/res/drawable-hdpi/creator_purple_bg.png new file mode 100644 index 000000000..b7d6e9fba Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_purple_bg.png differ diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_black.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_black.png new file mode 100644 index 000000000..13b104eaa Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_black.png differ diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_blue.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_blue.png new file mode 100644 index 000000000..7eba31aca Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_blue.png differ diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_green.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_green.png new file mode 100644 index 000000000..3e26538ab Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_green.png differ diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_pink.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_pink.png new file mode 100644 index 000000000..86390c0fa Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_pink.png differ diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_white.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_white.png new file mode 100644 index 000000000..18fd2404b Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_white.png differ diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_yellow.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_yellow.png new file mode 100644 index 000000000..a2b1d465f Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_yellow.png differ diff --git a/Habitica/res/drawable-hdpi/facebook_icon.png b/Habitica/res/drawable-hdpi/facebook_icon.png new file mode 100644 index 000000000..ea19ad9c0 Binary files /dev/null and b/Habitica/res/drawable-hdpi/facebook_icon.png differ diff --git a/Habitica/res/drawable-hdpi/forward_arrow_enabled.png b/Habitica/res/drawable-hdpi/forward_arrow_enabled.png new file mode 100644 index 000000000..b8c758525 Binary files /dev/null and b/Habitica/res/drawable-hdpi/forward_arrow_enabled.png differ diff --git a/Habitica/res/drawable-hdpi/google_icon.png b/Habitica/res/drawable-hdpi/google_icon.png new file mode 100644 index 000000000..0e3b3edd3 Binary files /dev/null and b/Habitica/res/drawable-hdpi/google_icon.png differ diff --git a/Habitica/res/drawable-hdpi/ic_action_launch.png b/Habitica/res/drawable-hdpi/ic_action_launch.png deleted file mode 100644 index 2982f6845..000000000 Binary files a/Habitica/res/drawable-hdpi/ic_action_launch.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/ic_action_twitter.png b/Habitica/res/drawable-hdpi/ic_action_twitter.png deleted file mode 100644 index ad420ce51..000000000 Binary files a/Habitica/res/drawable-hdpi/ic_action_twitter.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/ic_arrow_drop_down_80000000_24dp.png b/Habitica/res/drawable-hdpi/ic_arrow_drop_down_80000000_24dp.png new file mode 100644 index 000000000..6c5cc3661 Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_arrow_drop_down_80000000_24dp.png differ diff --git a/Habitica/res/drawable-hdpi/icon_body.png b/Habitica/res/drawable-hdpi/icon_body.png new file mode 100644 index 000000000..3d232abd3 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_body.png differ diff --git a/Habitica/res/drawable-hdpi/icon_extras.png b/Habitica/res/drawable-hdpi/icon_extras.png new file mode 100644 index 000000000..10a3183e6 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_extras.png differ diff --git a/Habitica/res/drawable-hdpi/icon_hair.png b/Habitica/res/drawable-hdpi/icon_hair.png new file mode 100644 index 000000000..0ba99efa9 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_hair.png differ diff --git a/Habitica/res/drawable-hdpi/icon_skin.png b/Habitica/res/drawable-hdpi/icon_skin.png new file mode 100644 index 000000000..350b486b4 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_skin.png differ diff --git a/Habitica/res/drawable-hdpi/indicator_diamond_selected.png b/Habitica/res/drawable-hdpi/indicator_diamond_selected.png new file mode 100644 index 000000000..de593c2db Binary files /dev/null and b/Habitica/res/drawable-hdpi/indicator_diamond_selected.png differ diff --git a/Habitica/res/drawable-hdpi/indicator_diamond_unselected.png b/Habitica/res/drawable-hdpi/indicator_diamond_unselected.png new file mode 100644 index 000000000..b8f6091bc Binary files /dev/null and b/Habitica/res/drawable-hdpi/indicator_diamond_unselected.png differ diff --git a/Habitica/res/drawable-hdpi/intro_1.png b/Habitica/res/drawable-hdpi/intro_1.png new file mode 100644 index 000000000..bcc63dea9 Binary files /dev/null and b/Habitica/res/drawable-hdpi/intro_1.png differ diff --git a/Habitica/res/drawable-hdpi/intro_1_title.png b/Habitica/res/drawable-hdpi/intro_1_title.png new file mode 100644 index 000000000..ab7aa4081 Binary files /dev/null and b/Habitica/res/drawable-hdpi/intro_1_title.png differ diff --git a/Habitica/res/drawable-hdpi/intro_2.png b/Habitica/res/drawable-hdpi/intro_2.png index 13eda543e..9f4044d95 100644 Binary files a/Habitica/res/drawable-hdpi/intro_2.png and b/Habitica/res/drawable-hdpi/intro_2.png differ diff --git a/Habitica/res/drawable-hdpi/intro_3.png b/Habitica/res/drawable-hdpi/intro_3.png new file mode 100644 index 000000000..294ff0d1a Binary files /dev/null and b/Habitica/res/drawable-hdpi/intro_3.png differ diff --git a/Habitica/res/drawable-hdpi/login_background.png b/Habitica/res/drawable-hdpi/login_background.png new file mode 100644 index 000000000..8f9ec6870 Binary files /dev/null and b/Habitica/res/drawable-hdpi/login_background.png differ diff --git a/Habitica/res/drawable-hdpi/login_begin_button.png b/Habitica/res/drawable-hdpi/login_begin_button.png new file mode 100644 index 000000000..f36791f79 Binary files /dev/null and b/Habitica/res/drawable-hdpi/login_begin_button.png differ diff --git a/Habitica/res/drawable-hdpi/login_button.9.png b/Habitica/res/drawable-hdpi/login_button.9.png new file mode 100644 index 000000000..9efee4b07 Binary files /dev/null and b/Habitica/res/drawable-hdpi/login_button.9.png differ diff --git a/Habitica/res/drawable-hdpi/login_logo.png b/Habitica/res/drawable-hdpi/login_logo.png new file mode 100644 index 000000000..68983c0b1 Binary files /dev/null and b/Habitica/res/drawable-hdpi/login_logo.png differ diff --git a/Habitica/res/drawable-hdpi/name_plate.9.png b/Habitica/res/drawable-hdpi/name_plate.9.png new file mode 100644 index 000000000..6af978ddd Binary files /dev/null and b/Habitica/res/drawable-hdpi/name_plate.9.png differ diff --git a/Habitica/res/drawable-hdpi/star_large.png b/Habitica/res/drawable-hdpi/star_large.png new file mode 100644 index 000000000..683246410 Binary files /dev/null and b/Habitica/res/drawable-hdpi/star_large.png differ diff --git a/Habitica/res/drawable-hdpi/star_medium.png b/Habitica/res/drawable-hdpi/star_medium.png new file mode 100644 index 000000000..cd5ecb076 Binary files /dev/null and b/Habitica/res/drawable-hdpi/star_medium.png differ diff --git a/Habitica/res/drawable-hdpi/star_small.png b/Habitica/res/drawable-hdpi/star_small.png new file mode 100644 index 000000000..83dabb711 Binary files /dev/null and b/Habitica/res/drawable-hdpi/star_small.png differ diff --git a/Habitica/res/drawable-hdpi/welcome_diamond_background.png b/Habitica/res/drawable-hdpi/welcome_diamond_background.png new file mode 100644 index 000000000..7b97f4740 Binary files /dev/null and b/Habitica/res/drawable-hdpi/welcome_diamond_background.png differ diff --git a/Habitica/res/drawable-mdpi/back_arrow_disabled.png b/Habitica/res/drawable-mdpi/back_arrow_disabled.png new file mode 100644 index 000000000..20dba418b Binary files /dev/null and b/Habitica/res/drawable-mdpi/back_arrow_disabled.png differ diff --git a/Habitica/res/drawable-mdpi/back_arrow_enabled.png b/Habitica/res/drawable-mdpi/back_arrow_enabled.png new file mode 100644 index 000000000..9155c3aa4 Binary files /dev/null and b/Habitica/res/drawable-mdpi/back_arrow_enabled.png differ diff --git a/Habitica/res/drawable-mdpi/cloud_1.png b/Habitica/res/drawable-mdpi/cloud_1.png new file mode 100644 index 000000000..e2c799e25 Binary files /dev/null and b/Habitica/res/drawable-mdpi/cloud_1.png differ diff --git a/Habitica/res/drawable-mdpi/cloud_2.png b/Habitica/res/drawable-mdpi/cloud_2.png new file mode 100644 index 000000000..0e212cbf2 Binary files /dev/null and b/Habitica/res/drawable-mdpi/cloud_2.png differ diff --git a/Habitica/res/drawable-mdpi/creator_blank_face.png b/Habitica/res/drawable-mdpi/creator_blank_face.png new file mode 100644 index 000000000..815aa579b Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_blank_face.png differ diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_black.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_black.png new file mode 100644 index 000000000..049797f01 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_black.png differ diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_blue.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_blue.png new file mode 100644 index 000000000..e404f6c18 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_blue.png differ diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_green.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_green.png new file mode 100644 index 000000000..db35d5ba7 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_green.png differ diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_pink.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_pink.png new file mode 100644 index 000000000..b1a6f1fa4 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_pink.png differ diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_white.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_white.png new file mode 100644 index 000000000..07d12340e Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_white.png differ diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_yellow.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_yellow.png new file mode 100644 index 000000000..4ee24c93a Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_yellow.png differ diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_black.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_black.png new file mode 100644 index 000000000..6b3a04c54 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_black.png differ diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_blond.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_blond.png new file mode 100644 index 000000000..a5b42fc5b Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_blond.png differ diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_brown.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_brown.png new file mode 100644 index 000000000..941a00326 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_brown.png differ diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_red.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_red.png new file mode 100644 index 000000000..9170447fb Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_red.png differ diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_white.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_white.png new file mode 100644 index 000000000..c494998a5 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_white.png differ diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_2_black.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_black.png new file mode 100644 index 000000000..d4df96fa0 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_black.png differ diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_2_red.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_red.png new file mode 100644 index 000000000..14cc35d85 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_red.png differ diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_3_red.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_red.png new file mode 100644 index 000000000..4b8c87eba Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_red.png differ diff --git a/Habitica/res/drawable-mdpi/creator_hills_bg.png b/Habitica/res/drawable-mdpi/creator_hills_bg.png new file mode 100644 index 000000000..49d16f4c1 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hills_bg.png differ diff --git a/Habitica/res/drawable-mdpi/creator_purple_bg.png b/Habitica/res/drawable-mdpi/creator_purple_bg.png new file mode 100644 index 000000000..edb1e64b9 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_purple_bg.png differ diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_black.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_black.png new file mode 100644 index 000000000..7265f0523 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_black.png differ diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_blue.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_blue.png new file mode 100644 index 000000000..97d616f52 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_blue.png differ diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_green.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_green.png new file mode 100644 index 000000000..75cefc908 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_green.png differ diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_pink.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_pink.png new file mode 100644 index 000000000..72600a033 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_pink.png differ diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_white.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_white.png new file mode 100644 index 000000000..f6a4c9f69 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_white.png differ diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_yellow.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_yellow.png new file mode 100644 index 000000000..b3b5ff145 Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_yellow.png differ diff --git a/Habitica/res/drawable-mdpi/facebook_icon.png b/Habitica/res/drawable-mdpi/facebook_icon.png new file mode 100644 index 000000000..4138b273d Binary files /dev/null and b/Habitica/res/drawable-mdpi/facebook_icon.png differ diff --git a/Habitica/res/drawable-mdpi/forward_arrow_enabled.png b/Habitica/res/drawable-mdpi/forward_arrow_enabled.png new file mode 100644 index 000000000..587d25c99 Binary files /dev/null and b/Habitica/res/drawable-mdpi/forward_arrow_enabled.png differ diff --git a/Habitica/res/drawable-mdpi/google_icon.png b/Habitica/res/drawable-mdpi/google_icon.png new file mode 100644 index 000000000..74b3bfee9 Binary files /dev/null and b/Habitica/res/drawable-mdpi/google_icon.png differ diff --git a/Habitica/res/drawable-mdpi/ic_action_launch.png b/Habitica/res/drawable-mdpi/ic_action_launch.png deleted file mode 100644 index 84612f7cc..000000000 Binary files a/Habitica/res/drawable-mdpi/ic_action_launch.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ic_action_twitter.png b/Habitica/res/drawable-mdpi/ic_action_twitter.png deleted file mode 100644 index c58461b73..000000000 Binary files a/Habitica/res/drawable-mdpi/ic_action_twitter.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ic_arrow_drop_down_80000000_24dp.png b/Habitica/res/drawable-mdpi/ic_arrow_drop_down_80000000_24dp.png new file mode 100644 index 000000000..94028d1a3 Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_arrow_drop_down_80000000_24dp.png differ diff --git a/Habitica/res/drawable-mdpi/icon_body.png b/Habitica/res/drawable-mdpi/icon_body.png new file mode 100644 index 000000000..80e7f3bc8 Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_body.png differ diff --git a/Habitica/res/drawable-mdpi/icon_extras.png b/Habitica/res/drawable-mdpi/icon_extras.png new file mode 100644 index 000000000..e896c03ec Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_extras.png differ diff --git a/Habitica/res/drawable-mdpi/icon_hair.png b/Habitica/res/drawable-mdpi/icon_hair.png new file mode 100644 index 000000000..81e3951a1 Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_hair.png differ diff --git a/Habitica/res/drawable-mdpi/icon_skin.png b/Habitica/res/drawable-mdpi/icon_skin.png new file mode 100644 index 000000000..c006648bf Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_skin.png differ diff --git a/Habitica/res/drawable-mdpi/indicator_diamond_selected.png b/Habitica/res/drawable-mdpi/indicator_diamond_selected.png new file mode 100644 index 000000000..3e2f94adb Binary files /dev/null and b/Habitica/res/drawable-mdpi/indicator_diamond_selected.png differ diff --git a/Habitica/res/drawable-mdpi/indicator_diamond_unselected.png b/Habitica/res/drawable-mdpi/indicator_diamond_unselected.png new file mode 100644 index 000000000..0a74a26e9 Binary files /dev/null and b/Habitica/res/drawable-mdpi/indicator_diamond_unselected.png differ diff --git a/Habitica/res/drawable-mdpi/intro_1.png b/Habitica/res/drawable-mdpi/intro_1.png new file mode 100644 index 000000000..0b2f92e54 Binary files /dev/null and b/Habitica/res/drawable-mdpi/intro_1.png differ diff --git a/Habitica/res/drawable-mdpi/intro_1_title.png b/Habitica/res/drawable-mdpi/intro_1_title.png new file mode 100644 index 000000000..da5f1adff Binary files /dev/null and b/Habitica/res/drawable-mdpi/intro_1_title.png differ diff --git a/Habitica/res/drawable-mdpi/intro_2.png b/Habitica/res/drawable-mdpi/intro_2.png index c3afa745e..4f2c18084 100644 Binary files a/Habitica/res/drawable-mdpi/intro_2.png and b/Habitica/res/drawable-mdpi/intro_2.png differ diff --git a/Habitica/res/drawable-mdpi/intro_3.png b/Habitica/res/drawable-mdpi/intro_3.png new file mode 100644 index 000000000..e51086102 Binary files /dev/null and b/Habitica/res/drawable-mdpi/intro_3.png differ diff --git a/Habitica/res/drawable-mdpi/login_background.png b/Habitica/res/drawable-mdpi/login_background.png new file mode 100644 index 000000000..dcc6047da Binary files /dev/null and b/Habitica/res/drawable-mdpi/login_background.png differ diff --git a/Habitica/res/drawable-mdpi/login_begin_button.png b/Habitica/res/drawable-mdpi/login_begin_button.png new file mode 100644 index 000000000..c7c15086e Binary files /dev/null and b/Habitica/res/drawable-mdpi/login_begin_button.png differ diff --git a/Habitica/res/drawable-mdpi/login_button.9.png b/Habitica/res/drawable-mdpi/login_button.9.png new file mode 100644 index 000000000..eea8b6eb5 Binary files /dev/null and b/Habitica/res/drawable-mdpi/login_button.9.png differ diff --git a/Habitica/res/drawable-mdpi/login_logo.png b/Habitica/res/drawable-mdpi/login_logo.png new file mode 100644 index 000000000..80a71274b Binary files /dev/null and b/Habitica/res/drawable-mdpi/login_logo.png differ diff --git a/Habitica/res/drawable-mdpi/name_plate.9.png b/Habitica/res/drawable-mdpi/name_plate.9.png new file mode 100644 index 000000000..3285b4a3e Binary files /dev/null and b/Habitica/res/drawable-mdpi/name_plate.9.png differ diff --git a/Habitica/res/drawable-mdpi/star_large.png b/Habitica/res/drawable-mdpi/star_large.png new file mode 100644 index 000000000..8b729833c Binary files /dev/null and b/Habitica/res/drawable-mdpi/star_large.png differ diff --git a/Habitica/res/drawable-mdpi/star_medium.png b/Habitica/res/drawable-mdpi/star_medium.png new file mode 100644 index 000000000..d9121577a Binary files /dev/null and b/Habitica/res/drawable-mdpi/star_medium.png differ diff --git a/Habitica/res/drawable-mdpi/star_small.png b/Habitica/res/drawable-mdpi/star_small.png new file mode 100644 index 000000000..e3bc9e1ff Binary files /dev/null and b/Habitica/res/drawable-mdpi/star_small.png differ diff --git a/Habitica/res/drawable-mdpi/welcome_diamond_background.png b/Habitica/res/drawable-mdpi/welcome_diamond_background.png new file mode 100644 index 000000000..e34db79a2 Binary files /dev/null and b/Habitica/res/drawable-mdpi/welcome_diamond_background.png differ diff --git a/Habitica/res/drawable-xhdpi/back_arrow_disabled.png b/Habitica/res/drawable-xhdpi/back_arrow_disabled.png new file mode 100644 index 000000000..d58cfb160 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/back_arrow_disabled.png differ diff --git a/Habitica/res/drawable-xhdpi/back_arrow_enabled.png b/Habitica/res/drawable-xhdpi/back_arrow_enabled.png new file mode 100644 index 000000000..9648c24b7 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/back_arrow_enabled.png differ diff --git a/Habitica/res/drawable-xhdpi/cloud_1.png b/Habitica/res/drawable-xhdpi/cloud_1.png new file mode 100644 index 000000000..1adabf4c5 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/cloud_1.png differ diff --git a/Habitica/res/drawable-xhdpi/cloud_2.png b/Habitica/res/drawable-xhdpi/cloud_2.png new file mode 100644 index 000000000..6fcd2f18a Binary files /dev/null and b/Habitica/res/drawable-xhdpi/cloud_2.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_blank_face.png b/Habitica/res/drawable-xhdpi/creator_blank_face.png new file mode 100644 index 000000000..7f832c145 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_blank_face.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_black.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_black.png new file mode 100644 index 000000000..63991308d Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_black.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_blue.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_blue.png new file mode 100644 index 000000000..bfa5681bc Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_blue.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_green.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_green.png new file mode 100644 index 000000000..cd0bee006 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_green.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_pink.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_pink.png new file mode 100644 index 000000000..88d99f9f4 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_pink.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_white.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_white.png new file mode 100644 index 000000000..9a32f77a1 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_white.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_yellow.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_yellow.png new file mode 100644 index 000000000..ab0799f44 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_yellow.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_black.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_black.png new file mode 100644 index 000000000..3a3233653 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_black.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_blond.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_blond.png new file mode 100644 index 000000000..9bb59b517 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_blond.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_brown.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_brown.png new file mode 100644 index 000000000..f0db35150 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_brown.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_red.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_red.png new file mode 100644 index 000000000..ef54b64c5 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_red.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_white.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_white.png new file mode 100644 index 000000000..afad8e9c0 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_white.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_red.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_red.png new file mode 100644 index 000000000..489eb3b72 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_red.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_red.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_red.png new file mode 100644 index 000000000..4a386d1a8 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_red.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_hills_bg.png b/Habitica/res/drawable-xhdpi/creator_hills_bg.png new file mode 100644 index 000000000..2c9bf1dd2 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hills_bg.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_purple_bg.png b/Habitica/res/drawable-xhdpi/creator_purple_bg.png new file mode 100644 index 000000000..64cc695e9 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_purple_bg.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_black.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_black.png new file mode 100644 index 000000000..3cafb41cf Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_black.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_blue.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_blue.png new file mode 100644 index 000000000..308676dfb Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_blue.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_green.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_green.png new file mode 100644 index 000000000..a7b608916 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_green.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_pink.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_pink.png new file mode 100644 index 000000000..87d3ff053 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_pink.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_white.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_white.png new file mode 100644 index 000000000..96a2577f2 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_white.png differ diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_yellow.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_yellow.png new file mode 100644 index 000000000..2b87c1564 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_yellow.png differ diff --git a/Habitica/res/drawable-xhdpi/facebook_icon.png b/Habitica/res/drawable-xhdpi/facebook_icon.png new file mode 100644 index 000000000..4b8bbc60d Binary files /dev/null and b/Habitica/res/drawable-xhdpi/facebook_icon.png differ diff --git a/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png new file mode 100644 index 000000000..bb333b164 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png differ diff --git a/Habitica/res/drawable-xhdpi/google_icon.png b/Habitica/res/drawable-xhdpi/google_icon.png new file mode 100644 index 000000000..ea9ec3839 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/google_icon.png differ diff --git a/Habitica/res/drawable-xhdpi/ic_action_launch.png b/Habitica/res/drawable-xhdpi/ic_action_launch.png deleted file mode 100644 index 724566426..000000000 Binary files a/Habitica/res/drawable-xhdpi/ic_action_launch.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/ic_action_twitter.png b/Habitica/res/drawable-xhdpi/ic_action_twitter.png deleted file mode 100644 index 592568b72..000000000 Binary files a/Habitica/res/drawable-xhdpi/ic_action_twitter.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/ic_arrow_drop_down_80000000_24dp.png b/Habitica/res/drawable-xhdpi/ic_arrow_drop_down_80000000_24dp.png new file mode 100644 index 000000000..903aaed0c Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_arrow_drop_down_80000000_24dp.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_body.png b/Habitica/res/drawable-xhdpi/icon_body.png new file mode 100644 index 000000000..d50f8367a Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_body.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_extras.png b/Habitica/res/drawable-xhdpi/icon_extras.png new file mode 100644 index 000000000..b74fb2011 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_extras.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_hair.png b/Habitica/res/drawable-xhdpi/icon_hair.png new file mode 100644 index 000000000..ee9e5a803 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_hair.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_skin.png b/Habitica/res/drawable-xhdpi/icon_skin.png new file mode 100644 index 000000000..ef265b050 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_skin.png differ diff --git a/Habitica/res/drawable-xhdpi/indicator_diamond_selected.png b/Habitica/res/drawable-xhdpi/indicator_diamond_selected.png new file mode 100644 index 000000000..20793c15d Binary files /dev/null and b/Habitica/res/drawable-xhdpi/indicator_diamond_selected.png differ diff --git a/Habitica/res/drawable-xhdpi/indicator_diamond_unselected.png b/Habitica/res/drawable-xhdpi/indicator_diamond_unselected.png new file mode 100644 index 000000000..46b54de30 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/indicator_diamond_unselected.png differ diff --git a/Habitica/res/drawable-xhdpi/intro_1.png b/Habitica/res/drawable-xhdpi/intro_1.png new file mode 100644 index 000000000..0883f9ac9 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/intro_1.png differ diff --git a/Habitica/res/drawable-xhdpi/intro_1_title.png b/Habitica/res/drawable-xhdpi/intro_1_title.png new file mode 100644 index 000000000..e243be225 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/intro_1_title.png differ diff --git a/Habitica/res/drawable-xhdpi/intro_2.png b/Habitica/res/drawable-xhdpi/intro_2.png index a499d3ef2..67db38364 100644 Binary files a/Habitica/res/drawable-xhdpi/intro_2.png and b/Habitica/res/drawable-xhdpi/intro_2.png differ diff --git a/Habitica/res/drawable-xhdpi/intro_3.png b/Habitica/res/drawable-xhdpi/intro_3.png new file mode 100644 index 000000000..738d224f2 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/intro_3.png differ diff --git a/Habitica/res/drawable-xhdpi/login_background.png b/Habitica/res/drawable-xhdpi/login_background.png new file mode 100644 index 000000000..f8daf89a4 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/login_background.png differ diff --git a/Habitica/res/drawable-xhdpi/login_begin_button.png b/Habitica/res/drawable-xhdpi/login_begin_button.png new file mode 100644 index 000000000..b4b9afe3d Binary files /dev/null and b/Habitica/res/drawable-xhdpi/login_begin_button.png differ diff --git a/Habitica/res/drawable-xhdpi/login_button.9.png b/Habitica/res/drawable-xhdpi/login_button.9.png new file mode 100644 index 000000000..1009b8d70 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/login_button.9.png differ diff --git a/Habitica/res/drawable-xhdpi/login_logo.png b/Habitica/res/drawable-xhdpi/login_logo.png new file mode 100644 index 000000000..eb6b17603 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/login_logo.png differ diff --git a/Habitica/res/drawable-xhdpi/name_plate.9.png b/Habitica/res/drawable-xhdpi/name_plate.9.png new file mode 100644 index 000000000..becb0127c Binary files /dev/null and b/Habitica/res/drawable-xhdpi/name_plate.9.png differ diff --git a/Habitica/res/drawable-xhdpi/star_large.png b/Habitica/res/drawable-xhdpi/star_large.png new file mode 100644 index 000000000..203a6b311 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/star_large.png differ diff --git a/Habitica/res/drawable-xhdpi/star_medium.png b/Habitica/res/drawable-xhdpi/star_medium.png new file mode 100644 index 000000000..29c75b610 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/star_medium.png differ diff --git a/Habitica/res/drawable-xhdpi/star_small.png b/Habitica/res/drawable-xhdpi/star_small.png new file mode 100644 index 000000000..424643e9d Binary files /dev/null and b/Habitica/res/drawable-xhdpi/star_small.png differ diff --git a/Habitica/res/drawable-xhdpi/welcome_diamond_background.png b/Habitica/res/drawable-xhdpi/welcome_diamond_background.png new file mode 100644 index 000000000..fd40583b9 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/welcome_diamond_background.png differ diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png new file mode 100644 index 000000000..6639e24ed Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png differ diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png new file mode 100644 index 000000000..1ea24a005 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png differ diff --git a/Habitica/res/drawable-xxhdpi/cloud_1.png b/Habitica/res/drawable-xxhdpi/cloud_1.png new file mode 100644 index 000000000..e334c920b Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/cloud_1.png differ diff --git a/Habitica/res/drawable-xxhdpi/cloud_2.png b/Habitica/res/drawable-xxhdpi/cloud_2.png new file mode 100644 index 000000000..ee67b96b6 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/cloud_2.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_blank_face.png b/Habitica/res/drawable-xxhdpi/creator_blank_face.png new file mode 100644 index 000000000..119cfc9cc Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_blank_face.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_black.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_black.png new file mode 100644 index 000000000..b09633df9 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_black.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_blue.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_blue.png new file mode 100644 index 000000000..03b7af107 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_blue.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_green.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_green.png new file mode 100644 index 000000000..a44d51b23 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_green.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_pink.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_pink.png new file mode 100644 index 000000000..c3ae30623 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_pink.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_white.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_white.png new file mode 100644 index 000000000..a532178b5 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_white.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_yellow.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_yellow.png new file mode 100644 index 000000000..e8121c9c3 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_yellow.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_black.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_black.png new file mode 100644 index 000000000..f66ec2409 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_black.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_blond.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_blond.png new file mode 100644 index 000000000..c4af7be17 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_blond.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_brown.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_brown.png new file mode 100644 index 000000000..84db7727e Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_brown.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_red.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_red.png new file mode 100644 index 000000000..60608365e Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_red.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_white.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_white.png new file mode 100644 index 000000000..9382cd9b2 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_white.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_red.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_red.png new file mode 100644 index 000000000..627e0b11a Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_red.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_red.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_red.png new file mode 100644 index 000000000..fb89cffb2 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_red.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_hills_bg.png b/Habitica/res/drawable-xxhdpi/creator_hills_bg.png new file mode 100644 index 000000000..84dac7828 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hills_bg.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_purple_bg.png b/Habitica/res/drawable-xxhdpi/creator_purple_bg.png new file mode 100644 index 000000000..51d998d22 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_purple_bg.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_black.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_black.png new file mode 100644 index 000000000..e5c3909f1 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_black.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_blue.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_blue.png new file mode 100644 index 000000000..63b585dda Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_blue.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_green.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_green.png new file mode 100644 index 000000000..ab68d8e0f Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_green.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_pink.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_pink.png new file mode 100644 index 000000000..14a83a3f4 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_pink.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_white.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_white.png new file mode 100644 index 000000000..ee33c19c5 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_white.png differ diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_yellow.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_yellow.png new file mode 100644 index 000000000..aa10fe0a0 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_yellow.png differ diff --git a/Habitica/res/drawable-xxhdpi/facebook_icon.png b/Habitica/res/drawable-xxhdpi/facebook_icon.png new file mode 100644 index 000000000..a5be3c8f3 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/facebook_icon.png differ diff --git a/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png new file mode 100644 index 000000000..fb48245b3 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png differ diff --git a/Habitica/res/drawable-xxhdpi/google_icon.png b/Habitica/res/drawable-xxhdpi/google_icon.png new file mode 100644 index 000000000..5e9e1cf00 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/google_icon.png differ diff --git a/Habitica/res/drawable-xxhdpi/ic_action_launch.png b/Habitica/res/drawable-xxhdpi/ic_action_launch.png deleted file mode 100644 index e9793e758..000000000 Binary files a/Habitica/res/drawable-xxhdpi/ic_action_launch.png and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/ic_arrow_drop_down_80000000_24dp.png b/Habitica/res/drawable-xxhdpi/ic_arrow_drop_down_80000000_24dp.png new file mode 100644 index 000000000..3d2089007 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_arrow_drop_down_80000000_24dp.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_body.png b/Habitica/res/drawable-xxhdpi/icon_body.png new file mode 100644 index 000000000..01565581c Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_body.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_extras.png b/Habitica/res/drawable-xxhdpi/icon_extras.png new file mode 100644 index 000000000..01df06cdc Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_extras.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_hair.png b/Habitica/res/drawable-xxhdpi/icon_hair.png new file mode 100644 index 000000000..0f940dc4d Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_hair.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_skin.png b/Habitica/res/drawable-xxhdpi/icon_skin.png new file mode 100644 index 000000000..f4fd80c53 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_skin.png differ diff --git a/Habitica/res/drawable-xxhdpi/indicator_diamond_selected.png b/Habitica/res/drawable-xxhdpi/indicator_diamond_selected.png new file mode 100644 index 000000000..65996690d Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/indicator_diamond_selected.png differ diff --git a/Habitica/res/drawable-xxhdpi/indicator_diamond_unselected.png b/Habitica/res/drawable-xxhdpi/indicator_diamond_unselected.png new file mode 100644 index 000000000..02a543262 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/indicator_diamond_unselected.png differ diff --git a/Habitica/res/drawable-xxhdpi/intro_1.png b/Habitica/res/drawable-xxhdpi/intro_1.png new file mode 100644 index 000000000..6b07b4c2a Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/intro_1.png differ diff --git a/Habitica/res/drawable-xxhdpi/intro_1_title.png b/Habitica/res/drawable-xxhdpi/intro_1_title.png new file mode 100644 index 000000000..729900b10 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/intro_1_title.png differ diff --git a/Habitica/res/drawable-xxhdpi/intro_2.png b/Habitica/res/drawable-xxhdpi/intro_2.png new file mode 100644 index 000000000..67fd0beef Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/intro_2.png differ diff --git a/Habitica/res/drawable-xxhdpi/intro_3.png b/Habitica/res/drawable-xxhdpi/intro_3.png new file mode 100644 index 000000000..6bcd49800 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/intro_3.png differ diff --git a/Habitica/res/drawable-xxhdpi/login_background.png b/Habitica/res/drawable-xxhdpi/login_background.png new file mode 100644 index 000000000..bc2c207fc Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/login_background.png differ diff --git a/Habitica/res/drawable-xxhdpi/login_begin_button.png b/Habitica/res/drawable-xxhdpi/login_begin_button.png new file mode 100644 index 000000000..f74937004 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/login_begin_button.png differ diff --git a/Habitica/res/drawable-xxhdpi/login_button.9.png b/Habitica/res/drawable-xxhdpi/login_button.9.png new file mode 100644 index 000000000..b136b9956 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/login_button.9.png differ diff --git a/Habitica/res/drawable-xxhdpi/login_logo.png b/Habitica/res/drawable-xxhdpi/login_logo.png new file mode 100644 index 000000000..3443959db Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/login_logo.png differ diff --git a/Habitica/res/drawable-xxhdpi/name_plate.9.png b/Habitica/res/drawable-xxhdpi/name_plate.9.png new file mode 100644 index 000000000..2cdc060ee Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/name_plate.9.png differ diff --git a/Habitica/res/drawable-xxhdpi/star_large.png b/Habitica/res/drawable-xxhdpi/star_large.png new file mode 100644 index 000000000..32e2ddfb1 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/star_large.png differ diff --git a/Habitica/res/drawable-xxhdpi/star_medium.png b/Habitica/res/drawable-xxhdpi/star_medium.png new file mode 100644 index 000000000..5069c451a Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/star_medium.png differ diff --git a/Habitica/res/drawable-xxhdpi/star_small.png b/Habitica/res/drawable-xxhdpi/star_small.png new file mode 100644 index 000000000..ced96727c Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/star_small.png differ diff --git a/Habitica/res/drawable-xxhdpi/welcome_diamond_background.png b/Habitica/res/drawable-xxhdpi/welcome_diamond_background.png new file mode 100644 index 000000000..00078f3fe Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/welcome_diamond_background.png differ diff --git a/Habitica/res/drawable-xxxhdpi/ic_arrow_drop_down_80000000_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_arrow_drop_down_80000000_24dp.png new file mode 100644 index 000000000..8b60cb037 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_arrow_drop_down_80000000_24dp.png differ diff --git a/Habitica/res/drawable/ic_arrow_back_white_36dp.xml b/Habitica/res/drawable/ic_arrow_back_white_36dp.xml new file mode 100644 index 000000000..928f7c7df --- /dev/null +++ b/Habitica/res/drawable/ic_arrow_back_white_36dp.xml @@ -0,0 +1,4 @@ + + + + diff --git a/Habitica/res/drawable/indicator_diamond.xml b/Habitica/res/drawable/indicator_diamond.xml new file mode 100644 index 000000000..249abe868 --- /dev/null +++ b/Habitica/res/drawable/indicator_diamond.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/intro_1.png b/Habitica/res/drawable/intro_1.png deleted file mode 100644 index 135552171..000000000 Binary files a/Habitica/res/drawable/intro_1.png and /dev/null differ diff --git a/Habitica/res/drawable/intro_3.png b/Habitica/res/drawable/intro_3.png deleted file mode 100644 index 04ee8031f..000000000 Binary files a/Habitica/res/drawable/intro_3.png and /dev/null differ diff --git a/Habitica/res/drawable/intro_background.png b/Habitica/res/drawable/intro_background.png deleted file mode 100644 index c29a36dc7..000000000 Binary files a/Habitica/res/drawable/intro_background.png and /dev/null differ diff --git a/Habitica/res/drawable/login_gradient.xml b/Habitica/res/drawable/login_gradient.xml new file mode 100644 index 000000000..e5339aff3 --- /dev/null +++ b/Habitica/res/drawable/login_gradient.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/activity_challenge_overview.xml b/Habitica/res/layout/activity_challenge_overview.xml deleted file mode 100644 index 57214e51a..000000000 --- a/Habitica/res/layout/activity_challenge_overview.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml index 07d8b9aa0..2540ae87b 100644 --- a/Habitica/res/layout/activity_intro.xml +++ b/Habitica/res/layout/activity_intro.xml @@ -1,13 +1,12 @@ + android:layout_height="match_parent"> - + android:background="@color/transparent" />