Merge branch 'master' of github.com:laurent22/joplin

Joplin_install_and_update.sh

@@ -107,7 +107,9 @@ if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$RELEASE_VERSIO
 
        # On some systems this directory doesn't exist by default
        mkdir -p ~/.local/share/applications
-       echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nComment=Joplin for Desktop\nExec=/home/$USER/.joplin/Joplin.AppImage\nIcon=joplin\nStartupWMClass=Joplin\nType=Application\nCategories=Office;\n$APPIMAGE_VERSION" >> ~/.local/share/applications/appimagekit-joplin.desktop
+       echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nComment=Joplin for Desktop\nExec=/home/$USER/.joplin/Joplin.AppImage\nIcon=joplin\nStartupWMClass=Joplin\nType=Application\nCategories=Office;\n#$APPIMAGE_VERSION" >> ~/.local/share/applications/appimagekit-joplin.desktop
+       # Update application icons
+       [[ `command -v update-desktop-database` ]] && update-desktop-database ~/.local/share/applications
        print "${COLOR_GREEN}OK${COLOR_RESET}"
     else
        print "${COLOR_RED}NOT DONE${COLOR_RESET}"

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2019 Laurent Cozic
+Copyright (c) 2016-2020 Laurent Cozic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -420,7 +420,7 @@ Current translations:
 
 MIT License
 
-Copyright (c) 2016-2019 Laurent Cozic
+Copyright (c) 2016-2020 Laurent Cozic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

ReactNativeClient/lib/components/global-style.js

@@ -126,6 +126,37 @@ function themeStyle(theme) {
 
 	let output = Object.assign({}, globalStyle);
 	if (theme == Setting.THEME_LIGHT) return addExtraStyles(output);
+	else if (theme == Setting.THEME_OLED_DARK) {
+		output.backgroundColor = '#000000';
+		output.color = '#dddddd';
+		output.colorFaded = '#777777';
+		output.dividerColor = '#555555';
+		output.strongDividerColor = '#888888';
+		output.selectedColor = '#333333';
+		output.textSelectionColor = '#00AEFF';
+		output.headerBackgroundColor = '#2D3136';
+
+		output.raisedBackgroundColor = '#0F2051';
+		output.raisedColor = '#788BC3';
+		output.raisedHighlightedColor = '#ffffff';
+
+		output.htmlColor = 'rgb(220,220,220)';
+		output.htmlBackgroundColor = 'rgb(29,32,36)';
+		output.htmlLinkColor = 'rgb(166,166,255)';
+
+		output.htmlDividerColor = '#3D444E';
+		output.htmlLinkColor = 'rgb(166,166,255)';
+		output.htmlCodeColor = '#ffffff';
+		output.htmlCodeBackgroundColor = 'rgb(47, 48, 49)';
+		output.htmlCodeBorderColor = 'rgb(70, 70, 70)';
+
+		output.codeThemeCss = 'hljs-atom-one-dark-reasonable.css';
+
+		output.colorUrl = '#7B81FF';
+
+		themeCache_[theme] = output;
+		return addExtraStyles(themeCache_[theme]);
+	}
 
 	output.backgroundColor = '#1D2024';
 	output.color = '#dddddd';

ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/katex.js

@@ -192,10 +192,25 @@ module.exports = function(context) {
 		context.pluginAssets['katex'] = [
 			{ name: 'katex.css' },
 			{ name: 'fonts/KaTeX_Main-Regular.woff2' },
+			{ name: 'fonts/KaTeX_Main-Bold.woff2' },
+			{ name: 'fonts/KaTeX_Main-BoldItalic.woff2' },
+			{ name: 'fonts/KaTeX_Main-Italic.woff2' },
 			{ name: 'fonts/KaTeX_Math-Italic.woff2' },
+			{ name: 'fonts/KaTeX_Math-BoldItalic.woff2' },
 			{ name: 'fonts/KaTeX_Size1-Regular.woff2' },
 			{ name: 'fonts/KaTeX_Size2-Regular.woff2' },
+			{ name: 'fonts/KaTeX_Size3-Regular.woff2' },
+			{ name: 'fonts/KaTeX_Size4-Regular.woff2' },
 			{ name: 'fonts/KaTeX_AMS-Regular.woff2' },
+			{ name: 'fonts/KaTeX_Caligraphic-Bold.woff2' },
+			{ name: 'fonts/KaTeX_Caligraphic-Regular.woff2' },
+			{ name: 'fonts/KaTeX_Fraktur-Bold.woff2' },
+			{ name: 'fonts/KaTeX_Fraktur-Regular.woff2' },
+			{ name: 'fonts/KaTeX_SansSerif-Bold.woff2' },
+			{ name: 'fonts/KaTeX_SansSerif-Italic.woff2' },
+			{ name: 'fonts/KaTeX_SansSerif-Regular.woff2' },
+			{ name: 'fonts/KaTeX_Script-Regular.woff2' },
+			{ name: 'fonts/KaTeX_Typewriter-Regular.woff2' },
 		];
 	};
 

ReactNativeClient/lib/joplin-renderer/Tools/buildAssets.js

@@ -16,10 +16,25 @@ async function main() {
 
 	await copyFile(`${rootDir}/node_modules/katex/dist/katex.min.css`, 'katex/katex.css');
 	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Main-Regular.woff2`, 'katex/fonts/KaTeX_Main-Regular.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Main-Bold.woff2`, 'katex/fonts/KaTeX_Main-Bold.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Main-BoldItalic.woff2`, 'katex/fonts/KaTeX_Main-BoldItalic.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Main-Italic.woff2`, 'katex/fonts/KaTeX_Main-Italic.woff2');
 	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Math-Italic.woff2`, 'katex/fonts/KaTeX_Math-Italic.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Math-BoldItalic.woff2`, 'katex/fonts/KaTeX_Math-BoldItalic.woff2');
 	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Size1-Regular.woff2`, 'katex/fonts/KaTeX_Size1-Regular.woff2');
 	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Size2-Regular.woff2`, 'katex/fonts/KaTeX_Size2-Regular.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Size3-Regular.woff2`, 'katex/fonts/KaTeX_Size3-Regular.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Size4-Regular.woff2`, 'katex/fonts/KaTeX_Size4-Regular.woff2');
 	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_AMS-Regular.woff2`, 'katex/fonts/KaTeX_AMS-Regular.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Caligraphic-Bold.woff2`, 'katex/fonts/KaTeX_Caligraphic-Bold.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Caligraphic-Regular.woff2`, 'katex/fonts/KaTeX_Caligraphic-Regular.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Fraktur-Bold.woff2`, 'katex/fonts/KaTeX_Fraktur-Bold.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Fraktur-Regular.woff2`, 'katex/fonts/KaTeX_Fraktur-Regular.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_SansSerif-Bold.woff2`, 'katex/fonts/KaTeX_SansSerif-Bold.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_SansSerif-Italic.woff2`, 'katex/fonts/KaTeX_SansSerif-Italic.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_SansSerif-Regular.woff2`, 'katex/fonts/KaTeX_SansSerif-Regular.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Script-Regular.woff2`, 'katex/fonts/KaTeX_Script-Regular.woff2');
+	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Typewriter-Regular.woff2`, 'katex/fonts/KaTeX_Typewriter-Regular.woff2');
 
 	await copyFile(`${rootDir}/node_modules/highlight.js/styles/atom-one-light.css`, 'highlight.js/atom-one-light.css');
 	await copyFile(`${rootDir}/node_modules/highlight.js/styles/atom-one-dark-reasonable.css`, 'highlight.js/atom-one-dark-reasonable.css');

ReactNativeClient/lib/models/Setting.js

@@ -247,6 +247,8 @@ class Setting extends BaseModel {
 						output[Setting.THEME_SOLARIZED_LIGHT] = _('Solarised Light');
 						output[Setting.THEME_SOLARIZED_DARK] = _('Solarised Dark');
 						output[Setting.THEME_NORD] = _('Nord');
+					} else {
+						output[Setting.THEME_OLED_DARK] = _('OLED Dark');
 					}
 					return output;
 				},
@@ -1001,6 +1003,7 @@ Setting.TYPE_BUTTON = 6;
 
 Setting.THEME_LIGHT = 1;
 Setting.THEME_DARK = 2;
+Setting.THEME_OLED_DARK = 22;
 Setting.THEME_SOLARIZED_LIGHT = 3;
 Setting.THEME_SOLARIZED_DARK = 4;
 Setting.THEME_DRACULA = 5;

Tools/PortableAppsLauncher/Other/Source/License.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2019 Laurent Cozic
+Copyright (c) 2016-2020 Laurent Cozic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

readme/terminal.md

@@ -514,7 +514,7 @@ The following commands are available in [command-line mode](#command-line-mode):
 
 # License
 
-Copyright (c) 2016-2019 Laurent Cozic
+Copyright (c) 2016-2020 Laurent Cozic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: