Merge branch 'feature/konfetti' into dev

Bumps `daggerVersion` from 2.50 to 2.51.1.

Updates `com.google.dagger:dagger` from 2.50 to 2.51.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.50...dagger-2.51.1)

Updates `com.google.dagger:dagger-compiler` from 2.50 to 2.51.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.50...dagger-2.51.1)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Report something broken in the app
+title: ''
+labels: ''
+assignees: ''
+
+---
+<!--
+Please use the template below for your bug report. Issues that do not follow this
+template, or that do not contain all necessary information (namely, description of
+the problem, steps to reproduce, phone, phone operating system, and app version)
+will be closed without further consideration.
+-->
+
+## Pre-submission checklist
+- [ ] I am submitting a bug report, not a feature request.
+- [ ] I have searched for similar issues, but did not find any matches.
+
+## Description
+A clear and concise description of what the problem is.
+
+## Steps to reproduce
+1. Go to ...
+2. Click on ....
+3. Scroll down to ....
+4. See error
+
+## System information
+ - Phone: [e.g. Google Pixel 4]
+ - Phone Operating System: [e.g. Android 10]
+ - App version: [e.g. 2.0.2]
+
+## Screenshots
+If applicable, add screenshots to help explain your problem.
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature requests
+    url: https://github.com/iSoron/uhabits/discussions/categories/feature-requests?discussions_q=category%3A%22Feature+Requests%22+sort%3Atop
+    about:  Submit ideas for new features and for improving existing features
+  - name: Help & FAQ
+    url: https://github.com/iSoron/uhabits/discussions/categories/help-faq
+    about:  Ask questions about using the app or setting up the project

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/main.yml

@@ -0,0 +1,31 @@
+name: Build & Test
+on:
+  pull_request:
+    paths-ignore:
+    - '**.md'
+  push:
+    paths-ignore:
+    - '**.md'
+jobs:
+  Test:
+    runs-on: self-hosted
+    timeout-minutes: 30
+    steps:
+    - name: Check out source code
+      uses: actions/checkout@v4
+
+    - name: Build project
+      run: ./build.sh build
+
+    - name: Run Android tests
+      run: ./build.sh android-tests-parallel 28 29 30 32 33 34
+
+    - name: Upload artifacts
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: build
+        path: |
+          build/*log
+          uhabits-android/build/outputs
+

.gitignore

@@ -1,33 +1,20 @@
-#built application files
-*.apk
-*.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Windows thumbnail db
-Thumbs.db
-
-# OSX files
-.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
+*.pbxuser
+*.perspective
+*.perspectivev3
+*.swp
+*~.nib
+*.hprof
+.DS_Store
+._.DS_Store
+.externalNativeBuild
+.gradle
+.idea
+.secret
+build
+local.properties
+node_modules
+*xcuserdata*
+*.sketch
+crowdin.yml
+kotlin-js-store

CHANGELOG.md

@@ -0,0 +1,372 @@
+# Changelog
+
+## [2.2.0] -- 2024-01-30
+### Added
+- Add support for Android 14 (@iSoron, @hiqua)
+- Allow user to change app language (@leondzn)
+
+### Fixed
+- Implement workaround to make notifications non-dismissible in Android 14 (@iSoron, #1872)
+- Fix splash screen background color in dark mode (@SIKV, #1888)
+
+## [2.1.3] -- 2023-08-28
+### Fixed
+- Use text input on Samsung devices (@iSoron, #1719)
+- Prevent crash if alarm permission is revoked (@iSoron)
+- Adjust widget colors (@iSoron)
+- Fix bug preventing screens from updating at midnight (@iSoron)
+- Fix skip button in locales that use comma instead of dot (@iSoron, #1721)
+
+## [2.1.2] -- 2023-05-26
+### Fixed
+- Fix bug that caused widget to enter checkmark on wrong date (@iSoron, #1541)
+- Fix widget corners on Android 12 (@iSoron)
+- Fix bug that caused notes to be lost when editing a checkmark (@iSoron, #1566)
+- Prevent soft keyboard from covering entry popup (@iSoron)
+- Accept comma (instead of dot) in certain locales (@iSoron)
+
+### Changed
+- Remove update delay after entering a checkmark (@iSoron)
+
+### Removed
+- Remove stack widgets (@iSoron)
+
+
+## [2.1.1] -- 2022-09-24
+### Fixed
+- Fix Tasker plugin (@iSoron, #1503)
+
+## [2.1.0] -- 2022-09-10
+### Added
+- Allow user to add notes to specific dates (@vbh, #1103)
+- Allow user to track "at most" numerical habits (@KristianTashkov, #1101)
+- Allow user to add skips to measurable habits (@kalina559, #1319)
+- Bring back custom frequencies (x times in y days) (@hiqua, #1079)
+- Improve number picker (@hiqua, @iSoron, #1082, #1370)
+- Add new checkmark and number picker (@iSoron, #1370)
+- Allow user to import numerical habits from HabitBull (@hiqua, #1278)
+- Add support for Android 13 themed icons (@cheeeeer, #1497)
+
+### Removed
+- Hide snooze button Android 12 notifications (@hiqua, #1226)
+- Remove preference to set LED lights (@iSoron)
+
+### Changed
+- Hide failed habits along with completed ones (@hiqua, #1052)
+- Cycle through all checkmark states when toggling (@iSoron)
+- Add delay after toggling a habit (@hiqua, @kalina559, #1147)
+- Small theme improvements (@KristianTashkov, #1113)
+- Left-align habit notes (@iSoron)
+- Increase target SDK to 31 (@hiqua)
+
+### Fixed
+- Fix small dialog buttons (@kalina559, #1096)
+- Fix invalid CSV files (@hiqua, #1177)
+- Fix small issues in calendar chart (@kalina559, #1314)
+- Resort habit list after edit (@hiqua, #1350)
+- Fix marker scaling in frequency display (@eduebernal, #1425)
+- Fix widgets not working correctly on API 33 (@iSoron, #1488)
+
+### Refactoring & Testing
+- Replace raster icons by vector assets (@kalina559)
+- Remove JVM dependencies from uhabits-core module (@sgallese)
+- Add various missing tests (@sgallese)
+- Upgrade project dependencies (@hiqua, @sgallese)
+
+## [2.0.3] - 2021-08-21
+### Fixed
+- Improve automatic checkmarks for monthly habits (@iSoron, #947)
+- Fix small theme issues (@iSoron)
+- Fix ANR on some Samsung phones (@iSoron, #962)
+- Fix dates before the year 2000 (@iSoron, #967)
+- Fix notification adding checkmarks to the wrong day (@hiqua, #969)
+- Fix crashes in widgets (@hiqua, @iSoron, #907, #966, #965)
+- Fix crash when moving habits (@hiqua, #968)
+
+## [2.0.2] - 2021-05-23
+
+### Changed
+- Make checkmark widget resizable
+
+### Fixed
+- Fix crash caused by numerical habits with zero target (@iSoron, #903)
+- Fix small issues with font size (@iSoron)
+- Allow fractional target values (@sumanabhi, #911)
+- Fix IllegalStateException in androidx.customview.view (@iSoron, #906)
+- Fix crash when selecting habit frequency in some languages (@iSoron, #926)
+- Fix IllegalArgumentException in RingView (@iSoron, #904)
+
+## [2.0.1] - 2021-05-09
+
+### Added
+- Make midnight delay optional and disabled by default (@hiqua)
+- Add arrows to sort menu (@iSoron) 
+
+### Removed
+- Temporarily remove experimental device sync functionality. This feature will be re-added in
+  Loop 2.1.
+
+### Changed
+- Make implicit checkmarks easier to read (@iSoron)
+- Update and improve list of translators (@hiqua, @iSoron)
+
+### Fixed
+- Disable transparency for stacked widgets (@hiqua)
+- Fix various color issues on the dark theme (@hiqua, @iSoron)
+- Fix "customize notifications" on older devices (@hiqua)
+- Fix snooze button in notifications when device is locked (@hiqua)
+- Fix a crash when deleting habits (@engineering4good)
+- Fix checkmark widget not rendering properly on some Samsung phones (@iSoron)
+
+### Refactoring & Testing
+- Finish conversion of the entire project to Kotlin (@hiqua, @iSoron, @MarKco)
+- Automatically run large tests on GitHub Actions (@iSoron)
+- Remove unused v21 resources (@hiqua)
+
+## [2.0.0-alpha] - 2020-11-29
+
+### Added
+- Track numeric habits (@iSoron, @namnl)
+- Skip days without breaking streak (@KristianTashkov)
+- Sort habits by status (@hiqua)
+- Sort habits in reverse order (@iSoron)
+- Add notes to habits (@recheej)
+- Improve readibility of charts (@chennemann)
+- Delay new day until 3am (@KristianTashkov)
+- Export backups daily (@iSoron)
+
+### Removed
+- Drop support to devices older than Android 6.0 (API 23)
+
+### Fixed
+- Reset chart offset when switching scale (@alxmjo)
+- Don't show reminders from archived habits (@KristianTashkov)
+- Lapses on non-daily habits decrease the score too much (@iSoron)
+- Update widgets at midnight (@KristianTashkov)
+
+### Refactoring
+- Convert files to Kotlin (@olegivo)
+
+## [1.8.12] - 2021-01-30
+
+- Fix bug that caused incorrect check marks to show after scrolling (#713)
+- Fix issue preventing widgets from updating at midnight (#680)
+
+## [1.8.11] - 2020-12-29
+
+- Fix theme issues on Xiaomi phones
+
+## [1.8.10] - 2020-11-26
+
+- Update translations
+
+## [1.8.9] - 2020-11-18
+
+- Manage exceptions when activities don't exist to handle intents (#181)
+- MemoryHabitList: Inherit parent's order (#598)
+- Remove notification groups; revert to default system behavior
+- Remove SyncManager and Internet permission
+
+## [1.8.8] - 2020-06-21
+
+- Make small changes to the habit scheduling algorithm, so that "1 time every x days" habits work more predictably.
+- Fix crash when saving habit
+
+## [1.8.0] - 2020-01-01
+
+- New bar chart showing number of repetitions performed in each week, month, quarter or year.
+- Improved calculation of streaks for non-daily habits: performing habits on irregular weekdays will no longer break your streak.
+- Many more colors to choose from (now 20 in total).
+- Ability to customize how transparent the widgets are on your home screen.
+- Ability to customize the first day of the week.
+- Yes/No buttons on notifications, instead of just "Check".
+- Automatic dark theme according to phone settings (Android 10).
+- Smaller APK and backup files.
+- Many other internal code changes improving performance and stability.
+
+## [1.7.11] - 2019-08-10
+
+- Fix bug that produced corrupted CSV files in some countries
+
+## [1.7.10] - 2019-06-15
+
+- Fix bug that prevented some devices from showing notifications.
+- Update targetSdk to Android Pie (API level 28)
+
+## [1.7.8] - 2018-04-21
+
+- Add support for adaptive icons (Oreo)
+- Add support for notification channels (Oreo)
+- Update translations
+
+## [1.7.7] - 2017-09-30
+
+- Fix bug that caused reminders to show repeatedly on DST changes
+
+## [1.7.6] - 2017-07-18
+
+- Fix bug that caused widgets not to render sometimes
+- Fix other minor bugs
+- Update translations
+
+## [1.7.3] - 2017-05-30
+
+- Improve performance of 'sort by score'
+- Other minor bug fixes
+
+## [1.7.2] - 2017-05-27
+
+- Fix crash at startup
+
+## [1.7.1] - 2017-05-21
+
+- Fix crash (BadParcelableException)
+- Fix layout for RTL languages such as Arabic
+- Automatically detect and reject invalid database files
+- Add Hebrew translation
+
+## [1.7.0] - 2017-03-31
+
+- Sort habits automatically
+- Allow swiping the header to see previous days
+- Import backups directly from Google Drive or Dropbox
+- Refresh data automatically at midnight
+- Other minor bug fixes and enhancements
+
+## [1.6.2] - 2016-10-13
+
+- Fix crash on Android 4.1
+
+## [1.6.1] - 2016-10-10
+
+- Fix a crash at startup when database is corrupted
+
+## [1.6.0] - 2016-10-10
+
+- 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] - 2016-06-19
+
+- Fix bug that prevented checkmark widget from working
+
+## [1.5.5] - 2016-06-19
+
+- 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] - 2016-05-29
+
+- Fix crash upon opening settings screen in some phones
+- Fix missing folders in CSV archive
+- Add Serbian translation
+
+## [1.5.3] - 2016-05-22
+
+- Complete Arabic and Czech translations
+- Fix crash at startup
+- Fix checkmark widget on custom launchers
+
+## [1.5.2] - 2016-05-19
+
+- Fix missing attachment on bug reports
+- Fix bug that prevents some widgets from rendering
+- Complete Japanese translation
+
+## [1.5.1] - 2016-05-17
+
+- Fix build on F-Droid
+
+## [1.5.0] - 2016-05-15
+
+- Add night mode, with AMOLED support
+- Backport material design to older devices
+- Display more information on statistics screen
+- Display score on main screen and checkmark widget
+- Make widgets react immediately to touch
+- Reschedule reminders after reboot
+- Pick first day of the week according to country
+- Add option to reverse order of days on main screen
+- Add option to change notification sounds
+- Add Catalan, Indonesian, Turkish, Ukrainian translations
+- Switch between Simplified/Traditional Chinese according to country
+
+## [1.4.1] - 2016-04-09
+
+- Show error message on widgets, instead of crashing
+- Complete French translation
+- Minor fixes to other translations
+
+## [1.4.0] - 2016-04-07
+
+- Ability to import data from third-party apps
+- Ability to save and restore full database backup
+- Show more information on streak chart
+- Simplify interface for creating habits
+- Add link to Frequently Asked Questions (FAQ)
+- Reduce app loading time and lag on widgets
+- Generate bug reports on crash and from settings screen
+- Disable vibration according to phone settings
+- Add Czech translation
+- Fix wrong month names for some languages
+
+## [1.3.3] - 2016-03-20
+
+- Add Spanish and Korean translations
+- Make small corrections to other translations
+- Fix incorrect date in history calendar
+
+## [1.3.2] - 2016-03-18
+
+- Add Arabic, Italian, Polish, Russian and Swedish translations
+- Minor fixes to German and French translations
+- Minor bug fixes
+
+## [1.3.1] - 2016-03-15
+
+- Fixes crash on devices with large screen, such as the Nexus 10
+- Fixes crash when clicking widgets and reminders of deleted habits
+- Other minor bug fixes
+
+## [1.3.0] - 2016-03-12
+
+- New frequency plot: view total repetitions per day of week
+- New history editor: put checkmarks in the past
+- Add German, French and Japanese translations
+- Add about screen, with credits to all contributors
+- Fix small bug that prevented habit from being reordered
+- Fix small bug caused by rotating the device
+
+## [1.2.0] - 2016-03-04
+
+- Ability to export habit data as CSV
+- Widgets (checkmark, history, score and streaks)
+- More natural scrolling on data views (fling)
+- Minor UI improvements on pre-Lollipop devices
+- Fix crash on Samsung Galaxy TabS 8.4
+- Other minor bug fixes
+
+## [1.1.1] - 2016-02-24
+
+- Show reminder only on chosen days of the week
+- Rearrange habits by long-pressing then dragging
+- Select and modify multiple habits simultaneously
+- 12/24 hour format according to phone preferences
+- Permanently delete habits
+- Usage hints during startup
+- Translation to Brazilian Portuguese and Chinese
+- Other minor fixes
+
+## [1.0.0] - 2016-02-19
+
+- Initial release

NOTICE.md

@@ -0,0 +1,207 @@
+# Copyright Notices
+
+### ActiveAndroid
+
+<https://github.com/pardom/ActiveAndroid>
+
+    Copyright (C) 2010 Michael Pardo
+
+    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.
+
+### Android Open Source Project
+
+<https://source.android.com/>
+
+    Copyright (C) 2013 The Android Open Source Project
+
+    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.
+
+### FontAwesome
+
+<http://fontawesome.io>
+
+Font Awesome is a full suite of 605 pictographic icons for easy scalable
+vector graphics on websites, created and maintained by Dave Gandy. Licensed
+under the SIL OFL 1.1.
+
+    The goals of the Open Font License (OFL) are to stimulate worldwide
+    development of collaborative font projects, to support the font creation
+    efforts of academic and linguistic communities, and to provide a free and
+    open framework in which fonts may be shared and improved in partnership
+    with others.
+
+    The OFL allows the licensed fonts to be used, studied, modified and
+    redistributed freely as long as they are not sold by themselves. The
+    fonts, including any derivative works, can be bundled, embedded,
+    redistributed and/or sold with any software provided that any reserved
+    names are not used by derivative works. The fonts and derivatives,
+    however, cannot be released under any other type of license. The
+    requirement for fonts to remain under this license does not apply
+    to any document created using the fonts or their derivatives.
+
+### Material Design Icons
+
+<https://github.com/google/material-design-icons>
+
+Material design icons are the official icon set from Google that are designed
+under the material design guidelines. Available under the Creative Common
+Attribution 4.0 International License (CC-BY 4.0).
+
+### Android Flow Layout
+
+<https://github.com/ApmeM/android-flowlayout>
+
+Extended linear layout that wrap its content when there is no place in the current line.
+
+    Copyright 2011, Artem Votincev (apmem.org)
+
+    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.
+
+### 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,17 +1,25 @@
-# Habits Tracker
+<h1 align="center">Loop Habit Tracker</h1>
+<p align="center">
+  <a href="https://github.com/iSoron/uhabits/actions?query=workflow%3A%22Build+%26+Test%22">
+    <img src="https://github.com/iSoron/uhabits/workflows/Build%20&%20Test/badge.svg" />
+  </a>
+  <a href="https://github.com/iSoron/uhabits/releases/latest">
+    <img src="https://img.shields.io/github/v/release/iSoron/uhabits" />
+  </a>
+  <a href="https://github.com/iSoron/uhabits/discussions">
+    <img src="https://img.shields.io/badge/GitHub-Discussions-%23fc4ebc" />
+  </a>
+</p>
 
-Habits Tracker is a simple Android app that helps you create and maintain good habits. Detailed graphs and statistics show you how your habits improved over time. It is completely ad-free and open source, with no intrusive permissions. Join the open beta at [Google Play Store](https://play.google.com/apps/testing/org.isoron.uhabits).
+Loop is a mobile app that helps you create and maintain good habits,
+allowing you to achieve your long-term goals. Detailed graphs and statistics
+show you how your habits improved over time. It is completely ad-free and open
+source.
 
-
-## Features
-
-* Simple and beautiful interface, following the Material Design guidelines.
-* Advanced algorithms for calculating the strength of your habits. Every repetition makes your habit stronger, and every missed day makes it weaker. A few missed days after a long streak, however, will not completely destroy your entire progress.
-* Detailed graphs and statistics, showing how did you habits improve over time. Scroll back to see the complete history of your habit.
-* Support for both daily habits and habits with more complex schedules, such as 3 times every week; one time every other week; or every other day.
-* Habit reminders at a chosen hour of the day.
-* Support for Android Wear. Reminders can be checked or dismissed from the watch.
-* Completely ad-free and open source. There are absolutely no advertisements, annoying notifications or intrusive permissions in this app, and there will never be. The complete source code is available under the GPLv3.
+<p align="center">
+  <a href="https://play.google.com/store/apps/details?id=org.isoron.uhabits&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-AC-global-none-all-co-pr-py-PartBadges-Oct1515-1"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="80px"/></a>
+  <a href="https://f-droid.org/app/org.isoron.uhabits"><img alt="Get it on F-Droid" src="https://f-droid.org/badge/get-it-on.png" height="80px"/></a>
+</p>
 
 ## Screenshots
 
@@ -19,12 +27,105 @@ Habits Tracker is a simple Android app that helps you create and maintain good h
 [![Edit habit][screen2th]][screen2]
 [![Habit strength][screen3th]][screen3]
 [![Habit history and streaks][screen4th]][screen4]
+[![Widgets][screen5th]][screen5]
+[![Night mode][screen6th]][screen6]
 
-[screen1]: screenshots/original/uhabits1.png
-[screen2]: screenshots/original/uhabits2.png
-[screen3]: screenshots/original/uhabits3.png
-[screen4]: screenshots/original/uhabits4.png
-[screen1th]: screenshots/thumbs/uhabits1.png
-[screen2th]: screenshots/thumbs/uhabits2.png
-[screen3th]: screenshots/thumbs/uhabits3.png
-[screen4th]: screenshots/thumbs/uhabits4.png
+## Features
+
+* <b>Beautiful, minimalistic and lightweight interface.</b>
+Loop has an elegant and minimalistic interface that is very easy to use, even for first-time users. Highly optimized for speed, the app works well even on older phones.
+
+* <b>Habit score.</b>
+Loop has an advanced formula for calculating the strength of your habits. Every repetition makes your habit stronger and every missed day makes it weaker. A few missed days after a long streak, however, will not completely destroy your progress, unlike many other don't-break-the-chain apps.
+
+* <b>Flexible schedules.</b>
+In addition to daily habits, Loop supports habits with more complex schedules, such as 3 times per week or every other day.
+
+* <b>Reminders.</b>
+Schedule notifications to remind you of your habits. Each habit can have its own reminder, at a chosen time of the day. Easily check or dismiss your habit directly from the notification.
+
+* <b>Widgets.</b>
+Be reminded of your habits whenever you unlock your phone. Colorful widgets allow you to track your habits directly from your home screen, without even opening the app.
+
+* <b>Take control of your data.</b>
+If you want to further analyze your data, or move it to another service, Loop allows you to export it to spreadsheets (CSV) or to a database file (SQLite). For power users, checkmarks can be added through other apps, such as Tasker.
+
+* <b>No limitations.</b>
+Track as many habits as you wish. Loop imposes no artificial limits on how many habits you can have. All features are available to all users. There are no in-app purchases.
+
+* <b>Completely ad-free and open source.</b>
+There are no advertisements, annoying notifications or intrusive permissions in this app, and there will never be. The app is completely open-source (GPLv3).
+
+* <b>Works offline and respects your privacy.</b>
+Loop doesn't require an Internet connection or online account registration. Your confidential data is never sent to anyone. Neither the developers nor any third-parties have access to it.
+
+## 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 [build instructions][build].
+
+## Contributing
+
+Loop is an open source project developed entirely by volunteers. If you would
+like to contribute to the project, you are very welcome. There are many ways to
+contribute, even if you are not a software developer.
+
+* **Report bugs, suggest features.** The easiest way to contribute is to simply
+  use the app and let us know if you find any problems or have any suggestions
+  to improve it. To report a problem, please [create a new bug report](https://github.com/iSoron/uhabits/issues/new/choose).
+  To request a new feature or vote on existing feature requests, please visit
+  our [GitHub Discussions page](https://github.com/iSoron/uhabits/discussions/categories/feature-requests).
+  If you would like to receive the newest versions of the app
+  earlier than everyone else, [join our open beta on Google Play][beta].
+
+* **Spread the word.** If you like the app, share it with your family, friends
+  and colleagues. You can also rate and review the app on Google Play Store, to help
+  other users find it more easily.
+
+* **Translate the app into your own language.** If you are not a native English
+  speaker, and would like to see the app translated into your own language,
+  please join our [open translation project][poedit]. If the translation
+  is already completed, you are also very welcome to join and proofread it.
+
+* **Write some code.** If you are an Android developer, you are very welcome to
+  contribute with code. Please see the [guidelines](https://github.com/iSoron/uhabits/blob/dev/docs/GUIDELINES.md).
+
+## License
+
+<img align="right" src="https://www.gnu.org/graphics/gplv3-88x31.png">
+
+  Copyright (C) 2016-2021 Álinson Santos Xavier <isoron@gmail.com>
+
+  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.
+
+  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 <https://www.gnu.org/licenses/>.
+
+[screen1]: screenshots/1.png
+[screen2]: screenshots/2.png
+[screen3]: screenshots/3.png
+[screen4]: screenshots/4.png
+[screen5]: screenshots/5.png
+[screen6]: screenshots/6.png
+[screen1th]: screenshots/1.thumb.png
+[screen2th]: screenshots/2.thumb.png
+[screen3th]: screenshots/3.thumb.png
+[screen4th]: screenshots/4.thumb.png
+[screen5th]: screenshots/5.thumb.png
+[screen6th]: screenshots/6.thumb.png
+[poedit]: https://translate.loophabits.org
+[playstore]: https://play.google.com/store/apps/details?id=org.isoron.uhabits
+[releases]: https://github.com/iSoron/uhabits/releases
+[fdroid]: https://f-droid.org/app/org.isoron.uhabits
+[build]: https://github.com/iSoron/uhabits/blob/dev/docs/BUILD.md
+[beta]: https://play.google.com/apps/testing/org.isoron.uhabits

app/build.gradle

@@ -1,31 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion "21.1.2"
-
-    defaultConfig {
-        applicationId "org.isoron.uhabits"
-        minSdkVersion 15
-        targetSdkVersion 23
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    lintOptions {
-        checkReleaseBuilds false
-    }
-}
-
-dependencies {
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.github.paolorotolo:appintro:3.4.0'
-    compile files('libs/ActiveAndroid.jar')
-}
-
-

app/lint.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<lint>
-</lint>

app/src/main/AndroidManifest.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-    package="org.isoron.uhabits"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="4"
-    android:versionName="1.0.0">
-
-    <uses-permission
-        android:name="android.permission.VIBRATE"/>
-
-    <application
-        android:name="com.activeandroid.app.Application"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppBaseTheme"
-        android:backupAgent=".HabitsBackupAgent">
-
-        <meta-data
-            android:name="AA_DB_NAME"
-            android:value="uhabits.db"/>
-
-        <meta-data
-            android:name="AA_DB_VERSION"
-            android:value="9"/>
-
-        <meta-data
-            android:name="com.google.android.backup.api_key"
-            android:value="AEdPqrEAAAAI6aeWncbnMNo8E5GWeZ44dlc5cQ7tCROwFhOtiw" />
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-
-        <receiver
-            android:name=".ReminderAlarmReceiver" />
-
-        <activity
-            android:name=".ShowHabitActivity"
-            android:label="@string/title_activity_show_habit"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.isoron.uhabits.MainActivity"/>
-        </activity>
-
-        <activity
-            android:name=".SettingsActivity"
-            android:label="Settings"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.isoron.uhabits.MainActivity"/>
-        </activity>
-
-        <activity android:name=".IntroActivity"
-                  android:label=""
-                  android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-    </application>
-
-</manifest>

app/src/main/assets/migrations/5.sql

@@ -1,2 +0,0 @@
-alter table habits add column reminder_hour integer;
-alter table habits add column reminder_min integer;

app/src/main/assets/migrations/6.sql

@@ -1 +0,0 @@
-alter table habits add column highlight integer not null default 0;

app/src/main/assets/migrations/7.sql

@@ -1 +0,0 @@
-alter table habits add column archived integer not null default 0;

app/src/main/java/com/mobeta/android/dslv/DragSortController.java

@@ -1,471 +0,0 @@
-package com.mobeta.android.dslv;
-
-import android.graphics.Point;
-import android.view.GestureDetector;
-import android.view.HapticFeedbackConstants;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.widget.AdapterView;
-
-/**
- * Class that starts and stops item drags on a {@link DragSortListView}
- * based on touch gestures. This class also inherits from
- * {@link SimpleFloatViewManager}, which provides basic float View
- * creation.
- *
- * An instance of this class is meant to be passed to the methods
- * {@link DragSortListView#setTouchListener()} and
- * {@link DragSortListView#setFloatViewManager()} of your
- * {@link DragSortListView} instance.
- */
-public class DragSortController extends SimpleFloatViewManager implements View.OnTouchListener, GestureDetector.OnGestureListener {
-
-    /**
-     * Drag init mode enum.
-     */
-    public static final int ON_DOWN = 0;
-    public static final int ON_DRAG = 1;
-    public static final int ON_LONG_PRESS = 2;
-
-    private int mDragInitMode = ON_DOWN;
-
-    private boolean mSortEnabled = true;
-
-    /**
-     * Remove mode enum.
-     */
-    public static final int CLICK_REMOVE = 0;
-    public static final int FLING_REMOVE = 1;
-
-    /**
-     * The current remove mode.
-     */
-    private int mRemoveMode;
-
-    private boolean mRemoveEnabled = false;
-    private boolean mIsRemoving = false;
-
-    private GestureDetector mDetector;
-
-    private GestureDetector mFlingRemoveDetector;
-
-    private int mTouchSlop;
-
-    public static final int MISS = -1;
-
-    private int mHitPos = MISS;
-    private int mFlingHitPos = MISS;
-
-    private int mClickRemoveHitPos = MISS;
-
-    private int[] mTempLoc = new int[2];
-
-    private int mItemX;
-    private int mItemY;
-
-    private int mCurrX;
-    private int mCurrY;
-
-    private boolean mDragging = false;
-
-    private float mFlingSpeed = 500f;
-
-    private int mDragHandleId;
-
-    private int mClickRemoveId;
-
-    private int mFlingHandleId;
-    private boolean mCanDrag;
-
-    private DragSortListView mDslv;
-    private int mPositionX;
-
-    /**
-     * Calls {@link #DragSortController(DragSortListView, int)} with a
-     * 0 drag handle id, FLING_RIGHT_REMOVE remove mode,
-     * and ON_DOWN drag init. By default, sorting is enabled, and
-     * removal is disabled.
-     *
-     * @param dslv The DSLV instance
-     */
-    public DragSortController(DragSortListView dslv) {
-        this(dslv, 0, ON_DOWN, FLING_REMOVE);
-    }
-
-    public DragSortController(DragSortListView dslv, int dragHandleId, int dragInitMode, int removeMode) {
-        this(dslv, dragHandleId, dragInitMode, removeMode, 0);
-    }
-
-    public DragSortController(DragSortListView dslv, int dragHandleId, int dragInitMode, int removeMode, int clickRemoveId) {
-        this(dslv, dragHandleId, dragInitMode, removeMode, clickRemoveId, 0);
-    }
-
-    /**
-     * By default, sorting is enabled, and removal is disabled.
-     *
-     * @param dslv The DSLV instance
-     * @param dragHandleId The resource id of the View that represents
-     * the drag handle in a list item.
-     */
-    public DragSortController(DragSortListView dslv, int dragHandleId, int dragInitMode,
-            int removeMode, int clickRemoveId, int flingHandleId) {
-        super(dslv);
-        mDslv = dslv;
-        mDetector = new GestureDetector(dslv.getContext(), this);
-        mFlingRemoveDetector = new GestureDetector(dslv.getContext(), mFlingRemoveListener);
-        mFlingRemoveDetector.setIsLongpressEnabled(false);
-        mTouchSlop = ViewConfiguration.get(dslv.getContext()).getScaledTouchSlop();
-        mDragHandleId = dragHandleId;
-        mClickRemoveId = clickRemoveId;
-        mFlingHandleId = flingHandleId;
-        setRemoveMode(removeMode);
-        setDragInitMode(dragInitMode);
-    }
-
-
-    public int getDragInitMode() {
-        return mDragInitMode;
-    }
-
-    /**
-     * Set how a drag is initiated. Needs to be one of
-     * {@link ON_DOWN}, {@link ON_DRAG}, or {@link ON_LONG_PRESS}.
-     *
-     * @param mode The drag init mode.
-     */
-    public void setDragInitMode(int mode) {
-        mDragInitMode = mode;
-    }
-
-    /**
-     * Enable/Disable list item sorting. Disabling is useful if only item
-     * removal is desired. Prevents drags in the vertical direction.
-     *
-     * @param enabled Set <code>true</code> to enable list
-     * item sorting.
-     */
-    public void setSortEnabled(boolean enabled) {
-        mSortEnabled = enabled;
-    }
-
-    public boolean isSortEnabled() {
-        return mSortEnabled;
-    }
-
-    /**
-     * One of {@link CLICK_REMOVE}, {@link FLING_RIGHT_REMOVE},
-     * {@link FLING_LEFT_REMOVE},
-     * {@link SLIDE_RIGHT_REMOVE}, or {@link SLIDE_LEFT_REMOVE}.
-     */
-    public void setRemoveMode(int mode) {
-        mRemoveMode = mode;
-    }
-
-    public int getRemoveMode() {
-        return mRemoveMode;
-    }
-
-    /**
-     * Enable/Disable item removal without affecting remove mode.
-     */
-    public void setRemoveEnabled(boolean enabled) {
-        mRemoveEnabled = enabled;
-    }
-
-    public boolean isRemoveEnabled() {
-        return mRemoveEnabled;
-    }
-
-    /**
-     * Set the resource id for the View that represents the drag
-     * handle in a list item.
-     *
-     * @param id An android resource id.
-     */
-    public void setDragHandleId(int id) {
-        mDragHandleId = id;
-    }
-
-    /**
-     * Set the resource id for the View that represents the fling
-     * handle in a list item.
-     *
-     * @param id An android resource id.
-     */
-    public void setFlingHandleId(int id) {
-        mFlingHandleId = id;
-    }
-
-    /**
-     * Set the resource id for the View that represents click
-     * removal button.
-     *
-     * @param id An android resource id.
-     */
-    public void setClickRemoveId(int id) {
-        mClickRemoveId = id;
-    }
-
-    /**
-     * Sets flags to restrict certain motions of the floating View
-     * based on DragSortController settings (such as remove mode).
-     * Starts the drag on the DragSortListView.
-     *
-     * @param position The list item position (includes headers).
-     * @param deltaX Touch x-coord minus left edge of floating View.
-     * @param deltaY Touch y-coord minus top edge of floating View.
-     *
-     * @return True if drag started, false otherwise.
-     */
-    public boolean startDrag(int position, int deltaX, int deltaY) {
-
-        int dragFlags = 0;
-        if (mSortEnabled && !mIsRemoving) {
-            dragFlags |= DragSortListView.DRAG_POS_Y | DragSortListView.DRAG_NEG_Y;
-        }
-        if (mRemoveEnabled && mIsRemoving) {
-            dragFlags |= DragSortListView.DRAG_POS_X;
-            dragFlags |= DragSortListView.DRAG_NEG_X;
-        }
-
-        mDragging = mDslv.startDrag(position - mDslv.getHeaderViewsCount(), dragFlags, deltaX,
-                deltaY);
-        return mDragging;
-    }
-
-    @Override
-    public boolean onTouch(View v, MotionEvent ev) {
-        if (!mDslv.isDragEnabled() || mDslv.listViewIntercepted()) {
-            return false;
-        }
-
-        mDetector.onTouchEvent(ev);
-        if (mRemoveEnabled && mDragging && mRemoveMode == FLING_REMOVE) {
-            mFlingRemoveDetector.onTouchEvent(ev);
-        }
-
-        int action = ev.getAction() & MotionEvent.ACTION_MASK;
-        switch (action) {
-            case MotionEvent.ACTION_DOWN:
-                mCurrX = (int) ev.getX();
-                mCurrY = (int) ev.getY();
-                break;
-            case MotionEvent.ACTION_UP:
-                if (mRemoveEnabled && mIsRemoving) {
-                    int x = mPositionX >= 0 ? mPositionX : -mPositionX;
-                    int removePoint = mDslv.getWidth() / 2;
-                    if (x > removePoint) {
-                        mDslv.stopDragWithVelocity(true, 0);
-                    }
-                }
-            case MotionEvent.ACTION_CANCEL:
-                mIsRemoving = false;
-                mDragging = false;
-                break;
-        }
-
-        return false;
-    }
-
-    /**
-     * Overrides to provide fading when slide removal is enabled.
-     */
-    @Override
-    public void onDragFloatView(View floatView, Point position, Point touch) {
-
-        if (mRemoveEnabled && mIsRemoving) {
-            mPositionX = position.x;
-        }
-    }
-
-    /**
-     * Get the position to start dragging based on the ACTION_DOWN
-     * MotionEvent. This function simply calls
-     * {@link #dragHandleHitPosition(MotionEvent)}. Override
-     * to change drag handle behavior;
-     * this function is called internally when an ACTION_DOWN
-     * event is detected.
-     *
-     * @param ev The ACTION_DOWN MotionEvent.
-     *
-     * @return The list position to drag if a drag-init gesture is
-     * detected; MISS if unsuccessful.
-     */
-    public int startDragPosition(MotionEvent ev) {
-        return dragHandleHitPosition(ev);
-    }
-
-    public int startFlingPosition(MotionEvent ev) {
-        return mRemoveMode == FLING_REMOVE ? flingHandleHitPosition(ev) : MISS;
-    }
-
-    /**
-     * Checks for the touch of an item's drag handle (specified by
-     * {@link #setDragHandleId(int)}), and returns that item's position
-     * if a drag handle touch was detected.
-     *
-     * @param ev The ACTION_DOWN MotionEvent.
-
-     * @return The list position of the item whose drag handle was
-     * touched; MISS if unsuccessful.
-     */
-    public int dragHandleHitPosition(MotionEvent ev) {
-        return viewIdHitPosition(ev, mDragHandleId);
-    }
-
-    public int flingHandleHitPosition(MotionEvent ev) {
-        return viewIdHitPosition(ev, mFlingHandleId);
-    }
-
-    public int viewIdHitPosition(MotionEvent ev, int id) {
-        final int x = (int) ev.getX();
-        final int y = (int) ev.getY();
-
-        int touchPos = mDslv.pointToPosition(x, y); // includes headers/footers
-
-        final int numHeaders = mDslv.getHeaderViewsCount();
-        final int numFooters = mDslv.getFooterViewsCount();
-        final int count = mDslv.getCount();
-
-        // Log.d("mobeta", "touch down on position " + itemnum);
-        // We're only interested if the touch was on an
-        // item that's not a header or footer.
-        if (touchPos != AdapterView.INVALID_POSITION && touchPos >= numHeaders
-                && touchPos < (count - numFooters)) {
-            final View item = mDslv.getChildAt(touchPos - mDslv.getFirstVisiblePosition());
-            final int rawX = (int) ev.getRawX();
-            final int rawY = (int) ev.getRawY();
-
-            View dragBox = id == 0 ? item : (View) item.findViewById(id);
-            if (dragBox != null) {
-                dragBox.getLocationOnScreen(mTempLoc);
-
-                if (rawX > mTempLoc[0] && rawY > mTempLoc[1] &&
-                        rawX < mTempLoc[0] + dragBox.getWidth() &&
-                        rawY < mTempLoc[1] + dragBox.getHeight()) {
-
-                    mItemX = item.getLeft();
-                    mItemY = item.getTop();
-
-                    return touchPos;
-                }
-            }
-        }
-
-        return MISS;
-    }
-
-    @Override
-    public boolean onDown(MotionEvent ev) {
-        if (mRemoveEnabled && mRemoveMode == CLICK_REMOVE) {
-            mClickRemoveHitPos = viewIdHitPosition(ev, mClickRemoveId);
-        }
-
-        mHitPos = startDragPosition(ev);
-        if (mHitPos != MISS && mDragInitMode == ON_DOWN) {
-            startDrag(mHitPos, (int) ev.getX() - mItemX, (int) ev.getY() - mItemY);
-        }
-
-        mIsRemoving = false;
-        mCanDrag = true;
-        mPositionX = 0;
-        mFlingHitPos = startFlingPosition(ev);
-
-        return true;
-    }
-
-    @Override
-    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-    	
-    	if(e1 == null) return false;
-    	if(e2 == null) return false;
-
-        final int x1 = (int) e1.getX();
-        final int y1 = (int) e1.getY();
-        final int x2 = (int) e2.getX();
-        final int y2 = (int) e2.getY();
-        final int deltaX = x2 - mItemX;
-        final int deltaY = y2 - mItemY;
-
-        if (mCanDrag && !mDragging && (mHitPos != MISS || mFlingHitPos != MISS)) {
-            if (mHitPos != MISS) {
-                if (mDragInitMode == ON_DRAG && Math.abs(y2 - y1) > mTouchSlop && mSortEnabled) {
-                    startDrag(mHitPos, deltaX, deltaY);
-                }
-                else if (mDragInitMode != ON_DOWN && Math.abs(x2 - x1) > mTouchSlop && mRemoveEnabled)
-                {
-                    mIsRemoving = true;
-                    startDrag(mFlingHitPos, deltaX, deltaY);
-                }
-            } else if (mFlingHitPos != MISS) {
-                if (Math.abs(x2 - x1) > mTouchSlop && mRemoveEnabled) {
-                    mIsRemoving = true;
-                    startDrag(mFlingHitPos, deltaX, deltaY);
-                } else if (Math.abs(y2 - y1) > mTouchSlop) {
-                    mCanDrag = false; // if started to scroll the list then
-                                      // don't allow sorting nor fling-removing
-                }
-            }
-        }
-        // return whatever
-        return false;
-    }
-
-    @Override
-    public void onLongPress(MotionEvent e) {
-        // Log.d("mobeta", "lift listener long pressed");
-        if (mHitPos != MISS && mDragInitMode == ON_LONG_PRESS) {
-            mDslv.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-            startDrag(mHitPos, mCurrX - mItemX, mCurrY - mItemY);
-        }
-    }
-
-    // complete the OnGestureListener interface
-    @Override
-    public final boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-        return false;
-    }
-
-    // complete the OnGestureListener interface
-    @Override
-    public boolean onSingleTapUp(MotionEvent ev) {
-        if (mRemoveEnabled && mRemoveMode == CLICK_REMOVE) {
-            if (mClickRemoveHitPos != MISS) {
-                mDslv.removeItem(mClickRemoveHitPos - mDslv.getHeaderViewsCount());
-            }
-        }
-        return true;
-    }
-
-    // complete the OnGestureListener interface
-    @Override
-    public void onShowPress(MotionEvent ev) {
-        // do nothing
-    }
-
-    private GestureDetector.OnGestureListener mFlingRemoveListener =
-            new GestureDetector.SimpleOnGestureListener() {
-                @Override
-                public final boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
-                        float velocityY) {
-                    // Log.d("mobeta", "on fling remove called");
-                    if (mRemoveEnabled && mIsRemoving) {
-                        int w = mDslv.getWidth();
-                        int minPos = w / 5;
-                        if (velocityX > mFlingSpeed) {
-                            if (mPositionX > -minPos) {
-                                mDslv.stopDragWithVelocity(true, velocityX);
-                            }
-                        } else if (velocityX < -mFlingSpeed) {
-                            if (mPositionX < minPos) {
-                                mDslv.stopDragWithVelocity(true, velocityX);
-                            }
-                        }
-                        mIsRemoving = false;
-                    }
-                    return false;
-                }
-            };
-
-}

app/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java

@@ -1,241 +0,0 @@
-package com.mobeta.android.dslv;
-
-import java.util.ArrayList;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.util.SparseIntArray;
-import android.view.View;
-import android.view.ViewGroup;
-import android.support.v4.widget.CursorAdapter;
-
-
-/**
- * A subclass of {@link android.widget.CursorAdapter} that provides
- * reordering of the elements in the Cursor based on completed
- * drag-sort operations. The reordering is a simple mapping of
- * list positions into Cursor positions (the Cursor is unchanged).
- * To persist changes made by drag-sorts, one can retrieve the
- * mapping with the {@link #getCursorPositions()} method, which
- * returns the reordered list of Cursor positions.
- *
- * An instance of this class is passed
- * to {@link DragSortListView#setAdapter(ListAdapter)} and, since
- * this class implements the {@link DragSortListView.DragSortListener}
- * interface, it is automatically set as the DragSortListener for
- * the DragSortListView instance.
- */
-public abstract class DragSortCursorAdapter extends CursorAdapter implements DragSortListView.DragSortListener {
-
-    public static final int REMOVED = -1;
-
-    /**
-     * Key is ListView position, value is Cursor position
-     */
-    private SparseIntArray mListMapping = new SparseIntArray();
-
-    private ArrayList<Integer> mRemovedCursorPositions = new ArrayList<Integer>();
-    
-    public DragSortCursorAdapter(Context context, Cursor c) {
-        super(context, c);
-    }
-
-    public DragSortCursorAdapter(Context context, Cursor c, boolean autoRequery) {
-        super(context, c, autoRequery);
-    }
-
-    public DragSortCursorAdapter(Context context, Cursor c, int flags) {
-        super(context, c, flags);
-    }
-
-    /**
-     * Swaps Cursor and clears list-Cursor mapping.
-     *
-     * @see android.widget.CursorAdapter#swapCursor(android.database.Cursor)
-     */
-    @Override
-    public Cursor swapCursor(Cursor newCursor) {
-        Cursor old = super.swapCursor(newCursor);
-        resetMappings();
-        return old;
-    }
-
-    /**
-     * Changes Cursor and clears list-Cursor mapping.
-     *
-     * @see android.widget.CursorAdapter#changeCursor(android.database.Cursor)
-     */
-    @Override
-    public void changeCursor(Cursor cursor) {
-        super.changeCursor(cursor);
-        resetMappings();
-    }
-
-    /**
-     * Resets list-cursor mapping.
-     */
-    public void reset() {
-        resetMappings();
-        notifyDataSetChanged();
-    }
-
-    private void resetMappings() {
-        mListMapping.clear();
-        mRemovedCursorPositions.clear();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return super.getItem(mListMapping.get(position, position));
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return super.getItemId(mListMapping.get(position, position));
-    }
-
-    @Override
-    public View getDropDownView(int position, View convertView, ViewGroup parent) {
-        return super.getDropDownView(mListMapping.get(position, position), convertView, parent);
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        return super.getView(mListMapping.get(position, position), convertView, parent);
-    }
-
-    /**
-     * On drop, this updates the mapping between Cursor positions
-     * and ListView positions. The Cursor is unchanged. Retrieve
-     * the current mapping with {@link getCursorPositions()}.
-     *
-     * @see DragSortListView.DropListener#drop(int, int)
-     */
-    @Override
-    public void drop(int from, int to) {
-        if (from != to) {
-            int cursorFrom = mListMapping.get(from, from);
-
-            if (from > to) {
-                for (int i = from; i > to; --i) {
-                    mListMapping.put(i, mListMapping.get(i - 1, i - 1));
-                }
-            } else {
-                for (int i = from; i < to; ++i) {
-                    mListMapping.put(i, mListMapping.get(i + 1, i + 1));
-                }
-            }
-            mListMapping.put(to, cursorFrom);
-
-            cleanMapping();        
-            notifyDataSetChanged();
-        }
-    }
-
-    /**
-     * On remove, this updates the mapping between Cursor positions
-     * and ListView positions. The Cursor is unchanged. Retrieve
-     * the current mapping with {@link getCursorPositions()}.
-     *
-     * @see DragSortListView.RemoveListener#remove(int)
-     */
-    @Override
-    public void remove(int which) {
-        int cursorPos = mListMapping.get(which, which);
-        if (!mRemovedCursorPositions.contains(cursorPos)) {
-            mRemovedCursorPositions.add(cursorPos);
-        }
-
-        int newCount = getCount();
-        for (int i = which; i < newCount; ++i) {
-            mListMapping.put(i, mListMapping.get(i + 1, i + 1));
-        }
-
-        mListMapping.delete(newCount);
-
-        cleanMapping();
-        notifyDataSetChanged();
-    }
-
-    /**
-     * Does nothing. Just completes DragSortListener interface.
-     */
-    @Override
-    public void drag(int from, int to) {
-        // do nothing
-    }
-
-    /**
-     * Remove unnecessary mappings from sparse array.
-     */
-    private void cleanMapping() {
-        ArrayList<Integer> toRemove = new ArrayList<Integer>();
-
-        int size = mListMapping.size();
-        for (int i = 0; i < size; ++i) {
-            if (mListMapping.keyAt(i) == mListMapping.valueAt(i)) {
-                toRemove.add(mListMapping.keyAt(i));
-            }
-        }
-
-        size = toRemove.size();
-        for (int i = 0; i < size; ++i) {
-            mListMapping.delete(toRemove.get(i));
-        }
-    }
-
-    @Override
-    public int getCount() {
-        return super.getCount() - mRemovedCursorPositions.size();
-    }
-
-    /**
-     * Get the Cursor position mapped to by the provided list position
-     * (given all previously handled drag-sort
-     * operations).
-     *
-     * @param position List position
-     *
-     * @return The mapped-to Cursor position
-     */
-    public int getCursorPosition(int position) {
-        return mListMapping.get(position, position);
-    }
-
-    /**
-     * Get the current order of Cursor positions presented by the
-     * list.
-     */
-    public ArrayList<Integer> getCursorPositions() {
-        ArrayList<Integer> result = new ArrayList<Integer>();
-
-        for (int i = 0; i < getCount(); ++i) {
-            result.add(mListMapping.get(i, i));
-        }
-
-        return result;
-    }
-
-    /**
-     * Get the list position mapped to by the provided Cursor position.
-     * If the provided Cursor position has been removed by a drag-sort,
-     * this returns {@link #REMOVED}.
-     *
-     * @param cursorPosition A Cursor position
-     * @return The mapped-to list position or REMOVED
-     */
-    public int getListPosition(int cursorPosition) {
-        if (mRemovedCursorPositions.contains(cursorPosition)) {
-            return REMOVED;
-        }
-
-        int index = mListMapping.indexOfValue(cursorPosition);
-        if (index < 0) {
-            return cursorPosition;
-        } else {
-            return mListMapping.keyAt(index);
-        }
-    }
-
-
-}

app/src/main/java/com/mobeta/android/dslv/DragSortItemView.java

@@ -1,100 +0,0 @@
-package com.mobeta.android.dslv;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.MeasureSpec;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.util.Log;
-
-/**
- * Lightweight ViewGroup that wraps list items obtained from user's
- * ListAdapter. ItemView expects a single child that has a definite
- * height (i.e. the child's layout height is not MATCH_PARENT).
- * The width of
- * ItemView will always match the width of its child (that is,
- * the width MeasureSpec given to ItemView is passed directly
- * to the child, and the ItemView measured width is set to the
- * child's measured width). The height of ItemView can be anything;
- * the 
- * 
- *
- * The purpose of this class is to optimize slide
- * shuffle animations.
- */
-public class DragSortItemView extends ViewGroup {
-
-    private int mGravity = Gravity.TOP;
-
-    public DragSortItemView(Context context) {
-        super(context);
-
-        // always init with standard ListView layout params
-        setLayoutParams(new AbsListView.LayoutParams(
-                ViewGroup.LayoutParams.FILL_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT));
-
-        //setClipChildren(true);
-    }
-
-    public void setGravity(int gravity) {
-        mGravity = gravity;
-    }
-
-    public int getGravity() {
-        return mGravity;
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        final View child = getChildAt(0);
-
-        if (child == null) {
-            return;
-        }
-
-        if (mGravity == Gravity.TOP) {
-            child.layout(0, 0, getMeasuredWidth(), child.getMeasuredHeight());
-        } else {
-            child.layout(0, getMeasuredHeight() - child.getMeasuredHeight(), getMeasuredWidth(), getMeasuredHeight());
-        }
-    }
-
-    /**
-     * 
-     */
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        
-        int height = MeasureSpec.getSize(heightMeasureSpec);
-        int width = MeasureSpec.getSize(widthMeasureSpec);
-
-        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-
-        final View child = getChildAt(0);
-        if (child == null) {
-            setMeasuredDimension(0, width);
-            return;
-        }
-
-        if (child.isLayoutRequested()) {
-            // Always let child be as tall as it wants.
-            measureChild(child, widthMeasureSpec,
-                    MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
-        }
-
-        if (heightMode == MeasureSpec.UNSPECIFIED) {
-            ViewGroup.LayoutParams lp = getLayoutParams();
-
-            if (lp.height > 0) {
-                height = lp.height;
-            } else {
-                height = child.getMeasuredHeight();
-            }
-        }
-
-        setMeasuredDimension(width, height);
-    }
-
-}

app/src/main/java/com/mobeta/android/dslv/DragSortItemViewCheckable.java

@@ -1,55 +0,0 @@
-package com.mobeta.android.dslv;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.MeasureSpec;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.Checkable;
-import android.util.Log;
-
-/**
- * Lightweight ViewGroup that wraps list items obtained from user's
- * ListAdapter. ItemView expects a single child that has a definite
- * height (i.e. the child's layout height is not MATCH_PARENT).
- * The width of
- * ItemView will always match the width of its child (that is,
- * the width MeasureSpec given to ItemView is passed directly
- * to the child, and the ItemView measured width is set to the
- * child's measured width). The height of ItemView can be anything;
- * the 
- * 
- *
- * The purpose of this class is to optimize slide
- * shuffle animations.
- */
-public class DragSortItemViewCheckable extends DragSortItemView implements Checkable {
-
-    public DragSortItemViewCheckable(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean isChecked() {
-        View child = getChildAt(0);
-        if (child instanceof Checkable)
-            return ((Checkable) child).isChecked();
-        else
-            return false;
-    }
-
-    @Override
-    public void setChecked(boolean checked) {
-        View child = getChildAt(0);
-        if (child instanceof Checkable)
-            ((Checkable) child).setChecked(checked);
-    }
-
-    @Override
-    public void toggle() {
-        View child = getChildAt(0);
-        if (child instanceof Checkable)
-            ((Checkable) child).toggle();
-    }
-}

app/src/main/java/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java

@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * 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.
- */
-
-package com.mobeta.android.dslv;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.LayoutInflater;
-
-// taken from v4 rev. 10 ResourceCursorAdapter.java
-
-/**
- * Static library support version of the framework's {@link android.widget.ResourceCursorAdapter}.
- * Used to write apps that run on platforms prior to Android 3.0.  When running
- * on Android 3.0 or above, this implementation is still used; it does not try
- * to switch to the framework's implementation.  See the framework SDK
- * documentation for a class overview.
- */
-public abstract class ResourceDragSortCursorAdapter extends DragSortCursorAdapter {
-    private int mLayout;
-
-    private int mDropDownLayout;
-    
-    private LayoutInflater mInflater;
-    
-    /**
-     * Constructor the enables auto-requery.
-     *
-     * @deprecated This option is discouraged, as it results in Cursor queries
-     * being performed on the application's UI thread and thus can cause poor
-     * responsiveness or even Application Not Responding errors.  As an alternative,
-     * use {@link android.app.LoaderManager} with a {@link android.content.CursorLoader}.
-     *
-     * @param context The context where the ListView associated with this adapter is running
-     * @param layout resource identifier of a layout file that defines the views
-     *            for this list item.  Unless you override them later, this will
-     *            define both the item views and the drop down views.
-     */
-    @Deprecated
-    public ResourceDragSortCursorAdapter(Context context, int layout, Cursor c) {
-        super(context, c);
-        mLayout = mDropDownLayout = layout;
-        mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    }
-    
-    /**
-     * Constructor with default behavior as per
-     * {@link CursorAdapter#CursorAdapter(Context, Cursor, boolean)}; it is recommended
-     * you not use this, but instead {@link #ResourceCursorAdapter(Context, int, Cursor, int)}.
-     * When using this constructor, {@link #FLAG_REGISTER_CONTENT_OBSERVER}
-     * will always be set.
-     *
-     * @param context The context where the ListView associated with this adapter is running
-     * @param layout resource identifier of a layout file that defines the views
-     *            for this list item.  Unless you override them later, this will
-     *            define both the item views and the drop down views.
-     * @param c The cursor from which to get the data.
-     * @param autoRequery If true the adapter will call requery() on the
-     *                    cursor whenever it changes so the most recent
-     *                    data is always displayed.  Using true here is discouraged.
-     */
-    public ResourceDragSortCursorAdapter(Context context, int layout, Cursor c, boolean autoRequery) {
-        super(context, c, autoRequery);
-        mLayout = mDropDownLayout = layout;
-        mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    }
-
-    /**
-     * Standard constructor.
-     *
-     * @param context The context where the ListView associated with this adapter is running
-     * @param layout Resource identifier of a layout file that defines the views
-     *            for this list item.  Unless you override them later, this will
-     *            define both the item views and the drop down views.
-     * @param c The cursor from which to get the data.
-     * @param flags Flags used to determine the behavior of the adapter,
-     * as per {@link CursorAdapter#CursorAdapter(Context, Cursor, int)}.
-     */
-    public ResourceDragSortCursorAdapter(Context context, int layout, Cursor c, int flags) {
-        super(context, c, flags);
-        mLayout = mDropDownLayout = layout;
-        mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    }
-
-    /**
-     * Inflates view(s) from the specified XML file.
-     * 
-     * @see android.widget.CursorAdapter#newView(android.content.Context,
-     *      android.database.Cursor, ViewGroup)
-     */
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return mInflater.inflate(mLayout, parent, false);
-    }
-
-    @Override
-    public View newDropDownView(Context context, Cursor cursor, ViewGroup parent) {
-        return mInflater.inflate(mDropDownLayout, parent, false);
-    }
-
-    /**
-     * <p>Sets the layout resource of the item views.</p>
-     *
-     * @param layout the layout resources used to create item views
-     */
-    public void setViewResource(int layout) {
-        mLayout = layout;
-    }
-    
-    /**
-     * <p>Sets the layout resource of the drop down views.</p>
-     *
-     * @param dropDownLayout the layout resources used to create drop down views
-     */
-    public void setDropDownViewResource(int dropDownLayout) {
-        mDropDownLayout = dropDownLayout;
-    }
-}

app/src/main/java/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java

@@ -1,422 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * 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.
- */
-
-package com.mobeta.android.dslv;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.ImageView;
-
-// taken from sdk/sources/android-16/android/widget/SimpleCursorAdapter.java
-
-/**
- * An easy adapter to map columns from a cursor to TextViews or ImageViews
- * defined in an XML file. You can specify which columns you want, which
- * views you want to display the columns, and the XML file that defines
- * the appearance of these views.
- *
- * Binding occurs in two phases. First, if a
- * {@link android.widget.SimpleCursorAdapter.ViewBinder} is available,
- * {@link ViewBinder#setViewValue(android.view.View, android.database.Cursor, int)}
- * is invoked. If the returned value is true, binding has occured. If the
- * returned value is false and the view to bind is a TextView,
- * {@link #setViewText(TextView, String)} is invoked. If the returned value
- * is false and the view to bind is an ImageView,
- * {@link #setViewImage(ImageView, String)} is invoked. If no appropriate
- * binding can be found, an {@link IllegalStateException} is thrown.
- *
- * If this adapter is used with filtering, for instance in an
- * {@link android.widget.AutoCompleteTextView}, you can use the
- * {@link android.widget.SimpleCursorAdapter.CursorToStringConverter} and the
- * {@link android.widget.FilterQueryProvider} interfaces
- * to get control over the filtering process. You can refer to
- * {@link #convertToString(android.database.Cursor)} and
- * {@link #runQueryOnBackgroundThread(CharSequence)} for more information.
- */
-public class SimpleDragSortCursorAdapter extends ResourceDragSortCursorAdapter {
-    /**
-     * A list of columns containing the data to bind to the UI.
-     * This field should be made private, so it is hidden from the SDK.
-     * {@hide}
-     */
-    protected int[] mFrom;
-    /**
-     * A list of View ids representing the views to which the data must be bound.
-     * This field should be made private, so it is hidden from the SDK.
-     * {@hide}
-     */
-    protected int[] mTo;
-
-    private int mStringConversionColumn = -1;
-    private CursorToStringConverter mCursorToStringConverter;
-    private ViewBinder mViewBinder;
-
-    String[] mOriginalFrom;
-
-    /**
-     * Constructor the enables auto-requery.
-     *
-     * @deprecated This option is discouraged, as it results in Cursor queries
-     * being performed on the application's UI thread and thus can cause poor
-     * responsiveness or even Application Not Responding errors.  As an alternative,
-     * use {@link android.app.LoaderManager} with a {@link android.content.CursorLoader}.
-     */
-    @Deprecated
-    public SimpleDragSortCursorAdapter(Context context, int layout, Cursor c, String[] from, int[] to) {
-        super(context, layout, c);
-        mTo = to;
-        mOriginalFrom = from;
-        findColumns(c, from);
-    }
-
-    /**
-     * Standard constructor.
-     * 
-     * @param context The context where the ListView associated with this
-     *            SimpleListItemFactory is running
-     * @param layout resource identifier of a layout file that defines the views
-     *            for this list item. The layout file should include at least
-     *            those named views defined in "to"
-     * @param c The database cursor.  Can be null if the cursor is not available yet.
-     * @param from A list of column names representing the data to bind to the UI.  Can be null 
-     *            if the cursor is not available yet.
-     * @param to The views that should display column in the "from" parameter.
-     *            These should all be TextViews. The first N views in this list
-     *            are given the values of the first N columns in the from
-     *            parameter.  Can be null if the cursor is not available yet.
-     * @param flags Flags used to determine the behavior of the adapter,
-     * as per {@link CursorAdapter#CursorAdapter(Context, Cursor, int)}.
-     */
-    public SimpleDragSortCursorAdapter(Context context, int layout,
-            Cursor c, String[] from, int[] to, int flags) {
-        super(context, layout, c, flags);
-        mTo = to;
-        mOriginalFrom = from;
-        findColumns(c, from);
-    }
-
-    /**
-     * Binds all of the field names passed into the "to" parameter of the
-     * constructor with their corresponding cursor columns as specified in the
-     * "from" parameter.
-     *
-     * Binding occurs in two phases. First, if a
-     * {@link android.widget.SimpleCursorAdapter.ViewBinder} is available,
-     * {@link ViewBinder#setViewValue(android.view.View, android.database.Cursor, int)}
-     * is invoked. If the returned value is true, binding has occured. If the
-     * returned value is false and the view to bind is a TextView,
-     * {@link #setViewText(TextView, String)} is invoked. If the returned value is
-     * false and the view to bind is an ImageView,
-     * {@link #setViewImage(ImageView, String)} is invoked. If no appropriate
-     * binding can be found, an {@link IllegalStateException} is thrown.
-     *
-     * @throws IllegalStateException if binding cannot occur
-     * 
-     * @see android.widget.CursorAdapter#bindView(android.view.View,
-     *      android.content.Context, android.database.Cursor)
-     * @see #getViewBinder()
-     * @see #setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder)
-     * @see #setViewImage(ImageView, String)
-     * @see #setViewText(TextView, String)
-     */
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        final ViewBinder binder = mViewBinder;
-        final int count = mTo.length;
-        final int[] from = mFrom;
-        final int[] to = mTo;
-
-        for (int i = 0; i < count; i++) {
-            final View v = view.findViewById(to[i]);
-            if (v != null) {
-                boolean bound = false;
-                if (binder != null) {
-                    bound = binder.setViewValue(v, cursor, from[i]);
-                }
-
-                if (!bound) {
-                    String text = cursor.getString(from[i]);
-                    if (text == null) {
-                        text = "";
-                    }
-
-                    if (v instanceof TextView) {
-                        setViewText((TextView) v, text);
-                    } else if (v instanceof ImageView) {
-                        setViewImage((ImageView) v, text);
-                    } else {
-                        throw new IllegalStateException(v.getClass().getName() + " is not a " +
-                                " view that can be bounds by this SimpleCursorAdapter");
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns the {@link ViewBinder} used to bind data to views.
-     *
-     * @return a ViewBinder or null if the binder does not exist
-     *
-     * @see #bindView(android.view.View, android.content.Context, android.database.Cursor)
-     * @see #setViewBinder(android.widget.SimpleCursorAdapter.ViewBinder)
-     */
-    public ViewBinder getViewBinder() {
-        return mViewBinder;
-    }
-
-    /**
-     * Sets the binder used to bind data to views.
-     *
-     * @param viewBinder the binder used to bind data to views, can be null to
-     *        remove the existing binder
-     *
-     * @see #bindView(android.view.View, android.content.Context, android.database.Cursor)
-     * @see #getViewBinder()
-     */
-    public void setViewBinder(ViewBinder viewBinder) {
-        mViewBinder = viewBinder;
-    }
-
-    /**
-     * Called by bindView() to set the image for an ImageView but only if
-     * there is no existing ViewBinder or if the existing ViewBinder cannot
-     * handle binding to an ImageView.
-     *
-     * By default, the value will be treated as an image resource. If the
-     * value cannot be used as an image resource, the value is used as an
-     * image Uri.
-     *
-     * Intended to be overridden by Adapters that need to filter strings
-     * retrieved from the database.
-     *
-     * @param v ImageView to receive an image
-     * @param value the value retrieved from the cursor
-     */
-    public void setViewImage(ImageView v, String value) {
-        try {
-            v.setImageResource(Integer.parseInt(value));
-        } catch (NumberFormatException nfe) {
-            v.setImageURI(Uri.parse(value));
-        }
-    }
-
-    /**
-     * Called by bindView() to set the text for a TextView but only if
-     * there is no existing ViewBinder or if the existing ViewBinder cannot
-     * handle binding to a TextView.
-     *
-     * Intended to be overridden by Adapters that need to filter strings
-     * retrieved from the database.
-     * 
-     * @param v TextView to receive text
-     * @param text the text to be set for the TextView
-     */    
-    public void setViewText(TextView v, String text) {
-        v.setText(text);
-    }
-
-    /**
-     * Return the index of the column used to get a String representation
-     * of the Cursor.
-     *
-     * @return a valid index in the current Cursor or -1
-     *
-     * @see android.widget.CursorAdapter#convertToString(android.database.Cursor)
-     * @see #setStringConversionColumn(int) 
-     * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter)
-     * @see #getCursorToStringConverter()
-     */
-    public int getStringConversionColumn() {
-        return mStringConversionColumn;
-    }
-
-    /**
-     * Defines the index of the column in the Cursor used to get a String
-     * representation of that Cursor. The column is used to convert the
-     * Cursor to a String only when the current CursorToStringConverter
-     * is null.
-     *
-     * @param stringConversionColumn a valid index in the current Cursor or -1 to use the default
-     *        conversion mechanism
-     *
-     * @see android.widget.CursorAdapter#convertToString(android.database.Cursor)
-     * @see #getStringConversionColumn()
-     * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter)
-     * @see #getCursorToStringConverter()
-     */
-    public void setStringConversionColumn(int stringConversionColumn) {
-        mStringConversionColumn = stringConversionColumn;
-    }
-
-    /**
-     * Returns the converter used to convert the filtering Cursor
-     * into a String.
-     *
-     * @return null if the converter does not exist or an instance of
-     *         {@link android.widget.SimpleCursorAdapter.CursorToStringConverter}
-     *
-     * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter)
-     * @see #getStringConversionColumn()
-     * @see #setStringConversionColumn(int)
-     * @see android.widget.CursorAdapter#convertToString(android.database.Cursor)
-     */
-    public CursorToStringConverter getCursorToStringConverter() {
-        return mCursorToStringConverter;
-    }
-
-    /**
-     * Sets the converter  used to convert the filtering Cursor
-     * into a String.
-     *
-     * @param cursorToStringConverter the Cursor to String converter, or
-     *        null to remove the converter
-     *
-     * @see #setCursorToStringConverter(android.widget.SimpleCursorAdapter.CursorToStringConverter) 
-     * @see #getStringConversionColumn()
-     * @see #setStringConversionColumn(int)
-     * @see android.widget.CursorAdapter#convertToString(android.database.Cursor)
-     */
-    public void setCursorToStringConverter(CursorToStringConverter cursorToStringConverter) {
-        mCursorToStringConverter = cursorToStringConverter;
-    }
-
-    /**
-     * Returns a CharSequence representation of the specified Cursor as defined
-     * by the current CursorToStringConverter. If no CursorToStringConverter
-     * has been set, the String conversion column is used instead. If the
-     * conversion column is -1, the returned String is empty if the cursor
-     * is null or Cursor.toString().
-     *
-     * @param cursor the Cursor to convert to a CharSequence
-     *
-     * @return a non-null CharSequence representing the cursor
-     */
-    @Override
-    public CharSequence convertToString(Cursor cursor) {
-        if (mCursorToStringConverter != null) {
-            return mCursorToStringConverter.convertToString(cursor);
-        } else if (mStringConversionColumn > -1) {
-            return cursor.getString(mStringConversionColumn);
-        }
-
-        return super.convertToString(cursor);
-    }
-
-    /**
-     * Create a map from an array of strings to an array of column-id integers in cursor c.
-     * If c is null, the array will be discarded.
-     *
-     * @param c the cursor to find the columns from
-     * @param from the Strings naming the columns of interest
-     */
-    private void findColumns(Cursor c, String[] from) {
-        if (c != null) {
-            int i;
-            int count = from.length;
-            if (mFrom == null || mFrom.length != count) {
-                mFrom = new int[count];
-            }
-            for (i = 0; i < count; i++) {
-                mFrom[i] = c.getColumnIndexOrThrow(from[i]);
-            }
-        } else {
-            mFrom = null;
-        }
-    }
-
-    @Override
-    public Cursor swapCursor(Cursor c) {
-        // super.swapCursor() will notify observers before we have
-        // a valid mapping, make sure we have a mapping before this
-        // happens
-        findColumns(c, mOriginalFrom);
-        return super.swapCursor(c);
-    }
-    
-    /**
-     * Change the cursor and change the column-to-view mappings at the same time.
-     *  
-     * @param c The database cursor.  Can be null if the cursor is not available yet.
-     * @param from A list of column names representing the data to bind to the UI.  Can be null 
-     *            if the cursor is not available yet.
-     * @param to The views that should display column in the "from" parameter.
-     *            These should all be TextViews. The first N views in this list
-     *            are given the values of the first N columns in the from
-     *            parameter.  Can be null if the cursor is not available yet.
-     */
-    public void changeCursorAndColumns(Cursor c, String[] from, int[] to) {
-        mOriginalFrom = from;
-        mTo = to;
-        // super.changeCursor() will notify observers before we have
-        // a valid mapping, make sure we have a mapping before this
-        // happens
-        findColumns(c, mOriginalFrom);
-        super.changeCursor(c);
-    }
-
-    /**
-     * This class can be used by external clients of SimpleCursorAdapter
-     * to bind values fom the Cursor to views.
-     *
-     * You should use this class to bind values from the Cursor to views
-     * that are not directly supported by SimpleCursorAdapter or to
-     * change the way binding occurs for views supported by
-     * SimpleCursorAdapter.
-     *
-     * @see SimpleCursorAdapter#bindView(android.view.View, android.content.Context, android.database.Cursor)
-     * @see SimpleCursorAdapter#setViewImage(ImageView, String) 
-     * @see SimpleCursorAdapter#setViewText(TextView, String)
-     */
-    public static interface ViewBinder {
-        /**
-         * Binds the Cursor column defined by the specified index to the specified view.
-         *
-         * When binding is handled by this ViewBinder, this method must return true.
-         * If this method returns false, SimpleCursorAdapter will attempts to handle
-         * the binding on its own.
-         *
-         * @param view the view to bind the data to
-         * @param cursor the cursor to get the data from
-         * @param columnIndex the column at which the data can be found in the cursor
-         *
-         * @return true if the data was bound to the view, false otherwise
-         */
-        boolean setViewValue(View view, Cursor cursor, int columnIndex);
-    }
-
-    /**
-     * This class can be used by external clients of SimpleCursorAdapter
-     * to define how the Cursor should be converted to a String.
-     *
-     * @see android.widget.CursorAdapter#convertToString(android.database.Cursor)
-     */
-    public static interface CursorToStringConverter {
-        /**
-         * Returns a CharSequence representing the specified Cursor.
-         *
-         * @param cursor the cursor for which a CharSequence representation
-         *        is requested
-         *
-         * @return a non-null CharSequence representing the cursor
-         */
-        CharSequence convertToString(Cursor cursor);
-    }
-
-}

app/src/main/java/com/mobeta/android/dslv/SimpleFloatViewManager.java

@@ -1,89 +0,0 @@
-package com.mobeta.android.dslv;
-
-import android.graphics.Bitmap;
-import android.graphics.Point;
-import android.graphics.Color;
-import android.widget.ListView;
-import android.widget.ImageView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.util.Log;
-
-/**
- * Simple implementation of the FloatViewManager class. Uses list
- * items as they appear in the ListView to create the floating View.
- */
-public class SimpleFloatViewManager implements DragSortListView.FloatViewManager {
-
-    private Bitmap mFloatBitmap;
-
-    private ImageView mImageView;
-
-    private int mFloatBGColor = Color.BLACK;
-
-    private ListView mListView;
-
-    public SimpleFloatViewManager(ListView lv) {
-        mListView = lv;
-    }
-
-    public void setBackgroundColor(int color) {
-        mFloatBGColor = color;
-    }
-
-    /**
-     * This simple implementation creates a Bitmap copy of the
-     * list item currently shown at ListView <code>position</code>.
-     */
-    @Override
-    public View onCreateFloatView(int position) {
-        // Guaranteed that this will not be null? I think so. Nope, got
-        // a NullPointerException once...
-        View v = mListView.getChildAt(position + mListView.getHeaderViewsCount() - mListView.getFirstVisiblePosition());
-
-        if (v == null) {
-            return null;
-        }
-
-        v.setPressed(false);
-
-        // Create a copy of the drawing cache so that it does not get
-        // recycled by the framework when the list tries to clean up memory
-        //v.setDrawingCacheQuality(View.DRAWING_CACHE_QUALITY_HIGH);
-        v.setDrawingCacheEnabled(true);
-        mFloatBitmap = Bitmap.createBitmap(v.getDrawingCache());
-        v.setDrawingCacheEnabled(false);
-
-        if (mImageView == null) {
-            mImageView = new ImageView(mListView.getContext());
-        }
-        mImageView.setBackgroundColor(mFloatBGColor);
-        mImageView.setPadding(0, 0, 0, 0);
-        mImageView.setImageBitmap(mFloatBitmap);
-        mImageView.setLayoutParams(new ViewGroup.LayoutParams(v.getWidth(), v.getHeight()));
-
-        return mImageView;
-    }
-
-    /**
-     * This does nothing
-     */
-    @Override
-    public void onDragFloatView(View floatView, Point position, Point touch) {
-        // do nothing
-    }
-
-    /**
-     * Removes the Bitmap from the ImageView created in
-     * onCreateFloatView() and tells the system to recycle it.
-     */
-    @Override
-    public void onDestroyFloatView(View floatView) {
-        ((ImageView) floatView).setImageDrawable(null);
-
-        mFloatBitmap.recycle();
-        mFloatBitmap = null;
-    }
-
-}
-

app/src/main/java/org/isoron/helpers/ColorHelper.java

@@ -1,60 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.helpers;
-
-import android.graphics.Color;
-
-public class ColorHelper
-{
-    public static final int[] palette =
-	{
-			Color.parseColor("#D32F2F"), // red
-            Color.parseColor("#E64A19"), // orange
-			Color.parseColor("#F9A825"), // yellow
-            Color.parseColor("#AFB42B"), // light green
-			Color.parseColor("#388E3C"), // dark green
-            Color.parseColor("#00897B"), // teal
-			Color.parseColor("#00ACC1"), // cyan
-            Color.parseColor("#039BE5"), // blue
-			Color.parseColor("#5E35B1"), // deep purple
-            Color.parseColor("#8E24AA"), // purple
-			Color.parseColor("#D81B60"), // pink
-            Color.parseColor("#303030"), // dark grey
-			Color.parseColor("#aaaaaa")  // light grey
-	};
-
-    public static int mixColors(int color1, int color2, float amount)
-	{
-		final byte ALPHA_CHANNEL = 24;
-		final byte RED_CHANNEL = 16;
-		final byte GREEN_CHANNEL = 8;
-		final byte BLUE_CHANNEL = 0;
-
-		final float inverseAmount = 1.0f - amount;
-
-		int a = ((int) (((float) (color1 >> ALPHA_CHANNEL & 0xff) * amount) +
-				((float) (color2 >> ALPHA_CHANNEL & 0xff) * inverseAmount))) & 0xff;
-		int r = ((int) (((float) (color1 >> RED_CHANNEL & 0xff) * amount) +
-				((float) (color2 >> RED_CHANNEL & 0xff) * inverseAmount))) & 0xff;
-		int g = ((int) (((float) (color1 >> GREEN_CHANNEL & 0xff) * amount) +
-				((float) (color2 >> GREEN_CHANNEL & 0xff) * inverseAmount))) & 0xff;
-		int b = ((int) (((float) (color1 & 0xff) * amount) +
-				((float) (color2 & 0xff) * inverseAmount))) & 0xff;
-
-		return a << ALPHA_CHANNEL | r << RED_CHANNEL | g << GREEN_CHANNEL | b << BLUE_CHANNEL;
-	}
-}

app/src/main/java/org/isoron/helpers/Command.java

@@ -1,34 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.helpers;
-
-public abstract class Command
-{
-    public abstract void execute();
-
-    public abstract void undo();
-
-    public Integer getExecuteStringId()
-    {
-        return null;
-    }
-
-    public Integer getUndoStringId()
-    {
-        return null;
-    }
-}

app/src/main/java/org/isoron/helpers/DateHelper.java

@@ -1,116 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.helpers;
-
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-public class DateHelper
-{
-	public static int millisecondsInOneDay = 24 * 60 * 60 * 1000;
-	
-	public static long getLocalTime()
-	{
-		TimeZone tz = TimeZone.getDefault();
-		long now = new Date().getTime();
-		return now + tz.getOffset(now);
-	}
-	
-	public static long getStartOfDay(long timestamp)
-	{
-		return (timestamp / millisecondsInOneDay) * millisecondsInOneDay;
-	}
-	
-	public static long getStartOfToday()
-	{
-		return getStartOfDay(DateHelper.getLocalTime());
-	}
-
-//	public static Date getStartOfDay(Date date)
-//	{
-//		Calendar calendar = Calendar.getInstance();
-//		calendar.setTime(date);
-//		calendar.set(Calendar.HOUR_OF_DAY, 0);
-//		calendar.set(Calendar.MINUTE, 0);
-//		calendar.set(Calendar.SECOND, 0);
-//		calendar.set(Calendar.MILLISECOND, 0);
-//		return calendar.getTime();
-//	}
-
-	public static int differenceInDays(Date from, Date to)
-	{
-		long milliseconds = getStartOfDay(to.getTime()) - getStartOfDay(from.getTime());
-        return (int) (milliseconds / millisecondsInOneDay);
-	}
-
-	public static String differenceInWords(Date from, Date to)
-	{
-		Integer days = differenceInDays(from, to);
-		boolean negative = (days < 0);
-		days = Math.abs(days);
-
-		Integer weeks = (int) Math.round(days / 7.0);
-		Double months = days / 30.4;
-		Double years = days / 365.0;
-
-		StringBuffer s = new StringBuffer();
-		DecimalFormat df = new DecimalFormat("#.#");
-
-		if(months > 18)
-		{
-			s.append(df.format(years));
-			s.append(" years");
-		}
-		else if(weeks > 6)
-		{
-			s.append(df.format(months));
-			s.append(" months");
-		}
-		else if(days > 13)
-		{
-			s.append(weeks);
-			s.append(" weeks");
-		}
-		else if(days > 6)
-		{
-			s.append(days);
-			s.append(" days");
-		}
-		else
-		{
-			if(days == 0)
-				s.append("Today");
-			else if(days == 1 && negative)
-				s.append("Yesterday");
-			else if(days == 1 && !negative)
-				s.append("Tomorrow");
-			else
-			{
-				if(negative)
-					s.append("past ");
-				s.append(new SimpleDateFormat("EEEE").format(to));
-			}
-		}
-
-		if(negative && days > 6)
-			s.append(" ago");
-
-		return s.toString();
-	}
-}

app/src/main/java/org/isoron/helpers/DialogHelper.java

@@ -1,57 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.helpers;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-
-public abstract class DialogHelper
-{
-
-	//	public static AlertDialog alert(Activity context, String title, String message, OnClickListener positiveClickListener) {
-	//		return new AlertDialog.Builder(context)
-	//			.setTitle(title)
-	//			.setMessage(message)
-	//			.setPositiveButton(android.R.string.yes, positiveClickListener)
-	//			.setNegativeButton(android.R.string.no, null).show();
-	//	}
-
-	public static abstract class SimpleClickListener implements OnClickListener
-	{
-		public abstract void onClick();
-
-		public void onClick(DialogInterface dialog, int whichButton)
-		{
-			onClick();
-		}
-	}
-
-	public static interface OnSavedListener
-	{
-		public void onSaved(Command command, Object savedObject);
-	}
-
-	public static void showSoftKeyboard(View view)
-	{
-		InputMethodManager imm = (InputMethodManager)
-				view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-		imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-	}
-}

app/src/main/java/org/isoron/helpers/ReplayableActivity.java

@@ -1,116 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.helpers;
-
-import android.app.Activity;
-import android.app.backup.BackupManager;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.widget.Toast;
-
-import org.isoron.uhabits.R;
-
-import java.util.LinkedList;
-
-abstract public class ReplayableActivity extends Activity
-{
-    private static int MAX_UNDO_LEVEL = 15;
-
-    private LinkedList<Command> undoList;
-    private LinkedList<Command> redoList;
-    private Toast toast;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-
-        undoList = new LinkedList<>();
-        redoList = new LinkedList<>();
-    }
-
-    public void executeCommand(Command command, Long refreshKey)
-    {
-        executeCommand(command, false, refreshKey);
-    }
-
-    protected void undo()
-    {
-        if (undoList.isEmpty())
-        {
-            showToast(R.string.toast_nothing_to_undo);
-            return;
-        }
-
-        Command last = undoList.pop();
-        redoList.push(last);
-        last.undo();
-        showToast(last.getUndoStringId());
-    }
-
-    protected void redo()
-    {
-        if (redoList.isEmpty())
-        {
-            showToast(R.string.toast_nothing_to_redo);
-            return;
-        }
-        Command last = redoList.pop();
-        executeCommand(last, false, null);
-    }
-
-    public void showToast(Integer stringId)
-    {
-        if (stringId == null) return;
-        if (toast == null) toast = Toast.makeText(this, stringId, Toast.LENGTH_SHORT);
-        else toast.setText(stringId);
-        toast.show();
-    }
-
-    public void executeCommand(final Command command, Boolean clearRedoStack,
-                               final Long refreshKey)
-    {
-        undoList.push(command);
-
-        if (undoList.size() > MAX_UNDO_LEVEL) undoList.removeLast();
-        if (clearRedoStack) redoList.clear();
-
-        new AsyncTask<Void, Void, Void>()
-        {
-            @Override
-            protected Void doInBackground(Void... params)
-            {
-                command.execute();
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Void aVoid)
-            {
-                ReplayableActivity.this.onPostExecuteCommand(refreshKey);
-                BackupManager.dataChanged("org.isoron.uhabits");
-            }
-        }.execute();
-
-
-        showToast(command.getExecuteStringId());
-    }
-
-    public void onPostExecuteCommand(Long refreshKey)
-    {
-    }
-}

app/src/main/java/org/isoron/uhabits/HabitsBackupAgent.java

@@ -1,31 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits;
-
-import android.app.backup.BackupAgentHelper;
-import android.app.backup.FileBackupHelper;
-import android.app.backup.SharedPreferencesBackupHelper;
-
-public class HabitsBackupAgent extends BackupAgentHelper
-{
-    @Override
-    public void onCreate()
-    {
-        addHelper("preferences", new SharedPreferencesBackupHelper(this, "preferences"));
-        addHelper("database", new FileBackupHelper(this, "../databases/uhabits.db"));
-    }
-}

app/src/main/java/org/isoron/uhabits/IntroActivity.java

@@ -1,67 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits;
-
-import android.app.Activity;
-import android.graphics.Color;
-import android.os.Bundle;
-
-import com.github.paolorotolo.appintro.AppIntro2;
-import com.github.paolorotolo.appintro.AppIntroFragment;
-
-public class IntroActivity extends AppIntro2
-{
-    @Override
-    public void init(Bundle savedInstanceState)
-    {
-        showStatusBar(false);
-
-        addSlide(AppIntroFragment.newInstance("Welcome",
-                "Habits Tracker helps you create and maintain good habits.", R.drawable.tutorial_1,
-                Color.parseColor("#194673")));
-
-        addSlide(AppIntroFragment.newInstance("Create some new habits",
-                "Every day, after performing your habit, put a checkmark on the app.",
-                R.drawable.tutorial_2, Color.parseColor("#ffa726")));
-
-        addSlide(AppIntroFragment.newInstance("Keep doing it",
-                "Habits performed consistently for a long time will earn a full star.",
-                R.drawable.tutorial_3, Color.parseColor("#7cb342")));
-
-        addSlide(AppIntroFragment.newInstance("Track your progress",
-                "Detailed graphs show you how your habits improved over time.",
-                R.drawable.tutorial_4, Color.parseColor("#9575cd")));
-    }
-
-    @Override
-    public void onNextPressed()
-    {
-
-    }
-
-    @Override
-    public void onDonePressed()
-    {
-        finish();
-    }
-
-    @Override
-    public void onSlideChanged()
-    {
-
-    }
-}

app/src/main/java/org/isoron/uhabits/MainActivity.java

@@ -1,104 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits;
-
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import org.isoron.helpers.ReplayableActivity;
-import org.isoron.uhabits.dialogs.ListHabitsFragment;
-import org.isoron.uhabits.models.Habit;
-
-public class MainActivity extends ReplayableActivity
-        implements ListHabitsFragment.OnHabitClickListener
-{
-    private ListHabitsFragment listHabitsFragment;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_habits_activity);
-
-        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
-
-        listHabitsFragment = (ListHabitsFragment) getFragmentManager().findFragmentById(
-                R.id.fragment1);
-
-        ReminderHelper.createReminderAlarms(MainActivity.this);
-
-        showTutorial();
-
-    }
-
-    private void showTutorial()
-    {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        Boolean firstRun = prefs.getBoolean("pref_first_run", true);
-
-        if(firstRun)
-        {
-            SharedPreferences.Editor editor = prefs.edit();
-            editor.putBoolean("pref_first_run", false);
-            editor.apply();
-
-            Intent intent = new Intent(this, IntroActivity.class);
-            this.startActivity(intent);
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        getMenuInflater().inflate(R.menu.list_habits_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        switch (item.getItemId())
-        {
-            case R.id.action_settings:
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivity(intent);
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public void onHabitClicked(Habit habit)
-    {
-        Intent intent = new Intent(this, ShowHabitActivity.class);
-        intent.setData(Uri.parse("content://org.isoron.uhabits/habit/" + habit.getId()));
-        startActivity(intent);
-    }
-
-    @Override
-    public void onPostExecuteCommand(Long refreshKey)
-    {
-        listHabitsFragment.onPostExecuteCommand(refreshKey);
-    }
-}

app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java

@@ -1,161 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits;
-
-import android.app.Activity;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.BitmapFactory;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NotificationCompat;
-import android.util.Log;
-
-import org.isoron.uhabits.models.Habit;
-
-import java.util.Date;
-
-public class ReminderAlarmReceiver extends BroadcastReceiver
-{
-
-    public static String ACTION_CHECK = "org.isoron.uhabits.ACTION_CHECK";
-    public static String ACTION_DISMISS = "org.isoron.uhabits.ACTION_DISMISS";
-    public static String ACTION_REMIND = "org.isoron.uhabits.ACTION_REMIND";
-    public static String ACTION_REMOVE_REMINDER = "org.isoron.uhabits.ACTION_REMOVE_REMINDER";
-    public static String ACTION_SNOOZE = "org.isoron.uhabits.ACTION_SNOOZE";
-
-    @Override
-    public void onReceive(Context context, Intent intent)
-    {
-        String action = intent.getAction();
-
-        if (action.equals(ACTION_REMIND)) createNotification(context, intent.getData());
-
-        else if (action.equals(ACTION_DISMISS)) dismissAllHabits();
-
-        else if (action.equals(ACTION_CHECK)) checkHabit(context, intent.getData());
-
-        else if (action.equals(ACTION_SNOOZE)) snoozeHabit(context, intent.getData());
-    }
-
-    private void snoozeHabit(Context context, Uri data)
-    {
-
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        long delayMinutes = Long.parseLong(prefs.getString("pref_snooze_interval", "15"));
-
-        Habit habit = Habit.get(ContentUris.parseId(data));
-        ReminderHelper.createReminderAlarm(context, habit,
-                new Date().getTime() + delayMinutes * 60 * 1000);
-        dismissNotification(context, habit);
-    }
-
-    private void checkHabit(Context context, Uri data)
-    {
-        Habit habit = Habit.get(ContentUris.parseId(data));
-        habit.toggleRepetitionToday();
-        habit.save();
-        dismissNotification(context, habit);
-    }
-
-    private void dismissAllHabits()
-    {
-        for (Habit h : Habit.getHighlightedHabits())
-        {
-            h.highlight = 0;
-            h.save();
-        }
-    }
-
-    private void dismissNotification(Context context, Habit habit)
-    {
-        NotificationManager notificationManager =
-                (NotificationManager) context.getSystemService(Activity.NOTIFICATION_SERVICE);
-
-        int notificationId = (int) (habit.getId() % Integer.MAX_VALUE);
-        notificationManager.cancel(notificationId);
-    }
-
-
-    private void createNotification(Context context, Uri data)
-    {
-
-        Habit habit = Habit.get(ContentUris.parseId(data));
-
-        if (habit.hasImplicitRepToday()) return;
-
-        Log.d("Alarm", String.format("Applying highlight: %s", habit.name));
-        habit.highlight = 1;
-        habit.save();
-
-        // Check if reminder has been turned off after alarm was scheduled
-        if (habit.reminder_hour == null) return;
-
-        Intent contentIntent = new Intent(context, MainActivity.class);
-        contentIntent.setData(data);
-        PendingIntent contentPendingIntent =
-                PendingIntent.getActivity(context, 0, contentIntent, 0);
-
-        Intent deleteIntent = new Intent(context, ReminderAlarmReceiver.class);
-        deleteIntent.setAction(ACTION_DISMISS);
-        PendingIntent deletePendingIntent = PendingIntent.getBroadcast(context, 0, deleteIntent, 0);
-
-        Intent checkIntent = new Intent(context, ReminderAlarmReceiver.class);
-        checkIntent.setData(data);
-        checkIntent.setAction(ACTION_CHECK);
-        PendingIntent checkIntentPending = PendingIntent.getBroadcast(context, 0, checkIntent, 0);
-
-        Intent snoozeIntent = new Intent(context, ReminderAlarmReceiver.class);
-        snoozeIntent.setData(data);
-        snoozeIntent.setAction(ACTION_SNOOZE);
-        PendingIntent snoozeIntentPending = PendingIntent.getBroadcast(context, 0, snoozeIntent, 0);
-
-        Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-
-        NotificationCompat.WearableExtender wearableExtender =
-                new NotificationCompat.WearableExtender().setBackground(
-                        BitmapFactory.decodeResource(context.getResources(), R.drawable.stripe));
-
-        Notification notification =
-                new NotificationCompat.Builder(context).setSmallIcon(R.drawable.ic_notification)
-                        .setContentTitle(habit.name)
-                        .setContentText(habit.description)
-                        .setContentIntent(contentPendingIntent)
-                        .setDeleteIntent(deletePendingIntent)
-                        .addAction(R.drawable.ic_action_check, "Check", checkIntentPending)
-                        .addAction(R.drawable.ic_action_snooze, "Later", snoozeIntentPending)
-                        .setSound(soundUri)
-                        .extend(wearableExtender)
-                        .build();
-
-        notification.flags |= Notification.FLAG_AUTO_CANCEL;
-
-        NotificationManager notificationManager =
-                (NotificationManager) context.getSystemService(Activity.NOTIFICATION_SERVICE);
-
-        int notificationId = (int) (habit.getId() % Integer.MAX_VALUE);
-        notificationManager.notify(notificationId, notification);
-    }
-
-}

app/src/main/java/org/isoron/uhabits/ReminderHelper.java

@@ -1,82 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-
-import org.isoron.uhabits.models.Habit;
-
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-public class ReminderHelper
-{
-    public static void createReminderAlarms(Context context)
-    {
-        for (Habit habit : Habit.getHabitsWithReminder())
-            createReminderAlarm(context, habit, null);
-    }
-
-    public static void createReminderAlarm(Context context, Habit habit, Long reminderTime)
-    {
-        Uri uri = Uri.parse("content://org.isoron.uhabits/habit/" + habit.getId());
-
-        if (reminderTime == null)
-        {
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTimeInMillis(System.currentTimeMillis());
-            calendar.set(Calendar.HOUR_OF_DAY, habit.reminder_hour);
-            calendar.set(Calendar.MINUTE, habit.reminder_min);
-            calendar.set(Calendar.SECOND, 0);
-
-            reminderTime = calendar.getTimeInMillis();
-
-            if (System.currentTimeMillis() > reminderTime)
-            {
-                reminderTime += AlarmManager.INTERVAL_DAY;
-            }
-        }
-
-        Intent alarmIntent = new Intent(context, ReminderAlarmReceiver.class);
-        alarmIntent.setAction(ReminderAlarmReceiver.ACTION_REMIND);
-        alarmIntent.setData(uri);
-
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(context,
-                ((int) (habit.getId() % Integer.MAX_VALUE)) + 1, alarmIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-
-        AlarmManager manager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        if (Build.VERSION.SDK_INT >= 19)
-        {
-            manager.setExact(AlarmManager.RTC_WAKEUP, reminderTime, pendingIntent);
-        }
-        else
-        {
-            manager.set(AlarmManager.RTC_WAKEUP, reminderTime, pendingIntent);
-        }
-
-        Log.d("Alarm", String.format("Setting alarm (%s): %s",
-                DateFormat.getDateTimeInstance().format(new Date(reminderTime)), habit.name));
-    }
-}

app/src/main/java/org/isoron/uhabits/SettingsActivity.java

@@ -1,33 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import org.isoron.uhabits.dialogs.SettingsFragment;
-
-public class SettingsActivity extends Activity
-{
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        getFragmentManager().beginTransaction().replace(android.R.id.content,
-                new SettingsFragment()).commit();
-    }
-}

app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java

@@ -1,73 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits;
-
-import org.isoron.helpers.ReplayableActivity;
-import org.isoron.uhabits.models.Habit;
-
-import android.app.Activity;
-import android.content.ContentUris;
-import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-
-public class ShowHabitActivity extends ReplayableActivity
-{
-
-    public Habit habit;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-
-        Uri data = getIntent().getData();
-        habit = Habit.get(ContentUris.parseId(data));
-        getActionBar().setTitle(habit.name);
-
-        if (android.os.Build.VERSION.SDK_INT >= 21)
-        {
-            getActionBar().setBackgroundDrawable(new ColorDrawable(habit.color));
-        }
-
-        setContentView(R.layout.show_habit_activity);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        getMenuInflater().inflate(R.menu.show_habit_activity_menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        switch (item.getItemId())
-        {
-            case R.id.action_settings:
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivity(intent);
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-}

app/src/main/java/org/isoron/uhabits/dialogs/EditHabitFragment.java

@@ -1,305 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.dialogs;
-
-import org.isoron.helpers.ColorHelper;
-import org.isoron.helpers.Command;
-import org.isoron.helpers.DialogHelper.OnSavedListener;
-import org.isoron.uhabits.R;
-import org.isoron.uhabits.models.Habit;
-
-import android.app.DialogFragment;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.graphics.ColorMatrix;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.TextView;
-
-import com.android.colorpicker.ColorPickerDialog;
-import com.android.colorpicker.ColorPickerSwatch;
-import com.android.datetimepicker.time.RadialPickerLayout;
-import com.android.datetimepicker.time.TimePickerDialog;
-import com.android.datetimepicker.time.TimePickerDialog.OnTimeSetListener;
-
-public class EditHabitFragment extends DialogFragment implements OnClickListener
-{
-	private int mode;
-	static final int EDIT_MODE = 0;
-	static final int CREATE_MODE = 1;
-
-	private OnSavedListener onSavedListener;
-
-	private Habit originalHabit, modified_habit;
-	private TextView tvName, tvDescription, tvFreqNum, tvFreqDen, tvInputReminder;
-
-	private SharedPreferences prefs;
-
-	static class SolidColorMatrix extends ColorMatrix
-	{
-		public SolidColorMatrix(int color)
-		{
-			float matrix[] = { 0.0f, 0.0f, 0.0f, 0.0f, Color.red(color), 0.0f, 0.0f, 0.0f, 0.0f,
-					Color.green(color), 0.0f, 0.0f, 0.0f, 0.0f, Color.blue(color), 0.0f, 0.0f,
-					0.0f, 1.0f, 0 };
-			set(matrix);
-		}
-	}
-
-	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-	 *                                    Factory                                    *
-	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-	static EditHabitFragment editSingleHabitFragment(long id)
-	{
-		EditHabitFragment frag = new EditHabitFragment();
-		Bundle args = new Bundle();
-		args.putLong("habitId", id);
-		args.putInt("editMode", EDIT_MODE);
-		frag.setArguments(args);
-		return frag;
-	}
-
-	static EditHabitFragment createHabitFragment()
-	{
-		EditHabitFragment frag = new EditHabitFragment();
-		Bundle args = new Bundle();
-		args.putInt("editMode", CREATE_MODE);
-		frag.setArguments(args);
-		return frag;
-	}
-
-	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-	 *                                   Creation                                    *
-	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState)
-	{
-		View view = inflater.inflate(R.layout.edit_habit, container, false);
-		tvName = (TextView) view.findViewById(R.id.input_name);
-		tvDescription = (TextView) view.findViewById(R.id.input_description);
-		tvFreqNum = (TextView) view.findViewById(R.id.input_freq_num);
-		tvFreqDen = (TextView) view.findViewById(R.id.input_freq_den);
-		tvInputReminder = (TextView) view.findViewById(R.id.input_reminder_time);
-
-		Button buttonSave = (Button) view.findViewById(R.id.buttonSave);
-		Button buttonDiscard = (Button) view.findViewById(R.id.buttonDiscard);
-
-		buttonSave.setOnClickListener(this);
-		buttonDiscard.setOnClickListener(this);
-		tvInputReminder.setOnClickListener(this);
-
-		ImageButton buttonPickColor = (ImageButton) view.findViewById(R.id.button_pick_color);
-
-		prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
-
-		Bundle args = getArguments();
-		mode = (Integer) args.get("editMode");
-
-		if(mode == CREATE_MODE)
-		{
-			getDialog().setTitle("Create habit");
-			modified_habit = new Habit();
-
-			int defaultNum = prefs.getInt("pref_default_habit_freq_num", modified_habit.freq_num);
-			int defaultDen = prefs.getInt("pref_default_habit_freq_den", modified_habit.freq_den);
-			int defaultColor = prefs.getInt("pref_default_habit_color", modified_habit.color);
-
-			modified_habit.color = defaultColor;
-			modified_habit.freq_num = defaultNum;
-			modified_habit.freq_den = defaultDen;
-        }
-		else if(mode == EDIT_MODE)
-		{
-			originalHabit = Habit.get((Long) args.get("habitId"));
-			modified_habit = new Habit(originalHabit);
-
-			getDialog().setTitle("Edit habit");
-			tvName.append(modified_habit.name);
-			tvDescription.append(modified_habit.description);
-		}
-
-		tvFreqNum.append(modified_habit.freq_num.toString());
-		tvFreqDen.append(modified_habit.freq_den.toString());
-
-		changeColor(modified_habit.color);
-		updateReminder();
-
-		buttonPickColor.setOnClickListener(new OnClickListener()
-		{
-			public void onClick(View view)
-			{
-				ColorPickerDialog picker = ColorPickerDialog.newInstance(
-						R.string.color_picker_default_title,
-						ColorHelper.palette, modified_habit.color, 4, ColorPickerDialog.SIZE_SMALL);
-
-				picker.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener()
-				{
-					public void onColorSelected(int color)
-					{
-						changeColor(color);
-					}
-				});
-				picker.show(getFragmentManager(), "picker");
-			}
-		});
-
-		return view;
-	}
-
-	private void changeColor(Integer color)
-	{
-		modified_habit.color = color;
-		tvName.setTextColor(color);
-
-		SharedPreferences.Editor editor = prefs.edit();
-		editor.putInt("pref_default_habit_color", color);
-		editor.apply();
-	}
-
-	private void updateReminder()
-	{
-		if(modified_habit.reminder_hour != null)
-		{
-			tvInputReminder.setTextColor(Color.BLACK);
-			tvInputReminder.setText(String.format("%02d:%02d", modified_habit.reminder_hour,
-					modified_habit.reminder_min));
-		}
-		else
-		{
-			tvInputReminder.setTextColor(Color.GRAY);
-			tvInputReminder.setText("Off");
-		}
-	}
-
-	public void setOnSavedListener(OnSavedListener onSavedListener)
-	{
-		this.onSavedListener = onSavedListener;
-	}
-
-	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-	 *                                    Callback                                   *
-	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-	@Override
-	public void onClick(View v)
-	{
-		int id = v.getId();
-		
-		/* Due date spinner */
-		if(id == R.id.input_reminder_time)
-		{
-			int default_hour = 8;
-			int default_min  = 0;
-
-			if(modified_habit.reminder_hour != null) {
-				default_hour = modified_habit.reminder_hour;
-				default_min = modified_habit.reminder_min;
-			}
-
-			TimePickerDialog timePicker = TimePickerDialog.newInstance(new OnTimeSetListener()
-			{
-
-				@Override
-				public void onTimeSet(RadialPickerLayout view, int hour, int minute)
-				{
-					modified_habit.reminder_hour = hour;
-					modified_habit.reminder_min = minute;
-					updateReminder();
-				}
-
-				@Override
-				public void onTimeCleared(RadialPickerLayout view)
-				{
-					modified_habit.reminder_hour = null;
-					modified_habit.reminder_min = null;
-					updateReminder();
-				}
-			}, default_hour, default_min, true);
-			timePicker.show(getFragmentManager(), "timePicker");
-		}
-
-		/* Save button */
-		if(id == R.id.buttonSave)
-		{
-			Command command = null;
-
-			modified_habit.name = tvName.getText().toString().trim();
-			modified_habit.description = tvDescription.getText().toString().trim();
-			modified_habit.freq_num = Integer.parseInt(tvFreqNum.getText().toString());
-			modified_habit.freq_den = Integer.parseInt(tvFreqDen.getText().toString());
-
-			Boolean valid = true;
-
-			if(modified_habit.name.length() == 0)
-			{
-				tvName.setError("Name cannot be blank.");
-				valid = false;
-			}
-
-			if(modified_habit.freq_den <= 0)
-			{
-				tvFreqNum.setError("Number must be positive.");
-				valid = false;
-			}
-
-			if(modified_habit.freq_num > modified_habit.freq_den)
-			{
-				tvFreqNum.setError("You can have at most one repetition per day");
-				valid = false;
-			}
-
-			if(!valid)
-				return;
-
-			SharedPreferences.Editor editor = prefs.edit();
-			editor.putInt("pref_default_habit_freq_num", modified_habit.freq_num);
-			editor.putInt("pref_default_habit_freq_den", modified_habit.freq_den);
-			editor.apply();
-
-			Habit savedHabit = null;
-
-			if(mode == EDIT_MODE)
-			{
-				command = originalHabit.new EditCommand(modified_habit);
-				savedHabit = originalHabit;
-			}
-
-			if(mode == CREATE_MODE)
-				command = new Habit.CreateCommand(modified_habit);
-
-			if(onSavedListener != null)
-				onSavedListener.onSaved(command, savedHabit);
-
-			dismiss();
-		}
-
-		/* Discard button */
-		if(id == R.id.buttonDiscard)
-		{
-			dismiss();
-		}
-	}
-}

app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java

@@ -1,672 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.dialogs;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Color;
-import android.graphics.Point;
-import android.graphics.Typeface;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Vibrator;
-import android.preference.PreferenceManager;
-import android.util.DisplayMetrics;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Display;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.mobeta.android.dslv.DragSortController;
-import com.mobeta.android.dslv.DragSortListView;
-import com.mobeta.android.dslv.DragSortListView.DropListener;
-
-import org.isoron.helpers.ColorHelper;
-import org.isoron.helpers.Command;
-import org.isoron.helpers.DateHelper;
-import org.isoron.helpers.DialogHelper.OnSavedListener;
-import org.isoron.helpers.ReplayableActivity;
-import org.isoron.uhabits.R;
-import org.isoron.uhabits.ReminderHelper;
-import org.isoron.uhabits.models.Habit;
-
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.TimeZone;
-
-public class ListHabitsFragment extends Fragment
-        implements OnSavedListener, OnItemClickListener, OnLongClickListener, DropListener,
-        OnClickListener
-{
-
-    public static final int INACTIVE_COLOR = Color.rgb(230, 230, 230);
-
-    public interface OnHabitClickListener
-    {
-        void onHabitClicked(Habit habit);
-    }
-
-    ListHabitsAdapter adapter;
-    DragSortListView listView;
-    ReplayableActivity activity;
-    TextView tvNameHeader;
-    long lastLongClick = 0;
-    private int tvNameWidth;
-    private int button_count;
-    private View llEmpty;
-    private ProgressBar progressBar;
-
-    private OnHabitClickListener habitClickListener;
-    private boolean short_toggle_enabled;
-
-    private HashMap<Long, Habit> habits;
-    private HashMap<Integer, Habit> positionToHabit;
-    private HashMap<Long, int[]> checkmarks;
-    private HashMap<Long, Integer> scores;
-
-    private Long lastLoadedTimestamp = null;
-    private AsyncTask<Void, Integer, Void> currentFetchTask = null;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState)
-    {
-        DisplayMetrics dm = getResources().getDisplayMetrics();
-        int width = (int) (dm.widthPixels / dm.density);
-        button_count = (int) ((width - 160) / 42);
-        tvNameWidth = (int) ((width - 30 - button_count * 42) * dm.density);
-
-        habits = new HashMap<>();
-        positionToHabit = new HashMap<>();
-        checkmarks = new HashMap<>();
-        scores = new HashMap<>();
-
-        View view = inflater.inflate(R.layout.list_habits_fragment, container, false);
-        tvNameHeader = (TextView) view.findViewById(R.id.tvNameHeader);
-
-        progressBar = (ProgressBar) view.findViewById(R.id.progressBar);
-        progressBar.setVisibility(View.INVISIBLE);
-
-        adapter = new ListHabitsAdapter(getActivity());
-        listView = (DragSortListView) view.findViewById(R.id.listView);
-        listView.setAdapter(adapter);
-        listView.setOnItemClickListener(this);
-        registerForContextMenu(listView);
-        listView.setDropListener(this);
-
-        DragSortController controller = new DragSortController(listView);
-        controller.setDragHandleId(R.id.tvStar);
-        controller.setRemoveEnabled(false);
-        controller.setSortEnabled(true);
-        controller.setDragInitMode(1);
-
-        listView.setFloatViewManager(controller);
-        listView.setOnTouchListener(controller);
-        listView.setDragEnabled(true);
-
-        Typeface fontawesome = Typeface.createFromAsset(getActivity().getAssets(),
-                "fontawesome-webfont.ttf");
-        ((TextView) view.findViewById(R.id.tvStarEmpty)).setTypeface(fontawesome);
-        llEmpty = view.findViewById(R.id.llEmpty);
-
-        updateEmptyMessage();
-        setHasOptionsMenu(true);
-        return view;
-    }
-
-    @Override
-    public void onAttach(Activity activity)
-    {
-        super.onAttach(activity);
-        habitClickListener = (OnHabitClickListener) activity;
-        this.activity = (ReplayableActivity) activity;
-    }
-
-    @Override
-    public void onResume()
-    {
-        super.onResume();
-        if(lastLoadedTimestamp == null || lastLoadedTimestamp != DateHelper.getStartOfToday())
-        {
-            updateHeader();
-            fetchAllHabits();
-            updateEmptyMessage();
-        }
-
-        adapter.notifyDataSetChanged();
-
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
-        short_toggle_enabled = prefs.getBoolean("pref_short_toggle", false);
-    }
-
-    private void updateHeader()
-    {
-        LayoutInflater inflater = activity.getLayoutInflater();
-        View view = getView();
-
-        if (view == null) return;
-
-        GregorianCalendar day = new GregorianCalendar(TimeZone.getTimeZone("GMT"));
-        day.setTimeInMillis(DateHelper.getStartOfDay(DateHelper.getLocalTime()));
-
-        LinearLayout llButtonsHeader = (LinearLayout) view.findViewById(R.id.llButtonsHeader);
-        llButtonsHeader.removeAllViews();
-
-        for (int i = 0; i < button_count; i++)
-        {
-            View check = inflater.inflate(R.layout.list_habits_header_check, null);
-            Button btCheck = (Button) check.findViewById(R.id.tvCheck);
-            btCheck.setText(day.getDisplayName(GregorianCalendar.DAY_OF_WEEK,
-                    GregorianCalendar.SHORT, Locale.US) + "\n" +
-                    Integer.toString(day.get(GregorianCalendar.DAY_OF_MONTH)));
-            llButtonsHeader.addView(check);
-
-            day.add(GregorianCalendar.DAY_OF_MONTH, -1);
-        }
-    }
-
-    private void fetchAllHabits()
-    {
-        if(currentFetchTask != null) currentFetchTask.cancel(true);
-
-        currentFetchTask = new AsyncTask<Void, Integer, Void>()
-        {
-            HashMap<Long, Habit> newHabits = Habit.getAll();
-            HashMap<Integer, Habit> newPositionToHabit = new HashMap<>();
-            HashMap<Long, int[]> newCheckmarks = new HashMap<>();
-            HashMap<Long, Integer> newScores = new HashMap<>();
-
-            @Override
-            protected Void doInBackground(Void... params)
-            {
-                long dateTo = DateHelper.getStartOfDay(DateHelper.getLocalTime());
-                long dateFrom = dateTo - (button_count - 1) * DateHelper.millisecondsInOneDay;
-                int[] empty = new int[button_count];
-
-                for(Habit h : newHabits.values())
-                {
-                    newScores.put(h.getId(), 0);
-                    newPositionToHabit.put(h.position, h);
-                    newCheckmarks.put(h.getId(), empty);
-                }
-
-                int current = 0;
-                for(int i = 0; i < newHabits.size(); i++)
-                {
-                    if(isCancelled()) return null;
-
-                    Habit h = newPositionToHabit.get(i);
-                    newScores.put(h.getId(), h.getScore());
-                    newCheckmarks.put(h.getId(), h.getCheckmarks(dateFrom, dateTo));
-
-                    publishProgress(current++, newHabits.size());
-                }
-
-                commit();
-
-                return null;
-            }
-
-            private void commit()
-            {
-                habits = newHabits;
-                positionToHabit = newPositionToHabit;
-                checkmarks = newCheckmarks;
-                scores = newScores;
-            }
-
-            @Override
-            protected void onPreExecute()
-            {
-                progressBar.setIndeterminate(false);
-                progressBar.setProgress(0);
-                progressBar.setVisibility(View.VISIBLE);
-            }
-
-            @Override
-            protected void onProgressUpdate(Integer... values)
-            {
-                progressBar.setMax(values[1]);
-                progressBar.setProgress(values[0]);
-
-                if(lastLoadedTimestamp == null)
-                {
-                    commit();
-                    adapter.notifyDataSetChanged();
-                }
-            }
-
-            @Override
-            protected void onPostExecute(Void aVoid)
-            {
-                if(isCancelled()) return;
-
-                adapter.notifyDataSetChanged();
-                updateEmptyMessage();
-
-                progressBar.setVisibility(View.INVISIBLE);
-                currentFetchTask = null;
-                lastLoadedTimestamp = DateHelper.getStartOfToday();
-            }
-
-        };
-
-        currentFetchTask.execute();
-    }
-
-    private void fetchHabit(final Long id)
-    {
-        new AsyncTask<Void, Void, Void>()
-        {
-            @Override
-            protected Void doInBackground(Void... params)
-            {
-                long dateTo = DateHelper.getStartOfDay(DateHelper.getLocalTime());
-                long dateFrom = dateTo - (button_count - 1) * DateHelper.millisecondsInOneDay;
-
-                Habit h = Habit.get(id);
-                habits.put(id, h);
-                scores.put(id, h.getScore());
-                checkmarks.put(id, h.getCheckmarks(dateFrom, dateTo));
-
-                return null;
-            }
-
-            @Override
-            protected void onPreExecute()
-            {
-                new Handler().postDelayed(new Runnable()
-                {
-                    @Override
-                    public void run()
-                    {
-                        if(getStatus() == Status.RUNNING)
-                        {
-                            progressBar.setIndeterminate(true);
-                            progressBar.setVisibility(View.VISIBLE);
-                        }
-                    }
-                }, 500);
-            }
-
-            @Override
-            protected void onPostExecute(Void aVoid)
-            {
-                progressBar.setVisibility(View.GONE);
-                adapter.notifyDataSetChanged();
-            }
-        }.execute();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
-    {
-        super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.list_habits_options, menu);
-
-        MenuItem showArchivedItem = menu.findItem(R.id.action_show_archived);
-        showArchivedItem.setChecked(Habit.isIncludeArchived());
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo)
-    {
-        super.onCreateContextMenu(menu, view, menuInfo);
-        getActivity().getMenuInflater().inflate(R.menu.list_habits_context, menu);
-
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
-        final Habit habit = habits.get(info.id);
-
-        if(habit.isArchived())
-            menu.findItem(R.id.action_archive_habit).setVisible(false);
-        else
-            menu.findItem(R.id.action_unarchive_habit).setVisible(false);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        switch(item.getItemId())
-        {
-            case R.id.action_add:
-            {
-                EditHabitFragment frag = EditHabitFragment.createHabitFragment();
-                frag.setOnSavedListener(this);
-                frag.show(getFragmentManager(), "dialog");
-                return true;
-            }
-
-            case R.id.action_show_archived:
-            {
-                Habit.setIncludeArchived(!Habit.isIncludeArchived());
-                fetchAllHabits();
-                activity.invalidateOptionsMenu();
-                return true;
-            }
-
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem menuItem)
-    {
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuItem.getMenuInfo();
-        final int id = menuItem.getItemId();
-        final Habit habit = habits.get(info.id);
-
-        if (id == R.id.action_edit_habit)
-        {
-            EditHabitFragment frag = EditHabitFragment.editSingleHabitFragment(habit.getId());
-            frag.setOnSavedListener(this);
-            frag.show(getFragmentManager(), "dialog");
-            return true;
-        }
-        else if (id == R.id.action_archive_habit)
-        {
-            Command c = habit.new ArchiveCommand();
-            executeCommand(c, null);
-        }
-        else if (id == R.id.action_unarchive_habit)
-        {
-            Command c = habit.new UnarchiveCommand();
-            executeCommand(c, null);
-        }
-
-        return super.onContextItemSelected(menuItem);
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-    {
-        if (new Date().getTime() - lastLongClick < 1000) return;
-
-        Habit habit = positionToHabit.get(position);
-        habitClickListener.onHabitClicked(habit);
-    }
-
-    @Override
-    public void onSaved(Command command, Object savedObject)
-    {
-        Habit h = (Habit) savedObject;
-
-        if(h == null) activity.executeCommand(command, null);
-        else activity.executeCommand(command, h.getId());
-        adapter.notifyDataSetChanged();
-
-        ReminderHelper.createReminderAlarms(activity);
-    }
-
-    private void updateEmptyMessage()
-    {
-        if(lastLoadedTimestamp == null)
-            llEmpty.setVisibility(View.GONE);
-        else
-            llEmpty.setVisibility(habits.size() > 0 ? View.GONE : View.VISIBLE);
-    }
-
-    @Override
-    public boolean onLongClick(View v)
-    {
-        switch(v.getId())
-        {
-            case R.id.tvCheck:
-            {
-                lastLongClick = new Date().getTime();
-                if(!short_toggle_enabled)
-                {
-                    toggleCheck(v);
-                    Vibrator vb = (Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE);
-                    vb.vibrate(100);
-                }
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private void toggleCheck(View v)
-    {
-        Habit habit = habits.get((Long) v.getTag(R.string.habit_key));
-
-        int offset = (Integer) v.getTag(R.string.offset_key);
-        long timestamp = DateHelper.getStartOfDay(
-                DateHelper.getLocalTime() - offset * DateHelper.millisecondsInOneDay);
-
-        if(v.getTag(R.string.toggle_key).equals(2))
-            updateCheck(habit.color, (TextView) v, 0);
-        else
-            updateCheck(habit.color, (TextView) v, 2);
-
-        executeCommand(habit.new ToggleRepetitionCommand(timestamp), habit.getId());
-    }
-
-    private void executeCommand(Command c, Long refreshKey)
-    {
-        activity.executeCommand(c, refreshKey);
-    }
-
-    @Override
-    public void drop(int from, int to)
-    {
-        Habit fromHabit = positionToHabit.get(from);
-        Habit toHabit = positionToHabit.get(to);
-        positionToHabit.put(to, fromHabit);
-        positionToHabit.put(from, toHabit);
-        adapter.notifyDataSetChanged();
-
-        Habit.reorder(from, to);
-    }
-
-    @Override
-    public void onClick(View v)
-    {
-        switch(v.getId())
-        {
-            case R.id.tvCheck:
-                if(short_toggle_enabled)
-                    toggleCheck(v);
-                else
-                    activity.showToast(R.string.long_press_to_toggle);
-                return;
-        }
-    }
-
-    class ListHabitsAdapter extends BaseAdapter
-    {
-        private Context context;
-        private LayoutInflater inflater;
-        private Typeface fontawesome;
-
-        public ListHabitsAdapter(Context context)
-        {
-            this.context = context;
-
-            inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            fontawesome = Typeface.createFromAsset(context.getAssets(), "fontawesome-webfont.ttf");
-        }
-
-        @Override
-        public int getCount()
-        {
-            return habits.size();
-        }
-
-        @Override
-        public Object getItem(int position)
-        {
-            return positionToHabit.get(position);
-        }
-
-        @Override
-        public long getItemId(int position)
-        {
-            return ((Habit) getItem(position)).getId();
-        }
-
-        @Override
-        public View getView(int position, View view, ViewGroup parent)
-        {
-            final Habit habit = positionToHabit.get(position);
-
-            if (view == null || (Long) view.getTag(R.id.KEY_TIMESTAMP) !=
-                    DateHelper.getStartOfToday())
-            {
-                view = inflater.inflate(R.layout.list_habits_item, null);
-                ((TextView) view.findViewById(R.id.tvStar)).setTypeface(fontawesome);
-
-                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(tvNameWidth,
-                        LayoutParams.WRAP_CONTENT, 1);
-                view.findViewById(R.id.tvName).setLayoutParams(params);
-
-                Display display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE))
-                        .getDefaultDisplay();
-                Point size = new Point();
-                display.getSize(size);
-
-                for (int i = 0; i < button_count; i++)
-                {
-                    View check = inflater.inflate(R.layout.list_habits_item_check, null);
-                    TextView btCheck = (TextView) check.findViewById(R.id.tvCheck);
-                    btCheck.setTypeface(fontawesome);
-                    btCheck.setOnLongClickListener(ListHabitsFragment.this);
-                    btCheck.setOnClickListener(ListHabitsFragment.this);
-                    ((LinearLayout) view.findViewById(R.id.llButtons)).addView(check);
-                }
-
-                view.setTag(R.id.KEY_TIMESTAMP, DateHelper.getStartOfToday());
-            }
-
-            TextView tvStar = (TextView) view.findViewById(R.id.tvStar);
-            TextView tvName = (TextView) view.findViewById(R.id.tvName);
-
-            if (habit == null)
-            {
-                tvName.setText(null);
-                return view;
-            }
-
-            LinearLayout llInner = (LinearLayout) view.findViewById(R.id.llInner);
-            llInner.setTag(R.string.habit_key, habit.getId());
-
-            int activeColor = habit.color;
-
-            tvName.setText(habit.name);
-            tvName.setTextColor(activeColor);
-
-            if(habit.isArchived())
-            {
-                activeColor = ColorHelper.palette[12];
-                tvName.setTextColor(activeColor);
-
-                tvStar.setText(context.getString(R.string.fa_archive));
-                tvStar.setTextColor(activeColor);
-            }
-            else
-            {
-                int score = scores.get(habit.getId());
-
-                if (score < Habit.HALF_STAR_CUTOFF)
-                {
-                    tvStar.setText(context.getString(R.string.fa_star_o));
-                    tvStar.setTextColor(INACTIVE_COLOR);
-                }
-                else if (score < Habit.FULL_STAR_CUTOFF)
-                {
-                    tvStar.setText(context.getString(R.string.fa_star_half_o));
-                    tvStar.setTextColor(INACTIVE_COLOR);
-                }
-                else
-                {
-                    tvStar.setText(context.getString(R.string.fa_star));
-                    tvStar.setTextColor(activeColor);
-                }
-            }
-
-            LinearLayout llButtons = (LinearLayout) view.findViewById(R.id.llButtons);
-            int m = llButtons.getChildCount();
-
-            int isChecked[] = checkmarks.get(habit.getId());
-
-            for (int i = 0; i < m; i++)
-            {
-
-                TextView tvCheck = (TextView) llButtons.getChildAt(i);
-                tvCheck.setTag(R.string.habit_key, habit.getId());
-                tvCheck.setTag(R.string.offset_key, i);
-                updateCheck(activeColor, tvCheck, isChecked[i]);
-            }
-
-            return view;
-        }
-    }
-
-    private void updateCheck(int activeColor, TextView tvCheck, int check)
-    {
-        switch (check)
-        {
-            case 2:
-                tvCheck.setText(R.string.fa_check);
-                tvCheck.setTextColor(activeColor);
-                tvCheck.setTag(R.string.toggle_key, 2);
-                break;
-
-            case 1:
-                tvCheck.setText(R.string.fa_check);
-                tvCheck.setTextColor(INACTIVE_COLOR);
-                tvCheck.setTag(R.string.toggle_key, 1);
-                break;
-
-            case 0:
-                tvCheck.setText(R.string.fa_times);
-                tvCheck.setTextColor(INACTIVE_COLOR);
-                tvCheck.setTag(R.string.toggle_key, 0);
-                break;
-        }
-    }
-
-    public void onPostExecuteCommand(Long refreshKey)
-    {
-        if(refreshKey == null) fetchAllHabits();
-        else fetchHabit(refreshKey);
-    }
-}

app/src/main/java/org/isoron/uhabits/dialogs/SettingsFragment.java

@@ -1,56 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.dialogs;
-
-import android.app.backup.BackupManager;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceFragment;
-
-import org.isoron.uhabits.R;
-
-public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener
-{
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.preferences);
-    }
-
-    @Override
-    public void onResume()
-    {
-        super.onResume();
-        getPreferenceManager().getSharedPreferences().
-                registerOnSharedPreferenceChangeListener(this);
-    }
-
-    @Override
-    public void onPause()
-    {
-        getPreferenceManager().getSharedPreferences().
-                unregisterOnSharedPreferenceChangeListener(this);
-        super.onPause();
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
-    {
-        BackupManager.dataChanged("org.isoron.uhabits");
-    }
-}

app/src/main/java/org/isoron/uhabits/dialogs/ShowHabitFragment.java

@@ -1,139 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.dialogs;
-
-import android.app.Fragment;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.isoron.helpers.ColorHelper;
-import org.isoron.helpers.Command;
-import org.isoron.helpers.DialogHelper;
-import org.isoron.uhabits.R;
-import org.isoron.uhabits.ReminderHelper;
-import org.isoron.uhabits.ShowHabitActivity;
-import org.isoron.uhabits.models.Habit;
-import org.isoron.uhabits.views.HabitHistoryView;
-import org.isoron.uhabits.views.HabitScoreView;
-import org.isoron.uhabits.views.HabitStreakView;
-import org.isoron.uhabits.views.RingView;
-
-public class ShowHabitFragment extends Fragment implements DialogHelper.OnSavedListener
-{
-    protected ShowHabitActivity activity;
-    private Habit habit;
-
-    @Override
-    public void onStart()
-    {
-        super.onStart();
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState)
-    {
-        Log.d("ShowHabitActivity", "Creating view...");
-
-        View view = inflater.inflate(R.layout.show_habit, container, false);
-        activity = (ShowHabitActivity) getActivity();
-        habit = activity.habit;
-
-        habit.updateCheckmarks();
-
-        if (android.os.Build.VERSION.SDK_INT >= 21)
-        {
-            int darkerHabitColor = ColorHelper.mixColors(habit.color, Color.BLACK, 0.75f);
-            activity.getWindow().setStatusBarColor(darkerHabitColor);
-        }
-
-        TextView tvHistory = (TextView) view.findViewById(R.id.tvHistory);
-        TextView tvOverview = (TextView) view.findViewById(R.id.tvOverview);
-        TextView tvStrength = (TextView) view.findViewById(R.id.tvStrength);
-        TextView tvStreaks = (TextView) view.findViewById(R.id.tvStreaks);
-        tvHistory.setTextColor(habit.color);
-        tvOverview.setTextColor(habit.color);
-        tvStrength.setTextColor(habit.color);
-        tvStreaks.setTextColor(habit.color);
-
-        LinearLayout llOverview = (LinearLayout) view.findViewById(R.id.llOverview);
-        llOverview.addView(new RingView(activity, (int) activity.getResources().getDimension(
-                R.dimen.small_square_size) * 4, habit.color,
-                ((float) habit.getScore() / Habit.MAX_SCORE), "Habit strength"));
-
-        LinearLayout llStrength = (LinearLayout) view.findViewById(R.id.llStrength);
-        llStrength.addView(new HabitScoreView(activity, habit,
-                (int) activity.getResources().getDimension(R.dimen.small_square_size)));
-
-        LinearLayout llHistory = (LinearLayout) view.findViewById(R.id.llHistory);
-        HabitHistoryView hhv = new HabitHistoryView(activity, habit,
-                (int) activity.getResources().getDimension(R.dimen.small_square_size));
-        llHistory.addView(hhv);
-
-        LinearLayout llStreaks = (LinearLayout) view.findViewById(R.id.llStreaks);
-        HabitStreakView hsv = new HabitStreakView(activity, habit,
-                (int) activity.getResources().getDimension(R.dimen.small_square_size));
-        llStreaks.addView(hsv);
-
-        setHasOptionsMenu(true);
-        return view;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
-    {
-        inflater.inflate(R.menu.show_habit_fragment_menu, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        switch (item.getItemId())
-        {
-            case R.id.action_edit_habit:
-            {
-                EditHabitFragment frag = EditHabitFragment.editSingleHabitFragment(habit.getId());
-                frag.setOnSavedListener(this);
-                frag.show(getFragmentManager(), "dialog");
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public void onSaved(Command command, Object savedObject)
-    {
-        Habit h = (Habit) savedObject;
-
-        if(h == null) activity.executeCommand(command, null);
-        else activity.executeCommand(command, h.getId());
-
-        ReminderHelper.createReminderAlarms(activity);
-        activity.recreate();
-    }
-}

app/src/main/java/org/isoron/uhabits/models/Checkmark.java

@@ -1,45 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.models;
-
-import com.activeandroid.Model;
-import com.activeandroid.annotation.Column;
-import com.activeandroid.annotation.Table;
-
-@Table(name = "Checkmarks")
-public class Checkmark extends Model
-{
-
-    public static final int UNCHECKED = 0;
-    public static final int CHECKED_IMPLICITLY = 1;
-    public static final int CHECKED_EXPLICITLY = 2;
-
-    @Column(name = "habit")
-    public Habit habit;
-
-    @Column(name = "timestamp")
-    public Long timestamp;
-
-    /**
-     * Indicates whether there is a checkmark at the given timestamp or not, and whether the
-     * checkmark is explicit or implicit. An explicit checkmark indicates that there is a
-     * repetition at that day. An implicit checkmark indicates that there is no repetition at that
-     * day, but a repetition was not needed, due to the frequency of the habit.
-     */
-    @Column(name = "value")
-    public Integer value;
-}

app/src/main/java/org/isoron/uhabits/models/Habit.java

@@ -1,811 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.models;
-
-import android.annotation.SuppressLint;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.activeandroid.ActiveAndroid;
-import com.activeandroid.Cache;
-import com.activeandroid.Model;
-import com.activeandroid.annotation.Column;
-import com.activeandroid.annotation.Table;
-import com.activeandroid.query.Delete;
-import com.activeandroid.query.From;
-import com.activeandroid.query.Select;
-import com.activeandroid.query.Update;
-import com.activeandroid.util.SQLiteUtils;
-
-import org.isoron.helpers.ColorHelper;
-import org.isoron.helpers.Command;
-import org.isoron.helpers.DateHelper;
-import org.isoron.uhabits.R;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-@Table(name = "Habits")
-public class Habit extends Model
-{
-
-    public static final int HALF_STAR_CUTOFF = 5999000;
-    public static final int FULL_STAR_CUTOFF = 12973000;
-    public static final int MAX_SCORE = 19259500;
-
-    private static boolean includeArchived = false;
-
-    @Column(name = "name")
-    public String name;
-
-    @Column(name = "description")
-    public String description;
-
-    @Column(name = "freq_num")
-    public Integer freq_num;
-
-    @Column(name = "freq_den")
-    public Integer freq_den;
-
-    @Column(name = "color")
-    public Integer color;
-
-    @Column(name = "position")
-    public Integer position;
-
-    @Column(name = "reminder_hour")
-    public Integer reminder_hour;
-
-    @Column(name = "reminder_min")
-    public Integer reminder_min;
-
-    @Column(name = "highlight")
-    public Integer highlight;
-
-    @Column(name = "archived")
-    public Integer archived;
-
-    public Habit(Habit model)
-    {
-        copyAttributes(model);
-    }
-
-    public Habit()
-    {
-        this.color = ColorHelper.palette[5];
-        this.position = Habit.getCount();
-        this.highlight = 0;
-        this.archived = 0;
-        this.freq_den = 7;
-        this.freq_num = 3;
-    }
-
-    public static Habit get(Long id)
-    {
-        return Habit.load(Habit.class, id);
-    }
-
-    public static HashMap<Long, Habit> getAll()
-    {
-        List<Habit> habits = select().execute();
-        HashMap<Long, Habit> map = new HashMap<>();
-
-        for(Habit h : habits)
-        {
-            map.put(h.getId(), h);
-        }
-
-        return map;
-    }
-
-    @SuppressLint("DefaultLocale")
-    public static void updateId(long oldId, long newId)
-    {
-        SQLiteUtils.execSql(String.format("update Habits set Id = %d where Id = %d", newId, oldId));
-    }
-
-    protected static From select()
-    {
-        if(includeArchived)
-            return new Select().from(Habit.class).orderBy("position");
-        else
-            return new Select().from(Habit.class).where("archived = 0").orderBy("position");
-    }
-
-    public static void setIncludeArchived(boolean includeArchived)
-    {
-        Habit.includeArchived = includeArchived;
-        rebuildOrder();
-    }
-
-    public static boolean isIncludeArchived()
-    {
-        return Habit.includeArchived;
-    }
-
-    public static int getCount()
-    {
-        return select().count();
-    }
-
-    public static Habit getByPosition(int position)
-    {
-        return select().offset(position).executeSingle();
-    }
-
-    public static java.util.List<Habit> getHabits()
-    {
-        return select().execute();
-    }
-
-    public static java.util.List<Habit> getHighlightedHabits()
-    {
-        return select().where("highlight = 1").orderBy("reminder_hour desc, reminder_min desc")
-                .execute();
-    }
-
-    public static java.util.List<Habit> getHabitsWithReminder()
-    {
-        return select().where("reminder_hour is not null").execute();
-    }
-
-    public static void reorder(int from, int to)
-    {
-        if (from == to) return;
-
-        Habit h = Habit.getByPosition(from);
-        if (to < from) new Update(Habit.class).set("position = position + 1")
-                .where("position >= ? and position < ?", to, from).execute();
-        else new Update(Habit.class).set("position = position - 1")
-                .where("position > ? and position <= ?", from, to).execute();
-
-        h.position = to;
-        h.save();
-    }
-
-    public static void rebuildOrder()
-    {
-        List<Habit> habits = select().execute();
-
-        ActiveAndroid.beginTransaction();
-        try
-        {
-            int i = 0;
-            for (Habit h : habits)
-            {
-                h.position = i++;
-                h.save();
-            }
-
-            ActiveAndroid.setTransactionSuccessful();
-        }
-        finally
-        {
-            ActiveAndroid.endTransaction();
-        }
-
-    }
-
-    public static void roundTimestamps()
-    {
-        List<Repetition> reps = new Select().from(Repetition.class).execute();
-        for (Repetition r : reps)
-        {
-            r.timestamp = DateHelper.getStartOfDay(r.timestamp);
-            r.save();
-        }
-    }
-
-    public static void recomputeAllScores()
-    {
-        for (Habit habit : getHabits())
-        {
-            habit.deleteScoresNewerThan(0);
-        }
-    }
-
-    public static int getStarCount()
-    {
-        String args[] = {};
-        return SQLiteUtils.intQuery("select count(*) from (select score, max(timestamp) from " +
-                "score group by habit) as scores where scores.score >= " +
-                Integer.toString(12973000), args);
-
-    }
-
-    public void copyAttributes(Habit model)
-    {
-        this.name = model.name;
-        this.description = model.description;
-        this.freq_num = model.freq_num;
-        this.freq_den = model.freq_den;
-        this.color = model.color;
-        this.position = model.position;
-        this.reminder_hour = model.reminder_hour;
-        this.reminder_min = model.reminder_min;
-        this.highlight = model.highlight;
-        this.archived = model.archived;
-    }
-
-    public void save(Long id)
-    {
-        save();
-        Habit.updateId(getId(), id);
-    }
-
-    protected From selectReps()
-    {
-        return new Select().from(Repetition.class).where("habit = ?", getId()).orderBy("timestamp");
-    }
-
-    protected From selectRepsFromTo(long timeFrom, long timeTo)
-    {
-        return selectReps().and("timestamp >= ?", timeFrom).and("timestamp <= ?", timeTo);
-    }
-
-    public boolean hasRep(long timestamp)
-    {
-        int count = selectReps().where("timestamp = ?", timestamp).count();
-        return (count > 0);
-    }
-
-    public boolean hasRepToday()
-    {
-        return hasRep(DateHelper.getStartOfToday());
-    }
-
-    public void deleteReps(long timestamp)
-    {
-        new Delete().from(Repetition.class).where("habit = ?", getId())
-                .and("timestamp = ?", timestamp).execute();
-    }
-
-    public void deleteCheckmarksNewerThan(long timestamp)
-    {
-        new Delete().from(Checkmark.class)
-                .where("habit = ?", getId())
-                .and("timestamp >= ?", timestamp)
-                .execute();
-    }
-
-    public void deleteStreaksNewerThan(long timestamp)
-    {
-        new Delete().from(Streak.class)
-                .where("habit = ?", getId())
-                .and("end >= ?", timestamp - DateHelper.millisecondsInOneDay)
-                .execute();
-    }
-
-    public int[] getCheckmarks(Long fromTimestamp, Long toTimestamp)
-    {
-        updateCheckmarks();
-
-        String query = "select value, timestamp from Checkmarks where " +
-                "habit = ? and timestamp >= ? and timestamp <= ?";
-
-        SQLiteDatabase db = Cache.openDatabase();
-        String args[] = {getId().toString(), fromTimestamp.toString(), toTimestamp.toString()};
-        Cursor cursor = db.rawQuery(query, args);
-
-        long day = DateHelper.millisecondsInOneDay;
-        int nDays = (int) ((toTimestamp - fromTimestamp) / day) + 1;
-        int[] checks = new int[nDays];
-
-        if(cursor.moveToFirst())
-        {
-            do
-            {
-                long timestamp = cursor.getLong(1);
-                int offset = (int) ((timestamp - fromTimestamp) / day);
-                checks[nDays - offset - 1] = cursor.getInt(0);
-
-            } while (cursor.moveToNext());
-        }
-
-        return checks;
-    }
-
-    public void updateCheckmarks()
-    {
-        long beginning;
-        long today = DateHelper.getStartOfToday();
-        long day = DateHelper.millisecondsInOneDay;
-
-        Checkmark newestCheckmark = getNewestCheckmark();
-        if(newestCheckmark == null)
-        {
-            Repetition oldestRep = getOldestRep();
-            if (oldestRep == null) return;
-
-            beginning = oldestRep.timestamp;
-        }
-        else
-        {
-            beginning = newestCheckmark.timestamp + day;
-        }
-
-        if(beginning > today)
-            return;
-
-        long beginningExtended = beginning - (long) (freq_den) * day;
-        List<Repetition> reps = selectRepsFromTo(beginningExtended, today).execute();
-
-        int nDays = (int) ((today - beginning) / day) + 1;
-        int nDaysExtended = (int) ((today - beginningExtended) / day) + 1;
-
-        int checks[] = new int[nDaysExtended];
-
-        // explicit checks
-        for (Repetition rep : reps)
-        {
-            int offset = (int) ((rep.timestamp - beginningExtended) / day);
-            checks[nDaysExtended - offset - 1] = 2;
-        }
-
-        // implicit checks
-        for (int i = 0; i < nDays; i++)
-        {
-            int counter = 0;
-
-            for (int j = 0; j < freq_den; j++)
-                if (checks[i + j] == 2) counter++;
-
-            if (counter >= freq_num) checks[i] = Math.max(checks[i], 1);
-        }
-
-        ActiveAndroid.beginTransaction();
-
-        try
-        {
-            for (int i = 0; i < nDays; i++)
-            {
-                Checkmark c = new Checkmark();
-                c.habit = this;
-                c.timestamp = today - i * day;
-                c.value = checks[i];
-                c.save();
-            }
-
-            ActiveAndroid.setTransactionSuccessful();
-        }
-        finally
-        {
-            ActiveAndroid.endTransaction();
-        }
-    }
-
-    public Checkmark getNewestCheckmark()
-    {
-        return new Select().from(Checkmark.class)
-                .where("habit = ?", getId())
-                .orderBy("timestamp desc")
-                .limit(1)
-                .executeSingle();
-    }
-
-    public int getRepsCount(int days)
-    {
-        long timeTo = DateHelper.getStartOfToday();
-        long timeFrom = timeTo - DateHelper.millisecondsInOneDay * days;
-        return selectRepsFromTo(timeFrom, timeTo).count();
-    }
-
-    public boolean hasImplicitRepToday()
-    {
-        long today = DateHelper.getStartOfToday();
-        int reps[] = getCheckmarks(today - DateHelper.millisecondsInOneDay, today);
-        return (reps[0] > 0);
-    }
-
-    public Repetition getOldestRep()
-    {
-        return (Repetition) selectReps().limit(1).executeSingle();
-    }
-
-    public Repetition getOldestRepNewerThan(long timestamp)
-    {
-        return selectReps()
-                .where("timestamp > ?", timestamp)
-                .limit(1)
-                .executeSingle();
-    }
-
-    public void toggleRepetition(long timestamp)
-    {
-        if (hasRep(timestamp))
-        {
-            deleteReps(timestamp);
-        }
-        else
-        {
-            Repetition rep = new Repetition();
-            rep.habit = this;
-            rep.timestamp = timestamp;
-            rep.save();
-        }
-
-        deleteScoresNewerThan(timestamp);
-        deleteCheckmarksNewerThan(timestamp);
-        deleteStreaksNewerThan(timestamp);
-    }
-
-    public void archive()
-    {
-        archived = 1;
-        position = 9999;
-        save();
-
-        Habit.rebuildOrder();
-    }
-
-    public void unarchive()
-    {
-        archived = 0;
-        save();
-    }
-
-    public boolean isArchived()
-    {
-        return archived != 0;
-    }
-
-    public void toggleRepetitionToday()
-    {
-        toggleRepetition(DateHelper.getStartOfToday());
-    }
-
-    public Score getNewestScore()
-    {
-        return new Select().from(Score.class).where("habit = ?", getId()).orderBy("timestamp desc")
-                .limit(1).executeSingle();
-    }
-
-    public void deleteScoresNewerThan(long timestamp)
-    {
-        new Delete().from(Score.class).where("habit = ?", getId()).and("timestamp >= ?", timestamp)
-                .execute();
-    }
-
-    public Integer getScore()
-    {
-        int beginningScore;
-        long beginningTime;
-
-        long today = DateHelper.getStartOfDay(DateHelper.getLocalTime());
-        long day = DateHelper.millisecondsInOneDay;
-
-        double freq = ((double) freq_num) / freq_den;
-        double multiplier = Math.pow(0.5, 1.0 / (14.0 / freq - 1));
-
-        Score newestScore = getNewestScore();
-        if (newestScore == null)
-        {
-            Repetition oldestRep = getOldestRep();
-            if (oldestRep == null) return 0;
-            beginningTime = oldestRep.timestamp;
-            beginningScore = 0;
-        }
-        else
-        {
-            beginningTime = newestScore.timestamp + day;
-            beginningScore = newestScore.score;
-        }
-
-        long nDays = (today - beginningTime) / day;
-        if (nDays < 0) return newestScore.score;
-
-        int reps[] = getCheckmarks(beginningTime, today);
-
-        ActiveAndroid.beginTransaction();
-        int lastScore = beginningScore;
-
-        try
-        {
-            for (int i = 0; i < reps.length; i++)
-            {
-                Score s = new Score();
-                s.habit = this;
-                s.timestamp = beginningTime + day * i;
-                s.score = (int) (lastScore * multiplier);
-                if (reps[reps.length - i - 1] == 2)
-                {
-                    s.score += 1000000;
-                    s.score = Math.min(s.score, 19259500);
-                }
-                s.save();
-
-                lastScore = s.score;
-            }
-
-            ActiveAndroid.setTransactionSuccessful();
-        }
-        finally
-        {
-            ActiveAndroid.endTransaction();
-        }
-
-        return lastScore;
-    }
-
-    public List<Score> getScores(long fromTimestamp, long toTimestamp)
-    {
-        return getScores(fromTimestamp, toTimestamp, 1, 0);
-    }
-
-    public List<Score> getScores(long fromTimestamp, long toTimestamp, int divisor, long offset)
-    {
-        return new Select().from(Score.class).where("habit = ? and timestamp > ? and " +
-                "timestamp <= ? and (timestamp - ?) % ? = 0", getId(), fromTimestamp, toTimestamp,
-                offset, divisor).execute();
-    }
-
-    public List<Streak> getStreaks()
-    {
-        updateStreaks();
-
-        return new Select()
-                .from(Streak.class)
-                .where("habit = ?", getId())
-                .orderBy("end asc")
-                .execute();
-    }
-
-    public Streak getNewestStreak()
-    {
-        return new Select()
-                .from(Streak.class)
-                .where("habit = ?", getId())
-                .orderBy("end desc")
-                .limit(1)
-                .executeSingle();
-    }
-
-    public void updateStreaks()
-    {
-        long beginning;
-        long today = DateHelper.getStartOfToday();
-        long day = DateHelper.millisecondsInOneDay;
-
-        Streak newestStreak = getNewestStreak();
-        if(newestStreak == null)
-        {
-            Repetition oldestRep = getOldestRep();
-            if (oldestRep == null) return;
-
-            beginning = oldestRep.timestamp;
-        }
-        else
-        {
-            Repetition oldestRep = getOldestRepNewerThan(newestStreak.end);
-            if (oldestRep == null) return;
-
-            beginning = oldestRep.timestamp;
-        }
-
-        if(beginning > today) return;
-
-        int checks[] = getCheckmarks(beginning, today);
-        ArrayList<Long> list = new ArrayList<>();
-
-        long current = beginning;
-        list.add(current);
-
-        for(int i = 1; i < checks.length; i++)
-        {
-            current += day;
-            int j = checks.length - i - 1;
-
-            if((checks[j + 1] == 0 && checks[j] > 0)) list.add(current);
-            if((checks[j + 1] > 0 && checks[j] == 0)) list.add(current - day);
-        }
-
-        if(list.size() % 2 == 1)
-            list.add(current);
-
-        ActiveAndroid.beginTransaction();
-
-        try
-        {
-            for (int i = 0; i < list.size(); i += 2)
-            {
-                Streak streak = new Streak();
-                streak.habit = this;
-                streak.start = list.get(i);
-                streak.end = list.get(i + 1);
-                streak.length = (streak.end - streak.start) / day + 1;
-                streak.save();
-            }
-
-            ActiveAndroid.setTransactionSuccessful();
-        }
-        finally
-        {
-            ActiveAndroid.endTransaction();
-        }
-    }
-
-    public static class CreateCommand extends Command
-    {
-        private Habit model;
-        private Long savedId;
-
-        public CreateCommand(Habit model)
-        {
-            this.model = model;
-        }
-
-        @Override
-        public void execute()
-        {
-            Habit savedHabit = new Habit(model);
-            if (savedId == null)
-            {
-                savedHabit.save();
-                savedId = savedHabit.getId();
-            } else
-            {
-                savedHabit.save(savedId);
-            }
-        }
-
-        @Override
-        public void undo()
-        {
-            Habit.get(savedId).delete();
-        }
-
-        @Override
-        public Integer getExecuteStringId()
-        {
-            return R.string.toast_habit_created;
-        }
-
-        @Override
-        public Integer getUndoStringId()
-        {
-            return R.string.toast_habit_deleted;
-        }
-
-    }
-
-    public class EditCommand extends Command
-    {
-        private Habit original;
-        private Habit modified;
-        private long savedId;
-        private boolean hasIntervalChanged;
-
-        public EditCommand(Habit modified)
-        {
-            this.savedId = getId();
-            this.modified = new Habit(modified);
-            this.original = new Habit(Habit.this);
-
-            hasIntervalChanged = (this.original.freq_den != this.modified.freq_den ||
-                    this.original.freq_num != this.modified.freq_num);
-        }
-
-        public void execute()
-        {
-            Habit habit = Habit.get(savedId);
-            habit.copyAttributes(modified);
-            habit.save();
-            if (hasIntervalChanged)
-            {
-                habit.deleteCheckmarksNewerThan(0);
-                habit.deleteStreaksNewerThan(0);
-                habit.deleteScoresNewerThan(0);
-            }
-        }
-
-        public void undo()
-        {
-            Habit habit = Habit.get(savedId);
-            habit.copyAttributes(original);
-            habit.save();
-            if (hasIntervalChanged)
-            {
-                habit.deleteCheckmarksNewerThan(0);
-                habit.deleteStreaksNewerThan(0);
-                habit.deleteScoresNewerThan(0);
-            }
-        }
-
-        public Integer getExecuteStringId()
-        {
-            return R.string.toast_habit_changed;
-        }
-
-        public Integer getUndoStringId()
-        {
-            return R.string.toast_habit_changed_back;
-        }
-    }
-
-    public class ToggleRepetitionCommand extends Command
-    {
-        private Long offset;
-
-        public ToggleRepetitionCommand(long offset)
-        {
-            this.offset = offset;
-        }
-
-        @Override
-        public void execute()
-        {
-            toggleRepetition(offset);
-        }
-
-        @Override
-        public void undo()
-        {
-            execute();
-        }
-    }
-
-    public class ArchiveCommand extends Command
-    {
-        @Override
-        public void execute()
-        {
-            archive();
-        }
-
-        @Override
-        public void undo()
-        {
-            unarchive();
-        }
-
-        public Integer getExecuteStringId()
-        {
-            return R.string.toast_habit_archived;
-        }
-
-        public Integer getUndoStringId()
-        {
-            return R.string.toast_habit_unarchived;
-        }
-    }
-
-    public class UnarchiveCommand extends Command
-    {
-        @Override
-        public void execute()
-        {
-            unarchive();
-        }
-
-        @Override
-        public void undo()
-        {
-            archive();
-        }
-
-        public Integer getExecuteStringId()
-        {
-            return R.string.toast_habit_unarchived;
-        }
-
-        public Integer getUndoStringId()
-        {
-            return R.string.toast_habit_archived;
-        }
-    }
-}

app/src/main/java/org/isoron/uhabits/models/Repetition.java

@@ -1,31 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.models;
-
-import com.activeandroid.Model;
-import com.activeandroid.annotation.Column;
-import com.activeandroid.annotation.Table;
-
-@Table(name = "Repetitions")
-public class Repetition extends Model {
-
-	@Column(name = "habit")
-	public Habit habit;
-	
-	@Column(name = "timestamp")
-	public Long timestamp;
-}

app/src/main/java/org/isoron/uhabits/models/Score.java

@@ -1,34 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.models;
-
-import com.activeandroid.Model;
-import com.activeandroid.annotation.Column;
-import com.activeandroid.annotation.Table;
-
-@Table(name = "Score")
-public class Score extends Model
-{
-	@Column(name = "habit")
-	public Habit habit;
-	
-	@Column(name = "timestamp")
-	public Long timestamp;
-	
-	@Column(name = "score")
-	public Integer score;
-}

app/src/main/java/org/isoron/uhabits/models/Streak.java

@@ -1,35 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.models;
-
-import com.activeandroid.Model;
-import com.activeandroid.annotation.Column;
-
-public class Streak extends Model
-{
-    @Column(name = "habit")
-    public Habit habit;
-
-    @Column(name = "start")
-    public Long start;
-
-    @Column(name = "end")
-    public Long end;
-
-    @Column(name = "length")
-    public Long length;
-}

app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java

@@ -1,253 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.views;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.Rect;
-import android.support.v4.view.MotionEventCompat;
-import android.view.MotionEvent;
-import android.view.View;
-
-import org.isoron.helpers.ColorHelper;
-import org.isoron.helpers.DateHelper;
-import org.isoron.uhabits.R;
-import org.isoron.uhabits.models.Checkmark;
-import org.isoron.uhabits.models.Habit;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.List;
-
-public class HabitHistoryView extends View
-{
-
-    private Habit habit;
-    private int[] checks;
-
-    private Context context;
-    private Paint pSquareBg, pSquareFg, pTextHeader;
-
-    private int squareSize, squareSpacing;
-    private int nColumns, offsetWeeks;
-
-    private int colorPrimary, colorPrimaryBrighter, grey;
-    private Float prevX, prevY;
-
-    public HabitHistoryView(Context context, Habit habit, int squareSize)
-    {
-        super(context);
-        this.habit = habit;
-        this.context = context;
-        this.squareSize = squareSize;
-
-        colorPrimary = habit.color;
-        colorPrimaryBrighter = ColorHelper.mixColors(colorPrimary, Color.WHITE, 0.5f);
-        grey = Color.rgb(230, 230, 230);
-        squareSpacing = 2;
-
-        pTextHeader = new Paint();
-        pTextHeader.setColor(Color.LTGRAY);
-        pTextHeader.setTextAlign(Align.LEFT);
-        pTextHeader.setTextSize(squareSize * 0.5f);
-        pTextHeader.setAntiAlias(true);
-
-        pSquareBg = new Paint();
-        pSquareBg.setColor(habit.color);
-
-        pSquareFg = new Paint();
-        pSquareFg.setColor(Color.WHITE);
-        pSquareFg.setAntiAlias(true);
-        pSquareFg.setTextSize(squareSize * 0.5f);
-        pSquareFg.setTextAlign(Align.CENTER);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
-    {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        setMeasuredDimension(getMeasuredWidth(), 8 * squareSize);
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh)
-    {
-        nColumns = (w / squareSize) - 1;
-        fetchReps();
-    }
-
-    private void fetchReps()
-    {
-        Calendar currentDate = new GregorianCalendar();
-        currentDate.add(Calendar.DAY_OF_YEAR, -offsetWeeks * 7);
-        int dayOfWeek = currentDate.get(Calendar.DAY_OF_WEEK) % 7;
-
-        long dateTo = DateHelper.getStartOfToday();
-        for (int i = 0; i < 7 - dayOfWeek; i++)
-            dateTo += DateHelper.millisecondsInOneDay;
-
-        for (int i = 0; i < offsetWeeks * 7; i++)
-            dateTo -= DateHelper.millisecondsInOneDay;
-
-        long dateFrom = dateTo;
-        for (int i = 0; i < nColumns * 7; i++)
-            dateFrom -= DateHelper.millisecondsInOneDay;
-
-        checks = habit.getCheckmarks(dateFrom, dateTo);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas)
-    {
-        super.onDraw(canvas);
-
-        Rect square = new Rect(0, 0, squareSize - squareSpacing, squareSize - squareSpacing);
-
-        Calendar currentDate = new GregorianCalendar();
-        currentDate.add(Calendar.DAY_OF_YEAR, - (offsetWeeks - 1) * 7);
-
-        int nDays = nColumns * 7;
-        int todayWeekday = new GregorianCalendar().get(Calendar.DAY_OF_WEEK) % 7;
-
-        currentDate.add(Calendar.DAY_OF_YEAR, -nDays);
-        currentDate.add(Calendar.DAY_OF_YEAR, -todayWeekday);
-
-        SimpleDateFormat dfMonth = new SimpleDateFormat("MMM");
-        SimpleDateFormat dfYear = new SimpleDateFormat("yyyy");
-
-        String previousMonth = "";
-        String previousYear = "";
-
-        int colors[] = {grey, colorPrimaryBrighter, colorPrimary};
-        String markers[] =
-                {context.getString(R.string.fa_times), context.getString(R.string.fa_check),
-                        context.getString(R.string.fa_check)};
-
-        float squareTextOffset = pSquareFg.getFontSpacing() * 0.4f;
-        float headerTextOffset = pTextHeader.getFontSpacing() * 0.3f;
-        boolean justPrintedYear = false;
-
-        int k = nDays;
-        for (int i = 0; i < nColumns; i++)
-        {
-            String month = dfMonth.format(currentDate.getTime());
-            String year = dfYear.format(currentDate.getTime());
-
-            if (!month.equals(previousMonth))
-            {
-                int offset = 0;
-                if (justPrintedYear) offset += squareSize;
-
-                canvas.drawText(month, square.left + offset, square.bottom - headerTextOffset,
-                        pTextHeader);
-                previousMonth = month;
-                justPrintedYear = false;
-            } else if (!year.equals(previousYear))
-            {
-                canvas.drawText(year, square.left, square.bottom - headerTextOffset, pTextHeader);
-                previousYear = year;
-                justPrintedYear = true;
-            } else
-            {
-                justPrintedYear = false;
-            }
-
-
-            square.offset(0, squareSize);
-
-            for (int j = 0; j < 7; j++)
-            {
-                if (!(i == nColumns - 1 && offsetWeeks == 0 && j > todayWeekday))
-                {
-                    if(k >= checks.length) pSquareBg.setColor(colors[0]);
-                    else pSquareBg.setColor(colors[checks[k]]);
-
-                    canvas.drawRect(square, pSquareBg);
-                    canvas.drawText(Integer.toString(currentDate.get(Calendar.DAY_OF_MONTH)),
-                            square.centerX(), square.centerY() + squareTextOffset, pSquareFg);
-                }
-
-                currentDate.add(Calendar.DAY_OF_MONTH, 1);
-                square.offset(0, squareSize);
-                k--;
-            }
-
-            square.offset(squareSize, -8 * squareSize);
-        }
-
-        String wdays[] = {"Sat", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri"};
-
-        for (int i = 0; i < 7; i++)
-        {
-            square.offset(0, squareSize);
-            canvas.drawText(wdays[i], square.left + headerTextOffset,
-                    square.bottom - headerTextOffset, pTextHeader);
-        }
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event)
-    {
-        int action = event.getAction();
-
-        int pointerIndex = MotionEventCompat.getActionIndex(event);
-        final float x = MotionEventCompat.getX(event, pointerIndex);
-        final float y = MotionEventCompat.getY(event, pointerIndex);
-
-        if (action == MotionEvent.ACTION_DOWN)
-        {
-            prevX = x;
-            prevY = y;
-        }
-
-        if (action == MotionEvent.ACTION_MOVE)
-        {
-            float dx = x - prevX;
-            float dy = y - prevY;
-
-            if (Math.abs(dy) > Math.abs(dx)) return false;
-            getParent().requestDisallowInterceptTouchEvent(true);
-            if(move(dx))
-            {
-                prevX = x;
-                prevY = y;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean move(float dx)
-    {
-        int newOffsetWeeks = offsetWeeks + (int) (dx / squareSize);
-        newOffsetWeeks = Math.max(0, newOffsetWeeks);
-
-        if (newOffsetWeeks != offsetWeeks)
-        {
-            offsetWeeks = newOffsetWeeks;
-            fetchReps();
-            invalidate();
-            return true;
-        }
-        else
-            return false;
-    }
-}

app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java

@@ -1,268 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.views;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.support.v4.view.MotionEventCompat;
-import android.view.MotionEvent;
-import android.view.View;
-
-import org.isoron.helpers.ColorHelper;
-import org.isoron.helpers.DateHelper;
-import org.isoron.uhabits.models.Habit;
-import org.isoron.uhabits.models.Score;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-public class HabitScoreView extends View
-{
-    public static final int BUCKET_SIZE = 7;
-
-    private final Paint pGrid;
-    private final float em;
-    private Habit habit;
-    private int columnWidth, columnHeight, nColumns;
-
-    private Paint pText, pGraph;
-    private int dataOffset;
-
-    private int barHeaderHeight;
-
-    private int[] colors;
-    private float prevX;
-    private float prevY;
-    private List<Score> scores;
-
-    public HabitScoreView(Context context, Habit habit, int columnWidth)
-    {
-        super(context);
-        this.habit = habit;
-        this.columnWidth = columnWidth;
-
-        pText = new Paint();
-        pText.setColor(Color.LTGRAY);
-        pText.setTextAlign(Paint.Align.LEFT);
-        pText.setTextSize(columnWidth * 0.5f);
-        pText.setAntiAlias(true);
-
-        pGraph = new Paint();
-        pGraph.setTextAlign(Paint.Align.CENTER);
-        pGraph.setTextSize(columnWidth * 0.5f);
-        pGraph.setAntiAlias(true);
-        pGraph.setStrokeWidth(columnWidth * 0.1f);
-
-        pGrid = new Paint();
-        pGrid.setColor(Color.LTGRAY);
-        pGrid.setAntiAlias(true);
-        pGrid.setStrokeWidth(columnWidth * 0.05f);
-
-        columnHeight = 8 * columnWidth;
-        barHeaderHeight = columnWidth;
-        em = pText.getFontSpacing();
-
-        colors = new int[4];
-
-        colors[0] = Color.rgb(230, 230, 230);
-        colors[3] = habit.color;
-        colors[1] = ColorHelper.mixColors(colors[0], colors[3], 0.66f);
-        colors[2] = ColorHelper.mixColors(colors[0], colors[3], 0.33f);
-    }
-
-    private void fetchScores()
-    {
-
-        long toTimestamp = DateHelper.getStartOfToday();
-        for (int i = 0; i < dataOffset * BUCKET_SIZE; i++)
-            toTimestamp -= DateHelper.millisecondsInOneDay;
-
-        long fromTimestamp = toTimestamp;
-        for (int i = 0; i < nColumns * BUCKET_SIZE; i++)
-            fromTimestamp -= DateHelper.millisecondsInOneDay;
-
-        scores = habit.getScores(fromTimestamp, toTimestamp, BUCKET_SIZE * DateHelper.millisecondsInOneDay,
-                toTimestamp);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
-    {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        setMeasuredDimension(getMeasuredWidth(), columnHeight + 2 * barHeaderHeight);
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh)
-    {
-        super.onSizeChanged(w, h, oldw, oldh);
-        nColumns = w / columnWidth;
-        fetchScores();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas)
-    {
-        super.onDraw(canvas);
-
-        float lineHeight = pText.getFontSpacing();
-        float barHeaderOffset = lineHeight * 0.4f;
-
-        RectF rGrid = new RectF(0, 0, nColumns * columnWidth, columnHeight);
-        rGrid.offset(0, barHeaderHeight);
-        drawGrid(canvas, rGrid);
-
-        SimpleDateFormat dfMonth = new SimpleDateFormat("MMM");
-        SimpleDateFormat dfDay = new SimpleDateFormat("d");
-
-        String previousMonth = "";
-
-        pGraph.setColor(habit.color);
-        RectF prevR = null;
-
-        for (int offset = nColumns - scores.size(); offset < nColumns; offset++)
-        {
-            Score score = scores.get(offset - nColumns + scores.size());
-            String month = dfMonth.format(score.timestamp);
-            String day = dfDay.format(score.timestamp);
-
-            long s = score.score;
-            double sRelative = ((double) s) / Habit.MAX_SCORE;
-
-            int height = (int) (columnHeight * sRelative);
-
-            RectF r = new RectF(0, 0, columnWidth, columnWidth);
-            r.offset(offset * columnWidth,
-                    barHeaderHeight + columnHeight - height - columnWidth / 2);
-
-            if (prevR != null)
-            {
-                drawLine(canvas, prevR, r);
-                drawMarker(canvas, prevR);
-            }
-
-            if (offset == nColumns - 1) drawMarker(canvas, r);
-
-            prevR = r;
-
-            r = new RectF(0, 0, columnWidth, columnHeight);
-            r.offset(offset * columnWidth, barHeaderHeight);
-            if (!month.equals(previousMonth))
-            {
-                canvas.drawText(month, r.centerX(), r.bottom + lineHeight * 1.2f, pText);
-            } else
-            {
-                canvas.drawText(day, r.centerX(), r.bottom + lineHeight * 1.2f, pText);
-            }
-
-            previousMonth = month;
-
-        }
-    }
-
-    private void drawGrid(Canvas canvas, RectF rGrid)
-    {
-//        pGrid.setColor(Color.rgb(230, 230, 230));
-//        pGrid.setStyle(Paint.Style.STROKE);
-//        canvas.drawRect(rGrid, pGrid);
-
-        int nRows = 5;
-        float rowHeight = rGrid.height() / nRows;
-
-        pGrid.setColor(Color.rgb(240, 240, 240));
-        for (int i = 0; i < nRows; i++)
-        {
-            canvas.drawText(String.format("%d%%", (100 - i * 100 / nRows)), rGrid.left + 0.5f * em,
-                    rGrid.top + 1f * em, pText);
-            canvas.drawLine(rGrid.left, rGrid.top, rGrid.right, rGrid.top, pGrid);
-            rGrid.offset(0, rowHeight);
-        }
-
-        canvas.drawLine(rGrid.left, rGrid.top, rGrid.right, rGrid.top, pGrid);
-    }
-
-    private void drawLine(Canvas canvas, RectF rectFrom, RectF rectTo)
-    {
-        pGraph.setColor(habit.color);
-        canvas.drawLine(rectFrom.centerX(), rectFrom.centerY(), rectTo.centerX(), rectTo.centerY(),
-                pGraph);
-    }
-
-    private void drawMarker(Canvas canvas, RectF rect)
-    {
-        rect.inset(columnWidth * 0.15f, columnWidth * 0.15f);
-        pGraph.setColor(Color.WHITE);
-        canvas.drawOval(rect, pGraph);
-
-        rect.inset(columnWidth * 0.1f, columnWidth * 0.1f);
-        pGraph.setColor(habit.color);
-        canvas.drawOval(rect, pGraph);
-
-        rect.inset(columnWidth * 0.1f, columnWidth * 0.1f);
-        pGraph.setColor(Color.WHITE);
-        canvas.drawOval(rect, pGraph);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event)
-    {
-        int action = event.getAction();
-
-        int pointerIndex = MotionEventCompat.getActionIndex(event);
-        final float x = MotionEventCompat.getX(event, pointerIndex);
-        final float y = MotionEventCompat.getY(event, pointerIndex);
-
-        if (action == MotionEvent.ACTION_DOWN)
-        {
-            prevX = x;
-            prevY = y;
-        }
-
-        if (action == MotionEvent.ACTION_MOVE)
-        {
-            float dx = x - prevX;
-            float dy = y - prevY;
-
-            if (Math.abs(dy) > Math.abs(dx)) return false;
-            getParent().requestDisallowInterceptTouchEvent(true);
-            if (move(dx))
-            {
-                prevX = x;
-                prevY = y;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean move(float dx)
-    {
-        int newDataOffset = dataOffset + (int) (dx / columnWidth);
-        newDataOffset = Math.max(0, newDataOffset);
-
-        if (newDataOffset != dataOffset)
-        {
-            dataOffset = newDataOffset;
-            fetchScores();
-            invalidate();
-            return true;
-        } else return false;
-    }
-}

app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java

@@ -1,188 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.views;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.support.v4.view.MotionEventCompat;
-import android.view.MotionEvent;
-import android.view.View;
-
-import org.isoron.helpers.ColorHelper;
-import org.isoron.helpers.DateHelper;
-import org.isoron.uhabits.models.Habit;
-import org.isoron.uhabits.models.Streak;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-public class HabitStreakView extends View
-{
-    private Habit habit;
-    private int columnWidth, columnHeight, nColumns;
-
-    private Paint pText, pBar;
-    private List<Streak> streaks;
-    private int dataOffset;
-
-    private long maxStreakLength;
-
-    private int barHeaderHeight;
-
-    private int[] colors;
-    private float prevX;
-    private float prevY;
-
-    public HabitStreakView(Context context, Habit habit, int columnWidth)
-    {
-        super(context);
-        this.habit = habit;
-        this.columnWidth = columnWidth;
-
-        pText = new Paint();
-        pText.setColor(Color.LTGRAY);
-        pText.setTextAlign(Paint.Align.CENTER);
-        pText.setTextSize(columnWidth * 0.5f);
-        pText.setAntiAlias(true);
-
-        pBar = new Paint();
-        pBar.setTextAlign(Paint.Align.CENTER);
-        pBar.setTextSize(columnWidth * 0.5f);
-        pBar.setAntiAlias(true);
-
-        columnHeight = 8 * columnWidth;
-        barHeaderHeight = columnWidth;
-
-        colors = new int[4];
-
-        colors[0] = Color.rgb(230, 230, 230);
-        colors[3] = habit.color;
-        colors[1] = ColorHelper.mixColors(colors[0], colors[3], 0.66f);
-        colors[2] = ColorHelper.mixColors(colors[0], colors[3], 0.33f);
-
-        fetchStreaks();
-    }
-
-    private void fetchStreaks()
-    {
-        streaks = habit.getStreaks();
-
-        for(Streak s : streaks)
-            maxStreakLength = Math.max(maxStreakLength, s.length);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
-    {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        setMeasuredDimension(getMeasuredWidth(), columnHeight + 2*barHeaderHeight);
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh)
-    {
-        super.onSizeChanged(w, h, oldw, oldh);
-        nColumns = w / columnWidth;
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas)
-    {
-        super.onDraw(canvas);
-
-        float lineHeight = pText.getFontSpacing();
-        float barHeaderOffset = lineHeight * 0.4f;
-
-        int nStreaks = streaks.size();
-        int start = Math.max(0, nStreaks - nColumns - dataOffset);
-        SimpleDateFormat dfMonth = new SimpleDateFormat("MMM");
-
-        String previousMonth = "";
-
-        for (int offset = 0; offset < nColumns && start+offset < nStreaks; offset++)
-        {
-            String month = dfMonth.format(streaks.get(start+offset).start);
-
-            long l = streaks.get(offset+start).length;
-            double lRelative = ((double) l) / maxStreakLength;
-
-            pBar.setColor(colors[(int) Math.floor(lRelative*3)]);
-
-            int height = (int) (columnHeight * lRelative);
-            Rect r = new Rect(0,0,columnWidth-2, height);
-            r.offset(offset * columnWidth, barHeaderHeight + columnHeight - height);
-
-            canvas.drawRect(r, pBar);
-            canvas.drawText(Long.toString(l), r.centerX(), r.top - barHeaderOffset, pBar);
-
-            if(!month.equals(previousMonth))
-                canvas.drawText(month, r.centerX(), r.bottom + lineHeight * 1.2f, pText);
-
-            previousMonth = month;
-        }
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event)
-    {
-        int action = event.getAction();
-
-        int pointerIndex = MotionEventCompat.getActionIndex(event);
-        final float x = MotionEventCompat.getX(event, pointerIndex);
-        final float y = MotionEventCompat.getY(event, pointerIndex);
-
-        if (action == MotionEvent.ACTION_DOWN)
-        {
-            prevX = x;
-            prevY = y;
-        }
-
-        if (action == MotionEvent.ACTION_MOVE)
-        {
-            float dx = x - prevX;
-            float dy = y - prevY;
-
-            if (Math.abs(dy) > Math.abs(dx)) return false;
-            getParent().requestDisallowInterceptTouchEvent(true);
-            if(move(dx))
-            {
-                prevX = x;
-                prevY = y;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean move(float dx)
-    {
-        int newDataOffset = dataOffset + (int) (dx / columnWidth);
-        newDataOffset = Math.max(0, Math.min(streaks.size() - nColumns, newDataOffset));
-
-        if (newDataOffset != dataOffset)
-        {
-            dataOffset = newDataOffset;
-            invalidate();
-            return true;
-        }
-        else
-            return false;
-    }
-}

app/src/main/java/org/isoron/uhabits/views/RingView.java

@@ -1,83 +0,0 @@
-/* Copyright (C) 2016 Alinson Santos Xavier
- *
- * 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.
- *
- * 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.
- *
- * You  should  have  received  a  copy  of the GNU General Public License
- * along  with  this  program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.views;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.view.View;
-
-public class RingView extends View
-{
-
-    private int size;
-    private int color;
-    private float perc;
-    private Paint pRing;
-    private float lineHeight;
-    private String label;
-
-    public RingView(Context context, int size, int color, float perc, String label)
-    {
-        super(context);
-        this.size = size;
-        this.color = color;
-        this.perc = perc;
-
-        pRing = new Paint();
-        pRing.setColor(color);
-        pRing.setAntiAlias(true);
-        pRing.setTextAlign(Paint.Align.CENTER);
-
-        this.label = label;
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
-    {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        setMeasuredDimension(size, size + (int) (2*lineHeight));
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas)
-    {
-        super.onDraw(canvas);
-        float thickness = size * 0.15f;
-
-        pRing.setColor(color);
-        RectF r = new RectF(0, 0, size, size);
-        canvas.drawArc(r, -90, 360 * perc, true, pRing);
-
-        pRing.setColor(Color.rgb(230, 230, 230));
-        canvas.drawArc(r, 360 * perc - 90 + 2, 360 * (1 - perc) - 4, true, pRing);
-
-        pRing.setColor(Color.WHITE);
-        r.inset(thickness, thickness);
-        canvas.drawArc(r, -90, 360, true, pRing);
-
-        pRing.setColor(Color.GRAY);
-        pRing.setTextSize(size * 0.2f);
-        lineHeight = pRing.getFontSpacing();
-        canvas.drawText(String.format("%.0f%%", perc * 100), r.centerX(), r.centerY()+lineHeight/3, pRing);
-
-        pRing.setTextSize(size * 0.15f);
-        canvas.drawText(label, size/2, size + lineHeight * 1.2f, pRing);
-    }
-}

app/src/main/res/drawable-v21/habits_item_check_normal.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item>
-        <shape android:shape="oval" >
-            <gradient
-                android:endColor="#00000000"
-                android:gradientRadius="50%p"
-                android:startColor="#50000000"
-                android:type="radial" />
-        </shape>
-    </item>
-    <item
-        android:bottom="5dp"
-        android:left="2dp"
-        android:right="4dp"
-        android:top="1dp">
-        <shape android:shape="oval" >
-            <solid android:color="#ffffff" />
-        </shape>
-    </item>
-
-</layer-list>

app/src/main/res/drawable-v21/habits_item_check_pressed.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item>
-        <shape android:shape="oval" >
-            <gradient
-                android:endColor="#00000000"
-                android:gradientRadius="50%p"
-                android:startColor="#50000000"
-                android:type="radial" />
-        </shape>
-    </item>
-    <item
-        android:bottom="5dp"
-        android:left="2dp"
-        android:right="4dp"
-        android:top="1dp">
-        <shape android:shape="oval" >
-            <solid android:color="#20000000" />
-        </shape>
-    </item>
-
-</layer-list>