Commit graph

194 commits

Author SHA1 Message Date
Phillip Thelen
8c15df4d8a Fix various username bugs 2018-11-06 14:04:27 +01:00
Phillip Thelen
b065cf0acc Implement new welcome screen 2018-11-05 13:57:42 +01:00
Phillip Thelen
1dd309cbbb Fix warnings 2018-10-29 16:39:10 +01:00
Phillip Thelen
72744c57b2 bump build number 2018-10-19 11:09:24 +02:00
Phillip Thelen
762d1faa2c Implement username changes 2018-10-17 16:28:23 +02:00
Phillip Thelen
333d08e11c Improve chat design 2018-08-09 14:37:53 +02:00
Phillip Thelen
b34e7ab969 Update android studio 2018-08-03 10:31:52 +02:00
Phillip Thelen
62f03a9888 Code cleanup 2018-07-25 12:40:50 +02:00
Phillip Thelen
d4a2cf3e3d Add Instabug 2018-07-24 18:14:55 +02:00
Phillip Thelen
5d97c835b9 Remove unused flowlayout dependency 2018-07-24 12:05:05 +02:00
Phillip Thelen
263dbde389 remove underscore 2018-07-24 11:32:35 +02:00
Phillip Thelen
b366686764 Refactor activities and remove Butterknife 2018-07-11 17:52:24 +02:00
Phillip Thelen
e66c95bda0 Update to RxJava 2, RxAndroid 2 and Realm 5 2018-07-11 12:53:46 +02:00
Phillip Thelen
4b140a2154 remove mips as build archtecture. Fixes #984 2018-07-10 17:03:19 +02:00
Phillip Thelen
193c25bfa2 Begin using API v4 2018-07-05 15:11:40 +02:00
Phillip Thelen
91f4059ab6 update dependencies 2018-07-05 13:26:09 +02:00
Phillip Thelen
99dad8f16e Fix various issues 2018-02-26 13:33:20 +01:00
Phillip Thelen
b54de0c30b Merge remote-tracking branch 'origin/custom-menu' into develop
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/build.gradle
#	Habitica/res/layout/fragment_about.xml
#	Habitica/res/layout/fragment_avatar_overview.xml
#	Habitica/res/layout/fragment_equipment_overview.xml
#	Habitica/res/layout/fragment_group_info.xml
#	Habitica/res/layout/fragment_news.xml
#	Habitica/res/layout/fragment_stats.xml
#	Habitica/res/layout/fragment_tavern_detail.xml
#	Habitica/res/layout/tavern_chat_new_entry_item.xml
#	Habitica/res/values/attrs.xml
#	Habitica/res/values/colors.xml
#	Habitica/res/values/dimens.xml
#	Habitica/res/values/strings.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenMenuItemCommand.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewHolder-Extensions.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
#	build.gradle
2018-01-30 14:06:03 +01:00
Phillip Thelen
31a9e36ad7 implement additional tavern features 2018-01-30 13:41:22 +01:00
Phillip Thelen
1173a0a94f replace materialdrawer library with custom implementation 2017-11-17 20:09:36 +01:00
Phillip Thelen
41072d1cae show stat points on correct menu item. Fixes #869 2017-11-17 14:12:14 +01:00
Phillip Thelen
418b2ee8aa remove staging key 2017-11-17 14:12:02 +01:00
Phillip Thelen
37b97ce1c2 Fix compilation error 2017-11-17 14:12:02 +01:00
Phillip Thelen
2720c4457b remove databinding 2017-11-17 14:12:02 +01:00
Phillip Thelen
76ff959824 update project 2017-11-17 14:12:02 +01:00
Daniel Gomez Rico
ab4c71bb43 Move build_tools/sdk version to main gralde
- Helps avoiding issues between submodules and travis setup.
- It works only if all modules uses the same dependencies.
2017-11-17 14:11:44 +01:00
Phillip Thelen
8ee135cf04 add kotlin to project 2017-11-17 14:11:44 +01:00
maiatoday
3181ffe559 New versions and changes so I can use studio 3
Build file updates and fixes. New versions so this project can be opened in studio preview. This will allow us to use the new profiler to find the memory leaks.
2017-11-17 14:11:35 +01:00
Phillip Thelen
2c867544aa show stat points on correct menu item. Fixes #869 2017-11-14 17:35:16 +01:00
Phillip Thelen
54256023c2 remove staging key 2017-10-30 09:32:29 +01:00
Phillip Thelen
41b12226ac Fix compilation error 2017-10-26 20:33:01 +02:00
Phillip Thelen
d93aad9574 remove databinding 2017-10-26 18:44:03 +02:00
Phillip Thelen
023956705f update project 2017-10-26 15:52:12 +02:00
Phillip Thelen
77a129f2cc Merge branch 'develop' into update_studio 2017-10-26 13:45:13 +02:00
Daniel Gomez Rico
99ef013584 Move build_tools/sdk version to main gralde
- Helps avoiding issues between submodules and travis setup.
- It works only if all modules uses the same dependencies.
2017-10-08 12:06:31 -05:00
Phillip Thelen
591fff8aa9 add kotlin to project 2017-10-03 15:19:05 +02:00
Phillip Thelen
528b9124ed minor design updates 2017-09-22 12:49:55 +02:00
Phillip Thelen
64827c3f89 update emoji lib with compressed emojis 2017-09-05 19:51:21 +02:00
Phillip Thelen
40cf584987 replace drawables with paintcode code 2017-09-05 19:51:20 +02:00
Phillip Thelen
77a591c723 Merge branch 'develop' into proguard 2017-09-05 16:46:14 +02:00
Phillip Thelen
a6f76cd6be fix crashes 2017-07-11 20:10:38 +02:00
Phillip Thelen
7dfa4c739d fix leakcanary issues 2017-07-06 14:22:57 +02:00
Phillip Thelen
5d66e1b538 add tests for YesterdailyDialog 2017-06-27 16:08:18 +02:00
Phillip Thelen
c670eb727e update dependencies 2017-06-21 16:12:10 +02:00
Phillip Thelen
ed5a5a42c2 fix various issues 2017-06-06 14:26:37 -07:00
maiatoday
5b12fb61dc New versions and changes so I can use studio 3
Build file updates and fixes. New versions so this project can be opened in studio preview. This will allow us to use the new profiler to find the memory leaks.
2017-06-04 17:24:24 +02:00
Phillip Thelen
9063705c99 add tests for UserRepository 2017-05-25 09:30:05 +02:00
Phillip Thelen
dbfa12c830 use mock realm in tests 2017-05-24 15:38:57 +02:00
Phillip Thelen
2eacc25cec fix guild display 2017-05-05 17:14:55 +02:00
Phillip Thelen
68e3ca7b65 remove dbflow 2017-05-04 12:36:39 +02:00