From acda038190ff89f5597185b945a028e98f2d1d98 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 29 Mar 2023 15:33:29 +0200 Subject: [PATCH] update icon --- .../drawable-hdpi/hourglass_fancy_left.png | Bin 0 -> 3805 bytes .../drawable-mdpi/hourglass_fancy_left.png | Bin 0 -> 2470 bytes .../drawable-mdpi/hourglass_fancy_right.png | Bin 0 -> 2465 bytes .../hourglass_fancy_right.png | Bin 0 -> 3996 bytes .../drawable-xhdpi/hourglass_fancy_left.png | Bin 0 -> 4923 bytes .../drawable-xhdpi/hourglass_fancy_right.png | Bin 0 -> 5016 bytes .../drawable-xxhdpi/hourglass_fancy_left.png | Bin 0 -> 7266 bytes .../drawable-xxhdpi/hourglass_fancy_right.png | Bin 0 -> 7578 bytes Habitica/res/drawable/gryphon_old.xml | 18 ++++++++++++++++++ .../res/drawable/hourglass_fancy_left.png | Bin 5020 -> 0 bytes .../res/drawable/hourglass_fancy_right.png | Bin 4826 -> 0 bytes .../res/drawable/ic_launcher_foreground.xml | 12 +++--------- .../res/drawable/ic_launcher_monochrome.xml | 9 +++------ Habitica/res/drawable/subscription_box_bg.xml | 4 ++-- .../res/layout/fragment_tavern_detail.xml | 5 +++-- Habitica/res/layout/subscription_details.xml | 12 +++++------- .../ui/activities/NotificationsActivity.kt | 5 ----- .../inventory/StableRecyclerAdapter.kt | 4 ++++ .../customization/AvatarOverviewFragment.kt | 10 ++++------ version.properties | 2 +- 20 files changed, 43 insertions(+), 38 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/hourglass_fancy_left.png create mode 100644 Habitica/res/drawable-mdpi/hourglass_fancy_left.png create mode 100644 Habitica/res/drawable-mdpi/hourglass_fancy_right.png create mode 100644 Habitica/res/drawable-night-hdpi/hourglass_fancy_right.png create mode 100644 Habitica/res/drawable-xhdpi/hourglass_fancy_left.png create mode 100644 Habitica/res/drawable-xhdpi/hourglass_fancy_right.png create mode 100644 Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png create mode 100644 Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png create mode 100644 Habitica/res/drawable/gryphon_old.xml delete mode 100644 Habitica/res/drawable/hourglass_fancy_left.png delete mode 100644 Habitica/res/drawable/hourglass_fancy_right.png 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 0000000000000000000000000000000000000000..bff3382765f6718aa42f936b36ac0a96a36520a1 GIT binary patch literal 3805 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 Tk0(Lc00000NkvXXu0mjf-F+)m literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a6ff670ea2782691c9d7f5bccf611e8f030d18c5 GIT binary patch literal 2470 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3488d7884856d77fc7ca503049ea7cbba45c3eb0 GIT binary patch literal 3996 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 teUnN_s4SwoD%)-(ZK~#7F?Ol6p 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 + + + diff --git a/Habitica/res/drawable/hourglass_fancy_left.png b/Habitica/res/drawable/hourglass_fancy_left.png deleted file mode 100644 index ce840e5de7f8956d6b49f05f330da0ad37e989cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5020 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 z z3V<_MMDWr}3oG$HrC~eps$JPfj_oX%kA z7$H@m7uaYtj|YT zu+au>;om>Hl4YK+7%#6N&jHY&K|tcNCYNS20_Ht`LIoFEW3;x(gnDyY;2{+z*t>|t zoyM5GAuX_MOsE#D0Aa_|*&0VJtlUto{pLf}TKS@skv6*I@qRG3vzUNYoRqp$i@5xO%K=v1FMr0UXFBo|eWNo(GIlc}V8)I#MMei;T+ zm!RdG7^$oQMq(m#d?e8~7}4@cR}@d`pL%Gq0}uTRn+#1hF4ZDlq+94P>cZ|LW1a#^ z-*myF0UK+I`cSENmJ5a-IsF# zb-2cp-V@^)isr{#S%WBT{ShsQQkM$58+5YrQvm9-TbIoIPr)YCfd*q^!G)$m=sts{ zk?%eec?#v_Q^qr$7njMG5r>kl0X`U zq%b5xBZZVcgMFOzZoG}30x+g(>V+_*f&fOl@p1&~FnW;RYpk>XFP0I<*-Mj_z?o)g z_vy%Y(XYYq*5nex)GIiD!zQ#huB#u~Om6zQtprp4i81+GxRmK<47myK0%Dl`R|xX^ z8s~=^7g^h8TiSA&(v51q>Z?;n=Oei5u0zQx=71Z1O$(x=^@GLL2h}jx$XHIqFm@oo?D^$dXUC~0*K&M zlfiI#VUcs}K0clNTDXP>^LX?0EZzp!&s1<&#=4me8W6;;Yi2!O0V4%n!UP6_vMT6@ zr-%E&AI8&22j2AaRwS>9xZEg(ocjf5PgA=OJ9vb5K_$@q0Sz5Ew;HzLO)k71ht}jc zyomqbj;8Bj=^AsLF#u@*0?}rLZg(+w0>j{s#o>k(Hjtl8PLdW0!t-Igbwl~}BzeaC z3#tPRqUM~eZDOC{FpF07*qoM6N<$g13z? A#{d8T 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