diff --git a/Habitica/res/drawable-hdpi/hourglass_fancy_left.png b/Habitica/res/drawable-hdpi/hourglass_fancy_left.png
new file mode 100644
index 000000000..bff338276
Binary files /dev/null and b/Habitica/res/drawable-hdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-mdpi/hourglass_fancy_left.png b/Habitica/res/drawable-mdpi/hourglass_fancy_left.png
new file mode 100644
index 000000000..a6ff670ea
Binary files /dev/null and b/Habitica/res/drawable-mdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-mdpi/hourglass_fancy_right.png b/Habitica/res/drawable-mdpi/hourglass_fancy_right.png
new file mode 100644
index 000000000..292f8099e
Binary files /dev/null and b/Habitica/res/drawable-mdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable-night-hdpi/hourglass_fancy_right.png b/Habitica/res/drawable-night-hdpi/hourglass_fancy_right.png
new file mode 100644
index 000000000..3488d7884
Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png b/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png
new file mode 100644
index 000000000..855b6d3e9
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png b/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png
new file mode 100644
index 000000000..e69459274
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png b/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png
new file mode 100644
index 000000000..521fbe768
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png b/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png
new file mode 100644
index 000000000..1581c7ca5
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png differ
diff --git a/Habitica/res/drawable/gryphon_old.xml b/Habitica/res/drawable/gryphon_old.xml
new file mode 100644
index 000000000..c86d246b0
--- /dev/null
+++ b/Habitica/res/drawable/gryphon_old.xml
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/Habitica/res/drawable/hourglass_fancy_left.png b/Habitica/res/drawable/hourglass_fancy_left.png
deleted file mode 100644
index ce840e5de..000000000
Binary files a/Habitica/res/drawable/hourglass_fancy_left.png and /dev/null differ
diff --git a/Habitica/res/drawable/hourglass_fancy_right.png b/Habitica/res/drawable/hourglass_fancy_right.png
deleted file mode 100644
index 20a5a97b4..000000000
Binary files a/Habitica/res/drawable/hourglass_fancy_right.png and /dev/null differ
diff --git a/Habitica/res/drawable/ic_launcher_foreground.xml b/Habitica/res/drawable/ic_launcher_foreground.xml
index a481c0d49..c22f2d231 100644
--- a/Habitica/res/drawable/ic_launcher_foreground.xml
+++ b/Habitica/res/drawable/ic_launcher_foreground.xml
@@ -1,16 +1,10 @@
+ android:viewportWidth="108"
+ android:viewportHeight="108">
-
+ android:viewportWidth="108"
+ android:viewportHeight="108">
-
diff --git a/Habitica/res/drawable/subscription_box_bg.xml b/Habitica/res/drawable/subscription_box_bg.xml
index 24df73ead..499e18b04 100644
--- a/Habitica/res/drawable/subscription_box_bg.xml
+++ b/Habitica/res/drawable/subscription_box_bg.xml
@@ -1,6 +1,6 @@
-
+
-
\ No newline at end of file
+
diff --git a/Habitica/res/layout/fragment_tavern_detail.xml b/Habitica/res/layout/fragment_tavern_detail.xml
index 854066e76..372626e58 100644
--- a/Habitica/res/layout/fragment_tavern_detail.xml
+++ b/Habitica/res/layout/fragment_tavern_detail.xml
@@ -13,7 +13,8 @@
android:id="@+id/shop_header"
android:layout_marginBottom="@dimen/spacing_large"
android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
+ android:layout_width="match_parent"
+ android:background="@color/window_background"/>
-
\ No newline at end of file
+
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index 4e6dfa7ad..e60c68355 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -212,19 +212,17 @@
android:layout_height="wrap_content">
@@ -311,4 +309,4 @@
android:layout_marginTop="@dimen/spacing_medium"/>
-
\ No newline at end of file
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
index b99a4304e..ac7008bd9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
@@ -15,7 +15,6 @@ import androidx.activity.viewModels
import androidx.core.content.ContextCompat
import androidx.lifecycle.lifecycleScope
import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.data.SocialRepository
import com.habitrpg.android.habitica.databinding.ActivityNotificationsBinding
@@ -82,10 +81,6 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
binding.notificationsRefreshLayout.setOnRefreshListener(this)
}
- override fun injectActivity(component: UserComponent?) {
- component?.inject(this)
- }
-
override fun onSupportNavigateUp(): Boolean {
if (supportFragmentManager.backStackEntryCount > 0) {
onBackPressed()
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 6d3ae01df..2c9779b1b 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
@@ -173,6 +173,10 @@ class StableRecyclerAdapter : RecyclerView.Adapter() {
internal inner class StableHeaderViewHolder(parent: ViewGroup) : RecyclerView.ViewHolder(parent.inflate(R.layout.shop_header)) {
private var binding: ShopHeaderBinding = ShopHeaderBinding.bind(itemView)
+ init {
+ binding.root.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.window_background))
+ }
+
fun bind() {
binding.npcBannerView.shopSpriteSuffix = shopSpriteSuffix ?: ""
binding.npcBannerView.identifier = "stable"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index 425a31a29..2e2f0471e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.AdapterView
-import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
@@ -18,6 +17,7 @@ import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
@@ -226,11 +226,9 @@ fun AvatarOverviewView(
userViewModel.updateUser("preferences.costume", it)
})
}
- AnimatedVisibility(visible = user?.preferences?.costume == true) {
- EquipmentOverviewView(user?.items?.gear?.costume, costumeTwoHanded, { type, equipped ->
- onEquipmentTap(type, equipped, true)
- })
- }
+ EquipmentOverviewView(user?.items?.gear?.costume, costumeTwoHanded, { type, equipped ->
+ onEquipmentTap(type, equipped, true)
+ }, modifier = Modifier.alpha(if (user?.preferences?.costume == true) 1.0f else 0.5f))
}
}
}
diff --git a/version.properties b/version.properties
index 41a04c539..fbaddb34c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
NAME=4.1.8
-CODE=5701
\ No newline at end of file
+CODE=5821
\ No newline at end of file