Merge branch 'develop' into feat/history-offer-connetion-share-proof

credebl · Oct 28, 2024 · bde5e48 · bde5e48
2 parents 24db833 + b39311c
commit bde5e48
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 19 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -81,8 +81,8 @@ android {
         applicationId "id.credebl.adeya"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 17
-        versionName "1.0.11"
+        versionCode 18
+        versionName "1.0.12"
 
         missingDimensionStrategy 'react-native-camera', 'general'
     }

diff --git a/app/components/record/W3CCredentialRecordField.tsx b/app/components/record/W3CCredentialRecordField.tsx
@@ -72,6 +72,7 @@ const W3CCredentialRecordField: React.FC<W3CCredentialRecordFieldProps> = ({
     valueText: {
       ...ListItems.recordAttributeText,
       paddingVertical: 4,
+      width: '90%',
     },
   })
 

diff --git a/app/screens/CredentialDetailsW3C.tsx b/app/screens/CredentialDetailsW3C.tsx
@@ -2,12 +2,12 @@ import type { StackScreenProps } from '@react-navigation/stack'
 
 import {
   CredentialExchangeRecord,
+  CredentialState,
   W3cCredentialRecord,
-  getW3cCredentialRecordById,
   deleteCredentialExchangeRecordById,
-  useCredentialByState,
-  CredentialState,
+  getW3cCredentialRecordById,
   useConnections,
+  useCredentialByState,
 } from '@adeya/ssi'
 import { BrandingOverlay } from '@hyperledger/aries-oca'
 import { CredentialOverlay } from '@hyperledger/aries-oca/build/legacy'
@@ -47,6 +47,33 @@ const paddingHorizontal = 24
 const paddingVertical = 16
 const logoHeight = 80
 
+const getPageSize = (prettyVc: { orientation: 'landscape' | 'portrait'; height?: number; width?: number }) => {
+  if (prettyVc?.height && prettyVc?.width) {
+    if (Platform.OS === 'android') {
+      const height = prettyVc.height * 0.75
+      const width = prettyVc.width * 0.75
+
+      return {
+        width,
+        height,
+      }
+    }
+
+    const height = prettyVc.height * 0.81
+    const width = prettyVc.width * 0.81
+
+    return {
+      width,
+      height,
+    }
+  }
+
+  return {
+    width: prettyVc.orientation === 'landscape' ? 595 : 842,
+    height: prettyVc.orientation === 'landscape' ? 420 : 595,
+  }
+}
+
 const CredentialDetailsW3C: React.FC<CredentialDetailsProps> = ({ navigation, route }) => {
   if (!route?.params) {
     throw new Error('CredentialDetails route prams were not set properly')
@@ -314,13 +341,6 @@ const CredentialDetailsW3C: React.FC<CredentialDetailsProps> = ({ navigation, ro
     )
   }
 
-  const getA4Sizes = (type: 'landscape' | 'portrait') => {
-    return {
-      width: type === 'landscape' ? 842 : 595,
-      height: type === 'landscape' ? 595 : 842,
-    }
-  }
-
   const generateQRCodeString = async (text: string) => {
     return toQRCodeString(text, {
       width: 95,
@@ -369,8 +389,7 @@ const CredentialDetailsW3C: React.FC<CredentialDetailsProps> = ({ navigation, ro
         fileName: w3cCredential?.credential.type[1],
         padding: 0,
         directory: 'Documents',
-        // add height and width to the options of a4 paper size
-        ...getA4Sizes(prettyVc.orientation),
+        ...getPageSize(prettyVc),
       }
 
       const file = await RNHTMLtoPDF.convert(options)

diff --git a/app/screens/RenderCertificate.tsx b/app/screens/RenderCertificate.tsx
@@ -54,7 +54,7 @@ const RenderCertificate: React.FC<RenderCertificateProps> = ({ navigation, route
 
   return (
     <SafeAreaView style={styles.container} edges={['left', 'right']}>
-      <Pdf source={{ uri: filePath }} style={styles.pdf} />
+      <Pdf source={{ uri: filePath }} style={styles.pdf} maxScale={10.0} />
     </SafeAreaView>
   )
 }

diff --git a/ios/AdeyaWallet.xcodeproj/project.pbxproj b/ios/AdeyaWallet.xcodeproj/project.pbxproj
@@ -507,7 +507,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = AdeyaWallet/AdeyaWallet.entitlements;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = Z5W7KRPGHZ;
 				ENABLE_BITCODE = NO;
@@ -518,7 +518,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.11;
+				MARKETING_VERSION = 1.0.12;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -546,7 +546,7 @@
 				CODE_SIGN_ENTITLEMENTS = AdeyaWallet/AdeyaWallet.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = Z5W7KRPGHZ;
 				INFOPLIST_FILE = AdeyaWallet/Info.plist;
@@ -556,7 +556,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.11;
+				MARKETING_VERSION = 1.0.12;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",