Merge pull request #1 from billthefarmer/master

Sync official version

README.md

@@ -1,14 +1,21 @@
 # ![Logo](src/main/res/drawable-hdpi/ic_launcher.png) Diary [![Build Status](https://travis-ci.org/billthefarmer/diary.svg?branch=master)](https://travis-ci.org/billthefarmer/diary) [![Available on F-Droid](https://f-droid.org/wiki/images/c/ca/F-Droid-button_available-on_smaller.png)](https://f-droid.org/packages/org.billthefarmer.diary)
 
-Diary is an innovative app where you could put your personal notes or personal journals every day. It's one of the best choices out there!
-
-If you have a habit of writing on your diary every day, a safe, simple and easy mobile diary app could be of great help. To date, the continued innovation in technology has paved the way to the development of paperless diary and notebooks.
-
-It will help you keep it ordered by date like a traditional journal or personal diary.
- You can make predictions about what will happen and see if they come true, and you can see how you changed over time, and read over memories, having a few laughs.
- It's the funniest, quickest and easiest way to document your life through a series of notes.
- The app is available on [F-Droid](https://f-droid.org/packages/org.billthefarmer.diary)
-and [here](https://github.com/billthefarmer/diary/releases).
+Diary is an innovative app where you could put your personal notes or
+personal journals every day. It's one of the best choices out there!
+
+If you have a habit of writing on your diary every day, a safe, simple
+and easy mobile diary app could be of great help. To date, the
+continued innovation in technology has paved the way to the
+development of paperless diary and notebooks.
+
+It will help you keep it ordered by date like a traditional journal or
+ personal diary.  You can make predictions about what will happen and
+ see if they come true, and you can see how you changed over time, and
+ read over memories, having a few laughs.  It's the funniest, quickest
+ and easiest way to document your life through a series of notes.  The
+ app is available on
+ [F-Droid](https://f-droid.org/packages/org.billthefarmer.diary) and
+ [here](https://github.com/billthefarmer/diary/releases).
 
 ![Diary](https://github.com/billthefarmer/billthefarmer.github.io/raw/master/images/diary/Diary-phone.png) ![Calendar](https://github.com/billthefarmer/billthefarmer.github.io/raw/master/images/diary/Calendar-phone.png)
 
@@ -59,6 +66,7 @@ a file manager.
 * Incremental search of diary entries
 * Add events to calendar
 * Dark or light theme for editing
+* Optional edit cursor position control
 
 ## Toolbar
 The toolbar icons are, from left to right:
@@ -160,19 +168,26 @@ co-ordinate separator regardless of locale.
 
 ## Events
 You may add an event to the calendar by adding a line to a diary entry
-which begins with an 'at' symbol followed by a time and an event
-title.
-
-    @ 10:30 Dentist
-
-An event will be added to the calendar when the entry is saved. A
-colon will be added after the 'at' symbol when the event has been
-added.
-
-    @:10:30 Dentist
-
-Use the Calendar app to remove or edit events. Do not remove the colon
-from the diary entry or the event will be added again.
+which begins with an 'at' symbol followed by a time and an event title
+`@ 10:30 Dentist`. An event will be added to the calendar when the
+entry is saved. A colon will be added after the 'at' symbol when the
+event has been added `@:10:30 Dentist`. Use the Calendar app to remove
+or edit events. Do not remove the colon from the diary entry or the
+event will be added again.
+
+## Cursor position
+You may put a line in an entry to control or remember the edit cursor
+position. This will not appear in the markdown view. Put `[<]: #` on a
+line for the start of an entry, `[>]: #` for the end of an entry. Put
+`[#]: #` for the cursor position to be remembered. There should be no
+other text on the line. The current cursor position will be added when
+the entry is saved `[#]: # (nnn)`. Because entries are only saved if
+they are changed, moving the cursor with no other change will not move
+the saved position.
+
+**Note** - Using this functionality will not stop reference type links
+to the top of the current entry, `[Top][#]` working. However you can
+more simply use an inline link `[Top](#)`.
 
 ## Styles
 You may add custom styles to the markdown formatting by placing a

build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
     }
 }
 
@@ -31,8 +31,8 @@ android {
         applicationId "org.billthefarmer.diary"
         minSdkVersion 14
         targetSdkVersion 28
-        versionName "1.43"
-        versionCode 143
+        versionName "1.45"
+        versionCode 145
 
         buildConfigField "long", "BUILT", System.currentTimeMillis() + "L"
     }

data/help.md

@@ -17,6 +17,7 @@
 * Incremental search of diary entries
 * Add events to calendar
 * Dark or light theme for editing
+* Optional edit cursor position control
 
 ## Toolbar
 The toolbar icons are, from left to right:
@@ -118,19 +119,26 @@ co-ordinate separator regardless of locale.
 
 ## Events
 You may add an event to the calendar by adding a line to a diary entry
-which begins with an 'at' symbol followed by a time and an event
-title.
-
-    @ 10:30 Dentist
-
-An event will be added to the calendar when the entry is saved. A
-colon will be added after the 'at' symbol when the event has been
-added.
-
-    @:10:30 Dentist
-
-Use the Calendar app to remove or edit events. Do not remove the colon
-from the diary entry or the event will be added again.
+which begins with an 'at' symbol followed by a time and an event title
+`@ 10:30 Dentist`. An event will be added to the calendar when the
+entry is saved. A colon will be added after the 'at' symbol when the
+event has been added `@:10:30 Dentist`. Use the Calendar app to remove
+or edit events. Do not remove the colon from the diary entry or the
+event will be added again.
+
+## Cursor position
+You may put a line in an entry to control or remember the edit cursor
+position. This will not appear in the markdown view. Put `[<]: #` on a
+line for the start of an entry, `[>]: #` for the end of an entry. Put
+`[#]: #` for the cursor position to be remembered. There should be no
+other text on the line. The current cursor position will be added when
+the entry is saved `[#]: # (nnn)`. Because entries are only saved if
+they are changed, moving the cursor with no other change will not move
+the saved position.
+
+**Note** - Using this functionality will not stop reference type links
+to the top of the current entry, `[Top][#]` working. However you can
+more simply use an inline link `[Top](#)`.
 
 ## Styles
 You may add custom styles to the markdown formatting by placing a

fastlane/metadata/android/en-GB/full_description.txt

@@ -0,0 +1,26 @@
+Write down what you did, your ideas, your dreams... This application
+will help you keep it ordered by date like a traditional journal or
+personal diary.
+
+What you write is saved on your device in plain text files, so it's
+easy to backup and you can open the files with other applications.
+
+Includes basic functionality for browsing the old entries.
+
+* Available in English, Catalan, Spanish, Italian, Japanese, German,
+  French, Polish, Brazilian Portuguese, Dutch and simplified Chinese.
+* Choice of date picker calendars
+* Diary entries may use markdown formatting
+* Optional index page
+* Display media stored in diary folders
+* Display OpenStreetMap maps
+* Add media from media providers
+* Receive media from other apps
+* Receive geo uris from other apps
+* Incremental search of diary entries
+* Add events to calendar
+* Dark or light theme for editing
+* Optional edit cursor position control
+
+Forked from [https://git.savannah.gnu.org/cgit/diary.git] Updated for android 4
+and later.

fastlane/metadata/android/en-GB/short_description.txt

@@ -0,0 +1 @@
+Personal diary or journal

fastlane/metadata/android/en-GB/title.txt

@@ -0,0 +1 @@
+Diary

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/main/assets/help.md

@@ -17,6 +17,7 @@
 * Incremental search of diary entries
 * Add events to calendar
 * Dark or light theme for editing
+* Optional edit cursor position control
 
 ## Toolbar
 The toolbar icons are, from left to right:
@@ -118,19 +119,26 @@ co-ordinate separator regardless of locale.
 
 ## Events
 You may add an event to the calendar by adding a line to a diary entry
-which begins with an 'at' symbol followed by a time and an event
-title.
-
-    @ 10:30 Dentist
-
-An event will be added to the calendar when the entry is saved. A
-colon will be added after the 'at' symbol when the event has been
-added.
-
-    @:10:30 Dentist
-
-Use the Calendar app to remove or edit events. Do not remove the colon
-from the diary entry or the event will be added again.
+which begins with an 'at' symbol followed by a time and an event title
+`@ 10:30 Dentist`. An event will be added to the calendar when the
+entry is saved. A colon will be added after the 'at' symbol when the
+event has been added `@:10:30 Dentist`. Use the Calendar app to remove
+or edit events. Do not remove the colon from the diary entry or the
+event will be added again.
+
+## Cursor position
+You may put a line in an entry to control or remember the edit cursor
+position. This will not appear in the markdown view. Put `[<]: #` on a
+line for the start of an entry, `[>]: #` for the end of an entry. Put
+`[#]: #` for the cursor position to be remembered. There should be no
+other text on the line. The current cursor position will be added when
+the entry is saved `[#]: # (nnn)`. Because entries are only saved if
+they are changed, moving the cursor with no other change will not move
+the saved position.
+
+**Note** - Using this functionality will not stop reference type links
+to the top of the current entry, `[Top][#]` working. However you can
+more simply use an inline link `[Top](#)`.
 
 ## Styles
 You may add custom styles to the markdown formatting by placing a