Phillip Thelen
|
38352ad4c2
|
fix various errors
|
2017-07-05 22:25:29 +02:00 |
|
Phillip Thelen
|
52f421d71b
|
Redo party view
|
2017-05-23 17:40:33 +02:00 |
|
Phillip Thelen
|
3c61635394
|
Merge branch 'realm' of github.com:HabitRPG/habitrpg-android into realm
# Conflicts:
# Habitica/AndroidManifest.xml
# Habitica/res/anim/fab_slide_in.xml
# Habitica/res/anim/fab_slide_out.xml
# Habitica/res/layout/floating_menu_tasks.xml
# Habitica/res/values-ru/strings.tutorial.xml
# Habitica/res/values-ru/strings.xml
# Habitica/res/values/strings.xml
# Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
# Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
# Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
# Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
# Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
# Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
# Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTaskCommand.java
# Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
# Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
# Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
# Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
# Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
# Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
# Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeSerializer.java
# Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
# translations/store_strings-ru.xml
|
2017-04-29 19:42:27 +02:00 |
|
Negue
|
a490fdb38a
|
Merge remote-tracking branch 'origin/develop' into create_challenges
Conflicts:
Habitica/res/values/strings.xml
Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
|
2017-04-23 15:28:37 +02:00 |
|
Negue
|
bcc9b13602
|
show gem errors / recolor gem buttons (based on state)
|
2017-04-22 15:55:37 +02:00 |
|
Phillip Thelen
|
f5ad6488bc
|
Move all db access to repositories
|
2017-04-20 21:14:23 +02:00 |
|
Phillip Thelen
|
6a6a7addf9
|
improve task filter layout
|
2017-04-17 15:11:19 +02:00 |
|
Negue
|
98fac6c0a5
|
Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges
Conflicts:
Habitica/res/values/strings.xml
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
|
2017-04-10 22:56:31 +02:00 |
|
Phillip Thelen
|
b3b84b193b
|
creator improvements
|
2017-04-10 18:48:06 +02:00 |
|
Phillip Thelen
|
368608693a
|
improve creator view
|
2017-04-07 15:56:23 +02:00 |
|
Phillip Thelen
|
b6c760bc6b
|
add badge to filter menu item
|
2017-04-06 22:02:19 +02:00 |
|
Negue
|
3f5347486c
|
Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges
Conflicts:
Habitica/res/values/strings.xml
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
|
2017-04-06 21:10:05 +02:00 |
|
Negue
|
94a4ef6b1d
|
more layout + open new/edit TaskFormActivity without saving to DB + extract ChallengeTasksRecyclerViewAdapter
|
2017-04-06 20:58:51 +02:00 |
|
Phillip Thelen
|
e79bd18c3a
|
Implement more task filtering options
|
2017-04-03 19:36:44 +02:00 |
|
Phillip Thelen
|
21b25e5658
|
update bottom bar design
|
2017-04-03 15:42:20 +02:00 |
|
Phillip Thelen
|
d17411495d
|
Implement bottom navigation bar
|
2017-04-02 23:59:22 +02:00 |
|
Phillip Thelen
|
fd99ab3d1d
|
improve character setup design
|
2017-03-31 11:16:36 +02:00 |
|
Phillip Thelen
|
a9edc575fd
|
improve character setup design
|
2017-03-30 14:02:44 +02:00 |
|
Phillip Thelen
|
c923e93d35
|
Implement new avatar customization
|
2017-03-30 14:02:44 +02:00 |
|
Phillip Thelen
|
a3ef5ef242
|
redesign intro and login
|
2017-03-24 17:30:58 +01:00 |
|
Phillip Thelen
|
7d491fbdba
|
New intro
|
2017-03-23 14:12:28 +01:00 |
|
Phillip Thelen
|
27f3e5645b
|
subscription layout changes
|
2017-02-03 13:21:42 +01:00 |
|
Phillip Thelen
|
1c85fbfa43
|
small design tweaks
|
2017-02-01 20:03:36 +01:00 |
|
Phillip Thelen
|
0021404751
|
display subscription status
|
2017-01-26 19:33:46 +01:00 |
|
Phillip Thelen
|
b575287f85
|
start working on subscriptions
|
2017-01-26 19:33:45 +01:00 |
|
Phillip Thelen
|
0c44813a0e
|
fix minor graphical issues
|
2017-01-23 13:16:11 +01:00 |
|
Phillip Thelen
|
1c5e081e48
|
remove borders from dailies and todos
|
2017-01-16 20:02:43 +01:00 |
|
Negue
|
3f1722de64
|
redesign task list in challenge details / buy reward button
|
2017-01-12 21:44:40 +01:00 |
|
Negue
|
8d499f5110
|
Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into challenges_joined
Conflicts:
Habitica/AndroidManifest.xml
Habitica/res/drawable-hdpi/ic_header_exp.png
Habitica/res/drawable-hdpi/ic_header_gem.png
Habitica/res/drawable-hdpi/ic_header_gold.png
Habitica/res/drawable-hdpi/ic_header_healer.png
Habitica/res/drawable-hdpi/ic_header_heart.png
Habitica/res/drawable-hdpi/ic_header_mage.png
Habitica/res/drawable-hdpi/ic_header_magic.png
Habitica/res/drawable-hdpi/ic_header_rogue.png
Habitica/res/drawable-hdpi/ic_header_silver.png
Habitica/res/drawable-hdpi/ic_header_warrior.png
Habitica/res/drawable-mdpi/ic_header_exp.png
Habitica/res/drawable-mdpi/ic_header_gem.png
Habitica/res/drawable-mdpi/ic_header_gold.png
Habitica/res/drawable-mdpi/ic_header_healer.png
Habitica/res/drawable-mdpi/ic_header_heart.png
Habitica/res/drawable-mdpi/ic_header_mage.png
Habitica/res/drawable-mdpi/ic_header_magic.png
Habitica/res/drawable-mdpi/ic_header_rogue.png
Habitica/res/drawable-mdpi/ic_header_silver.png
Habitica/res/drawable-mdpi/ic_header_warrior.png
Habitica/res/drawable-xhdpi/ic_header_exp.png
Habitica/res/drawable-xhdpi/ic_header_gem.png
Habitica/res/drawable-xhdpi/ic_header_gold.png
Habitica/res/drawable-xhdpi/ic_header_healer.png
Habitica/res/drawable-xhdpi/ic_header_heart.png
Habitica/res/drawable-xhdpi/ic_header_mage.png
Habitica/res/drawable-xhdpi/ic_header_magic.png
Habitica/res/drawable-xhdpi/ic_header_rogue.png
Habitica/res/drawable-xhdpi/ic_header_silver.png
Habitica/res/drawable-xhdpi/ic_header_warrior.png
Habitica/res/drawable-xxhdpi/ic_header_exp.png
Habitica/res/drawable-xxhdpi/ic_header_gem.png
Habitica/res/drawable-xxhdpi/ic_header_gold.png
Habitica/res/drawable-xxhdpi/ic_header_healer.png
Habitica/res/drawable-xxhdpi/ic_header_heart.png
Habitica/res/drawable-xxhdpi/ic_header_mage.png
Habitica/res/drawable-xxhdpi/ic_header_magic.png
Habitica/res/drawable-xxhdpi/ic_header_rogue.png
Habitica/res/drawable-xxhdpi/ic_header_silver.png
Habitica/res/drawable-xxhdpi/ic_header_warrior.png
Habitica/res/values/colors.xml
Habitica/res/values/strings.xml
Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
|
2017-01-11 22:37:00 +01:00 |
|
Negue
|
a281d7fbf8
|
show tasks inside dialog / improve loading challenges
|
2017-01-06 23:45:21 +01:00 |
|
Negue
|
c55872fa78
|
redesign public challenge item - use styles for fontFamily - new header icons
|
2016-12-19 18:01:54 +01:00 |
|
Negue
|
dde293de19
|
redesign "my challenges" list / custom Title override by fragment / save taskLists and groupId/name of a challenge to the database
|
2016-12-18 18:46:03 +01:00 |
|
Phillip Thelen
|
bcfd01e73f
|
move seeds button
|
2016-12-07 14:40:03 +01:00 |
|
Phillip Thelen
|
89420b81da
|
implement seeds sdk
|
2016-12-07 14:40:03 +01:00 |
|
Phillip Thelen
|
e5e710eb1c
|
improve IAP display
|
2016-10-11 19:38:23 +02:00 |
|
Phillip Thelen
|
185e93ffc2
|
start building new gem purchase screen
|
2016-10-11 19:38:23 +02:00 |
|
Phillip Thelen
|
44b6de04be
|
Start working on habit button widget
|
2016-09-22 16:02:01 +02:00 |
|
Phillip Thelen
|
256d9e3ea9
|
Continue work on widgets
|
2016-09-12 21:11:35 +02:00 |
|
Phillip Thelen
|
fc7ab5c319
|
Initial version for Avatar Stats Widget
|
2016-09-09 21:19:51 +02:00 |
|
Negue
|
98d13ca147
|
use APIHelper in ContentCache, get language from user.preferences, use common card-styles,
|
2016-08-12 22:17:02 +02:00 |
|
Phillip Thelen
|
051fed2f72
|
add RxJava and multidexing
|
2016-04-07 20:14:41 +02:00 |
|
Phillip Thelen
|
095ba04f4e
|
make spacing and sizing more consistent
|
2016-03-16 13:52:42 +01:00 |
|
Phillip Thelen
|
9c8e1be9d4
|
improve layouts
|
2016-03-08 20:53:03 +01:00 |
|
Phillip Thelen
|
2f09ab00b3
|
fix display of elements on older androids
|
2016-03-05 18:08:49 +01:00 |
|
Phillip Thelen
|
1469e6fe54
|
Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis
# Conflicts:
# Habitica/AndroidManifest.xml
# Habitica/res/layout/activity_task_form.xml
# Habitica/res/layout/tavern_chat_new_entry_item.xml
# Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
# Habitica/src/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
# Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
|
2016-02-26 14:02:15 +01:00 |
|
Phillip Thelen
|
2c982d5fb0
|
Add Intro before login
|
2016-02-02 15:02:26 +01:00 |
|
Phillip Thelen
|
cda0a1d56c
|
Display tutorial messages
|
2016-02-02 15:02:26 +01:00 |
|
Data5tream
|
3c69a0a802
|
Added icons for keyboard switch
|
2016-01-12 18:26:39 +01:00 |
|
Max Dörfler
|
5851bacb98
|
optical feedback on habit button +/- touch
|
2015-12-16 14:39:32 +01:00 |
|
Negue
|
2afbbd9b1c
|
[#86] remove unused drawables / animations / layout / styles
|
2015-12-12 19:54:25 +01:00 |
|
Phillip Thelen
|
e181c51fdc
|
Merge branch 'rewards-design' into develop
# Conflicts:
# Habitica/Habitica.iml
# Habitica/build.gradle
|
2015-11-15 15:20:39 +01:00 |
|
Franze Jr
|
36e6c42890
|
[#36] First version - Using MaterialDialogs
|
2015-11-10 18:01:34 -03:00 |
|
Negue
|
ba1a408c6a
|
Merge branch 'develop' into TaskListDesign
Conflicts:
Habitica/Habitica.iml
Habitica/res/values/dimens.xml
|
2015-11-09 20:34:22 +01:00 |
|
Franze Jr
|
86edf6b4e4
|
[#35] - Create databinding and logic for party members
|
2015-11-07 20:29:34 -03:00 |
|
Phillip Thelen
|
e8c12522b7
|
Adjust checkboxes in task lists
|
2015-11-07 19:10:03 +01:00 |
|
Phillip Thelen
|
afd23a4ae9
|
Redesign habit buttons
|
2015-11-07 15:27:17 +01:00 |
|
Negue
|
4f44bd44b5
|
List Tavern Messages, Send / Delete them, Toggle Sleep
|
2015-08-30 19:56:46 +02:00 |
|
Phillip Thelen
|
e58baadbc7
|
Begin header redesign
|
2015-08-17 23:37:56 +02:00 |
|
Negue
|
dc6b066b46
|
Avatar Control, Value Bar Control (HP, MP, XP), new colors
|
2015-06-20 20:13:44 +02:00 |
|
Negue
|
7a07028528
|
Move Fragments to other package
|
2015-06-20 20:05:53 +02:00 |
|
Negue
|
33239d8d24
|
Rename to Habitica - Part 1 (Folder/ SubModule)
|
2015-05-27 18:02:13 +02:00 |
|