Skip to content

Commit

Permalink
Merge branch 'release/5.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Federico Iosue committed Apr 26, 2018
2 parents 992c478 + cedca2a commit 5cc16b3
Show file tree
Hide file tree
Showing 386 changed files with 3,283 additions and 1,340 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ android:
- tools
- tools
- platform-tools
- build-tools-26.0.2
- android-23
- build-tools-27.0.3
- android-27
- extra-google-m2repository
- extra-android-m2repository
licenses:
- android-sdk-preview-license-.+
- android-sdk-license-.+
- google-gdk-license-.+
before_install:
- yes | sdkmanager "platforms;android-27"
script:
- ./gradlew clean build jacocoTestReport sonarqube
after_success:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,14 @@ They're all listed into the [build.gradle](https://github.com/federicoiosue/Omni


* Federico Iosue - [Website](http://www.iosue.it/federico)
* [Other contributors](https://github.com/federicoiosue/Omni-Notes/blob/master/contributors.md)
* [Other contributors](https://github.com/federicoiosue/Omni-Notes/blob/master/https://github.com/federicoiosue/Omni-Notes/blob/master/CONTRIBUTORS.md)



## License


Copyright 2015 Federico Iosue
Copyright 2013-2018 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
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2015 Federico Iosue ([email protected])
* Copyright (C) 2018 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
Expand All @@ -21,7 +21,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.1'
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6"
Expand Down
2 changes: 1 addition & 1 deletion etc/translations/arrays.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 Federico Iosue ([email protected])
~ Copyright (C) 2018 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
Expand Down
11 changes: 7 additions & 4 deletions etc/translations/strings.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
~ Copyright (C) 2015 Federico Iosue ([email protected])
~ Copyright (C) 2018 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
Expand Down Expand Up @@ -202,6 +202,9 @@
<string name="checklist">Checklist</string>
<string name="text_note">Text note</string>
<string name="photo">Photo</string>
<string name="uncompleted_checklists">Incompleted checklists</string>
<string name="info">Info</string>
<string name="completed">Completed</string>

<!-- Settings -->
<string name="dashclock_description">Displays some statistics and expiring reminders from Omni Notes</string>
Expand Down Expand Up @@ -364,17 +367,17 @@
<string name="tour_listactivity_actions_title">Actions</string>
<string name="tour_listactivity_actions_detail">Create new notes, sort them, access to preferences</string>
<string name="tour_listactivity_home_title">Navigate</string>
<string name="tour_listactivity_home_detail">Navigation menu allows you to move through notes with filters and tags</string>
<string name="tour_listactivity_home_detail">Navigation menu allows you to move through notes with filters and categories</string>
<string name="tour_listactivity_tag_title">Tags</string>
<string name="tour_listactivity_tag_detail">Add colored tags to find notes at-a-glance</string>
<string name="tour_listactivity_tag_detail">Add colored categories to organize notes at-a-glance</string>
<string name="tour_detailactivity_attachment_title">Improve</string>
<string name="tour_detailactivity_attachment_detail">Add attachment of several kinds to your notes!</string>
<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_links_title">Links</string>
<string name="tour_detailactivity_links_detail">Click on an URL or e-mail address to copy or open it</string>
<string name="tour_detailactivity_links_detail">URL, e-mail addresses and telephone numbers recognition</string>
<string name="tour_detailactivity_swipe_title">Swipe</string>
<string name="tour_detailactivity_swipe_detail">Create new notes without \n leaving the one you\'re editing</string>
<string name="tour_detailactivity_save_title">Save</string>
Expand Down
13 changes: 7 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#se
# Copyright (C) 2015 Federico Iosue ([email protected])
#
# Copyright (C) 2018 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
# 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,
Expand All @@ -15,13 +15,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

VERSION_NAME=5.4.5
VERSION_CODE=240
VERSION_NAME=5.5.0
VERSION_CODE=245
PACKAGE=it.feio.android.omninotes

MIN_SDK=16
# Upgrading this to 24+ will need ContentProvider for sharing and camera attachments
TARGET_SDK=23
BUILD_TOOLS=26.0.2
BUILD_TOOLS=27.0.3

# The following properties are empty defaults to allow build and can EVENTUALLY be overridden to allow:

Expand Down
21 changes: 19 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
#Wed Nov 08 17:59:56 CET 2017
#
# Copyright (C) 2018 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 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/>.
#

#Wed Apr 04 22:14:12 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
2 changes: 1 addition & 1 deletion omniNotes/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2015 Federico Iosue ([email protected])
* Copyright (C) 2018 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
Expand Down
6 changes: 3 additions & 3 deletions omniNotes/lint.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (C) 2016 Federico Iosue ([email protected])
~ Copyright (C) 2018 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
~ 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,
Expand All @@ -18,4 +18,4 @@

<lint>
<issue id="ManifestResource" severity="ignore" />
</lint>
</lint>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* Copyright (C) 2016 Federico Iosue ([email protected])
* Copyright (C) 2018 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
* 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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* Copyright (C) 2018 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 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 it.feio.android.omninotes;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* Copyright (C) 2018 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 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 it.feio.android.omninotes;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* Copyright (C) 2018 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 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 it.feio.android.omninotes;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* Copyright (C) 2018 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 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 it.feio.android.omninotes;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* Copyright (C) 2018 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 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 it.feio.android.omninotes;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* Copyright (C) 2016 Federico Iosue ([email protected])
* Copyright (C) 2018 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
* 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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* Copyright (C) 2017 Federico Iosue ([email protected])
* Copyright (C) 2018 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
* 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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* Copyright (C) 2017 Federico Iosue ([email protected])
* Copyright (C) 2018 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
* 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,
Expand Down

This file was deleted.

Loading

0 comments on commit 5cc16b3

Please sign in to comment.