From c5b0752e6aed925e3f00dec74e9664f130ed0849 Mon Sep 17 00:00:00 2001 From: Alexey Lunin <alexey.lunin@vereign.com> Date: Tue, 3 Oct 2023 04:10:24 +0300 Subject: [PATCH] Change styles for Sidebar and renambe SEAL to Data --- src/components/SearchBar.tsx | 46 ++++++++++++++++++------------------ src/localization/de/index.ts | 4 ++-- src/localization/en/index.ts | 4 ++-- src/localization/fr/index.ts | 4 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/components/SearchBar.tsx b/src/components/SearchBar.tsx index b0ce9cf..bacfff1 100644 --- a/src/components/SearchBar.tsx +++ b/src/components/SearchBar.tsx @@ -37,24 +37,8 @@ const SearchBar: React.FC<Props> = ({ searchPhrase, setSearchPhrase }) => { return ( <View style={styles.container}> - <Pressable - onPress={() => { - navigation.navigate(Stacks.SettingsStack); - }} - > - <SettingsSvg style={styles.settingsIcon} /> - </Pressable> <View style={styles.searchBar}> - {focused && ( - <Icon - name="close" - color={ColorPallet.grayscale.darkGrey} - size={24} - style={styles.closeIcon} - onPress={cancel} - /> - )} - + <SearchSvg style={styles.searchIcon} /> <TextInput style={[styles.input, focused ? styles.inputFocused : undefined]} returnKeyType="done" @@ -71,10 +55,18 @@ const SearchBar: React.FC<Props> = ({ searchPhrase, setSearchPhrase }) => { setFocused(true); }} /> - <SearchSvg style={styles.searchIcon} /> + {focused && ( + <Icon + name="close" + color={ColorPallet.grayscale.darkGrey} + size={24} + style={styles.closeIcon} + onPress={cancel} + /> + )} </View> <Pressable - style={styles.bellContainer} + style={styles.iconContainer} onPress={() => { navigation.navigate(Stacks.NotificationStack); }} @@ -86,6 +78,14 @@ const SearchBar: React.FC<Props> = ({ searchPhrase, setSearchPhrase }) => { </View> )} </Pressable> + <Pressable + style={styles.iconContainer} + onPress={() => { + navigation.navigate(Stacks.SettingsStack); + }} + > + <SettingsSvg style={styles.settingsIcon} /> + </Pressable> </View> ); }; @@ -104,18 +104,17 @@ const styles = StyleSheet.create({ }, closeIcon: { marginTop: 8, - marginLeft: 6, + marginRight: 6, }, searchIcon: { width: 20, height: 20, fill: ColorPallet.baseColors.black, alignSelf: 'center', - marginRight: 10, + marginLeft: 10, }, searchBar: { marginLeft: 15, - marginRight: 15, height: 40, flexDirection: 'row', flex: 1, @@ -132,9 +131,10 @@ const styles = StyleSheet.create({ inputFocused: { marginLeft: 0, }, - bellContainer: { + iconContainer: { position: 'relative', flexDirection: 'row', + marginLeft: 15, }, bellIcon: { width: 32, diff --git a/src/localization/de/index.ts b/src/localization/de/index.ts index 40e1d40..c6fe4c8 100644 --- a/src/localization/de/index.ts +++ b/src/localization/de/index.ts @@ -196,7 +196,7 @@ const translation = { Scan: 'Scan', Credentials: 'Credentials', Emails: 'Email', - SealHistory: 'SEAL', + SealHistory: 'Data', }, Toasts:{ Success: 'Erfolg', @@ -278,7 +278,7 @@ const translation = { ViewMnemonic: 'View Mnemonic', ReceivedEmails: 'Received Emails', EmailDetails: 'Email Details', - SealScannedQrCodeList: 'SEAL History', + SealScannedQrCodeList: 'Data', SealDetailsInfo: 'SEAL History Details ', }, Seal: { diff --git a/src/localization/en/index.ts b/src/localization/en/index.ts index eae4bed..d6082bf 100644 --- a/src/localization/en/index.ts +++ b/src/localization/en/index.ts @@ -196,7 +196,7 @@ const translation = { Scan: 'Scan', Credentials: 'Credential', Emails: 'Email', - SealHistory: 'SEAL', + SealHistory: 'Data', }, Toasts:{ Success: 'Success', @@ -278,7 +278,7 @@ const translation = { ViewMnemonic: 'View Mnemonic', ReceivedEmails: 'Received Emails', EmailDetails: 'Email Details', - SealScannedQrCodeList: 'SEAL History', + SealScannedQrCodeList: 'Data', SealDetailsInfo: 'SEAL History Details', }, Seal: { diff --git a/src/localization/fr/index.ts b/src/localization/fr/index.ts index 15d8d40..1a0385b 100644 --- a/src/localization/fr/index.ts +++ b/src/localization/fr/index.ts @@ -196,7 +196,7 @@ const translation = { Scan: 'Analyse', Credentials: 'Identifiants', Emails: 'Email', - SealHistory: 'SEAL', + SealHistory: 'Data', }, Toasts:{ Success: 'Succès', @@ -278,7 +278,7 @@ const translation = { ViewMnemonic: 'View Mnemonic', ReceivedEmails: 'Received Emails', EmailDetails: 'Email Details', - SealScannedQrCodeList: 'SEAL History', + SealScannedQrCodeList: 'Data', SealDetailsInfo: 'SEAL History Details', }, Seal: { -- GitLab