diff --git a/package.json b/package.json index 6e737951..b90d909a 100644 --- a/package.json +++ b/package.json @@ -55,5 +55,9 @@ "@react-navigation/stack": "6.0.11", "@types/node": "16.9.6", "@aries-framework/react-hooks": "patch:@aries-framework/react-hooks@npm:0.4.2#./.yarn/patches/@aries-framework-react-hooks-npm-0.4.2-84b7eb8764.patch" + }, + "dependencies": { + "react-native-qrcode-svg": "^6.2.0", + "react-native-svg": "^14.1.0" } } diff --git a/packages/legacy/app/android/app/src/main/res/mipmap-hdpi/basic_swish.png b/packages/legacy/app/android/app/src/main/res/mipmap-hdpi/basic_swish.png index a5469a9f..869f94b7 100644 Binary files a/packages/legacy/app/android/app/src/main/res/mipmap-hdpi/basic_swish.png and b/packages/legacy/app/android/app/src/main/res/mipmap-hdpi/basic_swish.png differ diff --git a/packages/legacy/app/android/app/src/main/res/mipmap-mdpi/basic_swish.png b/packages/legacy/app/android/app/src/main/res/mipmap-mdpi/basic_swish.png index 1669ab4d..869f94b7 100644 Binary files a/packages/legacy/app/android/app/src/main/res/mipmap-mdpi/basic_swish.png and b/packages/legacy/app/android/app/src/main/res/mipmap-mdpi/basic_swish.png differ diff --git a/packages/legacy/app/android/app/src/main/res/mipmap-xhdpi/basic_swish.png b/packages/legacy/app/android/app/src/main/res/mipmap-xhdpi/basic_swish.png index 542790fd..869f94b7 100644 Binary files a/packages/legacy/app/android/app/src/main/res/mipmap-xhdpi/basic_swish.png and b/packages/legacy/app/android/app/src/main/res/mipmap-xhdpi/basic_swish.png differ diff --git a/packages/legacy/app/android/app/src/main/res/mipmap-xxhdpi/basic_swish.png b/packages/legacy/app/android/app/src/main/res/mipmap-xxhdpi/basic_swish.png index 2c5ed52e..869f94b7 100644 Binary files a/packages/legacy/app/android/app/src/main/res/mipmap-xxhdpi/basic_swish.png and b/packages/legacy/app/android/app/src/main/res/mipmap-xxhdpi/basic_swish.png differ diff --git a/packages/legacy/app/android/app/src/main/res/mipmap-xxxhdpi/basic_swish.png b/packages/legacy/app/android/app/src/main/res/mipmap-xxxhdpi/basic_swish.png index 395dad7a..869f94b7 100644 Binary files a/packages/legacy/app/android/app/src/main/res/mipmap-xxxhdpi/basic_swish.png and b/packages/legacy/app/android/app/src/main/res/mipmap-xxxhdpi/basic_swish.png differ diff --git a/packages/legacy/app/android/app/src/main/res/values/strings.xml b/packages/legacy/app/android/app/src/main/res/values/strings.xml index 5828d678..58eb5254 100644 --- a/packages/legacy/app/android/app/src/main/res/values/strings.xml +++ b/packages/legacy/app/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - Aries Bifold + FHWA diff --git a/packages/legacy/app/package.json b/packages/legacy/app/package.json index 18e40c64..23b562a2 100644 --- a/packages/legacy/app/package.json +++ b/packages/legacy/app/package.json @@ -71,7 +71,6 @@ "react-native-orientation-locker": "^1.6.0", "react-native-permissions": "^3.8.4", "react-native-qrcode-svg": "^6.2.0", - "react-native-reanimated": "^3.4.2", "react-native-safe-area-context": "^3.2.0", "react-native-scalable-image": "^1.1.0", "react-native-screens": "^3.24.0", diff --git a/packages/legacy/core/App/localization/en/index.ts b/packages/legacy/core/App/localization/en/index.ts index caf9da17..56558b4e 100644 --- a/packages/legacy/core/App/localization/en/index.ts +++ b/packages/legacy/core/App/localization/en/index.ts @@ -486,6 +486,7 @@ const translation = { "AppGuides": "App guides", "Build": "Build", "WhatAreContacts": "What are Contacts?", + "QRCodeGen": "Generate QR Code", "ScanMyQR": "Scan my QR code", "Help": "Help", "MoreInformation": "More information", diff --git a/packages/legacy/core/App/navigators/ContactStack.tsx b/packages/legacy/core/App/navigators/ContactStack.tsx index a0e98e8b..e47290f9 100644 --- a/packages/legacy/core/App/navigators/ContactStack.tsx +++ b/packages/legacy/core/App/navigators/ContactStack.tsx @@ -11,6 +11,7 @@ import CredentialOffer from '../screens/CredentialOffer' import ListContacts from '../screens/ListContacts' import ProofDetails from '../screens/ProofDetails' import ProofRequest from '../screens/ProofRequest' +import QRCodeGen from '../screens/QRCodeGen' import RenameContact from '../screens/RenameContact' import WhatAreContacts from '../screens/WhatAreContacts' import { ContactStackParams, Screens } from '../types/navigators' @@ -39,6 +40,7 @@ const ContactStack: React.FC = () => { options={{ title: t('Screens.RenameContact') }} /> + +} + +const QRCodeGen: React.FC = () => { + const { ColorPallet, TextTheme } = useTheme() + const { t } = useTranslation() + const styles = StyleSheet.create({ + container: { + flex: 1, + alignItems: 'center', + backgroundColor: ColorPallet.brand.primaryBackground, + }, + title: { + ...TextTheme.headingTwo, + marginBottom: 15, + }, + pageContent: { + marginTop: 30, + paddingLeft: 25, + paddingRight: 25, + }, + }) + + return ( + + + Scan the QR Code + + + + ) +} + +export default QRCodeGen diff --git a/packages/legacy/core/App/screens/Settings.tsx b/packages/legacy/core/App/screens/Settings.tsx index cb1e5dbd..f7b9d30a 100644 --- a/packages/legacy/core/App/screens/Settings.tsx +++ b/packages/legacy/core/App/screens/Settings.tsx @@ -120,11 +120,18 @@ const Settings: React.FC = ({ navigation }) => { .getParent() ?.navigate(Stacks.ContactStack, { screen: Screens.Contacts, params: { navigation: navigation } }), }, + // { + // title: t('Settings.WhatAreContacts'), + // accessibilityLabel: t('Settings.WhatAreContacts'), + // testID: testIdWithKey('WhatAreContacts'), + // onPress: () => navigation.getParent()?.navigate(Stacks.ContactStack, { screen: Screens.WhatAreContacts }), + // value: undefined, + // }, { - title: t('Settings.WhatAreContacts'), - accessibilityLabel: t('Settings.WhatAreContacts'), - testID: testIdWithKey('WhatAreContacts'), - onPress: () => navigation.getParent()?.navigate(Stacks.ContactStack, { screen: Screens.WhatAreContacts }), + title: t('Settings.QRCodeGen'), + accessibilityLabel: t('Settings.QRCodeGen'), + testID: testIdWithKey('QRCodeGen'), + onPress: () => navigation.getParent()?.navigate(Stacks.ContactStack, { screen: Screens.QRCodeGen }), value: undefined, }, ], diff --git a/packages/legacy/core/App/types/navigators.ts b/packages/legacy/core/App/types/navigators.ts index 72ebb0bd..f1b18371 100644 --- a/packages/legacy/core/App/types/navigators.ts +++ b/packages/legacy/core/App/types/navigators.ts @@ -38,6 +38,7 @@ export enum Screens { NameWallet = 'Name Wallet', RenameContact = 'Rename Contact', ScanHelp = 'Scan Help', + QRCodeGen = 'Generate QR Code', } export enum Stacks { @@ -97,6 +98,7 @@ export type ContactStackParams = { [Screens.ContactDetails]: { connectionId: string } [Screens.RenameContact]: { connectionId: string } [Screens.WhatAreContacts]: undefined + [Screens.QRCodeGen]: undefined [Screens.CredentialDetails]: { credentialId: string } [Screens.CredentialOffer]: { credentialId: string } [Screens.ProofDetails]: { recordId: string; isHistory?: boolean } diff --git a/packages/legacy/core/package.json b/packages/legacy/core/package.json index 35ba55f2..5192b5bb 100644 --- a/packages/legacy/core/package.json +++ b/packages/legacy/core/package.json @@ -127,7 +127,6 @@ "react-native-orientation-locker": "^1.6.0", "react-native-permissions": "^3.8.4", "react-native-qrcode-svg": "^6.2.0", - "react-native-reanimated": "^3.4.2", "react-native-safe-area-context": "^3.2.0", "react-native-scalable-image": "^1.1.0", "react-native-screens": "^3.24.0", @@ -200,7 +199,6 @@ "react-native-orientation-locker": "*", "react-native-permissions": "^3.8.4", "react-native-qrcode-svg": "^6.2.0", - "react-native-reanimated": "^3.4.2", "react-native-safe-area-context": "^3.2.0", "react-native-screens": "^3.24.0", "react-native-splash-screen": "^3.3.0", diff --git a/yarn.lock b/yarn.lock index 7f2a08bc..e2554dec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2319,17 +2319,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-object-assign@npm:^7.16.7": - version: 7.18.6 - resolution: "@babel/plugin-transform-object-assign@npm:7.18.6" - dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: a9738264cc996c54febafa0701c5a182d99afbddbfe9fbcc0b2536e3b2332b3318a8143aacd0368e31e18c24cd1b1980be7a3b0b2e5122efb520952d863a1203 - languageName: node - linkType: hard - "@babel/plugin-transform-object-rest-spread@npm:^7.22.15": version: 7.22.15 resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.15" @@ -3077,7 +3066,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-typescript@npm:^7.16.7, @babel/preset-typescript@npm:^7.17.12": +"@babel/preset-typescript@npm:^7.17.12": version: 7.21.0 resolution: "@babel/preset-typescript@npm:7.21.0" dependencies: @@ -4074,7 +4063,6 @@ __metadata: react-native-orientation-locker: ^1.6.0 react-native-permissions: ^3.8.4 react-native-qrcode-svg: ^6.2.0 - react-native-reanimated: ^3.4.2 react-native-safe-area-context: ^3.2.0 react-native-scalable-image: ^1.1.0 react-native-screens: ^3.24.0 @@ -4146,7 +4134,6 @@ __metadata: react-native-orientation-locker: "*" react-native-permissions: ^3.8.4 react-native-qrcode-svg: ^6.2.0 - react-native-reanimated: ^3.4.2 react-native-safe-area-context: ^3.2.0 react-native-screens: ^3.24.0 react-native-splash-screen: ^3.3.0 @@ -7543,7 +7530,6 @@ __metadata: react-native-orientation-locker: ^1.6.0 react-native-permissions: ^3.8.4 react-native-qrcode-svg: ^6.2.0 - react-native-reanimated: ^3.4.2 react-native-safe-area-context: ^3.2.0 react-native-scalable-image: ^1.1.0 react-native-screens: ^3.24.0 @@ -7578,6 +7564,8 @@ __metadata: lerna: ^6.6.2 npm-run-all: ^4.1.5 prettier: ^2.8.4 + react-native-qrcode-svg: ^6.2.0 + react-native-svg: ^14.1.0 ts-node: ^10.0.0 typescript: ^5.0.4 languageName: unknown @@ -18708,27 +18696,6 @@ __metadata: languageName: node linkType: hard -"react-native-reanimated@npm:^3.4.2": - version: 3.5.4 - resolution: "react-native-reanimated@npm:3.5.4" - dependencies: - "@babel/plugin-transform-object-assign": ^7.16.7 - "@babel/preset-typescript": ^7.16.7 - convert-source-map: ^2.0.0 - invariant: ^2.2.4 - peerDependencies: - "@babel/core": ^7.0.0-0 - "@babel/plugin-proposal-nullish-coalescing-operator": ^7.0.0-0 - "@babel/plugin-proposal-optional-chaining": ^7.0.0-0 - "@babel/plugin-transform-arrow-functions": ^7.0.0-0 - "@babel/plugin-transform-shorthand-properties": ^7.0.0-0 - "@babel/plugin-transform-template-literals": ^7.0.0-0 - react: "*" - react-native: "*" - checksum: 885449b11324f0399128d665c90e7179a095dfa603dd251e8b1d14df2efe73411acd724562837e114366769e69b8aac2b0a2ffc1f63d2b7dbf1a35024f074604 - languageName: node - linkType: hard - "react-native-safe-area-context@npm:^3.2.0": version: 3.4.1 resolution: "react-native-safe-area-context@npm:3.4.1" @@ -18811,6 +18778,19 @@ __metadata: languageName: node linkType: hard +"react-native-svg@npm:^14.1.0": + version: 14.1.0 + resolution: "react-native-svg@npm:14.1.0" + dependencies: + css-select: ^5.1.0 + css-tree: ^1.1.3 + peerDependencies: + react: "*" + react-native: "*" + checksum: ed94adac9bf3144c5dcbf37a2956ab672d402f11c0ed75cda247d1d9136ce8977f4d01bcfc813ba576bd61ece420d66306c148057e2552828aa8fe9bad173d46 + languageName: node + linkType: hard + "react-native-tcp-socket@npm:^6.0.6": version: 6.0.6 resolution: "react-native-tcp-socket@npm:6.0.6"