Commit graph

4127 commits

Author SHA1 Message Date
Phillip Thelen
9aabe00874 Merge branch '3.5' of https://github.com/HabitRPG/habitica-android into 3.5 2022-02-14 18:07:25 +01:00
Phillip Thelen
0fb85684ae Fix 2022-02-14 18:07:22 +01:00
Hafizzle
1a5800c0ef
Added question mark to Discard string (#1707) 2022-02-14 15:41:42 +01:00
Phillip Thelen
23e6e88466 fix handling new subscriptions 2022-02-08 16:14:01 +01:00
Phillip Thelen
83a22fb35b Merge branch '3.5' of https://github.com/HabitRPG/habitica-android into 3.5 2022-02-07 21:16:55 +01:00
Phillip Thelen
2dbda95725 fix equipping things 2022-02-07 21:16:52 +01:00
Hafizzle
9088d1d566
Discard Modal for user editing a Task and presses back (#1704)
* Check created task being edited

isBeingEdited added to check for views being edited
check for edited views onBackPressed
Add res Strings for discard dialog

* Compare by task

Check if user is editing by comparing dummy task created during init to any changes

* Discard dialog events added

fire events to check if user accepted discard on back pressed, or if cancel was pressed and task was saved.

Code cleanup

* Dialog dismiss listener added

Set isDiscardCancelled true to Dialog onDismiss

* Format code / cleanup
2022-02-07 21:13:08 +01:00
Phillip Thelen
996142e16d Merge branch '3.5' of https://github.com/HabitRPG/habitica-android into 3.5
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
2022-02-02 11:59:38 +01:00
Hafizzle
2ed5a7d124
Fixed chat scroll (#1703)
Data observer added to Chat Adapter
2022-02-01 21:25:32 +01:00
Phillip Thelen
e08b3a9d5b fix icon 2022-02-01 17:03:29 +01:00
Phillip Thelen
05227415e4 update present icon 2022-02-01 16:43:00 +01:00
Phillip Thelen
703f51d28d Fix crashes 2022-02-01 12:14:13 +01:00
Phillip Thelen
354a73f6f1 Remove unused call 2022-02-01 11:33:45 +01:00
Phillip Thelen
dde0aa72b4 update dependencies 2022-02-01 10:17:14 +01:00
Phillip Thelen
46caca91e2 Start using a central userViewModel 2022-01-31 15:58:15 +01:00
Phillip Thelen
2e654c9c63 Design fixes 2022-01-31 13:54:01 +01:00
Phillip Thelen
c6305d9121 Fix minor issues 2022-01-31 11:46:31 +01:00
Phillip Thelen
009fc24fbd Begin moving logic out of main activity 2022-01-28 16:24:13 +01:00
Phillip Thelen
a37de3f497 Fix issue with reporting messages 2022-01-27 13:10:45 +01:00
Phillip Thelen
7a13395773 Implement new version of adventure guide 2022-01-25 16:49:21 +01:00
Phillip Thelen
3ac9a652d1 Fixes #1670 2022-01-20 15:12:26 +01:00
Phillip Thelen
42fe386b6c Fixes #1688 2022-01-20 15:00:57 +01:00
Phillip Thelen
bc7a9ebad4 Fully remove eventbus 2022-01-13 15:33:07 +01:00
Phillip Thelen
bfe0d3da71 Fixes #1685 2022-01-12 15:49:16 +01:00
Phillip Thelen
2429d1fdf8 Fixes #1424 2022-01-12 15:34:11 +01:00
Phillip Thelen
d5b70c9896 Refactor code 2022-01-12 15:33:54 +01:00
Phillip Thelen
7273767c96 Rewrite PurchaseHandler to use BillingClient 4.0 2022-01-11 14:39:15 +01:00
Phillip Thelen
f8fa953d76 Fixes #1680 2022-01-10 13:09:44 +01:00
Phillip Thelen
8eca74d83e Fix URL handling. Fixes #1674 2022-01-10 13:02:15 +01:00
Phillip Thelen
206cf183a5 Improve challenge and group loading. Fixes #1619 2022-01-10 12:34:41 +01:00
Phillip Thelen
b1bc6c5a17 Improve chat handling 2022-01-10 11:22:05 +01:00
Phillip Thelen
6e4994052b Fixes #1683 2022-01-07 11:44:52 +01:00
Phillip Thelen
2f9f342768 Improve notification handling 2022-01-06 13:36:08 +01:00
Phillip Thelen
910b2f2b0a tablet fix 2022-01-06 13:20:28 +01:00
Phillip Thelen
84cb6fe6ed Fixes #1671 2022-01-06 12:25:52 +01:00
Phillip Thelen
64602efe43 bump build number 2022-01-04 14:56:28 +01:00
Phillip Thelen
d07173a767 Fix minor issues 2022-01-04 14:37:37 +01:00
Phillip Thelen
55feea9dbd Fix error loading user data 2022-01-04 14:37:32 +01:00
Phillip Thelen
c513e63907 fix checking off task from widget. Fixes #1683 2022-01-04 14:08:37 +01:00
Phillip Thelen
ba50477cbe improve about me editing 2022-01-04 14:06:58 +01:00
Phillip Thelen
bce1c555b7 Fix clipboard issue 2022-01-04 14:06:42 +01:00
Phillip Thelen
0989f73de4 Improve type safety more 2021-12-17 13:14:35 +01:00
Phillip Thelen
99f31af07e minor fixes 2021-12-15 16:13:26 +01:00
Phillip Thelen
011af84c31 Fix widget issues 2021-12-09 15:52:33 +01:00
Phillip Thelen
b146895a52 Widget fixes 2021-11-29 17:03:17 +01:00
Phillip Thelen
164fefe228 Revert "Bug fix stats widget (#1664)"
This reverts commit b77158d244.

# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetFactory.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
2021-11-19 11:43:24 +01:00
Phillip Thelen
ea6adb6f16 Various settings fixes 2021-11-19 11:42:49 +01:00
Phillip Thelen
af01b9738a Hide facebook and apple for connecting in settings 2021-11-11 10:05:23 +01:00
Phillip Thelen
d561ab01b6 Fixes #1555 2021-11-10 15:12:29 +01:00
Phillip Thelen
3b6251f114 Improve social login handling for logged in users 2021-11-10 15:12:29 +01:00