sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

death and armoire tweaks

Browse source
This commit is contained in:
Phillip Thelen 2023-09-13 15:01:46 +02:00
parent e44f44bdd6
commit 857cb7a5cf
9 changed files with 326 additions and 247 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Habitica/res/drawable/subscriber_benefit_snackbar_bg.xml Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<gradient android:startColor="#77F4C7" android:endColor="#72CFFF" />
<corners android:radius="100dp" />
</shape>
</item>
<item android:left="3dp" android:right="3dp" android:top="3dp" android:bottom="3dp">
<shape android:shape="rectangle">
<gradient android:startColor="#72CFFF" android:endColor="#77F4C7" />
<corners android:radius="100dp" />
</shape>
</item>
</layer-list>

496
Habitica/res/layout/activity_armoire.xml
View file

@ -1,264 +1,298 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<FrameLayout
android:id="@+id/confetti_anchor"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center_horizontal">
<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/confetti_anchor"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal">
<com.habitrpg.android.habitica.ui.views.CurrencyView
android:id="@+id/gold_view"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:background="@drawable/armoire_gold_background"
android:gravity="center"
android:paddingStart="6dp"
android:paddingEnd="8dp"
android:textStyle="bold"
android:textSize="20sp"
tools:text="118"/>
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/icon_wrapper"
android:layout_width="165dp"
android:layout_height="158dp"
android:layout_marginTop="23dp"
android:layout_marginBottom="23dp"
android:visibility="invisible"
tools:visibility="visible">
<ImageView
android:layout_width="158dp"
android:layout_height="158dp"
android:layout_centerInParent="true"
android:src="@drawable/circle_gray_700" />
<com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/icon_view"
android:layout_width="136dp"
android:layout_height="136dp"
android:layout_centerInParent="true"/>
<com.habitrpg.android.habitica.ui.views.SparkView
android:id="@+id/left_spark_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
app:color="@color/brand_500"
app:thickness="6dp"
app:maxSpacing="8dp"
app:length="12dp"
app:duration="3500"
android:layout_marginTop="12dp"/>
<com.habitrpg.android.habitica.ui.views.SparkView
android:id="@+id/right_spark_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
app:color="@color/brand_500"
app:thickness="6dp"
app:maxSpacing="10dp"
app:duration="4000"
app:length="12dp"
android:layout_marginEnd="4dp"/>
</RelativeLayout>
<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
<TextView
android:id="@+id/title_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="+21 Experience"
android:textStyle="bold"
android:textSize="28sp"
android:gravity="center"
android:alpha="0"
android:textColor="@color/text_primary"/>
<TextView
android:id="@+id/subtitle_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="You wrestle with the Armoire and gain Experience. Take that!"
android:textColor="@color/text_ternary"
android:layout_marginHorizontal="60dp"
android:gravity="center_horizontal"
android:layout_marginTop="8dp"
android:textSize="20sp"
android:letterSpacing="0.04"
android:lineSpacingExtra="2dp"
android:alpha="0"
/>
</LinearLayout>
<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/armoire_background_full"
android:orientation="vertical"
android:gravity="center"
android:paddingTop="64dp">
<TextView
android:id="@+id/equipment_count_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/equipment_remaining"
android:textColor="@color/white"
style="@style/Headline"
android:textStyle="bold"/>
<TextView
android:id="@+id/no_equipment_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_pieces_added_every_month"
style="@style/Body2"
android:textColor="@color/white"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:paddingHorizontal="24dp">
<Button
android:id="@+id/equip_button"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="69dp"
android:text="@string/equip"
android:gravity="center_horizontal"
android:orientation="vertical">
<com.habitrpg.android.habitica.ui.views.CurrencyView
android:id="@+id/gold_view"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:background="@drawable/armoire_gold_background"
android:gravity="center"
android:paddingStart="6dp"
android:paddingEnd="8dp"
android:textSize="20sp"
android:textStyle="bold"
style="@style/HabiticaButton.White"
android:padding="0dp"
android:layout_marginEnd="12dp"/>
<Button
android:id="@+id/close_button"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="69dp"
android:text="@string/close"
tools:text="118" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<RelativeLayout
android:id="@+id/icon_wrapper"
android:layout_width="165dp"
android:layout_height="158dp"
android:layout_marginTop="23dp"
android:layout_marginBottom="23dp"
android:visibility="invisible"
tools:visibility="visible">
<ImageView
android:layout_width="158dp"
android:layout_height="158dp"
android:layout_centerInParent="true"
android:src="@drawable/circle_gray_700" />
<com.habitrpg.common.habitica.views.PixelArtView
android:id="@+id/icon_view"
android:layout_width="136dp"
android:layout_height="136dp"
android:layout_centerInParent="true" />
<com.habitrpg.android.habitica.ui.views.SparkView
android:id="@+id/left_spark_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="12dp"
app:color="@color/brand_500"
app:duration="3500"
app:length="12dp"
app:maxSpacing="8dp"
app:thickness="6dp" />
<com.habitrpg.android.habitica.ui.views.SparkView
android:id="@+id/right_spark_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="4dp"
app:color="@color/brand_500"
app:duration="4000"
app:length="12dp"
app:maxSpacing="10dp"
app:thickness="6dp" />
</RelativeLayout>
<androidx.compose.ui.platform.ComposeView
android:id="@+id/progress_view"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:alpha="0" />
</FrameLayout>
<TextView
android:id="@+id/title_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0"
android:gravity="center"
android:textColor="@color/text_primary"
android:textSize="28sp"
android:textStyle="bold"
style="@style/HabiticaButton.White"/>
tools:text="+21 Experience" />
<TextView
android:id="@+id/subtitle_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="60dp"
android:layout_marginTop="8dp"
android:alpha="0"
android:gravity="center_horizontal"
android:letterSpacing="0.04"
android:lineSpacingExtra="2dp"
android:textColor="@color/text_ternary"
android:textSize="20sp"
tools:text="You wrestle with the Armoire and gain Experience. Take that!" />
</LinearLayout>
<com.habitrpg.android.habitica.ui.views.ads.AdButton
android:id="@+id/ad_button"
android:layout_width="match_parent"
android:layout_height="60dp"
app:text="@string/watch_ad_to_open"
android:layout_marginTop="4dp"
android:layout_marginHorizontal="24dp"
app:currency="gold" />
<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
<LinearLayout
android:id="@+id/open_armoire_subscriber_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/armoire_background_full"
android:gravity="center"
android:orientation="vertical"
android:layout_marginTop="4dp">
<FrameLayout
android:paddingTop="64dp">
<TextView
android:id="@+id/equipment_count_view"
style="@style/Headline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/equipment_remaining"
android:textColor="@color/white"
android:textStyle="bold" />
<TextView
android:id="@+id/no_equipment_view"
style="@style/Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_pieces_added_every_month"
android:textColor="@color/white" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="65dp"
android:paddingStart="24dp"
android:paddingEnd="18dp">
<TextView
android:id="@+id/open_armoire_subscriber_button"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:paddingHorizontal="24dp">
<Button
android:id="@+id/equip_button"
style="@style/HabiticaButton.White"
android:layout_width="0dp"
android:layout_height="69dp"
android:layout_marginEnd="12dp"
android:layout_weight="1"
android:padding="0dp"
android:text="@string/equip"
android:textStyle="bold" />
<Button
android:id="@+id/close_button"
style="@style/HabiticaButton.White"
android:layout_width="0dp"
android:layout_height="69dp"
android:layout_weight="1"
android:text="@string/close"
android:textStyle="bold" />
</LinearLayout>
<com.habitrpg.android.habitica.ui.views.ads.AdButton
android:id="@+id/ad_button"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="4dp"
app:currency="gold"
app:text="@string/watch_ad_to_open" />
<LinearLayout
android:id="@+id/open_armoire_subscriber_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:text="@string/subscriber_button_armoire"
android:textStyle="bold"
android:background="@drawable/subscriber_benefit_button_bg"
android:gravity="center"
android:textSize="16sp"
android:backgroundTint="@null"
android:textColor="@color/green_1"
android:layout_marginEnd="6dp"
android:layout_marginTop="5dp"
android:padding="0dp"/>
android:layout_height="65dp"
android:paddingStart="24dp"
android:paddingEnd="18dp">
<TextView
android:id="@+id/open_armoire_subscriber_button"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="6dp"
android:background="@drawable/subscriber_benefit_button_bg"
android:backgroundTint="@null"
android:gravity="center"
android:padding="0dp"
android:text="@string/subscriber_button_armoire"
android:textColor="@color/green_1"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
style="@style/Caption2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|end"
android:background="@drawable/sub_perk_bg"
android:paddingHorizontal="6dp"
android:paddingVertical="4dp"
android:text="@string/sub_perk"
android:textColor="@color/green_500" />
</FrameLayout>
<TextView
style="@style/Body1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="center"
android:paddingHorizontal="48dp"
android:text="@string/subscription_benefit_armoire_sub"
android:textColor="@color/white" />
</LinearLayout>
<LinearLayout
android:id="@+id/unsubbed_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_large"
android:background="@drawable/subscribe_incentive_bg_topround"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingHorizontal="24dp"
android:paddingTop="16dp"
android:paddingBottom="8dp">
<Button
android:id="@+id/subscribe_modal_button"
style="@style/HabiticaButton.White"
android:layout_width="match_parent"
android:layout_height="69dp"
android:padding="0dp"
android:text="@string/subscribe_incentive_button_armoire"
android:textColor="@color/teal_10"
android:textStyle="bold" />
<TextView
style="@style/Body1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="3dp"
android:gravity="center_horizontal"
android:text="@string/subscribe_incentive_text_armoire"
android:textColor="@color/teal_1" />
<TextView
android:id="@+id/drop_rate_button_unsubbed"
style="@style/Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/sub_perk_bg"
android:textColor="@color/green_500"
android:paddingHorizontal="6dp"
android:paddingVertical="4dp"
style="@style/Caption2"
android:layout_gravity="top|end"
android:text="@string/sub_perk"/>
</FrameLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/subscription_benefit_armoire_sub"
android:textColor="@color/white"
style="@style/Body1"
android:gravity="center"
android:paddingHorizontal="48dp"
android:layout_marginTop="6dp"/>
</LinearLayout>
android:layout_marginTop="5dp"
android:layout_marginBottom="@dimen/spacing_medium"
android:alpha="0.75"
android:text="@string/armoire_drop_rates"
android:textColor="@color/teal_1" />
</LinearLayout>
<LinearLayout
android:id="@+id/unsubbed_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_marginTop="@dimen/spacing_large"
android:orientation="vertical"
android:paddingTop="16dp"
android:paddingBottom="8dp"
android:paddingHorizontal="24dp"
android:background="@drawable/subscribe_incentive_bg_topround"
>
<Button
android:id="@+id/subscribe_modal_button"
android:layout_width="match_parent"
android:layout_height="69dp"
android:text="@string/subscribe_incentive_button_armoire"
android:textStyle="bold"
style="@style/HabiticaButton.White"
android:textColor="@color/teal_10"
android:padding="0dp"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/subscribe_incentive_text_armoire"
android:textColor="@color/teal_1"
android:layout_marginHorizontal="16dp"
style="@style/Body1"
android:layout_marginTop="3dp"/>
<TextView
android:id="@+id/drop_rate_button_unsubbed"
android:id="@+id/drop_rate_button"
style="@style/Body2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="@string/armoire_drop_rates"
android:textColor="@color/teal_1"
android:alpha="0.75"
android:layout_marginTop="5dp"
android:layout_marginBottom="@dimen/spacing_medium"
style="@style/Body2"/>
android:textColor="@color/brand_600" />
</LinearLayout>
<TextView
android:id="@+id/drop_rate_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/armoire_drop_rates"
android:textColor="@color/brand_600"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/Body2"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>

0
common/src/main/res/layout/fragment_report_message.xml → Habitica/res/layout/fragment_report_message.xml
View file

17
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
View file

@ -7,6 +7,7 @@ import android.view.View
import android.view.animation.AccelerateInterpolator
import android.widget.FrameLayout
import android.widget.RelativeLayout
import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat
import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope
@ -27,6 +28,7 @@ import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionBottomSh
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import com.habitrpg.android.habitica.ui.views.ads.AdButton
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
import com.habitrpg.android.habitica.ui.views.progress.HabiticaCircularProgressView
import com.habitrpg.common.habitica.extensions.dpToPx
import com.habitrpg.common.habitica.extensions.loadImage
import com.habitrpg.common.habitica.helpers.Animations
@ -90,6 +92,10 @@ class ArmoireActivity : BaseActivity() {
}
}
binding.progressView.setContent {
HabiticaCircularProgressView(indicatorSize = 60.dp)
}
if (appConfigManager.enableArmoireAds()) {
val handler = AdHandler(this, AdType.ARMOIRE) {
if (!it) {
@ -181,6 +187,11 @@ class ArmoireActivity : BaseActivity() {
binding.iconView.bitmap = null
Animations.circularHide(binding.iconWrapper)
}
binding.progressView.animate().apply {
alpha(1f)
startDelay = 0
start()
}
binding.titleView.animate().apply {
alpha(0f)
duration = 300
@ -244,6 +255,12 @@ class ArmoireActivity : BaseActivity() {
binding.goldView.value = (gold).toDouble()
}
binding.progressView.animate().apply {
alpha(0f)
startDelay = 0
start()
}
val container = binding.confettiAnchor
container.postDelayed(
{

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
View file

@ -148,7 +148,7 @@ class DeathActivity : BaseActivity(), SnackbarActivity {
delay(1000)
(HabiticaBaseApplication.getInstance(this@DeathActivity)?.currentActivity?.get() as? SnackbarActivity)?.let {activity ->
HabiticaSnackbar.showSnackbar(
activity.snackbarContainer(), getString(R.string.subscriber_benefit_success_faint), HabiticaSnackbar.SnackbarDisplayType.SUCCESS, isSubscriberBenefit = true)
activity.snackbarContainer(), getString(R.string.subscriber_benefit_success_faint), HabiticaSnackbar.SnackbarDisplayType.SUBSCRIBER_BENEFIT, isSubscriberBenefit = true, duration = 2500)
}
}
finish()

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/ReportBottomSheetFragment.kt
View file

@ -13,7 +13,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.common.habitica.databinding.FragmentReportMessageBinding
import com.habitrpg.android.habitica.databinding.FragmentReportMessageBinding
import com.habitrpg.common.habitica.helpers.ExceptionHandler
import com.habitrpg.common.habitica.helpers.launchCatching
import com.habitrpg.common.habitica.helpers.setMarkdown
@ -180,4 +180,3 @@ class ReportBottomSheetFragment : BottomSheetDialogFragment() {
}
}
}

36
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
View file

@ -112,7 +112,7 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
}
enum class SnackbarDisplayType {
NORMAL, FAILURE, FAILURE_BLUE, DROP, SUCCESS, BLUE, BLACK
NORMAL, FAILURE, FAILURE_BLUE, DROP, SUCCESS, BLUE, BLACK, SUBSCRIBER_BENEFIT
}
companion object {
@ -133,7 +133,8 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
content: CharSequence?,
displayType: SnackbarDisplayType,
isCelebratory: Boolean = false,
isSubscriberBenefit: Boolean = false
isSubscriberBenefit: Boolean = false,
duration: Int = Snackbar.LENGTH_LONG
) {
showSnackbar(
container,
@ -146,7 +147,8 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
null,
displayType,
isCelebratory,
isSubscriberBenefit
isSubscriberBenefit,
duration
)
}
@ -157,7 +159,8 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
content: CharSequence?,
displayType: SnackbarDisplayType,
isCelebratory: Boolean = false,
isSubscriberBenefit: Boolean = false
isSubscriberBenefit: Boolean = false,
duration: Int = Snackbar.LENGTH_LONG
) {
showSnackbar(
container,
@ -170,7 +173,8 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
null,
displayType,
isCelebratory,
isSubscriberBenefit
isSubscriberBenefit,
duration
)
}
@ -183,7 +187,8 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
rightText: String,
displayType: SnackbarDisplayType,
isCelebratory: Boolean = false,
isSubscriberBenefit: Boolean = false
isSubscriberBenefit: Boolean = false,
duration: Int = Snackbar.LENGTH_LONG
) {
showSnackbar(
container,
@ -196,7 +201,8 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
rightText,
displayType,
isCelebratory,
isSubscriberBenefit
isSubscriberBenefit,
duration
)
}
@ -207,7 +213,8 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
specialView: View?,
displayType: SnackbarDisplayType,
isCelebratory: Boolean = false,
isSubscriberBenefit: Boolean = false
isSubscriberBenefit: Boolean = false,
duration: Int = Snackbar.LENGTH_LONG
) {
showSnackbar(
container,
@ -220,7 +227,8 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
null,
displayType,
isCelebratory,
isSubscriberBenefit
isSubscriberBenefit,
duration
)
}
@ -235,9 +243,10 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
rightText: String?,
displayType: SnackbarDisplayType,
isCelebratory: Boolean = false,
isSubscriberBenefit: Boolean = false
isSubscriberBenefit: Boolean = false,
duration: Int = Snackbar.LENGTH_LONG
) {
val snackbar = make(container, Snackbar.LENGTH_LONG)
val snackbar = make(container, duration)
.setTitle(title)
.setText(content)
.setSpecialView(specialView)
@ -258,6 +267,9 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
)
SnackbarDisplayType.SUCCESS -> snackbar.setBackgroundResource(R.drawable.snackbar_background_green)
SnackbarDisplayType.SUBSCRIBER_BENEFIT -> {
snackbar.setBackgroundResource(R.drawable.subscriber_benefit_snackbar_bg)
}
}
if (isCelebratory) {
@ -284,7 +296,7 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
500L
)
.setFadeOut(200L)
.setSpeedRange(0.1f, 0.4f)
.setSpeedRange(0.05f, 0.2f)
.setScaleRange(0.8f, 1.2f)
.setRotationSpeedRange(134f, 164f)
.emit(snackbar.getView(), 150, 500)

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
View file

@ -37,6 +37,7 @@ import com.habitrpg.android.habitica.ui.views.CurrencyViews
import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import com.habitrpg.android.habitica.ui.views.SnackbarActivity
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog
import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGoldDialog
import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientHourglassesDialog
import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientSubscriberGemsDialog

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.3
CODE=6521
CODE=6561