Merge pull request #8 from martinstoeckli/feature/auto-sync

Feature/auto sync

README.md

@@ -9,6 +9,7 @@ More information you can find on [SilentNote's homepage](https://www.martinstoec
 ## Features
 
 * ✔ Take your notes wherever you are on your Android and Windows devices.
+* ✔ Write the notes in an easily operated WYSIWYG editor.
 * ✔ Quickly find the right note with the full-text search, just by typing a few letters.
 * ✔ Store the notes to an online-storage of your choice, this allows to synchronize them between devices and offers an easy backup.
 * ✔ Currently supported are the `FTP` protocol, the `WebDav` protocol and `Dropbox`.

src/SilentNotes.Android/MainActivity.cs

@@ -70,11 +70,28 @@ protected override void OnDestroy()
             base.OnDestroy();
         }
 
+        /// <inheritdoc/>
+        protected override void OnStart()
+        {
+            base.OnStart();
+
+            IAutoSynchronizationService syncService = Ioc.GetOrCreate<IAutoSynchronizationService>();
+            syncService.SynchronizeAtStartup(); // no awaiting, run in background
+        }
+
         /// <inheritdoc/>
         protected override void OnStop()
         {
             INavigationService navigationService = Ioc.GetOrCreate<INavigationService>();
             navigationService.CurrentController?.StoreUnsavedData();
+
+            // The synchronization continues when we do not await it, even if another app became
+            // active in the meantime. As long as the user doesn't swipe away the app from the
+            // "recent apps", it can finish the job, that's exactly what we need.
+            // Tested with Android 5.0, 8.1
+            IAutoSynchronizationService syncService = Ioc.GetOrCreate<IAutoSynchronizationService>();
+            syncService.SynchronizeAtShutdown();
+
             base.OnStop();
         }
 

src/SilentNotes.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="11" android:versionName="2.1.0" package="ch.martinstoeckli.silentnotes" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="12" android:versionName="2.2.0" package="ch.martinstoeckli.silentnotes" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

src/SilentNotes.Android/Services/InternetStateService.cs

@@ -0,0 +1,56 @@
+// Copyright © 2018 Martin Stoeckli.
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using Android.Content;
+using Android.Net;
+using Android.OS;
+using SilentNotes.Services;
+
+namespace SilentNotes.Android.Services
+{
+    /// <summary>
+    /// Implementation of the <see cref="IInternetStateService"/> interface for the Android platform.
+    /// </summary>
+    public class InternetStateService : IInternetStateService
+    {
+        private readonly Context _applicationContext;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InternetStateService"/> class.
+        /// </summary>
+        /// <param name="applicationContext">The Android application context.</param>
+        public InternetStateService(Context applicationContext)
+        {
+            _applicationContext = applicationContext;
+        }
+
+        /// <inheritdoc/>
+        public bool IsInternetConnected()
+        {
+            ConnectivityManager connectivity = GetConnectivityManager();
+
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.M)
+            {
+                NetworkCapabilities capabilities = connectivity.GetNetworkCapabilities(connectivity.ActiveNetwork);
+                return (capabilities != null) && capabilities.HasCapability(NetCapability.Internet);
+            }
+
+            NetworkInfo info = connectivity.ActiveNetworkInfo;
+            return (info != null) && (info.IsConnected);
+        }
+
+        /// <inheritdoc/>
+        public bool IsInternetCostFree()
+        {
+            ConnectivityManager connectivity = GetConnectivityManager();
+            return !connectivity.IsActiveNetworkMetered;
+        }
+
+        private ConnectivityManager GetConnectivityManager()
+        {
+            return (ConnectivityManager)_applicationContext.GetSystemService(Context.ConnectivityService);
+        }
+    }
+}

src/SilentNotes.Android/Services/VersionService.cs

@@ -13,7 +13,7 @@ namespace SilentNotes.Android.Services
     /// </summary>
     public class VersionService : IVersionService
     {
-        private Context _applicationContext;
+        private readonly Context _applicationContext;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="VersionService"/> class.

src/SilentNotes.Android/SilentNotes.Android.csproj

@@ -82,6 +82,7 @@
     <Compile Include="Services\CryptoRandomService.cs" />
     <Compile Include="Services\DataProtectionService.cs" />
     <Compile Include="Services\FeedbackService.cs" />
+    <Compile Include="Services\InternetStateService.cs" />
     <Compile Include="Services\LanguageCodeService.cs" />
     <Compile Include="Services\NativeBrowserService.cs" />
     <Compile Include="Services\RepositoryStorageService.cs" />

src/SilentNotes.Android/Startup.cs

@@ -67,6 +67,12 @@ private static void RegisterServices(Activity rootActivity)
             Ioc.RegisterFactory<IDataProtectionService>(() => new DataProtectionService(
                 rootActivity,
                 Ioc.GetOrCreate<ICryptoRandomService>()));
+            Ioc.RegisterFactory<IInternetStateService>(() => new InternetStateService(rootActivity));
+            Ioc.RegisterFactory<IAutoSynchronizationService>(() => new AutoSynchronizationService(
+                Ioc.GetOrCreate<IInternetStateService>(),
+                Ioc.GetOrCreate<ISettingsService>(),
+                Ioc.GetOrCreate<IRepositoryStorageService>(),
+                Ioc.GetOrCreate<INavigationService>()));
         }
 
         private static void RegisterControllers()

src/SilentNotes.Shared/Assets/Html/sortable/README.md

@@ -1,5 +1,5 @@
 # Sortable
-Sortable is a <s>minimalist</s> JavaScript library for reorderable drag-and-drop lists.
+Sortable is a JavaScript library for reorderable drag-and-drop lists.
 
 Demo: http://sortablejs.github.io/Sortable/
 
@@ -11,6 +11,7 @@ Demo: http://sortablejs.github.io/Sortable/
  * CSS animation when moving items
  * Supports drag handles *and selectable text* (better than voidberg's html5sortable)
  * Smart auto-scrolling
+ * Advanced swap detection
  * Built using native HTML5 drag and drop API
  * Supports
    * [Meteor](https://github.com/SortableJS/meteor-sortablejs)
@@ -86,6 +87,7 @@ var sortable = new Sortable(el, {
 	disabled: false, // Disables the sortable if set to true.
 	store: null,  // @see Store
 	animation: 150,  // ms, animation speed moving items when sorting, `0` — without animation
+	easing: "cubic-bezier(1, 0, 0, 1)", // Easing for animation. Defaults to null. See https://easings.net/ for examples.
 	handle: ".my-handle",  // Drag handle selector within list items
 	filter: ".ignore-elements",  // Selectors that do not lead to dragging (String or Function)
 	preventOnFilter: true, // Call `event.preventDefault()` when triggered `filter`
@@ -113,6 +115,9 @@ var sortable = new Sortable(el, {
 	bubbleScroll: true, // apply autoscroll to all parent elements, allowing for easier movement
 
 	dragoverBubble: false,
+	removeCloneOnHide: true, // Remove the clone element when it is not showing, rather than just hiding it
+	emptyInsertThreshold: 5, // px, distance mouse must be from empty sortable to insert drag element into it
+
 
 	setData: function (/** DataTransfer */dataTransfer, /** HTMLElement*/dragEl) {
 		dataTransfer.setData('Text', dragEl.textContent); // `dataTransfer` object of HTML5 DragEvent
@@ -123,6 +128,11 @@ var sortable = new Sortable(el, {
 		evt.oldIndex;  // element index within parent
 	},
 
+	// Element is unchosen
+	onUnchoose: function(/**Event*/evt) {
+		// same properties as onEnd
+	},
+
 	// Element dragging started
 	onStart: function (/**Event*/evt) {
 		evt.oldIndex;  // element index within parent
@@ -166,17 +176,26 @@ var sortable = new Sortable(el, {
 	onMove: function (/**Event*/evt, /**Event*/originalEvent) {
 		// Example: https://jsbin.com/nawahef/edit?js,output
 		evt.dragged; // dragged HTMLElement
-		evt.draggedRect; // TextRectangle {left, top, right и bottom}
+		evt.draggedRect; // DOMRect {left, top, right, bottom}
 		evt.related; // HTMLElement on which have guided
-		evt.relatedRect; // TextRectangle
+		evt.relatedRect; // DOMRect
+		evt.willInsertAfter; // Boolean that is true if Sortable will insert drag element after target by default
 		originalEvent.clientY; // mouse position
 		// return false; — for cancel
+		// return -1; — insert before target
+		// return 1; — insert after target
 	},
 
 	// Called when creating a clone of element
 	onClone: function (/**Event*/evt) {
 		var origEl = evt.item;
 		var cloneEl = evt.clone;
+	},
+
+	// Called when dragging element changes position
+	onChange: function(/**Event*/evt) {
+		evt.newIndex // most likely why this event is used is to get the dragging element's current index
+		// same properties as onEnd
 	}
 });
 ```
@@ -191,7 +210,7 @@ You can also define whether lists can give away, give and keep a copy (`clone`),
 
  * name: `String` — group name
  * pull: `true|false|["foo", "bar"]|'clone'|function` — ability to move from the list. `clone` — copy the item, rather than move. Or an array of group names which the elements may be put in. Defaults to `true`.
- * put: `true|false|["baz", "qux"]|function` — whether elements can be added from other lists, or an array of group names from which elements can be taken.
+ * put: `true|false|["baz", "qux"]|function` — whether elements can be added from other lists, or an array of group names from which elements can be added.
  * revertClone: `boolean` — revert cloned element to initial position after moving to a another list.
 
 
@@ -227,6 +246,8 @@ Percentage of the target that the swap zone will take up, as a float between `0`
 
 Read more: https://github.com/SortableJS/Sortable/wiki/Swap-Thresholds-and-Direction#swap-threshold
 
+Demo: http://sortablejs.github.io/Sortable#thresholds
+
 
 ---
 
@@ -236,6 +257,8 @@ Set to `true` to set the swap zone to the sides of the target, for the effect of
 
 Read more: https://github.com/SortableJS/Sortable/wiki/Swap-Thresholds-and-Direction#forcing-inverted-swap-zone
 
+Demo: http://sortablejs.github.io/Sortable#thresholds
+
 
 ---
 
@@ -255,12 +278,15 @@ Direction that the Sortable should sort in. Can be set to `'vertical'`, `'horizo
 Read more: https://github.com/SortableJS/Sortable/wiki/Swap-Thresholds-and-Direction#direction
 
 
-Example of dynamic direction detection:
+Example of direction detection for vertical list that includes full column and half column elements:
 
 ```js
 Sortable.create(el, {
 	direction: function(evt, target, dragEl) {
-		return Sortable.utils.detectDirection(el);
+		if (target !== null && target.className.includes('half-column') && dragEl.className.includes('half-column')) {
+			return 'horizontal';
+		}
+		return 'vertical';
 	}
 });
 ```
@@ -469,15 +495,33 @@ Demo: https://jsbin.com/kesewor/edit?html,js,output
 
 
 #### `dragoverBubble` option
-If set to `true`, the dragover event will bubble to parent Sortables. Useful for nested Sortables. Works on both fallback and native dragover event.
+If set to `true`, the dragover event will bubble to parent sortables. Works on both fallback and native dragover event.
+By default, it is false, but Sortable will only stop bubbling the event once the element has been inserted into a parent Sortable, or *can* be inserted into a parent Sortable, but isn't at that specific time (due to animation, etc).
+
+Since 1.8.0, you will probably want to leave this option as false. Before 1.8.0, it may need to be `true` for nested sortables to work.
+
+
+---
+
+
+#### `removeCloneOnHide` option
+If set to `false`, the clone is hidden by having it's CSS `display` property set to `none`.
+By default, this option is `true`, meaning Sortable will remove the cloned element from the DOM when it is supposed to be hidden.
 
 
 ---
 
 
+#### `emptyInsertThreshold` option
+The distance (in pixels) the mouse must be from an empty sortable while dragging for the drag element to be inserted into that sortable. Defaults to `5`. Set to `0` to disable this feature.
+
+Demo: https://jsbin.com/becavoj/edit?js,output
+
+
+---
 ### Event object ([demo](https://jsbin.com/fogujiv/edit?js,output))
 
- - to:`HTMLElement` — list, in which moved element.
+ - to:`HTMLElement` — list, in which moved element
  - from:`HTMLElement` — previous list
  - item:`HTMLElement` — dragged element
  - clone:`HTMLElement`
@@ -489,9 +533,10 @@ If set to `true`, the dragover event will bubble to parent Sortables. Useful for
  - to:`HTMLElement`
  - from:`HTMLElement`
  - dragged:`HTMLElement`
- - draggedRect:` TextRectangle`
+ - draggedRect:`DOMRect`
  - related:`HTMLElement` — element on which have guided
- - relatedRect:` TextRectangle`
+ - relatedRect:`DOMRect`
+ - willInsertAfter:`Boolean` — `true` if will element be inserted after target (or `false` if before)
 
 
 ---
@@ -638,7 +683,7 @@ Link to the active instance.
 * closest(el`:HTMLElement`, selector`:String`[, ctx`:HTMLElement`])`:HTMLElement|Null` — for each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree
 * clone(el`:HTMLElement`)`:HTMLElement` — create a deep copy of the set of matched elements
 * toggleClass(el`:HTMLElement`, name`:String`, state`:Boolean`) — add or remove one classes from each element
-* detectDirection(el`:HTMLElement`)`:String` — automatically detect the direction of the element as either `'vertical'` or `'horizontal'`
+* detectDirection(el`:HTMLElement`)`:String` — automatically detect the [direction](https://github.com/SortableJS/Sortable/wiki/Swap-Thresholds-and-Direction#direction) of the element as either `'vertical'` or `'horizontal'`
 
 
 ---