habitica-android/Habitica/res/layout
Phillip Thelen 1469e6fe54 Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/res/layout/activity_task_form.xml
#	Habitica/res/layout/tavern_chat_new_entry_item.xml
#	Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
#	Habitica/src/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
2016-02-26 14:02:15 +01:00
..
activity_about.xml Move activities to /ui/activities package 2015-12-21 20:19:51 +01:00
activity_intro.xml minor fixes 2016-02-03 13:56:43 +01:00
activity_main.xml Display tutorial messages 2016-02-02 15:02:26 +01:00
activity_setup.xml Show setup after registration 2016-02-02 15:02:27 +01:00
activity_skill_tasks.xml add ability to use skills 2015-11-28 19:30:48 +01:00
activity_task_form.xml Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
avatar_background_overview_card.xml allow to buy and set backgrounds 2016-01-19 16:31:09 +01:00
avatar_overview_card.xml Allow users to select owned customizations 2016-01-13 17:25:08 +01:00
avatar_with_bars.xml Fix avatar margin 2016-02-02 20:30:25 +01:00
checklist_item.xml Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
checklist_item_row.xml Changed to emoji-lib library which combines the other twos used before 2015-12-26 16:21:21 +01:00
custom_list_preference_row.xml Port Checklist Feature 2015-06-27 20:22:38 +02:00
customization_grid_background_item.xml fix scaling for customizations 2016-01-20 15:31:34 +01:00
customization_grid_item.xml Allow customizations and sets to be purchased 2016-01-16 18:05:14 +01:00
customization_section_header.xml Show setup after registration 2016-02-02 15:02:27 +01:00
daily_item_card.xml Changed to emoji-lib library which combines the other twos used before 2015-12-26 16:21:21 +01:00
dialog_faint.xml Fix avatar size in dialogs 2016-01-20 15:44:40 +01:00
dialog_levelup.xml Fix avatar size in dialogs 2016-01-20 15:44:40 +01:00
dialog_purchase_customization.xml correct sorting for checklist items 2016-01-20 11:21:53 +01:00
edit_text_drawer_item.xml Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
floating_menu_tasks.xml Fix floating menu button 2015-11-28 19:30:48 +01:00
fragment_about.xml Add version to about screen 2016-01-26 16:31:58 +01:00
fragment_avatar_overview.xml allow to buy and set backgrounds 2016-01-19 16:31:09 +01:00
fragment_chatlist.xml Extract ChatListFragment 2015-09-15 21:56:23 +02:00
fragment_faq_detail.xml display FAQ Articles 2016-02-02 15:02:17 +01:00
fragment_gem_purchase.xml Get IAP Price & Add Support Text 2016-02-15 19:31:17 +01:00
fragment_guilds_overview.xml display list of guilds the user is a member of 2016-02-26 12:51:06 +01:00
fragment_intro.xml Add Intro before login 2016-02-02 15:02:26 +01:00
fragment_party.xml begin reworking activities into fragments 2015-11-19 16:50:03 +01:00
fragment_party_info.xml Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
fragment_party_memberlist.xml Party Part 2 - Memberlist / Fix Avatars 2015-09-23 22:39:04 +02:00
fragment_recyclerview.xml Replace Floating Action Button with a custom control (and on sub item for each task type) 2015-10-09 23:13:28 +02:00
fragment_setup_avatar.xml Show setup after registration 2016-02-02 15:02:27 +01:00
fragment_setup_tasks.xml Show setup after registration 2016-02-02 15:02:27 +01:00
fragment_skills.xml Display skills 2015-11-25 18:47:56 +01:00
fragment_tasks.xml Fix floating menu button 2015-11-28 19:30:48 +01:00
fragment_tavern.xml correct events for fragments 2015-11-19 21:38:21 +01:00
habit_item_card.xml Changed to emoji-lib library which combines the other twos used before 2015-12-26 16:21:21 +01:00
login_screen.xml display link to reset password on website. 2015-12-10 02:26:31 +01:00
normal_list_preference_row.xml Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00
overlay_tutorial.xml Display tutorial messages 2016-02-02 15:02:26 +01:00
party_member.xml fixed #216 2016-01-14 14:56:59 -05:00
plain_list_item.xml display list of guilds the user is a member of 2016-02-26 12:51:06 +01:00
refresh_actionview.xml Rotate refresh icon when refreshing. Fixes #65 2015-11-25 14:04:24 +01:00
reward_item_card.xml Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
row_checklist.xml First working task creating/update form 2015-08-03 15:55:17 +02:00
row_number_picker.xml First working task creating/update form 2015-08-03 15:55:17 +02:00
simple_textview.xml Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00
simple_widget.xml change Id of a textview 2015-06-20 20:34:46 +02:00
skill_list_item.xml better display for skills 2015-11-26 21:26:53 +01:00
skill_task_item_card.xml add ability to use skills 2015-11-28 19:30:48 +01:00
task_setup_item.xml Show setup after registration 2016-02-02 15:02:27 +01:00
tavern_chat_item.xml Changed to emoji-lib library which combines the other twos used before 2015-12-26 16:21:21 +01:00
tavern_chat_new_entry_item.xml Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 2016-02-26 14:02:15 +01:00
tavern_daniel_item.xml Optimize imports - all the project 2015-11-30 20:57:50 +01:00
todo_item_card.xml Changed to emoji-lib library which combines the other twos used before 2015-12-26 16:21:21 +01:00
value_bar.xml Don't animate health bar in party member list 2016-01-25 18:09:02 +01:00