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
5753 commits 3 branches 1 tag 142 MiB
Commit graph

5753 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michal
0e76722406 Minor clean ups 2015-12-21 23:55:44 +01:00
Michal
79b2a82904 Merge branch 'develop' into refactor 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
	Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
 2015-12-21 23:43:43 +01:00
Michal
f40e00f0c1 General MainActivity clean-up. Still needs more work 2015-12-21 23:37:41 +01:00
Michal
616b5a179f Move Snackbars logic to UiUtils 2015-12-21 23:20:02 +01:00
Data5tream
f60d77f392 If timeval == null a default value is used for the string 2015-12-21 22:46:13 +01:00
Data5tream
0a8469b33a Fixed notifications showing up every time MainActivity is called 2015-12-21 22:38:51 +01:00
Data5tream
bb14e23161 Removed unused variable 2015-12-21 22:25:04 +01:00
Michal Drabik
aeedce27fb Merge pull request #1 from HabitRPG/develop 
Update from original
 2015-12-21 22:17:34 +01:00
Data5tream
354900d0b3 Moved getNotification to NotificationPublisher 2015-12-21 21:59:35 +01:00
Negue
c0cc03b5fd update changelog & change the position of notes in changelog 2015-12-21 20:38:55 +01:00
Michal
762b8fc9c3 Move Crashlytics initialization to HabiticaApplication 2015-12-21 20:33:03 +01:00
Michal
9efca38c35 Create BaseActivity and move setContentView and ButterKnife logic 2015-12-21 20:31:41 +01:00
Darron Lumley
de9432404e added touch delegate to checkbox on daily/todo items. 2015-12-21 20:25:44 +01:00
Darron Lumley
20e8af1c97 removed references to checkbox holder in daily/todo items 2015-12-21 20:25:44 +01:00
Darron Lumley
b5165752df Made the relativelayout holder of the task checkbox react to click events 2015-12-21 20:25:44 +01:00
Negue
433bebf109 fixes #329 & fixes #162 2015-12-21 20:24:39 +01:00
Michal
c005c64f39 Move activities to /ui/activities package 2015-12-21 20:19:51 +01:00
Michal
2bd46a42aa Move 'dismissKeyboard()' to UiUtils class. 2015-12-21 20:16:27 +01:00
Phillip Thelen
665d19bd1a Merge pull request #335 from Data5tream/butterknife_refraction 
Butterknife refraction
 2015-12-21 20:11:44 +01:00
Phillip Thelen
f13f2f98cb Merge pull request #322 from dlew/dlew/exists 
Fixed HabiticaApplication.exists()
 2015-12-21 20:09:47 +01:00
Michal
4c34e72fe3 Clean up HabiticaApplication 2015-12-21 20:08:24 +01:00
Michal
542ac42738 Change static 'Instance' field to 'getInstance()' in HabiticaApplication 2015-12-21 20:03:57 +01:00
Negue
9aa0aee5af fixes #278 - NPE likes was null 2015-12-21 19:13:05 +01:00
Negue
a871b3f1a5 fixes NPE- MainActivity user 2015-12-21 18:59:08 +01:00
Negue
115f56111c first draft of the changelog 2015-12-21 18:50:40 +01:00
Negue
0a141d0679 fix NPE ChatListFragment 2015-12-21 18:50:26 +01:00
Negue
5b854e8f5c fixes #263 - it couldn't get the values of deserialization 2015-12-21 18:24:55 +01:00
Negue
19a136e8e2 fixes #318 - NPE on List.addAll 2015-12-21 18:07:35 +01:00
Data5tream
70c6936d9d Removed todo comment 2015-12-21 16:34:25 +01:00
Data5tream
85e64c9baf Butterknife in LoginActivity 2015-12-21 16:30:31 +01:00
Data5tream
c0df4d4181 Butterknife in TaskFormActivity 2015-12-21 16:09:37 +01:00
negue
69a1a006cd Merge pull request #326 from Data5tream/nomedia 
Created createNomedia method
 2015-12-20 15:33:29 +01:00
negue
2d213018a3 Merge pull request #323 from dlew/dlew/logs 
Minor improvements to logging
 2015-12-20 15:32:37 +01:00
negue
01cbc612a2 Merge pull request #313 from farsidesoul/hideFABOnScroll 
Hide FloatingActionButton on scroll
 2015-12-20 15:29:17 +01:00
Data5tream
9e191a2646 Created createNomedia method 2015-12-20 13:29:08 +01:00
Dan Lew
8b017acec9 Simplified logging logic 
Throwing an exception just to log its message makes no sense...
 2015-12-18 06:47:15 -06:00
Dan Lew
84cb69d170 Fixed up logging of Exceptions 
Added stack traces to the logs, which helps for debugging.
 2015-12-18 06:46:54 -06:00
Dan Lew
5da955275b Fixed HabiticaApplication.exists() 
It always returned `false` because it was targeting the wrong file.
 2015-12-18 06:31:01 -06:00
Darron Lumley
08fced059c Added a slide in and out animation to FAB when scrolling 2015-12-18 21:21:05 +11:00
negue
1868103380 Merge pull request #317 from gitter-badger/gitter-badge 
Add a Gitter chat badge to README.md
 2015-12-17 18:53:26 +01:00
Phillip Thelen
9c3d3b962a Merge pull request #316 from dlew/dlew/quest-display 
Fixed/improved quest display
 2015-12-17 15:44:04 +01:00
The Gitter Badger
403efe05a9 Add Gitter badge 2015-12-17 14:30:51 +00:00
Phillip Thelen
d4c2fc6beb Merge pull request #315 from dlew/dlew/fix-npe 
Fixed accidentally introduced potential NPE
 2015-12-17 15:26:28 +01:00
Phillip Thelen
6660e83af2 Merge pull request #305 from ianrumac/update/butterknife 
Updated butterknife dependency and unbinded fragment views
 2015-12-17 15:21:25 +01:00
Dan Lew
eebc7fc91c Extracted string resource for "Quest" 2015-12-17 07:01:52 -06:00
Dan Lew
82fcc5c95d Greatly simplified quset description layout 
The GridLayout was completely unnecessary
 2015-12-17 07:01:52 -06:00
Dan Lew
9f5c219605 Dynamically size quest image based on presence 
If it's there, it's 128dp x 128dp. If it's not, the ImageView is basically
hidden.
 2015-12-17 07:01:52 -06:00
Dan Lew
888e0b7cfa HTML-format quest text 
Some quests use HTML, this will automatically format it.
 2015-12-17 07:01:52 -06:00
Ian Rumac
3f2567f317 Fixed merge conflicts and updated to development version 2015-12-17 13:58:35 +01:00
Dan Lew
8c983bb7e6 Fixed accidentally introduced potential NPE 
This can occur when loading an image where one of the layers doesn't load
correctly.
 2015-12-17 06:39:21 -06:00