Skip to content

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

mobile: fix inconsistent button sizes

Ammar Ahmedcf169eb6d6c6
diff --git a/apps/mobile/app/components/announcements/cta.js b/apps/mobile/app/components/announcements/cta.js
index b33ade1ad..f8bd2d099 100644
--- a/apps/mobile/app/components/announcements/cta.js
+++ b/apps/mobile/app/components/announcements/cta.js
@@ -106,7 +106,6 @@ export const Cta = ({ actions, style = {}, color, inline }) => {
<Button
key={item.title}
title={item.title}
- fontSize={AppFontSize.md}
buttonType={{
color: color ? color : colors.primary.accent,
text: color
diff --git a/apps/mobile/app/components/app-lock/index.tsx b/apps/mobile/app/components/app-lock/index.tsx
index 66bb28c69..70e9409c8 100644
--- a/apps/mobile/app/components/app-lock/index.tsx
+++ b/apps/mobile/app/components/app-lock/index.tsx
@@ -336,7 +336,6 @@ const AppLocked = () => {
borderRadius: 150,
marginBottom: 10
}}
- fontSize={AppFontSize.md}
/>
</>
) : null}
diff --git a/apps/mobile/app/components/auth/login.js b/apps/mobile/app/components/auth/login.js
index 9d712ef1d..483131330 100644
--- a/apps/mobile/app/components/auth/login.js
+++ b/apps/mobile/app/components/auth/login.js
@@ -278,7 +278,7 @@ export const Login = ({ changeMode }) => {
}}
type="accent"
title={!loading ? strings.continue() : null}
- fontSize={AppFontSize.md}
+ fontSize={AppFontSize.sm}
/>
{step === LoginSteps.passwordAuth && (
@@ -294,7 +294,6 @@ export const Login = ({ changeMode }) => {
setStep(LoginSteps.emailAuth);
setLoading(false);
}}
- fontSize={AppFontSize.md}
type="secondaryAccented"
/>
)}
diff --git a/apps/mobile/app/components/auth/signup.js b/apps/mobile/app/components/auth/signup.js
index a4ee709a2..3271ba12a 100644
--- a/apps/mobile/app/components/auth/signup.js
+++ b/apps/mobile/app/components/auth/signup.js
@@ -272,7 +272,6 @@ export const Signup = ({ changeMode, welcome }) => {
onPress={() => {
signup();
}}
- fontSize={AppFontSize.md}
width="100%"
/>
diff --git a/apps/mobile/app/components/dialogs/result/index.js b/apps/mobile/app/components/dialogs/result/index.js
index 92d9989bd..3dd90b30f 100644
--- a/apps/mobile/app/components/dialogs/result/index.js
+++ b/apps/mobile/app/components/dialogs/result/index.js
@@ -135,7 +135,6 @@ const ResultDialog = () => {
paddingHorizontal: DefaultAppStyles.GAP
}}
onPress={close}
- fontSize={AppFontSize.md + 2}
/>
</View>
</View>
diff --git a/apps/mobile/app/components/intro/index.tsx b/apps/mobile/app/components/intro/index.tsx
index f029fdca0..3dc74809a 100644
--- a/apps/mobile/app/components/intro/index.tsx
+++ b/apps/mobile/app/components/intro/index.tsx
@@ -189,7 +189,6 @@ const Intro = () => {
mode: AuthMode.welcomeSignup
});
}}
- fontSize={AppFontSize.md}
type="accent"
title={strings.getStarted()}
/>
@@ -200,7 +199,6 @@ const Intro = () => {
}}
title={strings.iAlreadyHaveAnAccount()}
type="secondary"
- fontSize={AppFontSize.md}
onPress={() => {
SettingsService.set({
introCompleted: true
diff --git a/apps/mobile/app/components/sheet-provider/index.js b/apps/mobile/app/components/sheet-provider/index.js
index 4331ee156..b742a5f50 100644
--- a/apps/mobile/app/components/sheet-provider/index.js
+++ b/apps/mobile/app/components/sheet-provider/index.js
@@ -224,7 +224,6 @@ const SheetProvider = ({ context = "global" }) => {
marginBottom: DefaultAppStyles.GAP_VERTICAL
}}
width="100%"
- fontSize={AppFontSize.md}
/>
))}
diff --git a/apps/mobile/app/components/sheets/export-notes/index.tsx b/apps/mobile/app/components/sheets/export-notes/index.tsx
index 8f151363e..fca603379 100644
--- a/apps/mobile/app/components/sheets/export-notes/index.tsx
+++ b/apps/mobile/app/components/sheets/export-notes/index.tsx
@@ -289,7 +289,6 @@ const ExportNotesSheet = ({
}
type="accent"
width={250}
- fontSize={AppFontSize.md}
style={{
marginTop: DefaultAppStyles.GAP_VERTICAL
}}
@@ -319,7 +318,6 @@ const ExportNotesSheet = ({
title={strings.share()}
type="secondaryAccented"
width={250}
- fontSize={AppFontSize.md}
style={{
marginTop: DefaultAppStyles.GAP_VERTICAL
}}
@@ -351,7 +349,6 @@ const ExportNotesSheet = ({
title={strings.exportAgain()}
type="secondaryAccented"
width={250}
- fontSize={AppFontSize.md}
style={{
marginTop: DefaultAppStyles.GAP_VERTICAL
}}
diff --git a/apps/mobile/app/components/sheets/export-notes/share.jsx b/apps/mobile/app/components/sheets/export-notes/share.jsx
index 4cda73361..1291f1a1e 100644
--- a/apps/mobile/app/components/sheets/export-notes/share.jsx
+++ b/apps/mobile/app/components/sheets/export-notes/share.jsx
@@ -36,7 +36,6 @@ export const ShareComponent = ({ uri, name, padding }) => {
title={strings.open()}
type="accent"
width="100%"
- fontSize={AppFontSize.md}
onPress={async () => {
FileViewer.open(uri, {
showOpenWithDialog: true,
@@ -54,7 +53,6 @@ export const ShareComponent = ({ uri, name, padding }) => {
title={strings.share()}
type="shade"
width="100%"
- fontSize={AppFontSize.md}
style={{
marginTop: DefaultAppStyles.GAP_VERTICAL
}}
diff --git a/apps/mobile/app/components/sheets/publish-note/index.tsx b/apps/mobile/app/components/sheets/publish-note/index.tsx
index 28b6d0f6e..29d554fda 100644
--- a/apps/mobile/app/components/sheets/publish-note/index.tsx
+++ b/apps/mobile/app/components/sheets/publish-note/index.tsx
@@ -323,7 +323,6 @@ const PublishNoteSheet = ({
<>
<Button
onPress={deletePublishedNote}
- fontSize={AppFontSize.md}
type="error"
title={strings.unpublish()}
style={{
@@ -335,7 +334,6 @@ const PublishNoteSheet = ({
<Seperator half />
<Button
onPress={publishNote}
- fontSize={AppFontSize.md}
style={{
width: isPublished ? "49%" : 250,
borderRadius: isPublished ? 5 : 100
diff --git a/apps/mobile/app/components/sheets/rate-app/index.js b/apps/mobile/app/components/sheets/rate-app/index.js
index a179f5db6..5cb31b4de 100644
--- a/apps/mobile/app/components/sheets/rate-app/index.js
+++ b/apps/mobile/app/components/sheets/rate-app/index.js
@@ -93,7 +93,6 @@ const RateAppSheet = () => {
<Seperator half />
<Button
onPress={rateApp}
- fontSize={AppFontSize.md}
width="100%"
type="accent"
title={strings.rateApp()}
@@ -116,14 +115,12 @@ const RateAppSheet = () => {
setVisible(false);
clearMessage();
}}
- fontSize={AppFontSize.md}
type="error"
width="48%"
title={strings.never()}
/>
<Button
onPress={onClose}
- fontSize={AppFontSize.md}
width="48%"
type="secondary"
title={strings.later()}
diff --git a/apps/mobile/app/components/sheets/recovery-key/index.jsx b/apps/mobile/app/components/sheets/recovery-key/index.jsx
index a6b7fa494..18e50de5c 100644
--- a/apps/mobile/app/components/sheets/recovery-key/index.jsx
+++ b/apps/mobile/app/components/sheets/recovery-key/index.jsx
@@ -295,7 +295,6 @@ class RecoveryKeySheet extends React.Component {
title={strings.copyToClipboard()}
width="100%"
type="secondaryAccented"
- fontSize={AppFontSize.md}
/>
<Seperator />
<Button
@@ -303,7 +302,6 @@ class RecoveryKeySheet extends React.Component {
onPress={this.saveQRCODE}
width="100%"
type="secondaryAccented"
- fontSize={AppFontSize.md}
icon="qrcode"
/>
<Seperator />
@@ -313,7 +311,6 @@ class RecoveryKeySheet extends React.Component {
width="100%"
type="secondaryAccented"
icon="text"
- fontSize={AppFontSize.md}
/>
<Seperator />
@@ -323,7 +320,6 @@ class RecoveryKeySheet extends React.Component {
width="100%"
type="secondaryAccented"
icon="cloud"
- fontSize={AppFontSize.md}
/>
<Seperator />
@@ -344,7 +340,6 @@ class RecoveryKeySheet extends React.Component {
title={strings.done()}
width="100%"
type="error"
- fontSize={AppFontSize.md}
onPress={this.close}
/>
</View>
diff --git a/apps/mobile/app/components/ui/input/index.tsx b/apps/mobile/app/components/ui/input/index.tsx
index 8a121a384..c0d6f15b9 100644
--- a/apps/mobile/app/components/ui/input/index.tsx
+++ b/apps/mobile/app/components/ui/input/index.tsx
@@ -98,7 +98,7 @@ const Input = ({
onBlurInput,
onPress,
height = 45,
- fontSize = AppFontSize.md,
+ fontSize = AppFontSize.sm,
onFocusInput,
buttons,
marginRight,
@@ -237,8 +237,8 @@ const Input = ({
onPress && loading ? colors.primary.accent : colors.primary.paragraph,
flexGrow: 1,
flexShrink: 1,
- paddingBottom: DefaultAppStyles.GAP_VERTICAL,
- paddingTop: DefaultAppStyles.GAP_VERTICAL,
+ paddingBottom: DefaultAppStyles.GAP_VERTICAL - 4,
+ paddingTop: DefaultAppStyles.GAP_VERTICAL - 4,
fontFamily: "OpenSans-Regular",
...(inputStyle as ViewStyle)
};
diff --git a/apps/mobile/app/screens/settings/2fa.tsx b/apps/mobile/app/screens/settings/2fa.tsx
index 0aed102f1..b1bd0b17b 100644
--- a/apps/mobile/app/screens/settings/2fa.tsx
+++ b/apps/mobile/app/screens/settings/2fa.tsx
@@ -493,7 +493,6 @@ export const MFARecoveryCodes = ({
>
<Button
title={strings.copyCodes()}
- fontSize={AppFontSize.md}
onPress={() => {
const codeString = codes.join("\n");
Clipboard.setString(codeString);
@@ -510,7 +509,6 @@ export const MFARecoveryCodes = ({
<Button
title={strings.saveToFile()}
- fontSize={AppFontSize.md}
onPress={async () => {
try {
let path;