From fd8b94417514aa6e505d54f7a1a2a3ca6ca7d4cf Mon Sep 17 00:00:00 2001 From: Keshav Mishra Date: Wed, 27 Jul 2022 13:39:50 +0530 Subject: [PATCH 001/192] Update android-custom-build.yml --- .github/workflows/android-custom-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-custom-build.yml b/.github/workflows/android-custom-build.yml index e25bd6b14..7890487d9 100644 --- a/.github/workflows/android-custom-build.yml +++ b/.github/workflows/android-custom-build.yml @@ -49,4 +49,4 @@ jobs: with: name: apk-output path: android/app/build/outputs/apk/newlogic/release/ - retention-days: 1 + retention-days: 5 From af6be3c5a53d138a0ac648cddb5ea36757cb62a3 Mon Sep 17 00:00:00 2001 From: gaganama Date: Fri, 26 Aug 2022 11:05:14 +0530 Subject: [PATCH 002/192] [DSD-1364] Added delete workflow in manual mode for inji repo. --- .github/workflows/clear_artifacts.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/clear_artifacts.yml diff --git a/.github/workflows/clear_artifacts.yml b/.github/workflows/clear_artifacts.yml new file mode 100644 index 000000000..0af8038ec --- /dev/null +++ b/.github/workflows/clear_artifacts.yml @@ -0,0 +1,12 @@ +name: 'Delete old artifacts' +on: + workflow_dispatch: + +jobs: + delete-artifacts: + runs-on: ubuntu-latest + steps: + - uses: kolpav/purge-artifacts-action@v1 + with: + token: ${{ secrets. access_token }} + expire-in: 2days # Setting this to 0 will delete all artifacts \ No newline at end of file From 69f13c1cc4fb23c31cd6badbba43f0a58501c75e Mon Sep 17 00:00:00 2001 From: gaganama Date: Fri, 2 Sep 2022 12:50:26 +0530 Subject: [PATCH 003/192] [DSD-1364] Added token to the workflow for inji repo. --- .github/workflows/clear_artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clear_artifacts.yml b/.github/workflows/clear_artifacts.yml index 0af8038ec..5659641e2 100644 --- a/.github/workflows/clear_artifacts.yml +++ b/.github/workflows/clear_artifacts.yml @@ -8,5 +8,5 @@ jobs: steps: - uses: kolpav/purge-artifacts-action@v1 with: - token: ${{ secrets. access_token }} + token: ${{ secrets. ACTION_PAT }} expire-in: 2days # Setting this to 0 will delete all artifacts \ No newline at end of file From 48be877444df784ab360e5725282991871c8b1c4 Mon Sep 17 00:00:00 2001 From: gaganama Date: Fri, 2 Sep 2022 13:47:22 +0530 Subject: [PATCH 004/192] [DSD-1364] Added token to the workflow for inji repo. --- .github/workflows/clear_artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clear_artifacts.yml b/.github/workflows/clear_artifacts.yml index 5659641e2..32bc5fb3e 100644 --- a/.github/workflows/clear_artifacts.yml +++ b/.github/workflows/clear_artifacts.yml @@ -8,5 +8,5 @@ jobs: steps: - uses: kolpav/purge-artifacts-action@v1 with: - token: ${{ secrets. ACTION_PAT }} + token: ${{ secrets.ACTION_PAT }} expire-in: 2days # Setting this to 0 will delete all artifacts \ No newline at end of file From fa83ca719f4b7502251bc417a1f8e866df5f23b2 Mon Sep 17 00:00:00 2001 From: anil_majji Date: Tue, 31 Jan 2023 11:43:17 +0530 Subject: [PATCH 005/192] UI changed in home-screen --- assets/digital_identity_icon.png | Bin 0 -> 3235 bytes components/ui/Button.tsx | 42 +++++++++++++++++++- components/ui/themes/DefaultTheme.ts | 20 +++++++++- locales/en.json | 4 +- package-lock.json | 16 ++++++++ package.json | 1 + screens/Home/HomeScreen.tsx | 4 +- screens/Home/MyVcsTab.tsx | 56 ++++++++++++++------------- screens/Home/MyVcsTabController.ts | 2 +- 9 files changed, 110 insertions(+), 35 deletions(-) create mode 100644 assets/digital_identity_icon.png diff --git a/assets/digital_identity_icon.png b/assets/digital_identity_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5a678a4dff3d94f265fd65c8c74fe48ba7d25493 GIT binary patch literal 3235 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%0AjqbPA?|xnszZC{o8QYohkyx+v4Eande6a?Z2GN{ zaZ~lte$IdhF>qK9F}^n{Jw9v?$i9+{_cB5R_SOv9S0Z72(|Z~B6qM@F-eR30X@#ei zy1sj%mcHSdl3TE6`xQ|l%2D?uiQ38X+xxtgZsG>ZWCk#L4{N@pXhzTDt%s1Z)=^tP z1`&(tOGt>)6EPb=iZRP5`ytxlW^ezoK+EVMjx~P^HP@SRk&efY#~HmJ`WSlC8=xYo zL6p_#VE{*+Dzo$?1ZdBYJ-!Eeh#epUd%TjE(L+4g+$?KL*fWI3!VW#22<)vHvZoLX(UhuU?_qEM2kHvI5WChO zu%}C znJw3SWv9RLb1($)2HRrQ-}6}dD{?>vch7@!aJDyLI0PuVcG*aJ2G z2J4&r9w|Lv-f_Q%`FkfgM_J=!^_QHNiP(dU?kl;(agV+1)<6R&)l^19GyFn0%jA=7 za(X1+!@)jT#5CWLWUS!F?VzUyZ0UCL58o&7A}UbUk&NEi=?U|=oS2V(Q}I?Z@PDFy VgZm40py>br002ovPDHLkV1j8y6>|Up literal 0 HcmV?d00001 diff --git a/components/ui/Button.tsx b/components/ui/Button.tsx index e607772bd..e4d10d443 100644 --- a/components/ui/Button.tsx +++ b/components/ui/Button.tsx @@ -6,9 +6,10 @@ import { import { GestureResponderEvent, StyleProp, ViewStyle } from 'react-native'; import { Text } from './Text'; import { Theme, Spacing } from './styleUtils'; +import LinearGradient from 'react-native-linear-gradient'; export const Button: React.FC = (props) => { - const type = props.type || 'solid'; + const type = props.type || 'solid' || 'radius'; const buttonStyle: StyleProp = [ props.fill ? Theme.ButtonStyles.fill : null, Theme.ButtonStyles[type], @@ -28,7 +29,7 @@ export const Button: React.FC = (props) => { } }; - return ( + return !props.linearGradient ? ( = (props) => { onPress={handleOnPress} loading={props.loading} /> + ) : ( + + + {props.title} + + } + icon={props.icon} + onPress={handleOnPress} + loading={props.loading} + /> + ); }; @@ -62,6 +98,8 @@ interface ButtonProps { disabled?: boolean; margin?: Spacing; type?: RNEButtonProps['type']; + linearGradient?: boolean; + isVcThere?: boolean; onPress?: RNEButtonProps['onPress']; fill?: boolean; raised?: boolean; diff --git a/components/ui/themes/DefaultTheme.ts b/components/ui/themes/DefaultTheme.ts index bc42cb5d7..8430a310b 100644 --- a/components/ui/themes/DefaultTheme.ts +++ b/components/ui/themes/DefaultTheme.ts @@ -1,5 +1,6 @@ /* eslint-disable sonarjs/no-duplicate-string */ import { Dimensions, StyleSheet, ViewStyle } from 'react-native'; +import { LinearGradient } from 'react-native-svg'; import { Spacing } from '../styleUtils'; const Colors = { @@ -8,7 +9,7 @@ const Colors = { Grey5: '#E0E0E0', Grey6: '#F2F2F2', Orange: '#F2811D', - LightGrey: '#f7f5f0', + LightGrey: '#f0f3f7', White: '#FFFFFF', Red: '#EB5757', Green: '#219653', @@ -89,6 +90,16 @@ export const DefaultTheme = { backgroundColor: Colors.Grey6, borderRadius: 4, }, + homeScreenContainer: { + alignItems: 'center', + justifyContent: 'center', + borderRadius: 10, + backgroundColor: '#fff', + shadowColor: '#000', + shadowOpacity: 0.4, + elevation: 6, + padding: 10, + }, vertloadingContainer: { flex: 1, backgroundColor: Colors.Grey6, @@ -368,7 +379,7 @@ export const DefaultTheme = { borderColor: Colors.Orange, }, container: { - minHeight: 48, + minHeight: 45, flexDirection: 'row', }, disabled: { @@ -377,6 +388,10 @@ export const DefaultTheme = { addId: { backgroundColor: Colors.Orange, }, + gradientButton: { + borderRadius: 10, + width: '90%', + }, clearAddIdBtnBg: { backgroundColor: Colors.Transparent, }, @@ -652,6 +667,7 @@ export const DefaultTheme = { WarningLogo: require('../../../assets/warningLogo.png'), OtpLogo: require('../../../assets/otp-mobile-logo.png'), SuccessLogo: require('../../../assets/success-logo.png'), + DigitalIdentityLogo: require('../../../assets/digital_identity_icon.png'), elevation(level: ElevationLevel): ViewStyle { // https://ethercreative.github.io/react-native-shadow-generator/ diff --git a/locales/en.json b/locales/en.json index ce4b1dd66..088ee52db 100644 --- a/locales/en.json +++ b/locales/en.json @@ -127,8 +127,8 @@ "header": "OTP Verification" }, "MyVcsTab": { - "addVcButton": "Add {{vcLabel}}", - "generateVc": "Generate your {{vcLabel}}", + "downloadID": "Download ID", + "bringYourDigitalID": "Bring your digital identity", "generateVcDescription": "Tap on \"Add {{vcLabel}}\" below to download your {{vcLabel}}" }, "OnboardingOverlay": { diff --git a/package-lock.json b/package-lock.json index 03efecfb3..6e8edddfb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,6 +53,7 @@ "react-native-fs": "^2.20.0", "react-native-gesture-handler": "~2.1.0", "react-native-keychain": "^8.0.0", + "react-native-linear-gradient": "^2.6.2", "react-native-location-enabler": "^4.1.0", "react-native-permissions": "^3.6.0", "react-native-popable": "^0.4.3", @@ -21169,6 +21170,15 @@ "resolved": "https://registry.npmjs.org/react-native-keychain/-/react-native-keychain-8.0.0.tgz", "integrity": "sha512-c7Cs+YQN26UaQsRG1dmlXL7VL2ctnXwH/dl0IOMEQ7ZaL2NdN313YSAI8ZEZZjrVhNmPsyWEuvTFqWrdpItqQg==" }, + "node_modules/react-native-linear-gradient": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.6.2.tgz", + "integrity": "sha512-Z8Xxvupsex+9BBFoSYS87bilNPWcRfRsGC0cpJk72Nxb5p2nEkGSBv73xZbEHnW2mUFvP+huYxrVvjZkr/gRjQ==", + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/react-native-location-enabler": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/react-native-location-enabler/-/react-native-location-enabler-4.1.1.tgz", @@ -44115,6 +44125,12 @@ "resolved": "https://registry.npmjs.org/react-native-keychain/-/react-native-keychain-8.0.0.tgz", "integrity": "sha512-c7Cs+YQN26UaQsRG1dmlXL7VL2ctnXwH/dl0IOMEQ7ZaL2NdN313YSAI8ZEZZjrVhNmPsyWEuvTFqWrdpItqQg==" }, + "react-native-linear-gradient": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.6.2.tgz", + "integrity": "sha512-Z8Xxvupsex+9BBFoSYS87bilNPWcRfRsGC0cpJk72Nxb5p2nEkGSBv73xZbEHnW2mUFvP+huYxrVvjZkr/gRjQ==", + "requires": {} + }, "react-native-location-enabler": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/react-native-location-enabler/-/react-native-location-enabler-4.1.1.tgz", diff --git a/package.json b/package.json index d16e6edcc..e4a88611c 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "react-native-fs": "^2.20.0", "react-native-gesture-handler": "~2.1.0", "react-native-keychain": "^8.0.0", + "react-native-linear-gradient": "^2.6.2", "react-native-location-enabler": "^4.1.0", "react-native-permissions": "^3.6.0", "react-native-popable": "^0.4.3", diff --git a/screens/Home/HomeScreen.tsx b/screens/Home/HomeScreen.tsx index 806f084de..81b7bffa4 100644 --- a/screens/Home/HomeScreen.tsx +++ b/screens/Home/HomeScreen.tsx @@ -20,14 +20,14 @@ export const HomeScreen: React.FC = (props) => { return ( - {TabItem(t('myVcsTab', { vcLabel: controller.vcLabel.plural }))} {TabItem(t('receivedVcsTab', { vcLabel: controller.vcLabel.plural }))} {TabItem(t('historyTab'))} - + */} {controller.haveTabsLoaded && ( = (props) => { return ( - + {controller.vcKeys.length > 0 && ( = (props) => {