Commit graph

1076 commits

Author SHA1 Message Date
Phillip Thelen
a30ab7ea0a improve readability for +1 in chat 2015-12-09 03:22:21 +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
Franze Jr
506bc22a64 Fixes #98 - must supply a layout_width attribute error. 2015-12-06 23:00:31 -03: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
3be14accd7 Whitespace for tasks. Fixes #82 2015-12-01 19:41:07 +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
615053b692 correct colors for tasks 2015-11-24 20:46:12 +01:00
Phillip Thelen
2dddc93c39 correct events for fragments 2015-11-19 21:38:21 +01:00
Phillip Thelen
012278e4b9 add email to sidebar 2015-11-18 16:08:59 +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
Negue
ba1a408c6a Merge branch 'develop' into TaskListDesign
Conflicts:
	Habitica/Habitica.iml
	Habitica/res/values/dimens.xml
2015-11-09 20:34:22 +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
Phillip Thelen
e8c12522b7 Adjust checkboxes in task lists 2015-11-07 19:10:03 +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
Mickael Goubin
26341da346 last header line with placeholder text 2015-10-29 22:37:06 +01:00
Mickael Goubin
75c7fa401d Use darker colorPrimaryDark 2015-10-29 20:18:06 +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
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
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
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
937d6aa09f Replace MaterialViewPager with Google Controls 2015-09-14 20:05:15 +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
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
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
46962bdfbe fix avatar scale in header 2015-08-18 00:01:09 +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
Negue
04a2c3cfab Fix Colors in Views 2015-08-10 20:04:53 +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
92d558739f First implementation of avatar rendering 2015-07-20 19:00:03 +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
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
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
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
33240311e8 add new MainActivityNew with viewpager, recyclerview and drawer 2015-06-20 20:46:04 +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