Merge branch 'release/6.0.0' into master

.travis.yml

@@ -30,7 +30,9 @@ android:
   - android-sdk-preview-license-.+
   - android-sdk-license-.+
   - google-gdk-license-.+
+before_install:
+  - yes | sdkmanager "platforms;android-27"
 script: 
-  - ./gradlew clean build jacocoTestReport sonarqube
+  - ./gradlew -S clean build jacocoTestReport sonarqube
 after_success:
   - bash <(curl -s https://codecov.io/bash)

README.md

@@ -1,4 +1,4 @@
- ![icon](etc/logo.png)
+ ![icon](assets/logo.png)
 
 Omni-Notes
 ==========
@@ -45,23 +45,23 @@ Currently the following functions are implemented:
 Further developments will include:
 
 * Notes sychronization
-* Web interface to manage notes
+* Web interface to manage notes ([stub project](https://github.com/federicoiosue/omni-notes-desktop))
 
 You can find a complete changelog inside the application settings menu!
 
-If you need some help on how to use the application you'll find everything you need in the [Help Online](etc/help/help.md) section.
+If you need some help on how to use the application you'll find everything you need in the [Help Online](assets/help/help.md) section.
 
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/02.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/03.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/04.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/05.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/06.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/07.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/08.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/09.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/10.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/11.png)
-![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/etc/play_store_pics/12.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/02.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/03.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/04.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/05.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/06.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/07.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/08.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/09.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/10.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/11.png)
+![](https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/play_store_pics/12.png)
 
 ## User guide
 
@@ -88,19 +88,21 @@ There are many features/improvements that are not on **my** roadmap but someone
 
 Feel free to add yourself to [contributors.md](https://github.com/federicoiosue/Omni-Notes/blob/develop/contributors.md) file.
 
-**Don't forget to contribute to original code! Don't be selfish or lazy!**
+### New feature or improvements contributions
 
-### Test code contributions
+This kind of contributions **must** have screenshots or screencast as demonstration of the new additions.
+
+### Test your code contributions!
 
 All code changes and additions **must** be tested.
-See the [related section](#test) about this.
+See the [related section](#test) for more informations or this two pull requests comments: [one](https://github.com/federicoiosue/Omni-Notes/pull/646#pullrequestreview-187973443) and [two](https://github.com/federicoiosue/Omni-Notes/pull/683#issuecomment-506206689)
 
-### Fork project
+### Forking project
 
 When forking the project you'll have to modify some files that are strictly dependent from my own development / build / third-party-services environment. Files that need some attention are the following:
 
-- *gradle.properties*: this is overridden by another file with the same name inside the *omniNotes* module. You can do the same or leave as it is, any missing property will let the app gracefully fallback on a default behavior.
-- *.travis.yml*: if you use [TravisCI](https://travis-ci.org/) as continuous integration platform and a SonarQUBE instance for code quality analysis you'll have to modify this file according to your needs.
+  - *gradle.properties*: this is overridden by another file with the same name inside the *omniNotes* module. You can do the same or leave as it is, any missing property will let the app gracefully fallback on a default behavior.
+  - *.travis.yml*: if you use [TravisCI](https://travis-ci.org/) as continuous integration platform and a SonarQUBE instance for code quality analysis you'll have to modify this file according to your needs.
 
 ## Code quality
 
@@ -146,15 +148,15 @@ They're all listed into the [build.gradle](https://github.com/federicoiosue/Omni
 ## Developed with love and passion by
 
 
-* Federico Iosue - [Website](http://www.iosue.it/federico)
+* Federico Iosue - [Website](https://federico.iosue.it)
 * [Other contributors](https://github.com/federicoiosue/Omni-Notes/blob/master/https://github.com/federicoiosue/Omni-Notes/blob/master/CONTRIBUTORS.md)
 
 
 
 ## License
 
 
-    Copyright 2013-2018 Federico Iosue
+    Copyright 2013-2019 Federico Iosue
 
     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

assets/css/style.scss

@@ -0,0 +1,14 @@
+---
+---
+
+@import "{{ site.theme }}";
+.page-header {
+	height: 255px;
+    background-image: url(https://raw.githubusercontent.com/federicoiosue/Omni-Notes/develop/assets/ON_banner_site.png);
+    background-position: center;
+    background-repeat: no-repeat;
+    background-color: #f44336;
+}
+.page-header h1, .page-header h2, .page-header a.btn {
+	display: none;
+}

etc/translations/arrays.xml → assets/translations/arrays.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2018 Federico Iosue (federico[email protected])
+  ~ Copyright (C) 2013-2019 Federico Iosue (federico@iosue.it)
   ~
   ~ 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

etc/translations/play_store_description.txt → assets/translations/play_store_description.txt

@@ -1,6 +1,6 @@
 Open-source note taking application, designed to be lightweight and simple without giving up smart behavior.
 
-Follow the developments and post your comments and advice on Google+ Beta Community at https://plus.google.com/u/0/communities/112276053772152071903
+Follow the developments and post your comments and advice on our community at https://www.facebook.com/OmniNotes
 
 Your help in translating the app is welcome. Send me an e-mail If you want to lend a hand !
 

etc/translations/strings.xml → assets/translations/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright (C) 2018 Federico Iosue (federico[email protected])
+  ~ Copyright (C) 2013-2019 Federico Iosue (federico@iosue.it)
   ~
   ~ 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
@@ -13,12 +13,11 @@
   ~ 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
+  ~ You should have received a copy of the GNU General Public Licensefailed
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
-
-
+
     <!-- Activities -->
     <string name="title_item_list">Notes</string>
     <string name="add_note">Add Note</string>
@@ -31,6 +30,7 @@
     <string name="share">Share</string>
     <string name="undo">Undo</string>
     <string name="trash">Trash</string>
+    <string name="trash_action">Trash</string>
     <string name="trashed">trashed</string>
     <string name="note_trashed">Note(s) trashed</string>
     <string name="note_untrashed">Note(s) restored from trash</string>
@@ -45,6 +45,7 @@
     <string name="confirm">Confirm</string>
     <string name="ok">Ok</string>
     <string name="no">No</string>
+    <string name="failed">failed</string>
     <string name="cancel">Cancel</string>
     <string name="note_updated">Note updated</string>
     <string name="empty_note_not_saved">Can\'t save an empty note</string>
@@ -67,6 +68,7 @@
     <string name="delete_all_attachments">Delete all the attachments?</string>
     <string name="gallery">Gallery</string>
     <string name="location">Location</string>
+    <string name="timestamp">Timestamp</string>
     <string name="pushbullet">Pushbullet</string>
     <string name="remove_location">Remove location?</string>
     <string name="remove_reminder">Remove reminder?</string>
@@ -84,6 +86,7 @@
     <string name="data_import_message">Click -&gt; restore\nLong-click -&gt; delete</string>
     <string name="data_import_message_warning">WARNING: This will replace all current data!</string>
     <string name="data_export_completed">Data backup completed</string>
+    <string name="data_export_failed">Data backup failed: check logcat for details</string>
     <string name="data_import_completed">Data restore completed</string>
     <string name="click_to_refresh_application">Click to refresh application</string>
     <string name="backup_existing">Backup already exist. It\'ll be overwritten</string>
@@ -218,6 +221,8 @@
     <string name="settings_export">Backup</string>
     <string name="settings_sync_import_export">Sync and Backups</string>
     <string name="settings_import">Restore or delete backups</string>
+    <string name="settings_import_legacy">Restore legacy backup</string>
+    <string name="settings_import_legacy_summary">Allows to restore old backups made with versions of Omni Notes prior to version 6</string>
     <string name="settings_import_from_springpad">Import notes from Springpad</string>
     <string name="settings_import_from_springpad_summary">Select your Springpad exported archive and be sure to be connected to internet</string>
     <string name="settings_sync_drive">Sync with Google Drive</string>
@@ -244,6 +249,9 @@
     <string name="settings_max_video_size">Video attachments</string>
     <string name="settings_screen_data">Data</string>
     <string name="settings_backup">Backup</string>
+    <string name="settings_enable_automatic_backup">Enable automatic backup</string>
+    <string name="settings_enable_automatic_backup_summary">Notes will be stored into "_autobackup" backup folder</string>
+    <string name="settings_enable_automatic_backup_dialog">By activating this feature a full data backup will be performed</string>
     <string name="settings_password">Password</string>
     <string name="settings_password_access">Request password on access</string>
     <string name="settings_password_instructions">Password ensures that notes won\'t be viewed or modified by other persons.\n\nWhen setting a new password, the previous one will be requested.</string>
@@ -270,7 +278,7 @@
     <string name="settings_category_preferences">Preferences</string>
     <string name="settings_category_beta">Beta</string>
     <string name="settings_category_about">About</string>
-    <string name="settings_beta">Google+</string>
+    <string name="settings_beta">Opt-In</string>
     <string name="settings_beta_summary">Subscribe to the beta program to keep up to date with the latest features</string>
     <string name="donate">Donate</string>
     <string name="donate_summary">Support the development of this app with a non-profit donation</string>
@@ -333,6 +341,8 @@
     <string name="settings_error_reporting_summary_off">No crash reports will be sent. Do not complain if something goes wrong!</string>
     <string name="settings_send_analytics">Share anonymous data</string>
     <string name="settings_send_analytics_summary">Help the developer by sending non-sensitive data like device model, language, frequently used app\'s features. This data are used only to improve the open-source app.</string>
+    <string name="settings_enable_file_logging">Save logs to file</string>
+    <string name="settings_enable_file_logging_summary">The logs of the apps will be saved into a file that you\'ll be able to share with the developer to investigate possible problems (restart required)</string>
     <string name="settings_statistics">Statistics</string>
 
     <!-- Stats -->
@@ -375,7 +385,7 @@
     <string name="tour_detailactivity_action_title">Do more</string>
     <string name="tour_detailactivity_action_detail">Share, tag, archive, protect, and more&#8230;</string>
     <string name="tour_detailactivity_reminder_title">Just press</string>
-    <string name="tour_detailactivity_reminder_detail">Long pression have different effects on an object (attachment, location, reminder) than short pression!</string>
+    <string name="tour_detailactivity_reminder_detail">Long presses have different effects on an object (attachment, location, reminder) than short presses!</string>
     <string name="tour_detailactivity_links_title">Links</string>
     <string name="tour_detailactivity_links_detail">URL, e-mail addresses and telephone numbers recognition</string>
     <string name="tour_detailactivity_swipe_title">Swipe</string>
@@ -384,7 +394,7 @@
     <string name="tour_detailactivity_save_detail">To go back, press the \"up\" navigation icon, or your device button</string>
     <string name="tour_listactivity_final_title">Enjoy</string>
     <string name="tour_listactivity_final_detail">Thanks for using Omni Notes \nThe opensource alternative for productivity and leisure note-taking!</string>
-    <string name="tour_community">Subscribe to the community to participate!</string>
+    <string name="tour_community">Subscribe to the communities to participate!</string>
 
     <!-- Accessibility -->
     <string name="drawer_open">drawer open</string>
@@ -396,4 +406,10 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
+    <!-- Various -->
+    <string name="channel_backups_name">Backups</string>
+    <string name="channel_backups_description">Notifications for backup status and results</string>
+    <string name="channel_reminders_name">Reminders</string>
+    <string name="channel_reminders_description">Notifications for notes\' reminders</string>
+
 </resources>

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Federico Iosue (federico[email protected])
+ * Copyright (C) 2013-2019 Federico Iosue (federico@iosue.it)
  *
  * 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
@@ -21,8 +21,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6"
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'

gradle.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Federico Iosue (federico[email protected])
+# Copyright (C) 2013-2019 Federico Iosue (federico@iosue.it)
 #
 # 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
@@ -14,29 +14,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-VERSION_NAME=5.5.4
-VERSION_CODE=263
+VERSION_NAME=6.0.0
+VERSION_CODE=273
 PACKAGE=it.feio.android.omninotes
-
 MIN_SDK=16
-TARGET_SDK=26
+TARGET_SDK=28
 BUILD_TOOLS=27.0.3
-
+# Signing configuration. Template here: https://goo.gl/ecAVJ4
+# SIGN_PROPS=/path/to/your/signing/configuration
 # The following properties are empty defaults to allow build and can EVENTUALLY be overridden to allow:
-
 # Apk signature
 SIGN_PROPS=
-
 # Events tracking (params must be separated by comma)
 ANALYTICS_PARAMS=
 ANALYTICS_PARAMS_FOSS=
-
 # Crash reporting
 CRASH_REPORTING_URL=
-
 # App's version check for update dialog
 VERSION_CHECK_URL=
-
 # Google Maps API key to provide addresses autocompletion feature
 MAPS_API_KEY=

gradle.properties.orig

@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2015 Federico Iosue ([email protected])
+#
+# 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 Foundatibehaon, 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/>.
+#
+
+MIN_SDK=14
+TARGET_SDK=23
+<<<<<<< HEAD
+VERSION_NAME=5.3.0 Alpha 2
+=======
+VERSION_NAME=5.2.5
+>>>>>>> develop
+VERSION_CODE=206
+PACKAGE=it.feio.android.omninotes

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Federico Iosue (federico[email protected])
+# Copyright (C) 2013-2019 Federico Iosue (federico@iosue.it)
 #
 # 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