From d561ab01b6afca1f694488e7bb187870ed32a495 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 10 Nov 2021 15:11:49 +0100 Subject: [PATCH] Fixes #1555 --- .../drawable-hdpi/stable_equipped_star.png | Bin 0 -> 381 bytes .../drawable-mdpi/stable_equipped_star.png | Bin 0 -> 299 bytes .../drawable-xhdpi/stable_equipped_star.png | Bin 0 -> 421 bytes .../drawable-xxhdpi/stable_equipped_star.png | Bin 0 -> 672 bytes Habitica/res/drawable/pill_bg_teal_100.xml | 6 + Habitica/res/layout/mount_overview_item.xml | 13 ++ Habitica/res/layout/pet_detail_item.xml | 127 ++++++++++-------- Habitica/res/values/styles.xml | 10 ++ .../ui/viewHolders/MountViewHolder.kt | 1 + .../habitica/ui/viewHolders/PetViewHolder.kt | 1 + 10 files changed, 105 insertions(+), 53 deletions(-) create mode 100644 Habitica/res/drawable-hdpi/stable_equipped_star.png create mode 100644 Habitica/res/drawable-mdpi/stable_equipped_star.png create mode 100644 Habitica/res/drawable-xhdpi/stable_equipped_star.png create mode 100644 Habitica/res/drawable-xxhdpi/stable_equipped_star.png create mode 100644 Habitica/res/drawable/pill_bg_teal_100.xml diff --git a/Habitica/res/drawable-hdpi/stable_equipped_star.png b/Habitica/res/drawable-hdpi/stable_equipped_star.png new file mode 100644 index 0000000000000000000000000000000000000000..6783beb13a1b5a845dd8f47ee057f9dfc80be0d2 GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Y!3HERME&^*q*&4&eH|GXHuiJ>Nn{1`Em9*q z(|mmyw18|52FCVG1{NTT5s0OLn1O+50TWzAXaO^vEeMkQcktDIAoao1#WBP}aOuR; zyoU?~T$2BFYBcgWTxnKt=UTvU%abu?hr&g+M`wDC)hBS|x5x@^c*>w{TY25s+DOq; zDRf#Y`z^ufOI?x|o^Qx_z#aWX$RcXddM-7=4GiJ?_jbJ%lZokiJG-Xq`QeBY30&C~ z`gc7~@3CiAY`2~BfN$d@_qexDLN%PZtbc6VGC9mKYlp;vZ`~@D>{|uQ6}}`~R`8iO z@Al=)IQFmC3KqWImtD56kgwP9didS%<$VS%PFu8n=SBT&QZsF@|MB5Sliw2^-B+=_ zvBEY#-B{-&veu@D{IQh}ZxC literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-mdpi/stable_equipped_star.png b/Habitica/res/drawable-mdpi/stable_equipped_star.png new file mode 100644 index 0000000000000000000000000000000000000000..e40c0d1de9f556cff89a9ed46152f310ec71a8fe GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!3HF~3v%Lt6id3JuOkD)#(wTUiL5}rMQVg+ zny)W|7Ld)sz}TM2zyf430+m W|87tI(fgA@F7|Zwb6Mw<&;$T!yIzw3 literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/stable_equipped_star.png b/Habitica/res/drawable-xhdpi/stable_equipped_star.png new file mode 100644 index 0000000000000000000000000000000000000000..bb61849d3d50dd20caed5920b31cd13608ef0c6d GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^5)JjChu^vYgD#qSX%tfsg6aBTR=-} z)$CI%&NEw_30_p!c<>GTCD w&Uev?st(hH`y5@X!^Hf~)ZV-BNbJ&n#-&G00;Ekg{{e-Sr>mdKI;Vst0CNeNWdHyG literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/stable_equipped_star.png b/Habitica/res/drawable-xxhdpi/stable_equipped_star.png new file mode 100644 index 0000000000000000000000000000000000000000..c7b86a46643d649f2903fd97f8149e3f680f27c4 GIT binary patch literal 672 zcmeAS@N?(olHy`uVBq!ia0vp^DnP8r!3HEZp5@dAQY`6?zK%d%Klh(RRv_OZHNrE^ z*Ox&H$mU>RY|mt10kRl@SPF<47?>6?!9`RSFvHo3AjyMje%pXbggspxLn1iePV@C* zb`)q87IYL+dL+*^k>g+EI+pj3uFX|iB+mJS>D^J`3IXv&-5m;DKQ;#n2tNMqbpAr0 z@!XBe7b}R_?Ao>Z)!tc3FJ}h5)Q?(zSyIr+=C%Weki|D1ri-Er5{*nhBm`(XT-D_@ zTo^mUjrYm_d4^N9b}&yoxnAt$iWeC`2wZ*1^)-zR*_Dd&{piWx=wa-YVD+PqY-oi`7a?-pI7>-@O$Pon7x?3RWVPc zbZ#}*s|PYIW`)=0K8keYN&RwkyN7UZ07Pu@<-f+T>{!Mb?fzHkAB*BdfLgaxo%dgMBV*Q-<}Ys>8dM!yxw{5 zu{qz%A4+`}R?=18az5&;KxtvhlqE8s`7dw(Z0&K2n_bsHa_UL*^e$CjnS1wdO?2a& z^p)ka^lxSZX?0bZqdt8_xzYYh>gu^~FH5{4EXVl$d6VkGm|$VwipyNTcM6ytG>rJ1 ztdV&tyKV8y(}LF>L*ArH7?( + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/mount_overview_item.xml b/Habitica/res/layout/mount_overview_item.xml index 76293add4..36d2e5d7d 100644 --- a/Habitica/res/layout/mount_overview_item.xml +++ b/Habitica/res/layout/mount_overview_item.xml @@ -3,6 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:clickable="true" android:focusable="true"> @@ -46,4 +47,16 @@ android:gravity="center" android:textSize="12sp" /> + diff --git a/Habitica/res/layout/pet_detail_item.xml b/Habitica/res/layout/pet_detail_item.xml index 7fbe91ad3..a88125f5b 100644 --- a/Habitica/res/layout/pet_detail_item.xml +++ b/Habitica/res/layout/pet_detail_item.xml @@ -1,57 +1,78 @@ - - - - + + + android:id="@+id/imageView" + android:layout_width="68dp" + android:layout_height="68dp" + android:layout_gravity="center"/> + + + + + - + android:id="@+id/checkmark_view" + android:layout_width="12dp" + android:layout_height="10dp" + android:src="@drawable/pet_checkmark" + android:layout_gravity="center" /> + + - - \ No newline at end of file + android:id="@+id/active_indicator" + android:layout_width="@dimen/shopitem_status_size" + android:layout_height="@dimen/shopitem_status_size" + android:layout_gravity="end" + android:visibility="gone" + tools:visibility="visible" + android:layout_alignStart="@id/card_view" + android:layout_marginStart="-4dp" + android:layout_alignParentTop="true" + android:src="@drawable/star" + style="@style/ActiveLabel"/> + \ No newline at end of file diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index 161ec304b..e0c3b08a0 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -822,4 +822,14 @@ 12sp bold + \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt index 874a4da38..27aab30e1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt @@ -39,6 +39,7 @@ class MountViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject binding.imageView.alpha = 0.2f } binding.imageView.background = null + binding.activeIndicator.visibility = if (user?.currentMount.equals(animal?.key)) View.VISIBLE else View.GONE DataBindingUtils.loadImage(itemView.context, imageName) { val drawable = if (owned) it else BitmapDrawable(itemView.context.resources, it.toBitmap().extractAlpha()) binding.imageView.background = drawable diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt index 2c176b612..a4ac2ffc6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt @@ -96,6 +96,7 @@ class PetViewHolder(parent: ViewGroup, private val equipEvents: PublishSubject