From 68649d39b6b8cd8666a3fa16b9df21e3e81c797f Mon Sep 17 00:00:00 2001 From: Tanmoy karmakar Date: Sun, 2 Oct 2022 11:05:40 +0530 Subject: [PATCH 1/6] Added settings page Terms and condition button --- assets/images/termsAndConditions.png | Bin 1621 -> 1693 bytes ios/Podfile.lock | 8 +-- ios/Runner.xcodeproj/project.pbxproj | 64 +++++++++--------- .../widgets/setting_page_button.dart | 47 +++++++++++++ .../widgets/welcome_sceen_home.dart | 19 +++--- lib/utils/colors.dart | 2 + 6 files changed, 93 insertions(+), 47 deletions(-) create mode 100644 lib/screens/welcome_screen/widgets/setting_page_button.dart diff --git a/assets/images/termsAndConditions.png b/assets/images/termsAndConditions.png index 8581d538483e728fff459fa2d2463189280dd214..644881528ac7f1a7d54c66e425657d629172bc5b 100644 GIT binary patch literal 1693 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 Pm-p`J=7Vdv7?SmGvEutT diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 18b6777e..3ef48140 100644 --- 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: @@ -219,7 +214,6 @@ SPEC CHECKSUMS: 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 index fc1e35ee..d5c94b8d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -10,13 +10,13 @@ 03729451251A04200081BDCF /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03729450251A04200081BDCF /* ShareViewController.swift */; }; 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, ); }; }; - 0BDCBEE0D322301A1EF0869E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B1C35B7369486DE1AB7F3C72 /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 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 */; }; + A22C357F66BE84164C6231A6 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06F50C4A86344C6DBD297C6E /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -60,15 +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 = ""; }; + 06F50C4A86344C6DBD297C6E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 4F69A74C18BAFFE4AEA79529 /* 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 = ""; }; - 655888FAAB2B85959C2880D1 /* 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 = ""; }; + 45211ED657BA2DDD51C32096 /* 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 = ""; }; 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 = ""; }; - 8236931B8D27443DDF5E8751 /* 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 = ""; }; + 936BF752DA44252CFFD59242 /* 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 = ""; }; 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; }; @@ -76,7 +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 = ""; }; - B1C35B7369486DE1AB7F3C72 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B984AA408AD32B13E6AEA940 /* 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -91,7 +91,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0BDCBEE0D322301A1EF0869E /* Pods_Runner.framework in Frameworks */, + A22C357F66BE84164C6231A6 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -109,10 +109,10 @@ path = "Share Extension"; sourceTree = ""; }; - 75DCE734B469EA1865970A11 /* Frameworks */ = { + 6A4FCF7678CD1FD694F0B3D8 /* Frameworks */ = { isa = PBXGroup; children = ( - B1C35B7369486DE1AB7F3C72 /* Pods_Runner.framework */, + 06F50C4A86344C6DBD297C6E /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -131,9 +131,9 @@ 978D8E3BA80D7D0BD7F4B6D7 /* Pods */ = { isa = PBXGroup; children = ( - 4F69A74C18BAFFE4AEA79529 /* Pods-Runner.debug.xcconfig */, - 655888FAAB2B85959C2880D1 /* Pods-Runner.release.xcconfig */, - 8236931B8D27443DDF5E8751 /* Pods-Runner.profile.xcconfig */, + 936BF752DA44252CFFD59242 /* Pods-Runner.debug.xcconfig */, + B984AA408AD32B13E6AEA940 /* Pods-Runner.release.xcconfig */, + 45211ED657BA2DDD51C32096 /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -146,7 +146,7 @@ 0372944F251A04200081BDCF /* Share Extension */, 97C146EF1CF9000F007C117D /* Products */, 978D8E3BA80D7D0BD7F4B6D7 /* Pods */, - 75DCE734B469EA1865970A11 /* Frameworks */, + 6A4FCF7678CD1FD694F0B3D8 /* Frameworks */, ); sourceTree = ""; }; @@ -199,7 +199,7 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - CF87B4D9A3D8128EF27369B4 /* [CP] Check Pods Manifest.lock */, + 22F5EF24F4C1B21F2E181589 /* [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 */, - CDE842460B64DBF139B1781B /* [CP] Embed Pods Frameworks */, + 6CB03256DD0BC5BE5F651133 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -280,35 +280,43 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 22F5EF24F4C1B21F2E181589 /* [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 = "Thin Binary"; 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\" embed_and_thin"; + 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; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Run Script"; + name = "Thin Binary"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - CDE842460B64DBF139B1781B /* [CP] Embed Pods Frameworks */ = { + 6CB03256DD0BC5BE5F651133 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -325,27 +333,19 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - CF87B4D9A3D8128EF27369B4 /* [CP] Check Pods Manifest.lock */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { 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 = "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; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/lib/screens/welcome_screen/widgets/setting_page_button.dart b/lib/screens/welcome_screen/widgets/setting_page_button.dart new file mode 100644 index 00000000..bfa384e9 --- /dev/null +++ b/lib/screens/welcome_screen/widgets/setting_page_button.dart @@ -0,0 +1,47 @@ +import 'package:at_backupkey_flutter/utils/size_config.dart'; +import 'package:atsign_atmosphere_pro/utils/colors.dart'; +import 'package:flutter/material.dart'; + +class SettingPageButton extends StatelessWidget { + final String title; + final String iconPath; + const SettingPageButton({required this.iconPath, required this.title}); + + @override + Widget build(BuildContext context) { + SizeConfig().init(context); + return Container( + height: 62.toHeight, + width: 344.toWidth, + decoration: BoxDecoration( + color: ColorConstants.buttonBackgroundColor, + border: Border.all( + color: ColorConstants.buttonBorderColor, + width: 1, + ), + borderRadius: BorderRadius.circular(10), + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.only( + left: 30.0.toWidth, + right: 25.toWidth, + ), + child: Image.asset( + iconPath, + height: 28.33.toHeight, + ), + ), + Text( + title, + style: TextStyle( + fontSize: 18.toFont, + color: ColorConstants.buttonBorderColor, + fontWeight: FontWeight.w600, + ), + ) + ], + )); + } +} diff --git a/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart b/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart index 1f3dcb84..d86bbd41 100644 --- a/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart +++ b/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart @@ -9,10 +9,12 @@ import 'package:atsign_atmosphere_pro/screens/common_widgets/switch_at_sign.dart import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/overlapping_contacts.dart'; import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/select_contact_widget.dart'; import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/select_file_widget.dart'; +import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/setting_page_button.dart'; import 'package:atsign_atmosphere_pro/services/backend_service.dart'; import 'package:at_common_flutter/services/size_config.dart'; import 'package:atsign_atmosphere_pro/services/navigation_service.dart'; import 'package:atsign_atmosphere_pro/utils/colors.dart'; +import 'package:atsign_atmosphere_pro/utils/images.dart'; import 'package:atsign_atmosphere_pro/utils/text_strings.dart'; import 'package:atsign_atmosphere_pro/view_models/file_transfer_provider.dart'; import 'package:atsign_atmosphere_pro/view_models/history_provider.dart'; @@ -126,6 +128,13 @@ class _WelcomeScreenHomeState extends State { SizedBox( height: 20.toHeight, ), + SettingPageButton( + iconPath: ImageConstants.termsAndConditionsIcon, + title: "Terms & Conditions", + ), + SizedBox( + height: 20.toHeight, + ), SelectContactWidget( (b) { setState(() { @@ -178,16 +187,12 @@ class _WelcomeScreenHomeState extends State { ), SizedBox( height: (_welcomeScreenProvider - .selectedContacts != - null && - _welcomeScreenProvider .selectedContacts.isNotEmpty && filePickerModel.selectedFiles.isNotEmpty) ? 20.toHeight : 60.toHeight, ), - (_welcomeScreenProvider.selectedContacts != null && - _welcomeScreenProvider + (_welcomeScreenProvider .selectedContacts.isNotEmpty && filePickerModel.selectedFiles.isNotEmpty) ? Container( @@ -265,9 +270,7 @@ class _WelcomeScreenHomeState extends State { SizedBox( height: 30.toHeight, ), - if (_welcomeScreenProvider.selectedContacts != - null && - _welcomeScreenProvider + if (_welcomeScreenProvider .selectedContacts.isNotEmpty && filePickerModel.selectedFiles.isNotEmpty) ...[ Row( diff --git a/lib/utils/colors.dart b/lib/utils/colors.dart index 45ee0b55..1331648d 100644 --- a/lib/utils/colors.dart +++ b/lib/utils/colors.dart @@ -32,6 +32,8 @@ class ColorConstants { static const Color light_border_color = Color(0xFFEEF1F4); static const Color textBoxBg = Color(0xFFF2F2F2); static const Color lightBlueBg = Color(0xFFF8FBFF); + static const Color buttonBorderColor = Color(0xFF939393); + static const Color buttonBackgroundColor = Color(0xFFF1F1F1); } class ContactInitialsColors { From 8ef87c08c1a21735de24986b6739061abd0f840f Mon Sep 17 00:00:00 2001 From: Tanmoy karmakar Date: Sun, 2 Oct 2022 11:06:46 +0530 Subject: [PATCH 2/6] removed terms widget from welcome page --- .../welcome_screen/widgets/welcome_sceen_home.dart | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart b/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart index d86bbd41..623e2b2b 100644 --- a/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart +++ b/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart @@ -9,12 +9,10 @@ import 'package:atsign_atmosphere_pro/screens/common_widgets/switch_at_sign.dart import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/overlapping_contacts.dart'; import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/select_contact_widget.dart'; import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/select_file_widget.dart'; -import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/setting_page_button.dart'; import 'package:atsign_atmosphere_pro/services/backend_service.dart'; import 'package:at_common_flutter/services/size_config.dart'; import 'package:atsign_atmosphere_pro/services/navigation_service.dart'; import 'package:atsign_atmosphere_pro/utils/colors.dart'; -import 'package:atsign_atmosphere_pro/utils/images.dart'; import 'package:atsign_atmosphere_pro/utils/text_strings.dart'; import 'package:atsign_atmosphere_pro/view_models/file_transfer_provider.dart'; import 'package:atsign_atmosphere_pro/view_models/history_provider.dart'; @@ -128,13 +126,6 @@ class _WelcomeScreenHomeState extends State { SizedBox( height: 20.toHeight, ), - SettingPageButton( - iconPath: ImageConstants.termsAndConditionsIcon, - title: "Terms & Conditions", - ), - SizedBox( - height: 20.toHeight, - ), SelectContactWidget( (b) { setState(() { From ed19a05383c99ae0948bc37bba7795364c231dd4 Mon Sep 17 00:00:00 2001 From: Tanmoy karmakar Date: Thu, 6 Oct 2022 23:25:53 +0530 Subject: [PATCH 3/6] added block atsign sheet --- assets/images/down_arrow.png | Bin 0 -> 756 bytes assets/images/reload.png | Bin 0 -> 1604 bytes .../widgets/welcome_sceen_home.dart | 224 +++++++++++++++++- lib/utils/colors.dart | 2 + lib/utils/images.dart | 2 + 5 files changed, 220 insertions(+), 8 deletions(-) create mode 100644 assets/images/down_arrow.png create mode 100644 assets/images/reload.png diff --git a/assets/images/down_arrow.png b/assets/images/down_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..f15e5ad8fd7c2646af4edf8ebdd0e34178a7c2a5 GIT binary patch literal 756 zcmeAS@N?(olHy`uVBq!ia0vp^IzVj3!3HGvoUHx>q&N#aB8!3I-XP4l)OOlRpde#$ zkh>GZx^prwfgF}}M_)$E)e-c?47??UeT^vIy7~jsiUwF$w;8?iS!jsCX6S#7; zI%1vVgpaUo`Z)vV`Y*pM{i2hb zr(&MCY5&EnX2uAX#d{PD4yw%H*PbCw1ezVLe&cq1WGKE#Y zLFaVZj`M%|zRluish&4~azs^M^JbI3WkM|S&p-IQ5i97NmG(tS{A0b>73*gPRyExn zmrPD)HcQQu=z3Y%JllF>dCAF#!7)F-26wGH`YZc*q2H|J?@gK3@|P2|XE%h+Q#%l2 z#hRwUwoUp|d-(2W39Y9u*&c82ed98V!9Jj`QkGHJ!rZj5s7CAVL2;))HUctj^4lB@ zB$Mye1o~@Fi!A#q$rF5DGwhY|k?Wgu&MmR*c`3N?h4<5F*R2PxMl>k~6JXEk&KauLU z;qkPp>LrQ)6IQQ%xczQh*Tp5xTPzumYH^k8WV@98(sewVamsO*1>@00GcH9GsQl>d z$b1yH;#gr$U}*jQM@#d{?7}U!T@@9#bPN;`6rEmFSHYrD)p)S?@vB)>&TwS7_F+(&nqidaqU~(wVe40%lrP9pT6(=tI)UpqUx%z8yB7A zEIGP#(RcekGxmuWpRri=+mdKI;Vst0Bf{EasU7T literal 0 HcmV?d00001 diff --git a/assets/images/reload.png b/assets/images/reload.png new file mode 100644 index 0000000000000000000000000000000000000000..2db5e3ab0aba3e75668d70d3a8d3ee3a6b2b9e6e GIT binary patch literal 1604 zcmV-K2D|x*P)@~0drDELIAGL9O(c600d`2O+f$vv5yPeS-F!0M7}=5x|Pyyl1i; zw#Sm{E7Pui5fx>SRH}MPrBazGkze=)8|K6_E-x>`*VoquuJG;ctuc6!xw#&0y@iE^ z?&juZSEhtY3AwtuYCJqVMEJ?;6Rr?fBW3drNa}#N?~99zZC@mnP6$c3zrWwW$E?Xa z5oMtRi8`s8oYDwUY1qTheMv6`xd5`S=jZ2JE@F~*0+Ae`9wpAzt}r1(M8x75He#r& zUS3{qK}I;%ri(VKCQK0iO-7#sODOZ^p7L1qcTXhb06hkP6|`p}UdmKK{HGnQqN5Ka-?j-?>* z^1UDkXm@mn{@u4tFvp83Z1z(=-0!gu^^V-!0F2M0Y<-J_$U28=U` zbcA-F&@Phfh$SadtulGYpcLSPPC&r1jQ|%wPzZuH@Vqa0UMMADXJ=>Pw>t^RN`_8{ z*7o*x;i)x_)6>%p+z!hi#zcr!se+7k$tD>mSo@c&AcNT5-Mz;1SJ{tL1fztQ44X+n zoi0YL3D(=<30&>a?^RxDF-eF~sj8h3iUWA5zd_tO^h8%YK=(?NT&_q|)S;A!iG=9# z8i@l+MpQ&;W&x%4@$vDtOyxR`U{a^(aNpI?HyH$_Hq8_+f?z_Yv8z++44o$4$hf$; z=-VbzF-8cXbl~>I)rgwjm(EB)FPnJ42qBb?6m43*$sq7o%F3v^XJ z0Msa3$+9!1bi-fL+1lFb*y{BOQHRf+p%vP=#X`5r66ca zP0%L zzm8|LWkx`!xyktjX*p(0C{V|6+fb?N({bzpk)^C3AWKYl?jlFF#N5oO%YT+&T|l5q z!Vzt%QL=E_d0tfk`s1r+Hkt5w#Otn3n6AtyK*n#5D!p2*GOq9iGZMU~Wljs4Rq(H^ z4s_}7wUH1_v9O`XJzJfoOk^vh#maka2yv_~gFRa<2%*o|o_u);{2OaWv<&9%2K<5HIu(Z4tcOwXYzTp3 z2*BKpmd|W~Ea~TzS`gPXmCso^F`ITNkoH_$5$JMGGNKI4R&6@1GD7+fM~DL>at&X^ zO_{`Kf=?_dmenz|Tsd-;5;ExIJ@(V)aS>NalL>m*k;`dTiAc~&lQ8IokdY3R93D_+ z&ezh?Qn%S`{!j5H1ZXZ94?#zg|M+VwZT4glLb!$>N=X>b9W67Lotcwaj;rLhLzMBB zlmwEHTv7tK?BlkY_3Vy~ke;iIq(HeX+cJZv0gXETna4u5*&$SZk)gxEc3G{xWlXVH zN}NJ@P{#2#qlD0SnKbgIJwPHYG8QBD0i7PLGLE-dU11vQjWtWLfsSv|oU%;XNp?FS z6UsXIIgCmpcO(W&YXmXgOX2lS4eAIi+uy3#EByyT* { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - TextStrings().welcome, - semanticsLabel: TextStrings().welcome, - style: GoogleFonts.playfairDisplay( - textStyle: TextStyle( - fontSize: 26.toFont, - fontWeight: FontWeight.w800, - height: 1.3, + InkWell( + onTap: () { + blockedAtSignsSheet(context); + }, + child: Text( + TextStrings().welcome, + semanticsLabel: TextStrings().welcome, + style: GoogleFonts.playfairDisplay( + textStyle: TextStyle( + fontSize: 26.toFont, + fontWeight: FontWeight.w800, + height: 1.3, + ), ), ), ), @@ -370,6 +376,208 @@ class _WelcomeScreenHomeState extends State { )); } + Future blockedAtSignsSheet(BuildContext context) { + return showModalBottomSheet( + isScrollControlled: true, + backgroundColor: Colors.transparent, + context: context, + builder: (context) { + return Container( + height: MediaQuery.of(context).size.height * 0.9, + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(20), + topRight: Radius.circular(20), + ), + color: Colors.white, + ), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 27.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top: 23, bottom: 7), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 45.toWidth, + height: 2.toHeight, + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.circular(2), + ), + ), + Container( + width: 106.toWidth, + height: 31.toHeight, + decoration: BoxDecoration( + border: Border.all( + width: 1, + color: ColorConstants.buttonBorderColor, + ), + borderRadius: BorderRadius.circular(28), + ), + child: Center( + child: Text( + "Close", + style: TextStyle( + fontSize: 17.toFont, + color: ColorConstants.buttonBorderColor, + fontWeight: FontWeight.w600, + ), + ), + ), + ) + ], + ), + ), + Text( + "Blocked atSigns", + style: TextStyle( + fontWeight: FontWeight.bold, fontSize: 25.toFont), + ), + SizedBox(height: 30.toHeight), + Container( + height: 95.toHeight, + decoration: BoxDecoration( + color: ColorConstants.buttonBackgroundColor, + borderRadius: BorderRadius.circular(8), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Text( + "Refresh", + style: TextStyle( + color: ColorConstants.greyTextColor, + fontWeight: FontWeight.w600, + fontSize: 14.toFont, + ), + ), + Container( + width: 48.toWidth, + height: 48.toWidth, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + border: Border.all( + color: ColorConstants.buttonBorderColor, + ), + color: Colors.white, + ), + child: Center( + child: Image.asset( + ImageConstants.reload, + width: 17.toWidth, + ), + ), + ) + ], + ), + Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Search", + style: TextStyle( + color: ColorConstants.greyTextColor, + fontWeight: FontWeight.w600, + fontSize: 14.toFont, + ), + ), + Container( + width: 235.toWidth, + height: 48.toWidth, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + border: Border.all( + color: ColorConstants.buttonBorderColor, + ), + color: Colors.white, + ), + child: Center( + child: Row( + children: [ + Expanded( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: TextField( + decoration: InputDecoration.collapsed( + hintText: + "Search History by atSign", + ), + ), + ), + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Icon(Icons.search), + ), + ], + ), + ), + ), + ], + ) + ], + ), + ), + SizedBox( + height: 27.toHeight, + ), + Expanded( + child: Container( + child: Column( + children: [ + Container( + height: 37.toHeight, + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + topRight: Radius.circular(10), + ), + color: ColorConstants.lightGrey, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.only( + left: 24.0.toWidth, + right: 6.toWidth, + ), + child: Text( + "atSign", + style: TextStyle( + fontSize: 15.toFont, + fontWeight: FontWeight.w500, + color: ColorConstants.greyTextColor, + ), + ), + ), + Image.asset( + ImageConstants.downArrow, + width: 11.toWidth, + ), + ], + ), + ), + ], + ), + ), + ), + ], + ), + ), + ); + }); + } + scrollToBottom() { Timer( Duration(milliseconds: 200), diff --git a/lib/utils/colors.dart b/lib/utils/colors.dart index 1331648d..b64fbfe5 100644 --- a/lib/utils/colors.dart +++ b/lib/utils/colors.dart @@ -34,6 +34,8 @@ class ColorConstants { static const Color lightBlueBg = Color(0xFFF8FBFF); static const Color buttonBorderColor = Color(0xFF939393); static const Color buttonBackgroundColor = Color(0xFFF1F1F1); + static const Color greyTextColor = Color(0xffA4A4A5); + static const Color lightGrey = Color(0xffF2F2F2); } class ContactInitialsColors { diff --git a/lib/utils/images.dart b/lib/utils/images.dart index 644c93c2..6b8168a2 100644 --- a/lib/utils/images.dart +++ b/lib/utils/images.dart @@ -40,6 +40,8 @@ class ImageConstants { static String myFiles = '$_basePath/my_files.png'; static String groups = '$_basePath/groups.png'; static String contactUs = '$_basePath/contactUs.png'; + static String reload = "$_basePath/reload.png"; + static String downArrow = "$_basePath/down_arrow.png"; // TEST FILE DELETE WHEN IN PRODUCTION static String test = '$_basePath/test.jpg'; From 6b79e8f36b3bdd1ec2b0bd0813383e092f9639da Mon Sep 17 00:00:00 2001 From: Tanmoy karmakar Date: Fri, 7 Oct 2022 23:29:51 +0530 Subject: [PATCH 4/6] added the bottom sheet for block atsign --- assets/images/block.png | Bin 0 -> 1859 bytes .../widgets/blocked_at_sign_sheet.dart | 207 ++++++++++++++++++ .../widgets/blocked_at_sign_widget.dart | 61 ++++++ .../widgets/welcome_sceen_home.dart | 204 +---------------- lib/utils/images.dart | 1 + 5 files changed, 270 insertions(+), 203 deletions(-) create mode 100644 assets/images/block.png create mode 100644 lib/screens/welcome_screen/widgets/blocked_at_sign_sheet.dart create mode 100644 lib/screens/welcome_screen/widgets/blocked_at_sign_widget.dart diff --git a/assets/images/block.png b/assets/images/block.png new file mode 100644 index 0000000000000000000000000000000000000000..c9b9ca22e188682afe1d928ca72c3eb5a63251ea GIT binary patch literal 1859 zcmV-J2fX-+P)@~0drDELIAGL9O(c600d`2O+f$vv5yPgF=uF-N9NKOI`(JCQ56S0c~U2&dA(OnZ_S|jA;^gR)A1^pAT z3u7@y_lr5yKx0DCDq@xCTl}Umydq$XnPZH(u4*lf2%&(fa{UGBSw#w3Eil;rOA3N9 zAlOGJ{!IN&J~ zG_Gk6GZS4Nl2jutjSUO5`=RZDJhi+d6^#HY7H|%)7FV_ zVfn{+CMAaA%G>*=4{RH#0I6kIBCfh5q6}j(Ib5L?Ohau$mLeuZNJff5?6)qb)*PhP z!jU2(WcmAeq9UUv94Mlnv@u(30y7QB^;ZaxV#m7J{X9sBqyvm8-(aA|eYr>()^cf` zL^0wS=N=d4?_$g&=2o)iUv^*M8wda=T{koz@LfL?876g*X_E1G>#^Vp8pj(C@1IWa z`bmJ4p_xzuoRmL|fa?@}5{gx-56Ph{BhvatsSO!x;Eb8bqA`(Mz$Ui>&bIW7i zHLg+wC?8fa<1lW*OTU@bmPqlA5ufqKCaMg)gy5=`BrNt_Hw&l(1klnV(ubrxF8Z64 zk7++d$v$8G!$}BP2X;F1eFK{6yzXkU32$0j62^3#9KuzsJjP5DS%AlN6);v}^1qG?UYT|IXV)M_2}pk`ogs&;1f_hs zM+i>QfA!r!c?{?g0!0Cxs}Gf2xUdrUcWIbx5n}2lzRVORclwMSB1Hj=XMZj#y(HsS z8Wx_*!)*)6{drNGBHuwz5G%^(#TC>5-uvjg7VWh3FNOwQR$GNcQE2^yWSm1?Fs{Ev z2+HkGo_1+p?jlhXTt9I^HVFGHPPN$$s%{I>>KS@Kn~D+wD&~{x^EDw9#Jo2vT;g{O zNk*=+qHs{|RdCrt{B;k_ETLNfsaueY8j1q^7bdQcBaorHta+g*w_KYhiozfeLo)GR zjn*JdPc~ANijZ1JH^?-(K+LpgtSD8nAw+lQ7B0L@-@8+Q8>ENG;%^9f!xB=b(CkH# z0#vLU*!oTa-NE@xWtU072i0DDq4a`CQMxX6d7i0E2xlQNv;Y%CqoAT(cc3VHP+B|P zbxlZ-Tv3VhX4*B_5G6%n<~z8e?tu&g<(`#qsf;N)xiK^a+vQWWgG zH$^FT%ha6mOg-)qVkbnw3YQPkqLNmM-Rso_Y^6W;Tuvyx;9T5E>!2<~IuC7WI>@ep z&~AoR&B?vm4OF2D5@M`Gv)dj_@Z5?gk-Oeu z-oODAMONe4-p#;f%*-3rY=J5+lVUfflu1nO>U9P^W3?#{xByR!$(`K{!4#q%7cX7$!wF$%4nzoLbR9;+m-YZF4iK~6A;-9Wvpd}5BTYxT`k;$4RjHN blockedAtSignsSheet(BuildContext context) { + return showModalBottomSheet( + isScrollControlled: true, + backgroundColor: Colors.transparent, + context: context, + builder: (context) { + return Container( + height: MediaQuery.of(context).size.height * 0.9, + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(20), + topRight: Radius.circular(20), + ), + color: Colors.white, + ), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 27.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top: 23, bottom: 7), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 45.toWidth, + height: 2.toHeight, + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.circular(2), + ), + ), + Container( + width: 106.toWidth, + height: 31.toHeight, + decoration: BoxDecoration( + border: Border.all( + width: 1, + color: ColorConstants.buttonBorderColor, + ), + borderRadius: BorderRadius.circular(28), + ), + child: Center( + child: Text( + "Close", + style: TextStyle( + fontSize: 17.toFont, + color: ColorConstants.buttonBorderColor, + fontWeight: FontWeight.w600, + ), + ), + ), + ) + ], + ), + ), + Text( + "Blocked atSigns", + style: TextStyle( + fontWeight: FontWeight.bold, fontSize: 25.toFont), + ), + SizedBox(height: 30.toHeight), + Container( + height: 95.toHeight, + decoration: BoxDecoration( + color: ColorConstants.buttonBackgroundColor, + borderRadius: BorderRadius.circular(8), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Text( + "Refresh", + style: TextStyle( + color: ColorConstants.greyTextColor, + fontWeight: FontWeight.w600, + fontSize: 14.toFont, + ), + ), + Container( + width: 48.toWidth, + height: 48.toWidth, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + border: Border.all( + color: ColorConstants.buttonBorderColor, + ), + color: Colors.white, + ), + child: Center( + child: Image.asset( + ImageConstants.reload, + width: 17.toWidth, + ), + ), + ) + ], + ), + Column( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Search", + style: TextStyle( + color: ColorConstants.greyTextColor, + fontWeight: FontWeight.w600, + fontSize: 14.toFont, + ), + ), + Container( + width: 235.toWidth, + height: 48.toWidth, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + border: Border.all( + color: ColorConstants.buttonBorderColor, + ), + color: Colors.white, + ), + child: Center( + child: Row( + children: [ + Expanded( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: TextField( + decoration: InputDecoration.collapsed( + hintText: "Search History by atSign", + ), + ), + ), + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Icon(Icons.search), + ), + ], + ), + ), + ), + ], + ) + ], + ), + ), + SizedBox( + height: 27.toHeight, + ), + Expanded( + child: Container( + child: Column( + children: [ + Container( + height: 37.toHeight, + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + topRight: Radius.circular(10), + ), + color: ColorConstants.lightGrey, + ), + child: Row( + children: [ + Padding( + padding: EdgeInsets.only( + left: 24.0.toWidth, + right: 6.toWidth, + ), + child: Text( + "atSign", + style: TextStyle( + fontSize: 15.toFont, + fontWeight: FontWeight.w500, + color: ColorConstants.greyTextColor, + ), + ), + ), + Image.asset( + ImageConstants.downArrow, + width: 11.toWidth, + ), + ], + ), + ), + BlockedAtSignWidget() + ], + ), + ), + ), + ], + ), + ), + ); + }); +} diff --git a/lib/screens/welcome_screen/widgets/blocked_at_sign_widget.dart b/lib/screens/welcome_screen/widgets/blocked_at_sign_widget.dart new file mode 100644 index 00000000..904b200e --- /dev/null +++ b/lib/screens/welcome_screen/widgets/blocked_at_sign_widget.dart @@ -0,0 +1,61 @@ +import 'package:at_backupkey_flutter/utils/size_config.dart'; +import 'package:atsign_atmosphere_pro/utils/colors.dart'; +import 'package:atsign_atmosphere_pro/utils/images.dart'; +import 'package:flutter/material.dart'; + +class BlockedAtSignWidget extends StatelessWidget { + const BlockedAtSignWidget({ + Key? key, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + SizeConfig().init(context); + return Container( + height: 58.toHeight, + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + color: ColorConstants.buttonBorderColor, + ), + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Text( + "@airplanes45", + style: TextStyle( + fontWeight: FontWeight.w500, + fontSize: 13.toFont, + ), + ), + Container( + height: 31.toHeight, + width: 118.toWidth, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(15), + border: Border.all(color: ColorConstants.lightGrey), + color: ColorConstants.buttonBackgroundColor, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Text( + "Unblock?", + style: TextStyle( + fontWeight: FontWeight.w600, + fontSize: 13.toFont, + ), + ), + Image.asset( + ImageConstants.block, + height: 16.toHeight, + ), + ], + )) + ], + ), + ); + } +} diff --git a/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart b/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart index 8bc8d329..fb540e7b 100644 --- a/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart +++ b/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart @@ -6,6 +6,7 @@ import 'package:atsign_atmosphere_pro/screens/common_widgets/common_button.dart' import 'package:atsign_atmosphere_pro/screens/common_widgets/custom_heading.dart'; import 'package:atsign_atmosphere_pro/screens/common_widgets/side_bar.dart'; import 'package:atsign_atmosphere_pro/screens/common_widgets/switch_at_sign.dart'; +import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/blocked_at_sign_sheet.dart'; import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/overlapping_contacts.dart'; import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/select_contact_widget.dart'; import 'package:atsign_atmosphere_pro/screens/welcome_screen/widgets/select_file_widget.dart'; @@ -13,7 +14,6 @@ import 'package:atsign_atmosphere_pro/services/backend_service.dart'; import 'package:at_common_flutter/services/size_config.dart'; import 'package:atsign_atmosphere_pro/services/navigation_service.dart'; import 'package:atsign_atmosphere_pro/utils/colors.dart'; -import 'package:atsign_atmosphere_pro/utils/images.dart'; import 'package:atsign_atmosphere_pro/utils/text_strings.dart'; import 'package:atsign_atmosphere_pro/view_models/file_transfer_provider.dart'; import 'package:atsign_atmosphere_pro/view_models/history_provider.dart'; @@ -376,208 +376,6 @@ class _WelcomeScreenHomeState extends State { )); } - Future blockedAtSignsSheet(BuildContext context) { - return showModalBottomSheet( - isScrollControlled: true, - backgroundColor: Colors.transparent, - context: context, - builder: (context) { - return Container( - height: MediaQuery.of(context).size.height * 0.9, - decoration: BoxDecoration( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(20), - topRight: Radius.circular(20), - ), - color: Colors.white, - ), - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 27.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top: 23, bottom: 7), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - width: 45.toWidth, - height: 2.toHeight, - decoration: BoxDecoration( - color: Colors.black, - borderRadius: BorderRadius.circular(2), - ), - ), - Container( - width: 106.toWidth, - height: 31.toHeight, - decoration: BoxDecoration( - border: Border.all( - width: 1, - color: ColorConstants.buttonBorderColor, - ), - borderRadius: BorderRadius.circular(28), - ), - child: Center( - child: Text( - "Close", - style: TextStyle( - fontSize: 17.toFont, - color: ColorConstants.buttonBorderColor, - fontWeight: FontWeight.w600, - ), - ), - ), - ) - ], - ), - ), - Text( - "Blocked atSigns", - style: TextStyle( - fontWeight: FontWeight.bold, fontSize: 25.toFont), - ), - SizedBox(height: 30.toHeight), - Container( - height: 95.toHeight, - decoration: BoxDecoration( - color: ColorConstants.buttonBackgroundColor, - borderRadius: BorderRadius.circular(8), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Text( - "Refresh", - style: TextStyle( - color: ColorConstants.greyTextColor, - fontWeight: FontWeight.w600, - fontSize: 14.toFont, - ), - ), - Container( - width: 48.toWidth, - height: 48.toWidth, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10), - border: Border.all( - color: ColorConstants.buttonBorderColor, - ), - color: Colors.white, - ), - child: Center( - child: Image.asset( - ImageConstants.reload, - width: 17.toWidth, - ), - ), - ) - ], - ), - Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Search", - style: TextStyle( - color: ColorConstants.greyTextColor, - fontWeight: FontWeight.w600, - fontSize: 14.toFont, - ), - ), - Container( - width: 235.toWidth, - height: 48.toWidth, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10), - border: Border.all( - color: ColorConstants.buttonBorderColor, - ), - color: Colors.white, - ), - child: Center( - child: Row( - children: [ - Expanded( - child: Padding( - padding: const EdgeInsets.all(8.0), - child: TextField( - decoration: InputDecoration.collapsed( - hintText: - "Search History by atSign", - ), - ), - ), - ), - Padding( - padding: const EdgeInsets.all(8.0), - child: Icon(Icons.search), - ), - ], - ), - ), - ), - ], - ) - ], - ), - ), - SizedBox( - height: 27.toHeight, - ), - Expanded( - child: Container( - child: Column( - children: [ - Container( - height: 37.toHeight, - decoration: BoxDecoration( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(10), - topRight: Radius.circular(10), - ), - color: ColorConstants.lightGrey, - ), - child: Row( - children: [ - Padding( - padding: EdgeInsets.only( - left: 24.0.toWidth, - right: 6.toWidth, - ), - child: Text( - "atSign", - style: TextStyle( - fontSize: 15.toFont, - fontWeight: FontWeight.w500, - color: ColorConstants.greyTextColor, - ), - ), - ), - Image.asset( - ImageConstants.downArrow, - width: 11.toWidth, - ), - ], - ), - ), - ], - ), - ), - ), - ], - ), - ), - ); - }); - } - scrollToBottom() { Timer( Duration(milliseconds: 200), diff --git a/lib/utils/images.dart b/lib/utils/images.dart index 6b8168a2..0bbe1706 100644 --- a/lib/utils/images.dart +++ b/lib/utils/images.dart @@ -42,6 +42,7 @@ class ImageConstants { static String contactUs = '$_basePath/contactUs.png'; static String reload = "$_basePath/reload.png"; static String downArrow = "$_basePath/down_arrow.png"; + static String block = "$_basePath/block.png"; // TEST FILE DELETE WHEN IN PRODUCTION static String test = '$_basePath/test.jpg'; From adf1cdb93858b83a3e1acdfb460bffed966d57ec Mon Sep 17 00:00:00 2001 From: Tanmoy karmakar Date: Thu, 13 Oct 2022 01:07:29 +0530 Subject: [PATCH 5/6] added init method --- lib/screens/welcome_screen/widgets/welcome_sceen_home.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart b/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart index fb540e7b..66cedd2f 100644 --- a/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart +++ b/lib/screens/welcome_screen/widgets/welcome_sceen_home.dart @@ -51,6 +51,7 @@ class _WelcomeScreenHomeState extends State { @override Widget build(BuildContext context) { + SizeConfig().init(context); filePickerModel = Provider.of(context); _welcomeScreenProvider = Provider.of( context, From e971703da246445ea4207d2365a0be5601cef0d8 Mon Sep 17 00:00:00 2001 From: Tanmoy karmakar Date: Sat, 15 Oct 2022 01:08:13 +0530 Subject: [PATCH 6/6] added init method --- lib/screens/welcome_screen/widgets/blocked_at_sign_sheet.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/screens/welcome_screen/widgets/blocked_at_sign_sheet.dart b/lib/screens/welcome_screen/widgets/blocked_at_sign_sheet.dart index 17900dc0..7ce51173 100644 --- a/lib/screens/welcome_screen/widgets/blocked_at_sign_sheet.dart +++ b/lib/screens/welcome_screen/widgets/blocked_at_sign_sheet.dart @@ -5,6 +5,7 @@ import 'package:atsign_atmosphere_pro/utils/images.dart'; import 'package:flutter/material.dart'; Future blockedAtSignsSheet(BuildContext context) { + SizeConfig().init(context); return showModalBottomSheet( isScrollControlled: true, backgroundColor: Colors.transparent,