sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-29 10:18:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5758 commits 3 branches 1 tag 142 MiB
Commit graph

805 commits

Author SHA1 Message Date
Keith Holliday
a516d74282 Added string resource 2017-05-02 10:47:25 -06: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
ffd74efa23 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges 
Conflicts:
	Habitica/res/values/strings.xml
 2017-04-27 19:02:21 +02:00
Negue
b26f22c0b8 update labels 2017-04-27 18:59:52 +02:00
Phillip Thelen
a893206a58 Fix item interactions 2017-04-26 20:04:05 +02:00
Phillip Thelen
e35318834c display message when device doesn't support billing 2017-04-26 15:27:27 +02:00
Negue
eee013ee49 Show progress while saving & dialog if not all required fields are filled 2017-04-25 22:31:56 +02:00
Negue
f82df5a0ae requested changes / fixes / refactorings 2017-04-24 19:57:15 +02:00
Negue
e083a52b45 show errors if the user doesn't fill the fields or add tasks 2017-04-23 18:04:35 +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
Negue
13c7b1ee42 Update challenge / -tasks 2017-04-22 14:24:18 +02:00
Phillip Thelen
f5ad6488bc Move all db access to repositories 2017-04-20 21:14:23 +02:00
Negue
b4e8b95116 Navigation ChallengeList -> CreateChallenge / list possible challenge locations 2017-04-20 00:31:47 +02:00
Negue
82007a5f89 add / edit / remove tasks 2017-04-19 21:01:55 +02:00
Keith Holliday
47af28546b Added initial repeatabls UI 2017-04-19 08:32:58 -06:00
Keith Holliday
20cedc2e0c Began adding repeatables layout 2017-04-19 08:27:16 -06:00
Phillip Thelen
6a6a7addf9 improve task filter layout 2017-04-17 15:11:19 +02:00
Phillip Thelen
11c3f2ba2e better handling for dailyDueDefaultView setting 2017-04-15 18:05:50 +02:00
Phillip Thelen
469d39bb96 fix background naming 2017-04-14 14:44:03 +02:00
Phillip Thelen
746f6860f9 mention community guidelines in chat 2017-04-13 18:06:52 +02:00
Phillip Thelen
a9714ed053 better error messages 2017-04-13 16:28:04 +02:00
Phillip Thelen
09f9c9f837 expand task walkthorugh 2017-04-13 15:41:07 +02:00
Phillip Thelen
f70449b3b1 consistent writing for To-Do 2017-04-13 12:26:48 +02:00
Phillip Thelen
a4631e666c capitalize task names in fab 2017-04-13 12:25:26 +02:00
Phillip Thelen
a112297123 add empty view to tasks (currently disabled) 2017-04-11 01:08:07 +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
3283cd8187 fix various linter errors 2017-04-10 15:54:39 +02:00
Phillip Thelen
2418af37eb fix string formatting 2017-04-10 12:34:37 +02:00
Phillip Thelen
7adaa6cad7 update translations 2017-04-07 15:56:29 +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
b113917c01 Add clear button to task filters 2017-04-06 18:36:45 +02:00
Marco Fras
f8a3fe28a5 Update strings.xml 
Fixed a typo. Is this the correct way to do it? Someonw reported an issue on this on Transifex, did you see it or there's the need for someone to manually check the issues?
 2017-04-04 23:33:45 +02:00
Phillip Thelen
158acea5a1 make status and navbar transparent for intro and login 2017-04-04 17:45:24 +02:00
Phillip Thelen
e79bd18c3a Implement more task filtering options 2017-04-03 19:36:44 +02:00
Phillip Thelen
c923e93d35 Implement new avatar customization 2017-03-30 14:02:44 +02:00
Phillip Thelen
acd5c01ff7 Add new welcome screen 2017-03-27 15:33:57 +02:00
Phillip Thelen
a3ef5ef242 redesign intro and login 2017-03-24 17:30:58 +01:00
Phillip Thelen
0a7c60e83f Merge branch 'develop' into challenge_filter 
# Conflicts:
#	Habitica/res/values/strings.xml
 2017-03-23 14:13:13 +01:00
Phillip Thelen
7d491fbdba New intro 2017-03-23 14:12:28 +01:00
Negue
afc0a92e37 leave / remove tasks on deleting a challenge 2017-03-09 21:15:57 +01:00
Negue
16e32a7ec3 "my challenges" - filter 2017-03-01 13:45:43 +01:00
Phillip Thelen
d0a0b845e4 update translations 2017-02-26 12:07:23 +01:00
Phillip Thelen
27f3e5645b subscription layout changes 2017-02-03 13:21:42 +01:00
Phillip Thelen
67a0deee61 fix a bunch of linter errors 2017-02-01 16:58:53 +01:00
Phillip Thelen
33f1e4c22d Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Habitica/res/values/strings.xml
 2017-01-30 16:24:02 +01:00
Phillip Thelen
6af6c29e3d Implement subscriber features 2017-01-30 12:47:54 +01:00
Phillip Thelen
7d4f4c47e8 show subscription details in account details 2017-01-26 19:35:35 +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
8d1ab45424 update translations 2017-01-26 19:30:02 +01:00
AlbrechtRoehm
bf5e70f749 Change strings in checkInReward to make them translatable 2017-01-24 11:52:51 +01:00
AlbrechtRoehm
8cad6876f2 Start to add titles, replace customTitle() 2017-01-21 19:16:45 +01:00
Phillip Thelen
c307739f5a show message when user has dev setting active 2017-01-17 11:43:51 +01:00
Phillip Thelen
ab3a90ca6d fix minor design issues 2017-01-13 13:42:24 +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
Phillip Thelen
b2afa3246b Merge pull request #668 from Pandhariix/messages-when-changing-class 
Messages when changing class
 2017-01-10 17:56:40 +01:00
Negue
935eb4fe23 "You aren't taking on any challenges at the moment" - View if no other challenges available 2017-01-09 21:58:50 +01:00
Negue
a281d7fbf8 show tasks inside dialog / improve loading challenges 2017-01-06 23:45:21 +01:00
Phillip Thelen
3f00de6c4d update task design 2017-01-05 18:19:06 +01:00
josephnw
cb0084a3e5 Display group leader name 2016-12-30 19:34:14 +07: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
Negue
a1f9aab852 join / leave a challenge, open profile of the challenge leader, multiple fixes 2016-12-13 21:04:15 +01:00
Keith Holliday
fef633e7b5 Added notificaiton data model. Added login incentive notification dialogs 2016-12-13 12:35:00 -06:00
Maxime Busy
f6f47f3a30 Update strings.xml 2016-12-08 10:57:19 +01:00
Negue
7b21285657 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into todo_widget 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
 2016-12-08 00:18:52 +01:00
Pandhariix
a31d066c7b final changes on the texts 2016-12-06 23:29:53 +01:00
Negue
5d0c1df11f requested changes - load local challenges from database - load available challenges from api&database 2016-12-06 19:48:07 +01:00
Pandhariix
0c4d534d4d Correct confirmation message for changing class, and add a warning relative to the gear 2016-12-06 00:54:53 +01:00
AlbrechtRoehm
6c10c13ad0 Remove translations from commit 2016-12-05 19:26:54 +01:00
AlbrechtRoehm
63f745bcd2 Revert "Added strings to for correct display in the preferences_fragment; changed strings.xml in de and eng; Changed some upper case letters in the strings.tutorial.xml" 
This reverts commit 57867549a2.
 2016-12-05 19:21:45 +01:00
Pandhariix
6702379725 Erase the test code and finalize changes 2016-12-04 18:13:47 +01:00
Negue
445d1781d7 challenge detail activity 2016-12-01 21:48:24 +01:00
Pandhariix
b8a1c8653c Add strings and popups linked to the class changements 2016-12-01 00:49:02 +01:00
Negue
7958a08efc load / list challenges of user 2016-11-25 15:03:47 +01:00
AlbrechtRoehm
57867549a2 Added strings to for correct display in the preferences_fragment; changed strings.xml in de and eng; Changed some upper case letters in the strings.tutorial.xml 2016-11-19 00:22:39 +01:00
Negue
5a59f4451d revert from settings activity - split widgets into separate classes / providers 2016-11-18 22:16:45 +01:00
Negue
d69895279f activity to choose task type before adding the widget 2016-11-17 22:55:30 +01:00
negue
7fed4b92de Merge pull request #646 from HabitRPG/sounds 
Sounds
 2016-11-07 18:59:52 +01:00
Negue
ec8d8f201c Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into sounds 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
 2016-10-31 14:57:11 +01:00
Phillip Thelen
6d0efd5717 improve reminder scheduling on different android versions 2016-10-28 19:53:08 +02:00
Phillip Thelen
5d6f15cac9 add setting for custom day start. Fixes #641 2016-10-27 17:01:16 +02:00
Phillip Thelen
42662da172 Merge pull request #632 from hcorion/userid-in-profile 
Userid in profile
 2016-10-26 18:11:08 +02:00
Negue
05b63282c2 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into sounds 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
 2016-10-22 14:56:44 +02:00
Negue
26484dcea9 add audio preferences 2016-10-20 22:39:09 +02:00
Phillip Thelen
fa9a4ab266 start adding shop info to items list 2016-10-17 08:47:49 +02:00
Zion Nimchuk
3a33552290 Added better UserID UI with copy button 2016-10-13 16:03:37 -07:00
Negue
8b1865166c Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into apply_tranformations 
Conflicts:
	Habitica/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
 2016-10-12 21:15:05 +02:00
Phillip Thelen
32fc3642b4 create gem purchase activity 2016-10-11 19:38:44 +02:00
Phillip Thelen
185e93ffc2 start building new gem purchase screen 2016-10-11 19:38:23 +02:00
Negue
c5452523a2 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into apply_tranformations 
Conflicts:
	Habitica/res/values/strings.xml
 2016-10-03 22:49:03 +02:00
Negue
15ea308a42 Apply avatar transformations (if items available) / update gradle 2016-10-03 22:47:02 +02:00
Phillip Thelen
4b7c402657 improve widget update behaviour 2016-09-30 17:31:05 +02:00
Phillip Thelen
cde5cdb6ef update translations 2016-09-26 15:20:40 +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
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
739f90dd41 Merge remote-tracking branch 'refs/remotes/origin/widgets' into develop 2016-09-23 17:15:46 +02: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
Rick Kasten
eb496daa4b Fixed typo 2016-09-19 02:09:50 -04:00
Phillip Thelen
256d9e3ea9 Continue work on widgets 2016-09-12 21:11:35 +02:00
Phillip Thelen
ad7a1b7566 allow users to accept party invites 2016-09-04 15:28:21 +02:00
Phillip Thelen
23353cce9b Merge pull request #600 from jjbillings/delete-tags 
Delete and edit tags - Issues: 496, 507
 2016-08-22 18:34:58 +02:00
Phillip Thelen
ae643b4664 Merge pull request #602 from HabitRPG/debug 
have debug and store version without uninstall the other
 2016-08-22 18:25:50 +02:00
jjbillings
2b1f63ccd2 Sync from main repo 
# Conflicts:
#	Habitica/res/values/strings.xml

Conflicts resolved
 2016-08-21 19:45:54 -05:00
Phillip Thelen
9de0f1b91b update translations 2016-08-21 20:37:43 +02:00
Negue
f58141c5ac have debug and store version without uninstall the other 2016-08-21 16:19:20 +02:00
Phillip Thelen
51ce4ec529 allow users to send messages from inbox 2016-08-19 18:54:11 +02:00
Phillip Thelen
a954f481d9 Merge pull request #595 from TheHollidayInn/invites-qr-code 
Invites qr code
 2016-08-19 12:54:20 +02:00
jjbillings
67d6626382 Merge branch 'develop' of https://github.com/jjbillings/habitrpg-android into delete-tags 
# Conflicts:
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java

Resolved conflicts.
 2016-08-18 10:18:15 -05:00
jjbillings
d2e7b0fe26 Update String resources 2016-08-17 13:11:52 -05:00
Keith Holliday
9762dc3a04 Fixed styles. Made QR code purple. Encoded url to QR code. Made QR code larger 2016-08-16 20:17:18 -05:00
Phillip Thelen
abc83a38c2 fix incorrect string identifier 2016-08-16 18:21:08 +02:00
Phillip Thelen
43a63794bc Merge pull request #591 from jjbillings/guild-search-bar 
Guild Search Bar - Issue #513
 2016-08-16 18:20:46 +02:00
Keith Holliday
4bc2ace8f2 Added configure method for avaterview. Added dialgoue in preferences for qr code 2016-08-12 14:27:06 -05:00
Keith Holliday
45d9dc2d35 Added download qr. Added invite by qr. 2016-08-12 11:15:48 -05:00
Phillip Thelen
914b585d71 Merge pull request #572 from TheHollidayInn/social-notifications 
Social notifications
 2016-08-04 19:25:36 +02:00
Phillip Thelen
41ef950068 Allow chat messages to be copied to clipboard 
commit 61d2757fe581ea1ae084e0e576f7e0e1b2e226fb
Author: Phillip Thelen <viirus@pherth.net>
Date:   Thu Aug 4 12:22:58 2016 +0200

    add copy to clipboard string

commit b73d727a2251326f7860ae7b48225eb289c66f0c
Author: jjbillings <jjbillings@noctrl.edu>
Date:   Wed Aug 3 08:56:06 2016 -0400

    Add message into strings.xml
    # Conflicts:
    #	Habitica/res/values/strings.xml

commit 8546ee24e8b6a9593ae729e0084879d414a1a288
Merge: ecf1f33 93f264f
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Tue Aug 2 18:28:19 2016 -0400

    Merge remote-tracking branch 'origin/develop' into copy-chat-message

    # Conflicts:
    #	Habitica/res/values/strings.xml
    #Conflicts resolved...

commit 93f264f0b4
Merge: 81ded07 2ddc426
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Tue Aug 2 18:23:35 2016 -0400

    Merge pull request #2 from HabitRPG/develop

    Merge from main repo

commit ecf1f33ed0b3cf9457723353d5f1f8fa9dabeecb
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 09:27:09 2016 -0400

    Merge remote-tracking branch 'origin/develop' into copy-chat-message

    # Conflicts:
    #	Habitica/res/values/strings.xml

commit e64b3bda35aff3393c33a6e0628ea3843d517e22
Merge: f6e118d 81ded07
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 09:26:35 2016 -0400

    Merge remote-tracking branch 'origin/develop' into copy-chat-message

    # Conflicts:
    #	Habitica/res/values/strings.xml

commit 81ded07730
Merge: 0f70acc f5f5f00
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 09:08:35 2016 -0400

    Merge pull request #1 from HabitRPG/develop

    Update from original repo

commit f6e118d162a6b91a0716e7d1bceeaebe0aec96cb
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 09:02:12 2016 -0400

    Change Toast to SnackBar

commit 8835fe418df2fb5f2e08a06fdda94f2eae9d77f3
Merge: c72a1f5 80da760
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 08:59:52 2016 -0400

    Change Toast to SnackBar

commit c72a1f533d120cba9be838870460e2ee7a03ee9f
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Wed Jul 27 20:30:43 2016 -0400

    Add feature to copy chat messages to clipboard

commit 80da7601c48d63c92f909f4a3b4c6559bd907470
Merge: 2bf900d f0d997b
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 19:11:08 2016 +0200

    Merge branch 'travis' of github.com:HabitRPG/habitrpg-android into travis

    # Conflicts:
    #	.travis.yml

commit 2bf900df64aa241db5feeb4820b643cd0e1fa1e8
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 19:05:37 2016 +0200

    .

commit f0d997b56f37d511e66e18734716934efef3af13
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 19:05:37 2016 +0200

    .

commit 62e96caf288ae6f7260d4eb73164f082db0c7016
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 17:16:06 2016 +0200

    .

commit b0f640ced3c2a0e654a2b34ca2fe8307be0b7208
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 17:12:09 2016 +0200

    .

commit 97d3892b0e9b259e94f1920ffe6226da05fa218c
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 16:16:04 2016 +0200

    .

commit 6b89f5ee013c2711fe1872e7ff657439ab61a02d
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 16:00:39 2016 +0200

    set node version

commit 79e2b3af80741266c8ba9dda90d6a3ad40c56d0a
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 15:44:13 2016 +0200

    test

commit 11a68ba8e91e219ad1db9f7cc6bac3a203cdd60f
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 15:16:23 2016 +0200

    test different config

commit 9c96911dc31d1ba123481eb3d291aee274973474
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 14:52:33 2016 +0200

    fix config

commit 9f41579bd9289985fb98f1a46d0292f897b6b420
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 14:48:15 2016 +0200

    fix yaml
 2016-08-04 12:23:41 +02:00
jjbillings
3896d73e43 Add guild search bar 2016-08-03 21:04:17 -04:00
Keith Holliday
6aa8da81a0 Removed strings left accidently by merge 2016-08-02 13:40:51 -05:00
Keith Holliday
c834d020ac Added quest begun, invite to party and invite to guild local notifications 2016-08-02 13:30:27 -05:00
Keith Holliday
dd366a8337 Added reciever for responding to local noitfication actions 2016-08-02 13:30:02 -05:00
Keith Holliday
335453e926 Add UI for push settings. Added push manager. Added toggle for push enabled/disabled. 2016-08-02 13:29:05 -05:00
Phillip Thelen
fcdeb8092b various shop improvements 2016-07-29 12:13:13 +02:00
Phillip Thelen
4cbda57043 display message with empty inbox 2016-07-27 20:01:44 +02:00
Phillip Thelen
d29c7b72ca display shops in the app 2016-07-22 18:07:00 +02:00
Phillip Thelen
0ea1f4d4b1 Fix todo reminder dialog not being scrollable. 
Fixes #579
 2016-07-22 12:03:11 +02:00
Keith Holliday
70fec9fa45 Removed extra code. Fixed Menu index 2016-06-24 15:00:46 -05:00
Keith Holliday
46320f4ba3 Added reading inbox 2016-06-23 13:37:25 -05:00
Phillip Thelen
dbd46af4a2 update translations 2016-06-20 11:36:43 +02:00
Phillip Thelen
635d784b93 display leader message in guild info. Fixes #558 2016-06-14 15:47:06 +02:00
Keith Holliday
c74296c38d Added task reminders interface and model 2016-06-12 11:16:14 -06:00
Phillip Thelen
f7c2e97e66 improve display for class selection 2016-05-20 18:31:17 +02:00
Phillip Thelen
41605386f3 fix class selection 2016-05-19 13:15:35 +02:00
Phillip Thelen
edcec62858 add option to display maintenance and deprecation screen 2016-05-09 16:17:34 +02:00
Phillip Thelen
d64f150bdc allow party editing and leaving 2016-04-26 16:49:56 +02:00
Phillip Thelen
30dda364c5 Add sharing to raised pets 2016-04-26 16:49:56 +02:00
Phillip Thelen
8878be49a3 update share messages 2016-04-26 16:49:56 +02:00
Phillip Thelen
5dc6ef5d91 add sharing for level up and pet hatching 2016-04-26 16:49:56 +02:00
Phillip Thelen
25ab28a5c2 Begin implementing party invitations 2016-04-26 16:49:56 +02:00
Phillip Thelen
8654e038f6 handle class selection correctly 2016-04-26 16:49:56 +02:00
Phillip Thelen
ebe09f0301 allow to change class in settings. 2016-04-26 16:49:56 +02:00
Phillip Thelen
0046e43609 finish selecting a class after levelup 2016-04-26 16:49:56 +02:00
Phillip Thelen
35fe0f78d2 allow class selection 2016-04-26 16:49:56 +02:00
Phillip Thelen
7e44e5f85e better display for classless users. 2016-04-12 16:41:15 +02:00
Phillip Thelen
5a3b6757c9 Code cleanup 2016-04-12 15:46:44 +02:00
Phillip Thelen
9dd99afbe6 update translations 2016-04-12 15:04:16 +02:00
Phillip Thelen
4d156a31a7 Improve content loading 2016-04-12 15:04:16 +02:00
Phillip Thelen
17961c1a9f add world boss display 2016-04-12 15:04:16 +02:00
Phillip Thelen
318614ac02 Fix Stable 2016-04-07 20:14:41 +02:00
Phillip Thelen
809a247766 update translations 2016-04-07 20:14:41 +02:00
Phillip Thelen
871077ed5a add hatching and feeding 2016-03-31 15:57:57 +02:00
Phillip Thelen
ee30133a47 add item selling and quest inviting 2016-03-29 20:00:24 +02:00
jeubank12
8de649b7e0 Enhancement Complete 
Still need to add locale strings for translation of 'today'
 2016-03-29 13:00:15 +02:00
Phillip Thelen
ced7d44de7 Display inventory items 2016-03-29 12:40:21 +02:00
Phillip Thelen
f1c38e7614 start working on items 2016-03-29 12:40:21 +02:00
Saran Lertpradit
5575f4ff19 add enchanted armoire note 2016-03-29 12:40:21 +02:00
Saran Lertpradit
144a1d9186 Add enchanted armoire to rewards tab 
fixing #439
 2016-03-29 12:40:21 +02:00
Elliot
5aa05582a5 add attributes to task creation if auto allocated 2016-03-18 13:16:27 -04:00
Phillip Thelen
ba24517d6f make ago labels translatable 2016-03-16 17:14:00 +01:00
Phillip Thelen
095ba04f4e make spacing and sizing more consistent 2016-03-16 13:52:42 +01:00
Phillip Thelen
ba747d55ee fix several crashes 2016-03-15 13:53:59 +01:00
Phillip Thelen
a63b3352cb highlight equipped gear 2016-03-10 14:34:35 +01:00
Phillip Thelen
11eb098d35 allow changing equipment 2016-03-10 14:05:32 +01:00
Phillip Thelen
9c8e1be9d4 improve layouts 2016-03-08 20:53:03 +01:00
Brandon Cheng
61094d0f52 Merge pull request #6 from HabitRPG/develop 
Update to main branch
 2016-03-06 17:57:33 -08:00
Phillip Thelen
1caf6de984 fix post button 2016-03-06 17:09:34 +01:00
Phillip Thelen
53329ae75e allow guild editing 2016-03-06 16:49:35 +01:00
Brandon Cheng
8fd5dbeab9 Merge pull request #5 from HabitRPG/develop 
Update to main branch
 2016-03-05 10:44:31 -08:00
Phillip Thelen
3d12e22c81 update dependencies 2016-03-05 16:53:36 +01:00
Phillip Thelen
db6a7e2bdb Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
 2016-03-05 14:56:24 +01:00
Phillip Thelen
ae0ff33e41 Add more guild functionality 2016-03-05 14:54:19 +01:00
Phillip Thelen
7efb1b4f72 Merge pull request #429 from saranlert/quest-invitation 
add quest invitation accept/reject
 2016-03-05 14:47:46 +01:00
WhatsEmo
a1c6efc229 Attempt to fix CI Build Error 2016-03-01 14:20:03 -08:00
WhatsEmo
9313a00783 Cleared some merge conflicts 2016-02-27 13:35:37 -08:00
WhatsEmo
46a3ce995f Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop 2016-02-27 13:17:12 -08:00
Phillip Thelen
467c314896 display list of guilds the user is a member of 2016-02-26 12:51:06 +01:00
WhatsEmo
c74d183235 Something to help 2016-02-20 00:29:45 -08:00
WhatsEmo
2a03191def GitHub Glitched 
All these updates were already made
 2016-02-20 00:19:21 -08:00
Saran Lertpradit
222fb7e411 add quest interaction 
-list of quest participants in party view
-buttons to accept/reject/etc.. quest
 2016-02-19 01:18:24 +07:00
Phillip Thelen
8067b6bcd3 add translations 2016-02-17 22:16:11 +01:00
Phillip Thelen
a362af8ef7 Merge pull request #414 from ExperimentMonty/bugfix/skill-unlock-level 
Change skill unlock level text to 11
 2016-02-17 22:00:59 +01:00
Negue
99bff54292 Get IAP Price & Add Support Text 2016-02-15 19:31:17 +01:00
John Montgomery
f089626349 Change skill unlock level text to 11 2016-02-09 08:56:56 -05:00
Phillip Thelen
95c377ea54 Show setup after registration 2016-02-02 15:02:27 +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
Phillip Thelen
e59326e141 display FAQ Articles 2016-02-02 15:02:17 +01:00
Phillip Thelen
1a96430491 Add version to about screen 2016-01-26 16:31:58 +01:00
Phillip Thelen
999ddd053d Support due date for todos. Fixes 2016-01-20 14:20:09 +01:00
Phillip Thelen
21d6342968 Better formatting for customizations 2016-01-19 19:43:24 +01:00
Phillip Thelen
3a5710d93a allow to buy and set backgrounds 2016-01-19 16:31:09 +01:00
Phillip Thelen
5c527b8ad6 Allow customizations and sets to be purchased 2016-01-16 18:05:14 +01:00
Phillip Thelen
ca2f89087f Display current avatar customization 2016-01-12 17:08:02 +01:00
Negue
921b14183c extract constant strings 2016-01-11 20:29:05 +01:00
Dan Lew
eebc7fc91c Extracted string resource for "Quest" 2015-12-17 07:01:52 -06:00
Phillip Thelen
d29a1c923e remove keys 2015-12-14 14:36:49 +01:00
Negue
2633d3f7e3 [#86] remove unused strings / styles [#167] extract strings to resources 2015-12-12 21:02:44 +01:00
Phillip Thelen
dd925b8b41 display link to reset password on website. 2015-12-10 02:26:31 +01:00
Phillip Thelen
b23f175cb1 display information alert when not in party 2015-12-09 23:58:56 +01:00
Phillip Thelen
186afb05f4 disable skills menu item when it's not available. 2015-12-09 14:06:20 +01:00
Phillip Thelen
c64a6c6a10 Change task form handling. Fixes #141 2015-12-09 00:22:27 +01:00
Phillip Thelen
fea1dc3339 Add confirmation dialog when flagging. Fixes #139 2015-12-09 00:22:26 +01:00
Negue
935cf8cf9c closes #115 - improve about screen 2015-12-07 23:50:22 +01:00
Phillip Thelen
378d2acaee Change login field to "Email or Username". Fixes #118 2015-12-07 15:01:08 +01:00
Negue
405722e06a edit rewards - closes #89 #102 - refactor task form view / class a bit 2015-12-05 23:12:03 +01:00
Phillip Thelen
f3ecc21661 Tease upcoming features in sidebar. Fixes #105 2015-12-05 15:16:21 +01:00
Phillip Thelen
f783443d14 task form improvements 2015-12-03 21:41:03 +01:00
Phillip Thelen
ff5c1ece48 better display for rewards 2015-12-02 18:46:27 +01:00
Phillip Thelen
e1c96f69d5 better feedback when using skills 2015-12-02 16:56:13 +01:00
Phillip Thelen
46598945c3 add setting for daily reminder 2015-12-01 02:37:30 +01:00
Phillip Thelen
1283244b61 Allow checklist item editing 2015-11-30 23:01:41 +01:00
Phillip Thelen
0434496de7 Merge branch 'setttings-activity' into develop 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
 2015-11-28 19:51:03 +01:00
Phillip Thelen
effdc76390 add ability to use skills 2015-11-28 19:30:48 +01:00
Franze Jr
d1ceb6d6b9 [#13] First version of SettingsActivity 2015-11-26 18:56:22 -03:00
Phillip Thelen
2d2e8ad9ab Display skills 2015-11-25 18:47:56 +01:00
Phillip Thelen
116020171e Improve header layout 2015-11-25 14:41:06 +01:00
Phillip Thelen
2dddc93c39 correct events for fragments 2015-11-19 21:38:21 +01:00
Phillip Thelen
29db6a99cc better feedback on user login 2015-11-18 13:05:38 +01:00
Negue
72d1a33e08 Merge branch 'faint-screen' of https://github.com/HabitRPG/habitrpg-android into develop 
Conflicts:
	Habitica/Habitica.iml
	Habitica/res/values/strings.xml
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
 2015-11-15 18:57:19 +01:00
Phillip Thelen
75ad7523cc Display levelup popup 2015-11-15 17:22:05 +01:00
Phillip Thelen
3b0e565144 Display faint dialog and allow to revive 2015-11-15 16:33:06 +01:00
Phillip Thelen
3aa5ec4608 Add basic facebook login 2015-11-14 15:59:44 +01:00
Phillip Thelen
97554d5cfd Redesign login screen 2015-11-09 18:48:01 +01:00
Phillip Thelen
0cff8749d9 Merge pull request #41 from HabitRPG/offline-warning 
Offline warning
 2015-11-08 11:58:20 +01:00
Franze Jr
24cc7ea104 [#26] - Changes proposed by team. Add report a bug button, source code button and small changes and refactorings 2015-11-05 18:28:17 -03:00
Franze Jr
9df4745488 [#33] - Change error message from server for a more friendly way 2015-11-05 17:47:05 -03:00
Franze Jr
8b643ca957 [#26] - Moving strings to string resources 2015-11-04 23:28:37 -03:00
Franze Jr
66de7ea08f [#26] - First version of About Screen. 2015-11-04 20:30:42 -03:00
Franze Jr
25c9d69d02 [#33] - Add validations and small refactoring for handleError method 2015-11-03 22:19:11 -03:00
Franze Jr
e03c9c686d [#33] - Add networkChangeReceiver 2015-11-03 20:38:10 -03:00
Negue
94af661353 Cleanup / fixes / set title on TaskForm / Version 0.0.5 2015-10-21 22:33:32 +02:00
Negue
9c1d903752 Refactor MainDrawerBuilder / start with gempurchases 2015-10-19 20:25:57 +02:00
Negue
560669da95 Extract ChatListFragment 
Extract MainActivity to AvatarActivityBase
Party - Part 1 - Chat
 2015-09-15 21:56:23 +02:00
Phillip Thelen
c8d2483dbc Fix form rendering 2015-08-26 20:01:52 +02:00
Negue
b26e48c104 Create TavernActivity / extract Sidebar Strings / extract MainDrawerBuilder 2015-08-18 21:46:12 +02:00
Phillip Thelen
e58baadbc7 Begin header redesign 2015-08-17 23:37:56 +02:00
Phillip Thelen
bbe80a30c4 First working task creating/update form 2015-08-03 15:55:17 +02:00
Phillip Thelen
73f8c596d3 Start building new form for tasks 2015-08-03 15:55:17 +02:00
Negue
549281b969 Update Dependencies / change some strings 2015-06-28 19:37:02 +02:00
Negue
1ccdf9852e Merge: develop changes 2015-06-27 20:25:58 +02:00
Negue
c57d2219ad Port Checklist Feature 2015-06-27 20:22:38 +02:00
Phillip Thelen
5910c3f532 Don't crash when no internet connection is available 2015-06-27 17:29:47 +02:00
Negue
dc6b066b46 Avatar Control, Value Bar Control (HP, MP, XP), new colors 2015-06-20 20:13:44 +02:00
Negue
43086228d2 Rename to Habitica - Part 2 (Namespaces) / Update Fabric 2015-05-27 18:48:19 +02:00
Negue
33239d8d24 Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00
Renamed from HabitAndroRPG/res/values/strings.xml (Browse further)