diff --git a/apps/mobile/app/components/announcements/announcement.tsx b/apps/mobile/app/components/announcements/announcement.tsx
index 47ecabdc0..cdaa863b1 100644
--- a/apps/mobile/app/components/announcements/announcement.tsx
+++ b/apps/mobile/app/components/announcements/announcement.tsx
@@ -71,7 +71,7 @@ export const Announcement = () => {
alignItems: "center",
paddingHorizontal: DefaultAppStyles.GAP,
borderBottomWidth: 1,
- borderBottomColor: colors.primary.border,
+ borderBottomColor: colors.primary.separator,
paddingBottom: DefaultAppStyles.GAP_VERTICAL_SMALL
}}
>
diff --git a/apps/mobile/app/components/auth/change-password.tsx b/apps/mobile/app/components/auth/change-password.tsx
index 739cc155f..80f24a8c7 100644
--- a/apps/mobile/app/components/auth/change-password.tsx
+++ b/apps/mobile/app/components/auth/change-password.tsx
@@ -110,7 +110,7 @@ export const ChangePassword = () => {
{
diff --git a/apps/mobile/app/components/sheets/date-format/index.tsx b/apps/mobile/app/components/sheets/date-format/index.tsx
index 8f5a5770a..16197b4d2 100644
--- a/apps/mobile/app/components/sheets/date-format/index.tsx
+++ b/apps/mobile/app/components/sheets/date-format/index.tsx
@@ -111,7 +111,7 @@ function DateFormat({ close }: DateFormatProps) {
diff --git a/apps/mobile/app/components/sheets/export-notes/index.tsx b/apps/mobile/app/components/sheets/export-notes/index.tsx
index 01eff2e4a..391da494f 100644
--- a/apps/mobile/app/components/sheets/export-notes/index.tsx
+++ b/apps/mobile/app/components/sheets/export-notes/index.tsx
@@ -205,7 +205,7 @@ const ExportNotesSheet = ({
diff --git a/apps/mobile/app/components/sheets/force-sync/index.tsx b/apps/mobile/app/components/sheets/force-sync/index.tsx
index e78437148..6b807d5e8 100644
--- a/apps/mobile/app/components/sheets/force-sync/index.tsx
+++ b/apps/mobile/app/components/sheets/force-sync/index.tsx
@@ -118,7 +118,7 @@ function ForceSync({ mode, close }: ForceSyncProps) {
diff --git a/apps/mobile/app/components/sheets/github/issue.tsx b/apps/mobile/app/components/sheets/github/issue.tsx
index 1846cf6af..2739efbc2 100644
--- a/apps/mobile/app/components/sheets/github/issue.tsx
+++ b/apps/mobile/app/components/sheets/github/issue.tsx
@@ -238,7 +238,7 @@ Github Release: ${Config.GITHUB_RELEASE === "true" ? "Yes" : "No"}`,
diff --git a/apps/mobile/app/components/sheets/paywall/index.tsx b/apps/mobile/app/components/sheets/paywall/index.tsx
index 77748fa9b..f8d080100 100644
--- a/apps/mobile/app/components/sheets/paywall/index.tsx
+++ b/apps/mobile/app/components/sheets/paywall/index.tsx
@@ -197,7 +197,9 @@ export default function PaywallSheet(props: {
-
+
{features.map((feature) => (
diff --git a/apps/mobile/app/components/sheets/plan-limits/index.tsx b/apps/mobile/app/components/sheets/plan-limits/index.tsx
index c470efb19..9f8a5a062 100644
--- a/apps/mobile/app/components/sheets/plan-limits/index.tsx
+++ b/apps/mobile/app/components/sheets/plan-limits/index.tsx
@@ -117,7 +117,9 @@ export function PlanLimits() {
-
+
{featureUsage?.map((item) => (
diff --git a/apps/mobile/app/components/sheets/recovery-key/index.tsx b/apps/mobile/app/components/sheets/recovery-key/index.tsx
index b2c7b5904..fdbe711ff 100644
--- a/apps/mobile/app/components/sheets/recovery-key/index.tsx
+++ b/apps/mobile/app/components/sheets/recovery-key/index.tsx
@@ -278,7 +278,7 @@ function RecoveryKeySheet({ close }: RecoveryKeySheetProps) {
{
diff --git a/apps/mobile/app/components/sheets/user/index.tsx b/apps/mobile/app/components/sheets/user/index.tsx
index 3197416ea..4aca1c073 100644
--- a/apps/mobile/app/components/sheets/user/index.tsx
+++ b/apps/mobile/app/components/sheets/user/index.tsx
@@ -257,7 +257,7 @@ export const UserSheet = () => {
borderBottomWidth: 1,
height: 1,
width: "100%",
- borderColor: colors.primary.border,
+ borderColor: colors.primary.separator,
marginVertical: 0
}}
/>
diff --git a/apps/mobile/app/screens/attachments/index.tsx b/apps/mobile/app/screens/attachments/index.tsx
index 3e14991c5..6e440bc52 100644
--- a/apps/mobile/app/screens/attachments/index.tsx
+++ b/apps/mobile/app/screens/attachments/index.tsx
@@ -359,12 +359,7 @@ const Attachments = (props: NavigationProps<"Attachments">) => {
}}
/>
-
+
) => {
diff --git a/apps/mobile/app/screens/manage-tags/index.tsx b/apps/mobile/app/screens/manage-tags/index.tsx
index 73e486ac6..bb0ec7eb0 100644
--- a/apps/mobile/app/screens/manage-tags/index.tsx
+++ b/apps/mobile/app/screens/manage-tags/index.tsx
@@ -346,7 +346,7 @@ const ManageTags = (props: NavigationProps<"ManageTags">) => {
diff --git a/apps/mobile/app/screens/settings/components/2fa.tsx b/apps/mobile/app/screens/settings/components/2fa.tsx
index 958c56621..5fd18ac01 100644
--- a/apps/mobile/app/screens/settings/components/2fa.tsx
+++ b/apps/mobile/app/screens/settings/components/2fa.tsx
@@ -498,7 +498,7 @@ export const MFASetup = ({
style={{
height: 1,
marginVertical: Spacing.LEVEL_3,
- backgroundColor: colors.primary.border
+ backgroundColor: colors.primary.separator
}}
/>
@@ -768,7 +768,7 @@ export const MFARecoveryCodes = ({
style={{
height: 1,
marginTop: Spacing.LEVEL_1,
- backgroundColor: colors.primary.border
+ backgroundColor: colors.primary.separator
}}
/>
diff --git a/apps/mobile/app/screens/settings/components/change-email.tsx b/apps/mobile/app/screens/settings/components/change-email.tsx
index bf6d3419a..24e908bbf 100644
--- a/apps/mobile/app/screens/settings/components/change-email.tsx
+++ b/apps/mobile/app/screens/settings/components/change-email.tsx
@@ -30,6 +30,8 @@ import { eSendEvent, ToastManager } from "../../../services/event-manager";
import Navigation from "../../../services/navigation";
import { eUserLoggedIn } from "../../../utils/events";
import { DefaultAppStyles } from "../../../utils/styles";
+import { Spacing } from "../../../common/design/spacing";
+import { PASSWORD_PLACEHOLDER } from "../../../utils/constants";
enum EmailChangeSteps {
verify,
@@ -104,10 +106,16 @@ export const ChangeEmail = () => {
};
return (
-
+
{step === EmailChangeSteps.verify ? (
@@ -115,8 +123,9 @@ export const ChangeEmail = () => {
{
/>
{
loading
? undefined
: step === EmailChangeSteps.verify
- ? strings.verify()
+ ? strings.continue()
: strings.changeEmail()
}
type="accent"
diff --git a/apps/mobile/app/screens/settings/components/licenses.tsx b/apps/mobile/app/screens/settings/components/licenses.tsx
index 4e2edc7af..a590d1522 100644
--- a/apps/mobile/app/screens/settings/components/licenses.tsx
+++ b/apps/mobile/app/screens/settings/components/licenses.tsx
@@ -51,7 +51,7 @@ export const Licenses = () => {
alignSelf: "flex-start",
padding: DefaultAppStyles.GAP,
borderBottomWidth: 1,
- borderBottomColor: colors.primary.border,
+ borderBottomColor: colors.primary.separator,
borderRadius: 0
}}
onPress={() => {
diff --git a/apps/mobile/app/screens/settings/components/notesnook-circle.tsx b/apps/mobile/app/screens/settings/components/notesnook-circle.tsx
index 08e48e62b..91ca01104 100644
--- a/apps/mobile/app/screens/settings/components/notesnook-circle.tsx
+++ b/apps/mobile/app/screens/settings/components/notesnook-circle.tsx
@@ -38,6 +38,7 @@ import { eCloseSimpleDialog } from "../../../utils/events";
import { openLinkInBrowser } from "../../../utils/functions";
import { AppFontSize } from "../../../utils/size";
import { sleep } from "../../../utils/time";
+import LineSeparator from "../../../components/ui/seperator/line-separator";
let p: any;
export const NotesnookCircle = () => {
const user = useUserStore((state) => state.user);
@@ -82,63 +83,71 @@ export const NotesnookCircle = () => {
}, []);
return (
-
-
+
+
+
- Partner offers
-
- Get exclusive discounts from our trusted partners who share our
- commitment to privacy and user freedom.
-
-
-
- {!isFree && !isOnTrial ? null : (
-
+
+ Partner offers
- {isFree
- ? strings.freeUserCircleNotice()
- : strings.trialUserCircleNotice()}
+ Get exclusive discounts from our trusted partners who share our
+ commitment to privacy and user freedom.
-
- {isOnTrial ? null : (
-
- )}
- {partners.loading ? : null}
+ {!isFree && !isOnTrial ? null : (
+
+
+ {isFree
+ ? strings.freeUserCircleNotice()
+ : strings.trialUserCircleNotice()}
+
- {partners.error ? (
-
- ) : null}
+ {isOnTrial ? null : (
+
+ )}
- {partners.result?.map((item) => (
-
- ))}
-
+ {partners.loading ? : null}
+
+ {partners.error ? (
+
+ ) : null}
+
+ {partners.result?.map((item) => (
+
+ ))}
+
+
);
};
@@ -187,7 +196,8 @@ const Partner = ({
borderRadius: Radius.XS,
backgroundColor: colors.primary.shade,
paddingVertical: 4,
- paddingHorizontal: 8
+ paddingHorizontal: 8,
+ marginBottom: Spacing.LEVEL_1
}}
>
diff --git a/apps/mobile/app/screens/settings/components/server-config.tsx b/apps/mobile/app/screens/settings/components/server-config.tsx
index f7252258d..fa7882f74 100644
--- a/apps/mobile/app/screens/settings/components/server-config.tsx
+++ b/apps/mobile/app/screens/settings/components/server-config.tsx
@@ -101,7 +101,8 @@ export function ServersConfiguration() {
{isLoggedIn ? (
diff --git a/apps/mobile/app/screens/settings/components/user-section.jsx b/apps/mobile/app/screens/settings/components/user-section.jsx
index c9a8e1783..4687879d2 100644
--- a/apps/mobile/app/screens/settings/components/user-section.jsx
+++ b/apps/mobile/app/screens/settings/components/user-section.jsx
@@ -282,7 +282,7 @@ const SettingsUserSection = ({ item }) => {
paddingHorizontal: Spacing.LEVEL_3,
marginBottom: Spacing.LEVEL_2
}}
- color={colors.secondary.paragraph}
+ color={colors.primary.accent}
size={AppFontSize.sm}
fontFamily="MEDIUM"
>
diff --git a/apps/mobile/app/screens/settings/failed-inbox-items.tsx b/apps/mobile/app/screens/settings/failed-inbox-items.tsx
index 04da4f09b..fc71d6afb 100644
--- a/apps/mobile/app/screens/settings/failed-inbox-items.tsx
+++ b/apps/mobile/app/screens/settings/failed-inbox-items.tsx
@@ -34,6 +34,7 @@ import { Pressable } from "../../components/ui/pressable";
import Heading from "../../components/ui/typography/heading";
import Paragraph from "../../components/ui/typography/paragraph";
import { ToastManager } from "../../services/event-manager";
+import LineSeparator from "../../components/ui/seperator/line-separator";
type FailedInboxItem = {
id: string;
@@ -129,7 +130,7 @@ function PayloadDataBlock({ value }: { value: string }) {
-
+
{
title={strings.failedInboxItems()}
canGoBack={true}
id="Settings"
+ style={{
+ backgroundColor: "transparent"
+ }}
rightButton={
items?.length > 0
? {
@@ -215,6 +219,8 @@ export const FailedInboxItems = () => {
}
/>
+
+
{result.status === "pending" ? (
{
gap: Spacing.LEVEL_4,
paddingHorizontal: Spacing.LEVEL_3,
paddingVertical: Spacing.LEVEL_4,
- paddingBottom: 50
+ paddingBottom: 50,
+ paddingTop: Spacing.LEVEL_3
}}
>
{items.map((item) => {
diff --git a/apps/mobile/app/screens/settings/group.tsx b/apps/mobile/app/screens/settings/group.tsx
index cd54dafee..6e9e0e989 100644
--- a/apps/mobile/app/screens/settings/group.tsx
+++ b/apps/mobile/app/screens/settings/group.tsx
@@ -32,6 +32,7 @@ import { RouteParams, SettingSection } from "./types";
import { useThemeColors } from "@notesnook/theme";
import { SectionGroup } from "./section-group";
import { Spacing } from "../../common/design/spacing";
+import LineSeparator from "../../components/ui/seperator/line-separator";
const keyExtractor = (item: SettingSection) => item.id;
const AnimatedKeyboardAvoidingFlatList = Animated.createAnimatedComponent(
KeyboardAwareFlatList
@@ -69,14 +70,16 @@ const Group = ({
title={route.params.name as string}
canGoBack={true}
style={{
- backgroundColor: "transparent",
- borderRadius: 0,
- borderBottomWidth: 1,
- borderBottomColor: colors.primary.border
+ backgroundColor: "transparent"
}}
id="Settings"
/>
)}
+
+ {route.params?.component && !route.params.headerBottomBorder ? null : (
+
+ )}
+
@@ -251,6 +253,8 @@ export const accountGroup: SettingSection = {
},
{
id: "remove-name",
+ icon: "trash",
+ iconFamily: "notesnook",
name: strings.removeFullName(),
description: strings.removeFullNameDesc(),
useHook: () =>
@@ -281,7 +285,8 @@ export const accountGroup: SettingSection = {
type: "screen",
component: "change-email",
description: strings.changeEmailDesc(),
- icon: "at"
+ icon: "at",
+ headerBottomBorder: true
}
]
},
@@ -340,7 +345,8 @@ export const accountGroup: SettingSection = {
description: strings.changePasswordDesc(),
component: "change-password",
icon: "pencil-simple-line",
- iconFamily: "notesnook"
+ iconFamily: "notesnook",
+ headerBottomBorder: true
},
{
id: "2fa-settings",
@@ -781,6 +787,7 @@ export const accountGroup: SettingSection = {
id: "setup-inbox-keys",
name: strings.setupInboxKeys(),
type: "screen",
+ headerBottomBorder: true,
component: "setup-inbox-keys"
} as any);
} catch (e) {
@@ -809,6 +816,7 @@ export const accountGroup: SettingSection = {
});
},
type: "screen",
+ headerBottomBorder: true,
component: "manage-inbox-keys"
},
{
@@ -819,6 +827,7 @@ export const accountGroup: SettingSection = {
hidden: (current) => !current,
type: "screen",
component: "inbox-keys",
+ headerBottomBorder: true,
icon: "key",
iconFamily: "notesnook"
},
diff --git a/apps/mobile/app/screens/settings/groups/customize.ts b/apps/mobile/app/screens/settings/groups/customize.ts
index 864a124fb..b16c47bc5 100644
--- a/apps/mobile/app/screens/settings/groups/customize.ts
+++ b/apps/mobile/app/screens/settings/groups/customize.ts
@@ -233,11 +233,16 @@ export const customizeGroup: SettingSection = {
type: "screen",
name: strings.customizeToolbar(),
description: strings.customizeToolbarDesc(),
- component: "configuretoolbar"
+ icon: "wrench",
+ iconFamily: "notesnook",
+ component: "configuretoolbar",
+ headerBottomBorder: true
},
{
id: "reset-toolbar",
name: strings.resetToolbar(),
+ icon: "arrow-counter-clockwise",
+ iconFamily: "notesnook",
description: strings.resetToolbarDesc(),
modifer: () => {
useDragState.getState().setPreset("default");
@@ -339,7 +344,8 @@ export const customizeGroup: SettingSection = {
description: strings.serversConfigurationDesc(),
icon: "hard-drives",
iconFamily: "notesnook",
- component: "server-config"
+ component: "server-config",
+ headerBottomBorder: true
}
]
};
diff --git a/apps/mobile/app/screens/settings/groups/legal.ts b/apps/mobile/app/screens/settings/groups/legal.ts
index eb6316d41..dc022bff8 100644
--- a/apps/mobile/app/screens/settings/groups/legal.ts
+++ b/apps/mobile/app/screens/settings/groups/legal.ts
@@ -60,7 +60,8 @@ export const legalGroup: SettingSection = {
component: "licenses",
description: strings.ossLibs(),
icon: "file-dashed",
- iconFamily: "notesnook"
+ iconFamily: "notesnook",
+ headerBottomBorder: true
}
]
};
diff --git a/apps/mobile/app/screens/settings/home.tsx b/apps/mobile/app/screens/settings/home.tsx
index 2739aec96..5208ff122 100644
--- a/apps/mobile/app/screens/settings/home.tsx
+++ b/apps/mobile/app/screens/settings/home.tsx
@@ -32,6 +32,7 @@ import { LegendList } from "@legendapp/list";
import { useThemeColors } from "@notesnook/theme";
import { Spacing } from "../../common/design/spacing";
import { View } from "react-native";
+import LineSeparator from "../../components/ui/seperator/line-separator";
const keyExtractor = (item: SettingSection) => item.id;
@@ -69,13 +70,13 @@ const Home = ({
canGoBack={true}
hasSearch={false}
style={{
- backgroundColor: "transparent",
- borderRadius: 0,
- borderBottomWidth: 1,
- borderBottomColor: colors.primary.border
+ backgroundColor: "transparent"
}}
id="Settings"
/>
+
+
+
diff --git a/apps/mobile/app/screens/settings/manage-inbox-keys.tsx b/apps/mobile/app/screens/settings/manage-inbox-keys.tsx
index 0997bc349..036c37565 100644
--- a/apps/mobile/app/screens/settings/manage-inbox-keys.tsx
+++ b/apps/mobile/app/screens/settings/manage-inbox-keys.tsx
@@ -194,7 +194,8 @@ export const SetupInboxKeys = () => {
{
@@ -367,7 +369,8 @@ export const SetupInboxKeys = () => {
@@ -456,7 +459,8 @@ export const SetupInboxKeys = () => {
{
-
+ {/* */}
{
contentContainerStyle={{
width: "100%",
paddingHorizontal: Spacing.LEVEL_3,
- minHeight: "100%"
+ minHeight: "100%",
+ paddingTop: Spacing.LEVEL_4
}}
>
{apiKeys.length === 0 ? (
diff --git a/apps/mobile/app/screens/settings/section-group.tsx b/apps/mobile/app/screens/settings/section-group.tsx
index e1fb213d8..c6b2070af 100644
--- a/apps/mobile/app/screens/settings/section-group.tsx
+++ b/apps/mobile/app/screens/settings/section-group.tsx
@@ -43,7 +43,7 @@ export const SectionGroup = ({
paddingHorizontal: Spacing.LEVEL_3,
marginBottom: Spacing.LEVEL_2
}}
- color={colors.secondary.paragraph}
+ color={colors.primary.accent}
size={AppFontSize.sm}
fontFamily="MEDIUM"
>
@@ -74,7 +74,7 @@ export const SectionGroup = ({
style={{
height: 1,
width: "100%",
- backgroundColor: colors.primary.border
+ backgroundColor: colors.primary.separator
}}
/>
diff --git a/apps/mobile/app/screens/settings/types.ts b/apps/mobile/app/screens/settings/types.ts
index d83f5bdb0..2b1ad90a2 100644
--- a/apps/mobile/app/screens/settings/types.ts
+++ b/apps/mobile/app/screens/settings/types.ts
@@ -33,6 +33,7 @@ export type SettingSection = {
| "input-selector"
| "dropdown-selector"
| "group";
+ headerBottomBorder?: boolean;
name?: string | ((current?: unknown) => string);
description?: string | ((current: unknown) => string);
icon?: string;
diff --git a/apps/mobile/fonts/notesnook-icons.glyphmap.json b/apps/mobile/fonts/notesnook-icons.glyphmap.json
index 992035187..a81731661 100644
--- a/apps/mobile/fonts/notesnook-icons.glyphmap.json
+++ b/apps/mobile/fonts/notesnook-icons.glyphmap.json
@@ -1 +1 @@
-{"m":{"f":"notesnook-icons","u":1024,"z":1020,"s":59648,"h":"f9f9d57db8a96806b7df29f6ed7a6dde8ca7df45eec0427cfa848b3c2d69a577"},"i":{"archive":[1024,[[59648,"#666666"]]],"arrow-back":[1024,[[59649,"rgba(255,255,255,0.7)"]]],"arrow-clockwise":[1024,[[59650,"#181818"]]],"arrow-counter-clockwise":[1024,[[59651,"#181818"]]],"arrow-fat-up":[1024,[[59652,"var(--fill-0, #181818)"]]],"arrow-right":[1024,[[59653,"#008836"]]],"arrow-square-out":[1024,[[59654,"#666666"]]],"arrow-u-up-left":[1024,[[59655,"var(--fill-0, #181818)"]]],"arrows-clockwise":[1024,[[59656,"var(--fill-0, #181818)"]]],"backspace":[1024,[[59657,"#181818"]]],"bag-simple":[1024,[[59658,"var(--fill-0, #181818)"]]],"bell-z":[1024,[[59659,"#181818"]]],"bell":[1024,[[59660,"#666666"]]],"bomb-off":[1024,[[59661,"currentColor"]]],"bomb":[1024,[[59662,"#666666"]]],"book-open":[1024,[[59663,"#666666"]]],"bookmark":[1024,[[59664,"#666666"]]],"box-empty":[1024,[[59665,"#B0B0B1"]]],"bug-droid":[1024,[[59666,"var(--fill-0, #181818)"]]],"calendar-check":[946,[[59667,"var(--fill-0, #181818)"]]],"calendar-day":[1024,[[59668,"#181818"]]],"calendar-dots":[946,[[59669,"var(--fill-0, #181818)"]]],"calendar":[1024,[[59670,"rgba(102,102,102,0.8)"]]],"chart-donut":[1024,[[59671,"#181818"]]],"chart-line-up":[1024,[[59672,"var(--fill-0, #181818)"]]],"chat":[1024,[[59673,"white"]]],"check-circle":[1024,[[59674,"#008836"]]],"check-small":[951,[[59675,"#008836"]]],"check-square":[1024,[[59676,"#181818"]]],"check":[1024,[[59677,"#008836"]]],"checkbox-intermediate":[1024,[[59678,"currentColor"]]],"checkbox":[1024,[[59679,"#008836"],[59680,"white"]]],"checks":[1024,[[59681,"#181818"]]],"chevron-down":[1024,[[59682,"#181818"]]],"chevron-right":[1024,[[59683,"#181818"]]],"chevron-up":[1024,[[59684,"#181818"]]],"clock-counter-clockwise":[1024,[[59685,"var(--fill-0, #181818)"]]],"clock":[1024,[[59686,"#181818"]]],"close":[1024,[[59687,"#666666"]]],"cloud-check":[1024,[[59688,"var(--fill-0, #181818)"]]],"cloud-upload":[1024,[[59689,"#858585"]]],"cloud":[1024,[[59690,"white"]]],"copy":[1024,[[59691,"#008836"]]],"crown-simple":[1024,[[59692,"#E0B637"]]],"dark-mode-outline":[1024,[[59693,"currentColor"]]],"delete-restore":[1024,[[59694,"currentColor"]]],"device-mobile-camera":[1024,[[59695,"var(--fill-0, #181818)"]]],"discord-logo":[1024,[[59696,"var(--fill-0, #181818)"]]],"dots-three":[1024,[[59697,"#202020"]]],"download-simple":[1024,[[59698,"var(--fill-0, #181818)"]]],"drive-file-move":[1088,[[59699,"#666666"]]],"duplicate":[1024,[[59700,"currentColor"]]],"edit-pencil":[1024,[[59701,"#181818"]]],"ellipse":[1024,[[59702,"#A6A6A6"]]],"envelope-simple":[1024,[[59703,"white"]]],"export":[1024,[[59704,"var(--fill-0, #181818)"]]],"eye-closed":[1024,[[59705,"white"]]],"eye-filled":[1024,[[59706,"#666666"]]],"eye-open":[1024,[[59707,"#666666"]]],"eye-slash":[1024,[[59708,"var(--fill-0, #181818)"]]],"file-cloud":[1024,[[59709,"#181818"]]],"file-dashed":[1024,[[59710,"var(--fill-0, #181818)"]]],"file-html":[1024,[[59711,"#181818"]]],"file-pdf":[1024,[[59712,"#181818"]]],"file-text":[1024,[[59713,"var(--fill-0, #181818)"]]],"file":[1024,[[59714,"white"]]],"fingerprint-simple":[1024,[[59715,"#181818"]]],"folder":[1024,[[59716,"#181818"]]],"funnel":[1024,[[59717,"#666666"]]],"gift":[1024,[[59718,"#181818"]]],"git-pull-request":[1024,[[59719,"var(--fill-0, #181818)"]]],"github-logo":[1024,[[59720,"var(--fill-0, #181818)"]]],"hard-drives":[1024,[[59721,"var(--fill-0, #181818)"]]],"home":[1024,[[59722,"#181818"]]],"house":[1024,[[59723,"#6F6F6F"]]],"identifier":[1024,[[59724,"currentColor"]]],"image-outline":[1024,[[59725,"white"]]],"image":[1024,[[59726,"#181818"]]],"key":[1024,[[59727,"var(--fill-0, #181818)"]]],"link-alt":[1024,[[59728,"#666666"]]],"link-simple":[1024,[[59729,"white"]]],"link":[560,[[59730,"#666666"]]],"list":[2190,[[59731,"#181818"]]],"lock-simple":[1024,[[59732,"white"]]],"lock":[1024,[[59733,"#181818"]]],"markdown":[1024,[[59734,"#181818"]]],"mastodon-logo":[1024,[[59735,"var(--fill-0, #181818)"]]],"menu":[1024,[[59736,"#181818"]]],"message-badge-outline":[1024,[[59737,"currentColor"]]],"minus":[1024,[[59738,"#181818"]]],"mode-edit":[1024,[[59739,"#181818"]]],"moon":[1024,[[59740,"var(--fill-0, #181818)"]]],"music-notes":[1024,[[59741,"#181818"]]],"network":[1024,[[59742,"var(--fill-0, #181818)"]]],"note":[1024,[[59743,"#181818"]]],"notification":[1024,[[59744,"var(--fill-0, #181818)"]]],"numpad":[1024,[[59745,"#181818"]]],"nut":[1024,[[59746,"#181818"]]],"paint-brush-household":[1024,[[59747,"#181818"]]],"paint-roller":[1024,[[59748,"var(--fill-0, #181818)"]]],"palette":[1024,[[59749,"#666666"]]],"paperclip":[1024,[[59750,"#666666"]]],"pause":[1024,[[59751,"var(--fill-0, #181818)"]]],"pencil-ruler":[1024,[[59752,"#181818"]]],"pencil-simple-line":[1024,[[59753,"var(--fill-0, #181818)"]]],"pencil-simple-slash":[1024,[[59754,"#858585"]]],"pencil-simple":[1024,[[59755,"#181818"]]],"pin":[939,[[59756,"#666666"]]],"plus":[1024,[[59757,"#181818"]]],"radio-button":[1024,[[59758,"#008836"]]],"recovery-key-cloud-arrow-down":[1024,[[59759,"var(--fill-0, #181818)"]]],"recovery-key-copy":[1024,[[59760,"var(--stroke-0, #008836)"]]],"recovery-key-file":[1024,[[59761,"var(--fill-0, #181818)"]]],"recovery-key-key":[1024,[[59762,"var(--fill-0, #181818)"]]],"recovery-key-qr-code":[1024,[[59763,"var(--fill-0, #181818)"]]],"recovery-key-shield-check":[1024,[[59764,"var(--fill-0, #008836)"]]],"search":[1024,[[59765,"#181818"]]],"share":[1024,[[59766,"#666666"]]],"shield-check":[1024,[[59767,"#181818"]]],"shield-plus":[1024,[[59768,"#181818"]]],"shield":[1024,[[59769,"var(--fill-0, #181818)"]]],"shopping-mode":[1024,[[59770,"#666666"]]],"sliders-horizontal":[1024,[[59771,"var(--fill-0, #181818)"]]],"sliders":[1024,[[59772,"#181818"]]],"sort-ascending":[1024,[[59773,"#666666"]]],"sort-descending":[1024,[[59774,"currentColor"]]],"speaker-high":[1024,[[59775,"#181818"]]],"spellcheck":[1067,[[59776,"currentColor"]]],"square-out":[1024,[[59777,"#181818"]]],"squares-four":[1024,[[59778,"var(--fill-0, #181818)"]]],"star-filled":[1024,[[59779,"#E5C131"]]],"star":[1024,[[59780,"#666666"]]],"sun":[1024,[[59781,"#666666"]]],"swatches":[1024,[[59782,"var(--fill-0, #181818)"]]],"sync-disabled":[911,[[59783,"#858585"]]],"table":[1024,[[59784,"#181818"]]],"telegram-logo":[1024,[[59785,"var(--fill-0, #181818)"]]],"text-aa":[1024,[[59786,"#181818"]]],"toggle-off":[1725,[[59787,"#DADADA"]]],"toggle-on":[1725,[[59788,"#008836"]]],"trash-alt":[1024,[[59789,"#FB2C36"]]],"trash":[1024,[[59790,"#666666"]]],"tray-arrow-down":[1024,[[59791,"#181818"]]],"upload":[1024,[[59792,"#181818"]]],"user-circle-minus":[1024,[[59793,"var(--fill-0, #FF242E)"]]],"user-sheet-docs":[1024,[[59794,"var(--fill-0, #181818)"]]],"user-sheet-logout":[1024,[[59795,"var(--fill-0, #FB2C36)"]]],"user-sheet-settings":[1024,[[59796,"var(--fill-0, #181818)"]]],"user-sheet-support":[1024,[[59797,"var(--fill-0, #181818)"]]],"user-sheet-sync":[1024,[[59798,"var(--fill-0, #181818)"]]],"user":[1024,[[59799,"var(--fill-0, #181818)"]]],"users-three":[1024,[[59800,"var(--fill-0, #181818)"]]],"video-camera":[1024,[[59801,"#181818"]]],"view-list":[1024,[[59802,"#181818"]]],"warning-circle":[1024,[[59803,"#BB3431"]]],"warning":[1024,[[59804,"#FF242E"]]],"wifi-slash":[1024,[[59805,"var(--fill-0, #181818)"]]],"x-logo":[1024,[[59806,"var(--fill-0, #181818)"]]]}}
\ No newline at end of file
+{"m":{"f":"notesnook-icons","u":1024,"z":1020,"s":59648,"h":"067582ef109a4e9ceb4cdaa84ba2da48c467d84d522a55d215111518d281f3aa"},"i":{"archive":[1024,[[59648,"#666666"]]],"arrow-back":[1024,[[59649,"rgba(255,255,255,0.7)"]]],"arrow-clockwise":[1024,[[59650,"#181818"]]],"arrow-counter-clockwise":[1024,[[59651,"#181818"]]],"arrow-fat-up":[1024,[[59652,"var(--fill-0, #181818)"]]],"arrow-right":[1024,[[59653,"#008836"]]],"arrow-square-out":[1024,[[59654,"#666666"]]],"arrow-u-up-left":[1024,[[59655,"var(--fill-0, #181818)"]]],"arrows-clockwise":[1024,[[59656,"var(--fill-0, #181818)"]]],"backspace":[1024,[[59657,"#181818"]]],"bag-simple":[1024,[[59658,"var(--fill-0, #181818)"]]],"bell-z":[1024,[[59659,"#181818"]]],"bell":[1024,[[59660,"#666666"]]],"bomb-off":[1024,[[59661,"currentColor"]]],"bomb":[1024,[[59662,"#666666"]]],"book-open":[1024,[[59663,"#666666"]]],"bookmark":[1024,[[59664,"#666666"]]],"box-empty":[1024,[[59665,"#B0B0B1"]]],"bug-droid":[1024,[[59666,"var(--fill-0, #181818)"]]],"calendar-check":[946,[[59667,"var(--fill-0, #181818)"]]],"calendar-day":[1024,[[59668,"#181818"]]],"calendar-dots":[946,[[59669,"var(--fill-0, #181818)"]]],"calendar":[1024,[[59670,"rgba(102,102,102,0.8)"]]],"chart-donut":[1024,[[59671,"#181818"]]],"chart-line-up":[1024,[[59672,"var(--fill-0, #181818)"]]],"chat":[1024,[[59673,"white"]]],"check-circle":[1024,[[59674,"#008836"]]],"check-small":[951,[[59675,"#008836"]]],"check-square":[1024,[[59676,"#181818"]]],"check":[1024,[[59677,"#008836"]]],"checkbox-intermediate":[1024,[[59678,"currentColor"]]],"checkbox":[1024,[[59679,"#008836"],[59680,"white"]]],"checks":[1024,[[59681,"#181818"]]],"chevron-down":[1024,[[59682,"#181818"]]],"chevron-right":[1024,[[59683,"#181818"]]],"chevron-up":[1024,[[59684,"#181818"]]],"clock-counter-clockwise":[1024,[[59685,"var(--fill-0, #181818)"]]],"clock":[1024,[[59686,"#181818"]]],"close":[1024,[[59687,"#666666"]]],"cloud-check":[1024,[[59688,"var(--fill-0, #181818)"]]],"cloud-upload":[1024,[[59689,"#858585"]]],"cloud":[1024,[[59690,"white"]]],"copy":[1024,[[59691,"#008836"]]],"crown-simple":[1024,[[59692,"#E0B637"]]],"dark-mode-outline":[1024,[[59693,"currentColor"]]],"delete-restore":[1024,[[59694,"currentColor"]]],"device-mobile-camera":[1024,[[59695,"var(--fill-0, #181818)"]]],"discord-logo":[1024,[[59696,"var(--fill-0, #181818)"]]],"dots-three":[1024,[[59697,"#202020"]]],"download-simple":[1024,[[59698,"var(--fill-0, #181818)"]]],"drive-file-move":[1088,[[59699,"#666666"]]],"duplicate":[1024,[[59700,"currentColor"]]],"edit-pencil":[1024,[[59701,"#181818"]]],"ellipse":[1024,[[59702,"#A6A6A6"]]],"envelope-simple":[1024,[[59703,"white"]]],"export":[1024,[[59704,"var(--fill-0, #181818)"]]],"eye-closed":[1024,[[59705,"white"]]],"eye-filled":[1024,[[59706,"#666666"]]],"eye-open":[1024,[[59707,"#666666"]]],"eye-slash":[1024,[[59708,"var(--fill-0, #181818)"]]],"file-cloud":[1024,[[59709,"#181818"]]],"file-dashed":[1024,[[59710,"var(--fill-0, #181818)"]]],"file-html":[1024,[[59711,"#181818"]]],"file-pdf":[1024,[[59712,"#181818"]]],"file-text":[1024,[[59713,"var(--fill-0, #181818)"]]],"file":[1024,[[59714,"white"]]],"fingerprint-simple":[1024,[[59715,"#181818"]]],"folder":[1024,[[59716,"#181818"]]],"funnel":[1024,[[59717,"#666666"]]],"gift":[1024,[[59718,"#181818"]]],"git-pull-request":[1024,[[59719,"var(--fill-0, #181818)"]]],"github-logo":[1024,[[59720,"var(--fill-0, #181818)"]]],"hard-drives":[1024,[[59721,"var(--fill-0, #181818)"]]],"home":[1024,[[59722,"#181818"]]],"house":[1024,[[59723,"#6F6F6F"]]],"identifier":[1024,[[59724,"currentColor"]]],"image-outline":[1024,[[59725,"white"]]],"image":[1024,[[59726,"#181818"]]],"key":[1024,[[59727,"var(--fill-0, #181818)"]]],"link-alt":[1024,[[59728,"#666666"]]],"link-simple":[1024,[[59729,"white"]]],"link":[560,[[59730,"#666666"]]],"list":[2190,[[59731,"#181818"]]],"lock-simple":[1024,[[59732,"white"]]],"lock":[1024,[[59733,"#181818"]]],"markdown":[1024,[[59734,"#181818"]]],"mastodon-logo":[1024,[[59735,"var(--fill-0, #181818)"]]],"menu":[1024,[[59736,"#181818"]]],"message-badge-outline":[1024,[[59737,"currentColor"]]],"minus":[1024,[[59738,"#181818"]]],"mode-edit":[1024,[[59739,"#181818"]]],"moon":[1024,[[59740,"var(--fill-0, #181818)"]]],"music-notes":[1024,[[59741,"#181818"]]],"network":[1024,[[59742,"var(--fill-0, #181818)"]]],"note":[1024,[[59743,"#181818"]]],"notification":[1024,[[59744,"var(--fill-0, #181818)"]]],"numpad":[1024,[[59745,"#181818"]]],"nut":[1024,[[59746,"#181818"]]],"paint-brush-household":[1024,[[59747,"#181818"]]],"paint-roller":[1024,[[59748,"var(--fill-0, #181818)"]]],"palette":[1024,[[59749,"#666666"]]],"paperclip":[1024,[[59750,"#666666"]]],"pause":[1024,[[59751,"var(--fill-0, #181818)"]]],"pencil-ruler":[1024,[[59752,"#181818"]]],"pencil-simple-line":[1024,[[59753,"var(--fill-0, #181818)"]]],"pencil-simple-slash":[1024,[[59754,"#858585"]]],"pencil-simple":[1024,[[59755,"#181818"]]],"pin":[939,[[59756,"#666666"]]],"plus":[1024,[[59757,"#181818"]]],"radio-button":[1024,[[59758,"#008836"]]],"recovery-key-cloud-arrow-down":[1024,[[59759,"var(--fill-0, #181818)"]]],"recovery-key-copy":[1024,[[59760,"var(--stroke-0, #008836)"]]],"recovery-key-file":[1024,[[59761,"var(--fill-0, #181818)"]]],"recovery-key-key":[1024,[[59762,"var(--fill-0, #181818)"]]],"recovery-key-qr-code":[1024,[[59763,"var(--fill-0, #181818)"]]],"recovery-key-shield-check":[1024,[[59764,"var(--fill-0, #008836)"]]],"search":[1024,[[59765,"#181818"]]],"share":[1024,[[59766,"#666666"]]],"shield-check":[1024,[[59767,"#181818"]]],"shield-plus":[1024,[[59768,"#181818"]]],"shield":[1024,[[59769,"var(--fill-0, #181818)"]]],"shopping-mode":[1024,[[59770,"#666666"]]],"sliders-horizontal":[1024,[[59771,"var(--fill-0, #181818)"]]],"sliders":[1024,[[59772,"#181818"]]],"sort-ascending":[1024,[[59773,"#666666"]]],"sort-descending":[1024,[[59774,"currentColor"]]],"speaker-high":[1024,[[59775,"#181818"]]],"spellcheck":[1067,[[59776,"currentColor"]]],"square-out":[1024,[[59777,"#181818"]]],"squares-four":[1024,[[59778,"var(--fill-0, #181818)"]]],"star-filled":[1024,[[59779,"#E5C131"]]],"star":[1024,[[59780,"#666666"]]],"sun":[1024,[[59781,"#666666"]]],"swatches":[1024,[[59782,"var(--fill-0, #181818)"]]],"sync-disabled":[911,[[59783,"#858585"]]],"table":[1024,[[59784,"#181818"]]],"telegram-logo":[1024,[[59785,"var(--fill-0, #181818)"]]],"text-aa":[1024,[[59786,"#181818"]]],"toggle-off":[1725,[[59787,"#DADADA"]]],"toggle-on":[1725,[[59788,"#008836"]]],"trash-alt":[1024,[[59789,"#FB2C36"]]],"trash":[1024,[[59790,"#666666"]]],"tray-arrow-down":[1024,[[59791,"#181818"]]],"upload":[1024,[[59792,"#181818"]]],"user-circle-minus":[1024,[[59793,"var(--fill-0, #FF242E)"]]],"user-sheet-docs":[1024,[[59794,"var(--fill-0, #181818)"]]],"user-sheet-logout":[1024,[[59795,"var(--fill-0, #FB2C36)"]]],"user-sheet-settings":[1024,[[59796,"var(--fill-0, #181818)"]]],"user-sheet-support":[1024,[[59797,"var(--fill-0, #181818)"]]],"user-sheet-sync":[1024,[[59798,"var(--fill-0, #181818)"]]],"user":[1024,[[59799,"var(--fill-0, #181818)"]]],"users-three":[1024,[[59800,"var(--fill-0, #181818)"]]],"video-camera":[1024,[[59801,"#181818"]]],"view-list":[1024,[[59802,"#181818"]]],"warning-circle":[1024,[[59803,"#BB3431"]]],"warning":[1024,[[59804,"#FF242E"]]],"wifi-slash":[1024,[[59805,"var(--fill-0, #181818)"]]],"wrench":[1024,[[59806,"#181818"]]],"x-logo":[1024,[[59807,"var(--fill-0, #181818)"]]]}}
\ No newline at end of file
diff --git a/apps/mobile/fonts/notesnook-icons.ttf b/apps/mobile/fonts/notesnook-icons.ttf
index 33f2f8142..ef3e9b60c 100644
Binary files a/apps/mobile/fonts/notesnook-icons.ttf and b/apps/mobile/fonts/notesnook-icons.ttf differ
diff --git a/apps/mobile/ios/nanoicons-fonts/notesnook-icons.ttf b/apps/mobile/ios/nanoicons-fonts/notesnook-icons.ttf
index 33f2f8142..ef3e9b60c 100644
Binary files a/apps/mobile/ios/nanoicons-fonts/notesnook-icons.ttf and b/apps/mobile/ios/nanoicons-fonts/notesnook-icons.ttf differ
diff --git a/packages/editor-mobile/src/theme-factory/index.tsx b/packages/editor-mobile/src/theme-factory/index.tsx
index f3495423a..9beb2cb79 100644
--- a/packages/editor-mobile/src/theme-factory/index.tsx
+++ b/packages/editor-mobile/src/theme-factory/index.tsx
@@ -21,7 +21,6 @@ import { Theme, ThemeFactory, useThemeColors } from "@notesnook/theme";
import { ThemeProvider as EmotionThemeProvider } from "@emotion/react";
const modifyToolbarTheme = (toolbarTheme: Theme) => {
- toolbarTheme.space = [0, 10, 12, 18];
toolbarTheme.space.small = "10px";
toolbarTheme.buttons.menuitem = {
@@ -82,7 +81,6 @@ export const EmotionEditorTheme = (props: PropsWithChildren) => {
}),
[colors, isDark]
);
- theme.space = [0, 10, 12, 20];
return (
{props.children}
);
diff --git a/packages/icons/svgs/wrench.svg b/packages/icons/svgs/wrench.svg
new file mode 100644
index 000000000..cd351d218
--- /dev/null
+++ b/packages/icons/svgs/wrench.svg
@@ -0,0 +1,3 @@
+
diff --git a/packages/intl/locale/en.po b/packages/intl/locale/en.po
index 8db46deff..369b17643 100644
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@ -5630,6 +5630,10 @@ msgstr "Privacy Policy. "
msgid "private analytics and bug reports."
msgstr "private analytics and bug reports."
+#: src/strings.ts:2778
+msgid "Private key"
+msgstr "Private key"
+
#: src/strings.ts:2792
msgid "Private key is passphrase-protected. Please provide the decrypted key or a key without a passphrase."
msgstr "Private key is passphrase-protected. Please provide the decrypted key or a key without a passphrase."
@@ -5638,10 +5642,6 @@ msgstr "Private key is passphrase-protected. Please provide the decrypted key or
msgid "Private key required"
msgstr "Private key required"
-#: src/strings.ts:2778
-msgid "Private key:"
-msgstr "Private key:"
-
#: src/strings.ts:853
msgid "Private."
msgstr "Private."
@@ -5698,14 +5698,14 @@ msgstr "Provide your own keys"
msgid "Proxy"
msgstr "Proxy"
+#: src/strings.ts:2777
+msgid "Public key"
+msgstr "Public key"
+
#: src/strings.ts:2811
msgid "Public key required"
msgstr "Public key required"
-#: src/strings.ts:2777
-msgid "Public key:"
-msgstr "Public key:"
-
#: src/strings.ts:510
msgid "Publish"
msgstr "Publish"
diff --git a/packages/intl/locale/pseudo-LOCALE.po b/packages/intl/locale/pseudo-LOCALE.po
index 4e3456aab..f2ae8ea1e 100644
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@ -5604,6 +5604,10 @@ msgstr ""
msgid "private analytics and bug reports."
msgstr ""
+#: src/strings.ts:2778
+msgid "Private key"
+msgstr ""
+
#: src/strings.ts:2792
msgid "Private key is passphrase-protected. Please provide the decrypted key or a key without a passphrase."
msgstr ""
@@ -5612,10 +5616,6 @@ msgstr ""
msgid "Private key required"
msgstr ""
-#: src/strings.ts:2778
-msgid "Private key:"
-msgstr ""
-
#: src/strings.ts:853
msgid "Private."
msgstr ""
@@ -5672,12 +5672,12 @@ msgstr ""
msgid "Proxy"
msgstr ""
-#: src/strings.ts:2811
-msgid "Public key required"
+#: src/strings.ts:2777
+msgid "Public key"
msgstr ""
-#: src/strings.ts:2777
-msgid "Public key:"
+#: src/strings.ts:2811
+msgid "Public key required"
msgstr ""
#: src/strings.ts:510
diff --git a/packages/intl/src/strings.ts b/packages/intl/src/strings.ts
index a9e6754ff..bc61fec2c 100644
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@ -2774,8 +2774,8 @@ Use this if changes from other devices are not appearing on this device. This wi
expiresOn: () => t`Expires on`,
changingInboxPgpKeysNotice: () =>
t`Changing Inbox PGP keys will delete all your unsynced inbox items.`,
- publicKey: () => t`Public key:`,
- privateKey: () => t`Private key:`,
+ publicKey: () => t`Public key`,
+ privateKey: () => t`Private key`,
invalidPgpKeyPair: () =>
t`Invalid PGP key pair. Please check your keys and try again.`,
inboxKeysSaved: () => t`Inbox keys saved`,