Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 15:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove fonts

Browse Source
This commit is contained in:
ammarahm-ed
2021-01-02 15:23:38 +05:00
parent ce07ccb5cd
commit 011deee7af
37 changed files with 185 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/mobile/android/app/src/main/assets/constants.js
View File

@@ -393,7 +393,7 @@ let simpleToolbar = [
[{direction: 'rtl'}], // text direction [{direction: 'rtl'}], // text direction
]; ];
let fonts = ['Poppins', 'sans-serif']; let fonts = ["-apple-system","BlinkMacSystemFont","Segoe UI","Roboto","Oxygen-Sans","Ubuntu","Cantarell","Helvetica Neue","sans-serif"];
let fontNames = fonts.map((font) => getFontName(font)); let fontNames = fonts.map((font) => getFontName(font));
function getFontName(font) { function getFontName(font) {
return font.toLowerCase().replace(/\s/g, '-'); return font.toLowerCase().replace(/\s/g, '-');

109
apps/mobile/android/app/src/main/assets/fonts.css
View File

@@ -1,109 +0,0 @@
/* devanagari */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 400;
font-display: swap;
src: local('Poppins Italic'), local('Poppins-Italic'), url(./fonts/Poppins-Italic.ttf) format('truetype');
unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
}
/* latin-ext */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 400;
font-display: swap;
src: local('Poppins Italic'), local('Poppins-Italic'), url(./fonts/Poppins-Italic.ttf) format('truetype');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 400;
font-display: swap;
src: local('Poppins Italic'), local('Poppins-Italic'), url(./fonts/Poppins-Italic.ttf) format('truetype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* devanagari */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold Italic'), local('Poppins-SemiBoldItalic'), url(./fonts/Poppins-SemiBoldItalic.ttf) format('truetype');
unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
}
/* latin-ext */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold Italic'), local('Poppins-SemiBoldItalic'), url(./fonts/Poppins-SemiBoldItalic.ttf) format('truetype');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold Italic'), local('Poppins-SemiBoldItalic'), url(./fonts/Poppins-SemiBoldItalic.ttf) format('truetype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* devanagari */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Poppins Regular'), local('Poppins-Regular'), url(./fonts/Poppins-Regular.ttf) format('truetype');
unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
}
/* latin-ext */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Poppins Regular'), local('Poppins-Regular'), url(./fonts/Poppins-Regular.ttf) format('truetype');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Poppins Regular'), local('Poppins-Regular'), url(./fonts/Poppins-Regular.ttf) format('truetype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* devanagari */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(./fonts/Poppins-SemiBold.ttf) format('truetype');
unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
}
/* latin-ext */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(./fonts/Poppins-SemiBold.ttf) format('truetype');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(./fonts/Poppins-SemiBold.ttf) format('truetype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

BIN
apps/mobile/android/app/src/main/assets/fonts/Poppins-Italic.ttf
View File

Binary file not shown.

BIN
apps/mobile/android/app/src/main/assets/fonts/Poppins-Regular.ttf
View File

Binary file not shown.

BIN
apps/mobile/android/app/src/main/assets/fonts/Poppins-SemiBold.ttf
View File

Binary file not shown.

BIN
apps/mobile/android/app/src/main/assets/fonts/Poppins-SemiBoldItalic.ttf
View File

Binary file not shown.

2
apps/mobile/android/app/src/main/assets/plaineditor.html
View File

@@ -2,7 +2,7 @@
<head> <head>
<meta content="width=device-width, initial-scale=1, user-scalable=no" name="viewport" /> <meta content="width=device-width, initial-scale=1, user-scalable=no" name="viewport" />
<link href="fonts.css" rel="stylesheet">
<link href="styles.css" rel="stylesheet"> <link href="styles.css" rel="stylesheet">
<style> <style>

20
apps/mobile/android/app/src/main/assets/styles.css
View File

@@ -610,37 +610,37 @@
.ql-snow .ql-editor h1 { .ql-snow .ql-editor h1 {
font-size: 2em; font-size: 2em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h2 { .ql-snow .ql-editor h2 {
font-size: 1.5em; font-size: 1.5em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h3 { .ql-snow .ql-editor h3 {
font-size: 1.17em; font-size: 1.17em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h4 { .ql-snow .ql-editor h4 {
font-size: 1em; font-size: 1em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h5 { .ql-snow .ql-editor h5 {
font-size: 0.83em; font-size: 0.83em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h6 { .ql-snow .ql-editor h6 {
font-size: 0.67em; font-size: 0.67em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
@@ -912,7 +912,7 @@
.ql-toolbar.ql-snow { .ql-toolbar.ql-snow {
box-sizing: border-box; box-sizing: border-box;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
padding-left: 12px; padding-left: 12px;
padding-right:12px; padding-right:12px;
padding-top: 5px; padding-top: 5px;
@@ -1078,7 +1078,7 @@
} }
#formBox textarea { #formBox textarea {
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
background-color: transparent; background-color: transparent;
border: none; border: none;
@@ -1115,7 +1115,7 @@
} }
#textCopy { #textCopy {
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
@@ -1129,7 +1129,7 @@
color: gray; color: gray;
font-size: 11px; font-size: 11px;
height: 20px; height: 20px;
font-family: 'Poppins'; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
margin-top: -8px; margin-top: -8px;
margin-bottom: 6px ; margin-bottom: 6px ;
padding-left: 0px !important; padding-left: 0px !important;

1
apps/mobile/android/app/src/main/assets/texteditor.html
View File

@@ -2,7 +2,6 @@
<head> <head>
<meta content="width=device-width, initial-scale=1, user-scalable=no" name="viewport" /> <meta content="width=device-width, initial-scale=1, user-scalable=no" name="viewport" />
<link href="fonts.css" rel="stylesheet">
<link href="styles.css" rel="stylesheet"> <link href="styles.css" rel="stylesheet">
<style> <style>
.ql-toolbar { .ql-toolbar {

10
apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/MyTextView.java
View File

@@ -10,22 +10,16 @@ public class MyTextView extends AppCompatTextView {
public MyTextView(Context context, AttributeSet attrs, int defStyle) { public MyTextView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle); super(context, attrs, defStyle);
init();
} }
public MyTextView(Context context, AttributeSet attrs) { public MyTextView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
init();
} }
public MyTextView(Context context) { public MyTextView(Context context) {
super(context); super(context);
init();
} }
public void init() {
Typeface tf = Typeface.createFromAsset(getContext().getAssets(), "fonts/Poppins-SemiBold.ttf");
setTypeface(tf);
}
} }

109
apps/mobile/html/Web.bundle/site/fonts.css
View File

@@ -1,109 +0,0 @@
/* devanagari */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 400;
font-display: swap;
src: local('Poppins Italic'), local('Poppins-Italic'), url(./fonts/Poppins-Italic.ttf) format('truetype');
unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
}
/* latin-ext */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 400;
font-display: swap;
src: local('Poppins Italic'), local('Poppins-Italic'), url(./fonts/Poppins-Italic.ttf) format('truetype');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 400;
font-display: swap;
src: local('Poppins Italic'), local('Poppins-Italic'), url(./fonts/Poppins-Italic.ttf) format('truetype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* devanagari */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold Italic'), local('Poppins-SemiBoldItalic'), url(./fonts/Poppins-SemiBoldItalic.ttf) format('truetype');
unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
}
/* latin-ext */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold Italic'), local('Poppins-SemiBoldItalic'), u url(./fonts/Poppins-SemiBoldItalic.ttf) format('truetype');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Poppins';
font-style: italic;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold Italic'), local('Poppins-SemiBoldItalic'), url(./fonts/Poppins-SemiBoldItalic.ttf) format('truetype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* devanagari */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Poppins Regular'), local('Poppins-Regular'), url(./fonts/Poppins-Regular.ttf) format('truetype');
unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
}
/* latin-ext */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Poppins Regular'), local('Poppins-Regular'), url(./fonts/Poppins-Regular.ttf) format('truetype');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
font-display: swap;
src: local('Poppins Regular'), local('Poppins-Regular'), url(./fonts/Poppins-Regular.ttf) format('truetype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* devanagari */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(./fonts/Poppins-SemiBold.ttf) format('truetype');
unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
}
/* latin-ext */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(./fonts/Poppins-SemiBold.ttf) format('truetype');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Poppins';
font-style: normal;
font-weight: 600;
font-display: swap;
src: local('Poppins SemiBold'), local('Poppins-SemiBold'), url(./fonts/Poppins-SemiBold.ttf) format('truetype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

BIN
apps/mobile/html/Web.bundle/site/fonts/Poppins-Italic.ttf
View File

Binary file not shown.

BIN
apps/mobile/html/Web.bundle/site/fonts/Poppins-Regular.ttf
View File

Binary file not shown.

BIN
apps/mobile/html/Web.bundle/site/fonts/Poppins-SemiBold.ttf
View File

Binary file not shown.

BIN
apps/mobile/html/Web.bundle/site/fonts/Poppins-SemiBoldItalic.ttf
View File

Binary file not shown.

1
apps/mobile/html/Web.bundle/site/index.html
View File

@@ -2,7 +2,6 @@
<head> <head>
<meta content="width=device-width, initial-scale=1, user-scalable=no" name="viewport" /> <meta content="width=device-width, initial-scale=1, user-scalable=no" name="viewport" />
<link href="fonts.css" rel="stylesheet" />
<link href="styles.css" rel="stylesheet" /> <link href="styles.css" rel="stylesheet" />
<style> <style>

1
apps/mobile/html/Web.bundle/site/plaineditor.html
View File

@@ -2,7 +2,6 @@
<head> <head>
<meta content="width=device-width, initial-scale=1, user-scalable=no" name="viewport" /> <meta content="width=device-width, initial-scale=1, user-scalable=no" name="viewport" />
<link href="fonts.css" rel="stylesheet">
<link href="styles.css" rel="stylesheet"> <link href="styles.css" rel="stylesheet">
<style> <style>
.ql-toolbar { .ql-toolbar {

20
apps/mobile/html/Web.bundle/site/styles.css
View File

@@ -609,37 +609,37 @@
} }
.ql-snow .ql-editor h1 { .ql-snow .ql-editor h1 {
font-size: 2em; font-size: 2em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h2 { .ql-snow .ql-editor h2 {
font-size: 1.5em; font-size: 1.5em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h3 { .ql-snow .ql-editor h3 {
font-size: 1.17em; font-size: 1.17em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h4 { .ql-snow .ql-editor h4 {
font-size: 1em; font-size: 1em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h5 { .ql-snow .ql-editor h5 {
font-size: 0.83em; font-size: 0.83em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
.ql-snow .ql-editor h6 { .ql-snow .ql-editor h6 {
font-size: 0.67em; font-size: 0.67em;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
} }
@@ -910,7 +910,7 @@
.ql-toolbar.ql-snow { .ql-toolbar.ql-snow {
box-sizing: border-box; box-sizing: border-box;
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
padding-left: 12px; padding-left: 12px;
padding-right:12px; padding-right:12px;
padding-top: 5px; padding-top: 5px;
@@ -1087,7 +1087,7 @@
} }
#formBox textarea { #formBox textarea {
font-family: 'Poppins', sans-serif; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
font-weight: 600 !important; font-weight: 600 !important;
background-color: transparent; background-color: transparent;
border: none; border: none;
@@ -1126,7 +1126,7 @@
} }
#textCopy { #textCopy {
font-family: 'Poppins', sans-serif; font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif
font-weight: 600 !important; font-weight: 600 !important;
} }
@@ -1144,7 +1144,7 @@
color: gray; color: gray;
font-size: 11px; font-size: 11px;
height: 20px; height: 20px;
font-family: 'Poppins'; font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
margin-top: -8px; margin-top: -8px;
margin-bottom: 6px; margin-bottom: 6px;
} }

25
apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js
View File

@@ -1,19 +1,18 @@
import React, {createRef, useCallback, useEffect, useState} from 'react'; import React, { createRef, useCallback, useEffect, useState } from 'react';
import {TextInput, TouchableOpacity, View} from 'react-native'; import { TextInput, TouchableOpacity, View } from 'react-native';
import {ScrollView} from 'react-native-gesture-handler'; import { ScrollView } from 'react-native-gesture-handler';
import {notesnook} from '../../../e2e/test.ids'; import { notesnook } from '../../../e2e/test.ids';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {Actions} from '../../provider/Actions'; import { Actions } from '../../provider/Actions';
import { import {
eSendEvent, eSendEvent,
sendNoteEditedEvent, sendNoteEditedEvent,
ToastEvent, ToastEvent
} from '../../services/EventManager'; } from '../../services/EventManager';
import Navigation from '../../services/Navigation'; import { db } from '../../utils/DB';
import {db} from '../../utils/DB'; import { refreshNotesPage } from '../../utils/Events';
import {refreshNotesPage} from '../../utils/Events'; import { SIZE } from '../../utils/SizeUtils';
import {SIZE, WEIGHT} from '../../utils/SizeUtils'; import { Button } from '../Button';
import {Button} from '../Button';
import Heading from '../Typography/Heading'; import Heading from '../Typography/Heading';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
@@ -236,7 +235,7 @@ export const ActionSheetTagsSection = ({item, close}) => {
style={{ style={{
minWidth: 100, minWidth: 100,
zIndex: 10, zIndex: 10,
fontFamily: WEIGHT.regular, fontFamily: "sans-serif",
color: colors.pri, color: colors.pri,
paddingHorizontal: 5, paddingHorizontal: 5,
paddingVertical: 0, paddingVertical: 0,

31
apps/mobile/src/components/AddNotebookDialog/index.js
View File

@@ -1,4 +1,4 @@
import React, {createRef} from 'react'; import React, { createRef } from 'react';
import { import {
Keyboard, Keyboard,
KeyboardAvoidingView, KeyboardAvoidingView,
@@ -7,24 +7,21 @@ import {
SafeAreaView, SafeAreaView,
StyleSheet, StyleSheet,
TouchableOpacity, TouchableOpacity,
View, View
} from 'react-native'; } from 'react-native';
import {FlatList, TextInput} from 'react-native-gesture-handler'; import { FlatList, TextInput } from 'react-native-gesture-handler';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import { notesnook } from '../../../e2e/test.ids';
import {notesnook} from '../../../e2e/test.ids'; import { Actions } from '../../provider/Actions';
import {Actions} from '../../provider/Actions'; import { DDS } from '../../services/DeviceDetection';
import {DDS} from '../../services/DeviceDetection'; import { ToastEvent } from '../../services/EventManager';
import {eSendEvent, ToastEvent} from '../../services/EventManager'; import { db } from '../../utils/DB';
import {db} from '../../utils/DB'; import { ph, pv, SIZE } from '../../utils/SizeUtils';
import {eShowGetPremium} from '../../utils/Events'; import { ActionIcon } from '../ActionIcon';
import {ph, pv, SIZE, WEIGHT} from '../../utils/SizeUtils';
import {ActionIcon} from '../ActionIcon';
import {GetPremium} from '../ActionSheetComponent/GetPremium';
import DialogButtons from '../Dialog/dialog-buttons'; import DialogButtons from '../Dialog/dialog-buttons';
import DialogHeader from '../Dialog/dialog-header'; import DialogHeader from '../Dialog/dialog-header';
import {updateEvent} from '../DialogManager/recievers'; import { updateEvent } from '../DialogManager/recievers';
import Input from '../Input'; import Input from '../Input';
import {Toast} from '../Toast'; import { Toast } from '../Toast';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
let refs = []; let refs = [];
@@ -489,7 +486,6 @@ const styles = StyleSheet.create({
alignItems: 'center', alignItems: 'center',
}, },
headingText: { headingText: {
fontFamily: WEIGHT.bold,
marginLeft: 5, marginLeft: 5,
fontSize: SIZE.xl, fontSize: SIZE.xl,
}, },
@@ -499,7 +495,6 @@ const styles = StyleSheet.create({
borderRadius: 0, borderRadius: 0,
minHeight: 45, minHeight: 45,
fontSize: SIZE.md, fontSize: SIZE.md,
fontFamily: WEIGHT.regular,
padding: pv - 2, padding: pv - 2,
borderBottomWidth: 1, borderBottomWidth: 1,
marginTop: 10, marginTop: 10,
@@ -530,7 +525,7 @@ const styles = StyleSheet.create({
topicInput: { topicInput: {
padding: pv - 5, padding: pv - 5,
fontSize: SIZE.sm, fontSize: SIZE.sm,
fontFamily: WEIGHT.regular, fontFamily: "sans-serif",
paddingHorizontal: ph, paddingHorizontal: ph,
paddingRight: 40, paddingRight: 40,
paddingVertical: 10, paddingVertical: 10,

11
apps/mobile/src/components/ContextMenu/index.js
View File

@@ -1,9 +1,8 @@
import React, {useEffect, useState} from 'react'; import React, { useEffect, useState } from 'react';
import {Text, View} from 'react-native'; import { View } from 'react-native';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/EventManager'; import { eSubscribeEvent, eUnSubscribeEvent } from '../../services/EventManager';
import {getElevation} from '../../utils'; import { getElevation } from '../../utils';
import {SIZE, WEIGHT} from '../../utils/SizeUtils';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
let contextTimeout = null; let contextTimeout = null;

6
apps/mobile/src/components/DummyText/index.js
View File

@@ -1,6 +1,6 @@
import React, { createRef } from 'react'; import React, { createRef } from 'react';
import {Text} from 'react-native'; import { Text } from 'react-native';
import {SIZE, WEIGHT} from '../../utils/SizeUtils'; import { SIZE } from '../../utils/SizeUtils';
export const dummyRef = createRef(); export const dummyRef = createRef();
@@ -10,7 +10,7 @@ export const DummyText = () => {
ref={dummyRef} ref={dummyRef}
style={[ style={[
{ {
fontFamily: WEIGHT.regular, fontFamily: "sans-serif",
fontSize: SIZE.sm, fontSize: SIZE.sm,
position:"absolute", position:"absolute",
right:-1000, right:-1000,

22
apps/mobile/src/components/ExportDialog/index.js
View File

@@ -1,16 +1,16 @@
import React, {Fragment, useEffect, useState} from 'react'; import React, { Fragment, useEffect, useState } from 'react';
import {Platform, StyleSheet, TouchableOpacity, View} from 'react-native'; import { Platform, StyleSheet, TouchableOpacity, View } from 'react-native';
import FileViewer from 'react-native-file-viewer'; import FileViewer from 'react-native-file-viewer';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {notesnook} from '../../../e2e/test.ids'; import { notesnook } from '../../../e2e/test.ids';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {DDS} from '../../services/DeviceDetection'; import { DDS } from '../../services/DeviceDetection';
import {ToastEvent} from '../../services/EventManager'; import { ToastEvent } from '../../services/EventManager';
import Exporter from '../../services/Exporter'; import Exporter from '../../services/Exporter';
import {getElevation} from '../../utils'; import { getElevation } from '../../utils';
import {ph, pv, SIZE, WEIGHT} from '../../utils/SizeUtils'; import { ph, pv, SIZE } from '../../utils/SizeUtils';
import {sleep} from '../../utils/TimeUtils'; import { sleep } from '../../utils/TimeUtils';
import {GetPremium} from '../ActionSheetComponent/GetPremium'; import { GetPremium } from '../ActionSheetComponent/GetPremium';
import BaseDialog from '../Dialog/base-dialog'; import BaseDialog from '../Dialog/base-dialog';
import DialogButtons from '../Dialog/dialog-buttons'; import DialogButtons from '../Dialog/dialog-buttons';
import DialogHeader from '../Dialog/dialog-header'; import DialogHeader from '../Dialog/dialog-header';
@@ -247,7 +247,7 @@ const styles = StyleSheet.create({
flexDirection: 'row', flexDirection: 'row',
}, },
buttonText: { buttonText: {
fontFamily: WEIGHT.medium, fontFamily: "sans-serif",
color: 'white', color: 'white',
fontSize: SIZE.sm, fontSize: SIZE.sm,
marginLeft: 5, marginLeft: 5,

19
apps/mobile/src/components/Input/index.js
View File

@@ -1,18 +1,17 @@
import React, {useEffect, useState} from 'react'; import React, { useState } from 'react';
import {View} from 'react-native'; import { View } from 'react-native';
import {TextInput} from 'react-native-gesture-handler'; import { TextInput } from 'react-native-gesture-handler';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {useTracked} from '../../provider/index'; import { useTracked } from '../../provider/index';
import { import {
ERRORS_LIST, ERRORS_LIST,
validateEmail, validateEmail,
validatePass, validatePass,
validateUsername, validateUsername
} from '../../services/Validation'; } from '../../services/Validation';
import {getElevation} from '../../utils'; import { getElevation } from '../../utils';
import {hexToRGBA, RGB_Linear_Shade} from '../../utils/ColorUtils'; import { SIZE } from '../../utils/SizeUtils';
import {SIZE, WEIGHT} from '../../utils/SizeUtils'; import { ActionIcon } from '../ActionIcon';
import {ActionIcon} from '../ActionIcon';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
const Input = ({ const Input = ({
@@ -132,7 +131,7 @@ const Input = ({
const textStyle = { const textStyle = {
paddingHorizontal: 0, paddingHorizontal: 0,
fontSize: SIZE.md, fontSize: SIZE.md,
fontFamily: WEIGHT.regular, fontFamily: "sans-serif",
color: colors.pri, color: colors.pri,
paddingVertical: 0, paddingVertical: 0,
paddingBottom: 2.5, paddingBottom: 2.5,

10
apps/mobile/src/components/Loading/index.js
View File

@@ -1,8 +1,8 @@
import React from 'react'; import React from 'react';
import {ActivityIndicator, StyleSheet, Text, View} from 'react-native'; import { ActivityIndicator, StyleSheet, View } from 'react-native';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {Button} from '../Button'; import { ph, pv, SIZE } from '../../utils/SizeUtils';
import {ph, pv, SIZE, WEIGHT} from '../../utils/SizeUtils'; import { Button } from '../Button';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
export const Loading = ({ export const Loading = ({
@@ -64,7 +64,7 @@ const styles = StyleSheet.create({
flexDirection: 'row', flexDirection: 'row',
}, },
buttonText: { buttonText: {
fontFamily: WEIGHT.medium, fontFamily: "sans-serif",
color: 'white', color: 'white',
fontSize: SIZE.sm, fontSize: SIZE.sm,
}, },

3
apps/mobile/src/components/Menu/MenuListItem.js
View File

@@ -1,12 +1,11 @@
import React, {useEffect, useState} from 'react'; import React, {useEffect, useState} from 'react';
import {InteractionManager, View} from 'react-native'; import {View} from 'react-native';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {useTracked} from '../../provider'; import {useTracked} from '../../provider';
import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/EventManager'; import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/EventManager';
import Navigation from '../../services/Navigation'; import Navigation from '../../services/Navigation';
import {getElevation} from '../../utils'; import {getElevation} from '../../utils';
import {normalize, SIZE} from '../../utils/SizeUtils'; import {normalize, SIZE} from '../../utils/SizeUtils';
import {ActionIcon} from '../ActionIcon';
import {Button} from '../Button'; import {Button} from '../Button';
import {PressableButton} from '../PressableButton'; import {PressableButton} from '../PressableButton';
import Heading from '../Typography/Heading'; import Heading from '../Typography/Heading';

28
apps/mobile/src/components/MoveNoteDialog/index.js
View File

@@ -1,28 +1,28 @@
import React, {createRef, useEffect, useState} from 'react'; import React, { createRef, useEffect, useState } from 'react';
import {Keyboard, TextInput, TouchableOpacity, View} from 'react-native'; import { Keyboard, TextInput, TouchableOpacity, View } from 'react-native';
import {FlatList} from 'react-native-gesture-handler'; import { FlatList } from 'react-native-gesture-handler';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {notesnook} from '../../../e2e/test.ids'; import { notesnook } from '../../../e2e/test.ids';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {Actions} from '../../provider/Actions'; import { Actions } from '../../provider/Actions';
import { import {
eSendEvent, eSendEvent,
eSubscribeEvent, eSubscribeEvent,
eUnSubscribeEvent, eUnSubscribeEvent,
sendNoteEditedEvent, sendNoteEditedEvent,
ToastEvent, ToastEvent
} from '../../services/EventManager'; } from '../../services/EventManager';
import {db} from '../../utils/DB'; import { db } from '../../utils/DB';
import { import {
eOnNewTopicAdded, eOnNewTopicAdded,
eOpenMoveNoteDialog, eOpenMoveNoteDialog,
refreshNotesPage, refreshNotesPage
} from '../../utils/Events'; } from '../../utils/Events';
import {pv, SIZE, WEIGHT} from '../../utils/SizeUtils'; import { pv, SIZE } from '../../utils/SizeUtils';
import ActionSheetWrapper from '../ActionSheetComponent/ActionSheetWrapper'; import ActionSheetWrapper from '../ActionSheetComponent/ActionSheetWrapper';
import DialogHeader from '../Dialog/dialog-header'; import DialogHeader from '../Dialog/dialog-header';
import {PressableButton} from '../PressableButton'; import { PressableButton } from '../PressableButton';
import {Toast} from '../Toast'; import { Toast } from '../Toast';
import Heading from '../Typography/Heading'; import Heading from '../Typography/Heading';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
@@ -238,7 +238,7 @@ const MoveNoteComponent = ({close, note, setNote}) => {
borderRadius: 5, borderRadius: 5,
minHeight: 45, minHeight: 45,
fontSize: SIZE.md, fontSize: SIZE.md,
fontFamily: WEIGHT.regular, fontFamily: "sans-serif",
padding: pv - 2, padding: pv - 2,
}, },
]} ]}
@@ -377,7 +377,7 @@ const MoveNoteComponent = ({close, note, setNote}) => {
borderRadius: 5, borderRadius: 5,
height: 40, height: 40,
fontSize: SIZE.sm, fontSize: SIZE.sm,
fontFamily: WEIGHT.regular, fontFamily: "sans-serif",
padding: pv - 2, padding: pv - 2,
}, },
]} ]}

16
apps/mobile/src/components/NotebookItem/index.js
View File

@@ -1,14 +1,14 @@
import React from 'react'; import React from 'react';
import {TouchableOpacity, View} from 'react-native'; import { TouchableOpacity, View } from 'react-native';
import {notesnook} from '../../../e2e/test.ids'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {useTracked} from '../../provider'; import { notesnook } from '../../../e2e/test.ids';
import { useTracked } from '../../provider';
import Navigation from '../../services/Navigation'; import Navigation from '../../services/Navigation';
import {ph, pv, SIZE, WEIGHT} from '../../utils/SizeUtils'; import { pv, SIZE } from '../../utils/SizeUtils';
import {ActionIcon} from '../ActionIcon'; import { ActionIcon } from '../ActionIcon';
import {ActionSheetEvent} from '../DialogManager/recievers'; import { ActionSheetEvent } from '../DialogManager/recievers';
import Heading from '../Typography/Heading'; import Heading from '../Typography/Heading';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
export const NotebookItem = ({ export const NotebookItem = ({
item, item,
@@ -190,7 +190,7 @@ export const NotebookItem = ({
size={SIZE.xs} size={SIZE.xs}
style={{ style={{
marginRight: 10, marginRight: 10,
fontFamily: WEIGHT.regular, fontFamily: "sans-serif",
}}> }}>
{item && item.totalNotes && item.totalNotes > 1 {item && item.totalNotes && item.totalNotes > 1
? item.totalNotes + ' Notes' ? item.totalNotes + ' Notes'

6
apps/mobile/src/components/Premium/PremiumStatusDialog.js
View File

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
import { StyleSheet, View } from 'react-native'; import { StyleSheet, View } from 'react-native';
import { useTracked } from '../../provider'; import { useTracked } from '../../provider';
import { getElevation } from '../../utils'; import { getElevation } from '../../utils';
import { ph, pv, SIZE, WEIGHT } from '../../utils/SizeUtils'; import { ph, pv, SIZE } from '../../utils/SizeUtils';
import BaseDialog from '../Dialog/base-dialog'; import BaseDialog from '../Dialog/base-dialog';
import DialogContainer from '../Dialog/dialog-container'; import DialogContainer from '../Dialog/dialog-container';
import Seperator from '../Seperator'; import Seperator from '../Seperator';
@@ -100,7 +100,7 @@ const styles = StyleSheet.create({
alignItems: 'center', alignItems: 'center',
}, },
heading: { heading: {
fontFamily: WEIGHT.bold, fontFamily: "sans-serif",
marginLeft: 5, marginLeft: 5,
fontSize: SIZE.xxxl, fontSize: SIZE.xxxl,
}, },
@@ -116,7 +116,7 @@ const styles = StyleSheet.create({
flexDirection: 'row', flexDirection: 'row',
}, },
buttonText: { buttonText: {
fontFamily: WEIGHT.medium, fontFamily: "sans-serif",
color: 'white', color: 'white',
fontSize: SIZE.sm, fontSize: SIZE.sm,
marginLeft: 5, marginLeft: 5,

12
apps/mobile/src/components/SearchInput/index.js
View File

@@ -1,9 +1,9 @@
import React, {useEffect, useState} from 'react'; import React, { useEffect, useState } from 'react';
import {Platform, TextInput, View} from 'react-native'; import { Platform, TextInput, View } from 'react-native';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import SearchService from '../../services/SearchService'; import SearchService from '../../services/SearchService';
import {inputRef} from '../../utils/Refs'; import { inputRef } from '../../utils/Refs';
import {SIZE, WEIGHT} from '../../utils/SizeUtils'; import { SIZE } from '../../utils/SizeUtils';
export const SearchInput = (props) => { export const SearchInput = (props) => {
const [state] = useTracked(); const [state] = useTracked();
@@ -42,7 +42,7 @@ export const SearchInput = (props) => {
<TextInput <TextInput
ref={inputRef} ref={inputRef}
style={{ style={{
fontFamily: WEIGHT.bold, fontFamily: "sans-serif",
color: colors.pri, color: colors.pri,
fontSize: SIZE.xl, fontSize: SIZE.xl,
flexGrow: 1, flexGrow: 1,

7
apps/mobile/src/components/Typography/Heading.js
View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import {Text} from 'react-native'; import {Text} from 'react-native';
import {useTracked} from '../../provider'; import {useTracked} from '../../provider';
import {SIZE, WEIGHT} from '../../utils/SizeUtils'; import {SIZE} from '../../utils/SizeUtils';
/** /**
* *
@@ -17,6 +17,7 @@ import {SIZE, WEIGHT} from '../../utils/SizeUtils';
const Heading = ({color, size = SIZE.xl, style, ...restProps}) => { const Heading = ({color, size = SIZE.xl, style, ...restProps}) => {
const [state] = useTracked(); const [state] = useTracked();
const {colors} = state; const {colors} = state;
let fontSize = size || SIZE.xl;
return ( return (
<Text <Text
@@ -25,10 +26,10 @@ const Heading = ({color, size = SIZE.xl, style, ...restProps}) => {
{...restProps} {...restProps}
style={[ style={[
{ {
fontFamily: WEIGHT.bold, fontFamily: 'sans-serif',
fontSize: size || SIZE.xl, fontSize: size || SIZE.xl,
color: color || colors.heading, color: color || colors.heading,
paddingBottom: Platform.OS === 'ios' ? size * 0.25 : null, fontWeight: 'bold',
}, },
style, style,
]}></Text> ]}></Text>

8
apps/mobile/src/components/Typography/Paragraph.js
View File

@@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import {Platform, Text} from 'react-native'; import { Text } from 'react-native';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {SIZE, WEIGHT} from '../../utils/SizeUtils'; import { SIZE } from '../../utils/SizeUtils';
/** /**
* *
@@ -25,11 +25,9 @@ const Paragraph = ({color, size = SIZE.sm, style, ...restProps}) => {
{...restProps} {...restProps}
style={[ style={[
{ {
fontFamily: WEIGHT.regular,
fontSize: size || SIZE.sm, fontSize: size || SIZE.sm,
color: color || colors.pri, color: color || colors.pri,
fontWeight: '400', fontWeight: '400',
paddingBottom: Platform.OS === 'ios' ? size * 0.25 : null,
}, },
style, style,
]}></Text> ]}></Text>

32
apps/mobile/src/components/VaultDialog/index.js
View File

@@ -1,36 +1,36 @@
import React, {Component, createRef} from 'react'; import React, { Component, createRef } from 'react';
import {InteractionManager, TouchableOpacity, View} from 'react-native'; import { InteractionManager, TouchableOpacity, View } from 'react-native';
import * as Keychain from 'react-native-keychain'; import * as Keychain from 'react-native-keychain';
import Share from 'react-native-share'; import Share from 'react-native-share';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {notesnook} from '../../../e2e/test.ids'; import { notesnook } from '../../../e2e/test.ids';
import {Actions} from '../../provider/Actions'; import { Actions } from '../../provider/Actions';
import {DDS} from '../../services/DeviceDetection'; import { DDS } from '../../services/DeviceDetection';
import { import {
eSendEvent, eSendEvent,
eSubscribeEvent, eSubscribeEvent,
eUnSubscribeEvent, eUnSubscribeEvent,
sendNoteEditedEvent, sendNoteEditedEvent,
ToastEvent, ToastEvent
} from '../../services/EventManager'; } from '../../services/EventManager';
import {getElevation, toTXT} from '../../utils'; import { getElevation, toTXT } from '../../utils';
import {db} from '../../utils/DB'; import { db } from '../../utils/DB';
import { import {
eCloseVaultDialog, eCloseVaultDialog,
eOnLoadNote, eOnLoadNote,
eOpenVaultDialog, eOpenVaultDialog,
refreshNotesPage, refreshNotesPage
} from '../../utils/Events'; } from '../../utils/Events';
import {tabBarRef} from '../../utils/Refs'; import { tabBarRef } from '../../utils/Refs';
import {ph, pv, SIZE, WEIGHT} from '../../utils/SizeUtils'; import { ph, SIZE } from '../../utils/SizeUtils';
import {sleep} from '../../utils/TimeUtils'; import { sleep } from '../../utils/TimeUtils';
import {Button} from '../Button'; import { Button } from '../Button';
import BaseDialog from '../Dialog/base-dialog'; import BaseDialog from '../Dialog/base-dialog';
import DialogButtons from '../Dialog/dialog-buttons'; import DialogButtons from '../Dialog/dialog-buttons';
import DialogHeader from '../Dialog/dialog-header'; import DialogHeader from '../Dialog/dialog-header';
import {updateEvent} from '../DialogManager/recievers'; import { updateEvent } from '../DialogManager/recievers';
import Input from '../Input'; import Input from '../Input';
import {Toast} from '../Toast'; import { Toast } from '../Toast';
import Paragraph from '../Typography/Paragraph'; import Paragraph from '../Typography/Paragraph';
const passInputRef = createRef(); const passInputRef = createRef();
@@ -643,7 +643,7 @@ export class VaultDialog extends Component {
<Paragraph <Paragraph
style={{ style={{
fontSize: SIZE.sm, fontSize: SIZE.sm,
fontFamily: WEIGHT.regular, fontFamily: "sans-serif",
color: colors.pri, color: colors.pri,
maxWidth: '90%', maxWidth: '90%',
marginLeft: 10, marginLeft: 10,

27
apps/mobile/src/navigation/Drawer.js
View File

@@ -1,14 +1,13 @@
import {createDrawerNavigator} from '@react-navigation/drawer'; import { createDrawerNavigator } from '@react-navigation/drawer';
import {NavigationContainer} from '@react-navigation/native'; import { NavigationContainer } from '@react-navigation/native';
import * as React from 'react'; import * as React from 'react';
import {State} from 'react-native-gesture-handler'; import { State } from 'react-native-gesture-handler';
import {Menu} from '../components/Menu'; import { Menu } from '../components/Menu';
import {useTracked} from '../provider'; import { useTracked } from '../provider';
import {eSubscribeEvent, eUnSubscribeEvent} from '../services/EventManager'; import { eSubscribeEvent, eUnSubscribeEvent } from '../services/EventManager';
import {eCloseSideMenu, eOpenSideMenu} from '../utils/Events'; import { eCloseSideMenu, eOpenSideMenu } from '../utils/Events';
import {sideMenuRef, tabBarRef} from '../utils/Refs'; import { sideMenuRef, tabBarRef } from '../utils/Refs';
import {sleep} from '../utils/TimeUtils'; import { NavigatorStack } from './NavigatorStack';
import {NavigatorStack} from './NavigatorStack';
const Drawer = createDrawerNavigator(); const Drawer = createDrawerNavigator();
@@ -33,8 +32,12 @@ export const NavigationStack = ({component = NavigatorStack}) => {
}; };
const setGestureEnabled = () => { const setGestureEnabled = () => {
setLocked(false); if (locked) {
setLocked(false);
}
if (initRender) {
setInitRender(false); setInitRender(false);
}
}; };
React.useEffect(() => { React.useEffect(() => {
@@ -44,7 +47,7 @@ export const NavigationStack = ({component = NavigatorStack}) => {
eUnSubscribeEvent(eOpenSideMenu, setGestureEnabled); eUnSubscribeEvent(eOpenSideMenu, setGestureEnabled);
eUnSubscribeEvent(eCloseSideMenu, setGestureDisabled); eUnSubscribeEvent(eCloseSideMenu, setGestureDisabled);
}; };
}, []); }, [locked,initRender]);
return ( return (
<NavigationContainer ref={sideMenuRef}> <NavigationContainer ref={sideMenuRef}>

8
apps/mobile/src/utils/SizeUtils.js
View File

@@ -88,10 +88,4 @@ export const br = 5; // border radius
export var ph = normalize(10); // padding horizontal export var ph = normalize(10); // padding horizontal
export var pv = normalize(10); // padding vertical export var pv = normalize(10); // padding vertical
export const opacity = 0.5; // active opacity export const opacity = 0.5; // active opacity
export const WEIGHT = {
light: 'Poppins-Regular',
regular: 'Poppins-Regular',
medium: 'Poppins-Regular',
semibold: 'Poppins-SemiBold',
bold: 'Poppins-SemiBold',
};

20
apps/mobile/src/views/Editor/EditorTitle.js
View File

@@ -1,12 +1,12 @@
import React, {useEffect, useState} from 'react'; import React, { useEffect, useState } from 'react';
import {TextInput} from 'react-native'; import { TextInput } from 'react-native';
import Animated, {Easing} from 'react-native-reanimated'; import Animated, { Easing } from 'react-native-reanimated';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {DDS} from '../../services/DeviceDetection'; import { DDS } from '../../services/DeviceDetection';
import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/EventManager'; import { eSubscribeEvent, eUnSubscribeEvent } from '../../services/EventManager';
import {SIZE, WEIGHT} from '../../utils/SizeUtils'; import { SIZE } from '../../utils/SizeUtils';
import {sleep} from '../../utils/TimeUtils'; import { sleep } from '../../utils/TimeUtils';
import {post, _onMessage} from './Functions'; import { post, _onMessage } from './Functions';
const opacityVal = new Animated.Value(0); const opacityVal = new Animated.Value(0);
const translateY = new Animated.Value(-700); const translateY = new Animated.Value(-700);
@@ -60,7 +60,7 @@ export const EditorTitle = () => {
<TextInput <TextInput
defaultValue={title} defaultValue={title}
style={{ style={{
fontFamily: WEIGHT.bold, fontFamily: "sans-serif",
fontSize: SIZE.xl, fontSize: SIZE.xl,
color: colors.heading, color: colors.heading,
maxWidth: '100%', maxWidth: '100%',

44
apps/mobile/src/views/Settings/index.js
View File

@@ -1,4 +1,4 @@
import React, {createRef, useCallback, useEffect, useState} from 'react'; import React, { createRef, useCallback, useEffect, useState } from 'react';
import { import {
Appearance, Appearance,
InteractionManager, InteractionManager,
@@ -6,54 +6,54 @@ import {
Platform, Platform,
ScrollView, ScrollView,
TouchableOpacity, TouchableOpacity,
View, View
} from 'react-native'; } from 'react-native';
import * as Keychain from 'react-native-keychain'; import * as Keychain from 'react-native-keychain';
import {enabled} from 'react-native-privacy-snapshot'; import { enabled } from 'react-native-privacy-snapshot';
import Menu, {MenuItem} from 'react-native-reanimated-material-menu'; import Menu, { MenuItem } from 'react-native-reanimated-material-menu';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import {Button} from '../../components/Button'; import { Button } from '../../components/Button';
import BaseDialog from '../../components/Dialog/base-dialog'; import BaseDialog from '../../components/Dialog/base-dialog';
import DialogButtons from '../../components/Dialog/dialog-buttons'; import DialogButtons from '../../components/Dialog/dialog-buttons';
import DialogContainer from '../../components/Dialog/dialog-container'; import DialogContainer from '../../components/Dialog/dialog-container';
import DialogHeader from '../../components/Dialog/dialog-header'; import DialogHeader from '../../components/Dialog/dialog-header';
import {PressableButton} from '../../components/PressableButton'; import { PressableButton } from '../../components/PressableButton';
import Seperator from '../../components/Seperator'; import Seperator from '../../components/Seperator';
import {ListHeaderComponent} from '../../components/SimpleList/ListHeaderComponent'; import { ListHeaderComponent } from '../../components/SimpleList/ListHeaderComponent';
import Heading from '../../components/Typography/Heading'; import Heading from '../../components/Typography/Heading';
import Paragraph from '../../components/Typography/Paragraph'; import Paragraph from '../../components/Typography/Paragraph';
import {useTracked} from '../../provider'; import { useTracked } from '../../provider';
import {Actions} from '../../provider/Actions'; import { Actions } from '../../provider/Actions';
import Backup from '../../services/Backup'; import Backup from '../../services/Backup';
import {DDS} from '../../services/DeviceDetection'; import { DDS } from '../../services/DeviceDetection';
import { import {
eSendEvent, eSendEvent,
eSubscribeEvent, eSubscribeEvent,
eUnSubscribeEvent, eUnSubscribeEvent,
openVault, openVault,
ToastEvent, ToastEvent
} from '../../services/EventManager'; } from '../../services/EventManager';
import {setLoginMessage} from '../../services/Message'; import { setLoginMessage } from '../../services/Message';
import Navigation from '../../services/Navigation'; import Navigation from '../../services/Navigation';
import PremiumService from '../../services/PremiumService'; import PremiumService from '../../services/PremiumService';
import SettingsService from '../../services/SettingsService'; import SettingsService from '../../services/SettingsService';
import { import {
AndroidModule, AndroidModule,
dWidth, dWidth,
getElevation,
MenuItemsList, MenuItemsList,
setSetting, setSetting,
SUBSCRIPTION_STATUS_STRINGS, SUBSCRIPTION_STATUS_STRINGS
} from '../../utils'; } from '../../utils';
import { import {
ACCENT, ACCENT,
COLOR_SCHEME, COLOR_SCHEME,
COLOR_SCHEME_DARK, COLOR_SCHEME_DARK,
COLOR_SCHEME_LIGHT, COLOR_SCHEME_LIGHT,
setColorScheme, setColorScheme
} from '../../utils/Colors'; } from '../../utils/Colors';
import {hexToRGBA, RGB_Linear_Shade} from '../../utils/ColorUtils'; import { hexToRGBA, RGB_Linear_Shade } from '../../utils/ColorUtils';
import {db} from '../../utils/DB'; import { db } from '../../utils/DB';
import { import {
eCloseProgressDialog, eCloseProgressDialog,
eOpenLoginDialog, eOpenLoginDialog,
@@ -62,12 +62,12 @@ import {
eOpenRecoveryKeyDialog, eOpenRecoveryKeyDialog,
eOpenRestoreDialog, eOpenRestoreDialog,
eScrollEvent, eScrollEvent,
eUpdateSearchState, eUpdateSearchState
} from '../../utils/Events'; } from '../../utils/Events';
import {MMKV} from '../../utils/mmkv'; import { MMKV } from '../../utils/mmkv';
import {pv, SIZE, WEIGHT} from '../../utils/SizeUtils'; import { pv, SIZE } from '../../utils/SizeUtils';
import Storage from '../../utils/storage'; import Storage from '../../utils/storage';
import {timeConverter} from '../../utils/TimeUtils'; import { timeConverter } from '../../utils/TimeUtils';
const otherItems = [ const otherItems = [
{ {
@@ -747,7 +747,7 @@ const SettingsAppearanceSection = () => {
: 'transparent', : 'transparent',
}} }}
textStyle={{ textStyle={{
fontFamily: WEIGHT.regular, fontFamily: "sans-serif",
fontSize: SIZE.sm, fontSize: SIZE.sm,
color: color:
settings.homepage === item.name settings.homepage === item.name