From ce5b8328d86476db6b61de1f7cd2ec1e95df1392 Mon Sep 17 00:00:00 2001 From: Bibash Shrestha Date: Thu, 17 Aug 2023 19:01:37 +0545 Subject: [PATCH] feat: Added format attribute in card details #1799 --- .vscode/launch.json | 8 +------- lib/app/shared/widget/base/credential_field.dart | 4 ++-- .../widgets/credential_dynamic_detail.dart | 4 ++-- .../credential_manifest_details.dart | 16 ++++++++++++++++ .../widgets/display_properties_widget.dart | 1 + lib/l10n/arb/app_en.arb | 3 ++- lib/l10n/untranslated.json | 12 ++++++++---- 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 0ae10e8fa..b4e33cecb 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -28,13 +28,7 @@ "request": "launch", "type": "dart", "program": "lib/main_production.dart", - "args": [ - "--flavor", - "production", - "--target", - "lib/main_production.dart", - "--release" - ] + "args": ["--flavor", "production", "--target", "lib/main_production.dart"] } ] } diff --git a/lib/app/shared/widget/base/credential_field.dart b/lib/app/shared/widget/base/credential_field.dart index 1415268a4..a197a5297 100644 --- a/lib/app/shared/widget/base/credential_field.dart +++ b/lib/app/shared/widget/base/credential_field.dart @@ -52,9 +52,9 @@ class DisplayCredentialField extends StatelessWidget { Widget build(BuildContext context) { return Padding( padding: padding, - child: RichText( + child: SelectableText.rich( textAlign: TextAlign.left, - text: TextSpan( + TextSpan( children: [ if (title != null) TextSpan( diff --git a/lib/dashboard/home/tab_bar/credentials/widgets/credential_dynamic_detail.dart b/lib/dashboard/home/tab_bar/credentials/widgets/credential_dynamic_detail.dart index 10203f742..bafbb9985 100644 --- a/lib/dashboard/home/tab_bar/credentials/widgets/credential_dynamic_detail.dart +++ b/lib/dashboard/home/tab_bar/credentials/widgets/credential_dynamic_detail.dart @@ -55,9 +55,9 @@ class CredentialDynamicDetial extends StatelessWidget { return Padding( padding: padding, - child: RichText( + child: SelectableText.rich( textAlign: TextAlign.left, - text: TextSpan( + TextSpan( children: [ TextSpan(text: '$title: ', style: titleTheme), TextSpan( diff --git a/lib/dashboard/home/tab_bar/credentials/widgets/credential_manifest_widgets/credential_manifest_details.dart b/lib/dashboard/home/tab_bar/credentials/widgets/credential_manifest_widgets/credential_manifest_details.dart index b8fc9261a..a3add3f6d 100644 --- a/lib/dashboard/home/tab_bar/credentials/widgets/credential_manifest_widgets/credential_manifest_details.dart +++ b/lib/dashboard/home/tab_bar/credentials/widgets/credential_manifest_widgets/credential_manifest_details.dart @@ -1,4 +1,8 @@ +import 'dart:convert'; + +import 'package:altme/app/shared/shared.dart'; import 'package:altme/dashboard/dashboard.dart'; +import 'package:altme/l10n/l10n.dart'; import 'package:altme/theme/theme.dart'; import 'package:credential_manifest/credential_manifest.dart'; import 'package:flutter/material.dart'; @@ -17,6 +21,11 @@ class CredentialManifestDetails extends StatelessWidget { Widget build(BuildContext context) { final titleColor = Theme.of(context).colorScheme.titleColor; final valueColor = Theme.of(context).colorScheme.valueColor; + + final l10n = context.l10n; + + final data = credentialModel.jwt ?? credentialModel.data; + return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -33,6 +42,13 @@ class CredentialManifestDetails extends StatelessWidget { titleColor: titleColor, valueColor: valueColor, ), + CredentialField( + padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 8), + title: l10n.format, + value: data.toString(), + titleColor: titleColor, + valueColor: valueColor, + ), ], ); } diff --git a/lib/dashboard/home/tab_bar/credentials/widgets/display_properties_widget.dart b/lib/dashboard/home/tab_bar/credentials/widgets/display_properties_widget.dart index 76a5a2980..260946ec8 100644 --- a/lib/dashboard/home/tab_bar/credentials/widgets/display_properties_widget.dart +++ b/lib/dashboard/home/tab_bar/credentials/widgets/display_properties_widget.dart @@ -29,6 +29,7 @@ class DisplayPropertiesWidget extends StatelessWidget { ), ); }); + if (widgets.isNotEmpty) { return Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb index b7ba9e6e7..cf5c42ce8 100644 --- a/lib/l10n/arb/app_en.arb +++ b/lib/l10n/arb/app_en.arb @@ -929,5 +929,6 @@ }, "oidc4vcProfile": "OIDC4VC Profile", "pleaseSwitchToCorrectOIDC4VCProfile": "Please switch to correct OIDC4VC profile.", - "authenticationSuccess": "Authentication Success" + "authenticationSuccess": "Authentication Success", + "format": "Format" } \ No newline at end of file diff --git a/lib/l10n/untranslated.json b/lib/l10n/untranslated.json index ca80b005c..a4deba24b 100644 --- a/lib/l10n/untranslated.json +++ b/lib/l10n/untranslated.json @@ -841,7 +841,8 @@ "pleaseSwitchPolygonNetwork", "oidc4vcProfile", "pleaseSwitchToCorrectOIDC4VCProfile", - "authenticationSuccess" + "authenticationSuccess", + "format" ], "es": [ @@ -1686,7 +1687,8 @@ "pleaseSwitchPolygonNetwork", "oidc4vcProfile", "pleaseSwitchToCorrectOIDC4VCProfile", - "authenticationSuccess" + "authenticationSuccess", + "format" ], "fr": [ @@ -1834,7 +1836,8 @@ "pleaseSwitchPolygonNetwork", "oidc4vcProfile", "pleaseSwitchToCorrectOIDC4VCProfile", - "authenticationSuccess" + "authenticationSuccess", + "format" ], "it": [ @@ -2679,6 +2682,7 @@ "pleaseSwitchPolygonNetwork", "oidc4vcProfile", "pleaseSwitchToCorrectOIDC4VCProfile", - "authenticationSuccess" + "authenticationSuccess", + "format" ] }