diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 7e415a6bb..0a3245e88 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,8 +2,8 @@ diff --git a/Habitica/assets/migrations/Habitica/33.sql b/Habitica/assets/migrations/Habitica/33.sql new file mode 100644 index 000000000..693948507 --- /dev/null +++ b/Habitica/assets/migrations/Habitica/33.sql @@ -0,0 +1 @@ +ALTER TABLE Task ADD COLUMN group_id varchar(255); \ No newline at end of file diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 626077210..f1ad5eb08 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -46,11 +46,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 +69,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 @@ -141,10 +141,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' @@ -156,7 +156,7 @@ dependencies { android { compileSdkVersion 25 - buildToolsVersion "24.0.3" + buildToolsVersion "25.0.0" defaultConfig { applicationId "com.habitrpg.android.habitica" 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/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..10883ca6c 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..2509c879a 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..d0dc486fd Binary files /dev/null and b/Habitica/res/drawable-hdpi/intro_3.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..8bc43d2be 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..54d63d525 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..dbd98aadf Binary files /dev/null and b/Habitica/res/drawable-mdpi/intro_3.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..390fa936d 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..8b4a1e63c 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..3a54a66b7 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/intro_3.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..121faeb60 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..20db25a22 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..379a61f14 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/intro_3.png differ 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/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" />