From 14a5f3e9ad8f4c5b796f9b78e1c5cfeaa81321fe Mon Sep 17 00:00:00 2001 From: sarika gautam Date: Tue, 7 Dec 2021 16:39:15 +0530 Subject: [PATCH] minor changes and fix apps#383 --- ios/Podfile.lock | 64 +++--- ios/Runner.xcodeproj/project.pbxproj | 70 +++---- lib/screens/common_widgets/side_bar.dart | 3 +- .../common_widgets/side_bar_list_item.dart | 5 +- .../widgets/received_file_list_tile.dart | 2 +- .../history/widgets/sent_file_list_tile.dart | 2 +- lib/screens/home/home.dart | 15 +- .../welcome_screen_received_files.dart | 3 +- lib/utils/text_strings.dart | 8 +- pubspec.lock | 189 ++++++++++++++++-- 10 files changed, 267 insertions(+), 94 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 296c68b4..5b055dd9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -45,6 +45,8 @@ PODS: - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter + - file_saver (0.0.1): + - Flutter - Flutter (1.0.0) - flutter_image_compress (0.0.1): - Flutter @@ -60,15 +62,17 @@ PODS: - fluttertoast (0.0.2): - Flutter - Toast - - libwebp (1.1.0): - - libwebp/demux (= 1.1.0) - - libwebp/mux (= 1.1.0) - - libwebp/webp (= 1.1.0) - - libwebp/demux (1.1.0): + - image_gallery_saver (1.5.0): + - Flutter + - libwebp (1.2.0): + - libwebp/demux (= 1.2.0) + - libwebp/mux (= 1.2.0) + - libwebp/webp (= 1.2.0) + - libwebp/demux (1.2.0): - libwebp/webp - - libwebp/mux (1.1.0): + - libwebp/mux (1.2.0): - libwebp/demux - - libwebp/webp (1.1.0) + - libwebp/webp (1.2.0) - Mantle (2.1.6): - Mantle/extobjc (= 2.1.6) - Mantle/extobjc (2.1.6) @@ -82,19 +86,21 @@ PODS: - Flutter - receive_sharing_intent (0.0.1): - Flutter - - SDWebImage (5.9.1): - - SDWebImage/Core (= 5.9.1) - - SDWebImage/Core (5.9.1) - - SDWebImageWebPCoder (0.6.1): + - SDWebImage (5.11.1): + - SDWebImage/Core (= 5.11.1) + - SDWebImage/Core (5.11.1) + - SDWebImageWebPCoder (0.8.3): - libwebp (~> 1.0) - - SDWebImage/Core (~> 5.7) + - SDWebImage/Core (~> 5.10) - share (0.0.1): - Flutter + - share_plus (0.0.1): + - Flutter - shared_preferences_ios (0.0.1): - Flutter - - SwiftyGif (5.3.0) + - SwiftyGif (5.4.0) - Toast (4.0.0) - - url_launcher (0.0.1): + - url_launcher_ios (0.0.1): - Flutter - video_thumbnail (0.0.1): - Flutter @@ -110,20 +116,23 @@ DEPENDENCIES: - biometric_storage (from `.symlinks/plugins/biometric_storage/ios`) - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) + - file_saver (from `.symlinks/plugins/file_saver/ios`) - Flutter (from `Flutter`) - 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`) + - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`) - open_file (from `.symlinks/plugins/open_file/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`) - share (from `.symlinks/plugins/share/ios`) + - share_plus (from `.symlinks/plugins/share_plus/ios`) - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - - url_launcher (from `.symlinks/plugins/url_launcher/ios`) + - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) @@ -153,6 +162,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/emoji_picker_flutter/ios" file_picker: :path: ".symlinks/plugins/file_picker/ios" + file_saver: + :path: ".symlinks/plugins/file_saver/ios" Flutter: :path: Flutter flutter_image_compress: @@ -165,6 +176,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_qr_reader/ios" fluttertoast: :path: ".symlinks/plugins/fluttertoast/ios" + image_gallery_saver: + :path: ".symlinks/plugins/image_gallery_saver/ios" open_file: :path: ".symlinks/plugins/open_file/ios" package_info_plus: @@ -177,10 +190,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/receive_sharing_intent/ios" share: :path: ".symlinks/plugins/share/ios" + share_plus: + :path: ".symlinks/plugins/share_plus/ios" shared_preferences_ios: :path: ".symlinks/plugins/shared_preferences_ios/ios" - url_launcher: - :path: ".symlinks/plugins/url_launcher/ios" + url_launcher_ios: + :path: ".symlinks/plugins/url_launcher_ios/ios" video_thumbnail: :path: ".symlinks/plugins/video_thumbnail/ios" webview_flutter_wkwebview: @@ -196,29 +211,32 @@ SPEC CHECKSUMS: DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 emoji_picker_flutter: 4f9a1ac31d355e1bf9622a1e821a809149130127 file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1 + file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_image_compress: fd2b476345226e1a10ea352fa306af95704642c1 flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452 flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 flutter_qr_reader: d930dde3b2cfe2b3d0bb7d66e5ff3e514300a5e5 fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58 - libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3 + image_gallery_saver: 259eab68fb271cfd57d599904f7acdc7832e7ef2 + libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0 Mantle: 4c0ed6ce47c96eccc4dc3bb071deb3def0e2c3be open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1 - SDWebImage: a990c053fff71e388a10f3357edb0be17929c9c5 - SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21 + SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d + SDWebImageWebPCoder: bbf46e29fb8d1980a78ad3d5e9b4123c77f10ebc share: 0b2c3e82132f5888bccca3351c504d0003b3b410 + share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68 shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32 - SwiftyGif: e466e86c660d343357ab944a819a101c4127cb40 + SwiftyGif: 5d4af95df24caf1c570dbbcb32a3b8a0763bc6d7 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649 + url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1 webview_flutter_wkwebview: 005fbd90c888a42c5690919a1527ecc6649e1162 PODFILE CHECKSUM: be3641bcaef7a85afc04e2ed523c1b5ffa98afbe -COCOAPODS: 1.11.2 +COCOAPODS: 1.10.1 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4999cb11..895fcd38 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -11,12 +11,12 @@ 03729454251A04200081BDCF /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 03729452251A04200081BDCF /* MainInterface.storyboard */; }; 03729458251A04200081BDCF /* @mosphere-pro.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 0372944E251A04200081BDCF /* @mosphere-pro.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 208195073719489508891D0F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F1A96103C6528FA5E78D025 /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - F52D2A6F7A157591E645876D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D41AD47B24BC67C496F59F2 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -60,16 +60,15 @@ 03729455251A04200081BDCF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0372945E251A082B0081BDCF /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; 0372945F251A087A0081BDCF /* Share Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Share Extension.entitlements"; sourceTree = ""; }; - 12C4D14177182C6162B0C52A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 1D41AD47B24BC67C496F59F2 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 346CF991B90B14D9615185F4 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 586E126ADC90E37D9939D786 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 5F1A96103C6528FA5E78D025 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 961C2A261529605CAE2E6474 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 8FE04824983C909A4D6EA360 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -77,6 +76,7 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A5F179F25D48574C9915968B /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -91,7 +91,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F52D2A6F7A157591E645876D /* Pods_Runner.framework in Frameworks */, + 208195073719489508891D0F /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -109,10 +109,10 @@ path = "Share Extension"; sourceTree = ""; }; - 0525CFB2EC373040CC5963CC /* Frameworks */ = { + 0D74871C42ACA9B1B7C856DF /* Frameworks */ = { isa = PBXGroup; children = ( - 1D41AD47B24BC67C496F59F2 /* Pods_Runner.framework */, + 5F1A96103C6528FA5E78D025 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -131,9 +131,9 @@ 978D8E3BA80D7D0BD7F4B6D7 /* Pods */ = { isa = PBXGroup; children = ( - 961C2A261529605CAE2E6474 /* Pods-Runner.debug.xcconfig */, - 12C4D14177182C6162B0C52A /* Pods-Runner.release.xcconfig */, - 586E126ADC90E37D9939D786 /* Pods-Runner.profile.xcconfig */, + 346CF991B90B14D9615185F4 /* Pods-Runner.debug.xcconfig */, + 8FE04824983C909A4D6EA360 /* Pods-Runner.release.xcconfig */, + A5F179F25D48574C9915968B /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -146,7 +146,7 @@ 0372944F251A04200081BDCF /* Share Extension */, 97C146EF1CF9000F007C117D /* Products */, 978D8E3BA80D7D0BD7F4B6D7 /* Pods */, - 0525CFB2EC373040CC5963CC /* Frameworks */, + 0D74871C42ACA9B1B7C856DF /* Frameworks */, ); sourceTree = ""; }; @@ -199,7 +199,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 366A68814344846D1DC2B701 /* [CP] Check Pods Manifest.lock */, + AFBBCF384755CDC4E204A8DE /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -207,7 +207,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 03729459251A04200081BDCF /* Embed App Extensions */, - 8DD2D206E3F9D7A4B1365406 /* [CP] Embed Pods Frameworks */, + 0AC7ECA1F2B83361A66F3F07 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -280,26 +280,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 366A68814344846D1DC2B701 /* [CP] Check Pods Manifest.lock */ = { + 0AC7ECA1F2B83361A66F3F07 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { @@ -316,36 +311,41 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8DD2D206E3F9D7A4B1365406 /* [CP] Embed Pods Frameworks */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + inputPaths = ( ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + name = "Run Script"; + outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { + AFBBCF384755CDC4E204A8DE /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "Run Script"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/lib/screens/common_widgets/side_bar.dart b/lib/screens/common_widgets/side_bar.dart index 661ed3ef..4bd9f55b 100644 --- a/lib/screens/common_widgets/side_bar.dart +++ b/lib/screens/common_widgets/side_bar.dart @@ -349,7 +349,8 @@ class _SideBarWidgetState extends State { SideBarBackupItem( title: isExpanded ? TextStrings().sidebarBackupKey : '', leadingIcon: Icon(Icons.file_copy, - color: Color(0xFF757581), size: 21.toFont), + color: Color(0xFF757581), + size: (isTablet ? 24 : 21.toFont)), onPressed: () { BackupKeyWidget( atClientService: AtClientManager.getInstance().atClient, diff --git a/lib/screens/common_widgets/side_bar_list_item.dart b/lib/screens/common_widgets/side_bar_list_item.dart index 9daeece5..d0b11cb5 100644 --- a/lib/screens/common_widgets/side_bar_list_item.dart +++ b/lib/screens/common_widgets/side_bar_list_item.dart @@ -24,7 +24,8 @@ class SideBarItem extends StatelessWidget { Widget build(BuildContext context) { return InkWell( onTap: () { - if (_welcomeScreenProvider.isExpanded) { + if (SizeConfig().isMobile(context) || + _welcomeScreenProvider.isExpanded) { Navigator.pop(context); } Navigator.pushNamed(context, routeName, arguments: arguments ?? {}); @@ -35,7 +36,7 @@ class SideBarItem extends StatelessWidget { children: [ Image.asset( image, - height: 22.toHeight, + height: SizeConfig().isTablet(context) ? 24 : 22.toHeight, color: displayColor, ), SizedBox(width: 10), diff --git a/lib/screens/history/widgets/received_file_list_tile.dart b/lib/screens/history/widgets/received_file_list_tile.dart index 7ceed0ad..0ac1985f 100644 --- a/lib/screens/history/widgets/received_file_list_tile.dart +++ b/lib/screens/history/widgets/received_file_list_tile.dart @@ -257,7 +257,7 @@ class _ReceivedFilesListTileState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ Text( - '${widget.receivedHistory.files.length} Files', + '${widget.receivedHistory.files.length} File(s)', style: CustomTextStyles.secondaryRegular12, ), SizedBox(width: 10.toHeight), diff --git a/lib/screens/history/widgets/sent_file_list_tile.dart b/lib/screens/history/widgets/sent_file_list_tile.dart index 3e114a46..94294b52 100644 --- a/lib/screens/history/widgets/sent_file_list_tile.dart +++ b/lib/screens/history/widgets/sent_file_list_tile.dart @@ -229,7 +229,7 @@ class _SentFilesListTileState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ Text( - '${fileLength} Files', + '${fileLength} File(s)', style: CustomTextStyles.secondaryRegular12, ), SizedBox(width: 10.toHeight), diff --git a/lib/screens/home/home.dart b/lib/screens/home/home.dart index 6fe18fcc..dfcfea31 100644 --- a/lib/screens/home/home.dart +++ b/lib/screens/home/home.dart @@ -219,7 +219,7 @@ class _HomeState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - TextStrings().homeFileTransferItsSafe, + TextStrings().homeDescriptionMain, style: GoogleFonts.playfairDisplay( textStyle: TextStyle( fontSize: 38.toFont, @@ -231,22 +231,11 @@ class _HomeState extends State { SizedBox(height: 30.toHeight), Text.rich( TextSpan( - text: TextStrings().homeHassleFree, + text: TextStrings().homeDescriptionSub, style: TextStyle( fontSize: 15.toFont, fontWeight: FontWeight.bold, ), - children: [ - TextSpan( - text: TextStrings() - .homeWeWillSetupAccount, - style: TextStyle( - color: ColorConstants.fadedText, - fontSize: 15.toFont, - fontWeight: FontWeight.normal, - ), - ), - ], ), ) ], diff --git a/lib/screens/welcome_screen/widgets/welcome_screen_received_files.dart b/lib/screens/welcome_screen/widgets/welcome_screen_received_files.dart index 2b63b856..65c34a9c 100644 --- a/lib/screens/welcome_screen/widgets/welcome_screen_received_files.dart +++ b/lib/screens/welcome_screen/widgets/welcome_screen_received_files.dart @@ -20,7 +20,8 @@ class _WelcomeScreenReceivedFilesState historyProvider = Provider.of(context); return ProviderHandler( functionName: historyProvider.RECEIVED_HISTORY, - showError: true, + load: (provider) {}, + showError: false, successBuilder: (provider) => (provider.receivedHistoryLogs.isEmpty) ? Center( child: Text( diff --git a/lib/utils/text_strings.dart b/lib/utils/text_strings.dart index 65250984..0375ed66 100644 --- a/lib/utils/text_strings.dart +++ b/lib/utils/text_strings.dart @@ -4,9 +4,11 @@ class TextStrings { factory TextStrings() => _instance; // home screen texts - String homeFileTransferItsSafe = 'File transfer.\nIt’s safe!'; - String homeHassleFree = 'Hassle free.\n'; - String homeWeWillSetupAccount = 'We will set up your account right away.'; + // String homeFileTransferItsSafe = 'File transfer.\nIt’s safe!'; + // String homeHassleFree = 'Hassle free.\n'; + // String homeWeWillSetupAccount = 'We will set up your account right away.'; + String homeDescriptionMain = '100% encrypted file transfer'; + String homeDescriptionSub = 'From anywhere to everywhere!'; String appName = '@mosphere pro'; String copyRight = '© 2021 The @ Company'; diff --git a/pubspec.lock b/pubspec.lock index 585bd999..2181de92 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.2" + version: "3.1.6" args: dependency: transitive description: @@ -37,12 +37,12 @@ packages: source: hosted version: "2.8.1" at_backupkey_flutter: - dependency: "direct overridden" + dependency: transitive description: name: at_backupkey_flutter url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.1.1" at_base2e15: dependency: transitive description: @@ -63,56 +63,56 @@ packages: name: at_client_mobile url: "https://pub.dartlang.org" source: hosted - version: "3.1.1" + version: "3.1.2" at_common_flutter: dependency: "direct main" description: name: at_common_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.4" at_commons: dependency: "direct main" description: name: at_commons url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" at_contact: dependency: "direct main" description: name: at_contact url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" at_contacts_flutter: dependency: "direct main" description: name: at_contacts_flutter url: "https://pub.dartlang.org" source: hosted - version: "3.0.2" + version: "3.1.1" at_contacts_group_flutter: dependency: "direct main" description: name: at_contacts_group_flutter url: "https://pub.dartlang.org" source: hosted - version: "3.0.3" + version: "3.1.1" at_lookup: dependency: "direct main" description: name: at_lookup url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" + version: "3.0.5" at_onboarding_flutter: dependency: "direct main" description: name: at_onboarding_flutter url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" + version: "3.1.1" at_persistence_secondary_server: dependency: transitive description: @@ -147,7 +147,7 @@ packages: name: at_utils url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" biometric_storage: dependency: transitive description: @@ -204,6 +204,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.3.2" + cross_file: + dependency: transitive + description: + name: cross_file + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.2" crypto: dependency: transitive description: @@ -266,7 +273,56 @@ packages: name: file_picker url: "https://pub.dartlang.org" source: hosted - version: "4.2.4" + version: "4.2.7" + file_saver: + dependency: transitive + description: + name: file_saver + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.10" + file_selector: + dependency: transitive + description: + name: file_selector + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.2+1" + file_selector_linux: + dependency: transitive + description: + name: file_selector_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.2+1" + file_selector_macos: + dependency: transitive + description: + name: file_selector_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4+1" + file_selector_platform_interface: + dependency: transitive + description: + name: file_selector_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + file_selector_web: + dependency: transitive + description: + name: file_selector_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.1+2" + file_selector_windows: + dependency: transitive + description: + name: file_selector_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.2+1" filesystem_picker: dependency: "direct main" description: @@ -274,6 +330,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.0" + fixnum: + dependency: transitive + description: + name: fixnum + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" flutter: dependency: "direct main" description: flutter @@ -333,6 +396,13 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_toastr: + dependency: transitive + description: + name: flutter_toastr + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" flutter_web_plugins: dependency: transitive description: flutter @@ -380,6 +450,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.0.0" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" + image_gallery_saver: + dependency: "direct main" + description: + name: image_gallery_saver + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.1" internet_connection_checker: dependency: transitive description: @@ -569,6 +653,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.7.0" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "4.4.0" pin_code_fields: dependency: transitive description: @@ -646,6 +737,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.4" + share_plus: + dependency: transitive + description: + name: share_plus + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.4" + share_plus_linux: + dependency: transitive + description: + name: share_plus_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" + share_plus_macos: + dependency: transitive + description: + name: share_plus_macos + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + share_plus_platform_interface: + dependency: transitive + description: + name: share_plus_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + share_plus_web: + dependency: transitive + description: + name: share_plus_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.4" + share_plus_windows: + dependency: transitive + description: + name: share_plus_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.3" shared_preferences: dependency: transitive description: @@ -769,7 +902,21 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.15" + version: "6.0.17" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.13" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.13" url_launcher_linux: dependency: transitive description: @@ -868,6 +1015,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.2.0" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "5.3.1" yaml: dependency: transitive description: @@ -875,6 +1029,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.0" + zxing2: + dependency: transitive + description: + name: zxing2 + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.0" sdks: dart: ">=2.14.0 <3.0.0" flutter: ">=2.5.0"