Merge branch 'release/1.6.0'

.gitignore

@@ -1,36 +1,22 @@
-#built application files
-*.apk
 *.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
+*.apk
 *.class
-
-# generated files
-bin/
-gen/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Windows thumbnail db
-Thumbs.db
-
-# OSX files
+*.dex
+*.iml
+*.local.*
+*.swp
+*.trace
+*~
 .DS_Store
-
-# Eclipse project files
 .classpath
-.project
-
-# Android Studio
-.idea
-#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
 .gradle
-build/
-*.iml
-
+.idea
+.project
+Thumbs.db
 art/
-*.actual.png
+bin/
+build/
+captures/
+docs/
+gen/
+local.properties

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+### 1.6.0 (Oct 10, 2016)
+
+* Add option to make notifications sticky
+* Add option to hide completed habits
+* Display total number of repetitions for each habit
+* Pebble integration: check/snooze habits from the watch
+* Tasker/Locale integration: allow third-party apps to add checkmarks
+* Export an unified CSV file, with checkmarks for all the habits
+* Increase width of name column according to screen size
+* Stop showing reminders for archived habits
+* Add Danish, Dutch, Greek, Hindi and Portuguese (PT) translations
+* Other minor fixes and enhancements
+
+### 1.5.6 (Jun 19, 2016)
+
+* Fix bug that prevented checkmark widget from working
+
+### 1.5.5 (Jun 19, 2016)
+
+* Fix bug that prevented check button on notification to work sometimes
+* Fix bug that caused back button to apparently erase some checkmarks
+* Complete French translation
+* Add Croatian and Slovenian translations
+
 ### 1.5.4 (May 29, 2016)
 
 * Fix crash upon opening settings screen in some phones

NOTICE.md

@@ -59,28 +59,6 @@ under the SIL OFL 1.1.
     requirement for fonts to remain under this license does not apply
     to any document created using the fonts or their derivatives.
 
-
-### DragSortListView
-
-<https://github.com/bauerca/drag-sort-listview>
-
-    A subclass of the Android ListView component that enables drag
-    and drop re-ordering of list items.
-
-    Copyright 2012 Carl Bauer
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
 ### Material Design Icons
 
 <https://github.com/google/material-design-icons>
@@ -107,4 +85,123 @@ Extended linear layout that wrap its content when there is no place in the curre
     distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
     WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
     License for the specific language governing permissions and limitations
-    under the License.
+    under the License.
+
+### Dagger 2
+
+<https://github.com/google/dagger>
+
+A fast dependency injector for Android and Java.
+
+    Copyright 2012 Square, Inc.
+    Copyright 2012 Google, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
+
+### AutoFactory
+
+<https://github.com/google/auto/tree/master/factory>
+
+A source code generator for JSR-330-compatible factories.
+
+    Copyright 2013 Google, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
+
+### Retrolambda
+
+<https://github.com/orfjackal/retrolambda>
+
+Backport of Java 8's lambda expressions to Java 7, 6 and 5
+
+    Copyright (c) 2013-2016  Esko Luontola and other Retrolambda contributors
+    This software is released under the Apache License 2.0.
+    The license text is at http://www.apache.org/licenses/LICENSE-2.0
+
+### PebbleKit SDK
+
+<https://github.com/pebble/pebble-android-sdk/>
+
+Android PebbleKit SDK to talk to the Pebble via Bluetooth
+
+    The MIT License (MIT)
+    Copyright (c) 2014 - 2015 Pebble Technology
+
+### AppIntro
+
+<https://github.com/PaoloRotolo/AppIntro>
+
+Make a cool intro for your Android app.
+
+	Copyright 2015 Paolo Rotolo
+	Copyright 2016 Maximilian Narr
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	   http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+
+### ButterKnife
+
+<https://github.com/JakeWharton/butterknife>
+
+Bind Android views and callbacks to fields and methods
+
+	Copyright 2013 Jake Wharton
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	   http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+
+### opencsv
+
+<http://opencsv.sourceforge.net/>
+
+Opencsv is a very simple csv (comma-separated values) parser library for Java.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	   http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.

README.md

@@ -1,10 +1,13 @@
 # Loop Habit Tracker
+
 <a href="https://circleci.com/gh/iSoron/uhabits/tree/dev">
   <img src="https://img.shields.io/circleci/project/iSoron/uhabits/dev.svg">
 </a>
+<!--
 <a href="https://codecov.io/github/iSoron/uhabits?branch=dev">
   <img src="https://img.shields.io/codecov/c/github/iSoron/uhabits.svg" alt="Coverage via Codecov" />
 </a>
+-->
 
 Loop is a simple Android app that helps you create and maintain good habits,
 allowing you to achieve your long-term goals. Detailed graphs and statistics
@@ -16,6 +19,15 @@ source.
 <a href="http://f-droid.org/app/org.isoron.uhabits"><img alt="Git if on F-Droid" src="http://i.imgur.com/baSPE7X.png" height="75px"/></a>
 </p>
 
+## Screenshots
+
+[![Main screen][screen1th]][screen1]
+[![Edit habit][screen2th]][screen2]
+[![Habit strength][screen3th]][screen3]
+[![Habit history and streaks][screen4th]][screen4]
+[![Widgets][screen5th]][screen5]
+[![Night mode][screen6th]][screen6]
+
 ## Features
 
 * **Simple, beautiful and modern interface.** Loop has a minimalistic interface
@@ -47,21 +59,12 @@ source.
   and there will never be. The complete source code is available under the
   GPLv3.
 
-## Screenshots
-
-[![Main screen][screen1th]][screen1]
-[![Edit habit][screen2th]][screen2]
-[![Habit strength][screen3th]][screen3]
-[![Habit history and streaks][screen4th]][screen4]
-[![Widgets][screen5th]][screen5]
-[![Night mode][screen6th]][screen6]
-
 ## Installing
 
 The easiest way to install Loop is through the [Google Play Store][playstore] or [F-Droid][fdroid].
 You may also download and install the APK from the [releases page][releases];
 note, however, that the app will not be updated automatically.  To build this
-app from the source code, see [building instructions][build].
+app from the source code, see [build instructions][build].
 
 ## Contributing
 
@@ -89,18 +92,22 @@ contribute, even if you are not a software developer.
 
 ## License
 
-    This program is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the Free
-    Software Foundation, either version 3 of the License, or (at your option)
-    any later version.
+<img align="right" src="https://www.gnu.org/graphics/gplv3-88x31.png">
+
+	Copyright (C) 2016 Álinson Santos Xavier <[email protected]>
+
+	Loop Habit Tracker is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by the
+	Free Software Foundation, either version 3 of the License, or (at your
+	option) any later version.
 
-    This program is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-    more details.
+	Loop Habit Tracker is distributed in the hope that it will be useful, but
+	WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+	or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+	more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License along
+	with this program. If not, see <http://www.gnu.org/licenses/>.
 
 [screen1]: screenshots/original/uhabits1.png
 [screen2]: screenshots/original/uhabits2.png