Merge branch 'trunk' of github.com:atsign-foundation/atmosphere_pro

atsign-foundation · Sep 27, 2022 · 81d9721 · 81d9721
2 parents 13646db + 2cf2e01
commit 81d9721
Show file tree

Hide file tree

Showing 13 changed files with 144 additions and 87 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTop"
+            android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"

diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>MinimumOSVersion</key>
-	<string>9.0</string>
+	<string>13.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -52,6 +52,12 @@ post_install do |installer|
         ## dart: PermissionGroup.microphone
         'PERMISSION_MICROPHONE=0',
 
+        # dart: PermissionGroup.camera
+        'PERMISSION_CAMERA=1',
+
+        # dart: PermissionGroup.photos
+        'PERMISSION_PHOTOS=1',
+
         ## dart: PermissionGroup.speech
         'PERMISSION_SPEECH_RECOGNIZER=0',
 

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -57,8 +57,6 @@ PODS:
     - Flutter
   - flutter_local_notifications (0.0.1):
     - Flutter
-  - flutter_qr_reader (0.0.1):
-    - Flutter
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
@@ -123,7 +121,6 @@ DEPENDENCIES:
   - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
   - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
-  - flutter_qr_reader (from `.symlinks/plugins/flutter_qr_reader/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - open_file (from `.symlinks/plugins/open_file/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
@@ -175,8 +172,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_keychain/ios"
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
-  flutter_qr_reader:
-    :path: ".symlinks/plugins/flutter_qr_reader/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
   open_file:
@@ -215,11 +210,10 @@ SPEC CHECKSUMS:
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347
   file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
   flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
-  flutter_qr_reader: d930dde3b2cfe2b3d0bb7d66e5ff3e514300a5e5
   fluttertoast: 16fbe6039d06a763f3533670197d01fc73459037
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
@@ -241,6 +235,6 @@ SPEC CHECKSUMS:
   video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
   webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
 
-PODFILE CHECKSUM: db8a7794fb1b0bee1e3803fed876c7cf9577099b
+PODFILE CHECKSUM: db1b3d34103b9bca35e1d0bca266af8024bec0bc
 
 COCOAPODS: 1.11.3
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -415,7 +415,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
@@ -448,7 +448,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
@@ -478,7 +478,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Share Extension/Info.plist";
@@ -560,7 +560,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -708,7 +708,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -747,7 +747,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/lib/desktop_screens/desktop_history/widgets/desktop_received_file_details.dart b/lib/desktop_screens/desktop_history/widgets/desktop_received_file_details.dart
@@ -297,7 +297,7 @@ class _DesktopReceivedFileDetailsState
                 return Text.rich(
                   TextSpan(
                       text:
-                          '${DateFormat("MM-dd-yyyy").format(widget.fileTransfer!.date!)}  |  ${DateFormat('kk:mm').format(widget.fileTransfer!.date!)}',
+                          '${DateFormat("MM-dd-yyyy").format(widget.fileTransfer!.date!)}  |  ${DateFormat('kk:mm').format(widget.fileTransfer!.date!)}  ',
                       style: CustomTextStyles.greyText15,
                       children: [
                         fileTransferProgress != null

diff --git a/lib/desktop_screens/desktop_history/widgets/desktop_received_file_list_tile.dart b/lib/desktop_screens/desktop_history/widgets/desktop_received_file_list_tile.dart
@@ -2,7 +2,9 @@ import 'dart:io';
 import 'dart:typed_data';
 import 'package:at_contact/at_contact.dart';
 import 'package:at_contacts_flutter/utils/init_contacts_service.dart';
+import 'package:at_contacts_flutter/services/contact_service.dart';
 import 'package:atsign_atmosphere_pro/data_models/file_transfer.dart';
+import 'package:atsign_atmosphere_pro/screens/common_widgets/add_contact.dart';
 import 'package:atsign_atmosphere_pro/screens/common_widgets/confirmation_dialog.dart';
 import 'package:atsign_atmosphere_pro/screens/common_widgets/contact_initial.dart';
 import 'package:atsign_atmosphere_pro/screens/common_widgets/custom_button.dart';
@@ -182,7 +184,7 @@ class _DesktopReceivedFilesListTileState
                           ),
                           showDownloadIndicator
                               ? Positioned(
-                                  right: 0,
+                                  right: 1,
                                   child: Container(
                                     decoration: BoxDecoration(
                                       color: Colors.white,
@@ -196,7 +198,62 @@ class _DesktopReceivedFilesListTileState
                                     ),
                                   ),
                                 )
-                              : SizedBox()
+                              : SizedBox(),
+                          widget.receivedHistory!.sender != null
+                              ? Positioned(
+                                  right: 0,
+                                  child: GestureDetector(
+                                    onTap: ((widget.receivedHistory!.sender !=
+                                                null) &&
+                                            (ContactService()
+                                                    .contactList
+                                                    .indexWhere((element) =>
+                                                        element.atSign ==
+                                                        widget.receivedHistory!
+                                                            .sender) ==
+                                                -1))
+                                        ? () async {
+                                            await showDialog<void>(
+                                              context: context,
+                                              barrierDismissible: true,
+                                              builder: (BuildContext context) {
+                                                return AddContact(
+                                                  atSignName: widget
+                                                      .receivedHistory!.sender,
+                                                  image: firstContactImage,
+                                                );
+                                              },
+                                            );
+                                            if (mounted) {
+                                              setState(() {});
+                                            }
+                                          }
+                                        : null,
+                                    child: ((widget.receivedHistory!.sender !=
+                                                null) &&
+                                            (ContactService()
+                                                    .contactList
+                                                    .indexWhere((element) =>
+                                                        element.atSign ==
+                                                        widget.receivedHistory!
+                                                            .sender) ==
+                                                -1))
+                                        ? Container(
+                                            height: 20,
+                                            width: 20,
+                                            decoration: BoxDecoration(
+                                              shape: BoxShape.circle,
+                                              color: Colors.white,
+                                            ),
+                                            child: Icon(
+                                              Icons.person_add,
+                                              size: 15.toFont,
+                                            ),
+                                          )
+                                        : SizedBox(),
+                                  ),
+                                )
+                              : SizedBox(),
                         ],
                       )
                 : SizedBox(),

diff --git a/lib/screens/common_widgets/add_contact.dart b/lib/screens/common_widgets/add_contact.dart
@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:at_common_flutter/services/size_config.dart';
@@ -49,7 +50,8 @@ class _AddContactState extends State<AddContact> {
         ),
         content: ConstrainedBox(
           constraints: BoxConstraints(
-              maxHeight: (widget.name != null) ? 190.toHeight : 160.toHeight),
+            maxHeight: (widget.name != null) ? 190.toHeight : 150.toHeight,
+          ),
           child: Column(
             children: [
               if (!isKeyBoard)
@@ -107,40 +109,50 @@ class _AddContactState extends State<AddContact> {
               ? Center(
                   child: CircularProgressIndicator(),
                 )
-              : SizedBox(
-                  width: SizeConfig().screenWidth,
-                  child: CustomButton(
-                    buttonText: 'Yes',
-                    fontColor: Colors.white,
-                    onPressed: () async {
-                      setState(() {
-                        isContactAdding = true;
-                      });
-                      await ContactService().addAtSign(
-                        atSign: widget.atSignName,
-                        nickName: nickName,
-                      );
-                      setState(() {
-                        isContactAdding = false;
-                      });
-                      Navigator.pop(context);
-                    },
+              : Container(
+                  alignment: Alignment.center,
+                  child: SizedBox(
+                    width: (Platform.isAndroid || Platform.isIOS)
+                        ? SizeConfig().screenWidth
+                        : 150.toWidth,
+                    child: CustomButton(
+                      buttonText: 'Yes',
+                      fontColor: Colors.white,
+                      onPressed: () async {
+                        setState(() {
+                          isContactAdding = true;
+                        });
+                        await ContactService().addAtSign(
+                          atSign: widget.atSignName,
+                          nickName: nickName,
+                        );
+                        setState(() {
+                          isContactAdding = false;
+                        });
+                        Navigator.pop(context);
+                      },
+                    ),
                   ),
                 ),
           SizedBox(
             height: 10.toHeight,
           ),
           isContactAdding
               ? SizedBox()
-              : SizedBox(
-                  width: SizeConfig().screenWidth,
-                  child: CustomButton(
-                    buttonColor: Colors.white,
-                    buttonText: 'No',
-                    onPressed: () {
-                      Navigator.pop(context);
-                    },
-                  )),
+              : Container(
+                  alignment: Alignment.center,
+                  child: SizedBox(
+                      width: (Platform.isAndroid || Platform.isIOS)
+                          ? SizeConfig().screenWidth
+                          : 150.toWidth,
+                      child: CustomButton(
+                        buttonColor: Colors.white,
+                        buttonText: 'No',
+                        onPressed: () {
+                          Navigator.pop(context);
+                        },
+                      )),
+                ),
         ],
       ),
     );

diff --git a/lib/screens/history/widgets/received_file_list_tile.dart b/lib/screens/history/widgets/received_file_list_tile.dart
@@ -235,16 +235,18 @@ class _ReceivedFilesListTileState extends State<ReceivedFilesListTile> {
                                     right: -5,
                                     top: -10,
                                     child: Container(
-                                        height: 25,
-                                        width: 25,
-                                        decoration: BoxDecoration(
-                                          shape: BoxShape.circle,
-                                          color: Colors.white,
-                                        ),
-                                        child: Icon(
-                                          Icons.person_add,
-                                          size: 15.toFont,
-                                        )))
+                                      height: 25,
+                                      width: 25,
+                                      decoration: BoxDecoration(
+                                        shape: BoxShape.circle,
+                                        color: Colors.white,
+                                      ),
+                                      child: Icon(
+                                        Icons.person_add,
+                                        size: 15.toFont,
+                                      ),
+                                    ),
+                                  )
                                 : SizedBox()
                           ],
                         ),

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -80,7 +80,7 @@ SPEC CHECKSUMS:
   emoji_picker_flutter: 533634326b1c5de9a181ba14b9758e6dfe967a20
   file_selector_macos: f1b08a781e66103e3ba279fd5d4024a2478b3af6
   flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
-  FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
+  FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
   local_notifier: e9506bc66fc70311e8bc7291fb70f743c081e4ff
   package_info_plus_macos: f010621b07802a241d96d01876d6705f15e77c1c
   path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19

diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
@@ -423,7 +423,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -558,7 +558,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -585,7 +585,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = 5XUSS6C2DF;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = Runner/Info.plist;