sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update icon

Browse source
This commit is contained in:
Phillip Thelen 2023-03-29 15:33:29 +02:00
parent ac38f9c30f
commit acda038190
20 changed files with 43 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Habitica/res/drawable-hdpi/hourglass_fancy_left.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
Habitica/res/drawable-mdpi/hourglass_fancy_left.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Habitica/res/drawable-mdpi/hourglass_fancy_right.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Habitica/res/drawable-night-hdpi/hourglass_fancy_right.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
Habitica/res/drawable-xhdpi/hourglass_fancy_left.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
Habitica/res/drawable-xhdpi/hourglass_fancy_right.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.4 KiB

18
Habitica/res/drawable/gryphon_old.xml Normal file
View file

@ -0,0 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="430"
android:viewportHeight="430">
<path
android:pathData="M290.6,290.5C287.6,286.6 284.4,291.1 276.8,290.3C271.8,289.8 271.8,287.6 271.8,257.7C271.8,257.7 271.3,255.9 274.2,254.2C277.1,252.6 285.8,238.1 280.4,225.8C275.1,213.4 278.9,214 281.2,215.3C283.4,216.5 284.5,214.9 283.2,208.2C280.4,194.2 276.1,189.4 266,183.1C259.4,179 261.8,171.5 271.2,172C275.9,172.3 275.9,172.3 276.4,168.7C277.4,163 275.5,153.2 268.5,151.9C263.6,151 257.5,156.2 250.3,152.6C243.1,148.9 231.2,158 226.3,160.1C221.5,162.2 217.4,162.2 211.9,162.1C206.3,162 214.8,171.3 223.3,173.4C230.7,175.2 227.8,176.5 227.4,182.5C226.9,189.2 228.8,192.1 225.7,192.8C220.9,193.8 215.6,181 207.4,175.6C188.7,163.3 177.7,169.2 145.1,133.4C139.5,127.2 141.8,146.4 145.2,156.6C154.5,184 172.5,187.6 181,188.4C188.1,189.1 192.9,187.5 192.9,190.2C192.9,192.2 184.5,193.1 181.3,193.1C178.2,193.1 174.7,192.8 170.7,192.1C164.2,190.9 174.1,207.3 180.5,212.5C191.2,221.3 203.4,224.6 213.3,225.6C216.1,225.9 220.2,225.9 220.2,228.1C220.2,230.2 218,230.7 215.5,230.7C201.7,230.8 193.8,241.9 191.5,254.6C190.1,262.7 191.2,271.9 191.3,278.7L191.9,283.6C193,292.1 162.1,295.5 158,281.6C153.6,266.5 177.9,258.6 178.4,244.2C178.7,235.1 170.4,231 170.4,231L170.4,227.3L170.4,217.7L160.8,217.7L160.8,208.2L151.3,208.2L151.3,198.6L141.7,198.6L141.7,208.2L141.7,217.7L141.7,227.3L151.3,227.3L151.3,236.8L160.8,236.8L167,236.8C170.6,236.8 173.4,239.2 173.1,244.3C172.3,256.8 145.5,264.6 152.9,284.6C158.2,299.1 181.1,299.3 204,299.3L204,299.3L246.9,299.3C248.2,299.3 250.1,298.7 247.3,291.7C245.1,286.2 237.5,290.1 231.1,290.1C224.2,290.1 224,284.3 228.4,278.2C231.1,274.5 234.5,271.7 240.3,269C249.2,264.9 256,270.2 259.4,274.8C264.2,281.4 265.7,289 261.5,290.2C256.3,291.6 254.8,291.8 254.6,296.7C254.5,300.2 256.1,299.2 264.2,299.2L290.9,299.2C295.1,299.2 294.8,296 290.6,290.5"
android:strokeColor="@color/ic_launcher_foreground_color"
android:fillType="evenOdd"
android:fillColor="@color/ic_launcher_foreground_color"
android:strokeWidth="1"/>
<path
android:pathData="M132.2,198.9l9.5,0l0,-9.5l-9.5,0z"
android:strokeColor="@color/ic_launcher_foreground_color"
android:fillType="evenOdd"
android:fillColor="@color/ic_launcher_foreground_color"
android:strokeWidth="1"/>
</vector>

BIN
Habitica/res/drawable/hourglass_fancy_left.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.9 KiB

BIN
Habitica/res/drawable/hourglass_fancy_right.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.7 KiB

12
Habitica/res/drawable/ic_launcher_foreground.xml
View file

@ -1,16 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="430"
android:viewportHeight="430">
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M290.6,290.5C287.6,286.6 284.4,291.1 276.8,290.3C271.8,289.8 271.8,287.6 271.8,257.7C271.8,257.7 271.3,255.9 274.2,254.2C277.1,252.6 285.8,238.1 280.4,225.8C275.1,213.4 278.9,214 281.2,215.3C283.4,216.5 284.5,214.9 283.2,208.2C280.4,194.2 276.1,189.4 266,183.1C259.4,179 261.8,171.5 271.2,172C275.9,172.3 275.9,172.3 276.4,168.7C277.4,163 275.5,153.2 268.5,151.9C263.6,151 257.5,156.2 250.3,152.6C243.1,148.9 231.2,158 226.3,160.1C221.5,162.2 217.4,162.2 211.9,162.1C206.3,162 214.8,171.3 223.3,173.4C230.7,175.2 227.8,176.5 227.4,182.5C226.9,189.2 228.8,192.1 225.7,192.8C220.9,193.8 215.6,181 207.4,175.6C188.7,163.3 177.7,169.2 145.1,133.4C139.5,127.2 141.8,146.4 145.2,156.6C154.5,184 172.5,187.6 181,188.4C188.1,189.1 192.9,187.5 192.9,190.2C192.9,192.2 184.5,193.1 181.3,193.1C178.2,193.1 174.7,192.8 170.7,192.1C164.2,190.9 174.1,207.3 180.5,212.5C191.2,221.3 203.4,224.6 213.3,225.6C216.1,225.9 220.2,225.9 220.2,228.1C220.2,230.2 218,230.7 215.5,230.7C201.7,230.8 193.8,241.9 191.5,254.6C190.1,262.7 191.2,271.9 191.3,278.7L191.9,283.6C193,292.1 162.1,295.5 158,281.6C153.6,266.5 177.9,258.6 178.4,244.2C178.7,235.1 170.4,231 170.4,231L170.4,227.3L170.4,217.7L160.8,217.7L160.8,208.2L151.3,208.2L151.3,198.6L141.7,198.6L141.7,208.2L141.7,217.7L141.7,227.3L151.3,227.3L151.3,236.8L160.8,236.8L167,236.8C170.6,236.8 173.4,239.2 173.1,244.3C172.3,256.8 145.5,264.6 152.9,284.6C158.2,299.1 181.1,299.3 204,299.3L204,299.3L246.9,299.3C248.2,299.3 250.1,298.7 247.3,291.7C245.1,286.2 237.5,290.1 231.1,290.1C224.2,290.1 224,284.3 228.4,278.2C231.1,274.5 234.5,271.7 240.3,269C249.2,264.9 256,270.2 259.4,274.8C264.2,281.4 265.7,289 261.5,290.2C256.3,291.6 254.8,291.8 254.6,296.7C254.5,300.2 256.1,299.2 264.2,299.2L290.9,299.2C295.1,299.2 294.8,296 290.6,290.5"
android:strokeColor="@color/ic_launcher_foreground_color"
android:fillType="evenOdd"
android:fillColor="@color/ic_launcher_foreground_color"
android:strokeWidth="1"/>
<path
android:pathData="M132.2,198.9l9.5,0l0,-9.5l-9.5,0z"
android:pathData="M72.5660793,71.8011467 C71.9568906,70.4050958 71.2348924,70.292516 70.6031329,70.742835 C69.9713734,71.1931983 69.113995,71.4634075 68.279143,71.2607285 C67.4443354,71.0580938 67.2863844,69.1441494 67.4669062,66.9375154 C67.6473835,64.730837 68.3242845,62.3665736 68.3919524,61.5559906 C68.4596647,60.7453632 69.3170431,60.8804677 69.4298525,61.5109409 C69.542662,62.1414141 70.1969923,62.1414141 71.1446093,60.9930475 C72.0922708,59.8447252 72.227651,57.9757861 71.122083,55.2512586 C70.0164705,52.5267312 71.2574187,52.7744155 71.6974155,53.0446246 C72.1374123,53.3148337 72.4081283,52.90952 72.3066042,51.3558397 C72.2050802,49.8022037 70.7836102,48.5862626 69.6329006,47.8432097 C68.4822355,47.1001567 67.1284334,46.4584211 67.1622896,44.4656842 C67.1961457,42.4729473 69.8359932,42.7769436 70.2082776,42.8107309 C70.5805621,42.8444737 71.2799895,42.6868444 70.8738489,40.6153149 C70.4677527,38.5437855 68.9899002,38.1497342 68.0648095,38.2060019 C67.1461168,38.2619149 66.3161966,38.5437855 65.007536,38.0484168 C63.6989199,37.5530039 62.8415416,37.5079986 61.6231197,37.7782077 C60.4047422,38.0484168 59.0082867,39.029887 57.0203258,39.5682656 C55.9734063,39.8518211 54.9472803,39.9101728 53.8051014,39.9285297 C53.105674,39.9398364 52.8123873,40.6040525 53.7487189,41.6511018 C54.870282,42.9052198 57.5618467,42.9120482 58.1033231,42.7769436 C58.6448439,42.6418391 58.1258939,43.7226313 58.0807523,44.8935227 C58.0356552,46.0644142 58.6846538,48.4547496 58.1710354,49.0366259 C57.3361834,49.9823136 56.2306154,48.743892 55.8019484,47.640575 C55.373237,46.537258 54.9760269,44.9328081 49.0331156,42.8669986 C43.0088074,40.7729443 39.4898106,35.9771534 38.8626274,35.3105873 C37.413255,33.770209 36.6235445,34.5357868 36.6461153,35.6616286 C36.668686,36.7874705 36.668686,40.9530542 39.5792939,44.4206789 C42.4899018,47.8882593 46.9443416,48.6808402 48.7623552,48.4962077 C50.0371596,48.3667343 51.9059574,48.4049556 51.5555329,49.4869449 C51.2893932,50.3088347 47.7424495,50.7478913 45.9825512,50.4776822 C44.2226529,50.2074731 42.7944739,49.6333119 43.9790396,52.2339972 C45.4135722,55.3835698 49.6704734,55.4764181 51.4078454,55.3413135 C53.1451729,55.2062533 53.3425783,56.3320951 52.688248,56.9850488 C52.0339622,57.6380468 50.4545412,57.5479919 48.8751647,60.4076239 C47.2957437,63.2672559 47.7470259,67.3653095 47.7695966,69.4594081 C47.792123,71.5534624 44.0998466,72.2046868 42.0805177,71.3228047 C40.3915307,70.58525 40.0643434,68.6192502 42.3770923,67.1176252 C44.2498001,65.9017285 44.8648536,64.7987219 44.6270163,63.3805451 C44.3296419,61.6073808 43.4600896,61.6910951 43.4628887,60.1337346 L43.4628887,59.903609 C43.465599,59.6965403 43.4644882,59.4405643 43.4628887,59.2520742 L43.4628887,58.5972582 L43.4628887,55.9168936 C43.4628887,55.7238364 43.3060929,55.5673599 43.1126418,55.5673599 L40.4174782,55.5673599 C40.2240272,55.5673599 40.0671869,55.410839 40.0671869,55.2177818 L40.0671869,52.5281057 C40.0671869,52.3350485 39.9103912,52.178572 39.7169401,52.178572 L37.0217765,52.178572 C36.8283254,52.178572 36.6715296,52.0220511 36.6715296,51.8289939 L36.6715296,49.1393178 C36.6715296,48.9462606 36.5146894,48.7897841 36.3212383,48.7897841 L33.7459486,48.7897841 C33.5524975,48.7897841 33.3956573,48.6332632 33.3956573,48.440206 L33.3956573,45.8701598 C33.3956573,45.6771026 33.2388615,45.5206261 33.0454105,45.5206261 L30.3502469,45.5206261 C30.1567958,45.5206261 30,45.6771026 30,45.8701598 L30,48.5598359 C30,48.7528931 30.1567958,48.9094139 30.3502469,48.9094139 L32.9255366,48.9094139 C33.1189876,48.9094139 33.2758279,49.0658905 33.2758279,49.2589477 L33.2758279,52.178572 L33.2758279,55.5673599 L33.2758279,58.6065697 C33.2758279,58.7996269 33.4326236,58.9561477 33.6260747,58.9561477 L36.3212383,58.9561477 C36.5146894,58.9561477 36.6715296,59.1126243 36.6715296,59.3056815 L36.6715296,61.9953575 C36.6715296,62.1884147 36.8283254,62.3449356 37.0217765,62.3449356 L40.0671869,62.3449356 L41.4096592,62.3449356 C42.3770923,62.2765187 42.7479994,63.4105634 42.7380914,63.8752043 C42.7155206,64.933516 41.3190207,65.4404575 40.7525742,65.8792037 C39.2408656,67.0500951 37.9773466,68.6262559 38.676774,70.9229892 C39.4489344,73.4584058 43.4375188,73.9853003 45.6035577,73.9853003 L60.2467912,73.9853003 C61.0139309,73.9853003 61.8036414,74.1654101 61.6231197,73.2647278 C61.4426423,72.3640898 61.1041696,70.5627252 59.9986016,70.5627252 C58.8930336,70.5627252 57.9905137,71.7560971 56.9075164,71.4408827 C55.8244747,71.1256239 55.8244747,69.6620428 57.4489928,67.1176252 C59.0735553,64.573252 62.0066895,65.1136259 63.744017,66.6447814 C65.481389,68.1759369 65.0752484,71.395833 64.6014398,72.3865703 C64.1275869,73.3773075 64.6014398,73.9853003 65.481389,73.9853003 L72.385602,73.9853003 C73.4685992,73.9853003 73.175268,73.1971977 72.5660793,71.8011467"
android:strokeColor="@color/ic_launcher_foreground_color"
android:fillType="evenOdd"
android:fillColor="@color/ic_launcher_foreground_color"

9
Habitica/res/drawable/ic_launcher_monochrome.xml
View file

@ -1,12 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="430"
android:viewportHeight="430">
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M290.6,290.5C287.6,286.6 284.4,291.1 276.8,290.3C271.8,289.8 271.8,287.6 271.8,257.7C271.8,257.7 271.3,255.9 274.2,254.2C277.1,252.6 285.8,238.1 280.4,225.8C275.1,213.4 278.9,214 281.2,215.3C283.4,216.5 284.5,214.9 283.2,208.2C280.4,194.2 276.1,189.4 266,183.1C259.4,179 261.8,171.5 271.2,172C275.9,172.3 275.9,172.3 276.4,168.7C277.4,163 275.5,153.2 268.5,151.9C263.6,151 257.5,156.2 250.3,152.6C243.1,148.9 231.2,158 226.3,160.1C221.5,162.2 217.4,162.2 211.9,162.1C206.3,162 214.8,171.3 223.3,173.4C230.7,175.2 227.8,176.5 227.4,182.5C226.9,189.2 228.8,192.1 225.7,192.8C220.9,193.8 215.6,181 207.4,175.6C188.7,163.3 177.7,169.2 145.1,133.4C139.5,127.2 141.8,146.4 145.2,156.6C154.5,184 172.5,187.6 181,188.4C188.1,189.1 192.9,187.5 192.9,190.2C192.9,192.2 184.5,193.1 181.3,193.1C178.2,193.1 174.7,192.8 170.7,192.1C164.2,190.9 174.1,207.3 180.5,212.5C191.2,221.3 203.4,224.6 213.3,225.6C216.1,225.9 220.2,225.9 220.2,228.1C220.2,230.2 218,230.7 215.5,230.7C201.7,230.8 193.8,241.9 191.5,254.6C190.1,262.7 191.2,271.9 191.3,278.7L191.9,283.6C193,292.1 162.1,295.5 158,281.6C153.6,266.5 177.9,258.6 178.4,244.2C178.7,235.1 170.4,231 170.4,231L170.4,227.3L170.4,217.7L160.8,217.7L160.8,208.2L151.3,208.2L151.3,198.6L141.7,198.6L141.7,208.2L141.7,217.7L141.7,227.3L151.3,227.3L151.3,236.8L160.8,236.8L167,236.8C170.6,236.8 173.4,239.2 173.1,244.3C172.3,256.8 145.5,264.6 152.9,284.6C158.2,299.1 181.1,299.3 204,299.3L204,299.3L246.9,299.3C248.2,299.3 250.1,298.7 247.3,291.7C245.1,286.2 237.5,290.1 231.1,290.1C224.2,290.1 224,284.3 228.4,278.2C231.1,274.5 234.5,271.7 240.3,269C249.2,264.9 256,270.2 259.4,274.8C264.2,281.4 265.7,289 261.5,290.2C256.3,291.6 254.8,291.8 254.6,296.7C254.5,300.2 256.1,299.2 264.2,299.2L290.9,299.2C295.1,299.2 294.8,296 290.6,290.5"
android:fillColor="@color/white"/>
<path
android:pathData="M132.2,198.9l9.5,0l0,-9.5l-9.5,0z"
android:pathData="M72.5660793,71.8011467 C71.9568906,70.4050958 71.2348924,70.292516 70.6031329,70.742835 C69.9713734,71.1931983 69.113995,71.4634075 68.279143,71.2607285 C67.4443354,71.0580938 67.2863844,69.1441494 67.4669062,66.9375154 C67.6473835,64.730837 68.3242845,62.3665736 68.3919524,61.5559906 C68.4596647,60.7453632 69.3170431,60.8804677 69.4298525,61.5109409 C69.542662,62.1414141 70.1969923,62.1414141 71.1446093,60.9930475 C72.0922708,59.8447252 72.227651,57.9757861 71.122083,55.2512586 C70.0164705,52.5267312 71.2574187,52.7744155 71.6974155,53.0446246 C72.1374123,53.3148337 72.4081283,52.90952 72.3066042,51.3558397 C72.2050802,49.8022037 70.7836102,48.5862626 69.6329006,47.8432097 C68.4822355,47.1001567 67.1284334,46.4584211 67.1622896,44.4656842 C67.1961457,42.4729473 69.8359932,42.7769436 70.2082776,42.8107309 C70.5805621,42.8444737 71.2799895,42.6868444 70.8738489,40.6153149 C70.4677527,38.5437855 68.9899002,38.1497342 68.0648095,38.2060019 C67.1461168,38.2619149 66.3161966,38.5437855 65.007536,38.0484168 C63.6989199,37.5530039 62.8415416,37.5079986 61.6231197,37.7782077 C60.4047422,38.0484168 59.0082867,39.029887 57.0203258,39.5682656 C55.9734063,39.8518211 54.9472803,39.9101728 53.8051014,39.9285297 C53.105674,39.9398364 52.8123873,40.6040525 53.7487189,41.6511018 C54.870282,42.9052198 57.5618467,42.9120482 58.1033231,42.7769436 C58.6448439,42.6418391 58.1258939,43.7226313 58.0807523,44.8935227 C58.0356552,46.0644142 58.6846538,48.4547496 58.1710354,49.0366259 C57.3361834,49.9823136 56.2306154,48.743892 55.8019484,47.640575 C55.373237,46.537258 54.9760269,44.9328081 49.0331156,42.8669986 C43.0088074,40.7729443 39.4898106,35.9771534 38.8626274,35.3105873 C37.413255,33.770209 36.6235445,34.5357868 36.6461153,35.6616286 C36.668686,36.7874705 36.668686,40.9530542 39.5792939,44.4206789 C42.4899018,47.8882593 46.9443416,48.6808402 48.7623552,48.4962077 C50.0371596,48.3667343 51.9059574,48.4049556 51.5555329,49.4869449 C51.2893932,50.3088347 47.7424495,50.7478913 45.9825512,50.4776822 C44.2226529,50.2074731 42.7944739,49.6333119 43.9790396,52.2339972 C45.4135722,55.3835698 49.6704734,55.4764181 51.4078454,55.3413135 C53.1451729,55.2062533 53.3425783,56.3320951 52.688248,56.9850488 C52.0339622,57.6380468 50.4545412,57.5479919 48.8751647,60.4076239 C47.2957437,63.2672559 47.7470259,67.3653095 47.7695966,69.4594081 C47.792123,71.5534624 44.0998466,72.2046868 42.0805177,71.3228047 C40.3915307,70.58525 40.0643434,68.6192502 42.3770923,67.1176252 C44.2498001,65.9017285 44.8648536,64.7987219 44.6270163,63.3805451 C44.3296419,61.6073808 43.4600896,61.6910951 43.4628887,60.1337346 L43.4628887,59.903609 C43.465599,59.6965403 43.4644882,59.4405643 43.4628887,59.2520742 L43.4628887,58.5972582 L43.4628887,55.9168936 C43.4628887,55.7238364 43.3060929,55.5673599 43.1126418,55.5673599 L40.4174782,55.5673599 C40.2240272,55.5673599 40.0671869,55.410839 40.0671869,55.2177818 L40.0671869,52.5281057 C40.0671869,52.3350485 39.9103912,52.178572 39.7169401,52.178572 L37.0217765,52.178572 C36.8283254,52.178572 36.6715296,52.0220511 36.6715296,51.8289939 L36.6715296,49.1393178 C36.6715296,48.9462606 36.5146894,48.7897841 36.3212383,48.7897841 L33.7459486,48.7897841 C33.5524975,48.7897841 33.3956573,48.6332632 33.3956573,48.440206 L33.3956573,45.8701598 C33.3956573,45.6771026 33.2388615,45.5206261 33.0454105,45.5206261 L30.3502469,45.5206261 C30.1567958,45.5206261 30,45.6771026 30,45.8701598 L30,48.5598359 C30,48.7528931 30.1567958,48.9094139 30.3502469,48.9094139 L32.9255366,48.9094139 C33.1189876,48.9094139 33.2758279,49.0658905 33.2758279,49.2589477 L33.2758279,52.178572 L33.2758279,55.5673599 L33.2758279,58.6065697 C33.2758279,58.7996269 33.4326236,58.9561477 33.6260747,58.9561477 L36.3212383,58.9561477 C36.5146894,58.9561477 36.6715296,59.1126243 36.6715296,59.3056815 L36.6715296,61.9953575 C36.6715296,62.1884147 36.8283254,62.3449356 37.0217765,62.3449356 L40.0671869,62.3449356 L41.4096592,62.3449356 C42.3770923,62.2765187 42.7479994,63.4105634 42.7380914,63.8752043 C42.7155206,64.933516 41.3190207,65.4404575 40.7525742,65.8792037 C39.2408656,67.0500951 37.9773466,68.6262559 38.676774,70.9229892 C39.4489344,73.4584058 43.4375188,73.9853003 45.6035577,73.9853003 L60.2467912,73.9853003 C61.0139309,73.9853003 61.8036414,74.1654101 61.6231197,73.2647278 C61.4426423,72.3640898 61.1041696,70.5627252 59.9986016,70.5627252 C58.8930336,70.5627252 57.9905137,71.7560971 56.9075164,71.4408827 C55.8244747,71.1256239 55.8244747,69.6620428 57.4489928,67.1176252 C59.0735553,64.573252 62.0066895,65.1136259 63.744017,66.6447814 C65.481389,68.1759369 65.0752484,71.395833 64.6014398,72.3865703 C64.1275869,73.3773075 64.6014398,73.9853003 65.481389,73.9853003 L72.385602,73.9853003 C73.4685992,73.9853003 73.175268,73.1971977 72.5660793,71.8011467"
android:fillColor="@color/white"/>
</vector>

4
Habitica/res/drawable/subscription_box_bg.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?attr/colorWindowBackground"/>
<corners android:radius="8dip"/>
<corners android:radius="20dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>
</shape>

5
Habitica/res/layout/fragment_tavern_detail.xml
View file

@ -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"/>
<com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
android:id="@+id/worldBossSection"
android:layout_width="match_parent"
@ -109,4 +110,4 @@
android:padding="@dimen/spacing_large"/>
</com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

12
Habitica/res/layout/subscription_details.xml
View file

@ -212,19 +212,17 @@
android:layout_height="wrap_content">
<ImageView
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_centerVertical="true"
android:layout_marginStart="2dp"
android:scaleType="center"
android:src="@drawable/hourglass_fancy_left" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="2dp"
android:scaleType="center"
android:src="@drawable/hourglass_fancy_right" />
@ -311,4 +309,4 @@
android:layout_marginTop="@dimen/spacing_medium"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
View file

@ -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()

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
View file

@ -173,6 +173,10 @@ class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
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"

10
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
View file

@ -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))
}
}
}

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.1.8
CODE=5701
CODE=5821