From dff29b959959825c9a5363dcf95dd28b3b60ac90 Mon Sep 17 00:00:00 2001 From: Pooja Babusingh <68894211+PoojaBabusingh@users.noreply.github.com> Date: Thu, 19 Oct 2023 15:25:08 +0530 Subject: [PATCH 1/2] feat(INJI-486): add correct kannada language labels Signed-off-by: Pooja Babusingh <68894211+PoojaBabusingh@users.noreply.github.com> --- locales/kan.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/kan.json b/locales/kan.json index e7ba9b2020..e3a2650bae 100644 --- a/locales/kan.json +++ b/locales/kan.json @@ -340,8 +340,8 @@ } }, "MainLayout": { - "home": "ಲೇಔಟ್", - "scan": "ಮನೆ", + "home": "ಮನೆ", + "scan": "ಸ್ಕ್ಯಾನ್", "history": "ಇತಿಹಾಸ", "request": "ವಿನಂತಿ", "settings": "ಸೆಟ್ಟಿಂಗ್‌ಗಳು" From 1846274aa614071fe5649d8060b188dc1924e6c0 Mon Sep 17 00:00:00 2001 From: Pooja Babusingh <68894211+PoojaBabusingh@users.noreply.github.com> Date: Fri, 20 Oct 2023 14:59:47 +0530 Subject: [PATCH 2/2] feat(INJI-486): add padding to prevent kan lang text getting truncated Signed-off-by: Pooja Babusingh <68894211+PoojaBabusingh@users.noreply.github.com> --- components/CopyButton.tsx | 22 ++++++++++--------- components/EditableListItem.tsx | 2 +- components/MessageOverlay.tsx | 1 + components/ui/Button.tsx | 3 ++- components/ui/SetupPicker.tsx | 2 +- components/ui/themes/DefaultTheme.ts | 4 ++-- components/ui/themes/PurpleTheme.ts | 4 ++-- screens/AuthScreen.tsx | 2 ++ screens/History/HistoryScreen.tsx | 28 ++++++++++++++----------- screens/Home/IntroSlidersScreen.tsx | 9 +++++++- screens/Home/MyVcs/HistoryTab.tsx | 1 + screens/Home/MyVcsTab.tsx | 6 +++++- screens/PasscodeScreen.tsx | 7 +++++-- screens/Scan/ScanScreen.tsx | 6 +++++- screens/Settings/AboutInji.tsx | 18 ++++++++++------ screens/Settings/ReceivedCards.tsx | 2 +- screens/Settings/ReceivedCardsModal.tsx | 2 ++ screens/Settings/SettingScreen.tsx | 14 ++++++++----- screens/SetupLanguageScreen.tsx | 12 +++++++++-- 19 files changed, 97 insertions(+), 48 deletions(-) diff --git a/components/CopyButton.tsx b/components/CopyButton.tsx index 1d4f97a915..5427aaa8ed 100644 --- a/components/CopyButton.tsx +++ b/components/CopyButton.tsx @@ -1,13 +1,13 @@ -import React, { useState } from 'react'; -import { Pressable } from 'react-native'; -import { Theme } from './ui/styleUtils'; +import React, {useState} from 'react'; +import {Pressable} from 'react-native'; +import {Theme} from './ui/styleUtils'; import Clipboard from '@react-native-clipboard/clipboard'; -import { Icon } from 'react-native-elements'; -import { Text } from './ui'; -import { useTranslation } from 'react-i18next'; +import {Icon} from 'react-native-elements'; +import {Text} from './ui'; +import {useTranslation} from 'react-i18next'; -export const CopyButton: React.FC = ({ content }) => { - const { t } = useTranslation('common'); +export const CopyButton: React.FC = ({content}) => { + const {t} = useTranslation('common'); const [buttonText, setButtonText] = useState(t('clipboard.copy')); return ( @@ -22,10 +22,12 @@ export const CopyButton: React.FC = ({ content }) => { type={'material'} name={'file-copy'} color={Theme.Colors.Icon} - style={{ marginRight: 2 }} + style={{marginRight: 2}} size={19} /> - {buttonText} + + {buttonText} + ); }; diff --git a/components/EditableListItem.tsx b/components/EditableListItem.tsx index 847b8a30e8..ee1a5f553a 100644 --- a/components/EditableListItem.tsx +++ b/components/EditableListItem.tsx @@ -37,7 +37,7 @@ export const EditableListItem: React.FC = props => { color={Theme.Colors.Icon} /> - + {props.title} diff --git a/components/MessageOverlay.tsx b/components/MessageOverlay.tsx index 92d375bae4..2f91480c2a 100644 --- a/components/MessageOverlay.tsx +++ b/components/MessageOverlay.tsx @@ -29,6 +29,7 @@ export const MessageOverlay: React.FC = props => { {props.title && ( = props => { raised={props.raised} title={ = props => { raised={props.raised} title={ ) => { onPress={() => selectItem(index)} key={index}> - + diff --git a/components/ui/themes/DefaultTheme.ts b/components/ui/themes/DefaultTheme.ts index 3ad8d6a86f..ef1fdd1d2c 100644 --- a/components/ui/themes/DefaultTheme.ts +++ b/components/ui/themes/DefaultTheme.ts @@ -613,14 +613,14 @@ export const DefaultTheme = { fontFamily: 'Inter_700Bold', fontSize: 18, lineHeight: 19, - paddingTop: 4, + paddingTop: 5, }, subHeader: { color: Colors.mediumLightGrayText, fontFamily: 'Inter_600SemiBold', lineHeight: 19, fontSize: 13, - paddingTop: 3, + paddingTop: 4, }, semiBoldHeader: { color: Colors.Black, diff --git a/components/ui/themes/PurpleTheme.ts b/components/ui/themes/PurpleTheme.ts index e25ab9f439..7142b9e167 100644 --- a/components/ui/themes/PurpleTheme.ts +++ b/components/ui/themes/PurpleTheme.ts @@ -615,14 +615,14 @@ export const PurpleTheme = { fontFamily: 'Inter_700Bold', fontSize: 18, lineHeight: 19, - paddingTop: 4, + paddingTop: 5, }, subHeader: { color: Colors.mediumLightGrayText, fontFamily: 'Inter_600SemiBold', lineHeight: 19, fontSize: 13, - paddingTop: 3, + paddingTop: 4, }, semiBoldHeader: { color: Colors.Black, diff --git a/screens/AuthScreen.tsx b/screens/AuthScreen.tsx index 1a30a9efb5..3630661a28 100644 --- a/screens/AuthScreen.tsx +++ b/screens/AuthScreen.tsx @@ -40,12 +40,14 @@ export const AuthScreen: React.FC = props => { {t('header')} diff --git a/screens/History/HistoryScreen.tsx b/screens/History/HistoryScreen.tsx index c00642d72a..c696d21e0b 100644 --- a/screens/History/HistoryScreen.tsx +++ b/screens/History/HistoryScreen.tsx @@ -1,15 +1,15 @@ import React from 'react'; -import { RefreshControl } from 'react-native'; -import { Icon } from 'react-native-elements'; -import { useTranslation } from 'react-i18next'; -import { Centered, Column, Text } from '../../components/ui'; -import { useHistoryTab } from './HistoryScreenController'; -import { ActivityLogText } from '../../components/ActivityLogText'; -import { MainRouteProps } from '../../routes/main'; -import { Theme } from '../../components/ui/styleUtils'; +import {RefreshControl} from 'react-native'; +import {Icon} from 'react-native-elements'; +import {useTranslation} from 'react-i18next'; +import {Centered, Column, Text} from '../../components/ui'; +import {useHistoryTab} from './HistoryScreenController'; +import {ActivityLogText} from '../../components/ActivityLogText'; +import {MainRouteProps} from '../../routes/main'; +import {Theme} from '../../components/ui/styleUtils'; export const HistoryScreen: React.FC = () => { - const { t } = useTranslation('HistoryScreen'); + const {t} = useTranslation('HistoryScreen'); const controller = useHistoryTab(); return ( @@ -23,7 +23,7 @@ export const HistoryScreen: React.FC = () => { onRefresh={controller.REFRESH} /> }> - {controller.activities.map((activity) => ( + {controller.activities.map(activity => ( = () => { {controller.activities.length === 0 && ( - + {t('noHistory')} diff --git a/screens/Home/IntroSlidersScreen.tsx b/screens/Home/IntroSlidersScreen.tsx index f09636abbb..78da6b18a2 100644 --- a/screens/Home/IntroSlidersScreen.tsx +++ b/screens/Home/IntroSlidersScreen.tsx @@ -91,11 +91,16 @@ export const IntroSlidersScreen: React.FC = props => { crossAlign="center" backgroundColor={Theme.Colors.whiteText} width={Dimensions.get('screen').width}> - + {item.title} @@ -115,6 +120,7 @@ export const IntroSlidersScreen: React.FC = props => { style={{borderRadius: 10, height: 50, marginTop: -10}}> = props => { style={{borderRadius: 10, height: 50, marginTop: -10}}> = props => { /> diff --git a/screens/Home/MyVcsTab.tsx b/screens/Home/MyVcsTab.tsx index 8bc0dbd579..a3c092101c 100644 --- a/screens/Home/MyVcsTab.tsx +++ b/screens/Home/MyVcsTab.tsx @@ -133,6 +133,7 @@ export const MyVcsTab: React.FC = props => { = props => { {t('bringYourDigitalID')} diff --git a/screens/PasscodeScreen.tsx b/screens/PasscodeScreen.tsx index 3cd62d54e3..985e1d8d12 100644 --- a/screens/PasscodeScreen.tsx +++ b/screens/PasscodeScreen.tsx @@ -68,11 +68,12 @@ export const PasscodeScreen: React.FC = props => { + style={{...Theme.TextStyles.header, paddingTop: 7}}> {t('header')} @@ -92,11 +93,12 @@ export const PasscodeScreen: React.FC = props => { + style={{...Theme.TextStyles.header, paddingTop: 7}}> {t('confirmPasscode')} @@ -126,6 +128,7 @@ export const PasscodeScreen: React.FC = props => { { function noShareableVcText() { return ( - + {t('noShareableVcs')} ); diff --git a/screens/Settings/AboutInji.tsx b/screens/Settings/AboutInji.tsx index e8476a54e3..8603204995 100644 --- a/screens/Settings/AboutInji.tsx +++ b/screens/Settings/AboutInji.tsx @@ -39,7 +39,7 @@ export const AboutInji: React.FC = ({appId}) => { style={{marginRight: 15}} /> - + {t('aboutInji')} @@ -57,18 +57,20 @@ export const AboutInji: React.FC = ({appId}) => { setShowAboutInji(!showAboutInji); }}> - + {t('appID')} : {appId} - + {t('aboutDetailes')} - + {t('forMoreDetailes')} = ({appId}) => { onPress={() => { aboutInjiUrl && Linking.openURL(aboutInjiUrl); }}> - + {t('clickHere')} @@ -89,13 +94,14 @@ export const AboutInji: React.FC = ({appId}) => { crossAlign="center" style={Theme.Styles.versionContainer}> {t('version')}: {__InjiVersion.getValue()} {__TuvaliVersion.getpackageVersion() != 'unknown' && ( { source={Theme.ReceivedCardsIcon} style={{marginLeft: 10, marginRight: 9}} /> - + {t('receivedCards')} diff --git a/screens/Settings/ReceivedCardsModal.tsx b/screens/Settings/ReceivedCardsModal.tsx index 0d1d34ea80..ae9d8be2b8 100644 --- a/screens/Settings/ReceivedCardsModal.tsx +++ b/screens/Settings/ReceivedCardsModal.tsx @@ -49,6 +49,7 @@ export const ReceivedCardsModal: React.FC = ({ /> @@ -56,6 +57,7 @@ export const ReceivedCardsModal: React.FC = ({ {t('noReceivedVcsText')} diff --git a/screens/Settings/SettingScreen.tsx b/screens/Settings/SettingScreen.tsx index 26830cd711..50a6cc2719 100644 --- a/screens/Settings/SettingScreen.tsx +++ b/screens/Settings/SettingScreen.tsx @@ -32,7 +32,7 @@ const LanguageSetting: React.FC = () => { containerStyle={Theme.Styles.settingsIconBg} /> - + {t('language')} @@ -75,6 +75,7 @@ export const SettingScreen: React.FC< style={{display: Platform.OS !== 'ios' ? 'flex' : 'none'}} backgroundColor={Theme.Colors.lightGreyBackgroundColor}> - + {t('receiveCard')} @@ -103,6 +104,7 @@ export const SettingScreen: React.FC< {t('basicSettings')} @@ -129,7 +131,7 @@ export const SettingScreen: React.FC< style={{marginRight: 15}} /> - + {t('bioUnlock')} @@ -187,7 +189,7 @@ export const SettingScreen: React.FC< style={{marginRight: 15}} /> - + {t('injiTourGuide')} @@ -204,7 +206,7 @@ export const SettingScreen: React.FC< containerStyle={Theme.Styles.settingsIconBg} /> - + {t('logout')} @@ -218,6 +220,7 @@ export const SettingScreen: React.FC< weight="semibold" align="center" size="smaller" + style={{paddingTop: 3}} color={Theme.Colors.profileValue}> {controller.backendInfo.application.name}:{' '} {controller.backendInfo.application.version} @@ -226,6 +229,7 @@ export const SettingScreen: React.FC< weight="semibold" align="center" size="smaller" + style={{paddingTop: 3}} color={Theme.Colors.profileValue}> MOSIP: {controller.backendInfo.config['mosip.host']} diff --git a/screens/SetupLanguageScreen.tsx b/screens/SetupLanguageScreen.tsx index 0a6135c763..9d670bf9fb 100644 --- a/screens/SetupLanguageScreen.tsx +++ b/screens/SetupLanguageScreen.tsx @@ -47,10 +47,18 @@ export const SetupLanguageScreen: React.FC = props => { size={58} /> - + {t('header')} - + {t('description')}