Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

core: add missing settings keys

Ammar Ahmedca95af704368
diff --git a/apps/mobile/app/components/sheets/notebook-sheet/index.tsx b/apps/mobile/app/components/sheets/notebook-sheet/index.tsx
index 58eeebc6e..420011326 100644
--- a/apps/mobile/app/components/sheets/notebook-sheet/index.tsx
+++ b/apps/mobile/app/components/sheets/notebook-sheet/index.tsx
@@ -201,6 +201,38 @@ export const NotebookSheet = () => {
backgroundInteractionEnabled
gestureEnabled
>
+ <View
+ style={{
+ position: "absolute",
+ right: 24 + normalize(60),
+ marginTop: -90
+ }}
+ >
+ <Pressable
+ testID={notesnook.buttons.add}
+ type="secondary"
+ onPress={openEditor}
+ style={{
+ borderRadius: 100
+ }}
+ >
+ <View
+ style={{
+ alignItems: "center",
+ justifyContent: "center",
+ height: normalize(60),
+ width: normalize(60)
+ }}
+ >
+ <Icon
+ name="notebook-plus"
+ color={colors.primary.accent}
+ size={SIZE.xxl}
+ />
+ </View>
+ </Pressable>
+ </View>
+
<View
style={{
position: "absolute",
@@ -211,7 +243,16 @@ export const NotebookSheet = () => {
<Pressable
testID={notesnook.buttons.add}
type="accent"
- onPress={openEditor}
+ onPress={() => {
+ if (!notebook) return;
+ AddNotebookSheet.present(
+ undefined,
+ notebook,
+ undefined,
+ undefined,
+ false
+ );
+ }}
style={{
borderRadius: 100
}}
@@ -319,8 +360,8 @@ export const NotebookSheet = () => {
height: 40 * fontScale
}}
/>
- <IconButton
- name="plus"
+ {/* <IconButton
+ name="notebook-plus"
onPress={() => {
if (!notebook) return;
AddNotebookSheet.present(undefined, notebook, undefined);
@@ -332,7 +373,7 @@ export const NotebookSheet = () => {
width: 40 * fontScale,
height: 40 * fontScale
}}
- />
+ /> */}
<IconButton
name={collapsed ? "chevron-up" : "chevron-down"}
diff --git a/apps/mobile/native/fonts/MaterialCommunityIcons.ttf b/apps/mobile/native/fonts/MaterialCommunityIcons.ttf
index 358dac3c4..a1b4fa2fc 100644
Binary files a/apps/mobile/native/fonts/MaterialCommunityIcons.ttf and b/apps/mobile/native/fonts/MaterialCommunityIcons.ttf differ
diff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.json
index 6223eb581..13be19447 100644
--- a/apps/mobile/package-lock.json
+++ b/apps/mobile/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@notesnook/mobile",
- "version": "3.0.13",
+ "version": "3.0.15",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@notesnook/mobile",
- "version": "3.0.13",
+ "version": "3.0.15",
"hasInstallScript": true,
"license": "GPL-3.0-or-later",
"workspaces": [
@@ -38,12 +38,14 @@
"license": "GPL-3.0-or-later",
"dependencies": {
"@notesnook/core": "file:../core",
+ "pathe": "^1.1.2",
"timeago.js": "4.0.2"
},
"devDependencies": {
"@notesnook/core": "file:../core",
"@types/react": "^18.2.39",
- "react": "18.2.0"
+ "react": "18.2.0",
+ "vitest": "^1.4.0"
},
"peerDependencies": {
"react": ">=18",
@@ -3159,38 +3161,37 @@
"@notesnook/theme": "file:../theme",
"@notesnook/ui": "file:../ui",
"@social-embed/lib": "^0.0.2-next.1",
- "@tiptap/core": "2.1.12",
- "@tiptap/extension-character-count": "2.1.12",
- "@tiptap/extension-color": "2.1.12",
- "@tiptap/extension-font-family": "2.1.12",
- "@tiptap/extension-history": "2.1.12",
- "@tiptap/extension-horizontal-rule": "2.1.12",
- "@tiptap/extension-link": "^2.1.16",
- "@tiptap/extension-list-keymap": "2.1.12",
- "@tiptap/extension-placeholder": "2.1.12",
- "@tiptap/extension-subscript": "2.1.12",
- "@tiptap/extension-superscript": "2.1.12",
- "@tiptap/extension-table": "2.1.12",
- "@tiptap/extension-table-cell": "2.1.12",
- "@tiptap/extension-table-header": "2.1.12",
- "@tiptap/extension-table-row": "2.1.12",
- "@tiptap/extension-task-item": "2.1.12",
- "@tiptap/extension-task-list": "2.1.12",
- "@tiptap/extension-text-align": "2.1.12",
- "@tiptap/extension-text-style": "2.1.12",
- "@tiptap/extension-underline": "2.1.12",
- "@tiptap/pm": "2.1.12",
- "@tiptap/starter-kit": "2.1.12",
+ "@tiptap/core": "2.2.4",
+ "@tiptap/extension-character-count": "2.2.4",
+ "@tiptap/extension-color": "2.2.4",
+ "@tiptap/extension-font-family": "2.2.4",
+ "@tiptap/extension-history": "2.2.4",
+ "@tiptap/extension-horizontal-rule": "2.2.4",
+ "@tiptap/extension-list-keymap": "2.2.4",
+ "@tiptap/extension-placeholder": "2.2.4",
+ "@tiptap/extension-subscript": "2.2.4",
+ "@tiptap/extension-superscript": "2.2.4",
+ "@tiptap/extension-table": "2.2.4",
+ "@tiptap/extension-table-cell": "2.2.4",
+ "@tiptap/extension-table-header": "2.2.4",
+ "@tiptap/extension-table-row": "2.2.4",
+ "@tiptap/extension-task-item": "2.2.4",
+ "@tiptap/extension-task-list": "2.2.4",
+ "@tiptap/extension-text-align": "2.2.4",
+ "@tiptap/extension-text-style": "2.2.4",
+ "@tiptap/extension-underline": "2.2.4",
+ "@tiptap/pm": "2.2.4",
+ "@tiptap/starter-kit": "2.2.4",
"async-mutex": "^0.4.0",
"clipboard-polyfill": "4.0.0",
"detect-indent": "^7.0.0",
"entities": "^4.5.0",
- "katex": "0.16.4",
+ "katex": "0.16.9",
"linkifyjs": "^4.1.3",
"nanoid": "^4.0.1",
"prism-themes": "^1.9.0",
"prosemirror-codemark": "^0.4.2",
- "prosemirror-view": "1.32.2",
+ "prosemirror-view": "1.33.1",
"re-resizable": "^6.9.11",
"react-colorful": "^5.6.1",
"redent": "^4.0.0",
@@ -21335,21 +21336,6 @@
"@tiptap/core": "^2.0.0"
}
},
- "../../packages/editor/node_modules/@tiptap/extension-link": {
- "version": "2.1.16",
- "license": "MIT",
- "dependencies": {
- "linkifyjs": "^4.1.0"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/ueberdosis"
- },
- "peerDependencies": {
- "@tiptap/core": "^2.0.0",
- "@tiptap/pm": "^2.0.0"
- }
- },
"../../packages/editor/node_modules/@tiptap/extension-list-item": {
"version": "2.1.12",
"license": "MIT",
diff --git a/apps/mobile/scripts/optimize-fonts.mjs b/apps/mobile/scripts/optimize-fonts.mjs
index 2960b5379..35a688f55 100644
--- a/apps/mobile/scripts/optimize-fonts.mjs
+++ b/apps/mobile/scripts/optimize-fonts.mjs
@@ -76,7 +76,8 @@ const EXTRA_ICON_NAMES = [
"restore",
"keyboard",
"numeric",
- "vector-link"
+ "vector-link",
+ "notebook-plus"
];
const __filename = fileURLToPath(import.meta.url);
diff --git a/packages/core/src/collections/settings.ts b/packages/core/src/collections/settings.ts
index ca5092bcb..9c66521a1 100644
--- a/packages/core/src/collections/settings.ts
+++ b/packages/core/src/collections/settings.ts
@@ -67,6 +67,8 @@ const defaultSettings: SettingItemMap = {
"toolbarConfig:desktop": undefined,
"toolbarConfig:mobile": undefined,
+ "toolbarConfig:tablet": undefined,
+ "toolbarConfig:smallTablet": undefined,
"sideBarOrder:routes": [],
"sideBarOrder:colors": [],
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index f4733a463..eb5283a24 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -449,7 +449,11 @@ export interface LegacySettingsItem extends BaseItem<"settings"> {
}[];
}
-export type ToolbarConfigPlatforms = "desktop" | "mobile";
+export type ToolbarConfigPlatforms =
+ | "desktop"
+ | "mobile"
+ | "tablet"
+ | "smallTablet";
export type SideBarSection = "routes" | "colors" | "shortcuts";
export type SideBarHideableSection = "routes" | "colors";
export type SettingItemMap = {