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 dd5a68efc..e4fb6471a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -51,7 +51,7 @@ 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'
@@ -121,8 +121,8 @@ dependencies {
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'
@@ -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 2663
- versionName "3.1"
+ versionCode 2680
+ versionName "3.1.1"
}
buildFeatures {
diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_left.png b/Habitica/res/drawable-hdpi/g1g1_promo_left.png
index 59dcd684f..0c4c3f548 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..c3d1aa0f0 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-mdpi/g1g1_promo_left.png b/Habitica/res/drawable-mdpi/g1g1_promo_left.png
index 9f858cd6b..a1ce02fac 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..bf1d030c7 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-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-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-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-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-xhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png
index 7d2614f6a..15ff30736 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..90dccb250 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-xxhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png
index 8604581a8..21732f15e 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..b6b002419 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-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/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/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_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml
index 2e4ccfa96..8b748289b 100644
--- a/Habitica/res/layout/activity_gift_subscription.xml
+++ b/Habitica/res/layout/activity_gift_subscription.xml
@@ -120,20 +120,34 @@
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:padding="32dp"
android:gravity="center_horizontal"
android:orientation="vertical">
+
+
+
+
-
-
-
-
-
+
+
+
-
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index c3c0d25be..9a1a48bfd 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -19,42 +19,71 @@
android:layout_height="wrap_content"
android:orientation="vertical">
+ android:clipToPadding="true"
+ android:clickable="true"
+ android:visibility="gone"
+ tools:visibility="visible">
-
+
+
+ android:layout_marginStart="84dp"
+ android:layout_marginEnd="84dp"
+ android:gravity="center"
+ android:layout_marginBottom="6dp"/>
+
+
+
-
-
%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 (12:00 UTC) and will end %s (00: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
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/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/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/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 e7c2fe110..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
@@ -48,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 691fe7aa8..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
@@ -94,6 +94,8 @@ class NotificationsManager (private val context: Context) {
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
@@ -144,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 {
@@ -153,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/models/Notification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.kt
index 48151e7ba..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
@@ -47,6 +47,8 @@ class Notification {
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"),
@@ -78,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/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..4d4fc610d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt
@@ -0,0 +1,128 @@
+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.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)
+ view.binding.button.setTextColor(ContextCompat.getColor(context, R.color.teal_100))
+ 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/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/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index 78e0afebc..fa7428d14 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
@@ -808,7 +808,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())
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 2a5101eba..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
@@ -148,7 +148,11 @@ class CustomizationRecyclerViewAdapter() : androidx.recyclerview.widget.Recycler
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..667035088 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
@@ -10,7 +10,6 @@ import com.habitrpg.android.habitica.extensions.dpToPx
import com.habitrpg.android.habitica.extensions.inflate
import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
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
@@ -115,14 +114,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/StableRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
index 700dde378..e2c59aaf6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
@@ -180,12 +180,10 @@ class StableRecyclerAdapter : RecyclerView.Adapter() {
val animal = this.animal
if (animal != null) {
val color = if (animal.type == "special") animal.color else null
- if (animal.numberOwned > 0) {
- 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/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index 40357973e..2b4d81cff 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
@@ -265,10 +265,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)
@@ -349,11 +345,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)
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/social/QuestDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
index 1a1e8e926..36a47da34 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
@@ -70,7 +70,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 +103,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
@@ -231,28 +228,43 @@ 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)
- .flatMap { userRepository.retrieveUser() }
- .subscribe({ getActivity()?.supportFragmentManager?.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)
+ socialRepository.leaveQuest(partyID)
.flatMap { userRepository.retrieveUser() }
.subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
}
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