Commit graph

1077 commits

Author SHA1 Message Date
Phillip Thelen
52592324ff improve shop display state 2023-08-29 11:46:33 +02:00
Phillip Thelen
3a06fe468e subscription and sharing improvements 2023-08-28 11:36:13 +02:00
Phillip Thelen
0448667b89 always show gem in shop 2023-08-22 16:41:36 +02:00
Phillip Thelen
42fdc2560e show bottom sheet when tapping avatar 2023-08-22 10:45:36 +02:00
Phillip Thelen
2d0c00031e remove unused strings 2023-08-21 14:56:49 +02:00
Phillip Thelen
0be77ca124 Implement new empty states 2023-08-11 11:50:31 +02:00
Hafiz
79f37ce9a1 Change class flow fixes 2023-08-08 18:00:18 +02:00
Hafiz
d0bc53e17a Update question form 2023-08-08 18:00:17 +02:00
Phillip Thelen
5a94657668 adjust wording 2023-08-08 18:00:17 +02:00
Hafiz
d960d876d5 Match web implementation for tags / order tags
- Order tags
- Add "group" field to Tag
2023-08-08 18:00:17 +02:00
Hafiz
7b29839586 Base Dialog updates
- Update Habitica Dialog destructive button color/improved accessibility 
- Change class "go back" text changed to "close"
- Update Habitica Dialog message text size & color
2023-08-08 18:00:17 +02:00
Hafiz
2c4a4e0aea Class change dialog updates
Class change success text updates
Add "learn more" -> navigate to FAQ
2023-08-08 18:00:17 +02:00
Hafiz
6b318c79e0 String resources for changing/setting class 2023-08-08 18:00:17 +02:00
Hafiz
63688fef5d total_checkins string change 2023-05-18 20:50:41 -04:00
Phillip Thelen
20dd390e6c Implement new party tutorial view 2023-05-18 13:44:41 +02:00
Phillip Thelen
4b9ba6c3f9 fix issue with blocking 2023-05-11 15:03:05 +02:00
Phillip Thelen
6891fb23ac Update wording 2023-05-10 15:41:12 +02:00
Phillip Thelen
ba8bcfd86e Invite fllow improvements 2023-05-10 13:45:23 +02:00
Phillip Thelen
89b7408c3b party invite flow improvements 2023-05-08 12:26:12 +02:00
Phillip Thelen
2c1102da55 Merge branch 'version/4.2' of https://github.com/HabitRPG/habitica-android into version/4.2 2023-05-04 15:26:40 +02:00
Phillip Thelen
42a8bbc6ed
Merge pull request #1961 from Hafizzle/Fiz/todo-text-color-updates
Update todo text colors
2023-05-04 15:26:16 +02:00
Phillip Thelen
742a1de9b5
Merge pull request #1962 from Hafizzle/Fiz/insufficient-level-class-gear-message
When user is below level 10, update locked class gear message
2023-05-04 15:25:59 +02:00
Phillip Thelen
9793f9cb05 fix small issues 2023-05-04 15:23:18 +02:00
Phillip Thelen
30773b13b9 allow rescinding invites from party screen 2023-05-04 14:51:14 +02:00
Phillip Thelen
79d9d744b4 Invitation improvements 2023-05-04 12:55:39 +02:00
Phillip Thelen
5c46ffeaa0 l4p fixes 2023-05-03 17:12:36 +02:00
Hafiz
cadbcd17bd When user is below level 10, update locked class gear message
Over level 10:
This item is only available to a specific class.
You can change your class from Settings.

Below level 10:
This item is only available to a specific class.
You can select a class after level 10.
2023-05-02 13:39:46 -04:00
Hafiz
e142e3960b Update todo text colors
When the date is gray, use the lighter gray we use for things like alarms and streaks (Gray300 in light mode)
 When the date is red, it should be red100 in dark mode (showing as the darker maroon we use in light mode)
2023-05-02 13:24:40 -04:00
Phillip Thelen
c2547252de disable R8 full mode for now 2023-05-02 14:16:57 +02:00
Phillip Thelen
c9726049d1
Merge pull request #1954 from Hafizzle/Fiz/all-gear-owned-armoire-UI
Update state / message shown when you have all armoire items
2023-05-02 12:59:36 +02:00
Hafiz
c0a45a678f Re-add message that show's when you don't have all the items / Check armoire count 2023-05-01 00:38:00 -04:00
Phillip Thelen
54b2caf3b0
Merge branch 'version/4.2' into Fiz/choose-class-header-adjustments 2023-04-24 15:08:59 +02:00
Hafiz
2fa66ecbf4 Update state for when you have all armoire items 2023-04-06 14:09:32 -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
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
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
546a765cb1 Update party invite notification and party invite strings 2023-03-29 14:22:43 +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
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
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
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
113080c991 Updated No Party design UI
No Party design changes
Updated Create party string resources
2023-03-23 02:05:39 -04:00
Phillip Thelen
2a78e89624 finalize first version of party seeking 2023-03-22 13:25:23 +01:00
Phillip Thelen
cdc105bec7 Initial party seeking version 2023-03-13 18:18:26 +01:00
Phillip Thelen
ec44f0ac31 migrate to hilt 2023-03-08 09:53:33 +01:00
Phillip Thelen
f80c169a3a Minor dialog refactoring 2023-03-07 11:43:35 +01:00
Phillip Thelen
a499548ecc Add option to pause/resume damage to app settigns 2023-03-07 09:30:51 +01:00
Phillip Thelen
aa7221ec96 restructure a bit 2023-02-16 09:44:13 +01:00
Phillip Thelen
8bee0319ba add sub test server 2023-02-09 10:05:03 +01:00
Hafiz
d5ac7eb5be Add pixelArtBackground colors to HabiticaTheme 2023-01-17 14:02:12 -05:00
Phillip Thelen
b1c6f21557 minor event improvements 2023-01-16 19:55:55 +01:00
Phillip Thelen
52b411a836 Improve tint colors 2023-01-13 17:23:54 +01:00
Phillip Thelen
6222b24df6 Fix some tests 2023-01-13 12:05:29 +01:00
Phillip Thelen
553cd19176 work in feedback 2023-01-13 10:24:09 +01:00
Phillip Thelen
1b81f0ce2f fix bugs and crashes 2023-01-13 10:24:09 +01:00
Phillip Thelen
6f5aa2d6f7 Fix displaying banner 2023-01-13 10:24:09 +01:00
Phillip Thelen
382d3e685e Merge branch 'version/4.1' of https://github.com/HabitRPG/habitica-android into version/4.1
# Conflicts:
#	Habitica/res/values-iw/strings.xml
#	Habitica/res/values-lt/strings.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
2023-01-09 16:36:53 +01:00
Hafiz
c50a07db35 Feedback updates 2023-01-09 07:46:12 -05:00
Hafiz
9db4ee5d07 dialog that redirects to habitica notif system settings
summary shows "System Push Notifications for Habitica are disabled - you won't receive push notifications until they are enabled"
When a user attempts to turn on notifications again if they've previously denied the request or manually turned off notifs in system settings, they will be shown a dialog that redirects them to their system settings for Habitica notifications access
2023-01-08 20:34:46 -05:00
Phillip Thelen
a6d16c7e31 Many fixes 2023-01-06 10:49:24 +01:00
Phillip Thelen
a9f7375452 Begin allowing pet to be purchased 2023-01-04 15:47:01 +01:00
Phillip Thelen
beb20de968 preparing 2023-01-04 14:34:12 +01:00
Phillip Thelen
3cfdf48fe4 Fix many small issues 2022-12-21 14:52:36 +01:00
Phillip Thelen
e50f2f42be various fixes 2022-12-20 13:37:10 +01:00
Phillip Thelen
25fa75497e remove old code 2022-12-20 13:37:10 +01:00
Phillip Thelen
bc685cdc82 multiple fixes 2022-12-20 13:37:10 +01:00
Phillip Thelen
db39dc7d42 sub screen improvements 2022-12-20 13:37:10 +01:00
Phillip Thelen
80012485b4 dark mode improvements 2022-12-20 13:37:10 +01:00
Phillip Thelen
175f067083 various small improvements 2022-12-09 15:35:31 +01:00
Phillip Thelen
d32fe481e4 Display assigned avatars 2022-12-09 13:12:12 +01:00
Phillip Thelen
d7523c7bdf Refactor Refactor 2022-12-09 13:12:12 +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
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
2ea1096622 build basic task summary view 2022-11-17 17:33:15 +01:00
Phillip Thelen
4520248ed8 More coroutine work 2022-11-07 13:37:43 +01:00
Phillip Thelen
f93f45e692 fix colrs 2022-10-31 15:12:55 +01:00
Phillip Thelen
5ae7f9bbb7 Merge avatar and equipment screens 2022-10-31 09:42:13 +01:00
Phillip Thelen
ee20b4740f Continue group plan work 2022-10-04 09:33:18 +02:00
Phillip Thelen
fc96c6146e implement new header and group task display 2022-09-26 18:52:24 +02:00
Phillip Thelen
bf5bb9939b Begin implementing new header 2022-09-26 13:05:22 +02:00
Hafiz
db371e3da8 Subscription detail updates 2022-09-12 23:19:49 -04:00
Hafiz
7ac30c819b Updated sub benefit UI 2022-09-06 07:38:06 -04:00
Phillip Thelen
751e87338a finalize 4.0.2 2022-09-02 17:09:21 +02:00
Phillip Thelen
327f76db72 Implement copy shared tasks setting 2022-08-31 11:33:51 +02:00
Phillip Thelen
d569d56502 minor fixes for 4.0.1 2022-08-19 14:12:27 +02:00
Phillip Thelen
247366821a Merge branch 'main' of https://github.com/HabitRPG/habitica-android 2022-08-18 16:46:39 +02:00
Hafiz
c3bfa52366 Top line text roboto 16 medium
Category text lines roboto 16 regular
food description updated
less character spacing for supporting text
less character spacing for top text
2022-08-18 16:46:31 +02:00
Phillip Thelen
f80de5dc49 minor fixes 2022-08-18 15:10:27 +02:00
Phillip Thelen
513c1baa2a challenge form fixes 2022-08-17 11:19:32 +02:00
Phillip Thelen
4a8918a9c6 Some foldable optimizations 2022-08-16 11:58:24 +02:00
Phillip Thelen
a7e3e11526 Improve group task display 2022-08-16 10:56:04 +02:00
Hafiz
12d0a00efc Armoire drop rate sheet ui fixes 2022-08-09 01:57:45 -04:00
Pranshu Jha
d347c09337 fixed typo in Habitica/res/values/strings.xml where Experience is spelled as Ezperience 2022-08-07 15:50:41 +05:30
Phillip Thelen
241b3c3c75 animation tweaks 2022-08-02 17:02:42 +02:00
Phillip Thelen
37a307184c Fix RYA issues 2022-08-01 11:30:44 +02:00
Phillip Thelen
642ef76519 fix wear issues 2022-07-29 11:35:02 +02:00
Phillip Thelen
9ea87f93e7 Redeigned insufficient gem screen 2022-07-28 11:54:47 +02:00
Phillip Thelen
9b0ecc914e Improve account delete flow for subscribed users 2022-07-28 09:57:19 +02:00
Phillip Thelen
a9e09db6bd Fix account deletion issues 2022-07-28 09:49:45 +02:00
Phillip Thelen
de36a0351e UI fixes 2022-07-27 17:05:22 +02:00
Phillip Thelen
3e3d3b11f6 bunch of fixes 2022-07-27 17:04:28 +02:00
Hafiz
6fdcc212bc Background Bottomsheet UI fixes 2022-07-27 10:09:49 -04:00
Phillip Thelen
17aa7a321c minor improvements 2022-07-26 15:34:01 +02:00
Phillip Thelen
a9326eaa17 style fixes 2022-07-26 15:34:01 +02:00
Phillip Thelen
08980d1933 show account reset confirmation 2022-07-26 15:34:01 +02:00
Hafiz
cad11e8588 -Update Armoire equip type from "Gear" to "Equipped
-Switch filter to active state when filtering on backgrounds
-Check if Avatar Customization set is a deal (If total set costs less then total of individual item), and continue showing "buy set" button
-For Habitica Account Dialog, auto resize input when keyboard opened
-HabiticaAccountDialog (Delete dialog) UI fixes
-Check if Uri has scheme, if not adds https:// (to support in-line
-Avatar Customization item filter UI fixes
2022-07-26 07:15:54 -04:00
Phillip Thelen
d5a3bb5635 Improve phone communication handling 2022-07-25 09:47:56 +02:00
Phillip Thelen
e8d26ffe82 improve foldable layout 2022-07-19 18:34:31 +02:00
Hafiz
6fb21fa0d0 Update deletion confirmation dark mode navigation bar colors 2022-07-19 17:42:04 +02:00
Hafiz
a872c1c9da confirm delete screen ui updates
Correct confirm screen typeface for placeholder text
Fix delete confirm screen icon and text colors when in dark mode
2022-07-19 17:42:04 +02:00
Phillip Thelen
fa47696d4e fix opening activities 2022-07-05 15:16:37 +02:00
Phillip Thelen
3a8043e786 Fix a bunch of warnings 2022-07-05 15:16:05 +02:00
Phillip Thelen
0d0c4e4038 Various minor improvements 2022-06-27 22:09:33 +02:00
Phillip Thelen
bd7caff14f various improvements 2022-06-24 15:15:15 +02:00
Phillip Thelen
93187554bd Add Task detail view 2022-06-22 10:34:35 +02:00
Phillip Thelen
d5d9f6f39e very basic task form 2022-06-14 16:20:06 +02:00
Phillip Thelen
430e49e6be Implement basic authntication flow 2022-06-09 11:41:02 +02:00
Phillip Thelen
71356a491c create empty missing activities 2022-06-06 12:17:13 +02:00
Phillip Thelen
4f4ac804b5 Very Very barebones wearos skeleton 2022-06-03 11:23:14 +02:00
Phillip Thelen
6c536fa655 move and create models for tasks as well 2022-06-03 11:22:56 +02:00
Phillip Thelen
857a5a6ed1 basic avatar display
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
2022-06-03 11:22:54 +02:00
Phillip Thelen
69ee64203c Move code into common module 2022-06-02 09:14:08 +02:00
Phillip Thelen
c5473c58bc Move AvatarView to common module
# Conflicts:
#	Habitica/res/layout/dialog_pet_suggest_hatch.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogBackgroundContent.kt
#	common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
2022-06-02 09:14:08 +02:00
Phillip Thelen
fd4c49ecde Implement new faint screen 2022-05-27 10:06:00 +02:00
Phillip Thelen
6c3585040d Fix tag editing text color 2022-05-27 10:06:00 +02:00
Phillip Thelen
acb84d60ab improve touch feedback 2022-05-27 10:06:00 +02:00
Phillip Thelen
400c5f2fcf Bottom sheet improvements 2022-05-27 10:06:00 +02:00
Phillip Thelen
afe8b22cca minor fixes 2022-05-27 10:06:00 +02:00
Phillip Thelen
52a5f0baf4 Armoire tweaks 2022-05-27 10:06:00 +02:00
Phillip Thelen
ee5bebb826 Improve task filter 2022-05-27 10:06:00 +02:00
Phillip Thelen
5256e85641 Improve bottom sheet design and behaviour 2022-05-27 10:06:00 +02:00
Phillip Thelen
8a1c058fd5
Merge pull request #1764 from Hafizzle/Hafiz/Fixes#1722
Fixes#1722 - Show next hourglass month on sub info screen
2022-05-27 10:05:28 +02:00
Phillip Thelen
c7ef292721
Merge pull request #1773 from Hafizzle/Hafiz/#1523
#1523 - Update Reset/Delete Modals
2022-05-24 09:53:37 +02:00
Hafiz
1647026e5d Updated forgot pw strings 2022-05-15 16:24:23 -04:00
Hafiz
ed7d7af9c2 Enable delete account for OAuth users 2022-05-15 15:55:21 -04:00
Hafiz
b4655d5f73 Handle basic monthly subscription user receive hourglass on four month 2022-05-15 14:13:03 -04:00
Phillip Thelen
037fd43a4a Fixes #1746 2022-05-13 14:06:08 +02:00
Phillip Thelen
efa21e28c0 more animations 2022-05-09 16:39:36 +02:00
Phillip Thelen
765204821a Improve armoire display 2022-05-09 16:39:36 +02:00
Hafiz
cbfcb45a0c Reset/update fixes to 3.6 Branch 2022-05-09 00:42:18 -04:00
Phillip Thelen
d1b0573564 Improve backgrounds 2022-05-02 17:26:52 +02:00
Hafiz
156f40595e Set when user will next get hourglass as month using offset 2022-05-02 00:17:24 -04:00