Android release v1.0.99

README.md

@@ -26,7 +26,7 @@ Linux          | <a href='https://github.com/laurent22/joplin/releases/download/
 
 Operating System | Download | Alt. Download
 -----------------|----------|----------------
-Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.98/joplin-v1.0.98.apk)
+Android          | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin-android/releases/download/android-v1.0.99/joplin-v1.0.99.apk)
 iOS              | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeIOS.png'/></a> | -
 
 ## Terminal application

ReactNativeClient/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
 		applicationId "net.cozic.joplin"
 		minSdkVersion 16
 		targetSdkVersion 22
-		versionCode 2097276
-		versionName "1.0.98"
+		versionCode 2097277
+		versionName "1.0.99"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}

ReactNativeClient/lib/dialogs.js

@@ -1,5 +1,6 @@
 const DialogBox = require('react-native-dialogbox').default;
 const { Keyboard } = require('react-native');
+const { _ } = require('lib/locale');
 
 // Add this at the bottom of the component:
 //
@@ -18,12 +19,14 @@ dialogs.confirm = (parentComponent, message) => {
 			content: message,
 			
 			ok: {
+				text: _('OK'),
 				callback: () => {
 					resolve(true);
 				}
 			},
 
 			cancel: {
+				text: _('Cancel'),
 				callback: () => {
 					resolve(false);
 				}

ReactNativeClient/package.json

@@ -23,11 +23,11 @@
     "moment": "^2.18.1",
     "prop-types": "^15.6.0",
     "query-string": "4.3.4",
-    "react": "16.0.0-beta.5",
-    "react-native": "0.49.0",
+    "react": "16.2.0",
+    "react-native": "0.53.0",
     "react-native-action-button": "^2.6.9",
     "react-native-datepicker": "^1.6.0",
-    "react-native-dialogbox": "^0.6.6",
+    "react-native-dialogbox": "git+https://github.com/laurent22/react-native-dialogbox.git",
     "react-native-document-picker": "^2.1.0",
     "react-native-dropdownalert": "^3.1.2",
     "react-native-fetch-blob": "^0.10.6",
@@ -41,7 +41,7 @@
     "react-native-securerandom": "^0.1.1",
     "react-native-side-menu": "^1.1.3",
     "react-native-sqlite-storage": "3.3.*",
-    "react-native-vector-icons": "^4.4.2",
+    "react-native-vector-icons": "^4.5.0",
     "react-navigation": "^1.0.0-beta.21",
     "react-redux": "4.4.8",
     "redux": "3.6.0",

ReactNativeClient/rn-cli.config.js

@@ -0,0 +1,8 @@
+// Workaround for https://github.com/oblador/react-native-vector-icons/issues/627
+
+const blacklist = require('metro/src/blacklist')
+module.exports = {
+	getBlacklistRE () {
+		return blacklist([/react-native\/local-cli\/core\/__fixtures__.*/])
+	},
+}

docs/index.html

@@ -247,7 +247,7 @@
 <tr>
 <td>Android</td>
 <td><a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeAndroid.png'/></a></td>
-<td>or <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.98/joplin-v1.0.98.apk">Download APK File</a></td>
+<td>or <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.99/joplin-v1.0.99.apk">Download APK File</a></td>
 </tr>
 <tr>
 <td>iOS</td>
@@ -396,14 +396,14 @@ $$
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/hr.png" alt=""></td>
 <td>Croatian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po">hr_HR</a></td>
-<td>Hrvoje Mandić <a href="&#109;&#97;&#x69;&#108;&#x74;&#111;&#x3a;&#116;&#x72;&#98;&#117;&#x68;&#x6f;&#x6d;&#64;&#110;&#101;&#x74;&#46;&#x68;&#x72;">&#116;&#x72;&#98;&#117;&#x68;&#x6f;&#x6d;&#64;&#110;&#101;&#x74;&#46;&#x68;&#x72;</a></td>
+<td>Hrvoje Mandić <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#x3a;&#116;&#114;&#x62;&#x75;&#104;&#111;&#109;&#x40;&#x6e;&#101;&#x74;&#46;&#104;&#114;">&#116;&#114;&#x62;&#x75;&#104;&#111;&#109;&#x40;&#x6e;&#101;&#x74;&#46;&#104;&#114;</a></td>
 <td>71%</td>
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/de.png" alt=""></td>
 <td>Deutsch</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po">de_DE</a></td>
-<td>Tobias Strobel <a href="&#109;&#97;&#105;&#x6c;&#116;&#x6f;&#58;&#103;&#105;&#x74;&#64;&#115;&#x74;&#x72;&#111;&#x62;&#101;&#108;&#x74;&#111;&#98;&#x69;&#x61;&#x73;&#x2e;&#x64;&#101;">&#103;&#105;&#x74;&#64;&#115;&#x74;&#x72;&#111;&#x62;&#101;&#108;&#x74;&#111;&#98;&#x69;&#x61;&#x73;&#x2e;&#x64;&#101;</a></td>
+<td>Tobias Strobel <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#111;&#x3a;&#x67;&#105;&#116;&#x40;&#115;&#116;&#114;&#111;&#98;&#x65;&#x6c;&#x74;&#111;&#x62;&#105;&#97;&#x73;&#x2e;&#100;&#101;">&#x67;&#105;&#116;&#x40;&#115;&#116;&#114;&#111;&#98;&#x65;&#x6c;&#x74;&#111;&#x62;&#105;&#97;&#x73;&#x2e;&#100;&#101;</a></td>
 <td>89%</td>
 </tr>
 <tr>
@@ -417,7 +417,7 @@ $$
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/es.png" alt=""></td>
 <td>Español</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po">es_ES</a></td>
-<td>Fernando Martín <a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#58;&#x66;&#x40;&#109;&#114;&#x74;&#110;&#46;&#x65;&#x73;">&#x66;&#x40;&#109;&#114;&#x74;&#110;&#46;&#x65;&#x73;</a></td>
+<td>Fernando Martín <a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#102;&#64;&#x6d;&#114;&#116;&#x6e;&#x2e;&#x65;&#x73;">&#102;&#64;&#x6d;&#114;&#116;&#x6e;&#x2e;&#x65;&#x73;</a></td>
 <td>97%</td>
 </tr>
 <tr>
@@ -459,14 +459,14 @@ $$
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/ru.png" alt=""></td>
 <td>Русский</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po">ru_RU</a></td>
-<td>Artyom Karlov <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#114;&#x74;&#121;&#111;&#x6d;&#x2e;&#107;&#97;&#114;&#x6c;&#x6f;&#118;&#64;&#x67;&#x6d;&#97;&#105;&#x6c;&#x2e;&#99;&#111;&#x6d;">&#97;&#114;&#x74;&#121;&#111;&#x6d;&#x2e;&#107;&#97;&#114;&#x6c;&#x6f;&#118;&#64;&#x67;&#x6d;&#97;&#105;&#x6c;&#x2e;&#99;&#111;&#x6d;</a></td>
+<td>Artyom Karlov <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#x3a;&#x61;&#114;&#116;&#x79;&#x6f;&#109;&#x2e;&#x6b;&#x61;&#x72;&#x6c;&#x6f;&#118;&#x40;&#x67;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#111;&#109;">&#x61;&#114;&#116;&#x79;&#x6f;&#109;&#x2e;&#x6b;&#x61;&#x72;&#x6c;&#x6f;&#118;&#x40;&#x67;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#111;&#109;</a></td>
 <td>91%</td>
 </tr>
 <tr>
 <td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cn.png" alt=""></td>
 <td>中文 (简体)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/zh_CN.po">zh_CN</a></td>
-<td>RCJacH <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#82;&#67;&#74;&#x61;&#x63;&#72;&#64;&#x6f;&#117;&#116;&#108;&#111;&#111;&#107;&#x2e;&#x63;&#111;&#x6d;">&#82;&#67;&#74;&#x61;&#x63;&#72;&#64;&#x6f;&#117;&#116;&#108;&#111;&#111;&#107;&#x2e;&#x63;&#111;&#x6d;</a></td>
+<td>RCJacH <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x52;&#67;&#x4a;&#97;&#x63;&#x48;&#x40;&#x6f;&#117;&#116;&#108;&#x6f;&#x6f;&#x6b;&#x2e;&#99;&#111;&#x6d;">&#x52;&#67;&#x4a;&#97;&#x63;&#x48;&#x40;&#x6f;&#117;&#116;&#108;&#x6f;&#x6f;&#x6b;&#x2e;&#99;&#111;&#x6d;</a></td>
 <td>73%</td>
 </tr>
 <tr>