Commit graph

2787 commits

Author SHA1 Message Date
Phillip Thelen
8cec554c7f Fix crash on android pre 23 2019-06-05 11:56:17 +02:00
Phillip Thelen
04e88a8494 Improve settings dialogs 2019-06-05 11:37:18 +02:00
Phillip Thelen
7f66c84e5c Remove code from MainActivity 2019-06-04 16:37:37 +02:00
Phillip Thelen
0ba3840c68 Reorganize app components 2019-06-03 18:17:42 +02:00
Phillip Thelen
b070e66b18 Only show habit streak adjustments as needed. Fixes #1168 2019-06-03 17:19:37 +02:00
Phillip Thelen
f6d6308601 Don’t draw app behind navbar
Fixes #1164
2019-06-03 17:12:29 +02:00
Phillip Thelen
b456c7829e Fix logging out and logging back in 2019-06-03 14:09:29 +02:00
Phillip Thelen
88f42b0e97 Merge branch 'cvuorinen-794-global-notifications' into develop 2019-06-03 13:16:51 +02:00
Phillip Thelen
e04f5480db Fix merge issue 2019-06-03 13:15:59 +02:00
Phillip Thelen
73114f14f1 Merge branch '794-global-notifications' of https://github.com/cvuorinen/habitica-android into cvuorinen-794-global-notifications
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
2019-06-03 12:36:33 +02:00
Phillip Thelen
69432ba941 update changelog 2019-06-03 12:32:43 +02:00
Phillip Thelen
49c7795be5 store API key encrypted 2019-06-03 12:15:56 +02:00
Phillip Thelen
4e5f092869 Update guidelines 2019-05-31 13:41:05 +02:00
Phillip Thelen
d2044f307c Improve offline notice 2019-05-31 11:07:36 +02:00
Phillip Thelen
6c8f909a47 convert code to kotlin 2019-05-31 10:22:36 +02:00
Phillip Thelen
a725b0f362 Improve keyboard handling in task form 2019-05-31 10:22:36 +02:00
Phillip Thelen
2ffa14907e Implement first version of achievement screen 2019-05-31 10:22:36 +02:00
Phillip Thelen
ec14b054ca update login incentive modal 2019-05-31 10:22:36 +02:00
Phillip Thelen
b448c6bd6d update no currency dialogs 2019-05-31 10:22:36 +02:00
Phillip Thelen
cdda95295d Update purchase dialog 2019-05-31 10:22:36 +02:00
Phillip Thelen
c3c52b95dc start using native emojis 2019-05-31 10:22:36 +02:00
Phillip Thelen
6401a085d8 Implement new level up related dialogs 2019-05-31 10:22:36 +02:00
Phillip Thelen
fdfee1f5dc fix emoji textview classes 2019-05-31 10:22:36 +02:00
Phillip Thelen
f66d7c8ab9 tweak new alert design 2019-05-31 10:22:36 +02:00
Camille Merz
e5dd85e5ea #1122 Show confirmation toast when group invite sent (#1155)
* Show snackbar when invitation sent, even if field blank

* Show snackbar when invitation is sent, only if field filled out
2019-05-31 09:42:26 +02:00
Remigiusz Samborski
a6cb52fc40 Fixing bug #1153 Tasks: Keyboard goes away immediately when trying to adjust a streak (#1158)
* Fixing bug #1153 Tasks: Keyboard goes away immediately when trying to adjust a streak

Turned off keyboard hiding after scroll for Positive and Negative streak edittext fields.

* Fixing issue with saving positive and negative streak for Habits

Issue described here https://github.com/HabitRPG/habitica-android/issues/1153#issuecomment-493798106
2019-05-31 09:38:51 +02:00
Carl Vuorinen
716f649c35 Set dividers & bg correctly for notifications list 2019-05-22 19:42:24 +03:00
Carl Vuorinen
90fcb49e89 Add click handlers for group task notifications 2019-05-22 19:42:24 +03:00
Carl Vuorinen
aa35cd880d Handle clicking notifications
Pass notificationId to main activity via result intent so that we can navigate (can't navigate straight from notifications activity)
2019-05-22 19:42:24 +03:00
Carl Vuorinen
615dbe03c0 Add support for group task notifications 2019-05-22 19:42:24 +03:00
Carl Vuorinen
96dbfd01c9 Add a little padding to dismiss button so it's easier to hit 2019-05-22 19:42:24 +03:00
Carl Vuorinen
21d29b51e5 Refactor NotificationsManager 2019-05-22 19:42:24 +03:00
Carl Vuorinen
f1939123be Convert NotificationsManager to Kotlin 2019-05-22 19:42:24 +03:00
Carl Vuorinen
b668cccd7f Fix PopupNotificationsManagerTest 2019-05-22 19:42:24 +03:00
Carl Vuorinen
c5b5aac774 Rename PopupNotificationsManager to NotificationsManager 2019-05-22 19:42:24 +03:00
Carl Vuorinen
a78897cda7 Revert saving notifications to Realm through User, use PopupNotificationsManager instead
Combine Notification & GlobalNotification models since they model the same thing
2019-05-22 19:42:24 +03:00
Carl Vuorinen
a4583c479a Fix line spacing in no notifications view 2019-05-22 19:42:24 +03:00
Carl Vuorinen
196f208533 Implement dismiss notifications & mark notifications as seen 2019-05-22 19:42:24 +03:00
Carl Vuorinen
140f3eefea Change badge color to gray if all notifications seen 2019-05-22 19:42:16 +03:00
Carl Vuorinen
edc54be6a4 Change badge color from red to purple + improved badge layout
Previously with the padding in the badge shape, it didn't handle large
numbers well (partly cut off) and also the shape wasn't round with small
numbers. Using minWidth & center gravity without padding fixes both issues.
2019-05-22 18:37:21 +03:00
Carl Vuorinen
81516734f5 Add support for mystery items notifications 2019-05-22 18:37:21 +03:00
Carl Vuorinen
2cf3e29f4d Use different notification for party chat message
Using getUserData() did not work (value comes too late) so added local
var for party that's populated from same observable as notifications
2019-05-22 18:36:58 +03:00
Carl Vuorinen
0f86f44b33 Create notification item view and implement few notification types 2019-05-22 18:36:58 +03:00
Carl Vuorinen
3361a8e45f Add support for deserializing NEW_STUFF and UNALLOCATED_STATS_POINTS notifications 2019-05-22 18:34:01 +03:00
Carl Vuorinen
090ab372d0 Refactor NotificationsActivity, add some method stubs to view model 2019-05-22 18:34:01 +03:00
Carl Vuorinen
3dd5703be6 Implement NotificationsViewModel to handle logic related to listing notifications 2019-05-22 18:34:01 +03:00
Carl Vuorinen
ef4628f470 Create custom deserializer for notifications + enum for notification types
Deserialize chat data to custom property as Realm doesn't support polymorphism, so need different property for each different data "shape"
2019-05-22 18:33:09 +03:00
Carl Vuorinen
60abfe12ac Notifications view header with title, badge with count + dismiss all button 2019-05-22 18:32:09 +03:00
Carl Vuorinen
4c2a48ae69 Implement "no notifications" view, display when notifications list empty 2019-05-22 18:31:45 +03:00
Carl Vuorinen
6c09f32e63 Load notifications on activity create + add swipe refresh 2019-05-22 18:30:28 +03:00