From 90524ea4b952770e121032055bec13da4218f680 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 19 Oct 2023 10:41:13 +0200 Subject: [PATCH] improve display --- .../res/drawable/snackbar_background_red.xml | 4 ++-- Habitica/res/layout/snackbar_view.xml | 6 ++---- .../shops/TimeTravelersShopFragment.kt | 17 +++++++++++++++++ .../habitica/ui/views/shops/PurchaseDialog.kt | 3 --- .../helpers/RecyclerViewEmptySupport.kt | 6 +++++- version.properties | 2 +- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/Habitica/res/drawable/snackbar_background_red.xml b/Habitica/res/drawable/snackbar_background_red.xml index c03d995f3..097eab78b 100644 --- a/Habitica/res/drawable/snackbar_background_red.xml +++ b/Habitica/res/drawable/snackbar_background_red.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/Habitica/res/layout/snackbar_view.xml b/Habitica/res/layout/snackbar_view.xml index fe2f8f56b..9dd48cc9c 100644 --- a/Habitica/res/layout/snackbar_view.xml +++ b/Habitica/res/layout/snackbar_view.xml @@ -38,8 +38,7 @@ android:layout_height="wrap_content" tools:text="This is the Title" android:gravity="center" - style="@style/Title2" - android:textSize="18sp" + android:textSize="16sp" android:visibility="gone" tools:visibility="visible" android:textColor="@color/white"/> @@ -49,8 +48,7 @@ android:layout_height="wrap_content" tools:text="This is the Content" android:gravity="center" - style="@style/Body1" - android:textSize="13sp" + android:textSize="14sp" android:visibility="gone" tools:visibility="visible" android:textColor="@color/white"/> diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt index 77217c3b9..035b224d2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt @@ -4,9 +4,15 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.lifecycle.lifecycleScope import com.habitrpg.android.habitica.models.shops.Shop +import com.habitrpg.android.habitica.ui.fragments.purchases.EventOutcomeSubscriptionBottomSheetFragment +import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionBottomSheetFragment import com.habitrpg.android.habitica.ui.views.CurrencyText +import com.habitrpg.common.habitica.helpers.launchCatching import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.delay +import kotlin.time.Duration.Companion.seconds @AndroidEntryPoint class TimeTravelersShopFragment : ShopFragment() { @@ -22,6 +28,17 @@ class TimeTravelersShopFragment : ShopFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) initializeCurrencyViews() + + lifecycleScope.launchCatching { + val user = userViewModel.user.value + if (user?.isSubscribed != true) { + delay(2.seconds) + val subscriptionBottomSheet = EventOutcomeSubscriptionBottomSheetFragment().apply { + eventType = EventOutcomeSubscriptionBottomSheetFragment.EVENT_HOURGLASS_SHOP_OPENED + } + activity?.supportFragmentManager?.let { subscriptionBottomSheet.show(it, SubscriptionBottomSheetFragment.TAG) } + } + } } override fun initializeCurrencyViews() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt index 3ab9210c1..f9906a37c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt @@ -380,10 +380,7 @@ class PurchaseDialog( } parentActivity?.let { activity -> subscriptionBottomSheet.show(activity.supportFragmentManager, SubscriptionBottomSheetFragment.TAG) } } - } - - } return } diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt index 16d3c152b..b82a5cbd3 100644 --- a/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt +++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt @@ -87,7 +87,11 @@ class RecyclerViewStateAdapter(val showLoadingAsEmpty: Boolean = false) : Recycl animation1.duration = 300 animation1.startOffset = 500 animation1.fillAfter = true - view.findViewById(R.id.loading_indicator).startAnimation(animation1) + view.findViewById(R.id.compose_view).setContent { + HabiticaTheme { + HabiticaCircularProgressView(Modifier.size(60.dp)) + } + } object : RecyclerView.ViewHolder(view) {} } 1 -> FailedViewHolder(parent.inflate(R.layout.failed_item)) diff --git a/version.properties b/version.properties index f08f21455..2c1200f3d 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ NAME=4.3 -CODE=6681 \ No newline at end of file +CODE=6691 \ No newline at end of file