diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 8aa988061..8d875260e 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -116,10 +116,6 @@
android:name=".ui.activities.GiftGemsActivity"
android:label="@string/gift_gems">
-
-
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index f7c85ced4..e4e3d461a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -51,11 +51,11 @@ dependencies {
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
//Crash Logging
- implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
+ implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
//Dependency Injection
- implementation 'com.google.dagger:dagger:2.29.1'
- kapt 'com.google.dagger:dagger-compiler:2.29.1'
+ implementation 'com.google.dagger:dagger:2.31.2'
+ kapt 'com.google.dagger:dagger-compiler:2.31.2'
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
compileOnly 'com.github.pengrad:jdk9-deps:1.0'
//App Compatibility and Material Design
@@ -64,34 +64,34 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
// Markdown
- implementation "io.noties.markwon:core:4.6.0"
- implementation "io.noties.markwon:ext-strikethrough:4.6.0"
- implementation "io.noties.markwon:image:4.6.0"
- implementation "io.noties.markwon:recycler:4.6.0"
- implementation "io.noties.markwon:html:4.6.0"
+ implementation "io.noties.markwon:core:4.6.1"
+ implementation "io.noties.markwon:ext-strikethrough:4.6.1"
+ implementation "io.noties.markwon:image:4.6.1"
+ implementation "io.noties.markwon:recycler:4.6.1"
+ implementation "io.noties.markwon:html:4.6.1"
//Eventbus
implementation 'org.greenrobot:eventbus:3.2.0'
// IAP Handling / Verification
implementation 'org.solovyev.android:checkout:1.2.2'
//Facebook
- implementation('com.facebook.android:facebook-android-sdk:7.1.0') {
+ implementation('com.facebook.android:facebook-android-sdk:8.1.0') {
transitive = true
}
implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
//RxJava
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
- implementation 'io.reactivex.rxjava3:rxjava:3.0.6'
+ implementation 'io.reactivex.rxjava3:rxjava:3.0.9'
implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
implementation "com.github.akarnokd:rxjava3-bridge:3.0.0"
//Analytics
- implementation 'com.amplitude:android-sdk:2.25.2'
+ implementation 'com.amplitude:android-sdk:2.30.0'
// Fresco Image Management Library
- implementation('com.facebook.fresco:fresco:2.3.0') {
+ implementation('com.facebook.fresco:fresco:2.4.0') {
exclude module: 'bolts-android'
}
- implementation('com.facebook.fresco:animated-gif:2.3.0') {
+ implementation('com.facebook.fresco:animated-gif:2.4.0') {
exclude module: 'bolts-android'
}
//Tests
@@ -110,25 +110,25 @@ dependencies {
//Leak Detection
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
//Push Notifications
- implementation 'com.google.firebase:firebase-core:18.0.0'
- implementation 'com.google.firebase:firebase-messaging:21.0.0'
- implementation 'com.google.firebase:firebase-config:20.0.0'
- implementation 'com.google.firebase:firebase-perf:19.0.9'
- implementation 'com.google.android.gms:play-services-auth:18.1.0'
+ implementation 'com.google.firebase:firebase-core:18.0.1'
+ implementation 'com.google.firebase:firebase-messaging:21.0.1'
+ implementation 'com.google.firebase:firebase-config:20.0.2'
+ implementation 'com.google.firebase:firebase-perf:19.1.0'
+ implementation 'com.google.android.gms:play-services-auth:19.0.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.nex3z:flow-layout:1.2.2'
implementation 'androidx.core:core-ktx:1.3.2'
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
- implementation 'androidx.navigation:navigation-fragment-ktx:2.3.1'
- implementation 'androidx.navigation:navigation-ui-ktx:2.3.1'
+ implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
+ implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
implementation "androidx.paging:paging-runtime-ktx:2.1.2"
implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2'
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2'
- implementation 'com.willowtreeapps:signinwithapplebutton:0.2'
+ implementation 'com.willowtreeapps:signinwithapplebutton:0.3'
implementation project(':shared')
}
@@ -150,8 +150,8 @@ android {
buildConfigField "String", "TESTING_LEVEL", "\"production\""
resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
- versionCode 2629
- versionName "3.1"
+ versionCode 2694
+ versionName "3.2"
}
buildFeatures {
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_left.png b/Habitica/res/drawable-hdpi/g1g1_promo_left.png
index 59dcd684f..7530e505d 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_left.png and b/Habitica/res/drawable-hdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-hdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..ca3893bc5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-hdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..f024e8000
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..07a0a816f
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_right.png
index fd03bab4f..410b9f7e5 100644
Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_right.png and b/Habitica/res/drawable-hdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-hdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..482f62438
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..5870b55b6
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..1708142bc
Binary files /dev/null and b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-hdpi/no_background.png b/Habitica/res/drawable-hdpi/no_background.png
new file mode 100644
index 000000000..3b4306613
Binary files /dev/null and b/Habitica/res/drawable-hdpi/no_background.png differ
diff --git a/Habitica/res/drawable-hdpi/task_icon_team.png b/Habitica/res/drawable-hdpi/task_icon_team.png
new file mode 100644
index 000000000..5b8c03e38
Binary files /dev/null and b/Habitica/res/drawable-hdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-hdpi/team_info_icon.png b/Habitica/res/drawable-hdpi/team_info_icon.png
new file mode 100644
index 000000000..1f0372b42
Binary files /dev/null and b/Habitica/res/drawable-hdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable-hdpi/won_challenge_icon.png b/Habitica/res/drawable-hdpi/won_challenge_icon.png
new file mode 100644
index 000000000..ca83d23b1
Binary files /dev/null and b/Habitica/res/drawable-hdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_left.png b/Habitica/res/drawable-mdpi/g1g1_promo_left.png
index 9f858cd6b..eed4a13cc 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_left.png and b/Habitica/res/drawable-mdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..bdc4377e4
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-mdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..7d46ed660
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..077e318f2
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_right.png
index 80d855105..26458f1ad 100644
Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_right.png and b/Habitica/res/drawable-mdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..92eab4fe9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..32968bfa0
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..37d6eee82
Binary files /dev/null and b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-mdpi/no_background.png b/Habitica/res/drawable-mdpi/no_background.png
new file mode 100644
index 000000000..8c9e7f1ce
Binary files /dev/null and b/Habitica/res/drawable-mdpi/no_background.png differ
diff --git a/Habitica/res/drawable-mdpi/task_icon_team.png b/Habitica/res/drawable-mdpi/task_icon_team.png
new file mode 100644
index 000000000..cea954d3d
Binary files /dev/null and b/Habitica/res/drawable-mdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-mdpi/team_info_icon.png b/Habitica/res/drawable-mdpi/team_info_icon.png
new file mode 100644
index 000000000..0e94b23f7
Binary files /dev/null and b/Habitica/res/drawable-mdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable-mdpi/won_challenge_icon.png b/Habitica/res/drawable-mdpi/won_challenge_icon.png
new file mode 100644
index 000000000..fc62e61a8
Binary files /dev/null and b/Habitica/res/drawable-mdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-hdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-hdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..6eff51109
Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-hdpi/no_background.png b/Habitica/res/drawable-night-hdpi/no_background.png
new file mode 100644
index 000000000..75e93a504
Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/no_background.png differ
diff --git a/Habitica/res/drawable-night-hdpi/won_challenge_icon.png b/Habitica/res/drawable-night-hdpi/won_challenge_icon.png
new file mode 100644
index 000000000..b4e4b76aa
Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-mdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-mdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..4e00ffce3
Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-mdpi/no_background.png b/Habitica/res/drawable-night-mdpi/no_background.png
new file mode 100644
index 000000000..2d2e5fe82
Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/no_background.png differ
diff --git a/Habitica/res/drawable-night-mdpi/won_challenge_icon.png b/Habitica/res/drawable-night-mdpi/won_challenge_icon.png
new file mode 100644
index 000000000..defd8f1e8
Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-xhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-xhdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..6573424b6
Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-xhdpi/no_background.png b/Habitica/res/drawable-night-xhdpi/no_background.png
new file mode 100644
index 000000000..d7ebe62ed
Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-night-xhdpi/won_challenge_icon.png b/Habitica/res/drawable-night-xhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..3608f2db4
Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-xxhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-xxhdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..1340361ea
Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-xxhdpi/no_background.png b/Habitica/res/drawable-night-xxhdpi/no_background.png
new file mode 100644
index 000000000..a3e452f26
Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-night-xxhdpi/won_challenge_icon.png b/Habitica/res/drawable-night-xxhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..92f26055e
Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-night-xxxhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-night-xxxhdpi/challenge_won_gem_confetti.png
new file mode 100644
index 000000000..6c66fb945
Binary files /dev/null and b/Habitica/res/drawable-night-xxxhdpi/challenge_won_gem_confetti.png differ
diff --git a/Habitica/res/drawable-night-xxxhdpi/won_challenge_icon.png b/Habitica/res/drawable-night-xxxhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..92f26055e
Binary files /dev/null and b/Habitica/res/drawable-night-xxxhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png
index 7d2614f6a..0b37a0491 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..bdaaf36b0
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..fa4d52f5c
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..5bc571b1a
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png
index b4578e4ee..ebe4225f9 100644
Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..e2f40b772
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..91682e80b
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..4cae12268
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/no_background.png b/Habitica/res/drawable-xhdpi/no_background.png
new file mode 100644
index 000000000..dc10295c7
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-xhdpi/task_icon_team.png b/Habitica/res/drawable-xhdpi/task_icon_team.png
new file mode 100644
index 000000000..a32a12e99
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-xhdpi/team_info_icon.png b/Habitica/res/drawable-xhdpi/team_info_icon.png
new file mode 100644
index 000000000..a28ae3e66
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable-xhdpi/won_challenge_icon.png b/Habitica/res/drawable-xhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..914b8cca8
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png
index 8604581a8..960b525f3 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..6382735fe
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..b2623c1c2
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..d800b10c4
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png
index 6efdd65db..c283f62a8 100644
Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..7443adeed
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..7b36e791e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..18f0845d9
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/no_background.png b/Habitica/res/drawable-xxhdpi/no_background.png
new file mode 100644
index 000000000..ae58b4a5e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/no_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/task_icon_team.png b/Habitica/res/drawable-xxhdpi/task_icon_team.png
new file mode 100644
index 000000000..9e566f7c0
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-xxhdpi/team_info_icon.png b/Habitica/res/drawable-xxhdpi/team_info_icon.png
new file mode 100644
index 000000000..8145895e4
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable-xxhdpi/won_challenge_icon.png b/Habitica/res/drawable-xxhdpi/won_challenge_icon.png
new file mode 100644
index 000000000..c68d6d205
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/won_challenge_icon.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_left.png
index 80d6813de..a7c52f6a5 100644
Binary files a/Habitica/res/drawable-xxxhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_left.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_left_small.png
new file mode 100644
index 000000000..06d2a689a
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_left_small.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_left.png
new file mode 100644
index 000000000..b6b968bdb
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_left.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_right.png
new file mode 100644
index 000000000..1910abcce
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_menu_right.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_right.png
index 796d90bef..b5414eea9 100644
Binary files a/Habitica/res/drawable-xxxhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_right.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-xxxhdpi/g1g1_promo_right_small.png
new file mode 100644
index 000000000..aac553c1b
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_promo_right_small.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_left.png
new file mode 100644
index 000000000..ff9023e67
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_left.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_right.png
new file mode 100644
index 000000000..03b6c18d7
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/g1g1_sparkle_right.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/task_icon_team.png b/Habitica/res/drawable-xxxhdpi/task_icon_team.png
new file mode 100644
index 000000000..ef9b0acf5
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/task_icon_team.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/team_info_icon.png b/Habitica/res/drawable-xxxhdpi/team_info_icon.png
new file mode 100644
index 000000000..8982e1eac
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/team_info_icon.png differ
diff --git a/Habitica/res/drawable/g1g1_menu_background.xml b/Habitica/res/drawable/g1g1_menu_background.xml
new file mode 100644
index 000000000..df3114871
--- /dev/null
+++ b/Habitica/res/drawable/g1g1_menu_background.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/drawable/g1g1_promo_background.xml b/Habitica/res/drawable/g1g1_promo_background.xml
new file mode 100644
index 000000000..2c7932f4c
--- /dev/null
+++ b/Habitica/res/drawable/g1g1_promo_background.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/drawable/g1g1_promo_pill_bg.xml b/Habitica/res/drawable/g1g1_promo_pill_bg.xml
new file mode 100644
index 000000000..c6ef244f0
--- /dev/null
+++ b/Habitica/res/drawable/g1g1_promo_pill_bg.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_400.xml b/Habitica/res/drawable/layout_rounded_bg_brand_400.xml
new file mode 100644
index 000000000..6a9cc53d0
--- /dev/null
+++ b/Habitica/res/drawable/layout_rounded_bg_brand_400.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/drawable/no_party_background_gradient.xml b/Habitica/res/drawable/no_party_background_gradient.xml
index 792a5b12d..a72529e44 100644
--- a/Habitica/res/drawable/no_party_background_gradient.xml
+++ b/Habitica/res/drawable/no_party_background_gradient.xml
@@ -4,8 +4,8 @@
diff --git a/Habitica/res/drawable/rounded_purple_square.xml b/Habitica/res/drawable/rounded_purple_square.xml
index 043026ceb..bed89759c 100644
--- a/Habitica/res/drawable/rounded_purple_square.xml
+++ b/Habitica/res/drawable/rounded_purple_square.xml
@@ -2,6 +2,6 @@
-
+
\ No newline at end of file
diff --git a/Habitica/res/layout/achievement_challenge_item.xml b/Habitica/res/layout/achievement_challenge_item.xml
index 0fff98a27..e78a2845a 100644
--- a/Habitica/res/layout/achievement_challenge_item.xml
+++ b/Habitica/res/layout/achievement_challenge_item.xml
@@ -7,15 +7,14 @@
android:gravity="center_vertical"
android:paddingTop="13dp"
android:paddingBottom="13dp">
-
@@ -38,7 +38,6 @@
@@ -58,9 +56,6 @@
android:layout_gravity="fill_horizontal"
android:hint="@string/new_challenge_title"
android:id="@+id/create_challenge_title"
- android:textColor="@color/white"
- android:textColorHighlight="?textColorPrimaryDark"
- android:textColorHint="?textColorPrimaryDark"
tools:text="Get in shape"
android:inputType="text" />
@@ -69,22 +64,18 @@
+ app:hintTextAppearance="@style/TextAppearance.AppCompat"
+ android:layout_marginBottom="12dp"
+ android:layout_marginTop="12dp">
+ android:minLines="3" />
@@ -107,7 +98,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:text="@string/gem_reward"
- android:textColor="#cc000000" />
+ android:textColor="@color/text_primary" />
@@ -125,13 +116,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="28dp">
-
+ android:tint="@color/text_brand_neon"
+ android:src="@drawable/challenge_gem_add_button"/>
-
+ android:tint="@color/text_brand_neon"
+ android:src="@drawable/challenge_gem_remove_button"/>
@@ -167,14 +160,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="26dp"
android:text="@string/location"
- android:textColor="#cc000000" />
+ android:textColor="@color/text_primary" />
+ android:textColor="@color/text_primary" />
@@ -203,7 +195,7 @@
android:hint="@string/identify_your_challenge_with_a_tag"
android:maxLines="1"
android:textColor="@color/text_secondary"
- android:textColorHint="#61000000" />
+ android:textColorHint="@color/text_ternary" />
@@ -211,6 +203,7 @@
style="@style/Subheader2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
android:text="@string/tasks" />
-
-
-
diff --git a/Habitica/res/layout/activity_gift1get1_info.xml b/Habitica/res/layout/activity_gift1get1_info.xml
deleted file mode 100644
index dd6c47ec5..000000000
--- a/Habitica/res/layout/activity_gift1get1_info.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml
index 3c2046b70..d494d0732 100644
--- a/Habitica/res/layout/activity_gift_gems.xml
+++ b/Habitica/res/layout/activity_gift_gems.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
- android:theme="@style/Toolbar"
+ android:background="?attr/colorContentBackground"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
diff --git a/Habitica/res/layout/activity_gift_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml
index 2a7a98388..b66f4cdb3 100644
--- a/Habitica/res/layout/activity_gift_subscription.xml
+++ b/Habitica/res/layout/activity_gift_subscription.xml
@@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
- android:theme="@style/Toolbar"
+ android:background="?attr/colorContentBackground"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
@@ -76,7 +76,7 @@
android:id="@+id/subscription1MonthView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:recurringText="@string/one_month"
+ app:recurringText="@string/one_month_one_time"
app:gemCapText="@string/subscribe1month_gemcap"
app:isNonRecurring="true"/>
@@ -84,7 +84,7 @@
android:id="@+id/subscription3MonthView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:recurringText="@string/three_months"
+ app:recurringText="@string/three_months_one_time"
app:gemCapText="@string/subscribe3month_gemcap"
app:isNonRecurring="true"
app:hourGlassCount="1" />
@@ -92,7 +92,7 @@
android:id="@+id/subscription6MonthView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:recurringText="@string/six_months"
+ app:recurringText="@string/six_months_one_time"
app:gemCapText="@string/subscribe6month_gemcap"
app:isNonRecurring="true"
app:hourGlassCount="2" />
@@ -100,9 +100,10 @@
android:id="@+id/subscription12MonthView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:recurringText="@string/twelve_months"
+ app:recurringText="@string/twelve_months_one_time"
app:gemCapText="@string/subscribe12month_gemcap"
app:isNonRecurring="true"
+ app:flagText="@string/save_20"
app:hourGlassCount="4" >
@@ -120,20 +121,35 @@
android:id="@+id/gift_subscription_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/teal_50"
- android:padding="@dimen/spacing_large"
+ android:background="@drawable/g1g1_menu_background"
+ android:paddingHorizontal="32dp"
+ android:paddingVertical="16dp"
android:gravity="center_horizontal"
android:orientation="vertical">
+
+
+
+
-
+ android:paddingBottom="20dp">
-
-
+ android:scrollbars="vertical"/>
@@ -138,4 +128,4 @@
android:id="@+id/privacySpinner" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index f11fe1000..b6e1f23c1 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -27,7 +27,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="6dp"
android:layout_alignParentTop="true"
- android:layout_marginTop="6dp"
+ android:layout_marginTop="40dp"
android:textColor="@android:color/white"
android:background="@color/transparent" />
diff --git a/Habitica/res/layout/activity_prefs.xml b/Habitica/res/layout/activity_prefs.xml
index 8667bdae2..36641ca4f 100644
--- a/Habitica/res/layout/activity_prefs.xml
+++ b/Habitica/res/layout/activity_prefs.xml
@@ -22,13 +22,23 @@
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
+
-
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/challenge_add_task_item.xml b/Habitica/res/layout/challenge_add_task_item.xml
index 9a7a08479..d84169f50 100644
--- a/Habitica/res/layout/challenge_add_task_item.xml
+++ b/Habitica/res/layout/challenge_add_task_item.xml
@@ -4,12 +4,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="#FFF"
android:orientation="vertical"
android:gravity="center">
-
-
-
-
+
\ No newline at end of file
diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml
index 142af01f4..55ae48abf 100644
--- a/Habitica/res/layout/checklist_item_row.xml
+++ b/Habitica/res/layout/checklist_item_row.xml
@@ -30,7 +30,7 @@
android:scaleType="center"
android:src="@drawable/checkmark" />
-
-
+
+
-
+ android:layout_gravity="center">
+
-
-
+ android:layout_width="76dp"
+ android:layout_height="76dp"
+ android:layout_gravity="start"
+ app:roundedCornerRadius="6dp"
+ app:roundingBorderWidth="6dp"
+ android:scaleType="fitEnd" />
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index c9203ce35..5d9ba5d57 100644
--- a/Habitica/res/layout/customization_grid_item.xml
+++ b/Habitica/res/layout/customization_grid_item.xml
@@ -20,6 +20,7 @@
android:layout_width="60dp"
android:layout_height="76dp"
android:layout_gravity="start"
+ app:roundedCornerRadius="6dp"
android:scaleType="fitEnd" />
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_pet_suggest_hatch.xml b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
index ba4c4e72e..64059998a 100644
--- a/Habitica/res/layout/dialog_pet_suggest_hatch.xml
+++ b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
@@ -30,7 +30,7 @@
-
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_won_challenge.xml b/Habitica/res/layout/dialog_won_challenge.xml
index 4308e178f..382743b05 100644
--- a/Habitica/res/layout/dialog_won_challenge.xml
+++ b/Habitica/res/layout/dialog_won_challenge.xml
@@ -4,18 +4,40 @@
android:layout_height="match_parent"
android:gravity="center_horizontal">
-
+ android:layout_gravity="center"
+ android:src="@drawable/challenge_won_gem_confetti" />
+
+
+
+
+
+
-
-
-
-
-
-
+ android:visibility="gone"
+ tools:visibility="visible">
+
+ android:orientation="horizontal"
+ android:gravity="center_vertical">
diff --git a/Habitica/res/layout/fragment_no_party.xml b/Habitica/res/layout/fragment_no_party.xml
index 882a198c0..cb300b5f2 100644
--- a/Habitica/res/layout/fragment_no_party.xml
+++ b/Habitica/res/layout/fragment_no_party.xml
@@ -81,8 +81,7 @@
android:id="@+id/createPartyButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/HabiticaButton.Offset"
- android:background="@drawable/layout_rounded_bg_window"
+ style="@style/HabiticaButton.Gray"
android:text="@string/create_party"
android:layout_marginTop="@dimen/spacing_large"/>
@@ -106,6 +105,7 @@
style="@style/Body2"
android:text="@string/join_party_description"
android:textColor="@color/text_quad"
+ android:textColorLink="@color/text_brand_neon"
android:gravity="center"
android:layout_marginStart="@dimen/spacing_large"
android:layout_marginEnd="@dimen/spacing_large"/>
@@ -114,9 +114,7 @@
android:id="@+id/username_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColor="?colorAccent"
- style="@style/HabiticaButton.Offset"
- android:background="@drawable/layout_rounded_bg_window"
+ style="@style/HabiticaButton.Gray"
android:layout_marginTop="@dimen/spacing_large"
android:layout_marginBottom="@dimen/spacing_large"/>
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index 26777ec2a..1d3c6a34a 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -118,6 +118,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
+ android:gravity="center_vertical"
android:visibility="gone">
+
+ android:lineSpacingExtra="3dp"/>
+ android:lineSpacingExtra="3dp"/>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml
index cb551814a..c1cfa082d 100644
--- a/Habitica/res/layout/fragment_quest_detail.xml
+++ b/Habitica/res/layout/fragment_quest_detail.xml
@@ -106,6 +106,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone"
+ android:gravity="center_vertical"
android:padding="@dimen/content_border">
-
-
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 2ab6ff1c5..774e94355 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -913,7 +913,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.
1 Monat verbleibend
vor %d Wochen
vor einer Woche
- vor %d Monat(en)
+ vor %d Monaten
vor einem Monat
Möchtest Du jemandem eine glänzende Edelsteinbeute zuteil werden lassen\?
Mit Deinen aktuellen Filtern sind keine To-Dos sichtbar.
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index facc5c800..2dcb99287 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -758,7 +758,7 @@
Keep Challenges
You invited a friend (or friends) who joined you on your adventure!
Invited a Friend
- You put themselves to the test by joining a Challenge!
+ You put yourself to the test by joining a Challenge!
Joined a Challenge
Ventured into the social side of Habitica by joining a Guild!
Joined a Guild
@@ -916,7 +916,7 @@
1 month remaining
%dw ago
1w ago
- %d month ago
+ %d months ago
1 month ago
Using Skill
Your Username and/or Password was incorrect.
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index 93d634e2a..d9c045255 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -733,7 +733,7 @@
Vous avez obtenu un succès !
Voir les succès
Voir les nouveautés
- Vous ouvrez la boite et trouvez %@
+ Vous ouvrez la boite et trouvez %s
%s ne fait plus partie du groupe
Transférer
Confirmez-vous vouloir retirer %s du groupe \?
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index c3d536934..80b92d9ac 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -846,7 +846,7 @@
すべての乗騎を集めた実績、「乗騎使い」を手に入れました！
乗騎使い
全てのペットを集めたため、「獣使い」の実績を獲得しました！
- 宝箱を開け、%@を見つけました
+ 宝箱を開け、%sを見つけました
%sはグループから解除されました
移譲する
本当に%sをグループから解除しますか？
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 0f6b6c80a..fbc8e3eef 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -72,9 +72,6 @@
@color/yellow_100
@color/blue_100
- @color/brand_300
- @color/brand_50
-
@color/brand_500
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 36ca0f37f..99a8add56 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -243,7 +243,7 @@
Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll.
Are you sure? Only %1$d of your %2$d party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation.
1 month ago
- %d month ago
+ %d months ago
1w ago
%dw ago
1d ago
@@ -273,7 +273,7 @@
You\'ve found %d quest items
You found %s in the Armoire
- You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?
+ You rummage in the Armoire and find%1$s %2$s. What\'s that doing in here?
You wrestle with the Armoire and gain Experience. Take that!
Sell (%d Gold)
Hatch with potion
@@ -438,7 +438,7 @@
Subscription Status
Leave Challenge
- You can choose to keep this Challenge\'s tasks on your personal task board or delete them when you leave
+ You can choose to keep this Challenge\'s tasks on your personal task board or delete them when you leave
Leave & Keep Tasks
Leave & Delete Tasks
Remove
@@ -550,6 +550,7 @@
Started by %s
Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.
Reloading Content
+ Reloaded Content
k
m
b
@@ -655,7 +656,7 @@
The colored usernames you see in chat represent a person’s contributor tier. The higher the tier, the more the person has contributed to habitica through art, code, the community, or more!
Open navigation drawer
Close navigation drawer
- World Boss
+ World Boss
Boss Art
World Boss Description
Rage Strikes: %d/%d
@@ -876,7 +877,7 @@
Joined a Guild
Ventured into the social side of Habitica by joining a Guild!
Joined a Challenge
- You put themselves to the test by joining a Challenge!
+ You put yourself to the test by joining a Challenge!
Invited a Friend
You invited a friend (or friends) who joined you on your adventure!
Keep Challenges
@@ -1046,7 +1047,7 @@
There are so many Pets to collect, you’re bound to have a favorite. If you feed them, they may just grow…
Every Pet has a specific food they enjoy! Experiment to find out which will grow your Pet the fastest
Equipment can be practical or just fashionable. Raise your stats to get all sorts of benefits to your avatar
- Completing tasks gives you a chance to find eggs, hatching potions, and pet food.
+ Completing tasks gives you a chance to find eggs, hatching potions, and pet food.
Head to your Items and try combining your new Egg and Hatching Potion!
Go to Items
You found new items!
@@ -1124,7 +1125,17 @@
Hurray!
You won a Challenge
Congratulations!
- %s selected you as the winner! Your win has been recorded in your Achievements.
+ %s selected you as the winner! Your win has been recorded in your Achievements.]]>
You were selected as the winner! Your win has been recorded in your Achievements.
Claim %d Gems
+ In honor of the season of giving we\'re bringing back a very special promotion. Now when you gift somebody a subscription, you get the same sub for yourself for free!
+ Tap ‘Gift a Subscription’ and type in the username of the account you’d like to gift to. From there, pick the sub length you’d like to gift and check out. Your account will automatically be rewarded with the same level of subscription you just gifted.
+ This is a limited time event that starts on %s (13:00 UTC) and will end %s (01:00 UTC). This promotion only applies when you gift to another Habitican. If you or your gift recipient already have a subscription, the gifted subscription will add months of credit that will only be used after the current subscription is cancelled or expires.
+ Gift a sub and get a sub for free until %s
+ 1 month one-time subscription
+ 3 month one-time subscription
+ 6 month one-time subscription
+ 12 month one-time subscription
+ Teams
+ Team Information
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index 5b07f12c0..75852e598 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -118,7 +118,8 @@
+ android:layout="@layout/preference_child_summary"
+ app:isPreferenceVisible="false"/>
diff --git a/Habitica/res/xml/remote_config_defaults.xml b/Habitica/res/xml/remote_config_defaults.xml
index 3819edc7e..072e49af5 100644
--- a/Habitica/res/xml/remote_config_defaults.xml
+++ b/Habitica/res/xml/remote_config_defaults.xml
@@ -5,10 +5,6 @@
maxChatLength
3000
-
- enableGiftOneGetOne
- false
-
shopSpriteSuffix
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
index 9deca9f11..042b6e886 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -102,6 +102,7 @@ abstract class HabiticaBaseApplication : Application() {
val builder = RealmConfiguration.Builder()
.schemaVersion(1)
.deleteRealmIfMigrationNeeded()
+ .allowWritesOnUiThread(true)
try {
Realm.setDefaultConfiguration(builder.build())
} catch (ignored: UnsatisfiedLinkError) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
deleted file mode 100644
index 8d086df2f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.habitrpg.android.habitica;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import androidx.annotation.NonNull;
-import androidx.preference.PreferenceManager;
-
-import com.google.firebase.analytics.FirebaseAnalytics;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent;
-import com.habitrpg.android.habitica.events.UserSubscribedEvent;
-import com.habitrpg.android.habitica.helpers.PurchaseTypes;
-import com.habitrpg.android.habitica.models.IAPGift;
-import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
-import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
-import com.habitrpg.android.habitica.models.Transaction;
-import com.habitrpg.android.habitica.models.responses.ErrorResponse;
-
-import org.greenrobot.eventbus.EventBus;
-import org.json.JSONObject;
-import org.solovyev.android.checkout.BasePurchaseVerifier;
-import org.solovyev.android.checkout.Purchase;
-import org.solovyev.android.checkout.RequestListener;
-import org.solovyev.android.checkout.ResponseCodes;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import retrofit2.HttpException;
-
-/**
- * Created by Negue on 26.11.2015.
- */
-public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
-
- private static final String PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS";
- private static final String PENDING_GIFTS_KEY = "PENDING_GIFTS";
- private final ApiClient apiClient;
- private Set purchasedOrderList = new HashSet<>();
- private static Map pendingGifts = new HashMap<>();
- private static SharedPreferences preferences;
- private Context context;
-
- public HabiticaPurchaseVerifier(Context context, ApiClient apiClient) {
- preferences = PreferenceManager.getDefaultSharedPreferences(context);
- this.context = context;
-
- preferences.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
- pendingGifts = loadPendingGifts();
-
- this.apiClient = apiClient;
- }
-
- @Override
- protected void doVerify(@NonNull final List purchases, @NonNull final RequestListener> requestListener) {
- final List verifiedPurchases = new ArrayList<>(purchases.size());
-
- for (final Purchase purchase : purchases) {
- if (purchasedOrderList.contains(purchase.orderId)) {
- verifiedPurchases.add(purchase);
-
- requestListener.onSuccess(verifiedPurchases);
- } else {
- if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
- PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
- validationRequest.setSku(purchase.sku);
- validationRequest.setTransaction(new Transaction());
- validationRequest.getTransaction().setReceipt(purchase.data);
- validationRequest.getTransaction().setSignature(purchase.signature);
- if (pendingGifts.containsKey(purchase.sku)) {
- validationRequest.setGift(new IAPGift());
- validationRequest.getGift().uuid = pendingGifts.get(purchase.sku);
- }
-
- apiClient.validatePurchase(validationRequest).subscribe(purchaseValidationResult -> {
- purchasedOrderList.add(purchase.orderId);
-
- requestListener.onSuccess(verifiedPurchases);
- EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase));
- removeGift(purchase.sku);
- }, throwable -> {
- if (throwable.getClass().equals(retrofit2.HttpException.class)) {
- HttpException error = (HttpException) throwable;
- ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
- if (error.code() == 401) {
- if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
- purchasedOrderList.add(purchase.orderId);
-
- requestListener.onSuccess(verifiedPurchases);
- EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase));
- removeGift(purchase.sku);
- return;
- }
- }
- }
- requestListener.onError(ResponseCodes.ERROR, new Exception());
- });
- } else if (PurchaseTypes.allSubscriptionNoRenewTypes.contains(purchase.sku)) {
- PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
- validationRequest.setSku(purchase.sku);
- validationRequest.setTransaction(new Transaction());
- validationRequest.getTransaction().setReceipt(purchase.data);
- validationRequest.getTransaction().setSignature(purchase.signature);
- if (pendingGifts.containsKey(purchase.sku)) {
- validationRequest.setGift(new IAPGift());
- validationRequest.getGift().uuid = pendingGifts.get(purchase.sku);
- }
-
- apiClient.validateNoRenewSubscription(validationRequest).subscribe(purchaseValidationResult -> {
- purchasedOrderList.add(purchase.orderId);
- requestListener.onSuccess(verifiedPurchases);
- EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase));
- removeGift(purchase.sku);
- }, throwable -> {
- if (throwable.getClass().equals(retrofit2.HttpException.class)) {
- HttpException error = (HttpException)throwable;
- ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
- if (error.code() == 401) {
- if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
- purchasedOrderList.add(purchase.orderId);
-
- requestListener.onSuccess(verifiedPurchases);
- EventBus.getDefault().post(new ConsumablePurchasedEvent(purchase));
- removeGift(purchase.sku);
- return;
- }
- }
- }
- requestListener.onError(ResponseCodes.ERROR, new Exception());
- });
- } else if (PurchaseTypes.allSubscriptionTypes.contains(purchase.sku)) {
- SubscriptionValidationRequest validationRequest = new SubscriptionValidationRequest();
- validationRequest.setSku(purchase.sku);
- validationRequest.setTransaction(new Transaction());
- validationRequest.getTransaction().setReceipt(purchase.data);
- validationRequest.getTransaction().setSignature(purchase.signature);
- apiClient.validateSubscription(validationRequest).subscribe(purchaseValidationResult -> {
- purchasedOrderList.add(purchase.orderId);
-
- verifiedPurchases.add(purchase);
-
- requestListener.onSuccess(verifiedPurchases);
- FirebaseAnalytics.getInstance(context).logEvent("user_subscribed", null);
- EventBus.getDefault().post(new UserSubscribedEvent());
- }, throwable -> {
- if (throwable.getClass().equals(retrofit2.HttpException.class)) {
- HttpException error = (HttpException) throwable;
- ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
- if (error.code() == 401) {
- if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
- purchasedOrderList.add(purchase.orderId);
-
- verifiedPurchases.add(purchase);
-
- requestListener.onSuccess(verifiedPurchases);
- return;
- }
- }
- }
- requestListener.onError(ResponseCodes.ERROR, new Exception());
- });
- }
- }
- }
-
- SharedPreferences.Editor edit = preferences.edit();
- edit.putStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
- edit.apply();
-
- savePendingGifts();
- }
-
- public static void addGift(String sku, String userID) {
- pendingGifts.put(sku, userID);
- savePendingGifts();
- }
-
- private static void removeGift(String sku) {
- pendingGifts.remove(sku);
- savePendingGifts();
- }
-
- private static void savePendingGifts(){
- JSONObject jsonObject = new JSONObject(pendingGifts);
- String jsonString = jsonObject.toString();
- SharedPreferences.Editor editor = preferences.edit();
- editor.remove(PENDING_GIFTS_KEY).apply();
- editor.putString(PENDING_GIFTS_KEY, jsonString);
- editor.commit();
- }
-
- private Map loadPendingGifts() {
- Map outputMap = new HashMap<>();
- try{
- String jsonString = preferences.getString(PENDING_GIFTS_KEY, (new JSONObject()).toString());
- JSONObject jsonObject = new JSONObject(jsonString);
- Iterator keysItr = jsonObject.keys();
- while(keysItr.hasNext()) {
- String key = keysItr.next();
- String value = (String) jsonObject.get(key);
- outputMap.put(key, value);
- }
- }catch(Exception e){
- e.printStackTrace();
- }
- return outputMap;
- }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt
new file mode 100644
index 000000000..748d4be8f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt
@@ -0,0 +1,163 @@
+package com.habitrpg.android.habitica
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent
+import com.habitrpg.android.habitica.events.UserSubscribedEvent
+import com.habitrpg.android.habitica.helpers.PurchaseTypes
+import com.habitrpg.android.habitica.models.*
+import org.greenrobot.eventbus.EventBus
+import org.json.JSONObject
+import org.solovyev.android.checkout.BasePurchaseVerifier
+import org.solovyev.android.checkout.Purchase
+import org.solovyev.android.checkout.RequestListener
+import org.solovyev.android.checkout.ResponseCodes
+import retrofit2.HttpException
+import java.util.*
+
+/**
+ * Created by Negue on 26.11.2015.
+ */
+class HabiticaPurchaseVerifier(context: Context, apiClient: ApiClient) : BasePurchaseVerifier() {
+ private val apiClient: ApiClient
+ private val purchasedOrderList: MutableSet = HashSet()
+ private val context: Context
+ override fun doVerify(purchases: List, requestListener: RequestListener>) {
+ val verifiedPurchases: MutableList = ArrayList(purchases.size)
+ for (purchase in purchases) {
+ if (purchasedOrderList.contains(purchase.orderId)) {
+ verifiedPurchases.add(purchase)
+ requestListener.onSuccess(verifiedPurchases)
+ } else {
+ when {
+ PurchaseTypes.allGemTypes.contains(purchase.sku) -> {
+ val validationRequest = buildValidationRequest(purchase)
+ apiClient.validatePurchase(validationRequest).subscribe({
+ purchasedOrderList.add(purchase.orderId)
+ requestListener.onSuccess(verifiedPurchases)
+ EventBus.getDefault().post(ConsumablePurchasedEvent(purchase))
+ removeGift(purchase.sku)
+ }) { throwable: Throwable ->
+ handleError(throwable, purchase, requestListener, verifiedPurchases)
+ }
+ }
+ PurchaseTypes.allSubscriptionNoRenewTypes.contains(purchase.sku) -> {
+ val validationRequest = buildValidationRequest(purchase)
+ apiClient.validateNoRenewSubscription(validationRequest).subscribe({
+ purchasedOrderList.add(purchase.orderId)
+ requestListener.onSuccess(verifiedPurchases)
+ EventBus.getDefault().post(ConsumablePurchasedEvent(purchase))
+ removeGift(purchase.sku)
+ }) { throwable: Throwable ->
+ handleError(throwable, purchase, requestListener, verifiedPurchases)
+ }
+ }
+ PurchaseTypes.allSubscriptionTypes.contains(purchase.sku) -> {
+ val validationRequest = SubscriptionValidationRequest()
+ validationRequest.sku = purchase.sku
+ validationRequest.transaction = Transaction()
+ validationRequest.transaction?.receipt = purchase.data
+ validationRequest.transaction?.signature = purchase.signature
+ apiClient.validateSubscription(validationRequest).subscribe({
+ purchasedOrderList.add(purchase.orderId)
+ verifiedPurchases.add(purchase)
+ requestListener.onSuccess(verifiedPurchases)
+ FirebaseAnalytics.getInstance(context).logEvent("user_subscribed", null)
+ EventBus.getDefault().post(UserSubscribedEvent())
+ }) { throwable: Throwable ->
+ handleError(throwable, purchase, requestListener, verifiedPurchases)
+ }
+ }
+ }
+ }
+ }
+ val edit = preferences?.edit()
+ edit?.putStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList)
+ edit?.apply()
+ savePendingGifts()
+ }
+
+ private fun buildValidationRequest(purchase: Purchase): PurchaseValidationRequest {
+ val validationRequest = PurchaseValidationRequest()
+ validationRequest.sku = purchase.sku
+ validationRequest.transaction = Transaction()
+ validationRequest.transaction?.receipt = purchase.data
+ validationRequest.transaction?.signature = purchase.signature
+ if (pendingGifts.containsKey(purchase.sku)) {
+ validationRequest.gift = IAPGift()
+ validationRequest.gift?.uuid = pendingGifts[purchase.sku]
+ }
+ return validationRequest
+ }
+
+ private fun handleError(throwable: Throwable, purchase: Purchase, requestListener: RequestListener>, verifiedPurchases: MutableList) {
+ (throwable as? HttpException)?.let {error ->
+ if (error.code() == 401) {
+ val res = apiClient.getErrorResponse(throwable)
+ if (res.message != null && res.message == "RECEIPT_ALREADY_USED") {
+ purchasedOrderList.add(purchase.orderId)
+ requestListener.onSuccess(verifiedPurchases)
+ EventBus.getDefault().post(ConsumablePurchasedEvent(purchase))
+ removeGift(purchase.sku)
+ return
+ }
+ }
+ }
+ FirebaseCrashlytics.getInstance().recordException(throwable)
+ requestListener.onError(ResponseCodes.ERROR, Exception())
+ }
+
+ private fun loadPendingGifts(): MutableMap {
+ val outputMap: MutableMap = HashMap()
+ try {
+ val jsonString = preferences?.getString(PENDING_GIFTS_KEY, JSONObject().toString())
+ val jsonObject = JSONObject(jsonString)
+ val keysItr = jsonObject.keys()
+ while (keysItr.hasNext()) {
+ val key = keysItr.next()
+ val value = jsonObject[key] as String
+ outputMap[key] = value
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ return outputMap
+ }
+
+ companion object {
+ private const val PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS"
+ private const val PENDING_GIFTS_KEY = "PENDING_GIFTS"
+ private var pendingGifts: MutableMap = HashMap()
+ private var preferences: SharedPreferences? = null
+ fun addGift(sku: String?, userID: String?) {
+ pendingGifts[sku] = userID
+ savePendingGifts()
+ }
+
+ private fun removeGift(sku: String) {
+ pendingGifts.remove(sku)
+ savePendingGifts()
+ }
+
+ private fun savePendingGifts() {
+ val jsonObject = JSONObject(pendingGifts as Map<*, *>)
+ val jsonString = jsonObject.toString()
+ val editor = preferences?.edit()
+ editor?.remove(PENDING_GIFTS_KEY)
+ editor?.putString(PENDING_GIFTS_KEY, jsonString)
+ editor?.apply()
+ }
+ }
+
+ init {
+ preferences = PreferenceManager.getDefaultSharedPreferences(context)
+ this.context = context
+ preferences?.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList)
+ pendingGifts = loadPendingGifts()
+ this.apiClient = apiClient
+ }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index 55131a5f2..d299f51b3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -392,4 +392,12 @@ interface ApiService {
@POST("user/reroll")
fun reroll(): Flowable>
+
+ // Team Plans
+
+ @GET("group-plans")
+ fun getTeamPlans(): Flowable>>
+
+ @GET("tasks/group/{groupID}")
+ fun getTeamPlanTasks(@Path("groupID") groupId: String): Flowable>
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index bb4f665cc..96ff76300 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -97,6 +97,7 @@ import com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment;
import com.habitrpg.android.habitica.ui.fragments.support.SupportMainFragment;
import com.habitrpg.android.habitica.ui.fragments.tasks.TaskRecyclerViewFragment;
import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment;
+import com.habitrpg.android.habitica.ui.fragments.tasks.TeamBoardFragment;
import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel;
import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModel;
import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel;
@@ -337,4 +338,6 @@ public interface UserComponent {
void inject(AdventureGuideActivity adventureGuideFragment);
void inject(PromoInfoFragment promoInfoFragment);
+
+ void inject(@NotNull TeamBoardFragment teamBoardFragment);
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index e4e31eff4..b8de6d940 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -262,4 +262,6 @@ interface ApiClient {
fun transferGems(giftedID: String, amount: Int): Flowable
fun unlinkAllTasks(challengeID: String?, keepOption: String): Flowable
fun blockMember(userID: String): Flowable>
+ fun getTeamPlans(): Flowable>
+ fun getTeamPlanTasks(teamID: String): Flowable
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
index f920a9692..2cd201072 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
@@ -4,11 +4,13 @@ import com.habitrpg.android.habitica.data.local.UserQuestStatus
import com.habitrpg.android.habitica.models.Achievement
import com.habitrpg.android.habitica.models.QuestAchievement
import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.TeamPlan
import com.habitrpg.android.habitica.models.inventory.Customization
import com.habitrpg.android.habitica.models.inventory.CustomizationSet
import com.habitrpg.android.habitica.models.responses.SkillResponse
import com.habitrpg.android.habitica.models.responses.UnlockResponse
import com.habitrpg.android.habitica.models.responses.VerifyUsernameResponse
+import com.habitrpg.android.habitica.models.social.Group
import com.habitrpg.android.habitica.models.tasks.Task
import com.habitrpg.android.habitica.models.user.Stats
import com.habitrpg.android.habitica.models.user.User
@@ -20,15 +22,15 @@ interface UserRepository : BaseRepository {
fun getUser(): Flowable
fun getUser(userID: String): Flowable
- fun updateUser(user: User?, updateData: Map): Flowable
- fun updateUser(user: User?, key: String, value: Any): Flowable
+ fun updateUser(updateData: Map): Flowable
+ fun updateUser(key: String, value: Any): Flowable
fun retrieveUser(withTasks: Boolean): Flowable
fun retrieveUser(withTasks: Boolean = false, forced: Boolean = false, overrideExisting: Boolean = false): Flowable
fun revive(user: User): Flowable
- fun resetTutorial(user: User?)
+ fun resetTutorial()
fun sleep(user: User): Flowable
@@ -47,7 +49,7 @@ interface UserRepository : BaseRepository {
fun changeClass(selectedClass: String): Flowable
fun unlockPath(user: User?, customization: Customization): Flowable
- fun unlockPath(user: User, set: CustomizationSet): Flowable
+ fun unlockPath(set: CustomizationSet): Flowable
fun runCron(tasks: MutableList)
fun runCron()
@@ -58,7 +60,7 @@ interface UserRepository : BaseRepository {
fun changeCustomDayStart(dayStartTime: Int): Flowable
- fun updateLanguage(user: User?, languageCode: String): Flowable
+ fun updateLanguage(languageCode: String): Flowable
fun resetAccount(): Flowable
fun deleteAccount(password: String): Flowable
@@ -70,7 +72,7 @@ interface UserRepository : BaseRepository {
fun updatePassword(oldPassword: String, newPassword: String, newPasswordConfirmation: String): Flowable
fun verifyUsername(username: String): Flowable
- fun allocatePoint(user: User?, stat: String): Flowable
+ fun allocatePoint(stat: String): Flowable
fun bulkAllocatePoints(user: User?, strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable
fun useCustomization(user: User?, type: String, category: String?, identifier: String): Flowable
@@ -81,4 +83,8 @@ interface UserRepository : BaseRepository {
fun getUserQuestStatus(): Flowable
fun reroll(): Flowable
+ fun retrieveTeamPlans(): Flowable>
+ fun getTeamPlans(): Flowable>
+ fun retrieveTeamPlan(teamID: String): Flowable
+ fun getTeamPlan(teamID: String): Flowable
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
index f79c174f4..a47d6c05e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -780,6 +780,14 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
return apiService.transferGems(mapOf(Pair("toUserId", giftedID), Pair("gemAmount", amount))).compose(configureApiCallObserver())
}
+ override fun getTeamPlans(): Flowable> {
+ return apiService.getTeamPlans().compose(configureApiCallObserver())
+ }
+
+ override fun getTeamPlanTasks(teamID: String): Flowable {
+ return apiService.getTeamPlanTasks(teamID).compose(configureApiCallObserver())
+ }
+
override fun bulkAllocatePoints(strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable {
val body = HashMap>()
val stats = HashMap()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
index e2e6c0707..61caa63e7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
@@ -46,6 +46,7 @@ abstract class ContentRepositoryImpl(localRepository
val editor = PreferenceManager.getDefaultSharedPreferences(context).edit()
editor.putString("currentEvent", it.currentEventKey)
+ editor.putString("currentEventPromo", it.currentEventPromo)
editor.putLong("currentEventStartDate", it.currentEventStartDate?.time ?: 0)
editor.putLong("currentEventEndDate", it.currentEventEndDate?.time ?: 0)
editor.apply()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
index 5febec2fd..32e5f70ab 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
@@ -137,7 +137,7 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
localRepository.executeTransaction {
val liveItem = localRepository.getLiveObject(ownedItem)
val liveUser = localRepository.getLiveObject(user)
- liveItem?.numberOwned = 1 - (liveItem?.numberOwned ?: 0)
+ liveItem?.numberOwned = (liveItem?.numberOwned ?: 0) - 1
liveUser?.stats?.gp = (user.stats?.gp ?: 0.0) + item.value
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index c1cb335bf..b1939df49 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -35,8 +35,8 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
override fun getCurrentUserTasks(taskType: String): Flowable> =
this.localRepository.getTasks(taskType, userID)
- override fun saveTasks(userId: String, order: TasksOrder, tasks: TaskList) {
- localRepository.saveTasks(userId, order, tasks)
+ override fun saveTasks(ownerID: String, order: TasksOrder, tasks: TaskList) {
+ localRepository.saveTasks(ownerID, order, tasks)
}
override fun retrieveTasks(userId: String, tasksOrder: TasksOrder): Flowable {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index b9772ca7c..7b623d4ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -10,11 +10,13 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.Achievement
import com.habitrpg.android.habitica.models.QuestAchievement
import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.TeamPlan
import com.habitrpg.android.habitica.models.inventory.Customization
import com.habitrpg.android.habitica.models.inventory.CustomizationSet
import com.habitrpg.android.habitica.models.responses.SkillResponse
import com.habitrpg.android.habitica.models.responses.UnlockResponse
import com.habitrpg.android.habitica.models.responses.VerifyUsernameResponse
+import com.habitrpg.android.habitica.models.social.Group
import com.habitrpg.android.habitica.models.tasks.Task
import com.habitrpg.android.habitica.models.user.Stats
import com.habitrpg.android.habitica.models.user.User
@@ -33,14 +35,16 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
override fun getUser(userID: String): Flowable = localRepository.getUser(userID)
- override fun updateUser(user: User?, updateData: Map): Flowable {
- return apiClient.updateUser(updateData).map { newUser -> mergeUser(user, newUser) }
+ override fun updateUser(updateData: Map): Flowable {
+ return Flowable.zip(apiClient.updateUser(updateData),
+ localRepository.getUser(userID).firstElement().toFlowable(),
+ { newUser, user -> mergeUser(user, newUser) })
}
- override fun updateUser(user: User?, key: String, value: Any): Flowable {
+ override fun updateUser(key: String, value: Any): Flowable {
val updateData = HashMap()
updateData[key] = value
- return updateUser(user, updateData)
+ return updateUser(updateData)
}
override fun retrieveUser(withTasks: Boolean): Flowable =
@@ -68,7 +72,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
val timeZone = calendar.timeZone
val offset = -TimeUnit.MINUTES.convert(timeZone.getOffset(calendar.timeInMillis).toLong(), TimeUnit.MILLISECONDS)
if (offset.toInt() != user.preferences?.timezoneOffset ?: 0) {
- return@flatMap updateUser(user, "preferences.timezoneOffset", offset.toString())
+ return@flatMap updateUser("preferences.timezoneOffset", offset.toString())
} else {
return@flatMap Flowable.just(user)
}
@@ -80,8 +84,9 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
override fun revive(user: User): Flowable =
apiClient.revive().map { newUser -> mergeUser(user, newUser) }
+ .flatMap { retrieveUser(false, true) }
- override fun resetTutorial(user: User?) {
+ override fun resetTutorial() {
localRepository.getTutorialSteps()
.firstElement()
.map> { tutorialSteps ->
@@ -91,7 +96,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
}
updateData
}
- .flatMap { updateData -> updateUser(user, updateData).firstElement() }
+ .flatMap { updateData -> updateUser(updateData).firstElement() }
.subscribe({ }, RxErrorHandler.handleEmptyError())
}
@@ -136,19 +141,21 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
override fun changeClass(selectedClass: String): Flowable = apiClient.changeClass(selectedClass).flatMap { retrieveUser(false) }
override fun unlockPath(user: User?, customization: Customization): Flowable {
- return apiClient.unlockPath(customization.path)
- .doOnNext { unlockResponse ->
- if (user == null) return@doOnNext
- val copiedUser = localRepository.getUnmanagedCopy(user)
+ var path = customization.path
+ if (path.last() == '.' && customization.type == "background") {
+ path += user?.preferences?.background
+ }
+ return Flowable.zip(apiClient.unlockPath(path), localRepository.getUser(userID).firstElement().toFlowable(), { unlockResponse, copiedUser ->
copiedUser.preferences = unlockResponse.preferences
copiedUser.purchased = unlockResponse.purchased
copiedUser.items = unlockResponse.items
copiedUser.balance = copiedUser.balance - (customization.price ?: 0) / 4.0
localRepository.saveUser(copiedUser, false)
- }
+ unlockResponse
+ })
}
- override fun unlockPath(user: User, set: CustomizationSet): Flowable {
+ override fun unlockPath(set: CustomizationSet): Flowable {
var path = ""
for (customization in set.customizations) {
path = path + "," + customization.path
@@ -157,15 +164,14 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
return Flowable.just(null)
}
path = path.substring(1)
- return apiClient.unlockPath(path)
- .doOnNext { unlockResponse ->
- val copiedUser = localRepository.getUnmanagedCopy(user)
+ return Flowable.zip(apiClient.unlockPath(path), localRepository.getUser(userID).firstElement().toFlowable(), { unlockResponse, copiedUser ->
copiedUser.preferences = unlockResponse.preferences
copiedUser.purchased = unlockResponse.purchased
copiedUser.items = unlockResponse.items
copiedUser.balance = copiedUser.balance - set.price / 4.0
localRepository.saveUser(copiedUser, false)
- }
+ unlockResponse
+ })
}
override fun runCron() {
@@ -178,9 +184,8 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
}
override fun reroll(): Flowable {
- return apiClient.reroll().doOnNext {
- localRepository.saveUser(it, false)
- }
+ return apiClient.reroll()
+ .flatMap { retrieveUser(true, true, true) }
}
override fun readNotifications(notificationIds: Map>): Flowable> =
@@ -195,8 +200,8 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
return apiClient.changeCustomDayStart(updateObject)
}
- override fun updateLanguage(user: User?, languageCode: String): Flowable {
- return updateUser(user, "preferences.language", languageCode)
+ override fun updateLanguage(languageCode: String): Flowable {
+ return updateUser("preferences.language", languageCode)
.doOnNext { apiClient.setLanguageCode(languageCode) }
}
@@ -233,30 +238,26 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
override fun updatePassword(oldPassword: String, newPassword: String, newPasswordConfirmation: String): Flowable =
apiClient.updatePassword(oldPassword.trim(), newPassword.trim(), newPasswordConfirmation.trim())
- override fun allocatePoint(user: User?, stat: String): Flowable {
- if (user != null && user.isManaged) {
- localRepository.modify(user) { liveUser ->
- when (stat) {
- Stats.STRENGTH -> liveUser.stats?.strength = liveUser.stats?.strength?.inc()
- Stats.INTELLIGENCE -> liveUser.stats?.intelligence = liveUser.stats?.intelligence?.inc()
- Stats.CONSTITUTION -> liveUser.stats?.constitution= liveUser.stats?.constitution?.inc()
- Stats.PERCEPTION -> liveUser.stats?.per = liveUser.stats?.per?.inc()
- }
- liveUser.stats?.points = liveUser.stats?.points?.dec()
+ override fun allocatePoint(stat: String): Flowable {
+ localRepository.getUser(userID).subscribe( { liveUser ->
+ when (stat) {
+ Stats.STRENGTH -> liveUser.stats?.strength = liveUser.stats?.strength?.inc()
+ Stats.INTELLIGENCE -> liveUser.stats?.intelligence = liveUser.stats?.intelligence?.inc()
+ Stats.CONSTITUTION -> liveUser.stats?.constitution= liveUser.stats?.constitution?.inc()
+ Stats.PERCEPTION -> liveUser.stats?.per = liveUser.stats?.per?.inc()
}
- }
+ liveUser.stats?.points = liveUser.stats?.points?.dec()
+ }, RxErrorHandler.handleEmptyError())
return apiClient.allocatePoint(stat)
.doOnNext { stats ->
- if (user != null && user.isManaged) {
- localRepository.modify(user) { liveUser ->
+ /*localRepository.modify(user) { liveUser ->
liveUser.stats?.strength = stats.strength
liveUser.stats?.constitution = stats.constitution
liveUser.stats?.per = stats.per
liveUser.stats?.intelligence = stats.intelligence
liveUser.stats?.points = stats.points
liveUser.stats?.mp = stats.mp
- }
- }
+ }*/
}
}
@@ -320,7 +321,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
if (category != null) {
updatePath = "$updatePath.$category"
}
- return updateUser(user, updatePath, identifier)
+ return updateUser(updatePath, identifier)
}
override fun retrieveAchievements(): Flowable> {
@@ -337,6 +338,38 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
return localRepository.getQuestAchievements(userID)
}
+ override fun retrieveTeamPlans(): Flowable> {
+ return apiClient.getTeamPlans().doOnNext { teams ->
+ teams.forEach { it.userID = userID }
+ localRepository.save(teams)
+ }
+ }
+
+ override fun getTeamPlans(): Flowable> {
+ return localRepository.getTeamPlans(userID)
+ }
+
+ override fun retrieveTeamPlan(teamID: String): Flowable {
+ return Flowable.zip(apiClient.getGroup(teamID), apiClient.getTeamPlanTasks(teamID),
+ { team, tasks ->
+ team.tasks = tasks
+ team
+ })
+ .doOnNext { localRepository.save(it) }
+ .doOnNext { team ->
+ val id = team.id
+ val tasksOrder = team.tasksOrder
+ val tasks = team.tasks
+ if (id.isNotBlank() && tasksOrder != null && tasks != null) {
+ taskRepository.saveTasks(id, tasksOrder, tasks)
+ }
+ }
+ }
+
+ override fun getTeamPlan(teamID: String): Flowable {
+ return localRepository.getTeamPlan(teamID)
+ }
+
private fun mergeUser(oldUser: User?, newUser: User): User {
if (oldUser == null || !oldUser.isValid) {
return oldUser ?: newUser
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
index d42576902..508e2e775 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.kt
@@ -1,10 +1,8 @@
package com.habitrpg.android.habitica.data.local
-import com.habitrpg.android.habitica.models.Achievement
-import com.habitrpg.android.habitica.models.QuestAchievement
-import com.habitrpg.android.habitica.models.Skill
-import com.habitrpg.android.habitica.models.TutorialStep
+import com.habitrpg.android.habitica.models.*
import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.android.habitica.models.social.Group
import com.habitrpg.android.habitica.models.user.User
import io.reactivex.rxjava3.core.Flowable
import io.realm.RealmResults
@@ -32,4 +30,6 @@ interface UserLocalRepository : BaseLocalRepository {
fun getAchievements(): Flowable>
fun getQuestAchievements(userID: String): Flowable>
fun getUserQuestStatus(userID: String): Flowable
+ fun getTeamPlans(userID: String): Flowable>
+ fun getTeamPlan(teamID: String): Flowable
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
index 1f2fcda77..a6f92b7de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
@@ -37,21 +37,23 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
.filter { it.isLoaded })
}
- override fun saveTasks(userId: String, tasksOrder: TasksOrder, tasks: TaskList) {
+ override fun saveTasks(ownerID: String, tasksOrder: TasksOrder, tasks: TaskList) {
val sortedTasks = ArrayList()
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.habits))
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.dailys))
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.todos))
sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.rewards))
- removeOldTasks(userId, sortedTasks)
+ removeOldTasks(ownerID, sortedTasks)
val allChecklistItems = ArrayList()
- sortedTasks.forEach { it.checklist?.let { it1 -> allChecklistItems.addAll(it1) } }
- removeOldChecklists(allChecklistItems)
-
val allReminders = ArrayList()
- sortedTasks.forEach { it.reminders?.let { it1 -> allReminders.addAll(it1) } }
+ sortedTasks.forEach {
+ if (it.userId.isBlank()) it.userId = ownerID
+ it.checklist?.let { it1 -> allChecklistItems.addAll(it1) }
+ it.reminders?.let { it1 -> allReminders.addAll(it1) }
+ }
removeOldReminders(allReminders)
+ removeOldChecklists(allChecklistItems)
executeTransaction { realm1 -> realm1.insertOrUpdate(sortedTasks) }
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
index 9491f28d4..aed8622af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
@@ -53,7 +53,8 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
override fun getTutorialSteps(): Flowable> = RxJavaBridge.toV3Flowable(realm.where(TutorialStep::class.java).findAll().asFlowable()
.filter { it.isLoaded })
-override fun getUser(userID: String): Flowable {
+
+ override fun getUser(userID: String): Flowable {
if (realm.isClosed) return Flowable.empty()
return RxJavaBridge.toV3Flowable(realm.where(User::class.java)
.equalTo("id", userID)
@@ -134,10 +135,29 @@ override fun getUser(userID: String): Flowable {
}
}
+ override fun getTeamPlans(userID: String): Flowable> {
+ return RxJavaBridge.toV3Flowable(realm.where(TeamPlan::class.java)
+ .equalTo("userID", userID)
+ .findAll()
+ .asFlowable()
+ .filter { it.isLoaded })
+ }
+
+ override fun getTeamPlan(teamID: String): Flowable {
+ if (realm.isClosed) return Flowable.empty()
+ return RxJavaBridge.toV3Flowable(realm.where(Group::class.java)
+ .equalTo("id", teamID)
+ .findAll()
+ .asFlowable()
+ .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
+ .map { teams -> teams.first() })
+ }
+
override fun getSkills(user: User): Flowable> {
val habitClass = if (user.preferences?.disableClasses == true) "none" else user.stats?.habitClass
return RxJavaBridge.toV3Flowable(realm.where(Skill::class.java)
.equalTo("habitClass", habitClass)
+ .sort("lvl")
.findAll()
.asFlowable()
.filter { it.isLoaded })
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt
index 150a89d25..081a69e33 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShowAchievementDialog.kt
@@ -1,3 +1,3 @@
package com.habitrpg.android.habitica.events
-class ShowAchievementDialog(var type: String, val id: String, val isLastOnboardingAchievement: Boolean = false)
+class ShowAchievementDialog(var type: String, val id: String, val message: String? = null, val text: String? = null, val isLastOnboardingAchievement: Boolean = false)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Activity-Extension.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Activity-Extension.kt
new file mode 100644
index 000000000..30f595876
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Activity-Extension.kt
@@ -0,0 +1,10 @@
+package com.habitrpg.android.habitica.extensions
+
+import android.app.Activity
+import android.content.Context
+import android.view.inputmethod.InputMethodManager
+
+fun Activity.hideKeyboard() {
+ val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+ imm.hideSoftInputFromWindow(window.decorView.windowToken, 0)
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/String-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/String-Extensions.kt
new file mode 100644
index 000000000..c0f100088
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/String-Extensions.kt
@@ -0,0 +1,12 @@
+package com.habitrpg.android.habitica.extensions
+
+import android.text.Html
+
+fun String.fromHtml(): CharSequence {
+ return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+ Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY)
+ } else {
+ @Suppress("DEPRECATION")
+ Html.fromHtml(this)
+ }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
index a069d81cc..53441ccdc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
@@ -22,10 +22,6 @@ class AppConfigManager {
return remoteConfig.getLong("maxChatLength")
}
- fun enableGiftOneGetOne(): Boolean {
- return remoteConfig.getBoolean("enableGiftOneGetOne")
- }
-
fun spriteSubstitutions(): Map> {
val type = object : TypeToken>>() {}.type
return Gson().fromJson(remoteConfig.getString("spriteSubstitutions"), type)
@@ -112,7 +108,7 @@ class AppConfigManager {
val startDate = if (startDateLong > 0) Date(startDateLong) else null
val endDateLong = preferences.getLong("currentEventEndDate", 0)
val endDate = if (endDateLong > 0) Date(endDateLong) else null
- return getHabiticaPromotionFromKey(key, startDate, endDate)
+ return getHabiticaPromotionFromKey(preferences.getString("currentEventPromo", null) ?: key, startDate, endDate)
}
return null
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
index eadbedfee..476280ca2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
@@ -3,8 +3,12 @@ package com.habitrpg.android.habitica.helpers
import android.content.Intent
import androidx.core.os.bundleOf
import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.events.ShowWonChallengeDialog
import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
+import com.habitrpg.android.habitica.models.Notification
+import com.habitrpg.android.habitica.models.notifications.ChallengeWonData
import com.habitrpg.android.habitica.models.user.User
+import org.greenrobot.eventbus.EventBus
class NotificationOpenHandler {
@@ -44,7 +48,7 @@ class NotificationOpenHandler {
}
private fun openGiftOneGetOneInfoScreen() {
- MainNavigationController.navigate(R.id.giftOneGetOneInfoActivity)
+ MainNavigationController.navigate(R.id.subscriptionPurchaseActivity)
}
private fun openQuestDetailSCreen(partyId: String?, questKey: String?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
index ae327c2e7..beb79e512 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
@@ -72,6 +72,31 @@ class NotificationsManager (private val context: Context) {
Notification.Type.ACHIEVEMENT_CHALLENGE_JOINED.type -> displayAchievementNotification(it)
Notification.Type.ACHIEVEMENT_INVITED_FRIEND.type -> displayAchievementNotification(it)
Notification.Type.WON_CHALLENGE.type -> displayWonChallengeNotificaiton(it)
+
+ Notification.Type.ACHIEVEMENT_ALL_YOUR_BASE.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_BACK_TO_BASICS.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_JUST_ADD_WATER.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_LOST_MASTERCLASSER.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_MIND_OVER_MATTER.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_DUST_DEVIL.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_ARID_AUTHORITY.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_MONSTER_MAGUS.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_UNDEAD_UNDERTAKER.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_PRIMED_FOR_PAINTING.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_PEARLY_PRO.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_TICKLED_PINK.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_ROSY_OUTLOOK.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_BUG_BONANZA.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_BARE_NECESSITIES.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_FRESHWATER_FRIENDS.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_ALL_THAT_GLITTERS.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_BONE_COLLECTOR.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_SKELETON_CREW.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_SEEING_RED.type -> displayAchievementNotification(it)
+ Notification.Type.ACHIEVEMENT_RED_LETTER_DAY.type -> displayAchievementNotification(it)
+
Notification.Type.ACHIEVEMENT_GENERIC.type -> displayAchievementNotification(it, notifications.find { notif ->
notif.type == Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type
} != null)
@@ -89,7 +114,7 @@ class NotificationsManager (private val context: Context) {
return true
}
- private fun displayWonChallengeNotificaiton(notification: Notification): Any {
+ private fun displayWonChallengeNotificaiton(notification: Notification): Boolean {
EventBus.getDefault().post(ShowWonChallengeDialog(notification.id, notification.data as? ChallengeWonData))
return true
}
@@ -121,7 +146,8 @@ class NotificationsManager (private val context: Context) {
}
private fun displayAchievementNotification(notification: Notification, isLastOnboardingAchievement: Boolean = false): Boolean {
- val achievement = (notification.data as? AchievementData)?.achievement ?: notification.type ?: ""
+ val data = (notification.data as? AchievementData)
+ val achievement = data?.achievement ?: notification.type ?: ""
val delay: Long = if (achievement == "createdTask" || achievement == Notification.Type.ACHIEVEMENT_ONBOARDING_COMPLETE.type) {
1000
} else {
@@ -130,7 +156,7 @@ class NotificationsManager (private val context: Context) {
val sub = Completable.complete()
.delay(delay, TimeUnit.MILLISECONDS)
.subscribe({
- EventBus.getDefault().post(ShowAchievementDialog(achievement, notification.id, isLastOnboardingAchievement))
+ EventBus.getDefault().post(ShowAchievementDialog(achievement, notification.id, data?.message, data?.modalText, isLastOnboardingAchievement))
}, RxErrorHandler.handleEmptyError())
logOnboardingEvents(achievement)
return true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
index e2270b20e..53a40845d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
@@ -5,6 +5,7 @@ import android.content.Intent
import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
import org.solovyev.android.checkout.*
+import retrofit2.Response
import java.util.*
class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy) {
@@ -184,7 +185,10 @@ class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy
}
override fun onError(response: Int, e: java.lang.Exception) {
- e.printStackTrace()
+ crashlyticsProxy.logException(e)
+ if (response == ResponseCodes.ITEM_ALREADY_OWNED) {
+ checkIfPendingPurchases()
+ }
}
}))
}
@@ -203,7 +207,9 @@ class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy
})
}
- override fun onError(response: Int, e: java.lang.Exception) { /* no-op */ }
+ override fun onError(response: Int, e: java.lang.Exception) {
+ crashlyticsProxy.logException(e)
+ }
}))
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
index d73dc9926..b9971cebe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
@@ -5,6 +5,8 @@ import com.google.firebase.messaging.FirebaseMessagingService
import com.google.firebase.messaging.RemoteMessage
import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
import javax.inject.Inject
class HabiticaFirebaseMessagingService : FirebaseMessagingService() {
@@ -15,10 +17,17 @@ class HabiticaFirebaseMessagingService : FirebaseMessagingService() {
@Inject
internal lateinit var pushNotificationManager: PushNotificationManager
+ @Inject
+ internal lateinit var userRepository: UserRepository
+
override fun onMessageReceived(remoteMessage: RemoteMessage) {
userComponent?.inject(this)
if (this::pushNotificationManager.isInitialized) {
pushNotificationManager.displayNotification(remoteMessage)
+
+ if (remoteMessage.data["identifier"]?.contains(PushNotificationManager.WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true) {
+ userRepository.retrieveUser(true).subscribe({}, RxErrorHandler.handleEmptyError())
+ }
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
index 846c6596c..bc39291dd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
@@ -57,6 +57,7 @@ abstract class HabiticaLocalNotification(protected var context: Context, protect
protected open fun setNotificationActions(data: Map) {
val intent = Intent(context, MainActivity::class.java)
intent.putExtra("notificationIdentifier", identifier)
+ intent.putExtra("notificationTimeStamp", Date().time)
configureMainIntent(intent)
val pendingIntent = PendingIntent.getActivity(
context,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
index be15690a4..5ccf6e63b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
@@ -27,6 +27,29 @@ class Notification {
ACHIEVEMENT_GENERIC("ACHIEVEMENT"),
ACHIEVEMENT_ONBOARDING_COMPLETE("ONBOARDING_COMPLETE"),
+ ACHIEVEMENT_ALL_YOUR_BASE("ACHIEVEMENT_ALL_YOUR_BASE"),
+ ACHIEVEMENT_BACK_TO_BASICS("ACHIEVEMENT_BACK_TO_BASICS"),
+ ACHIEVEMENT_JUST_ADD_WATER("ACHIEVEMENT_JUST_ADD_WATER"),
+ ACHIEVEMENT_LOST_MASTERCLASSER("ACHIEVEMENT_LOST_MASTERCLASSER"),
+ ACHIEVEMENT_MIND_OVER_MATTER("ACHIEVEMENT_MIND_OVER_MATTER"),
+ ACHIEVEMENT_DUST_DEVIL("ACHIEVEMENT_DUST_DEVIL"),
+ ACHIEVEMENT_ARID_AUTHORITY("ACHIEVEMENT_ARID_AUTHORITY"),
+ ACHIEVEMENT_MONSTER_MAGUS("ACHIEVEMENT_MONSTER_MAGUS"),
+ ACHIEVEMENT_UNDEAD_UNDERTAKER("ACHIEVEMENT_UNDEAD_UNDERTAKER"),
+ ACHIEVEMENT_PRIMED_FOR_PAINTING("ACHIEVEMENT_PRIMED_FOR_PAINTING"),
+ ACHIEVEMENT_PEARLY_PRO("ACHIEVEMENT_PEARLY_PRO"),
+ ACHIEVEMENT_TICKLED_PINK("ACHIEVEMENT_TICKLED_PINK"),
+ ACHIEVEMENT_ROSY_OUTLOOK("ACHIEVEMENT_ROSY_OUTLOOK"),
+ ACHIEVEMENT_BUG_BONANZA("ACHIEVEMENT_BUG_BONANZA"),
+ ACHIEVEMENT_BARE_NECESSITIES("ACHIEVEMENT_BARE_NECESSITIES"),
+ ACHIEVEMENT_FRESHWATER_FRIENDS("ACHIEVEMENT_FRESHWATER_FRIENDS"),
+ ACHIEVEMENT_GOOD_AS_GOLD("ACHIEVEMENT_GOOD_AS_GOLD"),
+ ACHIEVEMENT_ALL_THAT_GLITTERS("ACHIEVEMENT_ALL_THAT_GLITTERS"),
+ ACHIEVEMENT_BONE_COLLECTOR("ACHIEVEMENT_BONE_COLLECTOR"),
+ ACHIEVEMENT_SKELETON_CREW("ACHIEVEMENT_SKELETON_CREW"),
+ ACHIEVEMENT_SEEING_RED("ACHIEVEMENT_SEEING_RED"),
+ ACHIEVEMENT_RED_LETTER_DAY("ACHIEVEMENT_RED_LETTER_DAY"),
+
FIRST_DROP("FIRST_DROPS"),
// Custom notification types (created by this app)
@@ -57,6 +80,31 @@ class Notification {
Type.FIRST_DROP.type -> FirstDropData::class.java
Type.ACHIEVEMENT_GENERIC.type -> AchievementData::class.java
Type.WON_CHALLENGE.type -> ChallengeWonData::class.java
+
+ Type.ACHIEVEMENT_ALL_YOUR_BASE.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_BACK_TO_BASICS.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_JUST_ADD_WATER.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_LOST_MASTERCLASSER.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_MIND_OVER_MATTER.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_DUST_DEVIL.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_ARID_AUTHORITY.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_MONSTER_MAGUS.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_UNDEAD_UNDERTAKER.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_PRIMED_FOR_PAINTING.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_PEARLY_PRO.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_TICKLED_PINK.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_ROSY_OUTLOOK.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_BUG_BONANZA.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_BARE_NECESSITIES.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_FRESHWATER_FRIENDS.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_ALL_THAT_GLITTERS.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_GOOD_AS_GOLD.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_BONE_COLLECTOR.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_SKELETON_CREW.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_SEEING_RED.type -> AchievementData::class.java
+ Type.ACHIEVEMENT_RED_LETTER_DAY.type -> AchievementData::class.java
+
else -> null
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
index 7601ea69a..845685c7d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.kt
@@ -21,12 +21,11 @@ open class Tag : RealmObject() {
}
- override fun equals(o: Any?): Boolean {
- if (Tag::class.java.isAssignableFrom(o!!.javaClass)) {
- val otherTag = o as Tag?
- return this.id == otherTag!!.id
+ override fun equals(other: Any?): Boolean {
+ if (other is Tag) {
+ return this.id == other.id
}
- return super.equals(o)
+ return super.equals(other)
}
override fun hashCode(): Int {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TeamPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TeamPlan.kt
new file mode 100644
index 000000000..63158fc06
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TeamPlan.kt
@@ -0,0 +1,29 @@
+package com.habitrpg.android.habitica.models
+
+import com.google.gson.annotations.SerializedName
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class TeamPlan : RealmObject() {
+ @PrimaryKey
+ var id: String = ""
+
+ var userID: String? = null
+ var summary: String = ""
+ @SerializedName("leader")
+ var leaderID: String? = null
+ //var managers: RealmList = RealmList()
+ var isActive: Boolean = false
+
+ override fun equals(other: Any?): Boolean {
+ if (other is TeamPlan) {
+ return this.id == other.id
+ }
+ return super.equals(other)
+ }
+
+ override fun hashCode(): Int {
+ return id.hashCode()
+ }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt
index 76d268836..3cadec4ed 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/WorldState.kt
@@ -12,6 +12,7 @@ class WorldState {
var rageStrikes: MutableList? = null
var currentEventKey: String? = null
+ var currentEventPromo: String? = null
var currentEventStartDate: Date? = null
var currentEventEndDate: Date? = null
}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/AchievementData.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/AchievementData.kt
index 17f66cceb..3fe34cd06 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/AchievementData.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/AchievementData.kt
@@ -3,5 +3,6 @@ package com.habitrpg.android.habitica.models.notifications
open class AchievementData : NotificationData {
var achievement: String? = null
-
+ var message: String? = null
+ var modalText: String? = null
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
index 83b28dabe..72eac86e4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
@@ -9,6 +9,7 @@ import android.view.View
import androidx.core.content.ContextCompat
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
+import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
import com.habitrpg.android.habitica.extensions.DateUtils
import com.habitrpg.android.habitica.helpers.MainNavigationController
@@ -83,6 +84,9 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
binding.promoBannerDurationView.setTextColor(Color.parseColor("#FEE2B6"))
}
+ override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
+ }
+
override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
val context = binding.root.context
binding.root.background = promoBackgroundDrawable(context)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt
new file mode 100644
index 000000000..997ce0335
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt
@@ -0,0 +1,133 @@
+package com.habitrpg.android.habitica.models.promotions
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.ShapeDrawable
+import android.view.View
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
+import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
+import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
+import com.habitrpg.android.habitica.extensions.DateUtils
+import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
+import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionFragment
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
+import java.text.SimpleDateFormat
+import java.util.*
+
+class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : HabiticaPromotion() {
+ override val identifier: String
+ get() = "g1g1"
+ override val promoType: PromoType
+ get() = PromoType.SUBSCRIPTION
+ override val startDate: Date = startDate ?: DateUtils.createDate(2020, 11, 17)
+ override val endDate: Date = endDate ?: DateUtils.createDate(2021, 0, 7)
+
+ override fun pillBackgroundDrawable(context: Context): Drawable {
+ return ContextCompat.getDrawable(context, R.drawable.g1g1_promo_pill_bg) ?: ShapeDrawable()
+ }
+
+ override fun backgroundColor(context: Context): Int {
+ return ContextCompat.getColor(context, R.color.gray_10)
+ }
+
+ override fun promoBackgroundDrawable(context: Context): Drawable {
+ return ContextCompat.getDrawable(context, R.drawable.g1g1_promo_background)
+ ?: ShapeDrawable()
+ }
+
+ override fun buttonDrawable(context: Context): Drawable {
+ return ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_content)
+ ?: ShapeDrawable()
+ }
+
+ override fun configurePromoMenuView(view: PromoMenuView) {
+ val context = view.context
+ view.background = ContextCompat.getDrawable(context, R.drawable.g1g1_menu_background)
+ view.setTitleText(context.getString(R.string.promo_g1g1_prompt))
+ view.setSubtitleText(context.getString(R.string.promo_g1g1_description))
+
+ view.setDecoration(
+ ContextCompat.getDrawable(context, R.drawable.g1g1_promo_menu_left),
+ ContextCompat.getDrawable(context, R.drawable.g1g1_promo_menu_right)
+ )
+
+ view.binding.button.backgroundTintList = ContextCompat.getColorStateList(context, R.color.content_background)
+ view.binding.button.setText(R.string.learn_more)
+ if (context.isUsingNightModeResources()) {
+ view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.teal_100))
+ } else {
+ view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.teal_10))
+ }
+ view.binding.button.setOnClickListener {
+ menuOnNavigation(context)
+ }
+ }
+
+ override fun menuOnNavigation(context: Context) {
+ MainNavigationController.navigate(R.id.promoInfoFragment)
+ }
+
+ override fun configurePurchaseBanner(binding: FragmentGemPurchaseBinding) {
+ val context = binding.root.context
+ binding.promoBanner.visibility = View.VISIBLE
+ binding.promoBanner.background = promoBackgroundDrawable(context)
+ binding.promoBannerLeftImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_left_small))
+ binding.promoBannerRightImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_right_small))
+ binding.promoBannerTitleImage.visibility = View.GONE
+ binding.promoBannerDurationView.visibility = View.GONE
+ binding.promoBannerTitleText.visibility = View.VISIBLE
+ val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
+ binding.promoBannerTitleText.text = context.getString(R.string.gift_one_get_one_purchase_banner, formatter.format(endDate))
+ }
+
+ override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
+ val context = binding.root.context
+ binding.promoBanner.visibility = View.VISIBLE
+ binding.promoBanner.background = promoBackgroundDrawable(context)
+ binding.promoBannerLeftImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_left_small))
+ binding.promoBannerRightImage.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_right_small))
+ binding.promoBannerTitleImage.visibility = View.GONE
+ binding.promoBannerDurationView.visibility = View.GONE
+ binding.promoBannerTitleText.visibility = View.VISIBLE
+ val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
+ binding.promoBannerTitleText.text = context.getString(R.string.gift_one_get_one_purchase_banner, formatter.format(endDate))
+ }
+
+ override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
+ }
+
+ override fun configureInfoFragment(fragment: PromoInfoFragment) {
+ val context = fragment.context ?: return
+ fragment.binding?.promoBanner?.background = promoBackgroundDrawable(context)
+ fragment.binding?.promoBannerLeftImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_left))
+ fragment.binding?.promoBannerRightImage?.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.g1g1_promo_right))
+ fragment.binding?.promoBannerTitleImage?.visibility = View.GONE
+ fragment.binding?.promoBannerTitleText?.visibility = View.VISIBLE
+ fragment.binding?.promoBannerTitleText?.text = context.getString(R.string.gift_one_get_one)
+ fragment.binding?.promoBannerSubtitleView?.setText(R.string.limited_event)
+ val formatter = SimpleDateFormat("MMM d", Locale.getDefault())
+ fragment.binding?.promoBannerDurationView?.text = context.getString(R.string.x_to_y,
+ formatter.format(startDate),
+ formatter.format(endDate))
+ fragment.binding?.promoBannerDurationView?.setTextColor(ContextCompat.getColor(context, R.color.white))
+ fragment.binding?.promptText?.setText(R.string.g1g1_promo_info_prompt)
+ fragment.binding?.promptText?.setTextColor(ContextCompat.getColor(context, R.color.text_teal))
+ fragment.binding?.promptButton?.background = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_400)
+ fragment.binding?.promptButton?.setText(R.string.gift_a_subscription)
+ fragment.binding?.promptButton?.setTextColor(ContextCompat.getColor(context, R.color.white))
+ fragment.binding?.promptButton?.setOnClickListener {
+ fragment.context?.let { context -> SubscriptionFragment.showGiftSubscriptionDialog(context, true) }
+ }
+
+ fragment.binding?.instructionDescriptionView?.text = context.getString(R.string.g1g1_promo_info_instructions)
+ val limitationsFormatter = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.LONG, SimpleDateFormat.LONG)
+ fragment.binding?.limitationsDescriptionView?.text = context.getString(R.string.g1g1_promo_info_limitations, limitationsFormatter.format(startDate), limitationsFormatter.format(endDate))
+ }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
index bc8e23e76..6361537b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/HabiticaPromotion.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.models.promotions
import android.content.Context
import android.graphics.drawable.Drawable
import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
+import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
@@ -31,6 +32,7 @@ abstract class HabiticaPromotion {
abstract fun menuOnNavigation(context: Context)
abstract fun configurePurchaseBanner(binding: FragmentGemPurchaseBinding)
+ abstract fun configurePurchaseBanner(binding: FragmentSubscriptionBinding)
abstract fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int)
abstract fun configureInfoFragment(fragment: PromoInfoFragment)
@@ -40,6 +42,7 @@ fun getHabiticaPromotionFromKey(key: String, startDate: Date?, endDate: Date?):
return when (key) {
"fall_extra_gems", "fall2020", "testFall2020" -> FallExtraGemsHabiticaPromotion(startDate, endDate)
"spooky_extra_gems", "fall2020SecondPromo", "spooky2020" -> SpookyExtraGemsHabiticaPromotion(startDate, endDate)
+ "g1g1" -> GiftOneGetOneHabiticaPromotion(startDate, endDate)
else -> null
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
similarity index 97%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
index 29b846256..c37289e1e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromo.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
@@ -9,6 +9,7 @@ import android.view.View
import androidx.core.content.ContextCompat
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
+import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
import com.habitrpg.android.habitica.databinding.PurchaseGemViewBinding
import com.habitrpg.android.habitica.extensions.DateUtils
import com.habitrpg.android.habitica.helpers.MainNavigationController
@@ -83,6 +84,9 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
binding.promoBannerDurationView.setTextColor(ContextCompat.getColor(context, R.color.white))
}
+ override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
+ }
+
override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
val context = binding.root.context
binding.root.background = promoBackgroundDrawable(context)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
index 422a8868b..afc20a4dc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
@@ -57,7 +57,7 @@ open class ShopItem : RealmObject() {
var level: Int? = null
val isTypeItem: Boolean
- get() = "eggs" == purchaseType || "hatchingPotions" == purchaseType || "food" == purchaseType || "armoire" == purchaseType || "potion" == purchaseType || "debuffPotion" == purchaseType
+ get() = "eggs" == purchaseType || "hatchingPotions" == purchaseType || "food" == purchaseType || "armoire" == purchaseType || "potion" == purchaseType || "debuffPotion" == purchaseType || "fortify" == purchaseType
val isTypeQuest: Boolean
get() = "quests" == purchaseType
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
index 4d1ed7ab0..eb2785d9e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
@@ -3,10 +3,13 @@ package com.habitrpg.android.habitica.models.social
import com.google.gson.annotations.SerializedName
import com.habitrpg.android.habitica.models.BaseObject
import com.habitrpg.android.habitica.models.inventory.Quest
+import com.habitrpg.android.habitica.models.tasks.TaskList
+import com.habitrpg.android.habitica.models.tasks.TasksOrder
import com.habitrpg.android.habitica.models.user.User
import io.realm.RealmList
import io.realm.RealmObject
+import io.realm.annotations.Ignore
import io.realm.annotations.PrimaryKey
open class Group : RealmObject(), BaseObject {
@@ -38,6 +41,12 @@ open class Group : RealmObject(), BaseObject {
var leaderOnlyChallenges: Boolean = false
var leaderOnlyGetGems: Boolean = false
+
+ @Ignore
+ var tasksOrder: TasksOrder? = null
+ @Ignore
+ var tasks: TaskList? = null
+
override fun equals(other: Any?): Boolean {
if (this === other) {
return true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index f3bc85609..7cdfde211 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -171,7 +171,7 @@ open class Task : RealmObject, BaseObject, Parcelable {
get() = this.checklist?.size != this.completedChecklistCount
val isGroupTask: Boolean
- get() = group?.approvalApproved == true
+ get() = group?.groupID?.isNotBlank() == true
val isPendingApproval: Boolean
get() = (group?.approvalRequired == true && group?.approvalRequested == true && group?.approvalApproved == false)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt
index cf4623a8d..db59ecaf2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt
@@ -1,14 +1,25 @@
package com.habitrpg.android.habitica.models.tasks
+import com.google.gson.annotations.SerializedName
+import io.realm.RealmList
import io.realm.RealmObject
import io.realm.annotations.PrimaryKey
+import java.util.*
open class TaskGroupPlan : RealmObject() {
@PrimaryKey
internal var taskID: String? = null
+ @SerializedName("id")
+ var groupID: String? = null
+ var managerNotes: String? = null
+ var sharedCompletion: String? = null
+ var assignedDate: Date? = null
+ var assigningUsername: String? = null
+ var assignedUsers: RealmList = RealmList()
+
var approvalRequested: Boolean = false
var approvalApproved: Boolean = false
var approvalRequired: Boolean = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
index 4d6cbc5d7..211053f05 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
@@ -217,11 +217,7 @@ class AvatarView : View {
avatar.stats?.buffs?.let { buffs ->
if (buffs.snowball == true) {
- if (Calendar.getInstance().get(Calendar.YEAR) > 2019) {
- layerMap[LayerType.VISUAL_BUFF] = "avatar_snowball_" + avatar.stats?.habitClass
- } else {
- layerMap[LayerType.VISUAL_BUFF] = "snowman"
- }
+ layerMap[LayerType.VISUAL_BUFF] = "avatar_snowball_" + avatar.stats?.habitClass
hasVisualBuffs = true
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
index bc2e1f736..c989e9fda 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
@@ -4,7 +4,6 @@ import android.graphics.Paint
import android.graphics.PorterDuff
import android.os.Build
import android.os.Bundle
-import android.text.Html
import android.view.MenuItem
import android.view.View
import android.widget.TextView
@@ -15,6 +14,7 @@ import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.databinding.ActivityAdventureGuideBinding
import com.habitrpg.android.habitica.databinding.AdventureGuideItemBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
@@ -65,11 +65,7 @@ class AdventureGuideActivity : BaseActivity() {
)
val descriptionText = getString(R.string.adventure_guide_description)
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- binding.descriptionView.setText(Html.fromHtml(descriptionText, Html.FROM_HTML_MODE_LEGACY), TextView.BufferType.SPANNABLE)
- } else {
- binding.descriptionView.setText(Html.fromHtml(descriptionText), TextView.BufferType.SPANNABLE)
- }
+ binding.descriptionView.setText(descriptionText.fromHtml(), TextView.BufferType.SPANNABLE)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
index 6d1aaa5eb..6bb7d5eb6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
@@ -19,7 +19,9 @@ import com.habitrpg.android.habitica.data.ChallengeRepository
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.databinding.ActivityCreateChallengeBinding
+import com.habitrpg.android.habitica.extensions.addCloseButton
import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.social.Challenge
import com.habitrpg.android.habitica.models.social.Group
@@ -27,10 +29,15 @@ import com.habitrpg.android.habitica.models.tasks.Task
import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.android.habitica.modules.AppModule
import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragmentDirections
import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
import java.lang.NumberFormatException
import java.util.*
import javax.inject.Inject
@@ -132,11 +139,22 @@ class ChallengeFormActivity : BaseActivity() {
createChallenge()
}
- compositeSubscription.add(observable.subscribe({
- dialog.dismiss()
- savingInProgress = false
- finish()
- }, { throwable ->
+ compositeSubscription.add(observable
+ .flatMap {
+ challengeId = it.id
+ challengeRepository.retrieveChallenges(0, true)
+ }
+ .subscribe({
+ dialog.dismiss()
+ savingInProgress = false
+ finish()
+ if (!editMode) {
+ GlobalScope.launch(context = Dispatchers.Main) {
+ delay(500L)
+ MainNavigationController.navigate(ChallengesOverviewFragmentDirections.openChallengeDetail(challengeId ?: ""))
+ }
+ }
+ }, { throwable ->
dialog.dismiss()
savingInProgress = false
RxErrorHandler.reportError(throwable)
@@ -198,6 +216,7 @@ class ChallengeFormActivity : BaseActivity() {
if (errorMessages.count() > 0) {
val alert = HabiticaAlertDialog(this)
alert.setMessage(errorMessages.joinToString("\n"))
+ alert.addCloseButton(true)
alert.enqueue()
}
return errorMessages.size == 0
@@ -324,7 +343,7 @@ class ChallengeFormActivity : BaseActivity() {
locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
compositeSubscription.add(socialRepository.getUserGroups("guild").zipWith(userRepository.getUser()
- .map { "" }
+ .map { it.party?.id ?: "" }
.distinctUntilChanged()
.flatMap {
if (it.isBlank()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index 8fb6c78e1..1ab0b3682 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -71,6 +71,8 @@ class ClassSelectionActivity : BaseActivity(), Consumer {
isInitialSelection = args.isInitialSelection
currentClass = args.className
+ newClass = currentClass ?: "healer"
+
compositeSubscription.add(userRepository.getUser().firstElement().subscribe({
it.preferences?.let {preferences ->
val unmanagedPrefs = userRepository.getUnmanagedCopy(preferences)
@@ -91,11 +93,6 @@ class ClassSelectionActivity : BaseActivity(), Consumer {
binding.selectedButton.setOnClickListener { displayConfirmationDialogForClass() }
}
- override fun onStart() {
- super.onStart()
- newClass = currentClass ?: "healer"
- }
-
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.class_selection, menu)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
index d3ab6e73e..79f86bd6d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
@@ -82,7 +82,7 @@ class FixCharacterValuesActivity: BaseActivity() {
userInfo["stats.mp"] = binding.manaEditText.getDoubleValue()
userInfo["stats.lvl"] = binding.levelEditText.getDoubleValue().toInt()
userInfo["achievements.streak"] = binding.streakEditText.getDoubleValue().toInt()
- compositeSubscription.add(repository.updateUser(user, userInfo)
+ compositeSubscription.add(repository.updateUser(userInfo)
.flatMap { repository.retrieveUser(false, true, true) }
.subscribe({}, RxErrorHandler.handleEmptyError(), {
progressDialog.dismiss()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
index 0073f008b..cc354aab7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
@@ -44,9 +44,14 @@ import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayTy
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import io.reactivex.rxjava3.core.Flowable
import io.realm.RealmResults
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
import java.text.SimpleDateFormat
import java.util.*
import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
import kotlin.math.floor
import kotlin.math.min
@@ -182,7 +187,11 @@ class FullProfileActivity : BaseActivity() {
}
private fun showSendMessageToUserDialog() {
- MainNavigationController.navigate(R.id.inboxFragment, bundleOf(Pair("username", username), Pair("userID", userID)))
+ finish()
+ GlobalScope.launch(context = Dispatchers.Main) {
+ delay(1000L)
+ MainNavigationController.navigate(R.id.inboxMessageListFragment, bundleOf(Pair("username", username), Pair("userID", userID)))
+ }
}
private fun updateView(user: Member) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftOneGetOneInfoActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftOneGetOneInfoActivity.kt
deleted file mode 100644
index b3d9bf36c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftOneGetOneInfoActivity.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.EditText
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.databinding.ActivityGift1get1InfoBinding
-import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-
-class GiftOneGetOneInfoActivity : BaseActivity() {
- private lateinit var binding: ActivityGift1get1InfoBinding
-
- override fun getLayoutResId(): Int {
- return R.layout.activity_gift1get1_info
- }
-
- override fun injectActivity(component: UserComponent?) {
-
- }
-
- override fun getContentView(): View {
- binding = ActivityGift1get1InfoBinding.inflate(layoutInflater)
- return binding.root
- }
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- binding.cancelButton.setOnClickListener {
- finish()
- }
-
- binding.giftButton.setOnClickListener {
- showGiftSubscriptionDialog()
- }
- }
-
- private fun showGiftSubscriptionDialog() {
- val chooseRecipientDialogView = layoutInflater.inflate(R.layout.dialog_choose_message_recipient, null)
-
- val alert = HabiticaAlertDialog(this)
- alert.setTitle(getString(R.string.gift_title))
- alert.addButton(getString(R.string.action_continue), true) { _, _ ->
- val usernameEditText = chooseRecipientDialogView?.findViewById(R.id.uuidEditText) as? EditText
- val intent = Intent(this, GiftSubscriptionActivity::class.java).apply {
- putExtra("username", usernameEditText?.text.toString())
- }
- startActivity(intent)
- finish()
- }
- alert.addCancelButton { _, _ ->
- }
- alert.setAdditionalContentView(chooseRecipientDialogView)
- alert.show()
- }
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
index fab336154..d71e6a20e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
@@ -78,8 +78,6 @@ class GiftSubscriptionActivity : BaseActivity() {
selectedSubscriptionSku?.let { sku -> purchaseSubscription(sku) }
}
- binding.giftSubscriptionContainer.isVisible = appConfigManager.enableGiftOneGetOne()
-
compositeSubscription.add(socialRepository.getMember(giftedUsername ?: giftedUserID).subscribe({
binding.avatarView.setAvatar(it)
binding.displayNameTextView.username = it.profile?.name
@@ -200,7 +198,7 @@ class GiftSubscriptionActivity : BaseActivity() {
}
private fun displayConfirmationDialog() {
- val message = getString(if (appConfigManager.enableGiftOneGetOne()){
+ val message = getString(if (appConfigManager.activePromo(this)?.identifier == "g1g1"){
R.string.gift_confirmation_text_sub_g1g1
} else {
R.string.gift_confirmation_text_sub
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
index 1cc20c156..4ac6a5e35 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
@@ -64,15 +64,6 @@ class GroupFormActivity : BaseActivity() {
binding.saveButton.setOnClickListener {
finishActivitySuccessfuly()
}
-
- autocompleteAdapter = AutocompleteAdapter(this)
- val tokenizer = AutocompleteTokenizer(listOf(':'))
- binding.groupNameEditText.setAdapter(autocompleteAdapter)
- binding.groupNameEditText.threshold = 2
- binding.groupNameEditText.setTokenizer(tokenizer)
- binding.groupDescriptionEditText.setAdapter(autocompleteAdapter)
- binding.groupDescriptionEditText.setTokenizer(tokenizer)
- binding.groupDescriptionEditText.threshold = 2
}
@@ -108,7 +99,7 @@ class GroupFormActivity : BaseActivity() {
val bundle = Bundle()
bundle.putString("name", name)
bundle.putString("groupType", groupType)
- bundle.putString("description", MarkdownParser.parseCompiled(binding.groupDescriptionEditText.text))
+ bundle.putString("description", MarkdownParser.parseCompiled(binding.groupDescriptionEditText.text.toString()))
bundle.putBoolean("leaderOnlyChallenges", binding.leaderCreateChallengeSwitch.isChecked)
bundle.putString("leader", this.groupLeader)
resultIntent.putExtras(bundle)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index 91dd84e98..b361a5754 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -47,6 +47,7 @@ import com.habitrpg.android.habitica.models.Notification
import com.habitrpg.android.habitica.models.TutorialStep
import com.habitrpg.android.habitica.models.inventory.Egg
import com.habitrpg.android.habitica.models.inventory.HatchingPotion
+import com.habitrpg.android.habitica.models.notifications.ChallengeWonData
import com.habitrpg.android.habitica.models.notifications.LoginIncentiveData
import com.habitrpg.android.habitica.models.responses.MaintenanceResponse
import com.habitrpg.android.habitica.models.responses.TaskScoringResult
@@ -76,6 +77,10 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.functions.Consumer
import io.reactivex.rxjava3.schedulers.Schedulers
import io.realm.kotlin.isValid
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import java.util.*
@@ -134,7 +139,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
var drawerToggle: ActionBarDrawerToggle? = null
private var resumeFromActivity = false
private var userQuestStatus = UserQuestStatus.NO_QUEST
- private var hasHandledNotificationOpen = false
+ private var lastNotificationOpen: Int? = null
val userID: String
get() = user?.id ?: ""
@@ -218,6 +223,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
}
override fun onDrawerOpened(drawerView: View) {
+ hideKeyboard()
val modernHeaderStyle = sharedPreferences.getBoolean("modern_header_style", true)
if (!isUsingNightModeResources() && modernHeaderStyle) {
window.updateStatusBarColor(getThemeColor(R.attr.colorPrimaryDark), false)
@@ -245,6 +251,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
val navigationController = findNavController(R.id.nav_host_fragment)
navigationController.addOnDestinationChangedListener { _, destination, arguments ->
+ hideKeyboard()
updateToolbarTitle(destination, arguments)
}
setupNotifications()
@@ -291,6 +298,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
}
override fun onSupportNavigateUp(): Boolean {
+ hideKeyboard()
onBackPressed()
return true
}
@@ -358,12 +366,13 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
putBoolean("preventDailyReminder", false)
}
- if (intent.hasExtra("notificationIdentifier") && !hasHandledNotificationOpen) {
- hasHandledNotificationOpen = true
+ if (intent.hasExtra("notificationIdentifier") && lastNotificationOpen != intent.getIntExtra("notificationTimeStamp", 0)) {
+ lastNotificationOpen = intent.getIntExtra("notificationTimeStamp", 0)
val identifier = intent.getStringExtra("notificationIdentifier") ?: ""
val additionalData = HashMap()
additionalData["identifier"] = identifier
AmplitudeManager.sendEvent("open notification", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
+ retrieveUser(true)
NotificationOpenHandler.handleOpenedByNotification(identifier, intent, user)
}
@@ -437,12 +446,12 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
compositeSubscription.add(inventoryRepository.getQuestContent(user?.party?.quest?.completed ?: "").firstElement().subscribe({
QuestCompletedDialog.showWithQuest(this, it)
- userRepository.updateUser(user, "party.quest.completed", "").subscribe({}, RxErrorHandler.handleEmptyError())
+ userRepository.updateUser("party.quest.completed", "").subscribe({}, RxErrorHandler.handleEmptyError())
}, RxErrorHandler.handleEmptyError()))
}
if (user?.flags?.welcomed == false) {
- compositeSubscription.add(userRepository.updateUser(user, "flags.welcomed", true).subscribe({}, RxErrorHandler.handleEmptyError()))
+ compositeSubscription.add(userRepository.updateUser("flags.welcomed", true).subscribe({}, RxErrorHandler.handleEmptyError()))
}
if (appConfigManager.enableAdventureGuide()) {
@@ -617,6 +626,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
pushNotificationManager.setUser(user1)
pushNotificationManager.addPushDeviceUsingStoredToken()
}
+ .flatMap { userRepository.retrieveTeamPlans() }
.flatMap { contentRepository.retrieveContent(this,false) }
.flatMap { contentRepository.retrieveWorldState(this) }
.subscribe({ }, RxErrorHandler.handleEmptyError()))
@@ -656,10 +666,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
}
override fun onTutorialCompleted(step: TutorialStep) {
- val path = "flags.tutorial." + step.tutorialGroup + "." + step.identifier
- val updateData = HashMap()
- updateData[path] = true
- compositeSubscription.add(userRepository.updateUser(user, updateData)
+ compositeSubscription.add(userRepository.updateUser("flags.tutorial." + step.tutorialGroup + "." + step.identifier, true)
.subscribe({ }, RxErrorHandler.handleEmptyError()))
binding.overlayFrameLayout.removeView(this.activeTutorialView)
this.removeActiveTutorialView()
@@ -802,7 +809,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
retrieveUser(true)
val dialog = AchievementDialog(this)
dialog.isLastOnboardingAchievement = event.isLastOnboardingAchievement
- dialog.setType(event.type)
+ dialog.setType(event.type, event.message, event.text)
dialog.enqueue()
apiClient.readNotification(event.id)
.subscribe({ }, RxErrorHandler.handleEmptyError())
@@ -900,4 +907,4 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
const val NOTIFICATION_ACCEPT = 223
const val NOTIFICATION_REJECT = 224
}
-}
\ No newline at end of file
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
index df584ed99..1162cccef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
@@ -14,6 +14,7 @@ import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.databinding.ActivityNotificationsBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.Notification
import com.habitrpg.android.habitica.models.inventory.QuestContent
@@ -366,11 +367,6 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
}
private fun fromHtml(text: String): CharSequence {
- return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
- Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY)
- } else {
- @Suppress("DEPRECATION")
- Html.fromHtml(text)
- }
+ return text.fromHtml()
}
-}
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
index 8e1d9dd5f..8e188ceef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
@@ -5,7 +5,10 @@ import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceScreen
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.events.ShowSnackbarEvent
import com.habitrpg.android.habitica.ui.fragments.preferences.*
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import org.greenrobot.eventbus.Subscribe
class PrefsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
@@ -49,6 +52,11 @@ class PrefsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStart
return false
}
+ @Subscribe
+ fun showSnackBarEvent(event: ShowSnackbarEvent) {
+ HabiticaSnackbar.showSnackbar(findViewById(R.id.snackbar_container), event.leftImage, event.title, event.text, event.specialView, event.rightIcon, event.rightTextColor, event.rightText, event.type)
+ }
+
private fun createNextPage(preferenceScreen: PreferenceScreen): PreferenceFragmentCompat? =
when (preferenceScreen.key) {
"profile" -> ProfilePreferencesFragment()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
index e410bbccb..a32b6df70 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
@@ -203,7 +203,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
additionalData["status"] = "completed"
AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
- compositeSubscription.add(userRepository.updateUser(user, "flags.welcomed", true).subscribe({
+ compositeSubscription.add(userRepository.updateUser("flags.welcomed", true).subscribe({
if (!compositeSubscription.isDisposed) {
compositeSubscription.dispose()
}
@@ -227,7 +227,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
}
private fun confirmNames(displayName: String, username: String) {
- compositeSubscription.add(userRepository.updateUser(null, "profile.name", displayName)
+ compositeSubscription.add(userRepository.updateUser("profile.name", displayName)
.flatMap { userRepository.updateLoginName(username).toFlowable() }
.subscribe({ }, RxErrorHandler.handleEmptyError()))
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index abad4e8f8..9ebd4d9f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -221,7 +221,9 @@ class TaskFormActivity : BaseActivity() {
override fun onStart() {
super.onStart()
- binding.textEditText.requestFocus()
+ if (isCreating) {
+ binding.textEditText.requestFocus()
+ }
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
index d48da01e2..327bf8478 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
@@ -105,7 +105,7 @@ class VerifyUsernameActivity: BaseActivity() {
private fun confirmNames() {
binding.confirmUsernameButton.isClickable = false
- compositeSubscription.add(userRepository.updateUser(null, "profile.name", binding.displayNameEditText.text.toString())
+ compositeSubscription.add(userRepository.updateUser("profile.name", binding.displayNameEditText.text.toString())
.flatMap { userRepository.updateLoginName(binding.usernameEditText.text.toString()).toFlowable() }
.doOnComplete { showConfirmationAndFinish() }
.doOnEach { binding.confirmUsernameButton.isClickable = true }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
index 6c63b0a4b..35d228912 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/AchievementsAdapter.kt
@@ -6,6 +6,7 @@ import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.facebook.drawee.view.SimpleDraweeView
import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.AchievementChallengeItemBinding
import com.habitrpg.android.habitica.databinding.AchievementQuestItemBinding
import com.habitrpg.android.habitica.databinding.AchievementSectionHeaderBinding
import com.habitrpg.android.habitica.extensions.inflate
@@ -123,7 +124,7 @@ class AchievementsAdapter: RecyclerView.Adapter() {
}
class ChallengeAchievementViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
- private var binding = AchievementQuestItemBinding.bind(itemView)
+ private var binding = AchievementChallengeItemBinding.bind(itemView)
fun bind(challengeName: String) {
binding.achievementTitle.text = challengeName
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
index 6b59e0334..66e340acb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
@@ -25,10 +25,11 @@ import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.subjects.PublishSubject
import java.util.*
-class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() {
+class CustomizationRecyclerViewAdapter() : androidx.recyclerview.widget.RecyclerView.Adapter() {
var userSize: String? = null
var hairColor: String? = null
+ var customizationType: String? = null
var gemBalance: Int = 0
var unsortedCustomizations: List = ArrayList()
var customizationList: MutableList = ArrayList()
@@ -61,7 +62,11 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
.inflate(R.layout.customization_section_header, parent, false)
SectionViewHolder(view)
} else {
- val viewID: Int = R.layout.customization_grid_item
+ val viewID: Int = if (customizationType == "background") {
+ R.layout.customization_grid_background_item
+ } else {
+ R.layout.customization_grid_item
+ }
val view = LayoutInflater.from(parent.context).inflate(viewID, parent, false)
CustomizationViewHolder(view)
@@ -143,7 +148,11 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
fun bind(customization: Customization) {
this.customization = customization
- DataBindingUtils.loadImage(binding.imageView, customization.getIconName(userSize, hairColor))
+ if (customization.type == "background" && customization.identifier == "") {
+ binding.imageView.setActualImageResource(R.drawable.no_background)
+ } else {
+ DataBindingUtils.loadImage(binding.imageView, customization.getIconName(userSize, hairColor))
+ }
if (customization.type == "background") {
val params = (binding.imageView.layoutParams as? LinearLayout.LayoutParams)?.apply {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
index ac6ed066f..716d0099f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
@@ -4,13 +4,15 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
import androidx.recyclerview.widget.RecyclerView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.extensions.dpToPx
import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.models.TeamPlan
import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
+import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment
import com.habitrpg.android.habitica.ui.menu.HabiticaDrawerItem
-import com.habitrpg.android.habitica.ui.viewHolders.GiftOneGetOnePromoMenuView
import com.habitrpg.android.habitica.ui.views.adventureGuide.AdventureGuideMenuBanner
import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
import com.habitrpg.android.habitica.ui.views.promo.PromoMenuViewHolder
@@ -67,6 +69,30 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
notifyDataSetChanged()
}
+ fun setTeams(teams: List) {
+ var teamHeaderIndex = -1
+ var nextHeaderIndex = -1
+ for ((index, item) in items.withIndex()) {
+ if (teamHeaderIndex != -1 && item.isHeader) {
+ nextHeaderIndex = index
+ break
+ } else if (item.identifier == NavigationDrawerFragment.SIDEBAR_TEAMS) {
+ teamHeaderIndex = index
+ }
+ }
+ if (teamHeaderIndex != -1 && nextHeaderIndex != -1) {
+ for (x in nextHeaderIndex-1 downTo teamHeaderIndex+1) {
+ items.removeAt(x)
+ }
+ for ((index, team) in teams.withIndex()) {
+ val item = HabiticaDrawerItem(R.id.teamBoardFragment, team.id, team.summary)
+ item.bundle = bundleOf(Pair("teamID", team.id))
+ items.add(teamHeaderIndex + index + 1, item)
+ }
+ }
+ notifyDataSetChanged()
+ }
+
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
val drawerItem = getItem(position)
when {
@@ -115,14 +141,6 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int): Recycle
)
SubscriptionBuyGemsPromoViewHolder(itemView)
}
- 3 -> {
- val itemView = GiftOneGetOnePromoMenuView(parent.context)
- itemView.layoutParams = ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT,
- 148.dpToPx(parent.context)
- )
- SubscriptionBuyGemsPromoViewHolder(itemView)
- }
4 -> {
val itemView = AdventureGuideMenuBanner(parent.context)
itemView.layoutParams = ViewGroup.LayoutParams(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
index f438c1253..caacacbbd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
@@ -105,25 +105,25 @@ class ItemRecyclerAdapter(val context: Context) : BaseRecyclerViewAdapter "Egg"
- is Food -> "Food"
- is HatchingPotion -> "HatchingPotion"
+ val type = when (ownedItem.itemType) {
+ "eggs" -> "Egg"
+ "food" -> "Food"
+ "hatchingPotions" -> "HatchingPotion"
else -> ""
}
- imageName = "Pet_" + type + "_" + item?.key
+ imageName = "Pet_" + type + "_" + ownedItem.key
if (isHatching) {
disabled = !this.canHatch
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
index 62ddf3709..ad501ae34 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
@@ -1,7 +1,6 @@
package com.habitrpg.android.habitica.ui.adapter.inventory
import android.content.Context
-import android.text.Html
import android.text.method.LinkMovementMethod
import android.view.View
import android.view.ViewGroup
@@ -9,6 +8,7 @@ import android.widget.Button
import android.widget.TextView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.ShopHeaderBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.helpers.MainNavigationController
import com.habitrpg.android.habitica.models.shops.Shop
@@ -221,8 +221,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter() {
val animal = this.animal
if (animal != null) {
val color = if (animal.type == "special") animal.color else null
- if (animal.numberOwned > 0 || ownedEggs?.containsKey(animal.animal) == true) {
- if (itemType == "pets") {
- MainNavigationController.navigate(StableFragmentDirections.openPetDetail(animal.animal, animal.type ?: "", color))
- } else {
- MainNavigationController.navigate(StableFragmentDirections.openMountDetail(animal.animal, animal.type ?: "", color))
- }
+ if (itemType == "pets") {
+ MainNavigationController.navigate(StableFragmentDirections.openPetDetail(animal.animal, animal.type ?: "", color))
+ } else {
+ MainNavigationController.navigate(StableFragmentDirections.openMountDetail(animal.animal, animal.type ?: "", color))
}
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
index d6141392e..08aa92844 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementProfileAdapter.kt
@@ -12,11 +12,13 @@ import com.facebook.imagepipeline.image.ImageInfo
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.ProfileAchievementItemBinding
import com.habitrpg.android.habitica.extensions.addOkButton
+import com.habitrpg.android.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.models.Achievement
import com.habitrpg.android.habitica.ui.AvatarView
import com.habitrpg.android.habitica.ui.activities.MainActivity
import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
+import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDetailDialog
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
class AchievementProfileAdapter : RecyclerView.Adapter() {
@@ -90,23 +92,9 @@ class AchievementProfileAdapter : RecyclerView.Adapter(
}
override fun onClick(view: View) {
- val context = itemView.context
- val alert = HabiticaAlertDialog(context)
-
- val customView = LayoutInflater.from(context).inflate(R.layout.dialog_achievement_details, null)
- val achievementImage = customView.findViewById(R.id.achievement_image) as? ImageView
- achievementImage?.setImageDrawable(binding.achievementDrawee.drawable)
-
- val titleView = customView.findViewById(R.id.achievement_title) as? TextView
- titleView?.text = achievement?.title
-
- val textView = customView.findViewById(R.id.achievement_text) as? TextView
- textView?.text = achievement?.text
-
- alert.setAdditionalContentView(customView)
- alert.addOkButton()
-
- alert.show()
+ achievement?.let {
+ AchievementDetailDialog(it, itemView.context).show()
+ }
}
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
index b197f48ee..1a706f69c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
@@ -20,8 +20,8 @@ import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.subjects.PublishSubject
import io.realm.OrderedRealmCollection
-class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollection?, private val layoutResource: Int, user: User?) : BaseRecyclerViewAdapter(), TaskRecyclerViewAdapter {
- var user = user
+class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollection?, private val layoutResource: Int) : BaseRecyclerViewAdapter(), TaskRecyclerViewAdapter {
+ var user: User? = null
set(value) {
field = value
notifyDataSetChanged()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
index 76df6f228..41215ddbe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
@@ -11,11 +11,11 @@ import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.ui.adapter.AchievementsAdapter
import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
import io.reactivex.rxjava3.kotlin.Flowables
+import io.reactivex.rxjava3.kotlin.combineLatest
import javax.inject.Inject
class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshListener {
@@ -89,11 +89,9 @@ class AchievementsFragment: BaseMainFragment
(it.category?.first()?.toInt() ?: 2) * it.index
}
}
- }.zipWith(Flowables.combineLatest(userRepository.getQuestAchievements(), userRepository.getQuestAchievements()
+ }.combineLatest(Flowables.combineLatest(userRepository.getQuestAchievements(), userRepository.getQuestAchievements()
.map { it.mapNotNull { achievement -> achievement.questKey } }
- .flatMap { inventoryRepository.getQuestContent(it) }), { achievements, questAchievements ->
- Pair(achievements, questAchievements)
- }).subscribe({
+ .flatMap { inventoryRepository.getQuestContent(it) })).subscribe({
val achievements = it.first
val entries = mutableListOf()
var lastCategory = ""
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
index 9cafc7679..bc17cc890 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
@@ -23,6 +23,7 @@ import javax.inject.Inject
abstract class BaseFragment : DialogFragment() {
+ var isModal: Boolean = false
abstract var binding: VB?
@Inject
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index 5772b0616..b7b2b768c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -185,6 +185,13 @@ class NavigationDrawerFragment : DialogFragment() {
questContent = it
}, RxErrorHandler.handleEmptyError()))
+ subscriptions?.add(userRepository.getTeamPlans()
+ .distinctUntilChanged { firstTeams, secondTeams -> firstTeams == secondTeams }
+ .subscribe( {
+ getItemWithIdentifier(SIDEBAR_TEAMS)?.isVisible = it.size != 0
+ adapter.setTeams(it)
+ }, RxErrorHandler.handleEmptyError()))
+
subscriptions?.add(userRepository.getUser().subscribe({
updateUser(it)
}, RxErrorHandler.handleEmptyError()))
@@ -265,10 +272,6 @@ class NavigationDrawerFragment : DialogFragment() {
subscriptionItem?.subtitle = context?.getString(R.string.more_out_of_habitica)
}
- if (configManager.enableGiftOneGetOne()) {
- subscriptionItem?.pillText = context?.getString(R.string.sale)
- context?.let { subscriptionItem?.pillBackground = ContextCompat.getDrawable(it, R.drawable.pill_bg_teal) }
- }
subscriptionItem?.let { updateItem(it) }
val promoItem = getItemWithIdentifier(SIDEBAR_SUBSCRIPTION_PROMO)
@@ -317,6 +320,8 @@ class NavigationDrawerFragment : DialogFragment() {
items.add(HabiticaDrawerItem(R.id.statsFragment, SIDEBAR_STATS, context.getString(R.string.sidebar_stats)))
items.add(HabiticaDrawerItem(R.id.achievementsFragment, SIDEBAR_ACHIEVEMENTS, context.getString(R.string.sidebar_achievements)))
+ items.add(HabiticaDrawerItem(0, SIDEBAR_TEAMS, context.getString(R.string.sidebar_teams), true))
+
items.add(HabiticaDrawerItem(0, SIDEBAR_INVENTORY, context.getString(R.string.sidebar_shops), true))
items.add(HabiticaDrawerItem(R.id.marketFragment, SIDEBAR_SHOPS_MARKET, context.getString(R.string.market)))
items.add(HabiticaDrawerItem(R.id.questShopFragment, SIDEBAR_SHOPS_QUEST, context.getString(R.string.questShop)))
@@ -329,11 +334,11 @@ class NavigationDrawerFragment : DialogFragment() {
items.add(HabiticaDrawerItem(R.id.stableFragment, SIDEBAR_STABLE, context.getString(R.string.sidebar_stable)))
items.add(HabiticaDrawerItem(R.id.avatarOverviewFragment, SIDEBAR_AVATAR, context.getString(R.string.sidebar_avatar)))
items.add(HabiticaDrawerItem(R.id.gemPurchaseActivity, SIDEBAR_GEMS, context.getString(R.string.sidebar_gems)))
- items.add(HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION, context.getString(R.string.sidebar_subscription), isHeader = false))
+ items.add(HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION, context.getString(R.string.sidebar_subscription)))
items.add(HabiticaDrawerItem(0, SIDEBAR_SOCIAL, context.getString(R.string.sidebar_section_social), true))
- items.add(HabiticaDrawerItem(R.id.tavernFragment, SIDEBAR_TAVERN, context.getString(R.string.sidebar_tavern), isHeader = false))
items.add(HabiticaDrawerItem(R.id.partyFragment, SIDEBAR_PARTY, context.getString(R.string.sidebar_party)))
+ items.add(HabiticaDrawerItem(R.id.tavernFragment, SIDEBAR_TAVERN, context.getString(R.string.sidebar_tavern)))
items.add(HabiticaDrawerItem(R.id.guildsOverviewFragment, SIDEBAR_GUILDS, context.getString(R.string.sidebar_guilds)))
items.add(HabiticaDrawerItem(R.id.challengesOverviewFragment, SIDEBAR_CHALLENGES, context.getString(R.string.sidebar_challenges)))
@@ -349,11 +354,7 @@ class NavigationDrawerFragment : DialogFragment() {
promoItem.isVisible = false
items.add(promoItem)
- if (configManager.enableGiftOneGetOne()) {
- val item = HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_G1G1_PROMO)
- item.itemViewType = 3
- items.add(item)
- } else if (configManager.showSubscriptionBanner()) {
+ if (configManager.showSubscriptionBanner()) {
val item = HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION_PROMO)
item.itemViewType = 2
items.add(item)
@@ -363,7 +364,7 @@ class NavigationDrawerFragment : DialogFragment() {
fun setSelection(transitionId: Int?, bundle: Bundle? = null, openSelection: Boolean = true, preventReselection: Boolean = true) {
closeDrawer()
- if (adapter.selectedItem != null && adapter.selectedItem == transitionId && preventReselection) return
+ if (adapter.selectedItem != null && adapter.selectedItem == transitionId && bundle == null && preventReselection) return
adapter.selectedItem = transitionId
if (!openSelection) {
@@ -525,6 +526,7 @@ class NavigationDrawerFragment : DialogFragment() {
const val SIDEBAR_SKILLS = "skills"
const val SIDEBAR_STATS = "stats"
const val SIDEBAR_ACHIEVEMENTS = "achievements"
+ const val SIDEBAR_TEAMS = "teams"
const val SIDEBAR_SOCIAL = "social"
const val SIDEBAR_TAVERN = "tavern"
const val SIDEBAR_PARTY = "party"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
index 1f6f628f4..55e58fec6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
@@ -44,6 +44,6 @@ class NewsFragment : BaseMainFragment() {
override fun onResume() {
super.onResume()
- compositeSubscription.add(userRepository.updateUser(user, "flags.newStuff", false).subscribeWithErrorHandler({}))
+ compositeSubscription.add(userRepository.updateUser("flags.newStuff", false).subscribeWithErrorHandler({}))
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
index d021cef3f..b5e55a0fe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
@@ -89,11 +89,11 @@ class StatsFragment: BaseMainFragment() {
binding?.distributeTaskHelpButton?.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
}
- compositeSubscription.add(userRepository.getUser(userId).subscribe({
+ compositeSubscription.add(userRepository.getUser().subscribe({ user ->
canAllocatePoints = user?.stats?.lvl ?: 0 >= 10 && user?.stats?.points ?: 0 > 0
- binding?.unlockAtLevel?.visibility = if (it?.stats?.lvl ?: 0 < 10) View.VISIBLE else View.GONE
- updateStats(it)
- updateAttributePoints(it)
+ binding?.unlockAtLevel?.visibility = if (user.stats?.lvl ?: 0 < 10) View.VISIBLE else View.GONE
+ updateStats(user)
+ updateAttributePoints(user)
}, RxErrorHandler.handleEmptyError()))
binding?.distributeEvenlyButton?.setOnCheckedChangeListener { _, isChecked ->
@@ -113,7 +113,7 @@ class StatsFragment: BaseMainFragment() {
}
binding?.automaticAllocationSwitch?.setOnCheckedChangeListener{ _, isChecked ->
- userRepository.updateUser(user, "preferences.automaticAllocation", isChecked).subscribe({}, RxErrorHandler.handleEmptyError())
+ userRepository.updateUser("preferences.automaticAllocation", isChecked).subscribe({}, RxErrorHandler.handleEmptyError())
}
binding?.strengthStatsView?.allocateAction = { allocatePoint(Stats.STRENGTH) }
@@ -140,7 +140,7 @@ class StatsFragment: BaseMainFragment() {
}
private fun changeAutoAllocationMode(allocationMode: String) {
- compositeSubscription.add(userRepository.updateUser(user, "preferences.allocationMode", allocationMode).subscribe({}, RxErrorHandler.handleEmptyError()))
+ compositeSubscription.add(userRepository.updateUser("preferences.allocationMode", allocationMode).subscribe({}, RxErrorHandler.handleEmptyError()))
binding?.distributeEvenlyButton?.isChecked = allocationMode == Stats.AUTO_ALLOCATE_FLAT
binding?.distributeClassButton?.isChecked = allocationMode == Stats.AUTO_ALLOCATE_CLASSBASED
binding?.distributeTaskButton?.isChecked = allocationMode == Stats.AUTO_ALLOCATE_TASKBASED
@@ -155,7 +155,7 @@ class StatsFragment: BaseMainFragment() {
}
private fun allocatePoint(stat: String) {
- compositeSubscription.add(userRepository.allocatePoint(user, stat).subscribe({ }, RxErrorHandler.handleEmptyError()))
+ compositeSubscription.add(userRepository.allocatePoint(stat).subscribe({ }, RxErrorHandler.handleEmptyError()))
}
private fun updateAttributePoints(user: User) {
@@ -203,8 +203,8 @@ class StatsFragment: BaseMainFragment() {
component.inject(this)
}
- private fun updateStats(currentUser: User) {
- val levelStat = min((currentUser.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
+ private fun updateStats(user: User) {
+ val levelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
totalStrength = levelStat
totalIntelligence = levelStat
@@ -216,25 +216,25 @@ class StatsFragment: BaseMainFragment() {
binding?.constitutionStatsView?.levelValue = levelStat
binding?.perceptionStatsView?.levelValue = levelStat
- totalStrength += currentUser.stats?.buffs?.str?.toInt() ?: 0
- totalIntelligence += currentUser.stats?.buffs?._int?.toInt() ?: 0
- totalConstitution += currentUser.stats?.buffs?.con?.toInt() ?: 0
- totalPerception += currentUser.stats?.buffs?.per?.toInt() ?: 0
- binding?.strengthStatsView?.buffValue = currentUser.stats?.buffs?.str?.toInt() ?: 0
- binding?.intelligenceStatsView?.buffValue = currentUser.stats?.buffs?._int?.toInt() ?: 0
- binding?.constitutionStatsView?.buffValue = currentUser.stats?.buffs?.con?.toInt() ?: 0
- binding?.perceptionStatsView?.buffValue = currentUser.stats?.buffs?.per?.toInt() ?: 0
+ totalStrength += user.stats?.buffs?.str?.toInt() ?: 0
+ totalIntelligence += user.stats?.buffs?._int?.toInt() ?: 0
+ totalConstitution += user.stats?.buffs?.con?.toInt() ?: 0
+ totalPerception += user.stats?.buffs?.per?.toInt() ?: 0
+ binding?.strengthStatsView?.buffValue = user.stats?.buffs?.str?.toInt() ?: 0
+ binding?.intelligenceStatsView?.buffValue = user.stats?.buffs?._int?.toInt() ?: 0
+ binding?.constitutionStatsView?.buffValue = user.stats?.buffs?.con?.toInt() ?: 0
+ binding?.perceptionStatsView?.buffValue = user.stats?.buffs?.per?.toInt() ?: 0
- totalStrength += currentUser.stats?.strength ?: 0
- totalIntelligence += currentUser.stats?.intelligence ?: 0
- totalConstitution += currentUser.stats?.constitution ?: 0
- totalPerception += currentUser.stats?.per ?: 0
- binding?.strengthStatsView?.allocatedValue = currentUser.stats?.strength ?: 0
- binding?.intelligenceStatsView?.allocatedValue = currentUser.stats?.intelligence ?: 0
- binding?.constitutionStatsView?.allocatedValue = currentUser.stats?.constitution ?: 0
- binding?.perceptionStatsView?.allocatedValue = currentUser.stats?.per ?: 0
+ totalStrength += user.stats?.strength ?: 0
+ totalIntelligence += user.stats?.intelligence ?: 0
+ totalConstitution += user.stats?.constitution ?: 0
+ totalPerception += user.stats?.per ?: 0
+ binding?.strengthStatsView?.allocatedValue = user.stats?.strength ?: 0
+ binding?.intelligenceStatsView?.allocatedValue = user.stats?.intelligence ?: 0
+ binding?.constitutionStatsView?.allocatedValue = user.stats?.constitution ?: 0
+ binding?.perceptionStatsView?.allocatedValue = user.stats?.per ?: 0
- val outfit = currentUser.items?.gear?.equipped
+ val outfit = user.items?.gear?.equipped
val outfitList = ArrayList()
outfit?.let { thisOutfit ->
outfitList.add(thisOutfit.armor)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index d69479ab1..68170e97c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -42,12 +42,12 @@ class AvatarCustomizationFragment : BaseMainFragment
if (customization.type == "background") {
userRepository.unlockPath(user, customization)
- .flatMap { userRepository.retrieveUser(false) }
+ .flatMap { userRepository.retrieveUser(false, true, true) }
} else {
userRepository.useCustomization(user, customization.type ?: "", customization.category, customization.identifier ?: "")
}
@@ -55,24 +55,14 @@ class AvatarCustomizationFragment : BaseMainFragment
- val user = this.user
- if (user != null) {
userRepository.unlockPath(user, customization)
- } else {
- Flowable.empty()
- }
}
.flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
.flatMap { inventoryRepository.retrieveInAppRewards() }
.subscribe({ }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(adapter.getUnlockSetEvents()
.flatMap { set ->
- val user = this.user
- if (user != null) {
- userRepository.unlockPath(user, set)
- } else {
- Flowable.empty()
- }
+ userRepository.unlockPath(set)
}
.flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
.flatMap { inventoryRepository.retrieveInAppRewards() }
@@ -91,6 +81,7 @@ class AvatarCustomizationFragment : BaseMainFragment prefs?.skin
"shirt" -> prefs?.shirt
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
index d635cb126..5d427ead7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
@@ -40,6 +40,7 @@ class AvatarEquipmentFragment : BaseMainFragment()
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
+ showsBackButton = true
compositeSubscription.add(adapter.getSelectCustomizationEvents()
.flatMap { equipment ->
val key = (if (equipment.key?.isNotBlank() != true) activeEquipment else equipment.key) ?: ""
@@ -53,12 +54,7 @@ class AvatarEquipmentFragment : BaseMainFragment()
.subscribe({ }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(adapter.getUnlockSetEvents()
.flatMap { set ->
- val user = this.user
- if (user != null) {
- userRepository.unlockPath(user, set)
- } else {
- Flowable.empty()
- }
+ userRepository.unlockPath(set)
}
.subscribe({ }, RxErrorHandler.handleEmptyError()))
return super.onCreateView(inflater, container, savedInstanceState)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index f91a11275..dc100c63c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -22,7 +22,6 @@ class AvatarOverviewFragment : BaseMainFragment()
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- showsBackButton = true
super.onViewCreated(view, savedInstanceState)
binding?.avatarSizeSpinner?.onItemSelectedListener = this
@@ -95,10 +94,8 @@ class AvatarOverviewFragment : BaseMainFragment()
override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
val newSize: String = if (position == 0) "slim" else "broad"
- if (this.user?.isValid == true && this.user?.preferences?.size != newSize) {
- compositeSubscription.add(userRepository.updateUser(user, "preferences.size", newSize)
+ compositeSubscription.add(userRepository.updateUser("preferences.size", newSize)
.subscribe({ }, RxErrorHandler.handleEmptyError()))
- }
}
override fun onNothingSelected(parent: AdapterView<*>) { /* no-on */ }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
index b069005e0..c9671b890 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
@@ -49,8 +49,8 @@ class EquipmentOverviewFragment : BaseMainFragment userRepository.updateUser(user, "preferences.autoEquip", isChecked).subscribe({ }, RxErrorHandler.handleEmptyError()) }
- binding?.costumeSwitch?.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser(user, "preferences.costume", isChecked).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+ binding?.autoEquipSwitch?.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser("preferences.autoEquip", isChecked).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+ binding?.costumeSwitch?.setOnCheckedChangeListener { _, isChecked -> userRepository.updateUser("preferences.costume", isChecked).subscribe({ }, RxErrorHandler.handleEmptyError()) }
user?.items?.gear?.let {
updateGearData(it)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
index 7fb6b1f07..6187d7c07 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
@@ -10,6 +10,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.data.UserRepository
import com.habitrpg.android.habitica.databinding.FragmentItemsBinding
import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
@@ -32,6 +33,8 @@ class ItemRecyclerFragment : BaseFragment(), SwipeRefreshL
@Inject
lateinit var inventoryRepository: InventoryRepository
@Inject
+ lateinit var socialRepository: SocialRepository
+ @Inject
lateinit var userRepository: UserRepository
var adapter: ItemRecyclerAdapter? = null
var itemType: String? = null
@@ -93,7 +96,14 @@ class ItemRecyclerFragment : BaseFragment(), SwipeRefreshL
compositeSubscription.add(adapter.getQuestInvitationFlowable()
.flatMap { quest -> inventoryRepository.inviteToQuest(quest) }
- .subscribe({ MainNavigationController.navigate(R.id.partyFragment) }, RxErrorHandler.handleEmptyError()))
+ .flatMap { socialRepository.retrieveGroup("party") }
+ .subscribe({
+ if (isModal) {
+ dismiss()
+ } else {
+ MainNavigationController.navigate(R.id.partyFragment)
+ }
+ }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(adapter.getOpenMysteryItemFlowable()
.flatMap { inventoryRepository.openMysteryItem(user) }
.doOnNext {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index 20c1a53e8..5bdb411ca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -152,14 +152,15 @@ open class ShopFragment : BaseMainFragment() {
.map { shop1 ->
if (shop1.identifier == Shop.MARKET) {
val user = user
+ val specialCategory = ShopCategory()
+ specialCategory.text = getString(R.string.special)
if (user?.isValid == true && user.purchased?.plan?.isActive == true) {
- val specialCategory = ShopCategory()
- specialCategory.text = getString(R.string.special)
val item = ShopItem.makeGemItem(context?.resources)
item.limitedNumberLeft = user.purchased?.plan?.numberOfGemsLeft()
specialCategory.items.add(item)
- shop1.categories.add(specialCategory)
}
+ specialCategory.items.add(ShopItem.makeFortifyItem(context?.resources))
+ shop1.categories.add(specialCategory)
}
if (shop1.identifier == Shop.TIME_TRAVELERS_SHOP) {
formatTimeTravelersShop(shop1)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
index 68ca2ee22..51536a052 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
@@ -73,7 +73,7 @@ class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedP
else -> null
}
if (pathKey != null) {
- compositeSubscription.add(userRepository.updateUser(user, "preferences.emailNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, RxErrorHandler.handleEmptyError()))
+ compositeSubscription.add(userRepository.updateUser("preferences.emailNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, RxErrorHandler.handleEmptyError()))
}
}
}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
index fcdda7c13..69585d9d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
@@ -6,6 +6,7 @@ import android.content.SharedPreferences
import android.content.res.Configuration
import android.os.Build
import android.os.Bundle
+import android.view.View
import androidx.appcompat.app.AlertDialog
import androidx.preference.CheckBoxPreference
import androidx.preference.ListPreference
@@ -54,12 +55,16 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
super.onCreate(savedInstanceState)
}
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ listView.itemAnimator = null
+ }
+
override fun setupPreferences() {
timePreference = findPreference("reminder_time") as? TimePreference
val useReminder = preferenceManager.sharedPreferences.getBoolean("use_reminder", false)
timePreference?.isEnabled = useReminder
-
pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
val usePushNotifications = preferenceManager.sharedPreferences.getBoolean("usePushNotifications", true)
pushNotificationsPreference?.isEnabled = usePushNotifications
@@ -70,6 +75,9 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
classSelectionPreference = findPreference("choose_class")
+ val weekdayPreference = findPreference("FirstDayOfTheWeek") as? ListPreference
+ weekdayPreference?.summary = weekdayPreference?.entry
+
serverUrlPreference = findPreference("server_url") as? ListPreference
serverUrlPreference?.isVisible = false
serverUrlPreference?.summary = preferenceManager.sharedPreferences.getString("server_url", "")
@@ -130,6 +138,10 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
event.type = HabiticaSnackbar.SnackbarDisplayType.NORMAL
EventBus.getDefault().post(event)
contentRepository.retrieveContent(context,true).subscribe({
+ val completedEvent = ShowSnackbarEvent()
+ completedEvent.text = context?.getString(R.string.reloaded_content)
+ completedEvent.type = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+ EventBus.getDefault().post(completedEvent)
}, RxErrorHandler.handleEmptyError())
}
"fixCharacterValues" -> {
@@ -190,7 +202,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
return
}
- userRepository.updateLanguage(user, languageHelper.languageCode ?: "en")
+ userRepository.updateLanguage(languageHelper.languageCode ?: "en")
.flatMap { contentRepository.retrieveContent(context,true) }
.subscribe({ }, RxErrorHandler.handleEmptyError())
@@ -201,7 +213,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
"audioTheme" -> {
val newAudioTheme = sharedPreferences.getString(key, "off")
if (newAudioTheme != null) {
- compositeSubscription.add(userRepository.updateUser(user, "preferences.sound", newAudioTheme)
+ compositeSubscription.add(userRepository.updateUser("preferences.sound", newAudioTheme)
.subscribe({ }, RxErrorHandler.handleEmptyError()))
soundManager.soundTheme = newAudioTheme
soundManager.preloadAllFiles()
@@ -215,7 +227,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
val activity = activity as? PrefsActivity ?: return
activity.reload()
}
- "dailyDueDefaultView" -> userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
+ "dailyDueDefaultView" -> userRepository.updateUser("preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
.subscribe({ }, RxErrorHandler.handleEmptyError())
"server_url" -> {
apiClient.updateServerUrl(sharedPreferences.getString(key, ""))
@@ -225,10 +237,14 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
val preference = findPreference(key) as ListPreference
preference.summary = preference.entry
}
+ "FirstDayOfTheWeek" -> {
+ val preference = findPreference(key) as ListPreference
+ preference.summary = preference.entry
+ }
"disablePMs" -> {
val isDisabled = sharedPreferences.getBoolean("disablePMs", false)
if (user?.inbox?.optOut != isDisabled) {
- compositeSubscription.add(userRepository.updateUser(user, "inbox.optOut", isDisabled)
+ compositeSubscription.add(userRepository.updateUser("inbox.optOut", isDisabled)
.subscribe({ }, RxErrorHandler.handleEmptyError()))
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
index 25d2f0319..863de186c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
@@ -58,21 +58,21 @@ class ProfilePreferencesFragment: BasePreferencesFragment(), SharedPreferences.O
val observable: Flowable? = when (key) {
"display_name" -> {
if (newValue != user?.profile?.name) {
- userRepository.updateUser(user, "profile.name", newValue)
+ userRepository.updateUser("profile.name", newValue)
} else {
null
}
}
"photo_url" -> {
if (newValue != user?.profile?.imageUrl) {
- userRepository.updateUser(user, "profile.imageUrl", newValue)
+ userRepository.updateUser("profile.imageUrl", newValue)
} else {
null
}
}
"about" -> {
if (newValue != user?.profile?.blurb) {
- userRepository.updateUser(user, "profile.blurb", newValue)
+ userRepository.updateUser("profile.blurb", newValue)
} else {
null
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
index 0b0c79db6..4413d02f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
@@ -75,7 +75,7 @@ class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPr
else -> null
}
if (pathKey != null) {
- compositeSubscription.add(userRepository.updateUser(user, "preferences.pushNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, RxErrorHandler.handleEmptyError()))
+ compositeSubscription.add(userRepository.updateUser("preferences.pushNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, RxErrorHandler.handleEmptyError()))
}
}
}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
index 27a5da1c8..fa7c8ed43 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
@@ -15,6 +15,7 @@ import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
import com.habitrpg.android.habitica.extensions.addCancelButton
import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
import com.habitrpg.android.habitica.helpers.*
+import com.habitrpg.android.habitica.models.promotions.PromoType
import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity
import com.habitrpg.android.habitica.ui.activities.GiftGemsActivity
@@ -58,9 +59,6 @@ class GemsPurchaseFragment : BaseFragment(), GemPurc
binding?.giftGemsButton?.setOnClickListener { showGiftGemsDialog() }
- binding?.giftSubscriptionContainer?.isVisible = appConfigManager.enableGiftOneGetOne()
- binding?.giftSubscriptionContainer?.setOnClickListener { showGiftSubscriptionDialog() }
-
if (context?.isUsingNightModeResources() == true) {
binding?.headerImageView?.setImageResource(R.drawable.gem_purchase_header_dark)
}
@@ -69,10 +67,12 @@ class GemsPurchaseFragment : BaseFragment(), GemPurc
if (promo != null) {
binding?.let {
promo.configurePurchaseBanner(it)
- promo.configureGemView(it.gems4View.binding, 4)
- promo.configureGemView(it.gems21View.binding, 21)
- promo.configureGemView(it.gems42View.binding, 42)
- promo.configureGemView(it.gems84View.binding, 84)
+ if (promo.promoType != PromoType.SUBSCRIPTION) {
+ promo.configureGemView(it.gems4View.binding, 4)
+ promo.configureGemView(it.gems21View.binding, 21)
+ promo.configureGemView(it.gems42View.binding, 42)
+ promo.configureGemView(it.gems84View.binding, 84)
+ }
}
binding?.promoBanner?.setOnClickListener {
val fragment = PromoInfoFragment()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index 0ed5d7233..149fe769c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -1,12 +1,13 @@
package com.habitrpg.android.habitica.ui.fragments.purchases
+import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.EditText
-import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.ApiClient
@@ -16,6 +17,7 @@ import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
import com.habitrpg.android.habitica.events.UserSubscribedEvent
import com.habitrpg.android.habitica.extensions.addCancelButton
import com.habitrpg.android.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.android.habitica.extensions.layoutInflater
import com.habitrpg.android.habitica.helpers.AppConfigManager
import com.habitrpg.android.habitica.helpers.PurchaseHandler
import com.habitrpg.android.habitica.helpers.PurchaseTypes
@@ -23,11 +25,10 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.user.User
import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity
-import com.habitrpg.android.habitica.ui.activities.GiftOneGetOneInfoActivity
import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity
import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
import org.greenrobot.eventbus.Subscribe
@@ -76,8 +77,7 @@ class SubscriptionFragment : BaseFragment(), GemPur
binding?.subscriptionDetails?.visibility = View.GONE
binding?.subscriptionDetails?.onShowSubscriptionOptions = { showSubscriptionOptions() }
- binding?.giftSubscriptionContainer?.setOnClickListener { showGiftSubscriptionDialog() }
- binding?.giftSubscriptionButton?.setOnClickListener { showGiftSubscriptionDialog() }
+ binding?.giftSubscriptionButton?.setOnClickListener { context?.let { context -> showGiftSubscriptionDialog(context, appConfigManager.activePromo(context)?.identifier == "g1g1") } }
binding?.subscription1month?.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription1Month) }
binding?.subscription3month?.setOnPurchaseClickListener { selectSubscription(PurchaseTypes.Subscription3Month) }
@@ -86,7 +86,21 @@ class SubscriptionFragment : BaseFragment(), GemPur
binding?.subscribeButton?.setOnClickListener { subscribeUser() }
- binding?.giftSubscriptionContainer?.isVisible = appConfigManager.enableGiftOneGetOne()
+ val promo = context?.let { appConfigManager.activePromo(it) }
+ if (promo != null) {
+ binding?.let {
+ promo.configurePurchaseBanner(it)
+ }
+ binding?.promoBanner?.setOnClickListener {
+ val fragment = PromoInfoFragment()
+ parentFragmentManager
+ .beginTransaction()
+ .replace(R.id.fragment_container, fragment as Fragment)
+ .commit()
+ }
+ } else {
+ binding?.promoBanner?.visibility = View.GONE
+ }
binding?.refreshLayout?.setOnRefreshListener { refresh() }
@@ -253,29 +267,24 @@ class SubscriptionFragment : BaseFragment(), GemPur
purchaseSubscription()
}
- private fun showGiftSubscriptionDialog() {
- if (appConfigManager.enableGiftOneGetOne()) {
- val intent = Intent(context, GiftOneGetOneInfoActivity::class.java)
- context?.startActivity(intent)
- } else {
- val chooseRecipientDialogView = this.activity?.layoutInflater?.inflate(R.layout.dialog_choose_message_recipient, null)
+ companion object {
+ fun showGiftSubscriptionDialog(context: Context, iSG1G1: Boolean) {
+ val chooseRecipientDialogView = context.layoutInflater.inflate(R.layout.dialog_choose_message_recipient, null)
- this.activity?.let { thisActivity ->
- val alert = HabiticaAlertDialog(thisActivity)
- alert.setTitle(getString(R.string.gift_title))
- alert.addButton(getString(R.string.action_continue), true) { _, _ ->
+ val alert = HabiticaAlertDialog(context)
+ alert.setTitle(context.getString(R.string.gift_title))
+ alert.addButton(context.getString(R.string.action_continue), true) { _, _ ->
val usernameEditText = chooseRecipientDialogView?.findViewById(R.id.uuidEditText) as? EditText
- val intent = Intent(thisActivity, GiftSubscriptionActivity::class.java).apply {
+ val intent = Intent(context, GiftSubscriptionActivity::class.java).apply {
putExtra("username", usernameEditText?.text.toString())
}
- startActivity(intent)
+ context.startActivity(intent)
}
alert.addCancelButton { _, _ ->
- thisActivity.dismissKeyboard()
+ //context.dismissKeyboard()
}
alert.setAdditionalContentView(chooseRecipientDialogView)
alert.show()
- }
}
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
index abae64b64..c619c3d3a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
@@ -56,7 +56,7 @@ class AvatarSetupFragment : BaseFragment() {
this.adapter = CustomizationSetupAdapter()
this.adapter?.userSize = this.user?.preferences?.size ?: "slim"
- adapter?.updateUserEvents?.flatMap { userRepository.updateUser(user, it) }?.subscribeWithErrorHandler {}?.let { compositeSubscription.add(it) }
+ adapter?.updateUserEvents?.flatMap { userRepository.updateUser(it) }?.subscribeWithErrorHandler {}?.let { compositeSubscription.add(it) }
adapter?.equipGearEvents?.flatMap { inventoryRepository.equip(user, "equipped", it) }?.subscribeWithErrorHandler {}?.let { compositeSubscription.add(it) }
this.adapter?.user = this.user
@@ -185,7 +185,7 @@ class AvatarSetupFragment : BaseFragment() {
updateData["preferences.hair.bangs"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_HAIR, SetupCustomizationRepository.SUBCATEGORY_BANGS, user), false)
updateData["preferences.hair.flower"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_EXTRAS, SetupCustomizationRepository.SUBCATEGORY_FLOWER, user), true)
updateData["preferences.chair"] = chooseRandomKey(customizationRepository.getCustomizations(SetupCustomizationRepository.CATEGORY_EXTRAS, SetupCustomizationRepository.SUBCATEGORY_WHEELCHAIR, user), true)
- compositeSubscription.add(userRepository.updateUser(user, updateData).subscribeWithErrorHandler({}))
+ compositeSubscription.add(userRepository.updateUser(updateData).subscribeWithErrorHandler({}))
}
@Suppress("ReturnCount")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt
index 90d54a914..6dec4924c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.kt
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.social
import android.content.Context
import android.content.Intent
+import android.content.pm.PackageManager
import android.os.Bundle
import android.view.*
import android.widget.TextView
@@ -90,6 +91,9 @@ class GuildsOverviewFragment : BaseMainFragment()
dialog.addButton(R.string.open_website, true, false) { _, _ ->
val uriUrl = "https://habitica.com/groups/myGuilds".toUri()
val launchBrowser = Intent(Intent.ACTION_VIEW, uriUrl)
+ val l = context.packageManager.queryIntentActivities(launchBrowser, PackageManager.MATCH_DEFAULT_ONLY)
+ val notHabitica = l.first { !it.activityInfo.processName.contains("habitica") }
+ launchBrowser.setPackage(notHabitica.activityInfo.processName)
startActivity(launchBrowser)
}
dialog.addCloseButton()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
index 46c6a7dd2..a562f342a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
@@ -51,7 +51,7 @@ class InboxOverviewFragment : BaseMainFragment(), androidx
binding?.inboxRefreshLayout?.setOnRefreshListener(this)
- compositeSubscription.add(userRepository.getUser().map { user?.inbox?.optOut ?: false }.distinctUntilChanged().subscribe {
+ compositeSubscription.add(userRepository.getUser().map { it.inbox?.optOut ?: false }.distinctUntilChanged().subscribe {
binding?.optOutView?.visibility = if (it) View.VISIBLE else View.GONE
})
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
index 9248c0660..40a68b6c6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
@@ -48,6 +48,11 @@ class NoPartyFragmentFragment : BaseMainFragment() {
return FragmentNoPartyBinding.inflate(inflater, container, false)
}
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ hidesToolbar = true
+ return super.onCreateView(inflater, container, savedInstanceState)
+ }
+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
index 7345aa71f..74cc5656a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
@@ -8,11 +8,14 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.core.content.ContextCompat
+import androidx.core.text.parseAsHtml
+import androidx.core.text.toHtml
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.databinding.FragmentQuestDetailBinding
+import com.habitrpg.android.habitica.extensions.fromHtml
import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.models.inventory.Quest
import com.habitrpg.android.habitica.models.inventory.QuestContent
@@ -21,6 +24,7 @@ import com.habitrpg.android.habitica.models.social.Group
import com.habitrpg.android.habitica.modules.AppModule
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
import com.habitrpg.android.habitica.ui.helpers.setMarkdown
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import javax.inject.Inject
@@ -70,7 +74,7 @@ class QuestDetailFragment : BaseMainFragment() {
binding?.questRejectButton?.setOnClickListener { onQuestReject() }
binding?.questBeginButton?.setOnClickListener { onQuestBegin() }
binding?.questCancelButton?.setOnClickListener { onQuestCancel() }
- binding?.questAbortButton?.setOnClickListener { onQuestAbort() }
+ binding?.questLeaveButton?.setOnClickListener { onQuestLeave() }
}
override fun onResume() {
@@ -103,14 +107,11 @@ class QuestDetailFragment : BaseMainFragment() {
} else if (showLeaderButtons()) {
binding?.questParticipantResponseWrapper?.visibility = View.GONE
binding?.questLeaderResponseWrapper?.visibility = View.VISIBLE
+ binding?.questCancelButton?.visibility = View.VISIBLE
if (isQuestActive) {
binding?.questBeginButton?.visibility = View.GONE
- binding?.questCancelButton?.visibility = View.GONE
- binding?.questAbortButton?.visibility = View.VISIBLE
} else {
binding?.questBeginButton?.visibility = View.VISIBLE
- binding?.questCancelButton?.visibility = View.VISIBLE
- binding?.questAbortButton?.visibility = View.GONE
}
} else {
binding?.questLeaderResponseWrapper?.visibility = View.GONE
@@ -124,7 +125,7 @@ class QuestDetailFragment : BaseMainFragment() {
}
private fun showParticipatantButtons(): Boolean {
- return if (user == null || user?.party == null || user?.party?.quest == null) {
+ return if (user?.party?.quest == null) {
false
} else !isQuestActive && user?.party?.quest?.RSVPNeeded == true
}
@@ -135,7 +136,9 @@ class QuestDetailFragment : BaseMainFragment() {
return
}
binding?.titleView?.text = questContent.text
- binding?.descriptionView?.setMarkdown(questContent.notes)
+ // We need to do this, because the quest description can contain markdown AND HTML.
+ binding?.descriptionView?.setText(MarkdownParser.parseMarkdown(questContent.notes).toHtml().fromHtml(), TextView.BufferType.SPANNABLE)
+
DataBindingUtils.loadImage(binding?.questScrollImageView, "inventory_quest_scroll_" + questContent.key)
}
@@ -231,28 +234,45 @@ class QuestDetailFragment : BaseMainFragment() {
private fun onQuestCancel() {
context?.let {
- val alert = HabiticaAlertDialog(it)
- alert.setMessage(R.string.quest_cancel_message)
- alert.addButton(R.string.yes, true) { _, _ ->
- partyId?.let { partyID ->
- @Suppress("DEPRECATION")
- socialRepository.cancelQuest(partyID)
- .subscribe({ getActivity()?.fragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+ if (isQuestActive) {
+
+ val builder = AlertDialog.Builder(getActivity())
+ .setMessage(R.string.quest_abort_message)
+ .setPositiveButton(R.string.yes) { _, _ ->
+ partyId?.let { partyID ->
+ @Suppress("DEPRECATION")
+ socialRepository.abortQuest(partyID)
+ .flatMap { userRepository.retrieveUser() }
+ .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+ }
+ }.setNegativeButton(R.string.no) { _, _ -> }
+ builder.show()
+ } else {
+ val alert = HabiticaAlertDialog(it)
+ alert.setMessage(R.string.quest_cancel_message)
+ alert.addButton(R.string.yes, true) { _, _ ->
+ partyId?.let { partyID ->
+ @Suppress("DEPRECATION")
+ socialRepository.cancelQuest(partyID)
+ .flatMap { userRepository.retrieveUser() }
+ .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+ }
}
+ alert.addButton(R.string.no, false)
+ alert.show()
}
- alert.addButton(R.string.no, false)
- alert.show()
}
}
- private fun onQuestAbort() {
+ private fun onQuestLeave() {
val builder = AlertDialog.Builder(getActivity())
.setMessage(R.string.quest_abort_message)
.setPositiveButton(R.string.yes) { _, _ ->
partyId?.let { partyID ->
@Suppress("DEPRECATION")
- socialRepository.abortQuest(partyID)
- .subscribe({ getActivity()?.fragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+ socialRepository.leaveQuest(partyID)
+ .flatMap { userRepository.retrieveUser() }
+ .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
}
}.setNegativeButton(R.string.no) { _, _ -> }
builder.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt
index 559440aa6..256ad7314 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt
@@ -79,10 +79,6 @@ class TavernFragment : BaseMainFragment() {
private fun setViewPagerAdapter() {
val fragmentManager = childFragmentManager
- if (this.user == null) {
- return
- }
-
binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
override fun getItem(position: Int): Fragment {
return when (position) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
index 9824e3d27..fef408724 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
@@ -1,6 +1,7 @@
package com.habitrpg.android.habitica.ui.fragments.social.challenges
import android.content.Intent
+import android.content.pm.PackageManager
import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
@@ -26,10 +27,10 @@ import com.habitrpg.android.habitica.models.tasks.Task
import com.habitrpg.android.habitica.ui.activities.ChallengeFormActivity
import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.EmojiParser
import com.habitrpg.android.habitica.ui.helpers.setMarkdown
import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.android.habitica.ui.helpers.EmojiParser
import java.util.*
import javax.inject.Inject
@@ -78,7 +79,7 @@ class ChallengeDetailFragment: BaseMainFragment(
FullProfileActivity.open(leaderID)
}
- challengeID?.let {id ->
+ challengeID?.let { id ->
compositeSubscription.add(challengeRepository.getChallenge(id)
.doOnNext {
set(it)
@@ -90,7 +91,7 @@ class ChallengeDetailFragment: BaseMainFragment(
.flatMap { creatorID ->
return@flatMap socialRepository.getMember(creatorID)
}
- .subscribe({ set(it)}, RxErrorHandler.handleEmptyError()))
+ .subscribe({ set(it) }, RxErrorHandler.handleEmptyError()))
compositeSubscription.add(challengeRepository.getChallengeTasks(id).subscribe({ taskList ->
binding?.taskGroupLayout?.removeAllViewsInLayout()
@@ -180,6 +181,9 @@ class ChallengeDetailFragment: BaseMainFragment(
dialog.addButton(R.string.open_website, true, false) { _, _ ->
val uriUrl = "https://habitica.com/challenges/${challengeID}".toUri()
val launchBrowser = Intent(Intent.ACTION_VIEW, uriUrl)
+ val l = context.packageManager.queryIntentActivities(launchBrowser, PackageManager.MATCH_DEFAULT_ONLY)
+ val notHabitica = l.first { !it.activityInfo.processName.contains("habitica") }
+ launchBrowser.setPackage(notHabitica.activityInfo.processName)
startActivity(launchBrowser)
}
dialog.addCloseButton()
@@ -187,7 +191,7 @@ class ChallengeDetailFragment: BaseMainFragment(
}
private fun refresh() {
- challengeID?.let {id ->
+ challengeID?.let { id ->
challengeRepository.retrieveChallenge(id)
.flatMap { challengeRepository.retrieveChallengeTasks(id) }
.subscribe({ }, RxErrorHandler.handleEmptyError(), { })
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index 3c6269a96..91f3afc5c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -326,6 +326,7 @@ class PartyDetailFragment : BaseFragment() {
val fragment = ItemRecyclerFragment()
fragment.itemType = "quests"
fragment.itemTypeText = getString(R.string.quest)
+ fragment.isModal = true
fragment.show(parentFragmentManager, "questDialog")
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
index 4179f9bb0..1eccf3a5a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
@@ -185,9 +185,6 @@ class PartyFragment : BaseMainFragment() {
private fun setViewPagerAdapter() {
val fragmentManager = childFragmentManager
- if (this.user == null) {
- return
- }
viewPagerAdapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
index fae3c0a27..b65d5609e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
@@ -45,6 +45,7 @@ class BugFixFragment: BaseMainFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
hidesToolbar = true
+ showsBackButton = true
return super.onCreateView(inflater, container, savedInstanceState)
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
index 8ce2796b6..2f5b54698 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
@@ -25,6 +25,7 @@ class FAQDetailFragment : BaseMainFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
hidesToolbar = true
+ showsBackButton = true
return super.onCreateView(inflater, container, savedInstanceState)
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
index 042641801..bd4c523c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
@@ -35,6 +35,7 @@ class FAQOverviewFragment : BaseMainFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
hidesToolbar = true
+ showsBackButton = true
return super.onCreateView(inflater, container, savedInstanceState)
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
index 9c4bfce81..6ee86ea7e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
@@ -63,7 +63,7 @@ class SupportMainFragment : BaseMainFragment() {
}.subscribe())
binding?.resetTutorialButton?.setOnClickListener {
- userRepository.resetTutorial(user)
+ userRepository.resetTutorial()
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
index 9a112ded7..7adf2cc55 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
@@ -25,6 +25,7 @@ import java.util.*
class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
+ private var showCustomRewards: Boolean = true
private var selectedCard: ShopItem? = null
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -51,9 +52,11 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
}
binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
- compositeSubscription.add(inventoryRepository.getInAppRewards().subscribe({
- (recyclerAdapter as? RewardsRecyclerViewAdapter)?.updateItemRewards(it)
- }, RxErrorHandler.handleEmptyError()))
+ if (showCustomRewards) {
+ compositeSubscription.add(inventoryRepository.getInAppRewards().subscribe({
+ (recyclerAdapter as? RewardsRecyclerViewAdapter)?.updateItemRewards(it)
+ }, RxErrorHandler.handleEmptyError()))
+ }
(recyclerAdapter as? RewardsRecyclerViewAdapter)?.purchaseCardEvents?.subscribe({
selectedCard = it
@@ -100,7 +103,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
when (requestCode) {
11 -> {
if (resultCode == Activity.RESULT_OK) {
- userRepository.useSkill(user,
+ userRepository.useSkill(null,
selectedCard?.key ?: "",
"member",
data.getStringExtra("member_id") ?: "")
@@ -118,11 +121,11 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
companion object {
- fun newInstance(context: Context?, user: User?, classType: String): RewardsRecyclerviewFragment {
+ fun newInstance(context: Context?, classType: String, showCustomRewards: Boolean): RewardsRecyclerviewFragment {
val fragment = RewardsRecyclerviewFragment()
fragment.retainInstance = true
- fragment.user = user
fragment.classType = classType
+ fragment.showCustomRewards = showCustomRewards
if (context != null) {
fragment.tutorialStepIdentifier = "rewards"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index e66b591fb..85765badd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -46,6 +46,7 @@ import javax.inject.Inject
import javax.inject.Named
open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+ internal var canEditTasks: Boolean = true
override var binding: FragmentRefreshRecyclerviewBinding? = null
override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
@@ -54,8 +55,7 @@ open class TaskRecyclerViewFragment : BaseFragment Unit) -> Unit)? = null
+
internal val className: String
get() = this.classType ?: ""
@@ -93,7 +94,7 @@ open class TaskRecyclerViewFragment : BaseFragment {
- RewardsRecyclerViewAdapter(null, R.layout.reward_item_card, user)
+ RewardsRecyclerViewAdapter(null, R.layout.reward_item_card)
}
else -> null
}
@@ -101,13 +102,6 @@ open class TaskRecyclerViewFragment : BaseFragment taskFilterHelper.setActiveFilter(Task.TYPE_TODO, Task.FILTER_ACTIVE)
Task.TYPE_DAILY -> {
- if (user?.isValid == true && user?.preferences?.dailyDueDefaultView == true) {
+ /*if (user?.isValid == true && user?.preferences?.dailyDueDefaultView == true) {
taskFilterHelper.setActiveFilter(Task.TYPE_DAILY, Task.FILTER_ACTIVE)
- }
+ }*/
}
}
@@ -262,6 +256,11 @@ open class TaskRecyclerViewFragment : BaseFragment
+ taskRepository.getTasksForChallenge(task.challengeID).firstElement().subscribe({ tasks ->
val taskCount = tasks.size
val dialog = HabiticaAlertDialog(it)
dialog.setTitle(R.string.broken_challenge)
dialog.setMessage(it.getString(R.string.broken_challenge_description, taskCount))
dialog.addButton(it.getString(R.string.keep_x_tasks, taskCount), true) { _, _ ->
if (!task.isValid) return@addButton
- taskRepository.unlinkAllTasks(task.challengeID, "keep-all").subscribe({}, RxErrorHandler.handleEmptyError())
+ taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
+ .flatMap { userRepository.retrieveUser(true, forced = true) }
+ .subscribe({}, RxErrorHandler.handleEmptyError())
}
dialog.addButton(it.getString(R.string.delete_x_tasks, taskCount), false, true) { _, _ ->
if (!task.isValid) return@addButton
- taskRepository.unlinkAllTasks(task.challengeID, "remove-all").subscribe({}, RxErrorHandler.handleEmptyError())
+ taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
+ .flatMap { userRepository.retrieveUser(true, forced = true) }
+ .subscribe({}, RxErrorHandler.handleEmptyError())
}
dialog.setExtraCloseButtonVisibility(View.VISIBLE)
dialog.show()
@@ -364,7 +367,7 @@ open class TaskRecyclerViewFragment : BaseFragment
+ compositeSubscription.add(taskRepository.taskChecked(null, task, direction == TaskDirection.UP, false) { result ->
handleTaskResult(result, task.value.toInt())
}.subscribeWithErrorHandler {})
}
@@ -379,10 +382,9 @@ open class TaskRecyclerViewFragment : BaseFragment? = null
if (context != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
index 76bc99460..7aba7f64b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
@@ -21,16 +21,19 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
import com.habitrpg.android.habitica.helpers.TaskFilterHelper
import com.habitrpg.android.habitica.models.tasks.Task
import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.modules.AppModule
import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.views.navigation.HabiticaBottomNavigationViewListener
import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
import io.reactivex.rxjava3.disposables.Disposable
import java.util.*
import javax.inject.Inject
+import javax.inject.Named
import kotlin.collections.ArrayList
-class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
+class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener, HabiticaBottomNavigationViewListener {
override var binding: FragmentViewpagerBinding? = null
@@ -38,6 +41,8 @@ class TasksFragment : BaseMainFragment(), SearchView.O
return FragmentViewpagerBinding.inflate(inflater, container, false)
}
+ @field:[Inject Named(AppModule.NAMED_USER_ID)]
+ lateinit var userID: String
@Inject
lateinit var taskFilterHelper: TaskFilterHelper
@Inject
@@ -50,13 +55,6 @@ class TasksFragment : BaseMainFragment(), SearchView.O
private var filterMenuItem: MenuItem? = null
- override var user: User?
- get() = super.user
- set(value) {
- super.user = value
- viewFragmentsDictionary?.values?.forEach { it.user = value }
- }
-
private val activeFragment: TaskRecyclerViewFragment?
get() {
var fragment = viewFragmentsDictionary?.get(binding?.viewPager?.currentItem)
@@ -89,26 +87,14 @@ class TasksFragment : BaseMainFragment(), SearchView.O
3 -> Task.TYPE_REWARD
else -> Task.TYPE_HABIT
}
- bottomNavigation?.onTabSelectedListener = {
- val newItem = when (it) {
- Task.TYPE_HABIT -> 0
- Task.TYPE_DAILY -> 1
- Task.TYPE_TODO -> 2
- Task.TYPE_REWARD -> 3
- else -> 0
- }
- binding?.viewPager?.currentItem = newItem
- updateBottomBarBadges()
- }
- bottomNavigation?.onAddListener = { type ->
- openNewTaskActivity(type)
- }
- bottomNavigation?.flipAddBehaviour = appConfigManager.flipAddTaskBehaviour()
+ bottomNavigation?.listener = this
+ bottomNavigation?.canAddTasks = true
}
override fun onPause() {
- bottomNavigation?.onTabSelectedListener = null
- bottomNavigation?.onAddListener = null
+ if (bottomNavigation?.listener == this) {
+ bottomNavigation?.listener = null
+ }
super.onPause()
}
@@ -176,10 +162,7 @@ class TasksFragment : BaseMainFragment(), SearchView.O
context?.let {
var disposable: Disposable? = null
val dialog = TaskFilterDialog(it, HabiticaBaseApplication.userComponent)
- if (user != null) {
- dialog.setTags(user?.tags?.createSnapshot() ?: emptyList())
- disposable = tagRepository.getTags(user?.id ?: "").subscribe({ tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
- }
+ disposable = tagRepository.getTags().subscribe({ tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
dialog.setActiveTags(taskFilterHelper.tags)
if (activeFragment != null) {
val taskType = activeFragment?.classType
@@ -220,12 +203,18 @@ class TasksFragment : BaseMainFragment(), SearchView.O
override fun getItem(position: Int): androidx.fragment.app.Fragment {
val fragment: TaskRecyclerViewFragment = when (position) {
- 0 -> TaskRecyclerViewFragment.newInstance(context, user, Task.TYPE_HABIT)
- 1 -> TaskRecyclerViewFragment.newInstance(context, user, Task.TYPE_DAILY)
- 3 -> RewardsRecyclerviewFragment.newInstance(context, user, Task.TYPE_REWARD)
- else -> TaskRecyclerViewFragment.newInstance(context, user, Task.TYPE_TODO)
+ 0 -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_HABIT)
+ 1 -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_DAILY)
+ 3 -> RewardsRecyclerviewFragment.newInstance(context, Task.TYPE_REWARD, true)
+ else -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_TODO)
+ }
+ fragment.ownerID = userID
+ fragment.refreshAction = {
+ compositeSubscription.add(userRepository.retrieveUser(true, true)
+ .doOnTerminate {
+ it()
+ }.subscribe({ }, RxErrorHandler.handleEmptyError()))
}
-
viewFragmentsDictionary?.put(position, fragment)
return fragment
@@ -412,4 +401,21 @@ class TasksFragment : BaseMainFragment(), SearchView.O
internal const val TASK_CREATED_RESULT = 1
const val TASK_UPDATED_RESULT = 2
}
+
+
+ override fun onTabSelected(taskType: String) {
+ val newItem = when (taskType) {
+ Task.TYPE_HABIT -> 0
+ Task.TYPE_DAILY -> 1
+ Task.TYPE_TODO -> 2
+ Task.TYPE_REWARD -> 3
+ else -> 0
+ }
+ binding?.viewPager?.currentItem = newItem
+ updateBottomBarBadges()
+ }
+
+ override fun onAdd(taskType: String) {
+ openNewTaskActivity(taskType)
+ }
}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt
new file mode 100644
index 000000000..f27fe488c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt
@@ -0,0 +1,435 @@
+package com.habitrpg.android.habitica.ui.fragments.tasks
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.view.*
+import androidx.appcompat.widget.SearchView
+import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentPagerAdapter
+import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.TagRepository
+import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
+import com.habitrpg.android.habitica.extensions.getThemeColor
+import com.habitrpg.android.habitica.extensions.setTintWith
+import com.habitrpg.android.habitica.helpers.*
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.views.navigation.HabiticaBottomNavigationViewListener
+import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
+import io.reactivex.rxjava3.disposables.Disposable
+import java.util.*
+import javax.inject.Inject
+import kotlin.collections.ArrayList
+
+
+class TeamBoardFragment : BaseMainFragment(), SearchView.OnQueryTextListener, HabiticaBottomNavigationViewListener {
+
+ override var binding: FragmentViewpagerBinding? = null
+
+ override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentViewpagerBinding {
+ return FragmentViewpagerBinding.inflate(inflater, container, false)
+ }
+
+ var teamID: String = ""
+
+ @Inject
+ lateinit var taskFilterHelper: TaskFilterHelper
+ @Inject
+ lateinit var tagRepository: TagRepository
+ @Inject
+ lateinit var appConfigManager: AppConfigManager
+
+ private var refreshItem: MenuItem? = null
+ internal var viewFragmentsDictionary: MutableMap? = WeakHashMap()
+
+ private var filterMenuItem: MenuItem? = null
+
+ private val activeFragment: TaskRecyclerViewFragment?
+ get() {
+ var fragment = viewFragmentsDictionary?.get(binding?.viewPager?.currentItem)
+ if (fragment == null) {
+ if (isAdded) {
+ fragment = (childFragmentManager.findFragmentByTag("android:switcher:" + R.id.viewPager + ":" + binding?.viewPager?.currentItem) as? TaskRecyclerViewFragment)
+ }
+ }
+ return fragment
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?): View? {
+ this.usesTabLayout = false
+ this.hidesToolbar = true
+ this.usesBottomNavigation = true
+ return super.onCreateView(inflater, container, savedInstanceState)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ arguments?.let {
+ val args = TeamBoardFragmentArgs.fromBundle(it)
+ teamID = args.teamID
+ }
+
+ compositeSubscription.add(userRepository.getTeamPlan(teamID)
+ .subscribe( {
+ activity?.title = it.name
+ }, RxErrorHandler.handleEmptyError()))
+
+ compositeSubscription.add(userRepository.retrieveTeamPlan(teamID).subscribe({ }, RxErrorHandler.handleEmptyError()))
+
+ loadTaskLists()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ bottomNavigation?.activeTaskType = when (binding?.viewPager?.currentItem) {
+ 0 -> Task.TYPE_HABIT
+ 1 -> Task.TYPE_DAILY
+ 2 -> Task.TYPE_TODO
+ 3 -> Task.TYPE_REWARD
+ else -> Task.TYPE_HABIT
+ }
+ bottomNavigation?.listener = this
+ bottomNavigation?.canAddTasks = false
+ }
+
+ override fun onPause() {
+ if (bottomNavigation?.listener == this) {
+ bottomNavigation?.listener = null
+ }
+
+ super.onPause()
+ }
+
+ override fun onDestroy() {
+ tagRepository.close()
+ super.onDestroy()
+ }
+
+ override fun injectFragment(component: UserComponent) {
+ component.inject(this)
+ }
+
+ override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+ inflater.inflate(R.menu.menu_team_board, menu)
+
+ filterMenuItem = menu.findItem(R.id.action_filter)
+ updateFilterIcon()
+
+ val item = menu.findItem(R.id.action_search)
+ tintMenuIcon(item)
+ val sv = item.actionView as? SearchView
+ sv?.setOnQueryTextListener(this)
+ sv?.setIconifiedByDefault(false)
+ item.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+ override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+ filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
+ return true
+ }
+
+ override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+ // Do something when expanded
+ filterMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
+ return true
+ }
+ })
+ }
+
+ override fun onQueryTextSubmit(query: String?): Boolean {
+ return true
+ }
+
+ override fun onQueryTextChange(newText: String?): Boolean {
+ taskFilterHelper.searchQuery = newText
+ viewFragmentsDictionary?.values?.forEach { values -> values.recyclerAdapter?.filter() }
+ return true
+ }
+
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ return when (item.itemId) {
+ R.id.action_filter -> {
+ showFilterDialog()
+ true
+ }
+ R.id.action_reload -> {
+ refreshItem = item
+ refresh()
+ true
+ }
+ R.id.action_team_info -> {
+ MainNavigationController.navigate(R.id.guildFragment, bundleOf(Pair("groupID", teamID)))
+ true
+ }
+ else -> super.onOptionsItemSelected(item)
+ }
+ }
+
+ private fun showFilterDialog() {
+ context?.let {
+ var disposable: Disposable? = null
+ val dialog = TaskFilterDialog(it, HabiticaBaseApplication.userComponent)
+ disposable = tagRepository.getTags().subscribe({ tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
+ dialog.setActiveTags(taskFilterHelper.tags)
+ if (activeFragment != null) {
+ val taskType = activeFragment?.classType
+ if (taskType != null) {
+ dialog.setTaskType(taskType, taskFilterHelper.getActiveFilter(taskType))
+ }
+ }
+ dialog.setListener(object : TaskFilterDialog.OnFilterCompletedListener {
+ override fun onFilterCompleted(activeTaskFilter: String?, activeTags: MutableList) {
+ if (viewFragmentsDictionary == null) {
+ return
+ }
+ taskFilterHelper.tags = activeTags
+ if (activeTaskFilter != null) {
+ activeFragment?.setActiveFilter(activeTaskFilter)
+ }
+ viewFragmentsDictionary?.values?.forEach { values -> values.recyclerAdapter?.filter() }
+ updateFilterIcon()
+ }
+ })
+ dialog.setOnDismissListener {
+ if (disposable?.isDisposed == false) {
+ disposable.dispose()
+ }
+ }
+ dialog.show()
+ }
+ }
+
+ private fun refresh() {
+ activeFragment?.onRefresh()
+ }
+
+ private fun loadTaskLists() {
+ val fragmentManager = childFragmentManager
+
+ binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+
+ override fun getItem(position: Int): androidx.fragment.app.Fragment {
+ val fragment: TaskRecyclerViewFragment = when (position) {
+ 0 -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_HABIT)
+ 1 -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_DAILY)
+ 3 -> RewardsRecyclerviewFragment.newInstance(context, Task.TYPE_REWARD, false)
+ else -> TaskRecyclerViewFragment.newInstance(context, Task.TYPE_TODO)
+ }
+ fragment.ownerID = teamID
+ fragment.canEditTasks = false
+ fragment.refreshAction = {
+ compositeSubscription.add(userRepository.retrieveTeamPlan(teamID)
+ .doOnTerminate {
+ it()
+ }.subscribe({ }, RxErrorHandler.handleEmptyError()))
+ }
+
+ viewFragmentsDictionary?.put(position, fragment)
+
+ return fragment
+ }
+
+ override fun getCount(): Int = 4
+
+ override fun getPageTitle(position: Int): CharSequence? = when (position) {
+ 0 -> activity?.getString(R.string.habits)
+ 1 -> activity?.getString(R.string.dailies)
+ 2 -> activity?.getString(R.string.todos)
+ 3 -> activity?.getString(R.string.rewards)
+ else -> ""
+ }
+ }
+
+ binding?.viewPager?.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
+ override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { /* no-op */ }
+
+ override fun onPageSelected(position: Int) {
+ bottomNavigation?.selectedPosition = position
+ updateFilterIcon()
+ }
+
+ override fun onPageScrollStateChanged(state: Int) { /* no-op */ }
+ })
+ }
+
+ private fun updateFilterIcon() {
+ if (filterMenuItem == null) {
+ return
+ }
+ var filterCount = 0
+ if (activeFragment != null) {
+ filterCount = taskFilterHelper.howMany(activeFragment?.classType)
+ }
+ if (filterCount == 0) {
+ filterMenuItem?.setIcon(R.drawable.ic_action_filter_list)
+ context?.let {
+ val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_action_filter_list)
+ filterIcon?.setTintWith(it.getThemeColor(R.attr.headerTextColor), PorterDuff.Mode.MULTIPLY)
+ filterMenuItem?.setIcon(filterIcon)
+ }
+ } else {
+ context?.let {
+ val filterIcon = ContextCompat.getDrawable(it, R.drawable.ic_filters_active)
+ filterIcon?.setTintWith(it.getThemeColor(R.attr.textColorPrimaryDark), PorterDuff.Mode.MULTIPLY)
+ filterMenuItem?.setIcon(filterIcon)
+ }
+ }
+ }
+
+ private fun updateBottomBarBadges() {
+ if (bottomNavigation == null) {
+ return
+ }
+ compositeSubscription.add(tutorialRepository.getTutorialSteps(listOf("habits", "dailies", "todos", "rewards")).subscribe({ tutorialSteps ->
+ val activeTutorialFragments = ArrayList()
+ for (step in tutorialSteps) {
+ var id = -1
+ val taskType = when (step.identifier) {
+ "habits" -> {
+ id = R.id.habits_tab
+ Task.TYPE_HABIT
+ }
+ "dailies" -> {
+ id = R.id.dailies_tab
+ Task.TYPE_DAILY
+ }
+ "todos" -> {
+ id = R.id.todos_tab
+ Task.TYPE_TODO
+ }
+ "rewards" -> {
+ id = R.id.rewards_tab
+ Task.TYPE_REWARD
+ }
+ else -> ""
+ }
+ val tab = bottomNavigation?.tabWithId(id)
+ if (step.shouldDisplay()) {
+ tab?.badgeCount = 1
+ activeTutorialFragments.add(taskType)
+ } else {
+ tab?.badgeCount = 0
+ }
+ }
+ if (activeTutorialFragments.size == 1) {
+ val fragment = viewFragmentsDictionary?.get(indexForTaskType(activeTutorialFragments[0]))
+ if (fragment?.tutorialTexts != null && context != null) {
+ val finalText = context?.getString(R.string.tutorial_tasks_complete)
+ if (!fragment.tutorialTexts.contains(finalText) && finalText != null) {
+ fragment.tutorialTexts.add(finalText)
+ }
+ }
+ }
+ }, RxErrorHandler.handleEmptyError()))
+ }
+ // endregion
+
+ private fun openNewTaskActivity(type: String) {
+ if (Date().time - (lastTaskFormOpen?.time ?: 0) < 2000) {
+ return
+ }
+
+ val additionalData = HashMap()
+ additionalData["created task type"] = type
+ additionalData["viewed task type"] = when (binding?.viewPager?.currentItem) {
+ 0 -> Task.TYPE_HABIT
+ 1 -> Task.TYPE_DAILY
+ 2 -> Task.TYPE_TODO
+ 3 -> Task.TYPE_REWARD
+ else -> ""
+ }
+ AmplitudeManager.sendEvent("open create task form", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
+
+ val bundle = Bundle()
+ bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type)
+ bundle.putStringArrayList(TaskFormActivity.SELECTED_TAGS_KEY, ArrayList(taskFilterHelper.tags))
+
+ val intent = Intent(activity, TaskFormActivity::class.java)
+ intent.putExtras(bundle)
+ intent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+ if (this.isAdded) {
+ lastTaskFormOpen = Date()
+ startActivityForResult(intent, TASK_CREATED_RESULT)
+ }
+ }
+
+ //endregion Events
+
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data)
+
+ when (requestCode) {
+ TASK_CREATED_RESULT -> {
+ onTaskCreatedResult(resultCode, data)
+ }
+ }
+ }
+
+ private fun onTaskCreatedResult(resultCode: Int, data: Intent?) {
+ if (resultCode == Activity.RESULT_OK) {
+ val taskType = data?.getStringExtra(TaskFormActivity.TASK_TYPE_KEY)
+ if (taskType != null) {
+ switchToTaskTab(taskType)
+
+ val index = indexForTaskType(taskType)
+ if (index != -1) {
+ val fragment = viewFragmentsDictionary?.get(index)
+ fragment?.binding?.recyclerView?.scrollToPosition(0)
+ }
+ }
+ }
+ }
+
+ private fun switchToTaskTab(taskType: String) {
+ val index = indexForTaskType(taskType)
+ if (binding?.viewPager != null && index != -1) {
+ binding?.viewPager?.currentItem = index
+ updateBottomBarBadges()
+ }
+ }
+
+ private fun indexForTaskType(taskType: String?): Int {
+ if (taskType != null) {
+ for (index in 0 until (viewFragmentsDictionary?.size ?: 0)) {
+ val fragment = viewFragmentsDictionary?.get(index)
+ if (fragment != null && taskType == fragment.className) {
+ return index
+ }
+ }
+ }
+ return -1
+ }
+
+ override val displayedClassName: String?
+ get() = null
+
+ override fun addToBackStack(): Boolean = false
+
+ companion object {
+ var lastTaskFormOpen: Date? = null
+ internal const val TASK_CREATED_RESULT = 1
+ const val TASK_UPDATED_RESULT = 2
+ }
+
+ override fun onTabSelected(taskType: String) {
+ val newItem = when (taskType) {
+ Task.TYPE_HABIT -> 0
+ Task.TYPE_DAILY -> 1
+ Task.TYPE_TODO -> 2
+ Task.TYPE_REWARD -> 3
+ else -> 0
+ }
+ binding?.viewPager?.currentItem = newItem
+ updateBottomBarBadges()
+ }
+
+ override fun onAdd(taskType: String) {
+ openNewTaskActivity(taskType)
+ }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
index 2c99af530..af3003de4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
@@ -5,7 +5,9 @@ import android.content.Context
import android.content.res.Resources
import android.graphics.drawable.BitmapDrawable
import android.text.method.LinkMovementMethod
+import android.util.Log
import android.view.View
+import androidx.appcompat.app.AlertDialog
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import com.habitrpg.android.habitica.R
@@ -23,6 +25,7 @@ import io.reactivex.rxjava3.core.Maybe
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers
import com.habitrpg.android.habitica.models.members.Member
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
open class ChatRecyclerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
@@ -66,7 +69,21 @@ class ChatRecyclerMessageViewHolder(itemView: View, private var userId: String,
itemView.setOnClickListener {
onShouldExpand?.invoke()
}
- binding.tvLikes.setOnClickListener { chatMessage?.let { onLikeMessage?.invoke(it) } }
+ binding.tvLikes.setOnClickListener { chatMessage?.let {
+ if(it.uuid != userId) {
+ onLikeMessage?.invoke(it)
+ }
+ else {
+ val context = context
+ if (context != null) {
+ val alert = HabiticaAlertDialog(context)
+ alert.setMessage("Can't like your own message. Don't be that person.")
+ alert.addButton(R.string.ok, true)
+ alert.show()
+ }
+ }
+ }
+ }
binding.messageText.setOnClickListener { onShouldExpand?.invoke() }
binding.messageText.movementMethod = LinkMovementMethod.getInstance()
binding.userLabel.setOnClickListener { chatMessage?.uuid?.let { onOpenProfile?.invoke(it) } }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GiftOneGetOnePromoMenuView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GiftOneGetOnePromoMenuView.kt
deleted file mode 100644
index 1d02400cf..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GiftOneGetOnePromoMenuView.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.habitrpg.android.habitica.ui.viewHolders
-
-import android.content.Context
-import android.content.Intent
-import android.util.AttributeSet
-import android.widget.Button
-import android.widget.RelativeLayout
-import androidx.core.content.ContextCompat
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.ui.activities.GiftOneGetOneInfoActivity
-
-class GiftOneGetOnePromoMenuView @JvmOverloads constructor(
- context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
-
- init {
- inflate(R.layout.promo_gift_one_get_one, true)
- setBackgroundColor(ContextCompat.getColor(context, R.color.teal_50))
- clipToPadding = false
- clipChildren = false
- clipToOutline = false
- findViewById