diff --git a/apps/mobile/src/components/LoginDialog/index.js b/apps/mobile/src/components/LoginDialog/index.js index edabeec30..030f839d6 100644 --- a/apps/mobile/src/components/LoginDialog/index.js +++ b/apps/mobile/src/components/LoginDialog/index.js @@ -355,7 +355,19 @@ const LoginDialog = () => { height: 50, }}> {DDS.isLargeTablet() ? ( - + { + close(); + }} + customStyle={{ + width: 40, + height: 40, + marginLeft: -5, + }} + color={colors.heading} + /> ) : ( { {mode === MODES.changePassword ? null : ( diff --git a/apps/mobile/src/components/Menu/ColorSection.js b/apps/mobile/src/components/Menu/ColorSection.js index 9e1785930..39e31035d 100644 --- a/apps/mobile/src/components/Menu/ColorSection.js +++ b/apps/mobile/src/components/Menu/ColorSection.js @@ -95,7 +95,6 @@ const ColorItem = ({item, index}) => { diff --git a/apps/mobile/src/components/Menu/MenuListItem.js b/apps/mobile/src/components/Menu/MenuListItem.js index 9a99a58f6..154ed0f91 100644 --- a/apps/mobile/src/components/Menu/MenuListItem.js +++ b/apps/mobile/src/components/Menu/MenuListItem.js @@ -4,7 +4,7 @@ import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import {useTracked} from '../../provider'; import {eSubscribeEvent, eUnSubscribeEvent} from '../../services/EventManager'; import Navigation from '../../services/Navigation'; -import {getElevation} from '../../utils'; +import { getElevation } from '../../utils'; import {SIZE} from '../../utils/SizeUtils'; import {PressableButton} from '../PressableButton'; import Heading from '../Typography/Heading'; @@ -64,7 +64,7 @@ export const MenuListItem = ({item, index, noTextMode, testID}) => { paddingHorizontal: 8, justifyContent: 'space-between', alignItems: 'center', - height: 40, + height: 45, }}> { }}> { width: 7, height: 7, borderRadius: 100, - ...getElevation(5), + ...getElevation(5) }} /> )} diff --git a/apps/mobile/src/components/Menu/TagsSection.js b/apps/mobile/src/components/Menu/TagsSection.js index 5517dc743..3c7721a10 100644 --- a/apps/mobile/src/components/Menu/TagsSection.js +++ b/apps/mobile/src/components/Menu/TagsSection.js @@ -173,17 +173,17 @@ const PinItem = ({item, index, onPress}) => { width: '100%', borderRadius: 0, paddingHorizontal: 10, - minHeight: 40, + minHeight: 50, }}> @@ -203,13 +203,25 @@ const PinItem = ({item, index, onPress}) => { {headerTextState?.id === item.id ? ( - + {item.title} ) : ( - + {item.title} )} diff --git a/apps/mobile/src/components/Menu/UserSection.js b/apps/mobile/src/components/Menu/UserSection.js index ee6f07ce5..562e00c2a 100644 --- a/apps/mobile/src/components/Menu/UserSection.js +++ b/apps/mobile/src/components/Menu/UserSection.js @@ -1,23 +1,22 @@ import React from 'react'; -import {ActivityIndicator, TouchableOpacity, View} from 'react-native'; +import { ActivityIndicator, TouchableOpacity, View } from 'react-native'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; -import {useTracked} from '../../provider'; -import {Actions} from '../../provider/Actions'; -import {DDS} from '../../services/DeviceDetection'; -import {eSendEvent, ToastEvent} from '../../services/EventManager'; -import {getElevation, SUBSCRIPTION_STATUS_STRINGS} from '../../utils'; -import {db} from '../../utils/DB'; -import {eOpenLoginDialog} from '../../utils/Events'; -import {pv, SIZE} from '../../utils/SizeUtils'; -import {PressableButton} from '../PressableButton'; +import { useTracked } from '../../provider'; +import { Actions } from '../../provider/Actions'; +import { DDS } from '../../services/DeviceDetection'; +import { eSendEvent, ToastEvent } from '../../services/EventManager'; +import { db } from '../../utils/DB'; +import { eOpenLoginDialog } from '../../utils/Events'; +import { pv, SIZE } from '../../utils/SizeUtils'; +import { PressableButton } from '../PressableButton'; import Paragraph from '../Typography/Paragraph'; -import {TimeSince} from './TimeSince'; +import { TimeSince } from './TimeSince'; export const UserSection = ({noTextMode}) => { const [state, dispatch] = useTracked(); const {colors, syncing, user} = state; - return !user && !user?.email ? ( + return user && user?.email ? ( { return size * multiplier; } else if (dSize > 7.2 && dSize <= 8.5 && DDS.isTab) { return size * 0.9; - } else if (dSize > 8.5 && dSize <= 9.8 && DDS.isTab) { + } else if (dSize > 8.5 && dSize <= 9.2 && DDS.isTab) { + return size * 0.78; + } else if (dSize > 9.2) { return size * 0.8; - } else if (dSize > 9.8) { - return size * 0.85; } else { return size; } @@ -61,8 +61,8 @@ export const normalize = (size) => { } }; export const SIZE = { - xxs: 9 * scale.fontScale, - xs: 11 * scale.fontScale, + xxs: normalize(9) * scale.fontScale, + xs: normalize(10.5) * scale.fontScale, sm: normalize(12.5) * scale.fontScale, md: normalize(15) * scale.fontScale, lg: normalize(21) * scale.fontScale, @@ -72,8 +72,8 @@ export const SIZE = { }; export function updateSize() { - SIZE.xxs = 9 * scale.fontScale; - SIZE.xs = 10 * scale.fontScale; + SIZE.xxs = normalize(9) * scale.fontScale; + SIZE.xs = normalize(10.5) * scale.fontScale; SIZE.sm = normalize(12.5) * scale.fontScale; SIZE.md = normalize(15) * scale.fontScale; SIZE.lg = normalize(21) * scale.fontScale;