Commit graph

5132 commits

Author SHA1 Message Date
Phillip Thelen
6468d20bc1 Store suppressed modals in database 2015-11-15 17:46:45 +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
e181c51fdc Merge branch 'rewards-design' into develop
# Conflicts:
#	Habitica/Habitica.iml
#	Habitica/build.gradle
2015-11-15 15:20:39 +01:00
Phillip Thelen
e2204dff0f Fix healer image in header 2015-11-15 14:45:15 +01:00
Phillip Thelen
4e99dc5db4 different display style for drop snackbars 2015-11-15 14:45:07 +01:00
Phillip Thelen
243cfcc4dc Display snackbar on drop 2015-11-14 19:35:14 +01:00
Phillip Thelen
a61f53caf5 correctly display dailies as due 2015-11-14 19:02:20 +01:00
Phillip Thelen
3aa5ec4608 Add basic facebook login 2015-11-14 15:59:44 +01:00
Franze Jr
6090995d28 [#36] Small refactorign proposed by @negue 2015-11-14 10:06:22 -03:00
negue
07ebfcb46d Merge pull request #52 from HabitRPG/refresh-button
Add refresh button rather than three dots icon
2015-11-14 00:49:44 +01:00
Franze Jr
29a8d965a9 [#36] Decrease padding between gold image and price 2015-11-13 20:29:57 -03:00
Franze Jr
eae09bb222 [#36] Add margin bottom in goldprice layout and decrease space between gold image and price 2015-11-13 20:02:00 -03:00
Franze Jr
4a58e05f5d Add refresh button rather than three dots icon 2015-11-13 19:27:15 -03:00
Franze Jr
c84e6f2fa2 [#36] Price gold centered and samll refactorings 2015-11-13 18:47:24 -03:00
Franze Jr
005a2ac66c [#36] Add validation for no custom image 2015-11-11 18:25:37 -03:00
Franze Jr
689d6476de [#36] Add Padding between gold and price 2015-11-10 20:16:02 -03:00
Franze Jr
c29e72b481 [#36] Add images in dialog 2015-11-10 20:06:05 -03:00
Franze Jr
36e6c42890 [#36] First version - Using MaterialDialogs 2015-11-10 18:01:34 -03:00
Negue
a18715350f Version 0.0.8 2015-11-09 20:48:06 +01: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
Negue
10ac099585 prepare changelog for 0.0.8 2015-11-09 20:08:45 +01:00
Phillip Thelen
4dc0fcbb13 correct class colors 2015-11-09 18:59:42 +01:00
Phillip Thelen
97554d5cfd Redesign login screen 2015-11-09 18:48:01 +01:00
Phillip Thelen
18a808adc9 Merge pull request #45 from HabitRPG/party-design
Party design
2015-11-09 14:10:23 +01:00
Franze Jr
eb578ec581 [#12] - Save fragment instance for TaskRecyclerViewFragment 2015-11-08 17:58:57 -03:00
Franze Jr
5af3f04d4d Remove unnecesary interface modifiers and redundant local variables 2015-11-08 16:04:31 -03:00
Franze Jr
60d90993e3 Remove unused imports, format code 2015-11-08 15:45:05 -03:00
Phillip Thelen
0cff8749d9 Merge pull request #41 from HabitRPG/offline-warning
Offline warning
2015-11-08 11:58:20 +01:00
Franze Jr
86edf6b4e4 [#35] - Create databinding and logic for party members 2015-11-07 20:29:34 -03:00
Negue
7cdc085524 Version 0.0.7 2015-11-08 00:01:14 +01:00
Negue
e19e0fba5d Saving hair to database - fixes #17 2015-11-07 23:42:37 +01:00
Negue
8380158cea some minor fixes 2015-11-07 23:40:48 +01:00
Negue
0e8a15b9a8 fix loading the gems / crash on load 2015-11-07 23:40:17 +01:00
Negue
2e0dc44756 Log Rest-Requests only in DEBUG Builds 2015-11-07 21:54:41 +01:00
Negue
aa7ffd8ce5 Version 0.0.6 2015-11-07 21:45:35 +01: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
Franze Jr
93ed6dbd94 [#35] - Change colors for class 2015-11-06 18:32:40 -03:00
Franze Jr
00ae4fe4e0 [#33] - Add new icon for warning 2015-11-06 18:04:48 -03:00
Phillip Thelen
a4e23cbecc Merge pull request #42 from HabitRPG/about-activity
[#26] - About Screen
2015-11-06 15:04:03 +01:00
Franze Jr
65466b7dd4 [#35] - Enable option for UserPicture choose if there is background, pets and mount 2015-11-05 20:00:34 -03: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
4df6a448dd [#33] - Remove unused variables from handleError method 2015-11-03 20:38:44 -03:00
Franze Jr
0d1072d6b4 [#33] - Update method for Retrofit 2015-11-03 20:38:38 -03:00
Franze Jr
e03c9c686d [#33] - Add networkChangeReceiver 2015-11-03 20:38:10 -03:00
Negue
10476415cc speed up ContentCache with async safe calls 2015-11-03 19:59:52 +01:00
Franze Jr
c876ac27d8 Remove commented code from ApiService 2015-11-02 22:45:23 -03:00
Mickael Goubin
dd5da62836 Starting header for other activities 2015-11-01 23:01:58 +01:00
Mickael Goubin
ee8fee9802 Add balance to HabitRPGUser model + use it to set gem text on header 2015-11-01 22:37:51 +01:00
Mickael Goubin
9bfe1ff7c5 use real data for header (except gems) 2015-11-01 22:12:02 +01:00
Mickael Goubin
ce566a4cd2 camelCase all the things 2015-11-01 20:14:58 +01:00
Mickael Goubin
19a738e91d smaller gold/silver/gems icon size 2015-10-29 22:50:40 +01:00
Mickael Goubin
005a6def4d Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop 2015-10-29 22:37:19 +01:00
Mickael Goubin
26341da346 last header line with placeholder text 2015-10-29 22:37:06 +01:00
Mickael Goubin
1a98aa9dd0 Bigger icons 2015-10-29 21:51:27 +01:00
Mickael Goubin
bf9b3207eb set up icons for header view 2015-10-29 21:23:23 +01:00
Negue
310cba8449 Load buyable gear rewards & save them to the db too 2015-10-29 20:49:57 +01:00
Mickael Goubin
75c7fa401d Use darker colorPrimaryDark 2015-10-29 20:18:06 +01:00
Negue
ca43925f7d remove unneeded layout [button_day_of_week] 2015-10-29 20:02:31 +01:00
Mickael Goubin
8470bcc031 Fix #16 statusbar color 2015-10-29 19:53:37 +01:00
Negue
94af661353 Cleanup / fixes / set title on TaskForm / Version 0.0.5 2015-10-21 22:33:32 +02:00
Mickael Goubin
8027959364 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
2015-10-21 18:23:24 +02:00
Mickael Goubin
48a56879c3 Merge branch 'develop' into feature-tags 2015-10-21 18:17:38 +02:00
Mickael Goubin
9d1444cf3b Udpate tag count when adding a tag 2015-10-21 18:16:29 +02:00
Mickael Goubin
c7735d7ad8 Update layout and AvatarActivityBase to fix the name of the activity not on the right spot 2015-10-21 01:06:03 +02:00
Mickael Goubin
aa03c3e07c Fix #8 while updating to a newer Material Drawer version 2015-10-20 19:39:59 +02:00
Negue
9c1d903752 Refactor MainDrawerBuilder / start with gempurchases 2015-10-19 20:25:57 +02:00
Mickael Goubin
15327e4530 Fix NPE when adding some tasks (value/completed could be null --> use primitive 2015-10-11 19:55:35 +02:00
Mickael Goubin
c1093e6d72 Fix showing number of tasks for tags 2015-10-11 19:51:23 +02:00
Mickael Goubin
904c52db8e Correct usage of 'in' 2015-10-11 19:02:08 +02:00
Mickael Goubin
e00fa14ed3 Search for tags async while saving 2015-10-11 19:02:08 +02:00
Mickael Goubin
6511e9c0ac Use async requests for user saving and retrieving 2015-10-11 19:02:08 +02:00
Mickael Goubin
8a9de93ad1 Fix #7 by putting the tagslist in the bundle given to TaskFormActivity. 2015-10-11 19:02:08 +02:00
Mickael Goubin
c3bf3f74c5 Fix #6 by creating a TagHelper that manage tags. 2015-10-11 18:59:45 +02:00
Mickael Goubin
e801414fb1 Update lib filter check to use list instead of arraylist 2015-10-11 18:53:14 +02:00
Mickael Goubin
c966bc1e3b Remove extra text to test longer tab title 2015-10-11 18:33:23 +02:00
Mickael Goubin
3be1154d2d Update to new version of design library. Tabs on single line. Tuning for new version of design lib 2015-10-11 18:32:20 +02:00
Negue
550ee32baa Replace Floating Action Button with a custom control (and on sub item for each task type) 2015-10-09 23:13:28 +02:00
Negue
4404933f20 Update Version Code 2015-10-09 23:10:36 +02:00
Negue
ba225096c6 remove buttons .. for now 2015-10-01 21:28:13 +02:00
Negue
b345cce09e Open/save database from "external" directory / update changelog 2015-10-01 21:18:31 +02:00
Negue
c47031a60b Party information / ContentCache / 2015-10-01 20:58:04 +02:00
Negue
40e606d377 - add dateCreated to task
- refactored some code
- fixed #4 #5
2015-09-28 22:37:43 +02:00
Negue
1588f856a5 Party Part 2 - Memberlist / Fix Avatars 2015-09-23 22:39:04 +02:00
Negue
560669da95 Extract ChatListFragment
Extract MainActivity to AvatarActivityBase
Party - Part 1 - Chat
2015-09-15 21:56:23 +02:00
Negue
2a5d0b79f2 Update Paperboy to 2.0.1 2015-09-14 20:11:12 +02:00
Negue
937d6aa09f Replace MaterialViewPager with Google Controls 2015-09-14 20:05:15 +02:00
Negue
6ce26b5cba Version 0.0.3 2015-09-12 20:16:30 +02:00
Negue
6c351f8e8f Filter by Tags, fix multiple TaskTags in db 2015-09-10 21:56:58 +02:00
Negue
f6af21ba86 improve tavern performance (no databinding) / layout 2015-09-05 22:52:47 +02:00
Negue
63548df9e5 tavern: pull-to-refresh, scrollbar 2015-09-04 21:32:55 +02:00
Negue
9ad9ec7a83 dis/-like chatmessage, update count, flag message 2015-09-04 20:40:33 +02:00
Negue
c10c55288e Filter flagged messages, show likes with different colors for each state 2015-09-02 21:36:26 +02:00
Phillip Thelen
447456c58e Enable checking off checklist items 2015-08-31 19:02:12 +02:00
Phillip Thelen
a72d5f06ce Display checklists in task list 2015-08-31 17:48:56 +02:00
Phillip Thelen
7e1a1fa1a3 don't open new activity of it's already active 2015-08-31 13:00:03 +02:00
Phillip Thelen
a92afe58f0 fix compatability warnings 2015-08-31 12:56:00 +02:00
Phillip Thelen
ec53b4a40c Fix contributor coloring in tavern 2015-08-31 12:13:29 +02:00
Negue
5665dd2fdb Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
	Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
2015-08-30 20:04:12 +02:00
Negue
4f44bd44b5 List Tavern Messages, Send / Delete them, Toggle Sleep 2015-08-30 19:56:46 +02:00
Phillip Thelen
59927ef0f1 Update UI when task is scored 2015-08-26 21:09:51 +02:00
Phillip Thelen
72a612ddae save created/updated tasks to database 2015-08-26 20:02:11 +02:00
Phillip Thelen
89ba8cb351 Add refresh option to main activity 2015-08-26 20:02:01 +02:00
Phillip Thelen
c8d2483dbc Fix form rendering 2015-08-26 20:01:52 +02:00
Phillip Thelen
2fff3b7b81 Fix displaying changes after updating task 2015-08-26 20:01:21 +02:00
Phillip Thelen
8bf78d45d5 Don't crash when no tags are set 2015-08-26 20:00:56 +02:00
negue
67a75c84b9 fix: taskType was null 2015-08-25 22:09:53 +02:00
Negue
b26e48c104 Create TavernActivity / extract Sidebar Strings / extract MainDrawerBuilder 2015-08-18 21:46:12 +02:00
Negue
9f7582b81f Don't forget the brackets. 2015-08-18 19:27:39 +02:00
Negue
ef57e2ddfa Save the task before tags/checklists 2015-08-18 19:20:52 +02:00
Negue
96508a2447 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop 2015-08-18 18:07:41 +02:00
Negue
a016cec942 Add LayoutCast as dependency 2015-08-18 18:07:32 +02:00
Negue
315d25e316 Version 0.0.2 / BlackText on Login 2015-08-18 18:00:25 +02:00
Phillip Thelen
46962bdfbe fix avatar scale in header 2015-08-18 00:01:09 +02:00
Phillip Thelen
b10f2269f6 fix okhttp error 2015-08-17 23:44:24 +02:00
Phillip Thelen
e58baadbc7 Begin header redesign 2015-08-17 23:37:56 +02:00
Phillip Thelen
efadeeecb6 redesign habit and todo list 2015-08-17 22:32:21 +02:00
Phillip Thelen
257bbaef4f add new color scheme 2015-08-17 22:06:36 +02:00
Phillip Thelen
0a3a693f91 redesign daily list 2015-08-17 22:06:29 +02:00
Phillip Thelen
92ef8c6e44 Refactor models for checklists and tags 2015-08-17 17:37:43 +02:00
Negue
d116228b13 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop 2015-08-10 21:23:02 +02:00
Negue
7179e2a581 Update Gradle / Dependencies 2015-08-10 21:16:58 +02:00
Negue
04a2c3cfab Fix Colors in Views 2015-08-10 20:04:53 +02:00
Phillip Thelen
ab84bf83d9 Combine task classes into one 2015-08-10 15:56:52 +02:00
Phillip Thelen
efecb79e81 Use more databindings 2015-08-03 18:14:20 +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
Phillip Thelen
c36339249c improve avatar rendering 2015-08-03 15:54:02 +02:00
Negue
740c90b7d6 No EditDialog on RewardItems 2015-07-28 19:48:41 +02:00
Negue
912898a3ac Buyable Item Images / clean up imports / nullcheck of gear 2015-07-28 19:37:18 +02:00
Phillip Thelen
92d558739f First implementation of avatar rendering 2015-07-20 19:00:03 +02:00
Negue
ae08141d95 - Load content / ItemData & save to DB
- Load buy-able gear & list it
- buy potion / gear / rewards
2015-07-15 15:36:12 +02:00
Negue
2225e710a2 draw zzz in avatar 2015-07-15 15:32:50 +02:00
Negue
3bfa4bb243 Add new Tasks / handler to reduce loadContent calls in the Adapter 2015-07-12 20:37:02 +02:00
Negue
ee48c6adfa initialize fabric / send events from viewAdapter / change AddTaskDialog to use taskId / change menu background color 2015-07-11 20:49:09 +02:00
Negue
e52f10b83c public HabitItem.getType 2015-07-11 20:46:15 +02:00
Negue
08c9ab0fe1 Login Screen with Snackbar instead of Crouton 2015-07-11 20:45:26 +02:00
Negue
2f2a9a8dfa Add more Events 2015-07-11 20:43:49 +02:00
Negue
e010c661d1 remove crouton lib 2015-07-11 20:43:21 +02:00
Negue
07f975e68d Add Event Sender / Receiver
Rename RecyclerViewFragment.java to TaskRecyclerViewFragment.java
2015-07-11 15:29:30 +02:00
Negue
4416366fa7 revert fragment_recyclerview.xml changes (FAB sometimes moved to the left side) 2015-07-11 15:28:14 +02:00
Negue
ab70ddef24 add EventBus / Events 2015-07-11 15:27:10 +02:00
Negue
75c895a86b Set Primary Color to Black 2015-07-07 20:59:49 +02:00
Negue
1eeaabffa7 Update Libraries / "Note" in Changelogs / Fix Crash on first start 2015-07-07 20:28:57 +02:00
Phillip Thelen
22b1e542cb load task and user data from database 2015-07-06 19:20:52 +02:00
Phillip Thelen
606038a085 Save data in persistent storage 2015-07-06 17:47:12 +02:00
Phillip Thelen
305d676976 refactor tasks layouts 2015-06-29 18:24:44 +02:00
Phillip Thelen
a7e78dbd68 Remove old code 2015-06-29 17:53:22 +02:00
Phillip Thelen
50ba0e07ab Fix actionbar offset 2015-06-29 17:43:03 +02:00
Phillip Thelen
ef177cef0f Start using material design viewpager 2015-06-29 16:04:03 +02:00
Negue
549281b969 Update Dependencies / change some strings 2015-06-28 19:37:02 +02:00
Negue
80e48529bd toggle sleep / load user in the new activity 2015-06-28 19:02:28 +02:00
Negue
0ece907d50 forgot to remove the old changelog call 2015-06-27 20:31:22 +02:00
Negue
1ccdf9852e Merge: develop changes 2015-06-27 20:25:58 +02:00
Negue
289c17019a Initialize Instabug in DEBUG Mode (or else the InstabugActivities crash) 2015-06-27 20:24:02 +02:00
Negue
dce33fe2b4 Animate Value Bar 2015-06-27 20:23:14 +02:00
Negue
c57d2219ad Port Checklist Feature 2015-06-27 20:22:38 +02:00
Negue
2e2dc5412a Move TagAdapter 2015-06-27 20:19:20 +02:00
Negue
aacceab336 Add AboutLibraries & Paperboy 2015-06-27 20:18:25 +02:00
Negue
90bcfd7797 Remove old Changelog Dialog 2015-06-27 20:14:26 +02:00
Phillip Thelen
77380b46c1 Fix handling for when tags object is an array 2015-06-27 19:49:58 +02:00
Phillip Thelen
5910c3f532 Don't crash when no internet connection is available 2015-06-27 17:29:47 +02:00
Phillip Thelen
f880ddcec1 don't launch crashlytics and instabug, when debug 2015-06-23 12:07:21 +02:00
Phillip Thelen
3619a5e7b2 Integracte HabitRPGWrapper library directly 2015-06-23 12:02:32 +02:00
Negue
29915637d3 Version 0.0.1 2015-06-20 20:47:02 +02:00
Negue
6595bc3073 Add Converters for Boolean (from int) 2015-06-20 20:46:53 +02:00
Negue
33240311e8 add new MainActivityNew with viewpager, recyclerview and drawer 2015-06-20 20:46:04 +02:00
Negue
5cbc77a9e3 Update Gradle Version / Add Databinding & other libraries 2015-06-20 20:40:53 +02:00
Negue
0b2361b8fa change Id of a textview 2015-06-20 20:34:46 +02:00
Negue
467161a5f2 Use new Avatar Control / VM 2015-06-20 20:32:34 +02:00
Negue
dc6b066b46 Avatar Control, Value Bar Control (HP, MP, XP), new colors 2015-06-20 20:13:44 +02:00
Negue
dc1d44dd53 add filter list icon 2015-06-20 20:06:10 +02:00
Negue
7a07028528 Move Fragments to other package 2015-06-20 20:05:53 +02:00
Negue
1d776901d7 Update App Icon 2015-06-20 20:03:26 +02:00
Negue
92e4055b0c fix: preferences back button 2015-05-27 20:17:26 +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