Commit graph

5753 commits

Author SHA1 Message Date
Phillip Thelen
0c0a761137 Fix issue with menu 2018-01-30 18:05:09 +01:00
Phillip Thelen
7022dc1c69 start adding world boss progress to tavern 2018-01-30 17:57:12 +01:00
Phillip Thelen
f376cdb2ce remove unused drawables 2018-01-30 14:56:55 +01:00
Phillip Thelen
25c8821d04 fix menu button behaviour 2018-01-30 14:41:33 +01:00
Phillip Thelen
299bcdd60d
Merge pull request #920 from kemirea/issue-911
don't show hourglass or gem count for other players. fixes #911.
2018-01-30 14:38:54 +01:00
Phillip Thelen
7d81e050dc
Merge branch 'develop' into issue-911 2018-01-30 14:38:48 +01:00
Phillip Thelen
0d7f92fde3
Merge pull request #909 from benbelow/repeat-every-zero-option
Add zero option for 'Repeat Every' spinner in Dailies setup
2018-01-30 14:36:40 +01:00
Phillip Thelen
be454170a5
Merge pull request #929 from caipivara/fix/android-license-not-accepted-for-travis
Fix travis setup to accept 26.0.2 build tools
2018-01-30 14:35:50 +01:00
Phillip Thelen
c69322651c
Merge pull request #928 from caipivara/feature/optimize-resources-with-loseless-algorithms
Optimize image resources with ImageOptim (with lossless algorithms) #1
2018-01-30 14:34:50 +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
Daniel Gomez Rico
6aad423169 Fix travis setup to accept 26.0.2 build tools 2018-01-29 15:05:30 -05:00
Daniel Gomez Rico
d1a21d5fb1 Optimize resources using imageoptim 2018-01-29 11:24:18 -05:00
Greta Chang
c66378643c don't show hourglass or gem count for other players. fixes #911. 2018-01-10 12:55:29 -08:00
Benjamin Below
06a75f60f1 Add zero option for 'Repeat Every' spinner in Dailies setup
closes #885
2017-12-18 17:58:30 +00:00
Phillip Thelen
0e30b03b0b improve RYA handling 2017-11-30 13:29:55 +01:00
Phillip Thelen
f35768b096 bump version number 2017-11-29 14:08:46 +01:00
Phillip Thelen
d5c41a4b45 remove logging 2017-11-29 14:00:18 +01:00
Phillip Thelen
4dbb2d4bf3 fix issue when closing the app 2017-11-29 13:57:33 +01:00
Phillip Thelen
4ff5a31a4f release bugfix version 2017-11-27 16:37:20 +01:00
Phillip Thelen
27baf6f117 fix minor bugs. 2017-11-27 16:36:43 +01:00
Phillip Thelen
bd2809c50a Fix various crashes 2017-11-20 13:51:27 +01:00
Phillip Thelen
92a10014b0 fix saving task repeat options 2017-11-20 12:10:48 +01:00
Phillip Thelen
b321528078 fix crash when navigating back to skills 2017-11-20 12:10:41 +01:00
Phillip Thelen
6fd4481a46 fix minor crashes 2017-11-17 23:57:49 +01:00
Phillip Thelen
b1f878dada tweak menu design 2017-11-17 23:12:16 +01:00
Phillip Thelen
1173a0a94f replace materialdrawer library with custom implementation 2017-11-17 20:09:36 +01:00
Phillip Thelen
a1364a1c2c begin implementing custom menu 2017-11-17 15:34:51 +01:00
Phillip Thelen
fa2ec9aac9 fix news display 2017-11-17 14:12:14 +01:00
Phillip Thelen
5b0bfae1e9 fix minor issues 2017-11-17 14:12:14 +01:00
Phillip Thelen
70d0bd955f bump build number 2017-11-17 14:12:14 +01:00
Phillip Thelen
9872b1f0f7 fix task filtering 2017-11-17 14:12:14 +01:00
Phillip Thelen
1e4f5006c4 begin tavern redesign 2017-11-17 14:12:14 +01:00
Phillip Thelen
d7cad56596 Fix canAfford function for gems. Fixes #886 2017-11-17 14:12:14 +01:00
Phillip Thelen
e27eb60cef improve displaying tutorials. Fixes #824 2017-11-17 14:12:14 +01:00
Phillip Thelen
e7b5d2a424 fix minor issues 2017-11-17 14:12:14 +01:00
Phillip Thelen
e64c46a254 fix bulk allocation issues. Fixes #865 2017-11-17 14:12:14 +01:00
Phillip Thelen
11a3290e2e convert code to kotlin 2017-11-17 14:12:14 +01:00
Phillip Thelen
6bdba57b6d Fix task reordering 2017-11-17 14:12:14 +01:00
Phillip Thelen
41072d1cae show stat points on correct menu item. Fixes #869 2017-11-17 14:12:14 +01:00
Phillip Thelen
f852ddb150 correctly hide class notes. Fixes #876 2017-11-17 14:12:13 +01:00
Phillip Thelen
6272ab5d89 show number of remaining subscriber gems. Fixes #880 2017-11-17 14:12:13 +01:00
Phillip Thelen
264b64e2dd fix various crashes 2017-11-17 14:12:13 +01:00
Phillip Thelen
d78ff2bd1d optimize imports 2017-11-17 14:12:13 +01:00
Phillip Thelen
59dfacac70 update stable section titles. #878 2017-11-17 14:12:13 +01:00
Phillip Thelen
ebb6b4bf66 correctly remove purchased equipment. Fixes #859 2017-11-17 14:12:13 +01:00
Phillip Thelen
89a0c885e5 fix title for rare pets category. Fixes #878 2017-11-17 14:12:13 +01:00
Phillip Thelen
5fc8ab8114 rename equipment category. fixes #856 2017-11-17 14:12:13 +01:00
Phillip Thelen
c74d743a3d Fix copying PM to clipboard and update inbox name. Fixes #877 2017-11-17 14:12:13 +01:00
Phillip Thelen
1d0c1e1861 Fix #875. Fix #876 2017-11-17 14:12:13 +01:00