diff --git a/apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js b/apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js index d155bd608..b72de76d5 100644 --- a/apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js +++ b/apps/mobile/src/components/ActionSheetComponent/ActionSheetTagsSection.js @@ -162,19 +162,18 @@ export const ActionSheetTagsSection = ({item}) => { marginTop: 5, alignItems: 'center', }}> - - {tags.filter( - (o) => - o.noteIds.length >= 1 && !note.tags.find((t) => t === o.title), - ).length === 0 - ? '' - : 'Suggested: '} - + {tags.filter( + (o) => o.noteIds.length >= 1 && !note.tags.find((t) => t === o.title), + ).length === 0 ? null : ( + + {"Suggested: "} + + )} {suggestions.map((tag) => ( { - - - {rowItem.name} - + {rowItem.name} ) : null; @@ -349,14 +343,7 @@ export const ActionSheetComponent = ({ color={colors.pri} size={SIZE.md} /> - - {item.name} - + {item.name} {!note.id && !note.dateCreated ? ( - - Please start writing to save your note. - + + Start writing to save your note. + ) : ( - - {note.title.replace('\n', '')} - + {note.title.replace('\n', '')} + {topic.title} @@ -583,7 +555,7 @@ export const ActionSheetComponent = ({ onPress={onPressSync} style={{ color: colors.accent, - fontSize: SIZE.xs - 1, + fontSize: SIZE.xs, textAlignVertical: 'center', fontFamily: WEIGHT.regular, marginTop: 5, @@ -592,6 +564,7 @@ export const ActionSheetComponent = ({ borderColor: colors.accent, paddingHorizontal: 5, borderRadius: 2, + height: 20, }}> {user && user.lastSynced > note.dateEdited ? 'Synced' @@ -601,7 +574,7 @@ export const ActionSheetComponent = ({ {refreshing ? ( diff --git a/apps/mobile/src/components/Menu/MenuListItem.js b/apps/mobile/src/components/Menu/MenuListItem.js index 757677ffc..7ef35aa32 100644 --- a/apps/mobile/src/components/Menu/MenuListItem.js +++ b/apps/mobile/src/components/Menu/MenuListItem.js @@ -8,8 +8,9 @@ import {eClearSearch} from '../../utils/Events'; import NavigationService from '../../services/Navigation'; import {showContext} from '../../utils'; import {PressableButton} from '../PressableButton'; -import {SIZE, WEIGHT} from "../../utils/SizeUtils"; -import {DDS} from "../../services/DeviceDetection"; +import {SIZE, WEIGHT} from '../../utils/SizeUtils'; +import {DDS} from '../../services/DeviceDetection'; +import Paragraph from '../Typography/Paragraph'; export const MenuListItem = ({item, index, noTextMode, ignore, testID}) => { const [state, dispatch] = useTracked(); @@ -24,15 +25,15 @@ export const MenuListItem = ({item, index, noTextMode, ignore, testID}) => { }, }); dispatch({ - type: Actions.HEADER_VERTICAL_MENU, - state: item.name === "Home", + type: Actions.HEADER_VERTICAL_MENU, + state: item.name === 'Home', }); eSendEvent(eClearSearch); } if (item.func) { - item.func() + item.func(); } else { - NavigationService.navigate(item.name) + NavigationService.navigate(item.name); } if (item.close) { NavigationService.closeDrawer(); @@ -45,7 +46,7 @@ export const MenuListItem = ({item, index, noTextMode, ignore, testID}) => { key={item.name + index} onPress={_onPress} onLongPress={(event) => { - showContext(event, item.name).then(r => r); + showContext(event, item.name).then((r) => r); }} color={ currentScreen === item.name.toLowerCase() ? colors.shade : 'transparent' @@ -78,16 +79,7 @@ export const MenuListItem = ({item, index, noTextMode, ignore, testID}) => { color={colors.accent} size={DDS.isTab ? SIZE.md + 5 : SIZE.md + 1} /> - {noTextMode ? null : ( - - {item.name} - - )} + {noTextMode ? null : {item.name}} {item.switch && !noTextMode ? ( diff --git a/apps/mobile/src/utils/SizeUtils.js b/apps/mobile/src/utils/SizeUtils.js index c1b126f82..f8e3531a7 100644 --- a/apps/mobile/src/utils/SizeUtils.js +++ b/apps/mobile/src/utils/SizeUtils.js @@ -60,8 +60,8 @@ export const normalize = (size) => { export const SIZE = { xxs: 9 * scale.fontScale, xs: 11 * scale.fontScale, - sm: normalize(13) * scale.fontScale, - md: normalize(16) * scale.fontScale, + sm: normalize(12.5) * scale.fontScale, + md: normalize(15) * scale.fontScale, lg: normalize(21) * scale.fontScale, xl: normalize(24) * scale.fontScale, xxl: normalize(28) * scale.fontScale, @@ -71,8 +71,8 @@ export const SIZE = { export function updateSize() { SIZE.xxs = 9 * scale.fontScale; SIZE.xs = 10 * scale.fontScale; - SIZE.sm = normalize(13) * scale.fontScale; - SIZE.md = normalize(16) * scale.fontScale; + SIZE.sm = normalize(12.5) * scale.fontScale; + SIZE.md = normalize(15) * scale.fontScale; SIZE.lg = normalize(21) * scale.fontScale; SIZE.xl = normalize(24) * scale.fontScale; SIZE.xxl = normalize(28) * scale.fontScale;