self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Fixed React Native app to work with latest versions of packages and removed dependency to yarn

Browse Source
This commit is contained in:
Laurent Cozic
2017-10-30 18:17:01 +00:00
parent a43f5a1b53
commit 5492e715f8
29 changed files with 6308 additions and 4320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CliClient/install.sh
View File

@@ -3,5 +3,4 @@
CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
"$CLIENT_DIR/publish.sh"
cd ~/bin/yarn/
yarn upgrade joplin
npm install -g joplin

24
CliClient/locales/en_GB.po
View File

@@ -42,7 +42,7 @@ msgstr ""
msgid "Please select the note or notebook to be deleted first."
msgstr ""
msgid "Set a todo as completed / not completed"
msgid "Set a to-do as completed / not completed"
msgstr ""
msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
@@ -209,11 +209,11 @@ msgid ""
"specified the note is duplicated in the current notebook."
msgstr ""
msgid "Marks a todo as done."
msgid "Marks a to-do as done."
msgstr ""
#, javascript-format
msgid "Note is not a todo: \"%s\""
msgid "Note is not a to-do: \"%s\""
msgstr ""
msgid "Edit note."
@@ -352,8 +352,8 @@ msgstr ""
msgid ""
"Displays only the items of the specific type(s). Can be `n` for notes, `t` "
"for todos, or `nt` for notes and todos (eg. `-tt` would display only the "
"todos, while `-ttd` would display notes and todos."
"for to-dos, or `nt` for notes and to-dos (eg. `-tt` would display only the "
"to-dos, while `-ttd` would display notes and to-dos."
msgstr ""
msgid "Either \"text\" or \"json\""
@@ -361,7 +361,7 @@ msgstr ""
msgid ""
"Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, "
"TODO_CHECKED (for todos), TITLE"
"TODO_CHECKED (for to-dos), TITLE"
msgstr ""
msgid "Please select a notebook first."
@@ -376,7 +376,7 @@ msgstr ""
msgid "Notes can only be created within a notebook."
msgstr ""
msgid "Creates a new todo."
msgid "Creates a new to-do."
msgstr ""
msgid "Moves the notes matching <note> to [notebook]."
@@ -462,12 +462,12 @@ msgstr ""
msgid ""
"<todo-command> can either be \"toggle\" or \"clear\". Use \"toggle\" to "
"toggle the given todo between completed and uncompleted state (If the target "
"is a regular note it will be converted to a todo). Use \"clear\" to convert "
"the todo back to a regular note."
"toggle the given to-do between completed and uncompleted state (If the "
"target is a regular note it will be converted to a to-do). Use \"clear\" to "
"convert the to-do back to a regular note."
msgstr ""
msgid "Marks a todo as non-completed."
msgid "Marks a to-do as non-completed."
msgstr ""
msgid ""
@@ -699,7 +699,7 @@ msgstr ""
msgid "%s: %d notes"
msgstr ""
msgid "New todo"
msgid "New to-do"
msgstr ""
msgid "New note"

31
CliClient/locales/fr_FR.po
View File

@@ -46,7 +46,7 @@ msgid "Please select the note or notebook to be deleted first."
msgstr "Veuillez d'abord sélectionner un carnet."
#, fuzzy
msgid "Set a todo as completed / not completed"
msgid "Set a to-do as completed / not completed"
msgstr "Tâches non-complétées et récentes"
msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
@@ -229,11 +229,11 @@ msgstr ""
"Copie les notes correspondant à [nom] vers [carnet]. Si aucun carnet n'est "
"spécifié, la note est dupliqué sur place."
msgid "Marks a todo as done."
msgid "Marks a to-do as done."
msgstr ""
#, javascript-format
msgid "Note is not a todo: \"%s\""
msgid "Note is not a to-do: \"%s\""
msgstr ""
msgid "Edit note."
@@ -386,10 +386,11 @@ msgstr ""
msgid "Reverses the sorting order."
msgstr "Inverser l'ordre."
#, fuzzy
msgid ""
"Displays only the items of the specific type(s). Can be `n` for notes, `t` "
"for todos, or `nt` for notes and todos (eg. `-tt` would display only the "
"todos, while `-ttd` would display notes and todos."
"for to-dos, or `nt` for notes and to-dos (eg. `-tt` would display only the "
"to-dos, while `-ttd` would display notes and to-dos."
msgstr ""
"Affiche uniquement les notes du ou des types spécifiés. Le type peut-être "
"`n` pour les notes, `t` pour les tâches (par exemple, `-tt` affiche "
@@ -398,9 +399,10 @@ msgstr ""
msgid "Either \"text\" or \"json\""
msgstr "Soit \"text\" soit \"json\""
#, fuzzy
msgid ""
"Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, "
"TODO_CHECKED (for todos), TITLE"
"TODO_CHECKED (for to-dos), TITLE"
msgstr ""
"Utilise le format de liste longue. Le format est ID, NOMBRE_DE_NOTES (pour "
"les carnets), DATE, TACHE_TERMINE (pour les tâches), TITRE"
@@ -417,7 +419,8 @@ msgstr "Créer une note."
msgid "Notes can only be created within a notebook."
msgstr "Les notes ne peuvent être créées que dans un carnet."
msgid "Creates a new todo."
#, fuzzy
msgid "Creates a new to-do."
msgstr "Créer une nouvelle tâche."
#, fuzzy
@@ -517,17 +520,18 @@ msgstr "Commande invalide : \"%s\""
#, fuzzy
msgid ""
"<todo-command> can either be \"toggle\" or \"clear\". Use \"toggle\" to "
"toggle the given todo between completed and uncompleted state (If the target "
"is a regular note it will be converted to a todo). Use \"clear\" to convert "
"the todo back to a regular note."
"toggle the given to-do between completed and uncompleted state (If the "
"target is a regular note it will be converted to a to-do). Use \"clear\" to "
"convert the to-do back to a regular note."
msgstr ""
"Gère le status des tâches. <action> peut être \"toggle\" ou \"clear\". "
"Utilisez \"toggle\" pour basculer la tâche entre le status terminé et non-"
"terminé (Si la cible est une note, elle sera convertie en tâche). Utilisez "
"\"clear\" pour convertir la tâche en note."
msgid "Marks a todo as non-completed."
msgstr ""
#, fuzzy
msgid "Marks a to-do as non-completed."
msgstr "Tâches non-complétées et récentes"
msgid ""
"Switches to [notebook] - all further operations will happen within this "
@@ -765,7 +769,8 @@ msgstr "Carnets"
msgid "%s: %d notes"
msgstr "%s : %d notes"
msgid "New todo"
#, fuzzy
msgid "New to-do"
msgstr "Nouvelle tâche"
msgid "New note"

24
CliClient/locales/joplin.pot
View File

@@ -42,7 +42,7 @@ msgstr ""
msgid "Please select the note or notebook to be deleted first."
msgstr ""
msgid "Set a todo as completed / not completed"
msgid "Set a to-do as completed / not completed"
msgstr ""
msgid "[t]oggle [c]onsole between maximized/minimized/hidden/visible."
@@ -209,11 +209,11 @@ msgid ""
"specified the note is duplicated in the current notebook."
msgstr ""
msgid "Marks a todo as done."
msgid "Marks a to-do as done."
msgstr ""
#, javascript-format
msgid "Note is not a todo: \"%s\""
msgid "Note is not a to-do: \"%s\""
msgstr ""
msgid "Edit note."
@@ -352,8 +352,8 @@ msgstr ""
msgid ""
"Displays only the items of the specific type(s). Can be `n` for notes, `t` "
"for todos, or `nt` for notes and todos (eg. `-tt` would display only the "
"todos, while `-ttd` would display notes and todos."
"for to-dos, or `nt` for notes and to-dos (eg. `-tt` would display only the "
"to-dos, while `-ttd` would display notes and to-dos."
msgstr ""
msgid "Either \"text\" or \"json\""
@@ -361,7 +361,7 @@ msgstr ""
msgid ""
"Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, "
"TODO_CHECKED (for todos), TITLE"
"TODO_CHECKED (for to-dos), TITLE"
msgstr ""
msgid "Please select a notebook first."
@@ -376,7 +376,7 @@ msgstr ""
msgid "Notes can only be created within a notebook."
msgstr ""
msgid "Creates a new todo."
msgid "Creates a new to-do."
msgstr ""
msgid "Moves the notes matching <note> to [notebook]."
@@ -462,12 +462,12 @@ msgstr ""
msgid ""
"<todo-command> can either be \"toggle\" or \"clear\". Use \"toggle\" to "
"toggle the given todo between completed and uncompleted state (If the target "
"is a regular note it will be converted to a todo). Use \"clear\" to convert "
"the todo back to a regular note."
"toggle the given to-do between completed and uncompleted state (If the "
"target is a regular note it will be converted to a to-do). Use \"clear\" to "
"convert the to-do back to a regular note."
msgstr ""
msgid "Marks a todo as non-completed."
msgid "Marks a to-do as non-completed."
msgstr ""
msgid ""
@@ -699,7 +699,7 @@ msgstr ""
msgid "%s: %d notes"
msgstr ""
msgid "New todo"
msgid "New to-do"
msgstr ""
msgid "New note"

1
CliClient/publish.sh
View File

@@ -2,7 +2,6 @@
set -e
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# yarn upgrade
npm version patch
#$SCRIPT_DIR/update-package-md5.sh
touch "$SCRIPT_DIR/app/main.js"

2
ReactNativeClient/android/app/build.gradle
View File

@@ -137,7 +137,7 @@ android {
}
dependencies {
compile project(':react-native-image-resizer')
compile project(':react-native-vector-icons')
compile project(':react-native-fs')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1"

BIN
ReactNativeClient/android/app/src/main/assets/fonts/Entypo.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/EvilIcons.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/Feather.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/FontAwesome.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/Foundation.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/Ionicons.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/MaterialIcons.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/Octicons.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/SimpleLineIcons.ttf Normal file
View File

Binary file not shown.

BIN
ReactNativeClient/android/app/src/main/assets/fonts/Zocial.ttf Normal file
View File

Binary file not shown.

16
ReactNativeClient/android/app/src/main/java/net/cozic/joplin/MainApplication.java
View File

@@ -3,15 +3,16 @@ package net.cozic.joplin;
import android.app.Application;
import com.facebook.react.ReactApplication;
import com.rnfs.RNFSPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader;
import org.pgsqlite.SQLitePluginPackage;
import com.RNFetchBlob.RNFetchBlobPackage;
import com.oblador.vectoricons.VectorIconsPackage;
import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
import com.RNFetchBlob.RNFetchBlobPackage;
import com.rnfs.RNFSPackage;
import fr.bamlab.rnimageresizer.ImageResizerPackage;
import org.pgsqlite.SQLitePluginPackage;
import java.util.Arrays;
import java.util.List;
@@ -27,12 +28,13 @@ public class MainApplication extends Application implements ReactApplication {
@Override
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new SQLitePluginPackage(),
new ImageResizerPackage(),
new MainReactPackage(),
new RNFSPackage(),
new RNFetchBlobPackage(),
new ReactNativeDocumentPicker(),
new ImageResizerPackage()
new RNFetchBlobPackage(),
new RNFSPackage(),
new SQLitePluginPackage(),
new VectorIconsPackage()
);
}
};

2
ReactNativeClient/android/settings.gradle
View File

@@ -1,4 +1,6 @@
rootProject.name = 'Joplin'
include ':react-native-vector-icons'
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
include ':react-native-image-resizer'
project(':react-native-image-resizer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-resizer/android')
include ':react-native-fs'

2
ReactNativeClient/build_android.bat Normal file
View File

@@ -0,0 +1,2 @@
cd android
gradlew.bat installDebug

121
ReactNativeClient/ios/AwesomeProject.xcodeproj/project.pbxproj
View File

@@ -37,6 +37,21 @@
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
EA51DDC9EBFC469F8214B3AD /* libRNFS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A8E646D13B9444DE81EC441D /* libRNFS.a */; };
628436ED66784ABE86A775AE /* libRCTImageResizer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B8E2583D2B6447DB35F295C /* libRCTImageResizer.a */; };
07D2C9309DC34FA8A4F2B9B0 /* libRNDocumentPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B227F8B0AFC4FA8BC9D7177 /* libRNDocumentPicker.a */; };
7E5B60CD1D414BD1B83F524C /* libRNFetchBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45615BC3EAEC4F5E947ACECD /* libRNFetchBlob.a */; };
3E336653B27B4DF9B68CC5E3 /* libSQLite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D1B4757E884C47C3A7B74CEA /* libSQLite.a */; };
D7AA1BCE6BE84D04B69504EF /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E6F3731DA3CC417DA0E18656 /* libRNVectorIcons.a */; };
01EACB536FDD4967ADFF2B7C /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 604048D7F6724E8AB60009B5 /* Entypo.ttf */; };
102D53C0C5734A77BD865EF8 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6451E6787D7A4939B0940789 /* EvilIcons.ttf */; };
0807A4C43422465BB101771F /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F07C38C6F4054355A8FCE69C /* Feather.ttf */; };
2325D11979804EF99B6E9774 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5482D9B65D004A999B98225D /* FontAwesome.ttf */; };
FC789F6FC7984B2188ACD995 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B8E9EC15CD314D6CAFF8F52C /* Foundation.ttf */; };
8EE0EE4DDF6E425EB055CB89 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B5F07FDA04104B999417FFD7 /* Ionicons.ttf */; };
00CC3677770C4718B50F241E /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8E6BF6E4F708428389305CDE /* MaterialCommunityIcons.ttf */; };
43D04553CC674D29982E596F /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F8EF22D6D262439988C3ABE7 /* MaterialIcons.ttf */; };
1AC1F0AA04454020908EE717 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 14A2F14FF2484F0FAC53165D /* Octicons.ttf */; };
97B44363F4A84FA286FA6835 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0F8BE100EDD24484A87C58C5 /* SimpleLineIcons.ttf */; };
222B80D34F3C495D9CA5DFAB /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 07CC5BD28300490FBCF2F6D7 /* Zocial.ttf */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -260,6 +275,25 @@
A8E646D13B9444DE81EC441D /* libRNFS.a */ = {isa = PBXFileReference; name = "libRNFS.a"; path = "libRNFS.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
8FB22B82988847ED8E7C0976 /* RCTImageResizer.xcodeproj */ = {isa = PBXFileReference; name = "RCTImageResizer.xcodeproj"; path = "../node_modules/react-native-image-resizer/ios/RCTImageResizer.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
9B8E2583D2B6447DB35F295C /* libRCTImageResizer.a */ = {isa = PBXFileReference; name = "libRCTImageResizer.a"; path = "libRCTImageResizer.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
9A76264FC62545F8B7526FB4 /* RNDocumentPicker.xcodeproj */ = {isa = PBXFileReference; name = "RNDocumentPicker.xcodeproj"; path = "../node_modules/react-native-document-picker/ios/RNDocumentPicker.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
2B227F8B0AFC4FA8BC9D7177 /* libRNDocumentPicker.a */ = {isa = PBXFileReference; name = "libRNDocumentPicker.a"; path = "libRNDocumentPicker.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
750D2094BD354714A6A2ED6F /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; name = "RNFetchBlob.xcodeproj"; path = "../node_modules/react-native-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
45615BC3EAEC4F5E947ACECD /* libRNFetchBlob.a */ = {isa = PBXFileReference; name = "libRNFetchBlob.a"; path = "libRNFetchBlob.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
005F57EA6E7540AEB142159D /* SQLite.xcodeproj */ = {isa = PBXFileReference; name = "SQLite.xcodeproj"; path = "../node_modules/react-native-sqlite-storage/src/ios/SQLite.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
D1B4757E884C47C3A7B74CEA /* libSQLite.a */ = {isa = PBXFileReference; name = "libSQLite.a"; path = "libSQLite.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
C1BD944C7223406EB689EA10 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; name = "RNVectorIcons.xcodeproj"; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
E6F3731DA3CC417DA0E18656 /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
604048D7F6724E8AB60009B5 /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
6451E6787D7A4939B0940789 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
F07C38C6F4054355A8FCE69C /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
5482D9B65D004A999B98225D /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
B8E9EC15CD314D6CAFF8F52C /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
B5F07FDA04104B999417FFD7 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
8E6BF6E4F708428389305CDE /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
F8EF22D6D262439988C3ABE7 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
14A2F14FF2484F0FAC53165D /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
0F8BE100EDD24484A87C58C5 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
07CC5BD28300490FBCF2F6D7 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -288,6 +322,10 @@
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
EA51DDC9EBFC469F8214B3AD /* libRNFS.a in Frameworks */,
628436ED66784ABE86A775AE /* libRCTImageResizer.a in Frameworks */,
07D2C9309DC34FA8A4F2B9B0 /* libRNDocumentPicker.a in Frameworks */,
7E5B60CD1D414BD1B83F524C /* libRNFetchBlob.a in Frameworks */,
3E336653B27B4DF9B68CC5E3 /* libSQLite.a in Frameworks */,
D7AA1BCE6BE84D04B69504EF /* libRNVectorIcons.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -456,6 +494,10 @@
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
8C2AA97067234408AD5BFD90 /* RNFS.xcodeproj */,
8FB22B82988847ED8E7C0976 /* RCTImageResizer.xcodeproj */,
9A76264FC62545F8B7526FB4 /* RNDocumentPicker.xcodeproj */,
750D2094BD354714A6A2ED6F /* RNFetchBlob.xcodeproj */,
005F57EA6E7540AEB142159D /* SQLite.xcodeproj */,
C1BD944C7223406EB689EA10 /* RNVectorIcons.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
@@ -476,6 +518,7 @@
832341AE1AAA6A7D00B99B32 /* Libraries */,
00E356EF1AD99517003FC87E /* AwesomeProjectTests */,
83CBBA001A601CBA00E9B192 /* Products */,
B788D30260EA47CEB74F9E88 /* Resources */,
);
indentWidth = 2;
sourceTree = "<group>";
@@ -492,6 +535,25 @@
name = Products;
sourceTree = "<group>";
};
B788D30260EA47CEB74F9E88 /* Resources */ = {
isa = "PBXGroup";
children = (
604048D7F6724E8AB60009B5 /* Entypo.ttf */,
6451E6787D7A4939B0940789 /* EvilIcons.ttf */,
F07C38C6F4054355A8FCE69C /* Feather.ttf */,
5482D9B65D004A999B98225D /* FontAwesome.ttf */,
B8E9EC15CD314D6CAFF8F52C /* Foundation.ttf */,
B5F07FDA04104B999417FFD7 /* Ionicons.ttf */,
8E6BF6E4F708428389305CDE /* MaterialCommunityIcons.ttf */,
F8EF22D6D262439988C3ABE7 /* MaterialIcons.ttf */,
14A2F14FF2484F0FAC53165D /* Octicons.ttf */,
0F8BE100EDD24484A87C58C5 /* SimpleLineIcons.ttf */,
07CC5BD28300490FBCF2F6D7 /* Zocial.ttf */,
);
name = Resources;
sourceTree = "<group>";
path = "";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -850,6 +912,17 @@
files = (
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
01EACB536FDD4967ADFF2B7C /* Entypo.ttf in Resources */,
102D53C0C5734A77BD865EF8 /* EvilIcons.ttf in Resources */,
0807A4C43422465BB101771F /* Feather.ttf in Resources */,
2325D11979804EF99B6E9774 /* FontAwesome.ttf in Resources */,
FC789F6FC7984B2188ACD995 /* Foundation.ttf in Resources */,
8EE0EE4DDF6E425EB055CB89 /* Ionicons.ttf in Resources */,
00CC3677770C4718B50F241E /* MaterialCommunityIcons.ttf in Resources */,
43D04553CC674D29982E596F /* MaterialIcons.ttf in Resources */,
1AC1F0AA04454020908EE717 /* Octicons.ttf in Resources */,
97B44363F4A84FA286FA6835 /* SimpleLineIcons.ttf in Resources */,
222B80D34F3C495D9CA5DFAB /* Zocial.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -985,11 +1058,19 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)\..\node_modules\react-native-image-resizer\ios\RCTImageResizer",
"$(SRCROOT)\..\node_modules\react-native-document-picker\ios\RNDocumentPicker",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
"$(SRCROOT)\..\node_modules\react-native-sqlite-storage\src\ios",
"$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager",
);
};
name = Debug;
@@ -1012,11 +1093,19 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)\..\node_modules\react-native-image-resizer\ios\RCTImageResizer",
"$(SRCROOT)\..\node_modules\react-native-document-picker\ios\RNDocumentPicker",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
"$(SRCROOT)\..\node_modules\react-native-sqlite-storage\src\ios",
"$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager",
);
};
name = Release;
@@ -1040,6 +1129,10 @@
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)\..\node_modules\react-native-image-resizer\ios\RCTImageResizer",
"$(SRCROOT)\..\node_modules\react-native-document-picker\ios\RNDocumentPicker",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
"$(SRCROOT)\..\node_modules\react-native-sqlite-storage\src\ios",
"$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager",
);
};
name = Debug;
@@ -1062,6 +1155,10 @@
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)\..\node_modules\react-native-image-resizer\ios\RCTImageResizer",
"$(SRCROOT)\..\node_modules\react-native-document-picker\ios\RNDocumentPicker",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
"$(SRCROOT)\..\node_modules\react-native-sqlite-storage\src\ios",
"$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager",
);
};
name = Release;
@@ -1093,11 +1190,19 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)\..\node_modules\react-native-image-resizer\ios\RCTImageResizer",
"$(SRCROOT)\..\node_modules\react-native-document-picker\ios\RNDocumentPicker",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
"$(SRCROOT)\..\node_modules\react-native-sqlite-storage\src\ios",
"$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager",
);
};
name = Debug;
@@ -1129,11 +1234,19 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-fs/**",
"$(SRCROOT)\..\node_modules\react-native-image-resizer\ios\RCTImageResizer",
"$(SRCROOT)\..\node_modules\react-native-document-picker\ios\RNDocumentPicker",
"$(SRCROOT)\..\node_modules\react-native-fetch-blob\ios/**",
"$(SRCROOT)\..\node_modules\react-native-sqlite-storage\src\ios",
"$(SRCROOT)\..\node_modules\react-native-vector-icons\RNVectorIconsManager",
);
};
name = Release;
@@ -1160,6 +1273,10 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
};
name = Debug;
@@ -1186,6 +1303,10 @@
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
};
name = Release;

17
ReactNativeClient/ios/AwesomeProject/Info.plist
View File

@@ -39,9 +39,8 @@
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<string/>
<key>NSAppTransportSecurity</key>
<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
<dict>
<key>NSExceptionDomains</key>
<dict>
@@ -52,5 +51,19 @@
</dict>
</dict>
</dict>
<key>UIAppFonts</key>
<array>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>FontAwesome.ttf</string>
<string>Foundation.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Octicons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
</array>
</dict>
</plist>

2
ReactNativeClient/lib/components/checkbox.js
View File

@@ -20,7 +20,7 @@ class Checkbox extends Component {
}
componentWillMount() {
this.state = { checked: this.props.checked };
this.setState({ checked: this.props.checked });
}
componentWillReceiveProps(newProps) {

2
ReactNativeClient/lib/components/note-list.js
View File

@@ -71,7 +71,7 @@ class NoteListComponent extends Component {
componentWillMount() {
const newDataSource = this.state.dataSource.cloneWithRows(this.filterNotes(this.props.items));
this.state = { dataSource: newDataSource };
this.setState({ dataSource: newDataSource });
}
componentWillReceiveProps(newProps) {

3
ReactNativeClient/lib/components/screens/note.js
View File

@@ -326,7 +326,8 @@ class NoteScreenComponent extends BaseScreenComponent {
const format = res.type == 'image/png' ? 'PNG' : 'JPEG';
reg.logger().info('Resizing image ' + localFilePath);
const resizedImagePath = await ImageResizer.createResizedImage(localFilePath, dimensions.width, dimensions.height, format, 85);
const resizedImage = await ImageResizer.createResizedImage(localFilePath, dimensions.width, dimensions.height, format, 85);
const resizedImagePath = resizedImage.uri;
reg.logger().info('Resized image ', resizedImagePath);
RNFetchBlob.fs.cp(resizedImagePath, targetPath); // mv doesn't work ("source path does not exist") so need to do cp and unlink

6101
ReactNativeClient/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

17
ReactNativeClient/package.json
View File

@@ -12,21 +12,22 @@
"form-data": "^2.1.4",
"html-entities": "^1.2.1",
"moment": "^2.18.1",
"prop-types": "^15.6.0",
"query-string": "4.3.4",
"react": "16.0.0-alpha.12",
"react-native": "0.46.0",
"react": "16.0.0-beta.5",
"react-native": "0.49.0",
"react-native-action-button": "^2.6.9",
"react-native-datepicker": "^1.6.0",
"react-native-dialogbox": "^0.6.6",
"react-native-document-picker": "^2.0.0",
"react-native-document-picker": "^2.1.0",
"react-native-fetch-blob": "^0.10.6",
"react-native-fs": "^2.3.3",
"react-native-image-resizer": "^0.1.1",
"react-native-fs": "^2.8.1",
"react-native-image-resizer": "^1.0.0",
"react-native-popup-dialog": "^0.9.35",
"react-native-popup-menu": "^0.7.4",
"react-native-side-menu": "^0.20.1",
"react-native-popup-menu": "^0.8.3",
"react-native-side-menu": "^1.1.3",
"react-native-sqlite-storage": "3.3.*",
"react-native-vector-icons": "^2.0.3",
"react-native-vector-icons": "^4.4.2",
"react-redux": "4.4.8",
"redux": "3.6.0",
"uuid": "^3.0.1"

3
ReactNativeClient/start_server.bat
View File

@@ -1,3 +1,2 @@
@echo off
npm start -- --reset-cache
rem "c:\Program Files (x86)\Yarn\bin\yarn.cmd" start -- --reset-cache
npm start -- --reset-cache

4257
ReactNativeClient/yarn.lock
View File

File diff suppressed because it is too large Load Diff