Commit graph

1261 commits

Author SHA1 Message Date
Negue
15ea308a42 Apply avatar transformations (if items available) / update gradle 2016-10-03 22:47:02 +02:00
Phillip Thelen
cde5cdb6ef update translations 2016-09-26 15:20:40 +02:00
Phillip Thelen
6684168d2f update widgets when app is closed 2016-09-26 13:40:42 +02:00
Phillip Thelen
ed6fe8967f fix compile error 2016-09-24 12:56:37 +02:00
Phillip Thelen
8140fe53a0 bump version number 2016-09-23 20:50:27 +02:00
Phillip Thelen
cde4bb0e4c update translations 2016-09-23 20:50:27 +02:00
Phillip Thelen
e62c6b567c update translations 2016-09-23 20:50:27 +02:00
Phillip Thelen
8f955b59a0 fix analytics error 2016-09-23 19:59:02 +02:00
Phillip Thelen
03a3417cfc refactor analytics handling 2016-09-23 19:43:51 +02:00
Phillip Thelen
dbe956b200 update build tools for travis 2016-09-23 19:21:04 +02:00
Phillip Thelen
fc6513ccad Merge branch 'refs/heads/pr/613' into develop
# Conflicts:
#	Habitica/res/xml/preferences_fragment.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java

#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java

#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
2016-09-23 19:17:08 +02:00
Phillip Thelen
1eda351768 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:

#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
2016-09-23 19:10:03 +02:00
Phillip Thelen
94b2bdba41 Add toast feedback for widgets 2016-09-23 19:07:29 +02:00
Phillip Thelen
258215fee9 Merge pull request #620 from DanielKaparunakis/FirstDayOfTheWeek
Feature: First day of the week
2016-09-23 19:06:21 +02:00
Phillip Thelen
739f90dd41 Merge remote-tracking branch 'refs/remotes/origin/widgets' into develop 2016-09-23 17:15:46 +02:00
Phillip Thelen
872b68f55d temporarily disable "Add Task" widget 2016-09-23 17:15:22 +02:00
Phillip Thelen
faf4b77d6d Make habit button work 2016-09-23 17:02:13 +02:00
Daniel Kaparunakis
497d574e36 Refactor: Rebase First Day of the Week feature
This commit rebases the develop branch into the FirstDayOfTheWeeK
branch syncing it with the current state of the develop branch.

Issue: #546, Pull Request: #620
2016-09-22 22:49:49 -05:00
Daniel Kaparunakis
4f759f1140 Feature: Add better case labels to the FirstDayOfTheWeekHelper class
This commit replaces the case labels of the switch with labels that
are more descriptive. The purpose of this change is to make the class
more readable by adding actual variable names to the cases instead of
hardcoded strings.

Issue: #546, Pull Request: #620
2016-09-22 22:43:27 -05:00
Daniel Kaparunakis
f1db752ca2 Feature: Add sensible default for first day of the using locale
This commits adds a default for the first day of the week setting.
This is better than arbitrarily choosing a first day of the week.
In addition, it reorders the days in the dailies screen with the
first day in the list being the day the user chose in the setting.

Issue: #546, Pull Request: #620
2016-09-22 22:43:27 -05:00
Daniel Kaparunakis
3634980116 Feature: Refactor the order of days in dailies
This commit refactors the order of days in the dailies in accordance
to the First Day of the Week setting. In addition, it sets the default
value for the setting using the user's locale as opposed to an
arbitrary value.
2016-09-22 22:43:27 -05:00
Daniel Kaparunakis
e02b52aac9 Fix: Correct default value for first day of the week.
This commit corrects the default value for the first of the week.
It was set to a non-sensical day of the week by mistake.
2016-09-22 22:36:08 -05:00
Daniel Kaparunakis
64e012a88a Feature: Add logic to files where calendar views occur
This commit adds the first day of the week calendar logic to the
RemindersManager & the TaskFormActivity classes. The date pickers
present themselves on two occassions: reminders & due dates. Both
were covered.
2016-09-22 22:36:08 -05:00
Daniel Kaparunakis
94ed87ba6e Feature: Add first day of the week option for all calendars
This is the first commit for the above feature. It adds the necessary
values & strings.
2016-09-22 22:36:08 -05:00
Phillip Thelen
44b6de04be Start working on habit button widget 2016-09-22 16:02:01 +02:00
Phillip Thelen
3ed0be06d0 Finish dailies widget 2016-09-22 13:07:06 +02:00
Daniel Kaparunakis
90ff59a17c Fix: Re-add code lost to Git conflicts.
This commit adds code that was lost due to unresolved Git conflicts.

Issue: #574, Pull Request: #613
2016-09-21 00:00:24 -05:00
Daniel Kaparunakis
6132ad561c Merge remote-tracking branch 'upstream/develop' into develop 2016-09-20 23:18:08 -05:00
Phillip Thelen
9cee9d79e8 update gradle plugin 2016-09-20 16:46:34 +02:00
Phillip Thelen
6c86a83023 Merge pull request #628 from HabitRPG/avatar_transformations
Show avatar transformations
2016-09-20 13:22:28 +02:00
Phillip Thelen
18a24cff9b Merge pull request #619 from vlad-vassilovski/fix-pet-and-mount-counts
Fix #617, #618: Correct profile's pet/mount counts
2016-09-20 12:58:12 +02:00
Phillip Thelen
4804f67eb9 Merge pull request #630 from DrStrangepork/develop
Fixed typo
2016-09-20 12:52:13 +02:00
Rick Kasten
eb496daa4b Fixed typo 2016-09-19 02:09:50 -04:00
Phillip Thelen
d10cfec978 list dailies in widget 2016-09-18 00:21:38 +02:00
Daniel Kaparunakis
96c61ed7cb Fix: Fix persistence for language settings after process dies.
This commit corrects an issue where the language was not persisting
if the app was killed or closed.
Ref: http://stackoverflow.com/questions/22402491/
android-change-and-set-default-locale-within-the-app

Issue: #574, Pull Request: #613
2016-09-16 14:28:16 -05:00
Daniel Kaparunakis
2efb6ee0bb Feature: Add content reload to language switcher setting's calls
This commit adds a content API reload call to the list of calls that
happen when the language is changed. This call is necessary so certain
parts of the app, like the stable, have the correct language when
the language is switched.
2016-09-16 12:45:08 -05:00
Negue
206a8be548 Show avatar transformations (snowball, shiny seed, seafoam and spooky sparkles) 2016-09-16 18:23:31 +02:00
Vlad Vassilovski
71fce3d021 Fix #617, #618: Correct profile's pet/mount counts
The profile's mounts tamed count wrongly ignores mounts with null value.

Also, null/nonexistent pet/mount collections have counts showing as "#".

Both counts should instead be shown as 0 for such null collections.

This fix matches the web app, which does the following:
1. Mounts tamed count = sum mount entries with any value (true, null)
2. Nonexistent pet/mount collections have counts showing as 0

Fix #617, #618
2016-09-15 20:49:21 -04:00
Phillip Thelen
776b6d58fd start working on dailies widget 2016-09-13 21:03:12 +02:00
Negue
ecb10bf5d6 fixes #608, fixes #616, fixes #618, fixes #621, fixes #622, fixes #623, fixes #624 2016-09-13 18:53:47 +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
Phillip Thelen
09a99ab367 Merge pull request #609 from jjbillings/tag-api-tests
Tag api tests
2016-09-09 10:33:20 +02:00
Daniel Kaparunakis
4b63b63b0d Refactor: Fix logic for language discovery at registration
This commit fixes the logic of language discovery at registration.
As opposed to using the LanguageHelper class, the new logic looks
at the resources themselves to determine whether the app can support
the language of the phone.
2016-09-06 00:10:51 -05:00
Daniel Kaparunakis
d2d8cb597f Refactor: Modify LanguageHelper class to simplify switch block
This commit simplifies the LanguageHelper class switch block. The
original switch had 18 or so initial cases, most of which could be
reduced to two general cases. The two general cases have been
impletemented as the default.
2016-09-05 23:24:06 -05:00
jjbillings
b48bb6e3e8 Refactored to getUser method 2016-09-05 12:23:31 -05:00
Phillip Thelen
c27fcb4aa8 Merge pull request #610 from jjbillings/add-material-icons
Change icon color
2016-09-05 14:04:12 +02:00
Phillip Thelen
4e15428d5a Merge pull request #601 from SirLoading/skill-feedback
Skill feedback
2016-09-05 13:57:15 +02:00
Daniel Kaparunakis
22ccb1bcf7 Feature: Add logic to SetupActivity to set language at registration
This commit adds logic to the SetupActivity for a new user. The
purpose of this logic is for the device language to be sent
to the web app automatically during registration.
2016-09-04 22:50:04 -05:00
Phillip Thelen
b6ebd58d11 fix pet count calculation 2016-09-04 18:51:35 +02:00