sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-18 11:49:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dark mode status bar with light system icons & shop fix

Browse source
This commit is contained in:
Hafizzle 2023-09-29 12:53:12 -04:00
parent 3dc0759012
commit 0bc2d6edd4
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
View file

@ -7,6 +7,7 @@ import android.os.Build
import android.os.Bundle
import android.view.View
import android.view.ViewGroup
import android.view.WindowInsetsController
import android.view.inputmethod.InputMethodManager
import androidx.appcompat.content.res.AppCompatResources
import androidx.core.content.ContextCompat
@ -99,15 +100,6 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
}
}
val window = window
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val decor = getWindow().decorView
decor.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
window.statusBarColor = ContextCompat.getColor(this, R.color.light_gray_bg)
} else {
window.statusBarColor = ContextCompat.getColor(this, R.color.days_gray)
}
binding.viewPager.disableFading = true
binding.previousButton.setOnClickListener { previousClicked() }
@ -115,7 +107,17 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
if (this.isUsingNightModeResources()) {
window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
window.insetsController?.setSystemBarsAppearance(
WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS,
WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
)
} else {
@Suppress("DEPRECATION")
window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
}
}
}
override fun onDestroy() {

14
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
View file

@ -328,16 +328,12 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
}
Shop.TIME_TRAVELERS_SHOP -> {
formatTimeTravelersShop(shop1)
if (userViewModel.user.value?.isSubscribed == false) {
if ((hourglasses.value ?: 0.0) > 0.0) {
context?.let { context -> InsufficientHourglassesDialog(context).show()}
} else {
activity?.let { activity ->
val subscriptionBottomSheet = EventOutcomeSubscriptionBottomSheetFragment().apply {
eventType = EventOutcomeSubscriptionBottomSheetFragment.EVENT_HOURGLASS_SHOP_OPENED
}
subscriptionBottomSheet.show(activity.supportFragmentManager, SubscriptionBottomSheetFragment.TAG)
if (userViewModel.user.value?.isSubscribed == false && (hourglasses.value ?: 0.0) <= 0.0) {
activity?.let { activity ->
val subscriptionBottomSheet = EventOutcomeSubscriptionBottomSheetFragment().apply {
eventType = EventOutcomeSubscriptionBottomSheetFragment.EVENT_HOURGLASS_SHOP_OPENED
}
subscriptionBottomSheet.show(activity.supportFragmentManager, SubscriptionBottomSheetFragment.TAG)
}
}
}