Commit graph

5753 commits

Author SHA1 Message Date
Phillip Thelen
d32fe481e4 Display assigned avatars 2022-12-09 13:12:12 +01:00
Phillip Thelen
dc33e91010 improve task score notification display 2022-12-09 13:12:12 +01:00
Phillip Thelen
d7523c7bdf Refactor Refactor 2022-12-09 13:12:12 +01:00
Phillip Thelen
8ebb743b10
Merge pull request #1862 from Hafizzle/Hafiz/task-link-updates
Notes and checklist item link fixes
2022-12-09 10:31:52 +01:00
Phillip Thelen
48a65cd4d3
Merge pull request #1877 from Hafizzle/Hafiz/android13-request-notification-permissions
Android 13 Notification Permissions
2022-12-05 17:53:02 +01:00
Phillip Thelen
708a013641
Merge pull request #1879 from shane-tang/gitignore-wearos-google-services
Add google-services.json to wearos/.gitignore
2022-12-05 17:52:27 +01:00
Phillip Thelen
bf3370b821
Merge pull request #1850 from Hafizzle/Hafiz/update-sub-benefit-ui
Updated subscription benefit screen UI
2022-12-05 17:51:49 +01:00
Phillip Thelen
b3686f72d4
Merge branch 'version/4.1' into Hafiz/update-sub-benefit-ui 2022-12-05 17:51:27 +01:00
Phillip Thelen
a374039228
Merge pull request #1865 from AdamWier/show-class-on-profile
If no flags loaded, assume character has class selected
2022-12-05 17:50:46 +01:00
Phillip Thelen
31330b8f1d
Merge branch 'version/4.1' into Hafiz/task-link-updates 2022-12-05 17:49:25 +01:00
Phillip Thelen
5d9f2d4b5f
Merge pull request #1853 from booker-lee/1842-fix-hp-under-1
Fix hp display when value is under 1 #1842
2022-12-05 17:45:34 +01:00
Phillip Thelen
b73a513cfe Rewrite parts of task form in compose 2022-11-28 13:26:18 +01:00
Phillip Thelen
5049c622dd Improve group plans support 2022-11-22 15:48:15 +01:00
Phillip Thelen
472a35281f More colors 2022-11-22 15:48:09 +01:00
Phillip Thelen
95c78d12e1 more colors 2022-11-17 19:01:54 +01:00
Phillip Thelen
2ea1096622 build basic task summary view 2022-11-17 17:33:15 +01:00
Phillip Thelen
3bd68fedf0 Fully remove RxJava 2022-11-17 14:19:21 +01:00
Phillip Thelen
c4a482eac8 Remove RxJava from all repositories 2022-11-16 14:02:58 +01:00
Phillip Thelen
cedc06f1e9 port more code to coroutines 2022-11-16 14:01:50 +01:00
Shane Tang
197405cfb2 add google-services.json to wearos/.gitignore 2022-11-15 21:55:40 -05:00
Phillip Thelen
bd4b04f86e
Merge pull request #1864 from Hafizzle/Hafiz/challenge-tasks-fix
Display Challenge tasks if local repository does not initially populate
2022-11-15 14:30:46 +01:00
Phillip Thelen
9223ee3705
Merge pull request #1863 from Hafizzle/Hafiz/wear-black-screen-fix
Black screen when launching wear app first time fix
2022-11-15 14:25:51 +01:00
Phillip Thelen
d5055a3212
Merge pull request #1859 from Hafizzle/Hafiz/drag-task-fix
Factor in if adventure guide is shown when dragging item
2022-11-15 14:20:27 +01:00
Phillip Thelen
2872a231a5
Merge pull request #1856 from Hafizzle/Hafiz/change-class-update
Update user when changing class
2022-11-15 14:19:47 +01:00
Phillip Thelen
9542d24d2d
Merge branch 'version/4.1' into Hafiz/change-class-update 2022-11-15 14:19:40 +01:00
Phillip Thelen
6a2a80a0d0
Merge pull request #1855 from Hafizzle/Hafiz/no-chair-selection
Fix no wheelchair selection not properly highlighting
2022-11-15 14:18:22 +01:00
Phillip Thelen
4dfc7ec1a1 fix crash
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
2022-11-15 14:00:54 +01:00
Phillip Thelen
7e8366a3ce group task logic fixes
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
#	version.properties
2022-11-15 14:00:15 +01:00
Hafiz
7ddfb56c23 Update SharedPreferences usePushNotifications if user denies permission 2022-11-14 23:30:20 -05:00
Phillip Thelen
4520248ed8 More coroutine work 2022-11-07 13:37:43 +01:00
Hafiz
40378e5823 Request permission on startup and when enabling push notifications 2022-11-04 00:50:32 -04:00
Phillip Thelen
576d81c868 group task logic fixes
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
#	version.properties
2022-11-02 10:20:01 +01:00
Phillip Thelen
f93f45e692 fix colrs 2022-10-31 15:12:55 +01:00
Phillip Thelen
e2fdeab194 Revert "Prepare for new menu"
This reverts commit e3f66e57df.
2022-10-31 14:33:03 +01:00
Phillip Thelen
f6a77bc77f fix import 2022-10-31 14:31:03 +01:00
Phillip Thelen
07e6fc3133 Revert "Prepare for new menu"
This reverts commit e3f66e57df.
2022-10-31 14:30:57 +01:00
Phillip Thelen
bdfb475a99 correctly display task completion for group tasks
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
2022-10-31 12:55:48 +01:00
Phillip Thelen
e3f66e57df Prepare for new menu 2022-10-31 09:42:13 +01:00
Phillip Thelen
5ae7f9bbb7 Merge avatar and equipment screens 2022-10-31 09:42:13 +01:00
Phillip Thelen
8fe9de1223 Improve push notification handling
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
#	version.properties
2022-10-31 09:42:13 +01:00
Phillip Thelen
adfe3ac280 fix setting emails and push notifications
# Conflicts:
#	version.properties
2022-10-31 09:42:13 +01:00
Phillip Thelen
af964643aa notification improvements
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
#	version.properties
2022-10-31 09:42:13 +01:00
Phillip Thelen
b9dff19cdb Fix issues wih notifications 2022-10-31 09:42:13 +01:00
Phillip Thelen
919ac41c29 Fix crash 2022-10-31 09:42:13 +01:00
Phillip Thelen
67c0978ffc
Merge pull request #1871 from Hafizzle/Hafiz/avatar-customization-filter-fix
Avatar Background filter by month fix
2022-10-31 09:39:49 +01:00
Phillip Thelen
30e8d0b0ea
Merge pull request #1868 from Hafizzle/Hafiz/incorrect-task-placement
Fix Task names appearing on incorrect task
2022-10-31 09:39:30 +01:00
Hafiz
858c7d087e Check customizationSet for month 2022-10-26 16:25:31 -04:00
Hafiz
3c3d1debc7 Fix Task names appearing on incorrect task
Removed extra unnecessary filter() onResume causing incorrect task placement
2022-10-24 01:40:46 -04:00
Hafizzle
2cef29f475
Merge pull request #1857 from kouki4416/fix-daily-streak-bug
Fix deselecting daily item does not decrement count(issue #1845)
2022-10-17 12:17:07 -04:00
AdamWier
946ae3ba01 If no flags loaded, assume character has class selected 2022-10-16 19:53:51 +02:00