Commit graph

5753 commits

Author SHA1 Message Date
Hafiz
2c18237643 fix 2023-04-06 14:10:52 -04:00
Hafiz
2fa66ecbf4 Update state for when you have all armoire items 2023-04-06 14:09:32 -04:00
Hafiz
680719b587 Remove testing vars 2023-04-05 12:08:39 -04:00
Hafiz
f0d6606829 Due date update to reflect if to-do is today (Shown as "Today", in the future with local date preference, or due yesterday or longer shown with red/maroon text) 2023-04-05 12:08:07 -04:00
Phillip Thelen
c59bc3cade
Merge pull request #1950 from Hafizzle/Fiz/seeking-party-ui-updates
No Party - Seeking party UI Updates
2023-04-05 15:43:21 +02:00
Phillip Thelen
75648e1a04
Merge pull request #1948 from Hafizzle/Fiz/change-class-modal-fix
Show confirmation modal on successful class change fixes
2023-04-05 15:39:06 +02:00
Phillip Thelen
f18855941f
Merge branch 'version/4.2' into Fiz/change-class-modal-fix 2023-04-05 15:39:01 +02:00
Phillip Thelen
f131e0118f
Merge pull request #1944 from Hafizzle/Fiz/manual-reschedule-alarm-update
Manual reschedule alarm updates - use cases around manually rescheduling an alarm
2023-04-05 15:32:17 +02:00
Phillip Thelen
91da8eeff5
Merge pull request #1940 from Hafizzle/Fiz/looking-party-empty-string
Updated find more members description
2023-04-05 15:31:50 +02:00
Phillip Thelen
73c38a6a9a
Merge branch 'version/4.2' into Fiz/looking-party-empty-string 2023-04-05 15:31:45 +02:00
Hafiz
1d0fc643d0 Merge branch 'Fiz/duplicate-menuitem-fixes' into version/4.2 2023-04-04 10:43:36 -04:00
Hafiz
10b384be35 Duplicate menu item fixes
quick fix of duplicate menu items
2023-04-04 10:40:32 -04:00
Hafiz
25d07d0ce9 Design header adjustments for "Choose Class"
Dark mode: button is Gray10, text is Gray400
Light mode: button is Gray 700, text is Gray200
2023-04-04 09:31:39 -04:00
Phillip Thelen
7bca210864 fix sprite substitution 2023-04-02 10:35:38 +02:00
Hafiz
244582a311 No Party - Seeking party UI Updates 2023-04-01 11:36:34 -04:00
Hafiz
bb18865720 Sync up the change class confirmation messages
new combined text:
Do you want to change your class to [newClass] for 3 Gems?
This will refund your stat points, switch which gear is unlocked in shops, and change your available skills.
2023-03-29 11:13:20 -04:00
Hafiz
5eb7f980f0 Show Confirmation modal on successful class change fixes
Updated Dialog width to fix multi-line progress text.
Finish activity when confirmation dialog "Got it" button was pressed or if dialog was dismissed.

Add class that was changed to in confirmation dialog.
2023-03-29 10:48:36 -04:00
Phillip Thelen
acda038190 update icon 2023-03-29 15:33:29 +02:00
Hafiz
ac38f9c30f Add transformation item name on toast after use 2023-03-29 14:22:43 +02:00
Hafiz
546a765cb1 Update party invite notification and party invite strings 2023-03-29 14:22:43 +02:00
Hafiz
170c583076 Filter included in all items not just food 2023-03-29 14:22:27 +02:00
Hafiz
fa7115463b Fix duplicate food entries - distinct by item key to avoid duplicates 2023-03-29 14:22:27 +02:00
Hafiz
f0274f2611 Update text -> Capitalize and add spaces
This is pretty quick-fix-esque but allows us to properly format the text without having to use the Skill object text immediately
2023-03-29 14:22:27 +02:00
Hafiz
6b1579e677 Ensure party invite view does not exist when creating
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
2023-03-29 14:21:39 +02:00
Phillip Thelen
4b326bae30 fix issue with reloading after joining party 2023-03-29 14:20:20 +02:00
Phillip Thelen
cd0057978d Fix multiple party invites 2023-03-29 14:19:58 +02:00
Phillip Thelen
bfa455bec5 fix gryphatrice 2023-03-29 14:17:53 +02:00
Phillip Thelen
6cdf5c7bf6 fix sprite substitution
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
#	common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
#	version.properties
2023-03-29 14:17:03 +02:00
Phillip Thelen
edf8d5bbe3 improve assigning UX 2023-03-29 12:45:28 +02:00
Phillip Thelen
99816e05a7 use correct dialog 2023-03-29 12:45:21 +02:00
Phillip Thelen
fb17a97e14 Minor improvements 2023-03-29 12:11:28 +02:00
Phillip Thelen
d5a8e1fe42 Add empty state 2023-03-28 12:03:10 +02:00
Phillip Thelen
1ef2e901fc paginate party seeking 2023-03-28 11:58:41 +02:00
Phillip Thelen
5249cb123b refactor inbox slightly 2023-03-28 11:19:33 +02:00
Phillip Thelen
2a4a30da3b Fix stable issues 2023-03-28 11:03:32 +02:00
Phillip Thelen
c7fc3d70aa show armoire in market if all gear was purchased 2023-03-27 16:23:15 +02:00
Phillip Thelen
06c3bdb2c4 fix task summary 2023-03-27 16:23:15 +02:00
Phillip Thelen
7a1541ac84 fix issue with subscriptions being reapplied
# Conflicts:
#	version.properties
2023-03-27 16:23:15 +02:00
Phillip Thelen
e37f25bc21 Fix next hourglass display 2023-03-27 16:23:15 +02:00
Phillip Thelen
eb8bd4bb16 Allow class to be switched from market 2023-03-27 16:23:15 +02:00
Phillip Thelen
3d89420792 dialog tweaks 2023-03-27 16:23:15 +02:00
Phillip Thelen
b7010191d4
Merge pull request #1943 from Hafizzle/Fiz/google-sign-in-progress-indicator
Added circular progress indicator when signing in with Google
2023-03-27 16:22:29 +02:00
Phillip Thelen
c4dc32658c
Merge pull request #1942 from Hafizzle/Fiz/android-9-gradient-fix
Android 9 Gradient Fix
2023-03-27 16:21:49 +02:00
Phillip Thelen
d72db86370
Merge pull request #1941 from Hafizzle/Fiz/no-party-design-changes
Updated No Party Design layout
2023-03-27 16:21:22 +02:00
Hafiz
e1fa720c21 Reschedule alarm updates - use cases around reminder manual reschedule
When manually changing the alarm time, nextDue will provide the previously set upcoming alarm - however if the alarm was changed to a upcoming time today (and not before the current time) AND the previous alarm set for today already passed, we want to check if the alarm repeat/days includes today as well. If so - use today's date to schedule an alarm. If not, use nextDue.

Alarms automatically rescheduled -> nextDue used.
A alarm that already passed today and is rescheduled for a upcoming time today -> Schedule for today (instead of using nextDue)

- Update reschedule alarm to handle some use cases around user rescheduling alarm
- Zoned Time extension
2023-03-26 23:38:52 -04:00
Hafiz
f3d87a8df2 Added circular progress indicator during google sign in 2023-03-25 00:17:31 -04:00
Hafiz
351372e1c0 LinearGradient Android 9 Fix
Android 9 gradients play well with setting colors using all color resources OR attr, using both causes a crash.
2023-03-24 23:40:15 -04:00
Hafiz
1aa5d39e4f Use Material card for looking for party view and set corner radius 15dp 2023-03-23 02:17:37 -04:00
Hafiz
113080c991 Updated No Party design UI
No Party design changes
Updated Create party string resources
2023-03-23 02:05:39 -04:00
Hafiz
2a3b17e9d0 Updated string resource 2023-03-22 11:18:06 -04:00