Commit Graph

86 Commits

Author SHA1 Message Date
Alinson S Xavier
87f069f986 Merge branch 'master' into dev 2018-06-04 19:57:02 -05:00
Alinson Xavier
bf8c14fc03 Fix reminder tests 2017-12-06 22:23:28 -06:00
Alinson Xavier
b46b7aae25 Merge branch 'feature/custom-snooze' into dev 2017-12-06 21:42:04 -06:00
Alinson Xavier
7f257e045b MemoryHabitList: iterate over a copy of the list 2017-12-04 23:13:31 -06:00
Alinson Xavier
0dc46d02a4 Minor style changes 2017-11-15 21:54:30 -06:00
Alinson Xavier
ecf3086aef Merge branch 'add-delete-button-to-stats' of git://github.com/derebaba/uhabits into pull/delete-button 2017-11-15 21:42:30 -06:00
derebaba
10be875b48 Fixed test 2017-11-15 10:57:00 +03:00
Alinson Xavier
e91f1c3fa4 Merge branch 'dev' into feature/custom-snooze 2017-11-14 22:20:32 -06:00
Alinson Xavier
9d48b4bcdb Simplify code; change notification actions to Yes/No/Later 2017-11-14 22:07:52 -06:00
Alinson Xavier
7f1a35ebe5 Merge branch 'dev' of git://github.com/rsri/uhabits into pull/cancel_notification 2017-11-14 21:54:16 -06:00
derebaba
1edd76ae8c Added delete button to statistics screen 2017-11-02 14:21:27 +03:00
Luboš Luňák
b1c2ab90d3 synchronize HabitList properly
When the app is not running and ReminderReceiver receives ACTION_SHOW_REMINDER,
the (SQLite)HabitList will start loading its data in the background for some
reason, and if the loading takes a moment, ReminderReceiver will call
the unsynchronized HabitList.getById() before the loading finishes,
failing to find the habit for which to show the notification.
2017-10-18 15:17:31 +02:00
Alinson Xavier
a201273781 Refactoring 2017-10-10 21:31:31 -05:00
Alinson Xavier
07c7234bfc Merge branch 'master' into dev 2017-09-30 13:40:09 -05:00
Luboš Luňák
e052a144bd fix testTruncate_dayOfWeek failing with some locales 2017-09-28 06:55:13 -05:00
Luboš Luňák
318caa886c fix csv export with locales that do not use dot as decimal separator 2017-09-28 06:55:13 -05:00
Luboš Luňák
46c61f9ea9 force US locale for tests 2017-09-28 06:55:13 -05:00
Luboš Luňák
f8e0d07236 avoid sql error when updating sql database
The index doesn't exist in version 1.7.6 and so trying to drop it
would lead to an error, resulting in not being able to import
1.7.6 database.
https://github.com/iSoron/uhabits/issues/327
2017-09-16 19:35:50 +02:00
Alinson Xavier
52c4282601 Merge pull request #329 from llunak/fix_snooze
fix snooze button in notifications
2017-09-13 07:03:46 -05:00
Luboš Luňák
f52da56221 fix snooze button in notifications
The "pref_snooze_interval" preference is manipulated by the ListPreference
class, which according to its docs stores the preference as a string.
Without reverting this part of 864636705d,
this results in "java.lang.ClassCastException: java.lang.String cannot be
cast to java.lang.Long" when trying to snooze a notification.
2017-09-12 15:54:43 +02:00
Luboš Luňák
4d59783809 make LED blinking for notifications configurable 2017-09-11 15:18:42 +02:00
srikanth r
e041d9041b Implemented cancel to reminders of habits. 2017-08-04 23:01:41 +05:30
Alinson Xavier
a75a27ad42 Make the day start at 3am instead of midnight
Closes #50
2017-07-25 20:18:01 -04:00
Alinson Xavier
b135aa09a3 Use more simple toString style 2017-07-24 12:14:48 -04:00
Alinson Xavier
f3a64fd67a Add tests for equals, hashCode and toString 2017-07-24 11:41:12 -04:00
Alinson Xavier
864636705d Implement tests for Preferences 2017-07-24 09:54:51 -04:00
Alinson Xavier
87f1d635d8 Implement PropertiesStorage 2017-07-23 20:07:44 -04:00
Alinson Xavier
fdcb9daadc LoopDBImporter: update table names 2017-07-23 17:26:08 -04:00
Alinson Xavier
89400e281e Move version numbers from build.gradle to gradle.properties 2017-07-23 10:03:09 -04:00
Alinson Xavier
57dc19550d Fix errors 2017-07-22 20:05:01 -04:00
Alinson Xavier
a8aa6f192c Replace Long by Timestamp 2017-07-22 16:29:08 -04:00
Alinson Xavier
882ddba324 Fix acceptance tests 2017-07-22 09:28:30 -04:00
Alinson Xavier
180c18f6bf Merge branch 'feature/kotlin' into dev 2017-07-21 18:12:45 -04:00
Alinson Xavier
2db4c06fe8 Merge branch 'master' into dev
# Conflicts:
#	app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
#	app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
#	app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
#	uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
#	uhabits-android/src/main/res/values-id/strings.xml
#	uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
2017-07-18 22:54:52 -04:00
Alinson Xavier
0984f7ff5d Update Android gradle plugin 2017-07-18 06:57:22 -04:00
Alinson Xavier
bb282da92d Fix tests 2017-06-23 16:25:25 -04:00
Alinson Xavier
38d3b0d047 Update habit.position after reordering list 2017-06-23 12:12:23 -04:00
Alinson Xavier
8ccada67d6 Import Loop DB without app restart 2017-06-23 10:24:54 -04:00
Alinson Xavier
33f7acc9ca Add reordering tests for SQLiteHabitList 2017-06-23 09:29:19 -04:00
Alinson Xavier
5d9563b9d8 Fix handling of null values in AndroidDatabase 2017-06-23 09:14:36 -04:00
Alinson Xavier
f55dc0d811 Fix animation when card moves and updates simultaneously 2017-06-22 23:31:46 -04:00
Alinson Xavier
7872983064 Fix order by position 2017-06-22 23:21:44 -04:00
Alinson Xavier
ea640a8a17 Rebuild order after removing habit 2017-06-22 22:50:27 -04:00
Alinson Xavier
6801d1d1ae Add more constraints on table Repetitions 2017-06-21 13:18:29 -04:00
Alinson Xavier
3584affbe0 Move BaseUnitTest 2017-06-21 10:20:59 -04:00
Alinson Xavier
1069fcfc62 Move importers to uhabits-core 2017-06-21 00:30:32 -04:00
Alinson Xavier
59745fb90f Refactor Android database classes 2017-06-20 22:37:35 -04:00
Alinson Xavier
1976160ae8 Move tests to uhabits-core 2017-06-20 22:20:46 -04:00
Alinson Xavier
6dd7e49112 Move database migrations to uhabits-core 2017-06-20 21:46:30 -04:00
Alinson Xavier
ecb5352134 Implement JDBC database 2017-06-20 14:13:37 -04:00