diff --git a/assets/images/png/Connected world-amico 1.png b/assets/images/png/Connected world-amico 1.png new file mode 100644 index 0000000..f5b8583 Binary files /dev/null and b/assets/images/png/Connected world-amico 1.png differ diff --git a/assets/images/png/Group 1000004385.png b/assets/images/png/Group 1000004385.png new file mode 100644 index 0000000..a046e4a Binary files /dev/null and b/assets/images/png/Group 1000004385.png differ diff --git a/assets/images/png/Group 1000004420.png b/assets/images/png/Group 1000004420.png new file mode 100644 index 0000000..7e9e4ea Binary files /dev/null and b/assets/images/png/Group 1000004420.png differ diff --git a/assets/images/png/Organizing projects-pana 1.png b/assets/images/png/Organizing projects-pana 1.png new file mode 100644 index 0000000..7aa5da6 Binary files /dev/null and b/assets/images/png/Organizing projects-pana 1.png differ diff --git a/assets/images/png/correct 1.png b/assets/images/png/correct 1.png new file mode 100644 index 0000000..77e4704 Binary files /dev/null and b/assets/images/png/correct 1.png differ diff --git a/assets/images/png/x-circle.png b/assets/images/png/x-circle.png new file mode 100644 index 0000000..166bf0c Binary files /dev/null and b/assets/images/png/x-circle.png differ diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 10c2c59..6e5bb08 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -64,7 +64,7 @@ PODS: - firebase_core (2.32.0): - Firebase/CoreOnly (= 10.25.0) - Flutter - - FirebaseAppCheckInterop (10.28.0) + - FirebaseAppCheckInterop (10.29.0) - FirebaseAuth (10.25.0): - FirebaseAppCheckInterop (~> 10.17) - FirebaseCore (~> 10.0) @@ -76,7 +76,7 @@ PODS: - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.12) - GoogleUtilities/Logger (~> 7.12) - - FirebaseCoreInternal (10.28.0): + - FirebaseCoreInternal (10.29.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - Flutter (1.0.0) - flutter_facebook_auth (6.0.4): @@ -130,10 +130,10 @@ PODS: - GTMAppAuth (4.1.1): - AppAuth/Core (~> 1.7) - GTMSessionFetcher/Core (< 4.0, >= 3.3) - - GTMSessionFetcher (3.4.1): - - GTMSessionFetcher/Full (= 3.4.1) - - GTMSessionFetcher/Core (3.4.1) - - GTMSessionFetcher/Full (3.4.1): + - GTMSessionFetcher (3.5.0): + - GTMSessionFetcher/Full (= 3.5.0) + - GTMSessionFetcher/Core (3.5.0) + - GTMSessionFetcher/Full (3.5.0): - GTMSessionFetcher/Core - image_cropper (0.0.4): - Flutter @@ -149,9 +149,9 @@ PODS: - Flutter - PromisesObjC (2.4.0) - RecaptchaInterop (100.0.0) - - SDWebImage (5.19.2): - - SDWebImage/Core (= 5.19.2) - - SDWebImage/Core (5.19.2) + - SDWebImage (5.19.4): + - SDWebImage/Core (= 5.19.4) + - SDWebImage/Core (5.19.4) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS @@ -259,10 +259,10 @@ SPEC CHECKSUMS: Firebase: 0312a2352584f782ea56f66d91606891d4607f06 firebase_auth: 5719ddc9f654b813405899480e84971bd8e61235 firebase_core: a626d00494efa398e7c54f25f1454a64c8abf197 - FirebaseAppCheckInterop: 5315f40293191bfec04b2cfab0215760e441540a + FirebaseAppCheckInterop: 6a1757cfd4067d8e00fccd14fcc1b8fd78cfac07 FirebaseAuth: c0f93dcc570c9da2bffb576969d793e95c344fbb FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483 - FirebaseCoreInternal: 58d07f1362fddeb0feb6a857d1d1d1c5e558e698 + FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_facebook_auth: c8700ab1770f3d8e5e7456220e4f3bbcdb831454 fluttertoast: 9f2f8e81bb5ce18facb9748d7855bf5a756fe3db @@ -273,7 +273,7 @@ SPEC CHECKSUMS: GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de - GTMSessionFetcher: 8000756fc1c19d2e5697b90311f7832d2e33f6cd + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 image_cropper: 2c150b3d63f4feaad31054d20381ddac0a460e63 image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425 @@ -281,7 +281,7 @@ SPEC CHECKSUMS: permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 - SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a + SDWebImage: 066c47b573f408f18caa467d71deace7c0f8280d shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 5d60154..bc384cd 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -8,13 +8,13 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2105BA461347F33698D3FD7B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC7FC30109CCD5376F6BFA0F /* 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 */; }; 9FD3FE5A0194B5B2D8202DCF /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D4274500C33C54346ECA2D49 /* GoogleService-Info.plist */; }; + CA23128F3D22F12344F34510 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E6D63EEFD9353D7ADC2CB4D /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -31,16 +31,17 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 01A8D59FC22474B9D47BC82F /* 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 = ""; }; 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 = ""; }; + 2E6D63EEFD9353D7ADC2CB4D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 355191DC29CD1712AAFF95EF /* 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 = ""; }; - 3E093EFD052120EBB5EFE242 /* 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 = ""; }; + 4145FC1F69369273F821F424 /* 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 = ""; }; 5210D9302C4006FC0040021E /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; 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 = ""; }; + 7A2724068B1177B4942EB08B /* 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 = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 8DA153E7FEAC51D97681DB93 /* 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; }; @@ -49,7 +50,6 @@ 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 = ""; }; D4274500C33C54346ECA2D49 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = ""; }; - DC7FC30109CCD5376F6BFA0F /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,7 +57,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2105BA461347F33698D3FD7B /* Pods_Runner.framework in Frameworks */, + CA23128F3D22F12344F34510 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -67,9 +67,9 @@ 01448FBCAC46C16EC8BC1181 /* Pods */ = { isa = PBXGroup; children = ( - 8DA153E7FEAC51D97681DB93 /* Pods-Runner.debug.xcconfig */, - 3E093EFD052120EBB5EFE242 /* Pods-Runner.release.xcconfig */, - 01A8D59FC22474B9D47BC82F /* Pods-Runner.profile.xcconfig */, + 355191DC29CD1712AAFF95EF /* Pods-Runner.debug.xcconfig */, + 7A2724068B1177B4942EB08B /* Pods-Runner.release.xcconfig */, + 4145FC1F69369273F821F424 /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -92,8 +92,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 01448FBCAC46C16EC8BC1181 /* Pods */, - DE8E73CF7AB07643531FB23E /* Frameworks */, D4274500C33C54346ECA2D49 /* GoogleService-Info.plist */, + F4C62E65C792A2B03ABD303E /* Frameworks */, ); sourceTree = ""; }; @@ -121,10 +121,10 @@ path = Runner; sourceTree = ""; }; - DE8E73CF7AB07643531FB23E /* Frameworks */ = { + F4C62E65C792A2B03ABD303E /* Frameworks */ = { isa = PBXGroup; children = ( - DC7FC30109CCD5376F6BFA0F /* Pods_Runner.framework */, + 2E6D63EEFD9353D7ADC2CB4D /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -136,23 +136,21 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 2427B225240D99C3274E4E9F /* [CP] Check Pods Manifest.lock */, + 30BAD3BCCCA511EDA8157430 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 193E6ECF33FCE0798A403773 /* [CP] Embed Pods Frameworks */, - A1A5C179E86574032091061E /* [CP] Copy Pods Resources */, + 4343791398B77D1A11F261A2 /* [CP] Embed Pods Frameworks */, + 57523D9CD6B060C3BF6C72B7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); dependencies = ( ); name = Runner; - packageProductDependencies = ( - ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -181,8 +179,6 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; - packageReferences = ( - ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -208,24 +204,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 193E6ECF33FCE0798A403773 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 2427B225240D99C3274E4E9F /* [CP] Check Pods Manifest.lock */ = { + 30BAD3BCCCA511EDA8157430 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -263,22 +242,24 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { + 4343791398B77D1A11F261A2 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); - inputPaths = ( + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "Run Script"; - outputPaths = ( + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; }; - A1A5C179E86574032091061E /* [CP] Copy Pods Resources */ = { + 57523D9CD6B060C3BF6C72B7 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -295,6 +276,21 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; showEnvVarsInLog = 0; }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/lib/Common/api_urls.dart b/lib/Common/api_urls.dart index 6bb3795..2efe081 100644 --- a/lib/Common/api_urls.dart +++ b/lib/Common/api_urls.dart @@ -91,14 +91,14 @@ class ApiUrls { static const getblockuser = "${baseUrl}fetch-blocked-profile"; static const postblockuser = "${baseUrl}block-profile"; + static const getlatestpost = "${baseUrl}fetch-latest-post"; + static const tagcommunityuser = "${baseUrl}fetch-communities-tags-to-pin"; // Individual static const posteditprofile = "${baseUrl}update-profile"; static const geteditprofile = "${baseUrl}fetch-profile"; static const getinterestlist = "${baseUrl}fetch-interests"; - - // Business static const posteditprofilebusiness = "${baseUrl}update-business-profile"; static const geteditprofilebusiness = "${baseUrl}fetch-business-profile"; diff --git a/lib/Common/controller/MainController.dart b/lib/Common/controller/MainController.dart index 32c64e1..759e536 100644 --- a/lib/Common/controller/MainController.dart +++ b/lib/Common/controller/MainController.dart @@ -1,12 +1,10 @@ import 'package:get/get.dart'; +import 'package:regroup/Main_Screens/CalenderTab/CalenderTab.dart'; +import 'package:regroup/Main_Screens/Chats/View/chatsmainscreen.dart'; +import 'package:regroup/Main_Screens/Community/Community.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupTab.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/CalenderTab.dart'; - -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/chatsmainscreen.dart'; - -import 'package:regroup/Feed%20Module/Main_Screens/Community/Community.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupTab.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart'; class MainController extends GetxController { var selectedIndex = 0.obs; diff --git a/lib/Common/controller/MainScreen.dart b/lib/Common/controller/MainScreen.dart index 6538f0d..87a871f 100644 --- a/lib/Common/controller/MainScreen.dart +++ b/lib/Common/controller/MainScreen.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/controller/MainController.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; -import '../../Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; final MainController mainController = Get.put(MainController()); diff --git a/lib/Common/controller/data/network/network_api.dart b/lib/Common/controller/data/network/network_api.dart index dfee1ad..853694a 100644 --- a/lib/Common/controller/data/network/network_api.dart +++ b/lib/Common/controller/data/network/network_api.dart @@ -16,9 +16,8 @@ class NetworkApiServices { Dio dio = Dio(); final controllerEntryPoint = Get.put(EntryPointController()); - String basicAuth = 'Basic ' + - base64.encode( - utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&')); + String basicAuth = 'Basic ${base64.encode( + utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&'))}'; Future getApi(String url, {bool optionalpar = false}) async { if (kDebugMode) { @@ -27,7 +26,6 @@ class NetworkApiServices { Response response; SharedPreferences prefs = await SharedPreferences.getInstance(); token = prefs.getString('access-token'); - print("url is $url"); log(token.toString()); try { diff --git a/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart b/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart index 7342852..6377ff6 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart +++ b/lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart @@ -6,12 +6,11 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart' - as timelineabilist; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart' as timelineabilist; + +import 'package:regroup/Main_Screens/ProfileTab/view_model/gettimelineability.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; @@ -288,7 +287,7 @@ class _AddTimelineState extends State { ], ), sizedBoxHeight(25.h), - text16400white("Role in the club"), + text16400white("Role in "), sizedBoxHeight(15.h), CustomTextFormField( textEditingController: @@ -404,9 +403,9 @@ class _AddTimelineState extends State { Row( children: [ Obx(() { - return commonGlassContainer( - border: 1, - borderradius: 2, + return commonGlassUI( + borderwidth: 1, + borderRadius: BorderRadius.circular(2), height: 20.h, width: 20.w, opacity1: 0.24, @@ -568,10 +567,10 @@ class _AddTimelineState extends State { textEditingController: rollnameController, texttype: TextInputType.text, - hintText: 'Enter role in club', + hintText: 'Enter role in the club', validator: (value) { if (value!.isEmpty) { - return 'Enter role in club'; + return 'Enter role in the club'; } return null; }, @@ -678,9 +677,9 @@ class _AddTimelineState extends State { Row( children: [ Obx(() { - return commonGlassContainer( - border: 1, - borderradius: 2, + return commonGlassUI( + borderwidth: 1, + borderRadius: BorderRadius.circular( 2), height: 20.h, width: 20.w, opacity1: 0.24, diff --git a/lib/Feed Module/sidemenu/view_model/tagcommunityuser.dart b/lib/Feed Module/sidemenu/view_model/tagcommunityuser.dart new file mode 100644 index 0000000..6443a3b --- /dev/null +++ b/lib/Feed Module/sidemenu/view_model/tagcommunityuser.dart @@ -0,0 +1,22 @@ +import 'dart:developer'; + +import 'package:regroup/Common/api_urls.dart'; +import 'package:regroup/Common/base_manager.dart'; +import 'package:regroup/Common/controller/data/network/network_api.dart'; +import 'package:regroup/sidemenu/Model/TagCommunityUserModel.dart'; + +TagCommunityUserModel? tagcommunityuserobj; + +class Sidegetmethod { + Future> getJoinedusergroups(updata) async { + final response = await NetworkApiServices().getApi( + "${ApiUrls.tagcommunityuser}?=$updata", + // optionalpar: false + ); + if (response.status == ResponseStatus.SUCCESS) { + tagcommunityuserobj = TagCommunityUserModel.fromJson(response.data); + log(tagcommunityuserobj!.data.toString()); + } + return response; + } +} diff --git a/lib/Login/View/loginscreen.dart b/lib/Login/View/loginscreen.dart index edfdfc8..0d187e4 100644 --- a/lib/Login/View/loginscreen.dart +++ b/lib/Login/View/loginscreen.dart @@ -5,9 +5,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; -import 'package:logger/web.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; import 'package:regroup/Login/ViewModel/LoginApi.dart'; import 'package:regroup/Utils/Common/AppleOAuthService.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; @@ -20,8 +18,7 @@ import 'package:regroup/onboarding/Signup/view_model/getUserprofile.dart'; import 'package:regroup/resources/routes/route_name.dart'; import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; import 'package:flutter_facebook_auth/flutter_facebook_auth.dart'; -import 'package:regroup/Common/global.dart' as global; -// import 'package:regroup/Common/global.dart' as global; + class LoginScreen extends StatefulWidget { const LoginScreen({super.key}); @@ -31,7 +28,6 @@ class LoginScreen extends StatefulWidget { } class _LoginScreenState extends State { - AccessToken? _accessToken; final TextEditingController _emailController = TextEditingController(); RxBool isObscured = true.obs; final TextEditingController _passwordController = TextEditingController(); @@ -124,7 +120,6 @@ class _LoginScreenState extends State { final LoginResult result = await FacebookAuth.instance.login(); if (result.status == LoginStatus.success) { - _accessToken = result.accessToken; final userData = await FacebookAuth.instance.getUserData(); logger.i(userData['email']); @@ -141,7 +136,6 @@ class _LoginScreenState extends State { _logout() async { await FacebookAuth.instance.logOut(); - _accessToken = null; setState(() {}); } diff --git a/lib/Login/View/verifygoogleapple.dart b/lib/Login/View/verifygoogleapple.dart index cd8df8d..23b1807 100644 --- a/lib/Login/View/verifygoogleapple.dart +++ b/lib/Login/View/verifygoogleapple.dart @@ -10,7 +10,7 @@ import 'package:regroup/Login/ViewModel/LoginApi.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -52,7 +52,7 @@ class _VerifygoogleandappleState extends State { } } - final Map _accountTypeMap = { + final Map _accountTypeMap = { 'Individual': 1, 'Business': 2, }; @@ -68,12 +68,11 @@ class _VerifygoogleandappleState extends State { SharedPreferences prefs = await SharedPreferences.getInstance(); if (resp.status == ResponseStatus.SUCCESS) { - int accountTypeValue = _accountTypeMap[_selectedAccountType] ?? 0; + int accountTypeValue = _accountTypeMap[_selectedAccountType] ?? 0; - await prefs.setString('accountTypefromLogin', - accountTypeValue.toString()); - await prefs.setString('accountTypeValue', - accountTypeValue.toString()); + await prefs.setString( + 'accountTypefromLogin', accountTypeValue.toString()); + await prefs.setString('accountTypeValue', accountTypeValue.toString()); if (_selectedAccountType == 'Individual') { Get.toNamed(RouteName.tellusindividualscreen); @@ -102,45 +101,54 @@ class _VerifygoogleandappleState extends State { backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ - const Positioned( - top: 310, right: -30, child: CommonBlurRightSecond()), - const Positioned(top: 510, left: -30, child: CommonBlurLeftBlue()), - GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 6, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), + + + // Positioned( + // top: 310, right: -30, child: CommonBlurRightSecond()), + // const Positioned(top: 510, left: -30, child: CommonBlurLeftBlue()), + // GlassmorphicContainer( + // width: MediaQuery.of(context).size.width, + // height: + // // 500.h, + // MediaQuery.of(context).size.height, + // borderRadius: 2, + // blur: 6, + // alignment: Alignment.bottomLeft, + // border: 2, + // linearGradient: LinearGradient( + // begin: Alignment.topCenter, + // end: Alignment.bottomCenter, + // colors: [ + // const Color(0XFF222935).withOpacity(0.60), + // const Color(0XFF222935).withOpacity(0.60), + // const Color(0XFF222935).withOpacity(0.60), + // const Color(0XFF222935).withOpacity(0.60), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - const Color(0XFF222935).withOpacity(0.60), + // // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), + // // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), + // // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), + // // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), + // ], + // ), + // borderGradient: LinearGradient( + // begin: Alignment.topCenter, + // end: Alignment.bottomCenter, + // colors: [ + // // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), + // // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), + // const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - ], - ), - child: Padding( + // const Color(0XFF222935).withOpacity(0.60), + // ], + // ), + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -234,10 +242,8 @@ class _VerifygoogleandappleState extends State { ], ), ), - ) - ], - ), - ), - ); + ] ) + + )); } } diff --git a/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart b/lib/Main_Screens/CalenderTab/AddEvent/AddEvent.dart similarity index 94% rename from lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart rename to lib/Main_Screens/CalenderTab/AddEvent/AddEvent.dart index ff085af..102deb7 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart +++ b/lib/Main_Screens/CalenderTab/AddEvent/AddEvent.dart @@ -103,11 +103,11 @@ class _AddEventState extends State { borderType: BorderType.RRect, radius: Radius.circular(14.r), color: const Color(0xFF434A53), - child: commonGlassContainer( - border: 0, + child: commonGlassUI( + // border: 0, width: double.infinity, height: 130.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: bannerPath.isNotEmpty && isbannerAdded ? Stack(children: [ Image.file( @@ -160,10 +160,10 @@ class _AddEventState extends State { ), ), sizedBoxHeight(20.h), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 60.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Center( child: Padding( padding: EdgeInsets.symmetric(horizontal: 12.w), @@ -197,7 +197,7 @@ class _AddEventState extends State { ]), ), ), - border: 1), + borderwidth: 1), sizedBoxHeight(20.h), text16400white("Type of event"), sizedBoxHeight(14.h), @@ -313,10 +313,10 @@ class _AddEventState extends State { }); } }, - child: commonGlassContainer( + child: commonGlassUI( width: 174.w, height: 50.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), customWidget: Center( child: Row(children: [ sizedBoxWidth(16.w), @@ -330,7 +330,7 @@ class _AddEventState extends State { formatTimeOfDay(starttime!)), ]), ), - border: 1), + borderwidth: 1), ) ], ), @@ -351,10 +351,10 @@ class _AddEventState extends State { }); } }, - child: commonGlassContainer( + child: commonGlassUI( width: 174.w, height: 50.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), customWidget: Center( child: Row(children: [ sizedBoxWidth(16.w), @@ -368,7 +368,7 @@ class _AddEventState extends State { formatTimeOfDay(endtime!)), ]), ), - border: 1), + borderwidth: 1), ) ], ), @@ -378,9 +378,9 @@ class _AddEventState extends State { Row( children: [ Obx(() { - return commonGlassContainer( - border: 1, - borderradius: 2, + return commonGlassUI( + borderwidth: 1, + borderRadius: BorderRadius.circular( 2), height: 23.h, width: 23.w, opacity1: 0.24, @@ -474,19 +474,19 @@ class _AddEventState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - commonGlassContainer( + commonGlassUI( height: 50.h, width: 127.w, - borderradius: 30.r, - border: 1, + borderRadius: BorderRadius.circular( 30.r), + borderwidth: 1, customWidget: Center( child: text16400white("2"), )), - commonGlassContainer( + commonGlassUI( height: 50.h, width: 215.w, - borderradius: 30.r, - border: 1, + borderRadius: BorderRadius.circular( 30.r), + borderwidth: 1, customWidget: Center( child: Row( mainAxisAlignment: MainAxisAlignment.center, @@ -515,10 +515,10 @@ class _AddEventState extends State { required String imagePath, required String title, }) { - return commonGlassContainer( + return commonGlassUI( width: double.infinity, height: 50.h, - borderradius: 30, + borderRadius: BorderRadius.circular(30), customWidget: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Center( @@ -540,6 +540,6 @@ class _AddEventState extends State { ), ), ), - border: 1); + borderwidth: 1); } } diff --git a/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart b/lib/Main_Screens/CalenderTab/AddUsers/AddUsers.dart similarity index 91% rename from lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart rename to lib/Main_Screens/CalenderTab/AddUsers/AddUsers.dart index bd7bc9b..725bc1b 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart +++ b/lib/Main_Screens/CalenderTab/AddUsers/AddUsers.dart @@ -138,10 +138,10 @@ class _AddUsersState extends State { children: [ text18w700_FCFCFC("Group members"), const Spacer(), - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/Vector (5)22.png", @@ -149,12 +149,12 @@ class _AddUsersState extends State { width: 12.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(14.w), - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), customWidget: Center( child: Image.asset( "assets/images/png/bi_filter.png", @@ -162,7 +162,7 @@ class _AddUsersState extends State { width: 18.w, ), ), - border: 0.5) + borderwidth: 0.5) ], ), ), @@ -237,9 +237,9 @@ class _AddUsersState extends State { ], ), const Spacer(), - commonGlassContainer( - border: 1, - borderradius: 2, + commonGlassUI( + borderwidth: 1, + borderRadius: BorderRadius.circular( 2), height: 23.h, width: 23.w, opacity1: 0.24, @@ -280,32 +280,32 @@ class _AddUsersState extends State { sizedBoxHeight(16.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("M")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Tu")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("W")), - border: 0.5), + borderwidth: 0.5), const Spacer(), Row( children: [ @@ -325,32 +325,32 @@ class _AddUsersState extends State { sizedBoxHeight(20.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Th")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("F")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Sa")), - border: 0.5), + borderwidth: 0.5), const Spacer(), Row( children: [ diff --git a/lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart b/lib/Main_Screens/CalenderTab/Availabillity.dart similarity index 97% rename from lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart rename to lib/Main_Screens/CalenderTab/Availabillity.dart index 5bd96ca..8549294 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart +++ b/lib/Main_Screens/CalenderTab/Availabillity.dart @@ -121,14 +121,15 @@ class _AvailabilityState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 670.h, - borderradius: 1, - border: 0, + borderRadius: BorderRadius.circular(1), + // border: 0, customWidget: SfCalendar( view: CalendarView.timelineMonth, - appointmentTextStyle: const TextStyle(color: Colors.white), + appointmentTextStyle: + const TextStyle(color: Colors.white), headerStyle: const CalendarHeaderStyle( textStyle: TextStyle( color: Colors.blue, diff --git a/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart b/lib/Main_Screens/CalenderTab/CalenderTab.dart similarity index 97% rename from lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart rename to lib/Main_Screens/CalenderTab/CalenderTab.dart index 6e67068..a146e0b 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart +++ b/lib/Main_Screens/CalenderTab/CalenderTab.dart @@ -177,10 +177,7 @@ class _CalenderTabState extends State { // initialIndex: selectedIndex.value, child: Column( children: [ - const CommonTabBar( - - - tabs: [ + const CommonTabBar(tabs: [ Tab( text: 'My sessions', ), @@ -190,7 +187,6 @@ class _CalenderTabState extends State { ]), Expanded( child: TabBarView( - children: [ mySessionsTab(), comSessionTab(), @@ -215,10 +211,11 @@ class _CalenderTabState extends State { sizedBoxHeight(20.h), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 136.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular(10.r) , + borderwidth: 1, customWidget: Row( children: [ Padding( @@ -245,15 +242,15 @@ class _CalenderTabState extends State { Image.asset("assets/images/png/Rectangle 45.png") ], ), - border: 1), + ), ), sizedBoxHeight(25.h), Stack(children: [ - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 500.h, - borderradius: 1, - border: 0, + borderRadius: BorderRadius.circular(1), + // borderw: 0, customWidget: SfCalendar( view: CalendarView.month, appointmentTextStyle: const TextStyle(color: Colors.white), @@ -456,10 +453,11 @@ class _CalenderTabState extends State { onTap: () { Get.toNamed(RouteName.eventDetails); }, - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 300.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), + borderwidth: 1.w, customWidget: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -529,15 +527,15 @@ class _CalenderTabState extends State { sizedBoxWidth(16.w), CircleAvatar( radius: 12.r, - backgroundImage: - const AssetImage("assets/images/png/Ellipse 52.png"), + backgroundImage: const AssetImage( + "assets/images/png/Ellipse 52.png"), ), sizedBoxWidth(8.w), text14w400_FCFCFC("Ryan dorwat"), ], ) ]), - border: 1), + ), ) ], ), @@ -551,11 +549,11 @@ class _CalenderTabState extends State { sizedBoxHeight(25.h), Stack(children: [ - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 530.h, - borderradius: 1, - border: 0, + borderRadius: BorderRadius.circular(1), + // border: 0, customWidget: SfCalendar( view: CalendarView.month, appointmentTextStyle: const TextStyle(color: Colors.white), @@ -730,10 +728,11 @@ class _CalenderTabState extends State { children: [ text18w700_FCFCFC(title), sizedBoxHeight(25.h), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 290.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), + borderwidth: 1, customWidget: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -810,7 +809,7 @@ class _CalenderTabState extends State { ), ], ), - border: 1) + ) ], ), ); diff --git a/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart b/lib/Main_Screens/CalenderTab/EventDetails.dart similarity index 82% rename from lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart rename to lib/Main_Screens/CalenderTab/EventDetails.dart index 070a2e3..48f893c 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart +++ b/lib/Main_Screens/CalenderTab/EventDetails.dart @@ -36,41 +36,44 @@ class _EventDetailsState extends State { onTap: () { Get.toNamed(RouteName.addEvent); }, - child: commonGlassContainer( - width: 40.w, - height: 40.h, - borderradius: 100, - opacity1: 0.24, - opacity2: 0.24, - customWidget: Center( - child: Image.asset("assets/images/png/Vector536.png", - height: 17.h, width: 17.w), - ), - border: 0.5), - ), - sizedBoxWidth(12.w), - commonGlassContainer( + child: commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, + borderwidth: 0.5, customWidget: Center( - child: Image.asset("assets/images/png/Vector522.png", + child: Image.asset("assets/images/png/Vector536.png", height: 17.h, width: 17.w), ), - border: 0.5), + ), + ), + sizedBoxWidth(12.w), + commonGlassUI( + width: 40.w, + height: 40.h, + borderRadius: BorderRadius.circular(100), + opacity1: 0.24, + opacity2: 0.24, + borderwidth: 0.5, + customWidget: Center( + child: Image.asset("assets/images/png/Vector522.png", + height: 17.h, width: 17.w), + ), + ), ], ), ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Column( + ), + SingleChildScrollView( + child: Column( children: [ Padding( padding: const EdgeInsets.symmetric(horizontal: 16), @@ -97,20 +100,21 @@ class _EventDetailsState extends State { sizedBoxHeight(22.h), Row( children: [ - commonGlassContainer( - width: 35.w, - height: 35.h, - borderradius: 100, - opacity1: 0.24, - opacity2: 0.24, - customWidget: Center( - child: Image.asset( - "assets/images/png/calender.png", - height: 17.h, - width: 17.w, - ), + commonGlassUI( + width: 35.w, + height: 35.h, + borderRadius: BorderRadius.circular(100), + opacity1: 0.24, + opacity2: 0.24, + borderwidth: 0.5, + customWidget: Center( + child: Image.asset( + "assets/images/png/calender.png", + height: 17.h, + width: 17.w, ), - border: 0.5), + ), + ), sizedBoxWidth(10.w), text16400white("20th April 2024 - 21st April 2024"), ], @@ -118,10 +122,10 @@ class _EventDetailsState extends State { sizedBoxHeight(16.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( @@ -131,7 +135,7 @@ class _EventDetailsState extends State { width: 17.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(10.w), text16400white("3 hours"), ], @@ -139,10 +143,10 @@ class _EventDetailsState extends State { sizedBoxHeight(16.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( @@ -152,7 +156,7 @@ class _EventDetailsState extends State { width: 17.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(10.w), text16400white("Elm street london, United Kingdom"), ], @@ -171,26 +175,26 @@ class _EventDetailsState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ - commonGlassContainer( + commonGlassUI( width: 87.w, height: 40.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular(30.r), customWidget: Center(child: text16w400_white("Yes")), - border: 1), - commonGlassContainer( + borderwidth: 1), + commonGlassUI( width: 87.w, height: 40.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular(30.r), customWidget: Center(child: text16w400_white("No")), - border: 1), - commonGlassContainer( + borderwidth: 1), + commonGlassUI( width: 154.w, height: 40.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular(30.r), customWidget: Center( child: text16w400_white("Not yet decided")), - border: 1), + borderwidth: 1), ], ), sizedBoxHeight(20.h), @@ -206,13 +210,13 @@ class _EventDetailsState extends State { sizedBoxHeight(16.h), text18w700white("Are you attending this event ?"), sizedBoxHeight(20.h), - commonGlassContainer( + commonGlassUI( width: 221.w, height: 40.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular(30.r), customWidget: Center(child: text16w400_white("Request to join")), - border: 1), + borderwidth: 1), sizedBoxHeight(20.h), commonDivider(), ], @@ -240,10 +244,10 @@ class _EventDetailsState extends State { sizedBoxHeight(20.h), Visibility( visible: adminView, - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 251.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular(10.r), customWidget: Padding( padding: const EdgeInsets.symmetric(vertical: 20), child: Column( @@ -265,15 +269,15 @@ class _EventDetailsState extends State { ], ), ), - border: 1), + borderwidth: 1), ), sizedBoxHeight(30.h), Visibility( visible: memberView, - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 65.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular(10.r), customWidget: Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ @@ -293,7 +297,7 @@ class _EventDetailsState extends State { text18w400white("90 Attending") ], ), - border: 1)), + borderwidth: 1)), text18w700white("Messages"), sizedBoxHeight(20.h), Row( @@ -306,20 +310,20 @@ class _EventDetailsState extends State { sizedBoxWidth(10.w), text16w400_white("Send message to invites"), const Spacer(), - commonGlassContainer( + commonGlassUI( width: 98.w, height: 30.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), customWidget: Center(child: text14400white("Select")), - border: 1) + borderwidth: 1) ], ), sizedBoxHeight(25.h), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 240.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 80.w), child: Column( @@ -353,7 +357,7 @@ class _EventDetailsState extends State { ) ]), ), - border: 1), + borderwidth: 1), sizedBoxHeight(50.h), CommonBtn(text: "Join the event"), sizedBoxHeight(40.h), diff --git a/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart b/lib/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart similarity index 91% rename from lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart rename to lib/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart index 4572b80..6ebb7f4 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart +++ b/lib/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart @@ -189,12 +189,12 @@ class _ManageMembersCalState extends State { child: Center(child: text10400white("Attending")), ), sizedBoxWidth(8.w), - commonGlassContainer( + commonGlassUI( width: 25.w, height: 25.h, opacity1: 0.24, opacity2: 0.24, - borderradius: 100.r, + borderRadius: BorderRadius.circular(100.r), customWidget: Center( child: Image.asset( "assets/images/png/alarm 1 (traced).png", @@ -202,14 +202,14 @@ class _ManageMembersCalState extends State { width: 13.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(8.w), - commonGlassContainer( + commonGlassUI( width: 25.w, height: 25.h, opacity1: 0.24, opacity2: 0.24, - borderradius: 100.r, + borderRadius: BorderRadius.circular( 100.r), customWidget: Center( child: Image.asset( "assets/images/png/fluent_delete-28-regular.png", @@ -217,7 +217,7 @@ class _ManageMembersCalState extends State { width: 13.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(12.w) ], ), @@ -244,32 +244,32 @@ class _ManageMembersCalState extends State { sizedBoxHeight(16.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("M")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Tu")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("W")), - border: 0.5), + borderwidth: 0.5), const Spacer(), Row( children: [ @@ -289,32 +289,32 @@ class _ManageMembersCalState extends State { sizedBoxHeight(20.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Th")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("F")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Sa")), - border: 0.5), + borderwidth: 0.5), const Spacer(), Row( children: [ @@ -374,4 +374,6 @@ class _ManageMembersCalState extends State { ), )); } + + } diff --git a/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart b/lib/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart similarity index 97% rename from lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart rename to lib/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart index 68a0fa5..9838fb4 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart +++ b/lib/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart @@ -89,10 +89,10 @@ class _ResourcePoolState extends State { } Widget resourceCard() { - return commonGlassContainer( + return commonGlassUI( width: double.infinity, height: 216.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), child: @@ -177,7 +177,7 @@ class _ResourcePoolState extends State { ), ]), ), - border: 1); + borderwidth: 1); } void inviteBottomSheet() { @@ -258,9 +258,9 @@ class _ResourcePoolState extends State { sizedBoxWidth(10.w), text16w400_FCFCFC(title), const Spacer(), - commonGlassContainer( - border: 1, - borderradius: 2, + commonGlassUI( + borderwidth: 1, + borderRadius: BorderRadius.circular( 2), height: 23.h, width: 23.w, opacity1: 0.24, diff --git a/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart b/lib/Main_Screens/CalenderTab/SetAvailabillity.dart similarity index 96% rename from lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart rename to lib/Main_Screens/CalenderTab/SetAvailabillity.dart index 1dd6be0..f05a41a 100644 --- a/lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart +++ b/lib/Main_Screens/CalenderTab/SetAvailabillity.dart @@ -138,10 +138,10 @@ class _SetAvailabillityState extends State { children: [ text16400white("Start time"), sizedBoxHeight(14.h), - commonGlassContainer( + commonGlassUI( width: 174.w, height: 50.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular(30.r), customWidget: Center( child: Row(children: [ sizedBoxWidth(16.w), @@ -154,7 +154,7 @@ class _SetAvailabillityState extends State { text16w400_white("3:00 pm") ]), ), - border: 1) + borderwidth: 1) ], ), const Spacer(), @@ -163,10 +163,10 @@ class _SetAvailabillityState extends State { children: [ text16400white("End time"), sizedBoxHeight(14.h), - commonGlassContainer( + commonGlassUI( width: 174.w, height: 50.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), customWidget: Center( child: Row(children: [ sizedBoxWidth(16.w), @@ -179,7 +179,7 @@ class _SetAvailabillityState extends State { text16w400_white("5:00 pm") ]), ), - border: 1) + borderwidth: 1) ], ), ], diff --git a/lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart b/lib/Main_Screens/Chats/View/chatsmainscreen.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart rename to lib/Main_Screens/Chats/View/chatsmainscreen.dart diff --git a/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart b/lib/Main_Screens/Chats/View/groupchat.dart similarity index 99% rename from lib/Feed Module/Main_Screens/Chats/View/groupchat.dart rename to lib/Main_Screens/Chats/View/groupchat.dart index 8cad5e0..0e3ecff 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/groupchat.dart +++ b/lib/Main_Screens/Chats/View/groupchat.dart @@ -264,13 +264,13 @@ class _GroupChatPageState extends State { child: Row( children: [ sizedBoxWidth(10.w), - commonGlassContainer( - border: 0.9, + commonGlassUI( + borderwidth: 0.9, width: 40.w, height: 40.h, opacity1: 0.24, opacity2: 0.24, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( 'assets/images/png/appbararrowbutton.png') diff --git a/lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart b/lib/Main_Screens/Chats/View/newchatpage.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart rename to lib/Main_Screens/Chats/View/newchatpage.dart diff --git a/lib/Feed Module/Main_Screens/Chats/View/newgroup.dart b/lib/Main_Screens/Chats/View/newgroup.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Chats/View/newgroup.dart rename to lib/Main_Screens/Chats/View/newgroup.dart diff --git a/lib/Feed Module/Main_Screens/Chats/View/userchat.dart b/lib/Main_Screens/Chats/View/userchat.dart similarity index 99% rename from lib/Feed Module/Main_Screens/Chats/View/userchat.dart rename to lib/Main_Screens/Chats/View/userchat.dart index a6e8f10..918ccd2 100644 --- a/lib/Feed Module/Main_Screens/Chats/View/userchat.dart +++ b/lib/Main_Screens/Chats/View/userchat.dart @@ -266,13 +266,13 @@ class _UserChatPageState extends State { child: Row( children: [ sizedBoxWidth(10.w), - commonGlassContainer( - border: 0.9, + commonGlassUI( + borderwidth: 0.9, width: 40.w, height: 40.h, opacity1: 0.24, opacity2: 0.24, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( 'assets/images/png/appbararrowbutton.png') diff --git a/lib/Feed Module/Main_Screens/Community/Community.dart b/lib/Main_Screens/Community/Community.dart similarity index 82% rename from lib/Feed Module/Main_Screens/Community/Community.dart rename to lib/Main_Screens/Community/Community.dart index 259e554..8c3a616 100644 --- a/lib/Feed Module/Main_Screens/Community/Community.dart +++ b/lib/Main_Screens/Community/Community.dart @@ -1,3 +1,5 @@ +// ignore_for_file: unused_local_variable, non_constant_identifier_names, avoid_print, file_names + import 'package:flutter/material.dart'; import 'package:flutter_reaction_button/flutter_reaction_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -8,10 +10,12 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/controller/MainScreen.dart'; -import 'package:regroup/Feed%20Module/sidemenu/sidemenu.dart'; +import 'package:regroup/Main_Screens/Community/ViewModel/LatestPost.dart'; +// import 'package:regroup/Feed%20Module/sidemenu/sidemenu.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; +import 'package:regroup/sidemenu/sidemenu.dart'; class CommunityScreen extends StatefulWidget { const CommunityScreen({super.key}); @@ -119,9 +123,9 @@ class _CommunityScreenState extends State { Expanded( child: TabBarView( children: [ - feedTab(), + feedTabData(), popularTab(), - latestTab(), + const LatestTab(), ], ), ), @@ -178,13 +182,19 @@ class _CommunityScreenState extends State { } } -Widget feedTab() { +Widget feedTabData() { List feedTabData = [ { "profileImg": "assets/images/png/Ellipse 43.png", "title": "Edward Hackket", "mainImg": "assets/images/png/Rectangle 24.png", "containerTitle": ['Cycle', 'Marathon', 'Events', 'Marathon', 'Events'], + "desciption": "", + "create_at": '1 hour', + "total_comments": 20, + "total_likes": 20, + "total_save": 10, + "community_name": 'text', }, { "profileImg": "assets/images/png/Ellipse 52.png", @@ -197,6 +207,12 @@ Widget feedTab() { 'Marathon', 'Events' ], + "desciption": "", + "create_at": '1 hour', + "total_comments": 20, + "total_likes": 20, + "total_save": 10, + "community_name": 'text', }, { "profileImg": "assets/images/png/Ellipse 52.png", @@ -209,6 +225,12 @@ Widget feedTab() { 'Marathon', 'Events' ], + "desciption": "", + "create_at": '1 hour', + "total_comments": 20, + "total_likes": 20, + "total_save": 10, + "community_name": 'text', }, { "profileImg": "assets/images/png/Ellipse 52.png", @@ -221,75 +243,58 @@ Widget feedTab() { 'Marathon', 'Events' ], + "desciption": "", + "create_at": '1 hour', + "total_comments": 20, + "total_likes": 20, + "total_save": 10, + "community_name": 'text', }, ]; - return Column(children: [ - sizedBoxHeight(16.h), - Expanded( - child: ListView.builder( - shrinkWrap: true, - itemCount: feedTabData.length, - itemBuilder: (context, index) { - if (index == 1) { - return announcecardtile( - profileImg: 'assets/images/png/Ellipse 48.png', - title: 'Jocelyn Dokidis', - mainImg: 'assets/images/png/Rectangle 46.png', - containerTitle: [ - 'Race', - 'Swimming', - 'Events', - 'Marathon', - 'Events' - ]); - } else { + return Column( + children: [ + sizedBoxHeight(20.h), + Expanded( + child: ListView.builder( + shrinkWrap: true, + itemCount: feedTabData.length, + itemBuilder: (context, index) { return Column( children: [ normalcardtile2( - profileImg: feedTabData[index]["profileImg"], - title: feedTabData[index]["title"], - mainImg: feedTabData[index]["mainImg"], - containerTitle: feedTabData[index]["containerTitle"]), + profileImg: feedTabData[index]["profileImg"], + title: feedTabData[index]["title"], + mainImg: feedTabData[index]["mainImg"], + containerTitle: feedTabData[index]["containerTitle"], + description: 'test', + create_at: '1 hour', + total_comments: '20', + total_likes: '20', + total_save: '10', + community_name: 'text', + ), sizedBoxHeight(20.h) ], ); - } - }, + }, + ), ), - ), - // normalcardtile2( - // profileImg: 'assets/images/png/Ellipse 43.png', - // title: 'Edward Hackket', - // mainImg: 'assets/images/png/Rectangle 24.png', - // containerTitle: ['Cycle', 'Marathon', 'Events', 'Marathon', 'Events']), - // sizedBoxHeight(20.h), - // announcecardtile( - // profileImg: 'assets/images/png/Ellipse 48.png', - // title: 'Jocelyn Dokidis', - // mainImg: 'assets/images/png/Rectangle 46.png', - // containerTitle: ['Race', 'Swimming', 'Events', 'Marathon', 'Events']), - // sizedBoxHeight(20.h), - // normalcardtile2( - // profileImg: 'assets/images/png/Ellipse 52.png', - // title: 'Ryan Dorwat', - // mainImg: 'assets/images/png/Rectangle 25.png', - // containerTitle: [ - // 'Football', - // 'Teams player', - // 'Events', - // 'Marathon', - // 'Events' - // ]), - // sizedBoxHeight(20.h), - ]); + ], + ); } Widget normalcardtile2({ required String profileImg, required String title, required String mainImg, + required String description, required List containerTitle, + required String community_name, + required String total_comments, + required String total_likes, + required String total_save, + required String? create_at, }) { var mainImage = 'assets/images/png/uiw_like-o.png'.obs; void updateImage(String reaction) { @@ -304,7 +309,7 @@ Widget normalcardtile2({ return commonGlassUI( width: double.infinity, - height: 570.h, + height: 760.h, mainOpacity: 1, borderRadius: BorderRadius.circular(1), customWidget: Column( @@ -316,7 +321,7 @@ Widget normalcardtile2({ crossAxisAlignment: CrossAxisAlignment.start, children: [ CircleAvatar( - foregroundImage: AssetImage(profileImg), + foregroundImage: NetworkImage(profileImg), radius: 25.r, ), sizedBoxWidth(12.w), @@ -333,7 +338,7 @@ Widget normalcardtile2({ width: 14.w, ), sizedBoxWidth(7.w), - text12w400_FCFCFC('Active alliance network'), + text12w400_FCFCFC(community_name), sizedBoxWidth(7.w), Icon( Icons.circle, @@ -341,7 +346,7 @@ Widget normalcardtile2({ size: 4.sp, ), sizedBoxWidth(6.w), - text12w400_FCFCFC('1 Hour ago'), + text12w400_FCFCFC(create_at!), ], ) ], @@ -444,17 +449,21 @@ Widget normalcardtile2({ ), sizedBoxHeight(20.h), GestureDetector( - onTap: () { - Get.toNamed(RouteName.postdetailsScreen); - }, - child: SizedBox( - height: 163.h, - width: double.infinity, - child: Image.asset( + onTap: () { + Get.toNamed(RouteName.postdetailsScreen); + }, + child: Container( + height: 360, + width: double.infinity, + decoration: BoxDecoration( + image: DecorationImage( + fit: BoxFit.cover, + image: NetworkImage( mainImg, - fit: BoxFit.cover, ), )), + ), + ), sizedBoxHeight(20.h), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), @@ -479,14 +488,21 @@ Widget normalcardtile2({ ), ), sizedBoxHeight(20.h), - text16w400_FCFCFC( - "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s . . ."), + SizedBox( + width: double.infinity, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text16w400_FCFCFC(description), + ], + ), + ), Row(children: [ InkWell( onTap: () { Get.toNamed(RouteName.reactionview); }, - child: stackReaction(number: '20', containerImages: [ + child: stackReaction(number: total_likes, containerImages: [ 'assets/images/png/f7_hand-thumbsup.png', 'assets/images/png/heart 2.png', 'assets/images/png/party-popper 2.png' @@ -510,7 +526,7 @@ Widget normalcardtile2({ ), ), sizedBoxWidth(12.w), - text14w400_FCFCFC('20'), + text14w400_FCFCFC(total_comments), sizedBoxWidth(20.w), commonContainer( width: 30.w, @@ -529,7 +545,7 @@ Widget normalcardtile2({ ), ), sizedBoxWidth(12.w), - text14w400_FCFCFC('10'), + text14w400_FCFCFC(total_save), ]), sizedBoxHeight(12.h), commonDivider(), @@ -1396,6 +1412,12 @@ Widget popularTab() { "title": "Edward Hackket", "mainImg": "assets/images/png/Rectangle 24.png", "containerTitle": ['Cycle', 'Marathon', 'Events', 'Marathon', 'Events'], + "desciption": "", + "create_at": '1 hour', + "total_comments": 20, + "total_likes": 20, + "total_save": 10, + "community_name": 'text', }, { "profileImg": "assets/images/png/Ellipse 52.png", @@ -1408,6 +1430,12 @@ Widget popularTab() { 'Marathon', 'Events' ], + "desciption": "", + "create_at": '1 hour', + "total_comments": 20, + "total_likes": 20, + "total_save": 10, + "community_name": 'text', }, { "profileImg": "assets/images/png/Ellipse 52.png", @@ -1420,6 +1448,12 @@ Widget popularTab() { 'Marathon', 'Events' ], + "desciption": "", + "create_at": '1 hour', + "total_comments": 20, + "total_likes": 20, + "total_save": 10, + "community_name": 'text', }, { "profileImg": "assets/images/png/Ellipse 52.png", @@ -1432,6 +1466,12 @@ Widget popularTab() { 'Marathon', 'Events' ], + "desciption": "", + "create_at": '1 hour', + "total_comments": 20, + "total_likes": 20, + "total_save": 10, + "community_name": 'text', }, ]; @@ -1446,10 +1486,17 @@ Widget popularTab() { return Column( children: [ normalcardtile2( - profileImg: popularTabData[index]["profileImg"], - title: popularTabData[index]["title"], - mainImg: popularTabData[index]["mainImg"], - containerTitle: popularTabData[index]["containerTitle"]), + profileImg: popularTabData[index]["profileImg"], + title: popularTabData[index]["title"], + mainImg: popularTabData[index]["mainImg"], + containerTitle: popularTabData[index]["containerTitle"], + description: 'test', + create_at: '1 hour', + total_comments: '20', + total_likes: '20', + total_save: '10', + community_name: 'text', + ), sizedBoxHeight(20.h) ], ); @@ -1460,98 +1507,168 @@ Widget popularTab() { ); } -Widget latestTab() { - List latestTabData = [ - { - "profileImg": "assets/images/png/Ellipse 43.png", - "title": "Edward Hackket", - "mainImg": "assets/images/png/Rectangle 24.png", - "containerTitle": ['Cycle', 'Marathon', 'Events', 'Marathon', 'Events'], - }, - { - "profileImg": "assets/images/png/Ellipse 52.png", - "title": "Ryan Dorwat", - "mainImg": "assets/images/png/Rectangle 25.png", - "containerTitle": [ - 'Football', - 'Teams player', - 'Events', - 'Marathon', - 'Events' - ], - }, - { - "profileImg": "assets/images/png/Ellipse 52.png", - "title": "Ryan Dorwat", - "mainImg": "assets/images/png/Rectangle 25.png", - "containerTitle": [ - 'Football', - 'Teams player', - 'Events', - 'Marathon', - 'Events' - ], - }, - { - "profileImg": "assets/images/png/Ellipse 52.png", - "title": "Ryan Dorwat", - "mainImg": "assets/images/png/Rectangle 25.png", - "containerTitle": [ - 'Football', - 'Teams player', - 'Events', - 'Marathon', - 'Events' - ], - }, - ]; +class LatestTab extends StatefulWidget { + const LatestTab({super.key}); - return Column(children: [ - sizedBoxHeight(16.h), - Expanded( - child: ListView.builder( - shrinkWrap: true, - itemCount: latestTabData.length, - itemBuilder: (context, index) { - if (index == 1) { - return announcecardtile( - profileImg: 'assets/images/png/Ellipse 48.png', - title: 'Jocelyn Dokidis', - mainImg: 'assets/images/png/Rectangle 46.png', - containerTitle: [ - 'Race', - 'Swimming', - 'Events', - 'Marathon', - 'Events' - ]); - } else { - return Column( - children: [ - normalcardtile2( - profileImg: latestTabData[index]["profileImg"], - title: latestTabData[index]["title"], - mainImg: latestTabData[index]["mainImg"], - containerTitle: latestTabData[index]["containerTitle"]), - sizedBoxHeight(20.h) - ], - ); - } - }, - ), - ), - - // normalcardtile2( - // profileImg: 'assets/images/png/Ellipse 43.png', - // title: 'Edward Hackket', - // mainImg: 'assets/images/png/Rectangle 24.png', - // containerTitle: ['Cycle', 'Marathon', 'Events', 'Marathon', 'Events']), - // sizedBoxHeight(20.h), - // announcecardtile( - // profileImg: 'assets/images/png/Ellipse 48.png', - // title: 'Jocelyn Dokidis', - // mainImg: 'assets/images/png/Rectangle 46.png', - // containerTitle: ['Race', 'Swimming', 'Events', 'Marathon', 'Events']), - // sizedBoxHeight(20.h), - ]); + @override + State createState() => _LatestTabState(); +} + +class _LatestTabState extends State { + late Future latestfuture; + + @override + void initState() { + latestfuture = LatespostApi().getLatestPostApi(); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return FutureBuilder( + future: latestfuture, + builder: (ctx, snapshot) { + if (snapshot.connectionState == ConnectionState.waiting) { + return + // ShimmerCommon(); + const Center( + child: CircularProgressIndicator( + color: Colors.blue, + ), + ); + } + + if (snapshot.hasError) { + return Center( + child: Text( + '${snapshot.error} occurred', + style: TextStyle(fontSize: 18.spMin), + ), + ); + } + + if (snapshot.connectionState == ConnectionState.done && + snapshot.hasData) { + print("Data fetched-->"); + + return Stack( + clipBehavior: Clip.none, + children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill), + ), + ), + Column( + children: [ + sizedBoxHeight(16.h), + Expanded( + child: ListView.builder( + shrinkWrap: true, + itemCount: latestpostobj!.data!.length, + itemBuilder: (context, index) { + if (index == 1) { + return announcecardtile( + profileImg: latestpostobj!.data![index] + .iamPrincipal!.profilePhoto ?? + '', + title: latestpostobj!.data![index].caption ?? '', + mainImg: 'assets/images/png/Rectangle 46.png', + containerTitle: [ + 'Race', + 'Swimming', + 'Events', + 'Marathon', + 'Events' + ]); + } else { + String? createAtstring = + latestpostobj!.data![index].createdAt; + if (createAtstring == null || + createAtstring.isEmpty) { + createAtstring = DateTime.now().toIso8601String(); + } + String? timeAgo; + + try { + DateTime postDateTime = + DateTime.parse(createAtstring); + DateTime now = DateTime.now(); + Duration difference = now.difference(postDateTime); + if (difference.inDays > 365) { + timeAgo = + '${(difference.inDays / 365).floor()} years ago'; + } else if (difference.inDays > 30) { + timeAgo = + '${(difference.inDays / 30).floor()} months ago'; + } else if (difference.inDays > 7) { + timeAgo = + '${(difference.inDays / 7).floor()} weeks ago'; + } else if (difference.inDays > 0) { + timeAgo = '${difference.inDays} days ago'; + } else if (difference.inHours > 0) { + timeAgo = '${difference.inHours} hours ago'; + } else if (difference.inMinutes > 0) { + timeAgo = '${difference.inMinutes} minutes ago'; + } else { + timeAgo = '${difference.inSeconds} seconds ago'; + } + print("Time ago: $timeAgo"); + } catch (e) { + print("Error parsing date: $e"); + String timeAgo = 'Unknown'; + } + + return Column( + children: [ + normalcardtile2( + profileImg: latestpostobj!.data![index] + .iamPrincipal!.profilePhoto ?? + '', + title: latestpostobj! + .data![index].iamPrincipal!.fullName ?? + '', + mainImg: + latestpostobj!.data![index].image ?? '', + containerTitle: + latestpostobj!.data![index].tagNames ?? + [''], + description: + latestpostobj!.data![index].caption ?? '', + create_at: timeAgo, + total_comments: latestpostobj! + .data![index].totalComment + .toString() ?? + '', + total_likes: latestpostobj! + .data![index].likecount + .toString() ?? + '', + total_save: latestpostobj! + .data![index].totalSave + .toString() ?? + '', + community_name: latestpostobj! + .data![index].community!.communityName + .toString() ?? + '', + ), + sizedBoxHeight(20.h) + ], + ); + } + }, + ), + ), + ], + ), + ], + ); + } + return Container(); + }, + ); + } } diff --git a/lib/Feed Module/Main_Screens/Community/CycleScreen.dart b/lib/Main_Screens/Community/CycleScreen.dart similarity index 95% rename from lib/Feed Module/Main_Screens/Community/CycleScreen.dart rename to lib/Main_Screens/Community/CycleScreen.dart index 799e14e..2bc64a9 100644 --- a/lib/Feed Module/Main_Screens/Community/CycleScreen.dart +++ b/lib/Main_Screens/Community/CycleScreen.dart @@ -5,9 +5,8 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/Community.dart'; +import 'package:regroup/Main_Screens/Community/Community.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -34,12 +33,13 @@ class _CycleScreenState extends State { width: 26.w, )), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), Column(children: [ + ), + Column(children: [ sizedBoxHeight(10.h), DefaultTabController( length: 2, @@ -137,11 +137,11 @@ Widget normalcardtile({ } } - return commonGlassContainer( + return commonGlassUI( width: double.infinity, height: 570.h, - border: 0, - borderradius: 1, + borderwidth: 0, + borderRadius: BorderRadius.circular( 1), customWidget: Column( children: [ sizedBoxHeight(25.h), @@ -283,7 +283,7 @@ Widget normalcardtile({ Get.toNamed(RouteName.postdetailsScreen); }, child: SizedBox( - height: 163.h, + height: 360.h, width: double.infinity, child: Image.asset( mainImg, @@ -327,13 +327,13 @@ Widget normalcardtile({ ]), ), const Spacer(), - commonGlassContainer( - border: 0.43, + commonGlassUI( + borderwidth: 0.43, width: 30.w, height: 30.h, opacity1: 0.05, opacity2: 0.06, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( 'assets/images/png/Frame 1000004088.png', @@ -345,11 +345,11 @@ Widget normalcardtile({ sizedBoxWidth(12.w), text14w400_FCFCFC('20'), sizedBoxWidth(20.w), - commonGlassContainer( - border: 0.43, + commonGlassUI( + borderwidth: 0.43, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.05, opacity2: 0.06, customWidget: Center( @@ -413,8 +413,10 @@ Widget normalcardtile({ itemScale: 0.4, itemSize: const Size(45, 45), boxPadding: const EdgeInsets.all(8), - boxAnimationDuration: const Duration(milliseconds: 200), - itemAnimationDuration: const Duration(milliseconds: 500), + boxAnimationDuration: + const Duration(milliseconds: 200), + itemAnimationDuration: + const Duration(milliseconds: 500), hoverDuration: const Duration(milliseconds: 700), // toggle: false, diff --git a/lib/Main_Screens/Community/Model/LatestPostModel.dart b/lib/Main_Screens/Community/Model/LatestPostModel.dart new file mode 100644 index 0000000..4d986aa --- /dev/null +++ b/lib/Main_Screens/Community/Model/LatestPostModel.dart @@ -0,0 +1,183 @@ +class LatestpostModel { + String? status; + int? statusCode; + String? message; + List? data; + + LatestpostModel({this.status, this.statusCode, this.message, this.data}); + + LatestpostModel.fromJson(Map json) { + status = json['status']; + statusCode = json['status_code']; + message = json['message']; + if (json['data'] != null) { + data = []; + json['data'].forEach((v) { + data!.add(Data.fromJson(v)); + }); + } + } + + Map toJson() { + final Map data = {}; + data['status'] = status; + data['status_code'] = statusCode; + data['message'] = message; + if (this.data != null) { + data['data'] = this.data!.map((v) => v.toJson()).toList(); + } + return data; + } +} + +class Data { + int? id; + int? likecount; + List? tagsXid; + bool? isILiked; + int? totalComment; + int? totalSave; + int? iamPrincipalXid; + int? postIn; + String? caption; + String? image; + String? manageTagsXids; + String? postAs; + String? ctaTitle; + String? ctaLink; + String? createdAt; + List? tagNames; + String? likeIcon; + IamPrincipal? iamPrincipal; + Community? community; + + Data( + {this.id, + this.likecount, + this.tagsXid, + this.isILiked, + this.totalComment, + this.totalSave, + this.iamPrincipalXid, + this.postIn, + this.caption, + this.image, + this.manageTagsXids, + this.postAs, + this.ctaTitle, + this.ctaLink, + this.createdAt, + this.tagNames, + this.likeIcon, + this.iamPrincipal, + this.community}); + + Data.fromJson(Map json) { + id = json['id']; + likecount = json['likecount']; + tagsXid = json['tags_xid'].cast(); + isILiked = json['is_i_liked']; + totalComment = json['total_comment']; + totalSave = json['total_save']; + iamPrincipalXid = json['iam_principal_xid']; + postIn = json['post_in']; + caption = json['caption']; + image = json['image']; + manageTagsXids = json['manage_tags_xids']; + postAs = json['post_as']; + ctaTitle = json['cta_title']; + ctaLink = json['cta_link']; + createdAt = json['created_at']; + tagNames = json['tag_names'].cast(); + likeIcon = json['likeIcon']; + iamPrincipal = json['iam_principal'] != null + ? IamPrincipal.fromJson(json['iam_principal']) + : null; + community = json['community'] != null + ? Community.fromJson(json['community']) + : null; + } + + Map toJson() { + final Map data = {}; + data['id'] = id; + data['likecount'] = likecount; + data['tags_xid'] = tagsXid; + data['is_i_liked'] = isILiked; + data['total_comment'] = totalComment; + data['total_save'] = totalSave; + data['iam_principal_xid'] = iamPrincipalXid; + data['post_in'] = postIn; + data['caption'] = caption; + data['image'] = image; + data['manage_tags_xids'] = manageTagsXids; + data['post_as'] = postAs; + data['cta_title'] = ctaTitle; + data['cta_link'] = ctaLink; + data['created_at'] = createdAt; + data['tag_names'] = tagNames; + data['likeIcon'] = likeIcon; + if (iamPrincipal != null) { + data['iam_principal'] = iamPrincipal!.toJson(); + } + if (community != null) { + data['community'] = community!.toJson(); + } + return data; + } +} + +class IamPrincipal { + int? id; + int? principalTypeXid; + String? userName; + String? fullName; + String? profilePhoto; + + IamPrincipal( + {this.id, + this.principalTypeXid, + this.userName, + this.fullName, + this.profilePhoto}); + + IamPrincipal.fromJson(Map json) { + id = json['id']; + principalTypeXid = json['principal_type_xid']; + userName = json['user_name']; + fullName = json['full_name']; + profilePhoto = json['profile_photo']; + } + + Map toJson() { + final Map data = {}; + data['id'] = id; + data['principal_type_xid'] = principalTypeXid; + data['user_name'] = userName; + data['full_name'] = fullName; + data['profile_photo'] = profilePhoto; + return data; + } +} + +class Community { + int? id; + String? communityProfilePhoto; + String? communityName; + + Community({this.id, this.communityProfilePhoto, this.communityName}); + + Community.fromJson(Map json) { + id = json['id']; + communityProfilePhoto = json['community_profile_photo']; + communityName = json['community_name']; + } + + Map toJson() { + final Map data = {}; + data['id'] = id; + data['community_profile_photo'] = communityProfilePhoto; + data['community_name'] = communityName; + return data; + } +} diff --git a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart b/lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart similarity index 96% rename from lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart rename to lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart index d028ed2..f601660 100644 --- a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart +++ b/lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart @@ -125,11 +125,11 @@ class _PostDetailsScreenState extends State { } } - return commonGlassContainer( + return commonGlassUI( width: double.infinity, height: 570.h, - border: 0, - borderradius: 0, + borderwidth: 0, + borderRadius: BorderRadius.circular(0), customWidget: Column( children: [ sizedBoxHeight(25.h), @@ -151,14 +151,14 @@ class _PostDetailsScreenState extends State { children: [ text16w400_FCFCFC(title), const Spacer(), - commonGlassContainer( + commonGlassUI( width: 72.w, height: 26.h, - borderradius: 5.r, + borderRadius: BorderRadius.circular(5.r), borderColor: const Color(0xFFD90B2E), customWidget: Center(child: text14400white("Follow")), - border: 1), + borderwidth: 1), sizedBoxWidth(6.w), PopupMenuButton( surfaceTintColor: const Color(0xFF222935), @@ -329,11 +329,11 @@ class _PostDetailsScreenState extends State { 'assets/images/png/party-popper 2.png' ]), const Spacer(), - commonGlassContainer( - border: 0.9, + commonGlassUI( + borderwidth: 0.9, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), customWidget: Center( child: Image.asset( 'assets/images/png/Frame 1000004088.png', @@ -345,11 +345,11 @@ class _PostDetailsScreenState extends State { sizedBoxWidth(12.w), text14w400_FCFCFC('20'), sizedBoxWidth(20.w), - commonGlassContainer( - border: 0.9, + commonGlassUI( + borderwidth: 0.9, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( 'assets/images/png/Vector (1).png', @@ -452,11 +452,11 @@ class _PostDetailsScreenState extends State { } Widget containertile({required String text}) { - return commonGlassContainer( - border: 0.9, + return commonGlassUI( + borderwidth: 0.9, width: 100.w, height: 30.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), borderColor: const Color(0xFFD90B2E), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 10.w), diff --git a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart b/lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart similarity index 95% rename from lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart rename to lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart index 8519d05..a0e03ac 100644 --- a/lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart +++ b/lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart @@ -93,13 +93,13 @@ class _ReactionViewState extends State { ), Tab( child: Row(children: [ - commonGlassContainer( + commonGlassUI( borderColor: const Color(0xFF1E3A46), opacity1: 0.05, opacity2: 0.06, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/f7_hand-thumbsup.png", @@ -107,20 +107,20 @@ class _ReactionViewState extends State { width: 17.w, ), ), - border: 1.71), + borderwidth: 1.71), const Spacer(), text14400white("110K"), ]), ), Tab( child: Row(children: [ - commonGlassContainer( + commonGlassUI( borderColor: const Color(0xFF1E3A46), opacity1: 0.05, opacity2: 0.06, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/heart 2.png", @@ -128,20 +128,20 @@ class _ReactionViewState extends State { width: 17.w, ), ), - border: 1.71), + borderwidth: 1.71), const Spacer(), text14400white("9.7K"), ]), ), Tab( child: Row(children: [ - commonGlassContainer( + commonGlassUI( borderColor: const Color(0xFF1E3A46), opacity1: 0.05, opacity2: 0.06, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/party-popper 2.png", @@ -149,7 +149,7 @@ class _ReactionViewState extends State { width: 17.w, ), ), - border: 1.71), + borderwidth: 1.71), const Spacer(), text14400white("7.4K"), ]), diff --git a/lib/Feed Module/Main_Screens/Community/PostScreen.dart b/lib/Main_Screens/Community/PostScreen.dart similarity index 100% rename from lib/Feed Module/Main_Screens/Community/PostScreen.dart rename to lib/Main_Screens/Community/PostScreen.dart diff --git a/lib/Main_Screens/Community/ViewModel/LatestPost.dart b/lib/Main_Screens/Community/ViewModel/LatestPost.dart new file mode 100644 index 0000000..f536630 --- /dev/null +++ b/lib/Main_Screens/Community/ViewModel/LatestPost.dart @@ -0,0 +1,26 @@ +import 'package:regroup/Common/api_urls.dart'; +import 'package:regroup/Common/base_manager.dart'; +import 'package:regroup/Common/controller/data/network/network_api.dart'; +import 'package:regroup/Main_Screens/Community/Model/LatestPostModel.dart'; + +LatestpostModel? latestpostobj; + +class LatespostApi { + LatespostApi(); + + Future> getLatestPostApi() async { + final response = await NetworkApiServices().getApi(ApiUrls.getlatestpost); + + if (response.status == ResponseStatus.SUCCESS) { + if (response.data["status"] == "success") { + latestpostobj = LatestpostModel.fromJson(response.data); + } + return ResponseData( + response.data['message'], ResponseStatus.SUCCESS, + data: response.data); + } else { + return ResponseData( + response.data['message'], ResponseStatus.FAILED); + } + } +} \ No newline at end of file diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart b/lib/Main_Screens/ExploreDesign/DetailExplore.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart rename to lib/Main_Screens/ExploreDesign/DetailExplore.dart index 110c852..65c12a9 100644 --- a/lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart +++ b/lib/Main_Screens/ExploreDesign/DetailExplore.dart @@ -41,16 +41,16 @@ class _DetailExploreState extends State { onTap: () { Get.back(); }, - child: commonGlassContainer( + child: commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: const Center( child: Icon( Icons.arrow_back, color: Colors.white, )), - border: 1, + borderwidth: 1, borderColor: const Color(0xFF55434F)), ), sizedBoxWidth(12.w), diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart b/lib/Main_Screens/ExploreDesign/ExploreScreen.dart similarity index 96% rename from lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart rename to lib/Main_Screens/ExploreDesign/ExploreScreen.dart index 20b4b60..46ce3d8 100644 --- a/lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart +++ b/lib/Main_Screens/ExploreDesign/ExploreScreen.dart @@ -191,10 +191,10 @@ class _ExploreScreenState extends State { sizedBoxHeight(25.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/community 1 (traced).png", @@ -202,21 +202,21 @@ class _ExploreScreenState extends State { width: 18.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(10.w), text16400white("10 subgroups "), const Spacer(), - commonGlassContainer( + commonGlassUI( width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/ph_users-light.png", height: 18.h, width: 18.w, )), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(10.w), text16400white("7 members"), ], @@ -224,14 +224,14 @@ class _ExploreScreenState extends State { sizedBoxHeight(30.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 170.w, height: 35.h, opacity1: 0.05, opacity2: 0.07, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), customWidget: Center(child: text14w400_FCFCFC("Message")), - border: 1), + borderwidth: 1), const Spacer(), Container( width: 170.w, diff --git a/lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart b/lib/Main_Screens/ExploreDesign/SearchGroup.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart rename to lib/Main_Screens/ExploreDesign/SearchGroup.dart index 255ab64..1649038 100644 --- a/lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart +++ b/lib/Main_Screens/ExploreDesign/SearchGroup.dart @@ -125,10 +125,10 @@ class _SearchGroupState extends State { Widget rowTile({required String imagePath, required String title}) { return Row( children: [ - commonGlassContainer( + commonGlassUI( width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( imagePath, @@ -136,7 +136,7 @@ class _SearchGroupState extends State { width: 16.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(12.w), text16400white(title), const Spacer(), diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart b/lib/Main_Screens/GroupTab/View/ConnectCommunity.dart similarity index 98% rename from lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart rename to lib/Main_Screens/GroupTab/View/ConnectCommunity.dart index 14d0c1f..4554fd1 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart +++ b/lib/Main_Screens/GroupTab/View/ConnectCommunity.dart @@ -78,11 +78,11 @@ class _ConnectCommunityState extends State { padding: EdgeInsets.only(bottom: 25.h), child: GestureDetector( onTap: ontap, - child: commonGlassContainer( - border: 0.9, + child: commonGlassUI( + borderwidth: 0.9, width: double.infinity, height: 162.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h), child: Column( diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart b/lib/Main_Screens/GroupTab/View/GoupSettings.dart similarity index 100% rename from lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart rename to lib/Main_Screens/GroupTab/View/GoupSettings.dart diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart b/lib/Main_Screens/GroupTab/View/GroupDetail.dart similarity index 98% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart rename to lib/Main_Screens/GroupTab/View/GroupDetail.dart index ca7f802..08d0779 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart +++ b/lib/Main_Screens/GroupTab/View/GroupDetail.dart @@ -111,12 +111,12 @@ class _GroupDetailState extends State { ), ), ], - child: commonGlassContainer( + child: commonGlassUI( opacity1: 0.24, opacity2: 0.24, width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/Vector536.png", @@ -124,7 +124,7 @@ class _GroupDetailState extends State { width: 17.w, ), ), - border: 0.5), + borderwidth: 0.5), ), sizedBoxWidth(16.w), PopupMenuButton( @@ -370,10 +370,10 @@ class _GroupDetailState extends State { ], ), sizedBoxHeight(25.h), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 135.h, - borderradius: 10, + borderRadius: BorderRadius.circular( 10), customWidget: Padding( padding: EdgeInsets.symmetric( vertical: 12.h, horizontal: 16.w), @@ -420,12 +420,12 @@ class _GroupDetailState extends State { ], ), ), - border: 1), + borderwidth: 1), sizedBoxHeight(20.h), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 51.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.only(right: 16.w), child: Center( @@ -447,7 +447,7 @@ class _GroupDetailState extends State { ]), ), ), - border: 1), + borderwidth: 1), sizedBoxHeight(20.h), Row( children: [ @@ -484,10 +484,10 @@ class _GroupDetailState extends State { ), ), sizedBoxHeight(25.h), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 51.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 12.w), child: Row(children: [ @@ -523,7 +523,7 @@ class _GroupDetailState extends State { ) ]), ), - border: 1), + borderwidth: 1), sizedBoxHeight(25.h), ], ), diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart b/lib/Main_Screens/GroupTab/View/GroupEvent.dart similarity index 94% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart rename to lib/Main_Screens/GroupTab/View/GroupEvent.dart index 5b7553e..21ce10b 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart +++ b/lib/Main_Screens/GroupTab/View/GroupEvent.dart @@ -109,11 +109,11 @@ class _GroupEventState extends State { borderType: BorderType.RRect, radius: Radius.circular(14.r), color: const Color(0xFF434A53), - child: commonGlassContainer( - border: 0, + child: commonGlassUI( + borderwidth: 0, width: double.infinity, height: 130.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: bannerPath.isNotEmpty && isbannerAdded ? Stack(children: [ Image.file( @@ -166,10 +166,10 @@ class _GroupEventState extends State { ), ), sizedBoxHeight(20.h), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 60.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Center( child: Padding( padding: EdgeInsets.symmetric(horizontal: 12.w), @@ -203,7 +203,7 @@ class _GroupEventState extends State { ]), ), ), - border: 1), + borderwidth: 1), sizedBoxHeight(20.h), text16400white("Type of event"), sizedBoxHeight(14.h), @@ -319,10 +319,10 @@ class _GroupEventState extends State { }); } }, - child: commonGlassContainer( + child: commonGlassUI( width: 174.w, height: 50.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), customWidget: Center( child: Row(children: [ sizedBoxWidth(16.w), @@ -336,7 +336,7 @@ class _GroupEventState extends State { formatTimeOfDay(starttime!)), ]), ), - border: 1), + borderwidth: 1), ) ], ), @@ -357,10 +357,10 @@ class _GroupEventState extends State { }); } }, - child: commonGlassContainer( + child: commonGlassUI( width: 174.w, height: 50.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), customWidget: Center( child: Row(children: [ sizedBoxWidth(16.w), @@ -374,7 +374,7 @@ class _GroupEventState extends State { formatTimeOfDay(endtime!)), ]), ), - border: 1), + borderwidth: 1), ) ], ), @@ -384,9 +384,9 @@ class _GroupEventState extends State { Row( children: [ Obx(() { - return commonGlassContainer( - border: 1, - borderradius: 2, + return commonGlassUI( + borderwidth: 1, + borderRadius: BorderRadius.circular( 2), height: 23.h, width: 23.w, opacity1: 0.24, @@ -487,19 +487,19 @@ class _GroupEventState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - commonGlassContainer( + commonGlassUI( height: 50.h, width: 127.w, - borderradius: 30.r, - border: 1, + borderRadius: BorderRadius.circular( 30.r), + borderwidth: 1, customWidget: Center( child: text16400white("2"), )), - commonGlassContainer( + commonGlassUI( height: 50.h, width: 215.w, - borderradius: 30.r, - border: 1, + borderRadius: BorderRadius.circular( 30.r), + borderwidth: 1, customWidget: Center( child: Row( mainAxisAlignment: MainAxisAlignment.center, @@ -528,10 +528,10 @@ class _GroupEventState extends State { required String imagePath, required String title, }) { - return commonGlassContainer( + return commonGlassUI( width: double.infinity, height: 50.h, - borderradius: 30, + borderRadius: BorderRadius.circular( 30), customWidget: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Center( @@ -553,6 +553,6 @@ class _GroupEventState extends State { ), ), ), - border: 1); + borderwidth: 1); } } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart b/lib/Main_Screens/GroupTab/View/GroupInfo.dart similarity index 94% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart rename to lib/Main_Screens/GroupTab/View/GroupInfo.dart index 2da225c..15b57ee 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart +++ b/lib/Main_Screens/GroupTab/View/GroupInfo.dart @@ -94,12 +94,12 @@ class _GroupInfoState extends State { sizedBoxHeight(30.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, opacity1: 0.24, opacity2: 0.24, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/Group 58645.png", @@ -107,7 +107,7 @@ class _GroupInfoState extends State { width: 13.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(12.w), text16400white("Elm street london, United Kingdom") ], @@ -115,12 +115,12 @@ class _GroupInfoState extends State { sizedBoxHeight(30.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, opacity1: 0.24, opacity2: 0.24, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/Vector2a.png", @@ -128,7 +128,7 @@ class _GroupInfoState extends State { width: 20.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(12.w), text16400white("www.exampledummywebsite.com") ], diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart b/lib/Main_Screens/GroupTab/View/GroupManage.dart similarity index 93% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart rename to lib/Main_Screens/GroupTab/View/GroupManage.dart index cc5680f..47f895e 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart +++ b/lib/Main_Screens/GroupTab/View/GroupManage.dart @@ -142,10 +142,10 @@ class _GroupManageState extends State { hintText: "Start date - End date", )), const Spacer(), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( @@ -155,7 +155,7 @@ class _GroupManageState extends State { width: 23.w, ), ), - border: 0.5) + borderwidth: 0.5) ], ), ], @@ -235,32 +235,32 @@ class _GroupManageState extends State { sizedBoxHeight(16.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("M")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Tu")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("W")), - border: 0.5), + borderwidth: 0.5), const Spacer(), Row( children: [ @@ -280,32 +280,32 @@ class _GroupManageState extends State { sizedBoxHeight(20.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Th")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("F")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Sa")), - border: 0.5), + borderwidth: 0.5), const Spacer(), Row( children: [ @@ -414,10 +414,10 @@ class _GroupManageState extends State { hintText: "Start date - End date", )), const Spacer(), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( @@ -427,7 +427,7 @@ class _GroupManageState extends State { width: 23.w, ), ), - border: 0.5) + borderwidth: 0.5) ], ), ], @@ -538,10 +538,10 @@ class _GroupManageState extends State { hintText: "Start date - End date", )), const Spacer(), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( @@ -551,7 +551,7 @@ class _GroupManageState extends State { width: 23.w, ), ), - border: 0.5) + borderwidth: 0.5) ], ), ], diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart b/lib/Main_Screens/GroupTab/View/GroupTab.dart similarity index 91% rename from lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart rename to lib/Main_Screens/GroupTab/View/GroupTab.dart index 48c419d..07e3994 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart +++ b/lib/Main_Screens/GroupTab/View/GroupTab.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/controller/MainScreen.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -232,8 +232,8 @@ class _GroupTabState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Mute group"), - const Spacer(), + text14w400_FCFCFC("Mute community"), + Spacer(), Image.asset( "assets/images/png/Black (1).png", height: 18.h, @@ -243,7 +243,7 @@ class _GroupTabState extends State { ), ), ), - const PopupMenuDivider(), + PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -251,29 +251,10 @@ class _GroupTabState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Pin group"), - const Spacer(), + text14w400_FCFCFC("Hide post"), + Spacer(), Image.asset( - "assets/images/png/f7_pin-fill (2).png", - height: 27.h, - width: 27.w, - ) - ], - ), - ), - ), - const PopupMenuDivider(), - PopupMenuItem( - onTap: () {}, - child: Padding( - padding: - EdgeInsets.symmetric(horizontal: 8.w), - child: Row( - children: [ - text14w400_FCFCFC("Make primary"), - const Spacer(), - Image.asset( - "assets/images/png/leave group.png", + "assets/images/png/mingcute_eye-close-line.png", height: 20.h, width: 20.w, ) @@ -281,7 +262,7 @@ class _GroupTabState extends State { ), ), ), - const PopupMenuDivider(), + PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -289,11 +270,29 @@ class _GroupTabState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - // text14w400_FCFCFC("Leave group"), - text14w400_D90B2E("Leave group"), - const Spacer(), + text14w400_FCFCFC("Pin"), + Spacer(), Image.asset( - "assets/images/png/LightGray22.png", + "assets/images/png/f7_pin-fill (2).png", + height: 25.h, + width: 25.w, + ) + ], + ), + ), + ), + PopupMenuDivider(), + PopupMenuItem( + onTap: () {}, + child: Padding( + padding: + EdgeInsets.symmetric(horizontal: 8.w), + child: Row( + children: [ + text14w400_FCFCFC("Leave community"), + Spacer(), + Image.asset( + "assets/images/png/logout 1 (traced).png", height: 18.h, width: 18.w, ) diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart b/lib/Main_Screens/GroupTab/View/NewPost.dart similarity index 98% rename from lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart rename to lib/Main_Screens/GroupTab/View/NewPost.dart index 7868e11..582fbe5 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart +++ b/lib/Main_Screens/GroupTab/View/NewPost.dart @@ -84,11 +84,11 @@ class _NewPostState extends State { borderType: BorderType.RRect, radius: Radius.circular(14.r), color: const Color(0xFF434A53), - child: commonGlassContainer( - border: 0, + child: commonGlassUI( + borderwidth: 0, width: double.infinity, height: 130.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: bannerPath.isNotEmpty && isbannerAdded ? Stack(children: [ Image.file( diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart b/lib/Main_Screens/GroupTab/View/RequestedGroups.dart similarity index 90% rename from lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart rename to lib/Main_Screens/GroupTab/View/RequestedGroups.dart index 07ba70a..7fc0186 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart +++ b/lib/Main_Screens/GroupTab/View/RequestedGroups.dart @@ -144,8 +144,8 @@ class _RequestedGroupsState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Mute group"), - const Spacer(), + text14w400_FCFCFC("Mute community"), + Spacer(), Image.asset( "assets/images/png/Black (1).png", height: 18.h, @@ -155,7 +155,7 @@ class _RequestedGroupsState extends State { ), ), ), - const PopupMenuDivider(), + PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -163,29 +163,10 @@ class _RequestedGroupsState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Pin group"), - const Spacer(), + text14w400_FCFCFC("Hide post"), + Spacer(), Image.asset( - "assets/images/png/f7_pin-fill (2).png", - height: 27.h, - width: 27.w, - ) - ], - ), - ), - ), - const PopupMenuDivider(), - PopupMenuItem( - onTap: () {}, - child: Padding( - padding: - EdgeInsets.symmetric(horizontal: 8.w), - child: Row( - children: [ - text14w400_FCFCFC("Make primary"), - const Spacer(), - Image.asset( - "assets/images/png/leave group.png", + "assets/images/png/mingcute_eye-close-line.png", height: 20.h, width: 20.w, ) @@ -193,7 +174,7 @@ class _RequestedGroupsState extends State { ), ), ), - const PopupMenuDivider(), + PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -201,11 +182,29 @@ class _RequestedGroupsState extends State { EdgeInsets.symmetric(horizontal: 8.w), child: Row( children: [ - // text14w400_FCFCFC("Leave group"), - text14w400_D90B2E("Leave group"), - const Spacer(), + text14w400_FCFCFC("Pin"), + Spacer(), Image.asset( - "assets/images/png/LightGray22.png", + "assets/images/png/f7_pin-fill (2).png", + height: 25.h, + width: 25.w, + ) + ], + ), + ), + ), + PopupMenuDivider(), + PopupMenuItem( + onTap: () {}, + child: Padding( + padding: + EdgeInsets.symmetric(horizontal: 8.w), + child: Row( + children: [ + text14w400_FCFCFC("Leave community"), + Spacer(), + Image.asset( + "assets/images/png/logout 1 (traced).png", height: 18.h, width: 18.w, ) diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart b/lib/Main_Screens/GroupTab/View/Sessions.dart similarity index 96% rename from lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart rename to lib/Main_Screens/GroupTab/View/Sessions.dart index 93640e3..9f06afd 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart +++ b/lib/Main_Screens/GroupTab/View/Sessions.dart @@ -245,9 +245,9 @@ class _SessionsState extends State { Row( children: [ Obx(() { - return commonGlassContainer( - border: 1, - borderradius: 2, + return commonGlassUI( + borderwidth: 1, + borderRadius: BorderRadius.circular( 2), height: 23.h, width: 23.w, opacity1: 0.24, @@ -334,19 +334,19 @@ class _SessionsState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - commonGlassContainer( + commonGlassUI( height: 50.h, width: 127.w, - borderradius: 30.r, - border: 1, + borderRadius: BorderRadius.circular( 30.r), + borderwidth: 1, customWidget: Center( child: text16400white("2"), )), - commonGlassContainer( + commonGlassUI( height: 50.h, width: 215.w, - borderradius: 30.r, - border: 1, + borderRadius: BorderRadius.circular( 30.r), + borderwidth: 1, customWidget: Center( child: Row( mainAxisAlignment: @@ -385,11 +385,11 @@ class _SessionsState extends State { borderType: BorderType.RRect, radius: Radius.circular(14.r), color: const Color(0xFF434A53), - child: commonGlassContainer( - border: 0, + child: commonGlassUI( + borderwidth: 0, width: double.infinity, height: 130.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: bannerPath.isNotEmpty && isbannerAdded ? Stack(children: [ diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart b/lib/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart similarity index 98% rename from lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart rename to lib/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart index 9c87a1e..5adbe64 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart +++ b/lib/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart @@ -123,11 +123,11 @@ class _EditSubgroupInfoState extends State { }, ); }, - child: commonGlassContainer( - border: 0.9, + child: commonGlassUI( + borderwidth: 0.9, width: double.infinity, height: 150.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular(10.r), customWidget: bannerPath.isNotEmpty && isbannerAdded ? Stack(children: [ Image.file( diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart b/lib/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart similarity index 95% rename from lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart rename to lib/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart index 1d7e562..0ea1678 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart +++ b/lib/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -77,12 +77,12 @@ class _SubGroupInfoState extends State { ), ), ], - child: commonGlassContainer( + child: commonGlassUI( opacity1: 0.24, opacity2: 0.24, width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/Vector536.png", @@ -90,19 +90,19 @@ class _SubGroupInfoState extends State { width: 17.w, ), ), - border: 0.5), + borderwidth: 0.5), ), sizedBoxWidth(16.w), GestureDetector( onTap: () { Get.toNamed(RouteName.editsubgroupinfo); }, - child: commonGlassContainer( + child: commonGlassUI( opacity1: 0.24, opacity2: 0.24, width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/codicon_account.png", @@ -110,7 +110,7 @@ class _SubGroupInfoState extends State { width: 20.w, ), ), - border: 0.5), + borderwidth: 0.5), ), sizedBoxWidth(16.w), PopupMenuButton( @@ -245,7 +245,8 @@ class _SubGroupInfoState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), ), SingleChildScrollView( child: @@ -300,31 +301,31 @@ class _SubGroupInfoState extends State { sizedBoxHeight(16.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( child: Image.asset("assets/images/png/Black.png", height: 20.h, width: 20.w), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(7.w), text16w400_FCFCFCblur("The athlectic town"), sizedBoxWidth(20.w), - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, opacity1: 0.24, opacity2: 0.24, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset("assets/images/png/img12.png", height: 20.h, width: 20.w), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(7.w), text16w400_FCFCFCblur("Public"), ], @@ -401,11 +402,11 @@ class _SubGroupInfoState extends State { } } - return commonGlassContainer( + return commonGlassUI( width: double.infinity, height: 570.h, - border: 0, - borderradius: 1, + borderwidth: 0, + borderRadius: BorderRadius.circular( 1), customWidget: Column( children: [ sizedBoxHeight(25.h), @@ -591,13 +592,13 @@ class _SubGroupInfoState extends State { ]), ), const Spacer(), - commonGlassContainer( - border: 0.43, + commonGlassUI( + borderwidth: 0.43, width: 30.w, height: 30.h, opacity1: 0.05, opacity2: 0.06, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( 'assets/images/png/Frame 1000004088.png', @@ -609,11 +610,11 @@ class _SubGroupInfoState extends State { sizedBoxWidth(12.w), text14w400_FCFCFC('20'), sizedBoxWidth(20.w), - commonGlassContainer( - border: 0.43, + commonGlassUI( + borderwidth: 0.43, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.05, opacity2: 0.06, customWidget: Center( @@ -677,8 +678,10 @@ class _SubGroupInfoState extends State { itemScale: 0.4, itemSize: const Size(45, 45), boxPadding: const EdgeInsets.all(8), - boxAnimationDuration: const Duration(milliseconds: 200), - itemAnimationDuration: const Duration(milliseconds: 500), + boxAnimationDuration: + const Duration(milliseconds: 200), + itemAnimationDuration: + const Duration(milliseconds: 500), hoverDuration: const Duration(milliseconds: 700), // toggle: false, @@ -751,11 +754,11 @@ class _SubGroupInfoState extends State { } Widget containertile({required String text}) { - return commonGlassContainer( - border: 1, + return commonGlassUI( + borderwidth: 1, width: 100.w, height: 30.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), borderColor: const Color(0xFFD90B2E), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 10.w), diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart b/lib/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart similarity index 70% rename from lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart rename to lib/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart index 7918eac..701bb6a 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart +++ b/lib/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -39,57 +39,56 @@ class _SubGroupSettingState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), Column( - crossAxisAlignment: CrossAxisAlignment.start, + ), + Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(30.h), + GestureDetector( + onTap: () { + inviteBottomSheet(); + }, + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Row( children: [ - sizedBoxHeight(30.h), - GestureDetector( - onTap: () { - inviteBottomSheet(); - }, - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Row( - children: [ - text18w400_FCFCFC("Group type"), - Spacer(), - Icon( - Icons.arrow_forward_ios_outlined, - color: Colors.white, - size: 18.sp, - ) - ], - ), - ), + text18w400_FCFCFC("Group type"), + Spacer(), + Icon( + Icons.arrow_forward_ios_outlined, + color: Colors.white, + size: 18.sp, + ) + ], ), - sizedBoxHeight(25.h), - commonDivider(), - sizedBoxHeight(25.h), - GestureDetector( - onTap: () { - Get.toNamed(RouteName.groupmanage); - }, - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Row( - children: [ - text18w400_FCFCFC("Manage members"), - Spacer(), - Icon( - Icons.arrow_forward_ios_outlined, - color: Colors.white, - size: 18.sp, - ) - ], - ), - ), + ), + ), + sizedBoxHeight(25.h), + commonDivider(), + sizedBoxHeight(25.h), + GestureDetector( + onTap: () { + Get.toNamed(RouteName.groupmanage); + }, + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Row( + children: [ + text18w400_FCFCFC("Manage members"), + Spacer(), + Icon( + Icons.arrow_forward_ios_outlined, + color: Colors.white, + size: 18.sp, + ) + ], ), - ]) + ), + ), + ]) ])); } diff --git a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart b/lib/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart similarity index 88% rename from lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart rename to lib/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart index 6b1b40d..d2d5b39 100644 --- a/lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart +++ b/lib/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -73,29 +73,30 @@ class _SubGroupsState extends State { image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - sizedBoxHeight(30.h), - Expanded( - child: ListView.builder( - shrinkWrap: true, - physics: BouncingScrollPhysics(), - itemCount: subgroupData.length, - itemBuilder: (context, index) { - return subgroupCard( - ontap: () { - Get.toNamed(RouteName.groupdetail); - }, - imagepath: subgroupData[index]['imagePath'], - title: subgroupData[index]['text'], - members: subgroupData[index]['members']); - }, - ), - ) - ])) + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + sizedBoxHeight(30.h), + Expanded( + child: ListView.builder( + shrinkWrap: true, + physics: BouncingScrollPhysics(), + itemCount: subgroupData.length, + itemBuilder: (context, index) { + return subgroupCard( + ontap: () { + Get.toNamed(RouteName.groupdetail); + }, + imagepath: subgroupData[index]['imagePath'], + title: subgroupData[index]['text'], + members: subgroupData[index]['members']); + }, + ), + ) + ])) ])); } @@ -109,11 +110,11 @@ class _SubGroupsState extends State { padding: EdgeInsets.only(bottom: 25.h), child: GestureDetector( onTap: ontap, - child: commonGlassContainer( - border: 0.9, + child: commonGlassUI( + borderwidth: 0.9, width: double.infinity, height: 162.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h), child: Column( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart b/lib/Main_Screens/ProfileTab/Badges/Badges.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart rename to lib/Main_Screens/ProfileTab/Badges/Badges.dart index 8ec6f61..31dcdb2 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart +++ b/lib/Main_Screens/ProfileTab/Badges/Badges.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -54,7 +54,8 @@ class _BadgesState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), ), SingleChildScrollView( child: Padding( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart b/lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart similarity index 99% rename from lib/Feed Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart rename to lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart index a1ffd3a..2cc96d6 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart +++ b/lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart @@ -7,7 +7,7 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart' hide MultipartFile, FormData; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart b/lib/Main_Screens/ProfileTab/Certificate/Certificate.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart rename to lib/Main_Screens/ProfileTab/Certificate/Certificate.dart index d7b1fdd..a4f129a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart +++ b/lib/Main_Screens/ProfileTab/Certificate/Certificate.dart @@ -1,8 +1,8 @@ - import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart b/lib/Main_Screens/ProfileTab/Clubs/Clubs.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart rename to lib/Main_Screens/ProfileTab/Clubs/Clubs.dart index b592b83..43e71bb 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart +++ b/lib/Main_Screens/ProfileTab/Clubs/Clubs.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -44,13 +44,14 @@ class _ClubsState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( + ), + SingleChildScrollView( + child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column(children: [ sizedBoxHeight(25.h), @@ -80,11 +81,11 @@ class _ClubsState extends State { padding: EdgeInsets.only(bottom: 25.h), child: GestureDetector( onTap: ontap, - child: commonGlassContainer( - border: 0.9, + child: commonGlassUI( + borderwidth: 0.9, width: double.infinity, height: 143.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 16.h), child: Column( @@ -218,5 +219,4 @@ class _ClubsState extends State { ), ); } - } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart b/lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart rename to lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart b/lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart rename to lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart b/lib/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart rename to lib/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart similarity index 99% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart index 9b23da0..a012092 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart @@ -8,8 +8,8 @@ import 'package:get/get.dart' hide MultipartFile, FormData; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/ImageUpload.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart similarity index 93% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart index b67f5fb..3a512b3 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart @@ -9,9 +9,10 @@ import 'package:get/get.dart' hide MultipartFile, FormData; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; + import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; @@ -29,7 +30,7 @@ class EditProfile extends StatefulWidget { State createState() => _EditProfileState(); } -//location in normal profile individual api + class _EditProfileState extends State { TextEditingController fullNameController = TextEditingController(); @@ -72,7 +73,7 @@ class _EditProfileState extends State { RxBool isloading = true.obs; void getCatIdFromName(List selectedInterests) { - // selectedinterestid.clear(); + for (var name in selectedInterests) { for (var i = 0; i < interestlistobj!.data!.length; i++) { if (name == interestlistobj!.data![i].name) { @@ -130,32 +131,30 @@ class _EditProfileState extends State { : selectedinterestid; String abilitiesIds = selectedinterestid.toString(); - print("Interests String: $abilitiesIds"); if (editProfileImage.usserprofilePicPath.value.isNotEmpty) { imageFile = await MultipartFile.fromFile( editProfileImage.usserprofilePicPath.value, filename: path.basename(profilePicture), ); - print(imageFile.toString()); } updata = FormData.fromMap({ - // "email_address": "priyanka14@yopmail.com", + "full_name": fullNameController.text, "profile_image": editProfileImage.usserprofilePicPath.isNotEmpty ? imageFile : null, - // profilePicture.isNotEmpty - // ? await convertFileToMultiPart1(profilePicture) - // : null, - // "profile_image": "ghjkk.png", + + + + "user_name": userNameController.text, "date_of_birth": dateController.text, "gender": _selectedgenderType, - // "interest": "selectedSportsIds", + "interest": - // '[1,2,3,4]', + abilitiesIds, "about": aboutController.text, "position": positionController.text, @@ -166,7 +165,6 @@ class _EditProfileState extends State { "address_line1": battingAvgController.text, }); log(updata.toString()); - print(imageFile.toString()); final data = await EditProfileApi().postEditProfileIndividual(updata); if (data.status == ResponseStatus.SUCCESS) { @@ -174,7 +172,7 @@ class _EditProfileState extends State { Get.toNamed(RouteName.mainscreen, arguments: 4); } else { Get.back(); - // btnController.reset(); + Get.snackbar( "Error!", data.data['message'], @@ -185,7 +183,7 @@ class _EditProfileState extends State { snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); - // _controller.isTextFieldEnabled.value = true; + } } @@ -224,7 +222,6 @@ class _EditProfileState extends State { if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { - print("Data fetched-->"); return Stack(children: [ Container( decoration: const BoxDecoration( @@ -252,7 +249,7 @@ class _EditProfileState extends State { .value != '' ? Image( - // File(profilePicture), + image: FileImage( File( editProfileImage @@ -314,16 +311,14 @@ class _EditProfileState extends State { context, true, (result) { - // var filenameresult = - // extractFileName1(result); + + editProfileImage .usserprofilePicPath .value = result; var filenameresult = extractFileName1(result); - print( - "File name is $filenameresult"); profilePicture = result; isImageAdded = true; @@ -488,8 +483,8 @@ class _EditProfileState extends State { ), sizedBoxHeight(16.h), - //Obx(() { - //return + + CustomDropDownChexkBox( header: 'Select interest', title: "", @@ -500,10 +495,10 @@ class _EditProfileState extends State { width: 18.w, height: 17.h, ), - // showOtherOption: true, + initiallySelected: listofUserInterests, ), - // }), + sizedBoxHeight(20.h), text16400white("About"), @@ -514,7 +509,7 @@ class _EditProfileState extends State { "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard", maxlines: 3, ), - // sizedBoxHeight(20.h), + text16400white("Position"), sizedBoxHeight(16.h), @@ -556,7 +551,7 @@ class _EditProfileState extends State { CustomTextFormField( textEditingController: weightController, hintText: "Enter your weight", - inputFormatters: [ + inputFormatters: [ FilteringTextInputFormatter.allow( RegExp(r'[a-zA-Z0-9\s]')), ], @@ -598,12 +593,11 @@ class _EditProfileState extends State { colorText: Colors.white, ); } - // else if (profilePicture == "") { - // utils.showToast( - // 'Upload edit profile picture!'); - // } + + + + else { - print(selectedinterestid.toString()); saveEditProfileInd(); } }, diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart index ca88cac..01b7234 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart @@ -9,10 +9,10 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/MainScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Global.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; @@ -100,13 +100,15 @@ class _ProfileTabState extends State { String? interestText; @override void initState() { - individualfuture = EditProfileApi() - .getEditProfileIndividual() - .then((value) => {setValues()}); - - businessfuture = EditProfileApi() - .getEditProfileBusiness() - .then((value) => {setValues2()}); + if (globalAccountType == '1') { + individualfuture = EditProfileApi() + .getEditProfileIndividual() + .then((value) => {setValues()}); + } else { + businessfuture = EditProfileApi() + .getEditProfileBusiness() + .then((value) => {setValues2()}); + } super.initState(); } @@ -126,8 +128,6 @@ class _ProfileTabState extends State { SharedPreferences prefs = await SharedPreferences.getInstance(); accountTypeValue = prefs.getString('accountTypeValue'); accounTypeLogin = prefs.getString('accountTypefromLogin'); - print('account tupe login is $accounTypeLogin'); - print('account tupe value is $accountTypeValue'); // foodItemDropdownController.selectedFooddynamic.clear(); // foodItemDropdownController.foodItemQControllerList.clear(); // foodItemDropdownController.OtherFoodIngredientList.clear(); @@ -152,7 +152,7 @@ class _ProfileTabState extends State { int? certificationsremoveid; - RemoveTimelineUploadata() async { + removeTimelineUploadata() async { utils.loader(); Map updata = { "timeline_id": timelineremoveid, @@ -160,11 +160,9 @@ class _ProfileTabState extends State { final data = await Profilepostmethod().postRemoveTimeline(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -177,11 +175,9 @@ class _ProfileTabState extends State { final data = await Profilepostmethod().postRemoveCertification(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -217,7 +213,6 @@ class _ProfileTabState extends State { if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { - print("Data fetched-->"); return Stack(clipBehavior: Clip.none, children: [ Container( decoration: const BoxDecoration( @@ -233,7 +228,7 @@ class _ProfileTabState extends State { children: [ Stack( children: [ - Container( + SizedBox( height: 484.h, width: double.infinity, child: getEditProfileIndi! @@ -362,9 +357,10 @@ class _ProfileTabState extends State { sizedBoxHeight(30.h), text18w700white("About"), sizedBoxHeight(10.h), - getEditProfileIndi!.data!.about == null || - getEditProfileIndi!.data!.about!.isEmpty - ? SizedBox() + getEditProfileIndi!.data!.about == null || + getEditProfileIndi! + .data!.about!.isEmpty + ? const SizedBox() : text14400white( getEditProfileIndi!.data!.about!), sizedBoxHeight(25.h), @@ -385,13 +381,14 @@ class _ProfileTabState extends State { )), ), sizedBoxWidth(12.w), - getEditProfileIndi!.data!.location == null || - getEditProfileIndi!.data!.location!.isEmpty - ? - SizedBox() - : - text14400whiteblur(getEditProfileIndi! - .data!.location!), + getEditProfileIndi!.data!.location == + null || + getEditProfileIndi! + .data!.location!.isEmpty + ? const SizedBox() + : text14400whiteblur( + getEditProfileIndi! + .data!.location!), ], ), sizedBoxHeight(20.h), @@ -586,7 +583,7 @@ class _ProfileTabState extends State { timelineremoveid = getEditProfileIndi!.data!.timelines![index].id ?? 0; getEditProfileIndi!.data!.timelines!.removeWhere((item) => item.id! == timelineremoveid); // .removeAt(index); - RemoveTimelineUploadata(); + removeTimelineUploadata(); }); }, child: SizedBox( @@ -1101,7 +1098,6 @@ class _ProfileTabState extends State { if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { - print("Data fetched-->"); return Stack(clipBehavior: Clip.none, children: [ Container( decoration: const BoxDecoration( @@ -1117,7 +1113,7 @@ class _ProfileTabState extends State { children: [ Stack( children: [ - Container( + SizedBox( height: 484.h, width: double.infinity, child: getEditProfileBus!.data! @@ -1217,8 +1213,8 @@ class _ProfileTabState extends State { color: Colors.white, width: 1.0, ), - boxShadow: [ - const BoxShadow( + boxShadow: const [ + BoxShadow( color: Color(0x66000000), offset: Offset(0, 4), @@ -1316,7 +1312,7 @@ class _ProfileTabState extends State { sizedBoxHeight(10.h), getEditProfileBus!.data!.bio == null || getEditProfileBus!.data!.bio!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400white( getEditProfileBus!.data!.bio!), sizedBoxHeight(25.h), @@ -1342,7 +1338,7 @@ class _ProfileTabState extends State { null || getEditProfileBus!.data! .businessOwnerName!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400whiteblur( getEditProfileBus! .data!.businessOwnerName!), @@ -1370,7 +1366,7 @@ class _ProfileTabState extends State { null || getEditProfileBus! .data!.websiteLink!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400whiteblur( getEditProfileBus! .data!.websiteLink!), @@ -1399,7 +1395,7 @@ class _ProfileTabState extends State { null || getEditProfileBus!.data! .businessLocation!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400whiteblur( getEditProfileBus! .data!.businessLocation!), @@ -1430,7 +1426,7 @@ class _ProfileTabState extends State { null || getEditProfileBus! .data!.foundedon!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400whiteblur( getEditProfileBus! .data!.foundedon!), @@ -1516,7 +1512,7 @@ class _ProfileTabState extends State { }) { return Row( children: [ - Container( + SizedBox( width: 10, height: 170.h, child: Stack( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart b/lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart rename to lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart b/lib/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart similarity index 93% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart rename to lib/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart index 85524f2..6e497cf 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart @@ -3,8 +3,8 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart'; import 'package:shared_preferences/shared_preferences.dart'; GetEditProfileIndi? getEditProfileIndi; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart b/lib/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart similarity index 91% rename from lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart rename to lib/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart index 09036ae..f8ab05e 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart +++ b/lib/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart @@ -1,7 +1,7 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart'; InterestModel? interestlistobj; List listofInterests = []; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart b/lib/Main_Screens/ProfileTab/Followers/Followers.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart rename to lib/Main_Screens/ProfileTab/Followers/Followers.dart index 8117225..69136b0 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart +++ b/lib/Main_Screens/ProfileTab/Followers/Followers.dart @@ -5,11 +5,12 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; @@ -18,6 +19,8 @@ import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; +import '../view_model/profilePostmethod.dart'; + class Followers extends StatefulWidget { const Followers({super.key}); @@ -37,7 +40,6 @@ class _FollowersState extends State { @override void initState() { - // TODO: implement initState var updata = ""; if (fromMainBusProfile == 'MainBusProfile') { Profilegetmethod() diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart b/lib/Main_Screens/ProfileTab/Following/Following.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart rename to lib/Main_Screens/ProfileTab/Following/Following.dart index 31bc182..742a8ce 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart +++ b/lib/Main_Screens/ProfileTab/Following/Following.dart @@ -5,12 +5,12 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart b/lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart rename to lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart b/lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart rename to lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart b/lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart rename to lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart b/lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart rename to lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart b/lib/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart similarity index 92% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart rename to lib/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart index a087b70..4d9d3d8 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart +++ b/lib/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart @@ -5,9 +5,10 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; + + import 'package:regroup/Utils/Common/ShimmerCommon.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; @@ -56,7 +57,6 @@ class _profiletabBusGestState extends State { // return utils.showToast(data.message); } else { Get.back(); - print("unfollow not done"); return utils.showToast(data.message); } } @@ -71,11 +71,9 @@ class _profiletabBusGestState extends State { Get.back(); // Get.back(); Get.toNamed(RouteName.mainscreen, arguments: 4); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -84,17 +82,17 @@ class _profiletabBusGestState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, // accountTypeValue == '1' || body: FutureBuilder( future: guestBusfuture, builder: (ctx, snapshot) { if (snapshot.connectionState == ConnectionState.waiting) { - return - // ShimmerCommon(); + return + // ShimmerCommon(); - Center( + const Center( child: CircularProgressIndicator( color: Colors.blue, ), @@ -112,7 +110,6 @@ class _profiletabBusGestState extends State { if (snapshot.connectionState == ConnectionState.done && snapshot.hasData) { - print("Data fetched-->"); return Stack(clipBehavior: Clip.none, children: [ Container( decoration: const BoxDecoration( @@ -143,10 +140,10 @@ class _profiletabBusGestState extends State { ).image, fit: BoxFit.cover, ), - shape: LinearBorder(), + shape: const LinearBorder(), ), ) - : Container( + : SizedBox( height: 484.h, width: double.infinity, child: Image.asset( @@ -156,7 +153,7 @@ class _profiletabBusGestState extends State { ), Positioned.fill( child: Container( - decoration: BoxDecoration( + decoration: const BoxDecoration( gradient: LinearGradient( begin: Alignment.topCenter, end: Alignment.bottomCenter, @@ -232,7 +229,7 @@ class _profiletabBusGestState extends State { width: 1.0, ), boxShadow: [ - BoxShadow( + const BoxShadow( color: Color(0x66000000), offset: Offset(0, 4), blurRadius: 4.0, @@ -297,7 +294,6 @@ class _profiletabBusGestState extends State { followunfollowid = guestGetProfileBus!.data!.id; FollowUnfollowUploadata(); - print(followunfollowid); }, child: guestGetProfileBus!.data! .isIamFollowingToGuestUser == @@ -306,7 +302,7 @@ class _profiletabBusGestState extends State { height: 40.h, width: 170.w, decoration: BoxDecoration( - color: Color(0xFFD90B2E), + color: const Color(0xFFD90B2E), borderRadius: BorderRadius.circular(30.r), ), @@ -318,7 +314,7 @@ class _profiletabBusGestState extends State { height: 40.h, width: 170.w, decoration: BoxDecoration( - color: Color(0xFFD90B2E), + color: const Color(0xFFD90B2E), borderRadius: BorderRadius.circular(30.r), ), @@ -351,14 +347,11 @@ class _profiletabBusGestState extends State { sizedBoxHeight(30.h), text18w700white("About"), sizedBoxHeight(10.h), - guestGetProfileBus!.data!.bio == null || - guestGetProfileBus!.data!.bio!.isEmpty - ? - SizedBox() - : - - text14400white( - guestGetProfileBus!.data!.bio! ), + guestGetProfileBus!.data!.bio == null || + guestGetProfileBus!.data!.bio!.isEmpty + ? const SizedBox() + : text14400white( + guestGetProfileBus!.data!.bio!), sizedBoxHeight(25.h), Row( children: [ @@ -377,14 +370,13 @@ class _profiletabBusGestState extends State { )), ), sizedBoxWidth(12.w), - guestGetProfileBus! - .data!.businessOwnerName == null || guestGetProfileBus! - .data!.businessOwnerName!.isEmpty - ? - SizedBox() - : - text14400whiteblur(guestGetProfileBus! + .data!.businessOwnerName == + null || + guestGetProfileBus!.data! + .businessOwnerName!.isEmpty + ? const SizedBox() + : text14400whiteblur(guestGetProfileBus! .data!.businessOwnerName!), ], ), @@ -406,13 +398,13 @@ class _profiletabBusGestState extends State { )), ), sizedBoxWidth(12.w), - guestGetProfileBus!.data!.websiteLink == null || - guestGetProfileBus!.data!.websiteLink!.isEmpty - ? - SizedBox() - : - text14400whiteblur( - guestGetProfileBus!.data!.websiteLink!), + guestGetProfileBus!.data!.websiteLink == + null || + guestGetProfileBus! + .data!.websiteLink!.isEmpty + ? const SizedBox() + : text14400whiteblur(guestGetProfileBus! + .data!.websiteLink!), ], ), sizedBoxHeight(20.h), @@ -434,13 +426,12 @@ class _profiletabBusGestState extends State { ), sizedBoxWidth(12.w), guestGetProfileBus! - .data!.businessLocation == null || - guestGetProfileBus! - .data!.businessLocation!.isEmpty - ? - SizedBox() - : - text14400whiteblur(guestGetProfileBus! + .data!.businessLocation == + null || + guestGetProfileBus! + .data!.businessLocation!.isEmpty + ? const SizedBox() + : text14400whiteblur(guestGetProfileBus! .data!.businessLocation!), ], ), @@ -470,10 +461,9 @@ class _profiletabBusGestState extends State { null ? text14400whiteblur( ' Founded at : ${guestGetProfileBus!.data!.businessType!.createdAt}') - : - SizedBox(), - // text14400whiteblur( - // "Founded at : 2010") + : const SizedBox(), + // text14400whiteblur( + // "Founded at : 2010") ], ), sizedBoxHeight(30.h), @@ -529,7 +519,7 @@ class _profiletabBusGestState extends State { ), )), ), - Spacer(), + const Spacer(), commonContainer( width: 40.w, height: 40.h, @@ -704,7 +694,7 @@ Widget normalcardtile({ sizedBoxWidth(7.w), Icon( Icons.circle, - color: Color(0xFFFCFCFC), + color: const Color(0xFFFCFCFC), size: 4.sp, ), sizedBoxWidth(6.w), @@ -713,12 +703,12 @@ Widget normalcardtile({ ) ], ), - Spacer(), + const Spacer(), PopupMenuButton( - surfaceTintColor: Color(0xFF222935), + surfaceTintColor: const Color(0xFF222935), constraints: BoxConstraints.tightFor(width: 176.w), - offset: Offset(0, 50), - color: Color(0xFF222935), + offset: const Offset(0, 50), + color: const Color(0xFF222935), tooltip: "", itemBuilder: (BuildContext context) => [ PopupMenuItem( @@ -736,7 +726,7 @@ Widget normalcardtile({ fontFamily: "Nunito Sans", ), ), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/Vector (5).png", height: 15.h, @@ -746,7 +736,7 @@ Widget normalcardtile({ ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -762,7 +752,7 @@ Widget normalcardtile({ fontFamily: "Nunito Sans", ), ), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/share.png", height: 20.h, @@ -772,7 +762,7 @@ Widget normalcardtile({ ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -788,7 +778,7 @@ Widget normalcardtile({ fontFamily: "Nunito Sans", ), ), - Spacer(), + const Spacer(), Image.asset( "assets/images/png/f7_pin-fill (2).png", height: 25.h, @@ -814,7 +804,7 @@ Widget normalcardtile({ onTap: () { Get.toNamed(RouteName.postdetailsScreen); }, - child: Container( + child: SizedBox( height: 163.h, width: double.infinity, child: Image.asset( @@ -853,7 +843,7 @@ Widget normalcardtile({ 'assets/images/png/heart 2.png', 'assets/images/png/party-popper 2.png' ]), - Spacer(), + const Spacer(), commonContainer( width: 30.w, height: 30.h, @@ -936,11 +926,11 @@ Widget normalcardtile({ boxRadius: 30, itemsSpacing: 8, itemScale: 0.4, - itemSize: Size(45, 45), - boxPadding: EdgeInsets.all(8), - boxAnimationDuration: Duration(milliseconds: 200), - itemAnimationDuration: Duration(milliseconds: 500), - hoverDuration: Duration(milliseconds: 700), + itemSize: const Size(45, 45), + boxPadding: const EdgeInsets.all(8), + boxAnimationDuration: const Duration(milliseconds: 200), + itemAnimationDuration: const Duration(milliseconds: 500), + hoverDuration: const Duration(milliseconds: 700), // toggle: false, child: _buildReactionsIcon(mainImage.value), @@ -1013,7 +1003,7 @@ Widget containertile({required String text}) { width: 100.w, height: 30.h, borderRadius: BorderRadius.circular(30.r), - borderColor: Color(0xFFD90B2E), + borderColor: const Color(0xFFD90B2E), borderwidth: 0.9, customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 10.w), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart b/lib/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart rename to lib/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart index 741707c..ed6cd02 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart +++ b/lib/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart @@ -7,9 +7,8 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/ViewModel/GuestProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -217,7 +216,7 @@ class _ProfileTabIndGuestState extends State { ).image, fit: BoxFit.cover, ), - shape: LinearBorder(), + shape: const LinearBorder(), ), ) : Container( @@ -450,7 +449,7 @@ class _ProfileTabIndGuestState extends State { sizedBoxHeight(10.h), guestGetProfileInd!.data!.about == null || guestGetProfileInd!.data!.about!.isEmpty - ? SizedBox() + ? const SizedBox() : text14400white( guestGetProfileInd!.data!.about!), sizedBoxHeight(25.h), @@ -471,9 +470,11 @@ class _ProfileTabIndGuestState extends State { )), ), sizedBoxWidth(12.w), - guestGetProfileInd!.data!.location == null || - guestGetProfileInd!.data!.location!.isEmpty - ? SizedBox() + guestGetProfileInd!.data!.location == + null || + guestGetProfileInd! + .data!.location!.isEmpty + ? const SizedBox() : text14400whiteblur(guestGetProfileInd! .data!.location!), ], @@ -650,7 +651,7 @@ class _ProfileTabIndGuestState extends State { child: Container( height: 11.h, width: 11.w, - decoration: BoxDecoration( + decoration: const BoxDecoration( color: Colors .white, shape: BoxShape @@ -662,7 +663,7 @@ class _ProfileTabIndGuestState extends State { width: 1.w, height: 170.h, decoration: - BoxDecoration( + const BoxDecoration( color: Colors .white), ), @@ -705,7 +706,7 @@ class _ProfileTabIndGuestState extends State { children: [ guestGetProfileInd?.data?.profilePhoto == null || guestGetProfileInd!.data!.profilePhoto!.isEmpty - ? CircleAvatar(radius: 10.r, backgroundImage: AssetImage('assets/images/png/cimg1.png')) + ? CircleAvatar(radius: 10.r, backgroundImage: const AssetImage('assets/images/png/cimg1.png')) : CircleAvatar(radius: 10.r, backgroundImage: NetworkImage(guestGetProfileInd!.data!.profilePhoto!)), sizedBoxWidth( 8.w), @@ -886,7 +887,7 @@ class _ProfileTabIndGuestState extends State { scrollDirection: Axis.horizontal, // padding: // EdgeInsets.only(left: 16.w), - physics: ScrollPhysics(), + physics: const ScrollPhysics(), itemCount: guestGetProfileInd! .data!.certifications!.length, itemBuilder: (context, index) { @@ -996,7 +997,7 @@ class _ProfileTabIndGuestState extends State { fontSize: 9.sp, fontWeight: FontWeight.w400, - color: Color(0xffFFFFFF).withOpacity(0.70), + color: const Color(0xffFFFFFF).withOpacity(0.70), fontFamily: 'Helvetica'), ) : Text( @@ -1005,7 +1006,7 @@ class _ProfileTabIndGuestState extends State { fontSize: 9.sp, fontWeight: FontWeight.w400, - color: Color(0xffFFFFFF).withOpacity(0.70), + color: const Color(0xffFFFFFF).withOpacity(0.70), fontFamily: 'Helvetica'), ) ], @@ -1699,7 +1700,7 @@ class _ProfileTabIndGuestState extends State { ).image, fit: BoxFit.cover, ), - shape: LinearBorder(), + shape: const LinearBorder(), ), ) : Container( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart b/lib/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart similarity index 85% rename from lib/Feed Module/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart rename to lib/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart index 824147b..4efe360 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart +++ b/lib/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart @@ -4,11 +4,10 @@ import 'dart:developer'; import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataBus.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataIndi.dart'; - +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowers.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GetGuestFollowing.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataBus.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/Model/GuestGetProfileDataIndi.dart'; GuestGetProfileDataIndi? guestGetProfileInd; GuestGetProfileDataBus? guestGetProfileBus; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/accountSessionModel.dart b/lib/Main_Screens/ProfileTab/Model/accountSessionModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/accountSessionModel.dart rename to lib/Main_Screens/ProfileTab/Model/accountSessionModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/certificateModel.dart b/lib/Main_Screens/ProfileTab/Model/certificateModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/certificateModel.dart rename to lib/Main_Screens/ProfileTab/Model/certificateModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart b/lib/Main_Screens/ProfileTab/Model/editTimelineModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart rename to lib/Main_Screens/ProfileTab/Model/editTimelineModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/faqModel.dart b/lib/Main_Screens/ProfileTab/Model/faqModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/faqModel.dart rename to lib/Main_Screens/ProfileTab/Model/faqModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/followersModel.dart b/lib/Main_Screens/ProfileTab/Model/followersModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/followersModel.dart rename to lib/Main_Screens/ProfileTab/Model/followersModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/followingModel.dart b/lib/Main_Screens/ProfileTab/Model/followingModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/followingModel.dart rename to lib/Main_Screens/ProfileTab/Model/followingModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart b/lib/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart rename to lib/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart b/lib/Main_Screens/ProfileTab/Model/termsconditionsModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart rename to lib/Main_Screens/ProfileTab/Model/termsconditionsModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart b/lib/Main_Screens/ProfileTab/Model/timelineabilityModel.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart rename to lib/Main_Screens/ProfileTab/Model/timelineabilityModel.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart b/lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart rename to lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart index 3a142af..ed11f14 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart +++ b/lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart @@ -8,10 +8,10 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; @@ -117,11 +117,9 @@ class _FollowersTabState extends State { final data = await Profilepostmethod().postRemoveuser(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -134,11 +132,9 @@ class _FollowersTabState extends State { final data = await Profilepostmethod().postBlockuser(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("block done"); return utils.showToast(data.message); } else { Get.back(); - print("block not done"); return utils.showToast(data.message); } } @@ -521,7 +517,6 @@ class _FollowingTabState extends State { final data = await Profilepostmethod().postunfollowuser(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("unfollow done"); // setState(() { // // Assuming followingobj is a list of items, remove the item with matching user ID // followingobj!.data!.removeWhere((item) => item.following!.id == userid); @@ -529,7 +524,6 @@ class _FollowingTabState extends State { return utils.showToast(data.message); } else { Get.back(); - print("unfollow not done"); return utils.showToast(data.message); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart b/lib/Main_Screens/ProfileTab/Settings/AccountSessions.dart similarity index 62% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart rename to lib/Main_Screens/ProfileTab/Settings/AccountSessions.dart index be6b13d..ead3211 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart +++ b/lib/Main_Screens/ProfileTab/Settings/AccountSessions.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -23,15 +24,14 @@ class _AccountSessionState extends State { @override Widget build(BuildContext context) { return Scaffold( - // key: _scaffoldKey1, - resizeToAvoidBottomInset: false, - backgroundColor: const Color(0xFF222935), - extendBody: true, - appBar: const CommonAppbar( - titleTxt: "Account sessions", - ), - body: - FutureBuilder( + // key: _scaffoldKey1, + resizeToAvoidBottomInset: false, + backgroundColor: const Color(0xFF222935), + extendBody: true, + appBar: const CommonAppbar( + titleTxt: "Account sessions", + ), + body: FutureBuilder( future: Profilegetmethod().getAccountSessions(), builder: (ctx, snapshot) { if (snapshot.data == null) { @@ -62,12 +62,10 @@ class _AccountSessionState extends State { : _buildBody(context); }, ), - - - ); + ); } - Widget _buildNoDataBody(context) { + Widget _buildNoDataBody(context) { return Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -86,65 +84,63 @@ class _AccountSessionState extends State { } Widget _buildBody(context) { - return - - Stack(children: [ - Container( - decoration: const BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: - Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - sizedBoxHeight(25.h), - text18w400white("Last login sessions"), - sizedBoxHeight(16.h), - ListView.builder( - shrinkWrap: true, - physics: const ScrollPhysics(), - itemCount: accountsessionobj!.data!.length, - itemBuilder: (context, index) { - final city = accountsessionobj!.data![index].city; - final state = accountsessionobj!.data![index].state; - final country = accountsessionobj!.data![index].country; + return Stack(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(25.h), + text18w400white("Last login sessions"), + sizedBoxHeight(16.h), + ListView.builder( + shrinkWrap: true, + physics: const ScrollPhysics(), + itemCount: accountsessionobj!.data!.length, + itemBuilder: (context, index) { + final city = accountsessionobj!.data![index].city; + final state = accountsessionobj!.data![index].state; + final country = accountsessionobj!.data![index].country; - // Combine city, state, and country - final locationTitle = '$city, $state, $country'; - return sessionCard( - title: locationTitle, - devicename: accountsessionobj!.data![index].deviceName!, - ipaddress: accountsessionobj!.data![index].ipAddress! - - ); - }, - ) - ]), + // Combine city, state, and country + final locationTitle = '$city, $state, $country'; + return sessionCard( + title: locationTitle, + devicename: accountsessionobj!.data![index].deviceName!, + ipaddress: accountsessionobj!.data![index].ipAddress!); + }, ) - ]); - - } + ]), + ) + ]); + } - Widget sessionCard({required String title, required String devicename, required String ipaddress}) { + Widget sessionCard( + {required String title, + required String devicename, + required String ipaddress}) { return Padding( padding: const EdgeInsets.symmetric(vertical: 15), - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 90.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), child: Column( children: [ Row( children: [ - commonGlassContainer( + commonGlassUI( width: 25.w, height: 25.h, opacity1: 0.24, opacity2: 0.24, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/Group 58645.png", @@ -152,7 +148,7 @@ class _AccountSessionState extends State { width: 9.w, ), ), - border: 1), + borderwidth: 1), sizedBoxWidth(10.w), text16400white(title), ], @@ -174,7 +170,7 @@ class _AccountSessionState extends State { ], ), ), - border: 1), + borderwidth: 1), ); } } diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart b/lib/Main_Screens/ProfileTab/Settings/AccountSetting.dart similarity index 70% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart rename to lib/Main_Screens/ProfileTab/Settings/AccountSetting.dart index 815dab9..7054342 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart +++ b/lib/Main_Screens/ProfileTab/Settings/AccountSetting.dart @@ -4,10 +4,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -24,7 +24,7 @@ class AccountSettings extends StatefulWidget { class _AccountSettingsState extends State { // bool swichvalue = false; - String? accountTypeValue; + String? accountTypeValue; String? accounTypeLogin; @override @@ -44,15 +44,14 @@ class _AccountSettingsState extends State { }); } - Future UploadData() async { + Future UploadData() async { print("upload data called"); SharedPreferences prefs = await SharedPreferences.getInstance(); - int? accountype ; + int? accountype; if (accountvisibility == false) { accountype = 0; - } - else if (accountvisibility == true) { + } else if (accountvisibility == true) { accountype = 1; } Map updata = { @@ -64,24 +63,20 @@ class _AccountSettingsState extends State { if (data.status == ResponseStatus.SUCCESS) { String? accountype; -accountype = prefs.getString('accountTypefromLogin'); - -if (accountype == "1") { - EditProfileApi() - .getEditProfileIndividual(); -} -else if (accountype == "2") { - EditProfileApi() - .getEditProfileBusiness(); -} - + accountype = prefs.getString('accountTypefromLogin'); + if (accountype == "1") { + EditProfileApi().getEditProfileIndividual(); + } else if (accountype == "2") { + EditProfileApi().getEditProfileBusiness(); + } return utils.showToast(data.message); } else { return utils.showToast(data.message); } } + @override Widget build(BuildContext context) { return Scaffold( @@ -112,42 +107,40 @@ else if (accountype == "2") { ), sizedBoxHeight(20.h), accounTypeLogin == '1' - ? + ? Column( + children: [ + Padding( + padding: EdgeInsets.symmetric( + horizontal: 16.w, vertical: 20.h), + child: Row(children: [ + Image.asset( + "assets/images/png/eyeIcon.png", + height: 21.h, + width: 21.w, + ), + sizedBoxWidth(12.w), + text16w400_FCFCFC("Account visibility"), + Spacer(), + Transform.scale( + scale: 0.9, + child: CupertinoSwitch( + value: accountvisibility, + trackColor: Colors.white.withOpacity(0.4), + activeColor: Color(0xFF34C759), + onChanged: (bool value) { + setState(() { + accountvisibility = value; + UploadData(); - Column( - children: [ - Padding( - padding: - EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h), - child: Row(children: [ - Image.asset( - "assets/images/png/eyeIcon.png", - height: 21.h, - width: 21.w, - ), - sizedBoxWidth(12.w), - text16w400_FCFCFC("Account visibility"), - Spacer(), - Transform.scale( - scale: 0.9, - child: CupertinoSwitch( - value: accountvisibility, - trackColor: Colors.white.withOpacity(0.4), - activeColor: Color(0xFF34C759), - onChanged: (bool value) { - setState(() { - accountvisibility = value; - UploadData(); - - // swichvalue = value ?? false; - }); - })) - ]), - ), - commonDivider(), - ], - ) - : SizedBox(), + // swichvalue = value ?? false; + }); + })) + ]), + ), + commonDivider(), + ], + ) + : SizedBox(), GestureDetector( onTap: () { Get.toNamed(RouteName.changepassword); diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart b/lib/Main_Screens/ProfileTab/Settings/ChangePassword.dart similarity index 93% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart rename to lib/Main_Screens/ProfileTab/Settings/ChangePassword.dart index 6cd5d7f..a7d4acb 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ChangePassword.dart @@ -4,10 +4,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -38,13 +38,11 @@ class _ChangePasswordState extends State { Get.back(); print("Change pass up done"); - Get.toNamed(RouteName.verifycode, - arguments: { - "currentpass" : currentpasscontroller.text, - "newpass" : newpasscontroller.text, - "confirmpass" : repeatpasscontroller.text - } - ); + Get.toNamed(RouteName.verifycode, arguments: { + "currentpass": currentpasscontroller.text, + "newpass": newpasscontroller.text, + "confirmpass": repeatpasscontroller.text + }); return utils.showToast(data.message); } else { Get.back(); @@ -60,9 +58,9 @@ class _ChangePasswordState extends State { child: Scaffold( resizeToAvoidBottomInset: false, // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "Change password", ), body: Stack(children: [ @@ -172,7 +170,6 @@ class _ChangePasswordState extends State { utils.showToast('Please fill all fields'); } else { Uploadata(); - } }, ) diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart b/lib/Main_Screens/ProfileTab/Settings/ContactUs.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart rename to lib/Main_Screens/ProfileTab/Settings/ContactUs.dart index bedc8ac..1d2217a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ContactUs.dart @@ -3,7 +3,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart b/lib/Main_Screens/ProfileTab/Settings/DeleteAccount.dart similarity index 95% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart rename to lib/Main_Screens/ProfileTab/Settings/DeleteAccount.dart index 9bfa5ea..9eb0a61 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart +++ b/lib/Main_Screens/ProfileTab/Settings/DeleteAccount.dart @@ -5,10 +5,10 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -64,9 +64,9 @@ class _DeleteAccountState extends State { child: Scaffold( // key: _scaffoldKey1, // resizeToAvoidBottomInset: false, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "", ), body: Stack(children: [ diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart b/lib/Main_Screens/ProfileTab/Settings/FaqScreen.dart similarity index 94% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart rename to lib/Main_Screens/ProfileTab/Settings/FaqScreen.dart index ebb976d..3d22deb 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart +++ b/lib/Main_Screens/ProfileTab/Settings/FaqScreen.dart @@ -2,9 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -64,10 +65,10 @@ class _FaqScreenState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), resizeToAvoidBottomInset: false, extendBody: true, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "FAQ’s", ), body: FutureBuilder( @@ -96,8 +97,8 @@ class _FaqScreenState extends State { ); } } - isExpandedList = - RxList.generate(faqobj!.data!.length, (index) => index == 0); + isExpandedList = + RxList.generate(faqobj!.data!.length, (index) => index == 0); return faqobj!.data!.isEmpty ? _buildNoDataBody(context) : _buildBody(context); @@ -169,10 +170,10 @@ class _FaqScreenState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - commonGlassContainer( + commonGlassUI( width: double.infinity, height: isExpanded ? 250.h : 82.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: SingleChildScrollView( child: Padding( padding: @@ -207,7 +208,7 @@ class _FaqScreenState extends State { ), ), ), - border: 1), + borderwidth: 1), ], ), ); diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart b/lib/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart rename to lib/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart index 2b12ccf..a669ec7 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart +++ b/lib/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -80,8 +80,7 @@ class _HelpAndSupportState extends State { ), ), accounTypeLogin == '1' - ? Column( - children: [ + ? Column(children: [ commonDivider(), GestureDetector( onTap: () { diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart b/lib/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart rename to lib/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart b/lib/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart similarity index 100% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart rename to lib/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart b/lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart rename to lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart index 609776d..7f7b775 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart +++ b/lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart @@ -2,9 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart b/lib/Main_Screens/ProfileTab/Settings/ReportABug.dart similarity index 96% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart rename to lib/Main_Screens/ProfileTab/Settings/ReportABug.dart index 9f559f0..905c70a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ReportABug.dart @@ -7,12 +7,12 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/CommonDropDown.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -69,9 +69,9 @@ class _ReportABugState extends State { child: Scaffold( // key: _scaffoldKey1, resizeToAvoidBottomInset: false, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "Report a bug", ), body: Stack(children: [ @@ -82,7 +82,7 @@ class _ReportABugState extends State { fit: BoxFit.fill)), ), SingleChildScrollView( - physics: ScrollPhysics(), + physics: const ScrollPhysics(), child: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Form( @@ -104,7 +104,7 @@ class _ReportABugState extends State { ), sizedBoxHeight(15.h), CustomTextFormField( - leadingIcon: Container( + leadingIcon: SizedBox( height: 25.h, width: 15.w, child: Center( @@ -145,7 +145,7 @@ class _ReportABugState extends State { ), sizedBoxHeight(15.h), CustomTextFormField( - leadingIcon: Container( + leadingIcon: SizedBox( height: 23.h, width: 23.w, child: Center( @@ -174,7 +174,7 @@ class _ReportABugState extends State { text16400white("Email address"), sizedBoxHeight(15.h), CustomTextFormField( - leadingIcon: Container( + leadingIcon: SizedBox( height: 17.h, width: 24.w, child: Center( diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart b/lib/Main_Screens/ProfileTab/Settings/Settings.dart similarity index 92% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart rename to lib/Main_Screens/ProfileTab/Settings/Settings.dart index 2cc16c7..1667ae0 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart +++ b/lib/Main_Screens/ProfileTab/Settings/Settings.dart @@ -2,13 +2,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -75,10 +74,10 @@ class _SettingsState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, resizeToAvoidBottomInset: false, - appBar: CommonAppbar( + appBar: const CommonAppbar( titleTxt: "Settings", ), body: Stack(children: [ @@ -124,7 +123,7 @@ class _SettingsState extends State { commonDivider(), ], ) - : SizedBox(), + : const SizedBox(), GestureDetector( onTap: () { Get.toNamed(RouteName.helpandsupport); @@ -157,7 +156,7 @@ class _SettingsState extends State { ), commonDivider(), accounTypeLogin == '1' - ? SizedBox() + ? const SizedBox() : Column( children: [ GestureDetector( @@ -199,8 +198,8 @@ class _SettingsState extends State { ), sizedBoxWidth(12.w), text16w400_FCFCFC(text), - Spacer(), - Icon( + const Spacer(), + const Icon( Icons.arrow_forward_ios, color: Colors.white, size: 20, @@ -212,13 +211,13 @@ class _SettingsState extends State { dialogwidget() { Get.dialog(Dialog( backgroundColor: Colors.transparent, - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 200.h, - borderradius: 14, + borderRadius: BorderRadius.circular( 14), opacity1: 0.09, opacity2: 0.13, - border: 0.8, + borderwidth: 0.8, customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h), child: Column( @@ -239,21 +238,21 @@ class _SettingsState extends State { // Get.offAllNamed(RouteName.loginScreen); Uploadata(); }, - child: commonGlassContainer( + child: commonGlassUI( width: 130.w, height: 40.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), opacity1: 0.05, opacity2: 0.07, customWidget: Center(child: text14400white("Yes, I want to")), - border: 1), + borderwidth: 1), ), Container( height: 40.h, width: 130.w, decoration: BoxDecoration( - color: Color(0xFFD90B2E), + color: const Color(0xFFD90B2E), borderRadius: BorderRadius.circular(30.r), ), child: Center(child: text14400white("Keep using App")), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart b/lib/Main_Screens/ProfileTab/Settings/TermsCondition.dart similarity index 93% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart rename to lib/Main_Screens/ProfileTab/Settings/TermsCondition.dart index 96c8a2d..30d9c9b 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart +++ b/lib/Main_Screens/ProfileTab/Settings/TermsCondition.dart @@ -2,7 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; + import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; @@ -18,7 +19,7 @@ class _TermsConditionState extends State { Widget build(BuildContext context) { return Scaffold( // key: _scaffoldKey1, - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), extendBody: true, resizeToAvoidBottomInset: false, appBar: const CommonAppbar( @@ -28,7 +29,7 @@ class _TermsConditionState extends State { future: Profilegetmethod().getTermsConditions(), builder: (ctx, snapshot) { if (snapshot.data == null) { - return Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator()); } if (snapshot.connectionState == ConnectionState.done) { if (snapshot.hasError) { diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart b/lib/Main_Screens/ProfileTab/Settings/VerifyCode.dart similarity index 90% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart rename to lib/Main_Screens/ProfileTab/Settings/VerifyCode.dart index efa0b8c..3722179 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart +++ b/lib/Main_Screens/ProfileTab/Settings/VerifyCode.dart @@ -3,14 +3,12 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; -import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Global.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; -import 'package:regroup/Utils/Common/googleOAuthService.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -41,7 +39,6 @@ class _VerifyCodeState extends State { final res = await Profilepostmethod().postChangepassverifyotp(updata); if (res.status == ResponseStatus.SUCCESS) { Get.back(); - print("verification done"); Get.back(); Get.back(); @@ -49,7 +46,6 @@ class _VerifyCodeState extends State { return utils.showToast(res.message); } else { Get.back(); - print("change pass not done"); return utils.showToast(res.message); } } @@ -64,7 +60,6 @@ class _VerifyCodeState extends State { final data = await Profilepostmethod().postChangepassword(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); - print("otp done"); setState(() { pincodeController.clear(); @@ -73,7 +68,6 @@ class _VerifyCodeState extends State { return utils.showToast(data.message); } else { Get.back(); - print("otp not done"); return utils.showToast(data.message); } } @@ -82,7 +76,7 @@ class _VerifyCodeState extends State { Widget build(BuildContext context) { return Scaffold( backgroundColor: const Color(0xFF222935), - appBar: CommonAppbar(titleTxt: ""), + appBar: const CommonAppbar(titleTxt: ""), resizeToAvoidBottomInset: false, body: Stack( children: [ @@ -124,29 +118,27 @@ class _VerifyCodeState extends State { obscureText: false, animationType: AnimationType.fade, pinTheme: PinTheme( - selectedFillColor: Color(0xFF434A53), - inactiveFillColor: Color(0xFF434A53), - inactiveColor: Color(0xFF434A53), - activeColor: Color(0xFF434A53), - selectedColor: Color(0xFF434A53), + selectedFillColor: const Color(0xFF434A53), + inactiveFillColor: const Color(0xFF434A53), + inactiveColor: const Color(0xFF434A53), + activeColor: const Color(0xFF434A53), + selectedColor: const Color(0xFF434A53), shape: PinCodeFieldShape.underline, borderRadius: BorderRadius.circular(5), fieldHeight: 70, fieldWidth: 70, activeFillColor: // Colors.white - Color(0xFF303030).withOpacity(0.4), + const Color(0xFF303030).withOpacity(0.4), // textStyle: TextStyle(color: Colors.white, fontSize: 20), // Change text color and font size ), - animationDuration: Duration(milliseconds: 300), + animationDuration: const Duration(milliseconds: 300), enableActiveFill: true, autovalidateMode: AutovalidateMode.onUserInteraction, controller: pincodeController, onCompleted: (v) { - print("Completed"); }, onChanged: (value) { - print(value); setState(() { // currentText = value; }); @@ -158,7 +150,6 @@ class _VerifyCodeState extends State { fontFamily: 'Helvetica', ), beforeTextPaste: (text) { - print("Allowing to paste $text"); return true; }, appContext: context, @@ -166,9 +157,9 @@ class _VerifyCodeState extends State { sizedBoxHeight(10.h), Center( child: TimerButton( - disabledTextStyle: TextStyle(color: Colors.red), - activeTextStyle: TextStyle(color: Colors.white), - disabledColor: Color(0XFF222935).withOpacity(0.10), + disabledTextStyle: const TextStyle(color: Colors.red), + activeTextStyle: const TextStyle(color: Colors.white), + disabledColor: const Color(0XFF222935).withOpacity(0.10), buttonType: ButtonType.textButton, label: "Resend OTP", timeOutInSeconds: 6, @@ -179,7 +170,7 @@ class _VerifyCodeState extends State { }); }, // disabledColor: Colors.white, - color: Color(0XFF222935).withOpacity(0.10), + color: const Color(0XFF222935).withOpacity(0.10), ), ), // ), diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart b/lib/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart similarity index 98% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart rename to lib/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart index edfb5b6..454f001 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart +++ b/lib/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart @@ -8,8 +8,8 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; @@ -436,10 +436,10 @@ class _BlockedUsersState extends State { Get.dialog(Dialog( backgroundColor: Colors.transparent, surfaceTintColor: Colors.transparent, - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 200.h, - borderradius: 14, + borderRadius: BorderRadius.circular(14), opacity1: 0.09, opacity2: 0.13, customWidget: Padding( @@ -458,14 +458,14 @@ class _BlockedUsersState extends State { onTap: () { Get.back(); }, - child: commonGlassContainer( + child: commonGlassUI( width: 110.w, height: 40.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), opacity1: 0.05, opacity2: 0.07, customWidget: Center(child: text14400white("No")), - border: 1), + borderwidth: 1), ), InkWell( onTap: () { @@ -490,7 +490,7 @@ class _BlockedUsersState extends State { ], ), ), - border: 0.8))); + borderwidth: 0.8))); } Widget blockedUser({ diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/View/Notification.dart b/lib/Main_Screens/ProfileTab/Settings/View/Notification.dart similarity index 97% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/View/Notification.dart rename to lib/Main_Screens/ProfileTab/Settings/View/Notification.dart index 98dd755..c00e370 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/View/Notification.dart +++ b/lib/Main_Screens/ProfileTab/Settings/View/Notification.dart @@ -4,9 +4,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart b/lib/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart similarity index 95% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart rename to lib/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart index 10b0369..74c9400 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart'; FetchBlockedUser? fetchblockuserobj; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart b/lib/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart similarity index 94% rename from lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart rename to lib/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart index 6f53d7c..569374a 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart +++ b/lib/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart @@ -1,7 +1,7 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart'; FetchNotification? fetchNoti; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart b/lib/Main_Screens/ProfileTab/Share profile/ShareProfile.dart similarity index 96% rename from lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart rename to lib/Main_Screens/ProfileTab/Share profile/ShareProfile.dart index ee9b84a..92e54a3 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart +++ b/lib/Main_Screens/ProfileTab/Share profile/ShareProfile.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -65,7 +65,8 @@ class _ShareProfileState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), ), SingleChildScrollView( child: Column(children: [ @@ -148,9 +149,9 @@ class _ShareProfileState extends State { ], ), Spacer(), - commonGlassContainer( - border: 1, - borderradius: 2, + commonGlassUI( + borderwidth: 1, + borderRadius: BorderRadius.circular( 2), height: 23.h, width: 23.w, opacity1: 0.24, diff --git a/lib/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart b/lib/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart new file mode 100644 index 0000000..2fa1a54 --- /dev/null +++ b/lib/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart @@ -0,0 +1,1002 @@ +import 'dart:developer'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:regroup/Common/CommonGlassmorphism.dart'; +import 'package:regroup/Common/CommonWidget.dart'; +import 'package:regroup/Common/base_manager.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart' + as timelineabilist; +import 'package:regroup/Main_Screens/ProfileTab/view_model/gettimelineability.dart'; +// import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart' +// as timelineabilist; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profileGetmethod.dart'; +import 'package:regroup/Main_Screens/ProfileTab/view_model/profilePostmethod.dart'; + +import 'package:regroup/Utils/Common/CommonAppbar.dart'; +import 'package:regroup/Utils/Common/CommonDropdown.dart'; +import 'package:regroup/Utils/Common/CustomNextButton.dart'; +import 'package:regroup/Utils/Common/CustomTextformfield.dart'; +import 'package:regroup/Utils/Common/sized_box.dart'; +import 'package:regroup/Utils/dialogs.dart'; +import 'package:regroup/Utils/texts.dart'; +import 'package:regroup/resources/routes/route_name.dart'; +import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; +import 'package:intl/intl.dart'; +import 'package:async/src/future_group.dart'; + +class AddTimeline extends StatefulWidget { + const AddTimeline({super.key}); + + @override + State createState() => _AddTimelineState(); +} + +class _AddTimelineState extends State { + TextEditingController dateController = TextEditingController(); + TextEditingController dateController2 = TextEditingController(); + TextEditingController clubNameController = TextEditingController(); + TextEditingController rollnameController = TextEditingController(); + TextEditingController teamnameController = TextEditingController(); + + int id = Get.arguments["id"]; + bool edited = Get.arguments["edit"]; + + RxBool isChecked = false.obs; + + timelineabilist.TimelineAbilityListModel? abilityModel; + List timeline = []; + List _abilitydrop = []; + + Future fetchABilitylist() async { + TimelineAbilityListApi abilityLsitAPI = TimelineAbilityListApi(); + ResponseData response = await abilityLsitAPI.getAbilitylistApi(); + + if (response.status == ResponseStatus.SUCCESS) { + abilityModel = + timelineabilist.TimelineAbilityListModel.fromJson(response.data!); + setState(() { + timeline = abilityModel!.data ?? []; // Store the fetched cities + _abilitydrop = + timeline.map((platform) => platform.name.toString()).toList(); + }); + log(timeline.toString()); + } else {} + } + + List selectedabilityid = []; + + void getCatIdFromName(List selectedAbilities) { + selectedabilityid.clear(); // Clear existing selections + for (var name in selectedAbilities) { + for (var i = 0; i < timeline.length; i++) { + if (name == timeline[i].name) { + selectedabilityid.add(timeline[i].id!); + break; // Assuming each name is unique, we break after finding a match + } + } + } + } + + // late Future myfuture; + FutureGroup futureGroup = FutureGroup(); + RxBool isloading = true.obs; + List seelctedNameList = []; + @override + void initState() { + // TODO: implement initState + + if (edited == true) { + // futureGroup.add( + Profilegetmethod().getEditTimeline(id).then((value) { + clubNameController.text = + edittimelineobj!.data!.timelineData!.clubName ?? ""; + rollnameController.text = + edittimelineobj!.data!.timelineData!.roleName ?? ""; + teamnameController.text = + edittimelineobj!.data!.timelineData!.teamName ?? ""; + ""; + dateController.text = + edittimelineobj!.data!.timelineData!.startDate ?? ""; + dateController2.text = + edittimelineobj!.data!.timelineData!.endDate ?? ""; + + log(_abilityMap.length.toString()); + // futureGroup.add( + fetchABilitylist().then((value) { + String abilitiesXids = + edittimelineobj!.data!.timelineData!.abilitiesXids ?? ""; + abilitiesIds = abilitiesXids + .split(',') + .map((e) => int.tryParse(e.trim()) ?? 0) // Trim spaces around IDs + .toList(); + selectedabilityid = abilitiesIds; + + for (int i = 0; i < _abilitydrop.length; i++) { + _abilityMap.add({ + "id": i + 1, + "name": _abilitydrop[i], + }); + } + getSelectedNames(selectedabilityid).then((value) { + seelctedNameList = value; + isloading = false.obs; + }); + }); + // ); + }); + } else { + fetchABilitylist().then((value) { + isloading = false.obs; + }); + } + + super.initState(); + } + + List abilitiesIds = []; + + UploadData() async { + // SharedPreferences prefs = await SharedPreferences.getInstance(); + utils.loader(); + String abilitiesIds = selectedabilityid.join(','); + Map updata = { + "club_name": clubNameController.text, + "role_name": rollnameController.text, + "team_name": teamnameController.text, + "start_date": dateController.text, + "end_date": dateController2.text, + "abilities_xids": abilitiesIds, + }; + final data = await Profilepostmethod().postTimeline(updata); + if (data.status == ResponseStatus.SUCCESS) { + Get.back(); + // Get.back(); + // await EditProfileApi().getEditProfileIndividual().then((value) { + // Get.back(); + // }); + Get.toNamed(RouteName.mainscreen, arguments: 4); + + return utils.showToast(data.message); + } else { + Get.back(); + return utils.showToast(data.message); + } + } + + EdituploadData() async { + utils.loader(); + String abilitiesIds = selectedabilityid.join(','); + Map updata = { + "club_name": clubNameController.text, + "role_name": rollnameController.text, + "team_name": teamnameController.text, + "start_date": dateController.text, + "end_date": dateController2.text, + "abilities_xids": abilitiesIds, + "timeline_id": id, + }; + final data = await Profilepostmethod().postEditTimeline(updata); + if (data.status == ResponseStatus.SUCCESS) { + Get.back(); + // await EditProfileApi().getEditProfileIndividual().then((value) { + // Get.back(); + // }); + + // utils.showToast(data.message); + // await Future.delayed( + // Duration(milliseconds: 500)); // Add a small delay if needed + // Get.toNamed(RouteName.mainscreen, arguments: 4); + Get.toNamed(RouteName.mainscreen, arguments: 4); + } else { + Get.back(); + return utils.showToast(data.message); + } + } + +// List> _abilityMap = []; + List> _abilityMap = []; + List listData = []; + +// Function to get names from selected IDs + Future> getSelectedNames(List selectedIds) async { + List selectedNames = []; + for (int id in selectedIds) { + for (Map ability in _abilityMap) { + if (ability["id"] == id) { + selectedNames.add(ability["name"]); + break; + } + } + _abilitydrop = + _abilityMap.map((ability) => ability["name"] as String).toList(); + } + + return selectedNames; + } + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => FocusManager.instance.primaryFocus?.unfocus(), + child: Scaffold( + // resizeToAvoidBottomInset: false, + // key: _scaffoldKey1, + backgroundColor: const Color(0xFF222935), + extendBody: true, + appBar: const CommonAppbar( + titleTxt: "Add timeline", + ), + body: Obx(() + // { + => + isloading.value + ? const Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + CircularProgressIndicator(), + ], + )) + : edited == true + ? Stack(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage( + "assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + ListView( + physics: const ScrollPhysics(), + children: [ + Padding( + padding: EdgeInsets.symmetric( + horizontal: 16.w), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + sizedBoxHeight(20.h), + text16400white("Club name"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + clubNameController, + texttype: TextInputType.text, + hintText: 'Enter club name', + validator: (value) { + if (value!.isEmpty) { + return 'Enter your club name '; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp('[a-zA-Z ]')) + ], + ), + sizedBoxHeight(25.h), + text16400white("Role in "), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + rollnameController, + texttype: TextInputType.text, + hintText: + 'Enter role in the club', + validator: (value) { + if (value!.isEmpty) { + return 'Enter role in the club'; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp('[a-zA-Z ]')) + ], + ), + sizedBoxHeight(25.h), + text16400white("Team name"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + teamnameController, + texttype: TextInputType.text, + hintText: 'Enter team name', + validator: (value) { + if (value!.isEmpty) { + return 'Enter your team name '; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp( + '[a-zA-ZS0-9 ]')), + ], + ), + sizedBoxHeight(25.h), + Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: [ + text16400white( + "Start date "), + sizedBoxHeight(10.h), + GestureDetector( + onTap: () => datePicker( + context, + dateController), + child: AbsorbPointer( + child: + CustomTextFormField( + textEditingController: + dateController, + leadingIcon: + Container( + height: 20.h, + width: 20.w, + child: Center( + child: + Image.asset( + "assets/images/png/calender.png", + height: 20.h, + width: 20.w, + ), + ), + ), + ), + ), + ) + ], + ), + ), + sizedBoxWidth(10.h), + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: [ + text16400white( + "End date"), + sizedBoxHeight(10.h), + GestureDetector( + onTap: () => datePicker( + context, + dateController2), + child: AbsorbPointer( + child: + CustomTextFormField( + textEditingController: + dateController2, + leadingIcon: + Container( + height: 20.h, + width: 20.w, + child: Center( + child: + Image.asset( + "assets/images/png/calender.png", + height: 20.h, + width: 20.w, + ), + ), + ), + ), + ), + ), + sizedBoxHeight(10.h), + Row( + children: [ + Obx(() { + return commonGlassContainer( + border: 1, + borderradius: 2, + height: 20.h, + width: 20.w, + opacity1: 0.24, + opacity2: 0.24, + customWidget: + Transform + .scale( + scale: 1.2, + child: Checkbox( + side: const BorderSide( + color: Color( + 0xFF434A53)), + value: + isChecked + .value, + activeColor: + Colors + .transparent, + checkColor: + Colors + .white, + onChanged: + ((value) { + // isChecked.value = value!; + isChecked + .value = + value!; + if (isChecked + .value) { + // Set end date to today's date + dateController2 + .text = DateFormat( + 'yyyy-MM-dd') + .format( + DateTime.now()); + } else { + // Clear end date when checkbox is unchecked + dateController2 + .clear(); + } + }), + ), + ), + ); + }), + sizedBoxWidth(8.w), + text10400white( + "Present") + ], + ), + ], + ), + ) + ], + ), + text16400white("Ability"), + sizedBoxHeight(15.h), + // CustomDropDownCheckBoxTimeline( + // header: 'Select ability', + // title: '', + // listData: _abilitydrop, + // onItemSelected: getCatIdFromName, + // initiallySelected: abilitiesIds + // .map((id) => id.toString()) + // .toList(), + // ), + CustomDropDownCheckBoxTimeline( + header: 'Select ability', + title: '', + listData: _abilitydrop, + // _abilityMap.map((ability) => ability["name"]).toList(), + onItemSelected: getCatIdFromName, + // (selectedNames) { + // // Convert selected names back to IDs if needed + // List selectedIds = []; + // for (String name in selectedNames) { + // for (Map ability + // in _abilityMap) { + // if (ability["name"] == name) { + // selectedIds.add(ability["id"]); + // break; + // } + // } + // } + // // Use selectedIds as needed + // print(selectedIds); + // }, + initiallySelected: + seelctedNameList, // Pass initially selected names + ), + sizedBoxHeight(80.h), + Padding( + padding: EdgeInsets.symmetric( + horizontal: 20.w), + child: CustomButton( + text: "Add timeline", + onPressed: () { + if (clubNameController.text.isBlank! || + rollnameController + .text.isBlank! || + teamnameController + .text.isBlank! || + dateController + .text.isBlank! || + dateController2 + .text.isBlank! || + selectedabilityid + .isEmpty) { + utils.showToast( + 'Please fill all fields'); + } else { + EdituploadData(); + } + }, + ), + ), + ]), + ) + ]) + ]) + : Stack(children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage( + "assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + ListView( + physics: const ScrollPhysics(), + children: [ + Padding( + padding: EdgeInsets.symmetric( + horizontal: 16.w), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + sizedBoxHeight(20.h), + text16400white("Club name"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + clubNameController, + texttype: TextInputType.text, + hintText: 'Enter club name', + validator: (value) { + if (value!.isEmpty) { + return 'Enter your full name '; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp('[a-zA-Z ]')) + ], + ), + sizedBoxHeight(25.h), + text16400white("Role in the club"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + rollnameController, + texttype: TextInputType.text, + hintText: + 'Enter role in the club', + validator: (value) { + if (value!.isEmpty) { + return 'Enter role in the club'; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp('[a-zA-Z ]')) + ], + ), + sizedBoxHeight(25.h), + text16400white("Team name"), + sizedBoxHeight(15.h), + CustomTextFormField( + textEditingController: + teamnameController, + texttype: TextInputType.text, + hintText: 'Enter team name', + validator: (value) { + if (value!.isEmpty) { + return 'Enter your team name '; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter + .allow(RegExp( + '[a-zA-ZS0-9 ]')), + ], + ), + sizedBoxHeight(25.h), + Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: [ + text16400white( + "Start date "), + sizedBoxHeight(10.h), + GestureDetector( + onTap: () => datePicker( + context, + dateController), + child: AbsorbPointer( + child: + CustomTextFormField( + textEditingController: + dateController, + leadingIcon: + Container( + height: 20.h, + width: 20.w, + child: Center( + child: + Image.asset( + "assets/images/png/calender.png", + height: 20.h, + width: 20.w, + ), + ), + ), + ), + ), + ) + ], + ), + ), + sizedBoxWidth(10.h), + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: [ + text16400white( + "End date"), + sizedBoxHeight(10.h), + GestureDetector( + onTap: () => datePicker( + context, + dateController2), + child: AbsorbPointer( + child: + CustomTextFormField( + textEditingController: + dateController2, + leadingIcon: + Container( + height: 20.h, + width: 20.w, + child: Center( + child: + Image.asset( + "assets/images/png/calender.png", + height: 20.h, + width: 20.w, + ), + ), + ), + ), + ), + ), + sizedBoxHeight(10.h), + Row( + children: [ + Obx(() { + return commonGlassContainer( + border: 1, + borderradius: 2, + height: 20.h, + width: 20.w, + opacity1: 0.24, + opacity2: 0.24, + customWidget: + Transform + .scale( + scale: 1.2, + child: Checkbox( + side: const BorderSide( + color: Color( + 0xFF434A53)), + value: + isChecked + .value, + activeColor: + Colors + .transparent, + checkColor: + Colors + .white, + onChanged: + ((value) { + // isChecked.value = value!; + isChecked + .value = + value!; + if (isChecked + .value) { + // Set end date to today's date + dateController2 + .text = DateFormat( + 'yyyy-MM-dd') + .format( + DateTime.now()); + } else { + // Clear end date when checkbox is unchecked + dateController2 + .clear(); + } + }), + ), + ), + ); + }), + sizedBoxWidth(8.w), + text10400white( + "Present") + ], + ), + ], + ), + ) + ], + ), + text16400white("Ability"), + sizedBoxHeight(15.h), + CustomDropDownChexkBox( + header: 'Select ability', + title: '', + listData: _abilitydrop, + onItemSelected: getCatIdFromName, + initiallySelected: [], // or pass initial values if needed + ), + sizedBoxHeight(80.h), + Padding( + padding: EdgeInsets.symmetric( + horizontal: 20.w), + child: CustomButton( + text: "Add timeline", + onPressed: () { + if (clubNameController.text.isBlank! || + rollnameController + .text.isBlank! || + teamnameController + .text.isBlank! || + dateController + .text.isBlank! || + dateController2 + .text.isBlank! || + selectedabilityid + .isEmpty) { + utils.showToast( + 'Please fill all fields'); + } else { + UploadData(); + } + }, + ), + ), + ]), + ) + ]) + ]) + + // } + )), + ); + } +} + +class CustomDropDownCheckBoxTimeline extends StatefulWidget { + const CustomDropDownCheckBoxTimeline({ + Key? key, + required this.header, + required this.title, + required this.listData, + required this.onItemSelected, + this.leadingImage, + this.showOtherOption = false, + required this.initiallySelected, + }) : super(key: key); + + final String header; + final String title; + final List listData; + final Function(List) onItemSelected; + final Widget? leadingImage; + final bool showOtherOption; + final List initiallySelected; + + @override + State createState() => + _CustomDropDownCheckBoxTimelineState(); +} + +class _CustomDropDownCheckBoxTimelineState + extends State { + RxBool onDropTap = false.obs; + RxList selectedValues = [].obs; + final TextEditingController _textController = TextEditingController(); + + @override + void initState() { + super.initState(); + selectedValues + .addAll(widget.initiallySelected); // Initialize selectedValues + } + + List> _buildDropdownMenuItems() { + return widget.listData.asMap().entries.map((entry) { + int index = entry.key; + String item = entry.value; + return DropdownMenuItem( + value: item, + child: InkWell( + onTap: () { + setState(() { + if (selectedValues.contains(item)) { + selectedValues.remove(item); + } else { + selectedValues.add(item); + } + _textController.clear(); + widget.onItemSelected(selectedValues.toList()); + }); + }, + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Row( + children: [ + Obx(() { + return Checkbox( + value: selectedValues.contains(item), + activeColor: Colors.white, + checkColor: const Color(0xFFD90B2E), + onChanged: (bool? value) { + setState(() { + if (value == true) { + selectedValues.add(item); + } else { + selectedValues.remove(item); + } + _textController.clear(); + widget.onItemSelected(selectedValues.toList()); + }); + }, + ); + }), + const SizedBox(width: 8), + Expanded( + child: Text( + item, + style: const TextStyle( + color: Colors.white, + fontSize: 16, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w500, + ), + maxLines: 1, // Adjust as needed + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + if (index != widget.listData.length - 1) + const Divider(thickness: 1, color: Color(0xFF434A53)), + ], + ), + ), + ); + }).toList(); + } + + @override + Widget build(BuildContext context) { + return Obx( + () => Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GestureDetector( + onTap: () { + onDropTap.value = !onDropTap.value; + }, + child: Container( + width: double.infinity, + // height: 50, + padding: const EdgeInsets.only( + right: 22, left: 12, top: 15, bottom: 15), + decoration: BoxDecoration( + color: const Color(0xFFFFFFFF).withOpacity(0.10), + borderRadius: onDropTap.value + ? const BorderRadius.vertical( + top: Radius.circular(30), + ) + : const BorderRadius.all(Radius.circular(30)), + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + const Color(0xFFffffff).withOpacity(0.50), + const Color(0xFFFFFFFF).withOpacity(0.50), + ], + ), + border: Border.all(color: const Color(0xFF434A53)), + ), + child: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + widget.leadingImage == null + ? const SizedBox() + : widget.leadingImage!, + const SizedBox(width: 12), + Expanded( + child: Text( + selectedValues.isEmpty + ? widget.header + : selectedValues.join(', '), + style: const TextStyle( + color: Colors.white, + fontSize: 16, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w400, + ), + // overflow: TextOverflow.ellipsis, + ), + ), + // const Spacer(), + onDropTap.value + ? Image.asset('assets/images/png/arrowup.png') + : Image.asset('assets/images/png/arrowdown.png'), + ], + ), + ), + ), + ), + if (onDropTap.value) + Scrollbar( + child: Container( + width: double.infinity, + decoration: BoxDecoration( + color: const Color(0xFFFFFFFF).withOpacity(0.10), + borderRadius: const BorderRadius.vertical( + bottom: Radius.circular(30), + ), + border: Border.all(color: const Color(0xFF434A53)), + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + const Color(0xFFffffff).withOpacity(0.50), + const Color(0xFFFFFFFF).withOpacity(0.50), + ], + ), + ), + child: Column( + children: _buildDropdownMenuItems(), + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/Feed Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart b/lib/Main_Screens/ProfileTab/view_model/gettimelineability.dart similarity index 90% rename from lib/Feed Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart rename to lib/Main_Screens/ProfileTab/view_model/gettimelineability.dart index 37223ee..cea1867 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart +++ b/lib/Main_Screens/ProfileTab/view_model/gettimelineability.dart @@ -4,7 +4,7 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart'; class TimelineAbilityListApi { TimelineAbilityListApi(); diff --git a/lib/Feed Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart b/lib/Main_Screens/ProfileTab/view_model/profileGetmethod.dart similarity index 81% rename from lib/Feed Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart rename to lib/Main_Screens/ProfileTab/view_model/profileGetmethod.dart index 15eb216..ca3898d 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart +++ b/lib/Main_Screens/ProfileTab/view_model/profileGetmethod.dart @@ -4,15 +4,15 @@ import 'dart:developer'; import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/accountSessionModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/certificateModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/faqModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart'; -// import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/accountSessionModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/certificateModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/editTimelineModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/faqModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Model/termsconditionsModel.dart'; +// import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart'; FaqModel? faqobj; PrivacypolicyModel? privacyobj; diff --git a/lib/Feed Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart b/lib/Main_Screens/ProfileTab/view_model/profilePostmethod.dart similarity index 78% rename from lib/Feed Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart rename to lib/Main_Screens/ProfileTab/view_model/profilePostmethod.dart index 0fc9289..2323265 100644 --- a/lib/Feed Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart +++ b/lib/Main_Screens/ProfileTab/view_model/profilePostmethod.dart @@ -17,112 +17,82 @@ class Profilepostmethod { utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&')); Future> postContactus(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postcontactus, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postReportandbug(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postreportbug, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postBlockuser(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postblock, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postunfollowuser(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postunfollow, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postRemoveuser(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postremoveuser, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postChangepassword(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postchangepassword, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postChangepassverifyotp(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postchangepassverify, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postTimeline(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.posttimeline, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postAccountvisibility(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postaccountvisibility, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postDeleteaccount(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postdeleteaccount, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } @@ -179,7 +149,6 @@ class Profilepostmethod { return ResponseData("success", ResponseStatus.SUCCESS, data: response.data); } else if (response.statusCode == 203) { - print(response.data); return ResponseData("success", ResponseStatus.PRIVATE, data: response.data); } else { @@ -194,46 +163,34 @@ class Profilepostmethod { } Future> postEditTimeline(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postedittimeline, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postRemoveTimeline(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postremovetimeline, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postRemoveCertification(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postremovecertification, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } Future> postCertification(updata) async { - print("updata is $updata"); final response = await NetworkApiServices().postApi( updata, ApiUrls.postcertification, ); - print("response is ${response.data}"); - print("response message is ${response.message}"); return response; } diff --git a/lib/Feed Module/Notification/View/notification.dart b/lib/Notifications/notification.dart similarity index 79% rename from lib/Feed Module/Notification/View/notification.dart rename to lib/Notifications/notification.dart index 619f56b..9848a5e 100644 --- a/lib/Feed Module/Notification/View/notification.dart +++ b/lib/Notifications/notification.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -58,47 +58,14 @@ class _NotificationPageState extends State { body: Stack( children: [ // const CommonBlurLeftRed(), - const Positioned(top: 10, left: -30, child: CommonBlurLeftSecond()), - // const CommonBlurRightRed(), - // const CommonBlurLeft(), - const Positioned(top: 150, right: -30, child: CommonBlurRightSecond()), - const Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()), - GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 6, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - const Color(0XFF222935).withOpacity(0.60), - - const Color(0XFF222935).withOpacity(0.60), - ], - ), - child: Column( + + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + Column( children: [ ListView.separated( separatorBuilder: (context, index) { @@ -121,9 +88,9 @@ class _NotificationPageState extends State { }, ), ], - )), - ], - ), + )]), + + ); } } diff --git a/lib/Utils/Common/CommonAppbar.dart b/lib/Utils/Common/CommonAppbar.dart index 614fd4b..7289a27 100644 --- a/lib/Utils/Common/CommonAppbar.dart +++ b/lib/Utils/Common/CommonAppbar.dart @@ -129,11 +129,11 @@ class CommonAppbar extends StatelessWidget implements PreferredSizeWidget { child: Row( children: [ sizedBoxWidth(10.w), - commonGlassContainer( - border: 0.5, + commonGlassUI( + borderwidth: 0.5, width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( diff --git a/lib/Utils/texts.dart b/lib/Utils/texts.dart index d796b52..52531db 100644 --- a/lib/Utils/texts.dart +++ b/lib/Utils/texts.dart @@ -45,9 +45,10 @@ Widget text20400white(String text) { ); } -Widget text20400FCFCFC(String text) { +Widget text20400FCFCFC(String text, {TextAlign? textAlign}) { return Text( text, + textAlign: textAlign, style: TextStyle( fontSize: 20.sp, color: const Color(0xFFFCFCFC), @@ -172,6 +173,18 @@ Widget text144005DFD63(String text) { ); } +Widget text13400A7A7A7(String text) { + return Text( + text, + // textAlign: TextAlign.center, + style: TextStyle( + fontSize: 13.sp, + color: const Color(0xFFA7A7A7), + fontWeight: FontWeight.w400, + fontFamily: 'Helvetica'), + ); +} + Widget text14400whiteblur(String text, {TextAlign? textAlign}) { return Text( text, @@ -382,9 +395,10 @@ Widget txt20Black(txt) { ); } -Widget text16w400_FCFCFC(String text) { +Widget text16w400_FCFCFC(String text, {TextAlign? textAlign}) { return Text( text, + textAlign: textAlign, style: TextStyle( fontSize: 16.sp, color: const Color(0xFFFCFCFC), @@ -447,9 +461,10 @@ Widget text10400whiteblur(String text) { ); } -Widget text16w700_FCFCFC(String text) { +Widget text16w700_FCFCFC(String text, {TextAlign? textAlign}) { return Text( text, + textAlign: textAlign, style: TextStyle( fontSize: 16.sp, color: const Color(0xFFFCFCFC), diff --git a/lib/main.dart b/lib/main.dart index 325010a..7f36095 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:io'; + import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:firebase_core/firebase_core.dart'; @@ -9,7 +10,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:regroup/Utils/dialogs.dart'; -import 'package:regroup/Utils/Common/NoInternet.dart'; import 'package:regroup/firebase_options.dart'; import 'package:regroup/resources/routes/route_name.dart'; import 'package:regroup/resources/routes/routes.dart'; @@ -122,7 +122,13 @@ class _MyAppState extends State with WidgetsBindingObserver { fontFamily: 'Cambria', ), debugShowCheckedModeBanner: false, + // initialRoute: RouteName.individualactivitystep2, + + + initialRoute: RouteName.splashScreen, + + getPages: AppRoutes.appRoutes(), ), designSize: const Size(390, 844), diff --git a/lib/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart b/lib/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart index f60173a..2740593 100644 --- a/lib/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart +++ b/lib/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart @@ -8,7 +8,7 @@ import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/ImageUpload.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -98,10 +98,10 @@ class _LetusUnderstandState extends State { Get.snackbar( "Success!", 'success!', - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.green, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -111,10 +111,10 @@ class _LetusUnderstandState extends State { Get.snackbar( "Error!", data.message, - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -124,10 +124,10 @@ class _LetusUnderstandState extends State { Get.snackbar( "Error!", data.data['message'], - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -153,7 +153,7 @@ class _LetusUnderstandState extends State { Widget durationPickerDialog() { int selectedHour = 1; return AlertDialog( - title: Text('Select Duration'), + title: const Text('Select Duration'), content: Container( width: double.minPositive, child: Container( @@ -178,7 +178,7 @@ class _LetusUnderstandState extends State { ), actions: [ TextButton( - child: Text('Cancel'), + child: const Text('Cancel'), onPressed: () { Navigator.of(context).pop(); }, @@ -190,7 +190,7 @@ class _LetusUnderstandState extends State { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), + backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ // Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), @@ -274,7 +274,7 @@ class _LetusUnderstandState extends State { height: 25.h, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: Color(0xFF434A53)), + side: const BorderSide(width: 1, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), ), @@ -287,7 +287,7 @@ class _LetusUnderstandState extends State { width: 15, height: 15, decoration: ShapeDecoration( - gradient: LinearGradient( + gradient: const LinearGradient( begin: Alignment(0.98, -0.21), end: Alignment(-0.98, 0.21), colors: [ @@ -311,7 +311,7 @@ class _LetusUnderstandState extends State { Center( child: Container( width: 154.w, - decoration: ShapeDecoration( + decoration: const ShapeDecoration( shape: RoundedRectangleBorder( side: BorderSide( width: 1, @@ -566,8 +566,8 @@ class _LetusUnderstandState extends State { height: 115, decoration: ShapeDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: [ Colors.white .withOpacity(0.30000001192092896), @@ -576,7 +576,7 @@ class _LetusUnderstandState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), ), @@ -604,13 +604,13 @@ class _LetusUnderstandState extends State { width: 27, height: 27, decoration: ShapeDecoration( - color: Color(0xFF7E7E7E), + color: const Color(0xFF7E7E7E), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular( 5)), ), - child: Icon( + child: const Icon( Icons.delete_outline_outlined, color: Colors.white, ) @@ -644,8 +644,8 @@ class _LetusUnderstandState extends State { height: 115, decoration: ShapeDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: [ Colors.white .withOpacity(0.30000001192092896), @@ -654,7 +654,7 @@ class _LetusUnderstandState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), @@ -688,8 +688,8 @@ class _LetusUnderstandState extends State { height: 115, decoration: ShapeDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: [ Colors.white .withOpacity(0.30000001192092896), @@ -698,7 +698,7 @@ class _LetusUnderstandState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), ), @@ -726,13 +726,13 @@ class _LetusUnderstandState extends State { width: 27, height: 27, decoration: ShapeDecoration( - color: Color(0xFF7E7E7E), + color: const Color(0xFF7E7E7E), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular( 5)), ), - child: Icon( + child: const Icon( Icons.delete_outline_outlined, color: Colors.white, ) @@ -766,8 +766,8 @@ class _LetusUnderstandState extends State { height: 115, decoration: ShapeDecoration( gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), + begin: const Alignment(0.98, -0.21), + end: const Alignment(-0.98, 0.21), colors: [ Colors.white .withOpacity(0.30000001192092896), @@ -776,7 +776,7 @@ class _LetusUnderstandState extends State { ], ), shape: RoundedRectangleBorder( - side: BorderSide( + side: const BorderSide( width: 0.50, color: Color(0xFF7E7E7E)), borderRadius: BorderRadius.circular(10), diff --git a/lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart b/lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart index 514e86c..85da716 100644 --- a/lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart +++ b/lib/onboarding/Signup/View/Business/View/step2Selectgroup.dart @@ -29,46 +29,14 @@ class _SelectgroupStep2State extends State { backgroundColor: Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ - Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), - Positioned(top: 400, right: -30, child: CommonBlurRightSecond()), - Positioned(top: 630, left: -30, child: CommonBlurLeftBlue()), - SingleChildScrollView( - child: GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 6, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - Color(0XFF222935).withOpacity(0.60), - - Color(0XFF222935).withOpacity(0.60), - ], - ), - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 50.h), child: Column( @@ -241,10 +209,10 @@ class _SelectgroupStep2State extends State { }) ], ), - )), - ), - ], - )); + )],), + + + ); } } diff --git a/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart b/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart index 9a678d8..4f16c3f 100644 --- a/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart +++ b/lib/onboarding/Signup/View/Business/View/step3SelectCommunity.dart @@ -29,46 +29,13 @@ class _SelectBusinessCommunityState extends State { backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ - const Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), - const Positioned(top: 400, right: -30, child: CommonBlurRightSecond()), - const Positioned(top: 630, left: -30, child: CommonBlurLeftBlue()), - SingleChildScrollView( - child: GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 6, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - const Color(0XFF222935).withOpacity(0.60), - - const Color(0XFF222935).withOpacity(0.60), - ], - ), - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 50.h), child: Column( @@ -242,10 +209,10 @@ class _SelectBusinessCommunityState extends State { }) ], ), - )), - ), - ], - )); + )]), + + + ); } } diff --git a/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart b/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart index 73fe783..8428a80 100644 --- a/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart +++ b/lib/onboarding/Signup/View/Business/View/tellusbusiness.dart @@ -7,7 +7,7 @@ import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -129,12 +129,11 @@ class _TellusaboutBusinessState extends State { @override Widget build(BuildContext context) { return WillPopScope( - onWillPop: ()async { + onWillPop: () async { // SystemNavigator.pop(); - Navigator.pop(context); + Navigator.pop(context); return true; - }, child: GestureDetector( onTap: () => FocusManager.instance.primaryFocus?.unfocus(), diff --git a/lib/onboarding/Signup/View/Individual/FindCommunityPage.dart b/lib/onboarding/Signup/View/Individual/FindCommunityPage.dart new file mode 100644 index 0000000..b8581e7 --- /dev/null +++ b/lib/onboarding/Signup/View/Individual/FindCommunityPage.dart @@ -0,0 +1,44 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:regroup/Common/CommonButton.dart'; +import 'package:regroup/Utils/Common/sized_box.dart'; +import 'package:regroup/Utils/texts.dart'; +import 'package:regroup/resources/routes/route_name.dart'; + +class FindCommunityPage extends StatelessWidget { + const FindCommunityPage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Color(0xFF222935), + body: SingleChildScrollView( + child: Padding( + padding: EdgeInsets.symmetric( + vertical: 60.h, + ), + child: Column(children: [ + sizedBoxHeight(40.h), + Image.asset("assets/images/png/Organizing projects-pana 1.png"), + sizedBoxHeight(30.h), + Padding( + padding: EdgeInsets.symmetric(horizontal: 10.w), + child: Column(children: [ + text20400FCFCFC( + '''ReGroup helps organise individuals into groups, and groups within communities. For example, an individual is part of a local football club, while all the football clubs in the city form a wider football community. If you already know which communities you're interested in, you can search for them here.''', + textAlign: TextAlign.center), + sizedBoxHeight(20.h), + CommonBtn( + text: "Find communities", + onTap: () { + // individualcommunitystep4 + // Get.toNamed(RouteName.individualgroupstep3); + Get.toNamed(RouteName.individualcommunitystep4); + }), + ]), + ), + ])), + )); + } +} diff --git a/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart b/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart index 097b0e0..430ec5c 100644 --- a/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart +++ b/lib/onboarding/Signup/View/Individual/step1Selectprofile.dart @@ -2,9 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -26,45 +24,14 @@ class _SelectIndividualProfileState extends State { backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ - const Positioned(top: 70, left: -30, child: CommonBlurLeftSecond()), - const Positioned(top: 310, right: -30, child: CommonBlurRightSecond()), - const Positioned(top: 540, left: -30, child: CommonBlurLeftBlue()), - GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 6, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - const Color(0XFF222935).withOpacity(0.60), - - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - const Color(0XFF222935).withOpacity(0.60), - - const Color(0XFF222935).withOpacity(0.60), - ], - ), - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 50.h), child: Column( @@ -181,7 +148,7 @@ class _SelectIndividualProfileState extends State { }) ], ), - )), + ) ], )); } diff --git a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart index 97a11dd..89c76e2 100644 --- a/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart +++ b/lib/onboarding/Signup/View/Individual/step2Selectactivity.dart @@ -1,15 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; -import 'package:regroup/Common/CommonDropDown.dart'; +import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -18,6 +14,9 @@ import 'package:regroup/onboarding/Signup/view_model/postmethod.dart'; import 'package:regroup/resources/routes/route_name.dart'; import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart'; +int? _firstSelectedIndex; +bool _isFirstSelectionActive = false; + class SelectIndividualActivity extends StatefulWidget { const SelectIndividualActivity({super.key}); @@ -45,16 +44,49 @@ class _SelectIndividualActivityState extends State { // }); // } - void _onContainerTap(int id) { + void _onContainerTap(int index) { setState(() { - if (_selectedIndices.contains(id)) { - _selectedIndices.remove(id); + if (_selectedIndices.contains(index)) { + _selectedIndices.remove(index); + if (_firstSelectedIndex == index) { + // If the first selected container is unselected, reset the active state + _firstSelectedIndex = null; + _isFirstSelectionActive = false; + } } else { - _selectedIndices.add(id); + if (_firstSelectedIndex == null) { + // The first item is being selected + _firstSelectedIndex = index; + _isFirstSelectionActive = true; + } + _selectedIndices.add(index); } }); } + Color _getGradientColor(int index) { + if (_selectedIndices.isEmpty) { + return Colors.transparent; + } else if (_firstSelectedIndex == index && _isFirstSelectionActive) { + // Apply Color(0XFFD90B2E) to the first selected item + return Color(0XFFD90B2E); + } else if (_selectedIndices.contains(index)) { + // Apply Color(0xFF009DAB) to all other selected items + return Color(0xFF009DAB); + } + return Colors.transparent; + } + + // void _onContainerTap(int id) { + // setState(() { + // if (_selectedIndices.contains(id)) { + // _selectedIndices.remove(id); + // } else { + // _selectedIndices.add(id); + // } + // }); + // } + // to give two different colors for selectedd two containers // Color _getGradientColor(int index) { // if (_selectedIndices.isEmpty) { @@ -72,33 +104,31 @@ class _SelectIndividualActivityState extends State { // return Colors.transparent; // } - Color _getGradientColor(int id) { - if (_selectedIndices.contains(id)) { - return const Color(0XFFD90B2E); // Selected color - } - return Colors.transparent; // Default color - } + // Color _getGradientColor(int id) { + // if (_selectedIndices.contains(id)) { + // return const Color(0XFFD90B2E); // Selected color + // } + // return Colors.transparent; // Default color + // } Uploadata() async { utils.loader(); String selectedIndicesString = '[${_selectedIndices.join(',')}]'; - print('Selected Indices: $selectedIndicesString'); Map updata = { "manage_interest_xid": selectedIndicesString, "other_interest": otheractivitycontroller.text, }; - print('Payload: $updata'); final data = await Onboard().PostIndividualActivity(updata); if (data.status == ResponseStatus.SUCCESS) { Get.back(); print("Activities selected"); - Get.toNamed(RouteName.individualgroupstep3); + // Get.toNamed(RouteName.individualgroupstep3); + Get.toNamed(RouteName.findcommunitypage); return utils.showToast(data.message); } else { Get.back(); - print("Not done"); return utils.showToast(data.message); } } @@ -106,310 +136,291 @@ class _SelectIndividualActivityState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusManager.instance.primaryFocus?.unfocus(), - child: Scaffold( - backgroundColor: const Color.fromARGB(255, 18, 32, 47), - bottomNavigationBar: Padding( - padding: const EdgeInsets.only(bottom: 10, left: 16, right: 16), - child: CustomButton( - text: "Continue", - onPressed: () { - if (_selectedIndices.isEmpty && - otheractivitycontroller.text.isEmpty) { - utils.showToast('Please select activity'); - } else { - print(_selectedIndices.toString()); - // String selectedIndicesString = - // _selectedIndices.join(','); - // print( - // 'Selected Indices: [$selectedIndicesString]'); - Uploadata(); - } - // Get.toNamed( - // RouteName.individualgroupstep3); - }), - ), - body: SafeArea( - child: FutureBuilder( - future: Getonboard().getIndividualactivity(), - builder: (ctx, snapshot) { - if (snapshot.data == null) { - return const Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [Center(child: CircularProgressIndicator())], - ); - } - if (snapshot.connectionState == ConnectionState.done) { - if (snapshot.hasError) { - return Center( - child: Text( - '${snapshot.error} occured', - style: TextStyle(fontSize: 18.spMin), - ), + onTap: () => FocusManager.instance.primaryFocus?.unfocus(), + child: Scaffold( + backgroundColor: const Color.fromARGB(255, 18, 32, 47), + bottomNavigationBar: Padding( + padding: const EdgeInsets.only(bottom: 10, left: 16, right: 16), + child: CustomButton( + text: "Continue", + onPressed: () { + if (_selectedIndices.isEmpty && + otheractivitycontroller.text.isEmpty) { + utils.showToast('Please select activity'); + } else { + print(_selectedIndices.toString()); + // String selectedIndicesString = + // _selectedIndices.join(','); + // print( + // 'Selected Indices: [$selectedIndicesString]'); + Uploadata(); + } + // Get.toNamed( + // RouteName.individualgroupstep3); + }), + ), + body: SafeArea( + child: FutureBuilder( + future: Getonboard().getIndividualactivity(), + builder: (ctx, snapshot) { + if (snapshot.data == null) { + return const Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [Center(child: CircularProgressIndicator())], ); } - } + if (snapshot.connectionState == ConnectionState.done) { + if (snapshot.hasError) { + return Center( + child: Text( + '${snapshot.error} occured', + style: TextStyle(fontSize: 18.spMin), + ), + ); + } + } - return Stack( - children: [ - Container( - decoration: const BoxDecoration( - image: DecorationImage( - image: AssetImage( - "assets/images/png/Ellipse 1496.png"), - fit: BoxFit.fill)), - ), - Padding( - padding: - EdgeInsets.symmetric(horizontal: 16.w, vertical: 0.h), - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Align( - alignment: Alignment.topRight, - child: GestureDetector( - onTap: () { - Get.toNamed(RouteName.communitycommitscreen); - }, - child: Text( - 'Skip', - style: TextStyle( - color: Colors.white, - fontSize: 16.sp, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w400, - decoration: TextDecoration.underline, - decorationColor: Colors.white), + return Stack( + children: [ + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage( + "assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + Padding( + padding: + EdgeInsets.symmetric(horizontal: 16.w, vertical: 0.h), + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Align( + alignment: Alignment.topRight, + child: GestureDetector( + onTap: () { + Get.toNamed(RouteName.communitycommitscreen); + }, + child: Text( + 'Skip', + style: TextStyle( + color: Colors.white, + fontSize: 16.sp, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w400, + decoration: TextDecoration.underline, + decorationColor: Colors.white), + ), ), ), - ), - sizedBoxHeight(30.h), - Align( - alignment: Alignment.center, - child: text16400white('Step 1 of 3')), - sizedBoxHeight(20.h), - Container( - width: double.infinity, - height: 25.h, - decoration: ShapeDecoration( - shape: RoundedRectangleBorder( - side: const BorderSide( - width: 1, color: Color(0xFF434A53)), - borderRadius: BorderRadius.circular(30), + sizedBoxHeight(30.h), + Align( + alignment: Alignment.center, + child: text16400white('Step 1 of 3')), + sizedBoxHeight(20.h), + Container( + width: double.infinity, + height: 25.h, + decoration: ShapeDecoration( + shape: RoundedRectangleBorder( + side: const BorderSide( + width: 1, color: Color(0xFF434A53)), + borderRadius: BorderRadius.circular(30), + ), ), - ), - child: Padding( - padding: EdgeInsets.symmetric( - horizontal: 8.w, vertical: 2.h), - child: Row( - children: [ - Container( - width: 120.w, - height: 15.h, - decoration: ShapeDecoration( - gradient: const LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), - colors: [ - Color(0xA5D90B2E), - Color(0x42D90B2E) - ], - ), - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(30), - ), - ), - child: Row( - mainAxisAlignment: - MainAxisAlignment.end, - children: [ - Container( - width: 15, - height: 15, - decoration: ShapeDecoration( - gradient: const LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), - colors: [ - Color(0xFFD90B2E), - Color(0x60D90B2E) - ], - ), - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(30), - ), - ), - ) - ], - )) - ], - ), - ), - ), - sizedBoxHeight(40.h), - indiactivityobj!.data == null || - indiactivityobj!.data!.isEmpty - ? _buildNoDataBody(context) - : Column( - crossAxisAlignment: CrossAxisAlignment.start, + child: Padding( + padding: EdgeInsets.symmetric( + horizontal: 8.w, vertical: 2.h), + child: Row( children: [ - Center( - child: _selectedIndices.isEmpty - ? text20400white( - 'What is your main activity ?') - : text20400white( - 'What else do you do?')), - sizedBoxHeight(10.w), - Center( - child: Container( - width: 154.w, - decoration: const ShapeDecoration( + Container( + width: 100.w, + height: 15.h, + decoration: ShapeDecoration( + gradient: const LinearGradient( + begin: Alignment(0.98, -0.21), + end: Alignment(-0.98, 0.21), + colors: [ + Color(0xA5D90B2E), + Color(0x42D90B2E) + ], + ), shape: RoundedRectangleBorder( - side: BorderSide( - width: 1, - strokeAlign: - BorderSide.strokeAlignCenter, - color: Color(0xFF858585), - ), + borderRadius: + BorderRadius.circular(30), ), ), - ), - ), - sizedBoxHeight(30.h), - GridView.builder( - physics: const ScrollPhysics(), - shrinkWrap: true, - gridDelegate: - SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: - 3, // Number of items in each row - crossAxisSpacing: 12 - .w, // Horizontal spacing between items - mainAxisSpacing: 12 - .h, // Vertical spacing between items - ), - itemCount: indiactivityobj!.data!.length, - itemBuilder: (context, index) { - return ActivityContainer( - index: - indiactivityobj!.data![index].id!, - titleString: indiactivityobj! - .data![index].name!, - image: indiactivityobj! - .data![index].image, - // 'assets/images/svg/individualact7.svg', - isSelected: _selectedIndices.contains( - indiactivityobj! - .data![index].id!), - gradientColor: _getGradientColor( - indiactivityobj! - .data![index].id!), - onTap: _onContainerTap, - ); - }, - ), - - sizedBoxHeight(30.h), - text20400FCFCFC("Add other activity"), - sizedBoxHeight(25.h), - CustomTextFormField( - textEditingController: - otheractivitycontroller, - texttype: TextInputType.text, - hintText: "Enter other activity", - // leadingIcon: - // // const Icon(Icons.mail_outline), - // Image.asset( - // width: 22.w, - // height: 17.h, - // 'assets/images/png/user.png', - // ), - // validatorText: "Enter your full name", - validator: (value) { - if (value!.isEmpty) { - return 'Enter your full name '; - } - return null; - }, - inputFormatters: [ - // LengthLimitingTextInputFormatter(20), - RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow( - RegExp('[a-zA-Z ]')) - ], - ), - // CustomDropDownRadio( - // header: "", - // title: "", - // listData: [ - // "American football", - // "Archery", - // "Athletics", - // "Baseball", - // "Basketball", - // "Boxing", - // "Canoeing", - // "Clay pigeon shooting", - // "Climbing", - // "Combat sports", - // "Cricket", - // "Dodgeball", - // "Equestrian", - // "Fencing", - // "Gaelic football", - // "Golf", - // "Gymnastics", - // "Handball", - // "Hockey", - // "Lacrosse", - // "Modern biathlon and pentathlon", - // "Netball", - // "Orienteering", - // "Pool and snooker", - // "Powerlifting", - // "Rifle", - // "Rugby league", - // "Rugby union", - // "Sailing", - // "Snowsports", - // "Squash", - // "Surfing", - // "Swimming", - // "Softball", - // "Table tennis", - // "Tennis", - // "Touch rugby", - // "Trampoline", - // "Triathlon", - // "Ultimate frisbee", - // "Volleyball", - // "Water polo", - // "Windsurfing" - // ], - // onItemSelected: (p0) {}, - // leadingImage: SizedBox()), - // // Spacer(flex: 1), - - sizedBoxHeight(35.h), + child: Row( + mainAxisAlignment: + MainAxisAlignment.end, + children: [ + Container( + width: 15, + height: 15, + decoration: ShapeDecoration( + gradient: const LinearGradient( + begin: Alignment(0.98, -0.21), + end: Alignment(-0.98, 0.21), + colors: [ + Color(0xFFD90B2E), + Color(0x60D90B2E) + ], + ), + shape: RoundedRectangleBorder( + borderRadius: + BorderRadius.circular(30), + ), + ), + ) + ], + )) ], - ) - ], + ), + ), + ), + sizedBoxHeight(40.h), + indiactivityobj!.data == null || + indiactivityobj!.data!.isEmpty + ? _buildNoDataBody(context) + : Column( + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + text20400white( + 'What are your interests?'), + // sizedBoxHeight(5.w), + + _isFirstSelectionActive + ? text13400A7A7A7( + 'Select your secondary interests') + : text13400A7A7A7( + 'Select your primary interest'), + + // Container( + // width: 154.w, + // decoration: const ShapeDecoration( + // shape: RoundedRectangleBorder( + // side: BorderSide( + // width: 1, + // strokeAlign: + // BorderSide.strokeAlignCenter, + // color: Color(0xFF858585), + // ), + // ), + // ), + // ), + sizedBoxHeight(30.h), + GridView.builder( + physics: const ScrollPhysics(), + shrinkWrap: true, + gridDelegate: + SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: + 3, // Number of items in each row + crossAxisSpacing: 12 + .w, // Horizontal spacing between items + mainAxisSpacing: 12 + .h, // Vertical spacing between items + ), + itemCount: + indiactivityobj!.data!.length, + itemBuilder: (context, index) { + return ActivityContainer( + index: indiactivityobj! + .data![index].id!, + titleString: indiactivityobj! + .data![index].name!, + image: indiactivityobj! + .data![index].image, + // 'assets/images/svg/individualact7.svg', + isSelected: _selectedIndices + .contains(indiactivityobj! + .data![index].id!), + gradientColor: _getGradientColor( + indiactivityobj! + .data![index].id!), + onTap: _onContainerTap, + ); + }, + ), + + sizedBoxHeight(30.h), + // text20400FCFCFC("Add other activity"), + // sizedBoxHeight(25.h), + // CustomTextFormField( + // textEditingController: + // otheractivitycontroller, + // texttype: TextInputType.text, + // hintText: "Enter other activity", + // // leadingIcon: + // // // const Icon(Icons.mail_outline), + // // Image.asset( + // // width: 22.w, + // // height: 17.h, + // // 'assets/images/png/user.png', + // // ), + // // validatorText: "Enter your full name", + // validator: (value) { + // if (value!.isEmpty) { + // return 'Enter your full name '; + // } + // return null; + // }, + // inputFormatters: [ + // // LengthLimitingTextInputFormatter(20), + // RemoveEmojiInputFormatter(), + // FilteringTextInputFormatter.allow( + // RegExp('[a-zA-Z ]')) + // ], + // ), + + sizedBoxHeight(35.h), + ], + ) + ], + ), ), ), - ), - ], - ); - }, + ], + ); + }, + ), ), - ), - - // - ), - ); + floatingActionButton: Stack( + alignment: Alignment.center, + clipBehavior: Clip.none, // Ensure the Positioned widget is visible + children: [ + FloatingActionButton( + onPressed: () { + interestdialogwidget(); + }, + backgroundColor: const Color(0xFFD90B2E), + autofocus: true, + shape: const CircleBorder(), + child: Icon( + Icons.add, + color: Colors.white, + size: 27.sp, + ), + ), + Positioned( + right: 60.w, + child: Container( + width: 212.w, + height: 35.h, + decoration: BoxDecoration( + color: Color(0xFF363636), + borderRadius: BorderRadius.circular(20), + border: + Border.all(color: Color(0xFFD90B2E), width: 1.w)), + child: Center( + child: text16400white("Can’t find your interest"))), + ) + ], + ), + )); } Widget _buildNoDataBody(context) { @@ -418,6 +429,126 @@ class _SelectIndividualActivityState extends State { children: [Text("No Data Found")], ); } + + interestdialogwidget() { + Get.dialog(Dialog( + // backgroundColor: Colors.transparent, + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.r), + color: const Color(0xFF222935)), + child: Padding( + padding: EdgeInsets.only( + right: 16.w, left: 16.w, top: 20.h, bottom: 40.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Spacer(), + InkWell( + onTap: () { + Get.back(); + }, + child: Image.asset( + "assets/images/png/x-circle.png", + height: 28.h, + width: 28.w, + ), + ) + ], + ), + text16w700_FCFCFC("Suggest interest"), + sizedBoxHeight(16.h), + Center( + child: CustomTextFormField( + textEditingController: otheractivitycontroller, + hintText: "Please type your interest", + texttype: TextInputType.text, + validator: (value) { + if (value!.isEmpty) { + return 'Enter your interest'; + } + return null; + }, + inputFormatters: [ + // LengthLimitingTextInputFormatter(20), + RemoveEmojiInputFormatter(), + FilteringTextInputFormatter.allow(RegExp('[a-zA-Z ]')) + ], + )), + sizedBoxHeight(10.h), + text10w400_FCFCFC_blur("We will surely make this happen"), + sizedBoxHeight(20.h), + Align( + alignment: Alignment.center, + child: SizedBox( + width: 177.w, + child: CommonBtn( + text: "Suggest", + onTap: () { + Get.back(); + thankdialogwidget(); + })), + ) + ], + ), + ), + ), + ], + ), + )); + } + + thankdialogwidget() { + Get.dialog(Dialog( + // backgroundColor: Colors.transparent, + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.r), + color: const Color(0xFF222935)), + child: Padding( + padding: EdgeInsets.only( + right: 16.w, left: 16.w, top: 20.h, bottom: 40.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + children: [ + Spacer(), + Image.asset( + "assets/images/png/x-circle.png", + height: 28.h, + width: 28.w, + ) + ], + ), + Image.asset( + "assets/images/png/correct 1.png", + height: 72.h, + width: 72.w, + ), + sizedBoxHeight(20.h), + text16w700_FCFCFC( + "Thank You! \n for adding one more to the club", + textAlign: TextAlign.center), + sizedBoxHeight(16.h), + ], + ), + ), + ), + ], + ), + )); + } } class ActivityContainer extends StatelessWidget { @@ -446,22 +577,33 @@ class ActivityContainer extends StatelessWidget { // height: 120.h, decoration: ShapeDecoration( gradient: LinearGradient( - begin: const Alignment(0.98, -0.21), - end: const Alignment(-0.98, 0.21), + begin: const Alignment(0.98, 0.10), + end: const Alignment(-0.40, -0.70), colors: isSelected - ? [ - gradientColor.withOpacity(0.80), - gradientColor.withOpacity(0.77), - gradientColor.withOpacity(0.66), - gradientColor.withOpacity(0.18), - ] + ? _firstSelectedIndex == index && + _isFirstSelectionActive == true + ? [ + Color(0xFF009DAB).withOpacity(0.80), + Color(0xFF009DAB).withOpacity(0.77), + gradientColor.withOpacity(0.70), + gradientColor.withOpacity(0.50), + ] + : [ + Colors.white.withOpacity(0.06), + Colors.white.withOpacity(0.08), + ] : [ Colors.white.withOpacity(0.06), Colors.white.withOpacity(0.08), ], ), shape: RoundedRectangleBorder( - side: const BorderSide(width: 1, color: Color(0xFF434A53)), + side: isSelected + ? _firstSelectedIndex == index && + _isFirstSelectionActive == true + ? BorderSide(width: 0.4.w, color: Colors.transparent) + : BorderSide(width: 3.w, color: gradientColor) + : BorderSide(width: 2.w, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(10), ), ), diff --git a/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart b/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart index 447b062..0146056 100644 --- a/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart +++ b/lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart @@ -1,14 +1,13 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; +import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -65,9 +64,10 @@ class _SelectIndividualGroupState extends State { final data = await Onboard().postGroups(updata); if (data.status == ResponseStatus.SUCCESS) { - Get.back(); + // Get.back(); print("groups selected"); - Get.toNamed(RouteName.individualcommunitystep4); + // Get.toNamed(RouteName.individualcommunitystep4); + Get.toNamed(RouteName.communitycommitscreen); return utils.showToast(data.message); } else { @@ -82,7 +82,7 @@ class _SelectIndividualGroupState extends State { return GestureDetector( onTap: () => FocusManager.instance.primaryFocus?.unfocus(), child: Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), + backgroundColor: const Color.fromARGB(255, 18, 32, 47), body: Stack( children: [ Container( @@ -117,14 +117,15 @@ class _SelectIndividualGroupState extends State { sizedBoxHeight(30.h), Align( alignment: Alignment.center, - child: text16400white('Step 2 of 3')), + child: text16400white('Step 3 of 3')), sizedBoxHeight(20.h), Container( width: double.infinity, height: 25.h, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: Color(0xFF434A53)), + side: const BorderSide( + width: 1, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), ), @@ -133,45 +134,47 @@ class _SelectIndividualGroupState extends State { horizontal: 8.w, vertical: 2.h), child: Row( children: [ - Container( - width: 216.w, - height: 15.h, - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), - colors: [ - Color(0xA5D90B2E), - Color(0x42D90B2E) + Expanded( + child: Container( + // width: 216.w, + height: 15.h, + decoration: ShapeDecoration( + gradient: const LinearGradient( + begin: Alignment(0.98, -0.21), + end: Alignment(-0.98, 0.21), + colors: [ + Color(0xA5D90B2E), + Color(0x42D90B2E) + ], + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(30), + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Container( + width: 15, + height: 15, + decoration: ShapeDecoration( + gradient: const LinearGradient( + begin: Alignment(0.98, -0.21), + end: Alignment(-0.98, 0.21), + colors: [ + Color(0xFFD90B2E), + Color(0x60D90B2E) + ], + ), + shape: RoundedRectangleBorder( + borderRadius: + BorderRadius.circular(30), + ), + ), + ) ], - ), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(30), - ), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Container( - width: 15, - height: 15, - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), - colors: [ - Color(0xFFD90B2E), - Color(0x60D90B2E) - ], - ), - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(30), - ), - ), - ) - ], - )) + )), + ) ], ), ), @@ -183,14 +186,19 @@ class _SelectIndividualGroupState extends State { children: [ text20400white('Find your group'), sizedBoxWidth(5.w), - Image.asset('assets/images/png/informationicon.png') + InkWell( + onTap: () { + groupBottomsheet(); + }, + child: Image.asset( + 'assets/images/png/informationicon.png')) ], )), sizedBoxHeight(10.w), Center( child: Container( width: 108.w, - decoration: ShapeDecoration( + decoration: const ShapeDecoration( shape: RoundedRectangleBorder( side: BorderSide( width: 1, @@ -215,7 +223,7 @@ class _SelectIndividualGroupState extends State { // ), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Icon( + child: const Icon( Icons.search, size: 35, color: Colors.white, @@ -241,13 +249,14 @@ class _SelectIndividualGroupState extends State { if (snapshot.connectionState == ConnectionState.waiting) { // Display shimmer effect while waiting for data - return Center(child: CircularProgressIndicator()); + return const Center( + child: CircularProgressIndicator()); } else if (snapshot.hasError) { // Handle error state return Center( child: Text( '${snapshot.error} occurred', - style: TextStyle(fontSize: 18), + style: const TextStyle(fontSize: 18), ), ); } else { @@ -256,9 +265,9 @@ class _SelectIndividualGroupState extends State { ? _buildNoDataBody(context) : Expanded( child: GridView.builder( - physics: ScrollPhysics(), + physics: const ScrollPhysics(), gridDelegate: - SliverGridDelegateWithFixedCrossAxisCount( + const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, crossAxisSpacing: 12.0, mainAxisSpacing: 12.0, @@ -328,6 +337,53 @@ class _SelectIndividualGroupState extends State { ), ); } + + void groupBottomsheet() { + Get.bottomSheet( + isScrollControlled: true, + Container( + // height: 700.h, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(14.r), + color: const Color(0xFF222935)), + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h), + child: Column(mainAxisSize: MainAxisSize.min, children: [ + // sizedBoxHeight(20.h), + Row( + children: [ + Spacer(), + Image.asset( + "assets/images/png/x-circle.png", + height: 28.h, + width: 28.w, + ), + ], + ), + Image.asset( + "assets/images/png/Group 1000004385.png", + height: 185.h, + width: 185.w, + ), + + sizedBoxHeight(20.h), + text16w400_FCFCFC( + '''Use this screen to find specific groups within your area. Groups span any club, society or hobbyist group e.g. sports clubs, social clubs, service clubs, musical groups or voluntary societies. If you are still exploring your options, you can skip this step. You can always join or create new groups later.''', + textAlign: TextAlign.center), + sizedBoxHeight(20.h), + + SizedBox( + width: 239.w, + child: CommonBtn( + text: "Understood", + onTap: () { + Get.back(); + }, + )), + + // sizedBoxHeight(40.h) + ])))); + } } class GroupSelect extends StatelessWidget { @@ -348,13 +404,13 @@ class GroupSelect extends StatelessWidget { @override Widget build(BuildContext context) { - return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + return Column(crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 169, - height: 74, + width: 72.w, + height: 72.h, decoration: ShapeDecoration( image: image == null || image!.isEmpty - ? DecorationImage( + ? const DecorationImage( image: AssetImage("assets/images/png/groupindividual3.png"), fit: BoxFit.fill, ) @@ -362,26 +418,42 @@ class GroupSelect extends StatelessWidget { image: NetworkImage(image!), fit: BoxFit.fill, ), - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)), + shape: + RoundedRectangleBorder(borderRadius: BorderRadius.circular(100)), ), ), - SizedBox(height: 15.0), + const SizedBox(height: 15.0), Text( titleString, - style: TextStyle( + style: const TextStyle( color: Colors.white, fontSize: 12.0, overflow: TextOverflow.ellipsis), ), - SizedBox(height: 15.0), + const SizedBox(height: 15.0), GestureDetector( onTap: () => onTap(index), child: Container( - width: 169, - height: 23, + width: 169.w, + height: 23.h, decoration: ShapeDecoration( + gradient: isSelected + ? LinearGradient(colors: [ + Color(0xFFD90B2E), + Color(0xFFD90B2E), + ]) + : LinearGradient( + begin: Alignment(0.98, -0.21), + end: Alignment(-0.98, 0.21), + colors: [ + Colors.white.withOpacity(0.04), + Colors.white.withOpacity(0.05) + ], + ), shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: Color(0xFFFF002B)), + side: isSelected + ? BorderSide(width: 1.w, color: Colors.transparent) + : BorderSide(width: 1.w, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), ), @@ -389,10 +461,8 @@ class GroupSelect extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ isSelected - ? Text('Regrouping', - style: TextStyle(color: Colors.white, fontSize: 10.0)) - : Text('Join', - style: TextStyle(color: Colors.white, fontSize: 10.0)) + ? text10400white("Leave group") + : text10400white("Join") ], ), ), diff --git a/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart b/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart index 78b3bd9..050cdd2 100644 --- a/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart +++ b/lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart @@ -2,13 +2,13 @@ import 'dart:async'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; +import 'package:regroup/Common/CommonButton.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -68,7 +68,9 @@ class _SelectIndividualCommunityState extends State { if (data.status == ResponseStatus.SUCCESS) { // Get.back(); print("groups selected"); - Get.toNamed(RouteName.communitycommitscreen); + // Get.toNamed(RouteName.communitycommitscreen); + Get.toNamed(RouteName.individualgroupstep3); + return utils.showToast(data.message); } else { @@ -118,14 +120,15 @@ class _SelectIndividualCommunityState extends State { sizedBoxHeight(30.h), Align( alignment: Alignment.center, - child: text16400white('Step 3 of 3')), + child: text16400white('Step 2 of 3')), sizedBoxHeight(20.h), Container( width: double.infinity, height: 25.h, decoration: ShapeDecoration( shape: RoundedRectangleBorder( - side: const BorderSide(width: 1, color: Color(0xFF434A53)), + side: const BorderSide( + width: 1, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), ), @@ -134,46 +137,45 @@ class _SelectIndividualCommunityState extends State { horizontal: 8.w, vertical: 2.h), child: Row( children: [ - Expanded( - child: Container( - // width: 216.w, - height: 15.h, - decoration: ShapeDecoration( - gradient: const LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), - colors: [ - Color(0xA5D90B2E), - Color(0x42D90B2E) - ], + Container( + width: 170.w, + height: 15.h, + decoration: ShapeDecoration( + gradient: const LinearGradient( + begin: Alignment(0.98, -0.21), + end: Alignment(-0.98, 0.21), + colors: [ + Color(0xA5D90B2E), + Color(0x42D90B2E) + ], + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(30), + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Container( + width: 15, + height: 15, + decoration: ShapeDecoration( + gradient: const LinearGradient( + begin: Alignment(0.98, -0.21), + end: Alignment(-0.98, 0.21), + colors: [ + Color(0xFFD90B2E), + Color(0x60D90B2E) + ], + ), + shape: RoundedRectangleBorder( + borderRadius: + BorderRadius.circular(30), + ), ), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(30), - ), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Container( - width: 15, - height: 15, - decoration: ShapeDecoration( - gradient: const LinearGradient( - begin: Alignment(0.98, -0.21), - end: Alignment(-0.98, 0.21), - colors: [ - Color(0xFFD90B2E), - Color(0x60D90B2E) - ], - ), - shape: RoundedRectangleBorder( - borderRadius: - BorderRadius.circular(30), - ), - ), - ) - ], - ))) + ) + ], + )) ], ), ), @@ -185,8 +187,13 @@ class _SelectIndividualCommunityState extends State { children: [ text20400white('Find your community'), sizedBoxWidth(5.w), - Image.asset( - 'assets/images/png/informationicon.png', + InkWell( + onTap: () { + communityBottomsheet(); + }, + child: Image.asset( + 'assets/images/png/informationicon.png', + ), ) ], )), @@ -244,7 +251,8 @@ class _SelectIndividualCommunityState extends State { if (snapshot.connectionState == ConnectionState.waiting) { // Display shimmer effect while waiting for data - return const Center(child: CircularProgressIndicator()); + return const Center( + child: CircularProgressIndicator()); } else if (snapshot.hasError) { // Handle error state return Center( @@ -333,6 +341,56 @@ class _SelectIndividualCommunityState extends State { ), ); } + + void communityBottomsheet() { + Get.bottomSheet( + isScrollControlled: true, + Container( + // height: 700.h, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(14.r), + color: const Color(0xFF222935)), + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 20.h), + child: Column(mainAxisSize: MainAxisSize.min, children: [ + // sizedBoxHeight(20.h), + Row( + children: [ + Spacer(), + Image.asset( + "assets/images/png/x-circle.png", + height: 28.h, + width: 28.w, + ), + ], + ), + Image.asset( + "assets/images/png/Connected world-amico 1.png", + height: 185.h, + width: 185.w, + ), + + sizedBoxHeight(20.h), + text16w400_FCFCFC( + '''Use this screen to find interesting communities near you. Communities are +a collection of groups, individuals and businesses that share common interests. e.g. 'London football clubs' or 'Cambridge rowing clubs'. If you aren't sure of which communities you'd like to be a part of or already know the specific club you'd like to join, you can skip this step. Don't worry, you can always join new communities later.''', + textAlign: TextAlign.center), + sizedBoxHeight(20.h), + + SizedBox( + width: 239.w, + child: CommonBtn( + text: "Understood", + onTap: () { + Get.back(); + }, + )), + + // sizedBoxHeight(40.h) + ])))); + } + + } class CommunitySelect extends StatelessWidget { @@ -355,8 +413,8 @@ class CommunitySelect extends StatelessWidget { Widget build(BuildContext context) { return Column(crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - width: 73.w, - height: 73.h, + width: 170.w, + height: 74.h, decoration: ShapeDecoration( image: image == null || image!.isEmpty ? const DecorationImage( @@ -368,7 +426,7 @@ class CommunitySelect extends StatelessWidget { fit: BoxFit.fill, ), shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(100), + borderRadius: BorderRadius.circular(5.r), ), ), ), @@ -384,11 +442,26 @@ class CommunitySelect extends StatelessWidget { GestureDetector( onTap: () => onTap(index), child: Container( - width: 169, - height: 23, + width: 169.w, + height: 23.h, decoration: ShapeDecoration( + gradient: isSelected + ? LinearGradient(colors: [ + Color(0xFFD90B2E), + Color(0xFFD90B2E), + ]) + : LinearGradient( + begin: Alignment(0.98, -0.21), + end: Alignment(-0.98, 0.21), + colors: [ + Colors.white.withOpacity(0.04), + Colors.white.withOpacity(0.05) + ], + ), shape: RoundedRectangleBorder( - side: const BorderSide(width: 1, color: Color(0xFFFF002B)), + side: isSelected + ? BorderSide(width: 1.w, color: Colors.transparent) + : BorderSide(width: 1.w, color: Color(0xFF434A53)), borderRadius: BorderRadius.circular(30), ), ), @@ -396,10 +469,8 @@ class CommunitySelect extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ isSelected - ? const Text('Regrouping', - style: TextStyle(color: Colors.white, fontSize: 10.0)) - : const Text('Join', - style: TextStyle(color: Colors.white, fontSize: 10.0)) + ? text10400white("Leave community") + : text10400white("Join") ], ), ), diff --git a/lib/onboarding/Signup/View/Individual/tellusindividual.dart b/lib/onboarding/Signup/View/Individual/tellusindividual.dart index 32364f3..236d6c2 100644 --- a/lib/onboarding/Signup/View/Individual/tellusindividual.dart +++ b/lib/onboarding/Signup/View/Individual/tellusindividual.dart @@ -14,7 +14,7 @@ import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/ImageUpload.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/Utils/texts.dart'; @@ -154,7 +154,7 @@ class _TellusaboutIndividualState extends State { Get.toNamed(RouteName.individualactivitystep2); } else { Get.back(); - utils.showToast(data.message); + utils.showToast(data.message); } } @@ -162,14 +162,11 @@ class _TellusaboutIndividualState extends State { Widget build(BuildContext context) { return WillPopScope( onWillPop: () async { - SystemNavigator.pop(); + SystemNavigator.pop(); // Navigator.pop(context); - return true; - }, - child: GestureDetector( onTap: () => FocusManager.instance.primaryFocus?.unfocus(), child: Scaffold( @@ -179,7 +176,8 @@ class _TellusaboutIndividualState extends State { Container( decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/png/Ellipse 1496.png"), + image: + AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), ), ListView(physics: const ScrollPhysics(), children: [ @@ -319,7 +317,8 @@ class _TellusaboutIndividualState extends State { inputFormatters: [ // LengthLimitingTextInputFormatter(20), RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow(RegExp('[a-zA-Z ]')) + FilteringTextInputFormatter.allow( + RegExp('[a-zA-Z ]')) ], ), sizedBoxHeight(10.h), @@ -346,7 +345,8 @@ class _TellusaboutIndividualState extends State { inputFormatters: [ // LengthLimitingTextInputFormatter(20), RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow(RegExp('[a-zA-Z ]')) + FilteringTextInputFormatter.allow( + RegExp('[a-zA-ZS0-9 ]')), ], ), sizedBoxHeight(10.h), @@ -416,7 +416,8 @@ class _TellusaboutIndividualState extends State { inputFormatters: [ // LengthLimitingTextInputFormatter(20), RemoveEmojiInputFormatter(), - FilteringTextInputFormatter.allow(RegExp('[a-zA-Z ]')) + FilteringTextInputFormatter.allow( + RegExp('[a-zA-Z ]')) ], ), sizedBoxHeight(20.h), @@ -435,7 +436,7 @@ class _TellusaboutIndividualState extends State { } // if (_selectedgendertype.isNotEmpty) { // Get.toNamed(RouteName.individualprofilestep1); - + // // Get.to(() => BusinessPage()); // } else { // // Handle case where no selection is made diff --git a/lib/onboarding/Signup/View/communitycommitment.dart b/lib/onboarding/Signup/View/communitycommitment.dart index 7c441c5..f159ae1 100644 --- a/lib/onboarding/Signup/View/communitycommitment.dart +++ b/lib/onboarding/Signup/View/communitycommitment.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -107,7 +107,8 @@ class _CommunitycommitmentState extends State { CustomButton2( text: 'Decline', onPressed: () { - Get.offAllNamed(RouteName.loginScreen); + alertdialogwidget(); + // Get.offAllNamed(RouteName.loginScreen); }) ], ), @@ -115,4 +116,130 @@ class _CommunitycommitmentState extends State { ], )); } + + alertdialogwidget() { + Get.dialog(Dialog( + // backgroundColor: Colors.transparent, + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.r), + color: const Color(0xFF222935)), + child: Padding( + padding: EdgeInsets.only( + right: 16.w, left: 16.w, top: 20.h, bottom: 40.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + text16w400_FCFCFC("Are you sure you don’t want to be \nNice?", + textAlign: TextAlign.center), + sizedBoxHeight(16.h), + Row( + children: [ + InkWell( + onTap: () { + Get.back(); + dialogwidget(); + + Future.delayed(Duration(seconds: 2), () { + Get.back(); + Get.toNamed(RouteName.signupendpage); + }); + }, + child: Container( + // width: 120.w, + height: 40.h, + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.centerLeft, + end: Alignment.centerRight, + colors: [ + Color.fromRGBO(255, 255, 255, 0.036), + Color.fromRGBO(255, 255, 255, 0.048), + ], + ), + border: Border.all( + color: Color(0xFF434A53), + width: 1.0, + ), + borderRadius: BorderRadius.circular(30.r)), + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 10.w), + child: + Center(child: text14400white("Yes, I am evil")), + ), + ), + ), + Spacer(), + GestureDetector( + onTap: () { + Get.toNamed(RouteName.signupendpage); + }, + child: Container( + // height: 40.h, + // width: 120.w, + decoration: BoxDecoration( + color: Color(0xFFD90B2E), + borderRadius: BorderRadius.circular(30.r), + ), + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 20.w), + child: Center( + child: text14w400_FCFCFC( + "No, I want \nto be Nice")), + ), + ), + ) + ], + ) + ], + ), + ), + ), + ], + ), + )); + } + + dialogwidget() { + Get.dialog(Dialog( + // backgroundColor: Colors.transparent, + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.r), + color: const Color(0xFF222935)), + child: Padding( + padding: EdgeInsets.only( + right: 80.w, left: 80.w, top: 20.h, bottom: 40.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/images/png/Group 1000004420.png", + height: 66.h, + width: 66.w, + ), + sizedBoxHeight(14.w), + SizedBox( + width: 182.w, + child: text16w400_FCFCFC( + "Nah, I know you’re nice person...", + textAlign: TextAlign.center), + ), + sizedBoxHeight(16.h), + ], + ), + ), + ), + ], + ), + )); + } } diff --git a/lib/onboarding/Signup/View/signupendpage.dart b/lib/onboarding/Signup/View/signupendpage.dart index 0fed976..7c23f13 100644 --- a/lib/onboarding/Signup/View/signupendpage.dart +++ b/lib/onboarding/Signup/View/signupendpage.dart @@ -27,54 +27,40 @@ class _SignupendPageState extends State { fit: BoxFit.fill)), ), Center( - child: Container( - width: 358.w, - height: 519.h, - decoration: ShapeDecoration( - gradient: LinearGradient( - begin: const Alignment(0.98, -0.21), - end: const Alignment(-0.98, 0.21), - colors: [ - Colors.white.withOpacity(0.05999999865889549), - Colors.white.withOpacity(0.07999999821186066) - ], - ), - shape: RoundedRectangleBorder( - side: const BorderSide(width: 0.80, color: Color(0xFF434A53)), - borderRadius: BorderRadius.circular(5), - ), - ), - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 30.h), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset('assets/images/png/regroupredtexticon.png'), - sizedBoxHeight(30.h), - text25700white('Welcome Edward '), - sizedBoxHeight(20.h), - // text16400white( - // '''Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.'''), - Text( - '''Congratulations, your account has been successfully created. Get ready to regroup with your community''', - textAlign: TextAlign.center, - style: TextStyle( - color: const Color(0xCCFCFCFC), - fontSize: 16.sp, - fontFamily: 'Helvetica', - fontWeight: FontWeight.w400, - ), + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 30.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset('assets/images/png/regroupredtexticon.png'), + sizedBoxHeight(30.h), + text25700white('Welcome Edward '), + sizedBoxHeight(20.h), + // text16400white( + // '''Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.'''), + SizedBox( + width: 246.w, + child: Text( + '''Your account is now active. Welcome to the ReGroup community''', + textAlign: TextAlign.center, + style: TextStyle( + color: const Color(0xCCFCFCFC), + fontSize: 16.sp, + fontFamily: 'Helvetica', + fontWeight: FontWeight.w400, ), - sizedBoxHeight(20.h), - CustomButton( - text: "Let's begin", - onPressed: () { - Get.toNamed(RouteName.mainscreen); - }) - ], + ), ), - )), + sizedBoxHeight(20.h), + CustomButton( + text: "Let's begin", + onPressed: () { + Get.toNamed(RouteName.mainscreen); + }) + ], + ), + ), ) ], )); diff --git a/lib/onboarding/Signup/View/signupscreen.dart b/lib/onboarding/Signup/View/signupscreen.dart index 65c24fa..b4e9c5f 100644 --- a/lib/onboarding/Signup/View/signupscreen.dart +++ b/lib/onboarding/Signup/View/signupscreen.dart @@ -7,7 +7,7 @@ import 'package:flutter_facebook_auth/flutter_facebook_auth.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; +import 'package:regroup/Global.dart'; import 'package:regroup/Login/ViewModel/LoginApi.dart'; import 'package:regroup/Utils/Common/AppleOAuthService.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; @@ -153,6 +153,7 @@ class _SignupScreenState extends State { if (data.status == ResponseStatus.SUCCESS) { Get.back(); print("Sign up done"); + globalAccountType = accountTypeValue.toString(); String selectedCategory = _selectedAccountType; @@ -165,6 +166,7 @@ class _SignupScreenState extends State { return utils.showToast(data.message); + } else { Get.back(); print("registration not done"); diff --git a/lib/onboarding/Signup/view_model/getUserprofile.dart b/lib/onboarding/Signup/view_model/getUserprofile.dart index effc8b2..e663759 100644 --- a/lib/onboarding/Signup/view_model/getUserprofile.dart +++ b/lib/onboarding/Signup/view_model/getUserprofile.dart @@ -41,6 +41,8 @@ class Getuserdetails { fullname = prefs.getString('fullname'); phonenumber = prefs.getString('phone'); globalAccountType = prefs.getString('accountTypefromLogin'); + globalAccountType = + getuserobj?.data?.userData?.principalTypeXid.toString(); } else if (responseData is String) { Map jsonMap; try { diff --git a/lib/onboarding/SplashScreen.dart b/lib/onboarding/SplashScreen.dart index 841450c..27aada9 100644 --- a/lib/onboarding/SplashScreen.dart +++ b/lib/onboarding/SplashScreen.dart @@ -10,8 +10,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/svg.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/base_manager.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; import 'package:regroup/Global.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart'; import 'package:regroup/Utils/Common/NoInternet.dart'; import 'package:regroup/Utils/dialogs.dart'; import 'package:regroup/onboarding/Signup/view_model/getUserprofile.dart'; diff --git a/lib/onboarding/forgotPass/View/ForgotOtp.dart b/lib/onboarding/forgotPass/View/ForgotOtp.dart index 918b4e3..6b3a7a2 100644 --- a/lib/onboarding/forgotPass/View/ForgotOtp.dart +++ b/lib/onboarding/forgotPass/View/ForgotOtp.dart @@ -2,12 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:glassmorphism/glassmorphism.dart'; import 'package:pin_code_fields/pin_code_fields.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart'; @@ -22,11 +20,11 @@ class ForgotOtp extends StatefulWidget { } class _ForgotOtpState extends State { -TextEditingController? pincode = TextEditingController(); + TextEditingController? pincode = TextEditingController(); final String emailAddress = Get.arguments; double? principleId; - + get utils => null; // principleId = prefs.getString('email').toString(); @@ -48,14 +46,14 @@ TextEditingController? pincode = TextEditingController(); Get.snackbar( "Success!", 'OTP verification successful!', - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.green, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); - Future.delayed(Duration(seconds: 1), () { + Future.delayed(const Duration(seconds: 1), () { Get.toNamed(RouteName.newpassword, arguments: emailAddress); }); // print('success'); @@ -65,10 +63,10 @@ TextEditingController? pincode = TextEditingController(); Get.snackbar( "Error!", data.data['message'], - duration: Duration(seconds: 2), + duration: const Duration(seconds: 2), colorText: Colors.white, backgroundColor: Colors.red, - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), snackStyle: SnackStyle.FLOATING, snackPosition: SnackPosition.BOTTOM, ); @@ -76,56 +74,23 @@ TextEditingController? pincode = TextEditingController(); } } - - @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color.fromARGB(255, 18, 32, 47), - appBar: CommonAppbar( + backgroundColor: const Color.fromARGB(255, 18, 32, 47), + appBar: const CommonAppbar( titleTxt: '', ), body: Stack( children: [ - // CommonBlurLeftSecond(), - Positioned(top: 150, right: -30, child: CommonBlurRightSecond()), - Positioned(top: 350, left: -30, child: CommonBlurLeftBlue()), - GlassmorphicContainer( - width: MediaQuery.of(context).size.width, - height: - // 500.h, - MediaQuery.of(context).size.height, - borderRadius: 2, - blur: 6, - alignment: Alignment.bottomLeft, - border: 2, - linearGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - Color(0XFF222935).withOpacity(0.60), - - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - ], - ), - borderGradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - // Color.fromARGB(255, 18, 32, 47).withOpacity(0.50), - Color(0XFF222935).withOpacity(0.60), - - Color(0XFF222935).withOpacity(0.60), - ], - ), - child: Padding( + Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/images/png/Ellipse 1496.png"), + fit: BoxFit.fill)), + ), + + Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -157,29 +122,27 @@ TextEditingController? pincode = TextEditingController(); obscureText: false, animationType: AnimationType.fade, pinTheme: PinTheme( - selectedFillColor: Color(0xFF434A53), - inactiveFillColor: Color(0xFF434A53), - inactiveColor: Color(0xFF434A53), - activeColor: Color(0xFF434A53), - selectedColor: Color(0xFF434A53), + selectedFillColor: const Color(0xFF434A53), + inactiveFillColor: const Color(0xFF434A53), + inactiveColor: const Color(0xFF434A53), + activeColor: const Color(0xFF434A53), + selectedColor: const Color(0xFF434A53), shape: PinCodeFieldShape.underline, borderRadius: BorderRadius.circular(5), fieldHeight: 70, fieldWidth: 70, activeFillColor: // Colors.white - Color(0xFF303030).withOpacity(0.4), + const Color(0xFF303030).withOpacity(0.4), // textStyle: TextStyle(color: Colors.white, fontSize: 20), // Change text color and font size ), - animationDuration: Duration(milliseconds: 300), + animationDuration: const Duration(milliseconds: 300), enableActiveFill: true, autovalidateMode: AutovalidateMode.onUserInteraction, controller: pincode, onCompleted: (v) { - print("Completed"); }, onChanged: (value) { - print(value); setState(() { // currentText = value; }); @@ -191,7 +154,6 @@ TextEditingController? pincode = TextEditingController(); fontFamily: 'Helvetica', ), beforeTextPaste: (text) { - print("Allowing to paste $text"); return true; }, appContext: context, @@ -220,9 +182,9 @@ TextEditingController? pincode = TextEditingController(); ), ], ), - )), - ], - ), - );; + )],), + + ); + } -} \ No newline at end of file +} diff --git a/lib/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart b/lib/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart index 6303873..8e3a8dc 100644 --- a/lib/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart +++ b/lib/onboarding/forgotPass/ViewModel/ForgotPassAPI.dart @@ -1,7 +1,6 @@ import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:shared_preferences/shared_preferences.dart'; class ForgotPassAPI { ForgotPassAPI(); diff --git a/lib/resources/routes/route_name.dart b/lib/resources/routes/route_name.dart index 49dfdfd..ebb1e53 100644 --- a/lib/resources/routes/route_name.dart +++ b/lib/resources/routes/route_name.dart @@ -14,6 +14,8 @@ class RouteName { static const String individualactivitystep2 = '/individualactivitystep2'; static const String individualgroupstep3 = '/individualgroupstep3'; static const String individualcommunitystep4 = '/individualcommunitystep4'; + static const String findcommunitypage = '/findcommunitypage'; + static const String communitycommitscreen = '/communitycommitscreen'; static const String signupendpage = '/signupendpage'; diff --git a/lib/resources/routes/routes.dart b/lib/resources/routes/routes.dart index 12a47a7..544bb49 100644 --- a/lib/resources/routes/routes.dart +++ b/lib/resources/routes/routes.dart @@ -1,100 +1,100 @@ import 'package:flutter/material.dart'; import 'package:get/get_navigation/src/routes/get_route.dart'; +import 'package:regroup/Main_Screens/CalenderTab/AddEvent/AddEvent.dart'; +import 'package:regroup/Main_Screens/CalenderTab/AddUsers/AddUsers.dart'; +import 'package:regroup/Main_Screens/CalenderTab/Availabillity.dart'; +import 'package:regroup/Main_Screens/CalenderTab/EventDetails.dart'; +import 'package:regroup/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart'; +import 'package:regroup/Main_Screens/CalenderTab/Resource%20Pool/ResourcePool.dart'; +import 'package:regroup/Main_Screens/CalenderTab/SetAvailabillity.dart'; +import 'package:regroup/Main_Screens/Chats/View/groupchat.dart'; +import 'package:regroup/Main_Screens/Chats/View/newchatpage.dart'; +import 'package:regroup/Main_Screens/Chats/View/newgroup.dart'; +import 'package:regroup/Main_Screens/Chats/View/userchat.dart'; +import 'package:regroup/Main_Screens/Community/Community.dart'; +import 'package:regroup/Main_Screens/Community/CycleScreen.dart'; +import 'package:regroup/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart'; +import 'package:regroup/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart'; +import 'package:regroup/Main_Screens/Community/PostScreen.dart'; +import 'package:regroup/Main_Screens/ExploreDesign/DetailExplore.dart'; +import 'package:regroup/Main_Screens/ExploreDesign/ExploreScreen.dart'; +import 'package:regroup/Main_Screens/ExploreDesign/SearchGroup.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/ConnectCommunity.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GoupSettings.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupDetail.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupEvent.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupInfo.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupManage.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/GroupTab.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/NewPost.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/RequestedGroups.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/Sessions.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart'; +import 'package:regroup/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Badges/Badges.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Certificate/AddCertificate.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Certificate/Certificate.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Clubs/Clubs.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart'; +import 'package:regroup/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Followers/Followers.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Following/Following.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/View/Business/ProfileTabBusGuest.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Guest%20User/View/Individual/ProfileTabIndGuest.dart'; +import 'package:regroup/Main_Screens/ProfileTab/My%20Network/MyNetwork.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/AccountSessions.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/AccountSetting.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ChangePassword.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ContactUs.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/DeleteAccount.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/FaqScreen.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/ReportABug.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/Settings.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/TermsCondition.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/VerifyCode.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Settings/View/Notification.dart'; +import 'package:regroup/Main_Screens/ProfileTab/Share%20profile/ShareProfile.dart'; +import 'package:regroup/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/Availabillity.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/EventDetails.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/Resource%20Pool/ResourcePool.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/CalenderTab/SetAvailabillity.dart'; +import 'package:regroup/Notifications/notification.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/groupchat.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/newchatpage.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/newgroup.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Chats/View/userchat.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ExploreDesign/DetailExplore.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ExploreDesign/ExploreScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ExploreDesign/SearchGroup.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/ConnectCommunity.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GoupSettings.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupDetail.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupEvent.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupInfo.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupManage.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/GroupTab.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/NewPost.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/RequestedGroups.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/Sessions.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Badges/Badges.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Certificate/Certificate.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Clubs/Clubs.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Followers/Followers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Following/Following.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/View/Business/ProfileTabBusGuest.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Guest%20User/View/Individual/ProfileTabIndGuest.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/My%20Network/MyNetwork.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/View/BlockedUsers.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ContactUs.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/View/Notification.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ReportABug.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Settings.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Share%20profile/ShareProfile.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart'; -import 'package:regroup/Feed%20Module/Notification/View/notification.dart'; - -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/CommunitySetting.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/EditCommunity/EditCommunity.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageGroup.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageTags.dart/ManageTags.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageTags.dart/NewTag/NewTag.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Announcements/AnnouncementRequest.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Announcements/ManageMembers.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/AddGroups.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/NewCommunity.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Watchlist.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/CommunitySetting.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/EditCommunity/EditCommunity.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageGroup.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageTags.dart/ManageTags.dart'; +import 'package:regroup/sidemenu/Community/Admin/PopupItem/Community%20settings/ManageTags.dart/NewTag/NewTag.dart'; +import 'package:regroup/sidemenu/Community/Announcements/AnnouncementRequest.dart'; +import 'package:regroup/sidemenu/Community/Announcements/ManageMembers.dart'; +import 'package:regroup/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/AddGroups.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/NewCommunity.dart'; +import 'package:regroup/sidemenu/Community/Watchlist.dart'; import 'package:regroup/Login/View/loginscreen.dart'; import 'package:regroup/Common/controller/MainScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/Community.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/CycleScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart'; -import 'package:regroup/Feed%20Module/Main_Screens/Community/PostScreen.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Announcements/View/Announcements.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/Group/view/Group.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart'; -import 'package:regroup/Feed%20Module/sidemenu/SavedPosts/SavedPosts.dart'; -import 'package:regroup/Feed%20Module/sidemenu/sidemenu.dart'; + +import 'package:regroup/sidemenu/Community/Announcements/View/Announcements.dart'; +import 'package:regroup/sidemenu/Community/Group/view/Group.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/View/CommunityDetails.dart'; +import 'package:regroup/sidemenu/Community/MyCommunity/View/MyCommunity.dart'; +import 'package:regroup/sidemenu/SavedPosts/SavedPosts.dart'; +import 'package:regroup/sidemenu/sidemenu.dart'; import 'package:regroup/Login/View/verifygoogleapple.dart'; import 'package:regroup/Utils/Common/NoInternet.dart'; import 'package:regroup/onboarding/NewPass/View/NewPass.dart'; import 'package:regroup/onboarding/Signup/View/Business/View/step1Letusunderstandbetter.dart'; -import 'package:regroup/onboarding/Signup/View/Business/View/step2Selectgroup.dart'; -import 'package:regroup/onboarding/Signup/View/Business/View/step3SelectCommunity.dart'; + import 'package:regroup/onboarding/Signup/View/Business/View/tellusbusiness.dart'; +import 'package:regroup/onboarding/Signup/View/Individual/FindCommunityPage.dart'; import 'package:regroup/onboarding/Signup/View/Individual/step1Selectprofile.dart'; import 'package:regroup/onboarding/Signup/View/Individual/step2Selectactivity.dart'; import 'package:regroup/onboarding/Signup/View/Individual/step3Selectyourgroup.dart'; @@ -192,10 +192,7 @@ class AppRoutes { name: RouteName.group, page: () => const Group(), ), - GetPage( - name: RouteName.individualprofilestep1, - page: () => const SelectIndividualProfile(), - ), + GetPage( name: RouteName.individualactivitystep2, page: () => const SelectIndividualActivity(), @@ -207,6 +204,10 @@ class AppRoutes { GetPage( name: RouteName.individualcommunitystep4, page: () => const SelectIndividualCommunity(), + ), + GetPage( + name: RouteName.findcommunitypage, + page: () => const FindCommunityPage(), ), GetPage( name: RouteName.communitycommitscreen, @@ -220,14 +221,8 @@ class AppRoutes { name: RouteName.businessletusunderstandstep1, page: () => const LetusUnderstand(), ), - GetPage( - name: RouteName.businessSelectgroupstep2, - page: () => const SelectgroupStep2(), - ), - GetPage( - name: RouteName.businessSelectcommunitystep3, - page: () => const SelectBusinessCommunity(), - ), + + GetPage( name: RouteName.communitysetting, page: () => const CommunitySetting(), @@ -456,79 +451,73 @@ class AppRoutes { name: RouteName.editsubgroupinfo, page: () => const EditSubgroupInfo(), ), - GetPage( + GetPage( name: RouteName.subgroupsetting, page: () => const SubGroupSetting(), ), - GetPage( + GetPage( name: RouteName.explorescreen, page: () => const ExploreScreen(), ), - GetPage( + GetPage( name: RouteName.searchgroup, page: () => const SearchGroup(), ), - GetPage( + GetPage( name: RouteName.detailexplore, page: () => const DetailExplore(), ), - - GetPage( + GetPage( name: RouteName.certificate, page: () => const Certificate(), ), - GetPage( + GetPage( name: RouteName.availability, page: () => const Availability(), ), - - GetPage( + GetPage( name: RouteName.sessions, page: () => const Sessions(), ), - - GetPage( + GetPage( name: RouteName.forgotpass, page: () => const ForgotPass(), ), - GetPage( + GetPage( name: RouteName.newpassword, page: () => const NewPassword(), ), - GetPage( + GetPage( name: RouteName.forgotOtp, page: () => const ForgotOtp(), - ), - GetPage( - name: RouteName.verifygoogleapplepage, - page: () => Verifygoogleandapple(), ), - GetPage( + GetPage( + name: RouteName.verifygoogleapplepage, + page: () => Verifygoogleandapple(), + ), + GetPage( name: RouteName.buseditprofile, - page: () => BusEditProfile(), + page: () => const BusEditProfile(), ), GetPage( name: RouteName.profiletab, - page: () => ProfileTab(), + page: () => const ProfileTab(), ), - - GetPage( + GetPage( name: RouteName.profiletabindguest, - page: () => ProfileTabIndGuest(), + page: () => const ProfileTabIndGuest(), ), - GetPage( + GetPage( name: RouteName.profiletabbusguest, - page: () => profiletabBusGest(), + page: () => const profiletabBusGest(), ), - GetPage( + GetPage( name: RouteName.mynetwork, - page: () => MyNetwork(), + page: () => const MyNetwork(), ), - GetPage( + GetPage( name: RouteName.addcertificate, - page: () => AddCertificate(), + page: () => const AddCertificate(), ), - - ]; } diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart similarity index 95% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart index 38784d9..37e4aa1 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -27,12 +27,13 @@ class _CommunitySettingState extends State { titleTxt: "Community settings", ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), Column(children: [ + ), + Column(children: [ sizedBoxHeight(30.h), GestureDetector( onTap: () { diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart similarity index 97% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart index 0a14f8b..8d4485a 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart @@ -9,7 +9,7 @@ import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/ImageUpload.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; @@ -150,11 +150,11 @@ class _EditCommunityState extends State { borderType: BorderType.RRect, radius: Radius.circular(14.r), color: Color(0xFF434A53), - child: commonGlassContainer( - border: 0, + child: commonGlassUI( + borderwidth: 0, width: double.infinity, height: 150.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: bannerPath.isNotEmpty && isbannerAdded ? Stack(children: [ Image.file( @@ -210,10 +210,10 @@ class _EditCommunityState extends State { ), ), sizedBoxHeight(16.w), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 60.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Center( child: Padding( padding: EdgeInsets.symmetric(horizontal: 12.w), @@ -247,7 +247,7 @@ class _EditCommunityState extends State { ]), ), ), - border: 1), + borderwidth: 1), sizedBoxHeight(25.h), text16w400_FCFCFC("Community name"), sizedBoxHeight(14.h), diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart similarity index 96% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart index 6dbf089..30c24e8 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart @@ -4,7 +4,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -80,7 +80,8 @@ class _ManageGroupsState extends State { image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( + ), + SingleChildScrollView( child: Column(children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), @@ -105,19 +106,19 @@ class _ManageGroupsState extends State { sizedBoxHeight(25.h), Row( children: [ - commonGlassContainer( + commonGlassUI( opacity1: 0.24, opacity2: 0.24, width: 50.w, height: 50.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/Black.png", height: 30.h, width: 30.w, )), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(8.w), text18w400_FCFCFC("Create group"), Spacer(), diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart similarity index 94% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart index 0bacc8b..2125226 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -30,13 +30,14 @@ class _ManageTagsState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Column(children: [ + ), + SingleChildScrollView( + child: Column(children: [ sizedBoxHeight(20.h), DefaultTabController( length: 2, @@ -167,22 +168,22 @@ Widget rowTagRequestTile({ }) { return Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 60.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Center( child: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Row(children: [ text16w700_FCFCFC(title), Spacer(), - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, opacity1: 0.24, opacity2: 0.24, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Icon( Icons.clear, @@ -190,7 +191,7 @@ Widget rowTagRequestTile({ color: Colors.white, weight: 1, )), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(16.w), Container( height: 35.h, @@ -209,7 +210,7 @@ Widget rowTagRequestTile({ ]), ), ), - border: 1), + borderwidth: 1), ); } diff --git a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart similarity index 92% rename from lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart rename to lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart index 2e0b01f..32a983b 100644 --- a/lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart +++ b/lib/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -26,13 +26,14 @@ class _NewTagState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( + ), + SingleChildScrollView( + child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart b/lib/sidemenu/Community/Announcements/AnnouncementRequest.dart similarity index 81% rename from lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart rename to lib/sidemenu/Community/Announcements/AnnouncementRequest.dart index 6299508..dbb5b1f 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart +++ b/lib/sidemenu/Community/Announcements/AnnouncementRequest.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -27,23 +27,24 @@ class _AnnouncementRequestState extends State { titleTxt: "Announcement requests", ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 16), - child: Column( - children: [ - sizedBoxHeight(25.h), - Announcementtile( - profileImg: "assets/images/png/Ellipse 43.png", - title: "title", - mainImg: "assets/images/png/Rectangle 22.png") - ], - ))) + ), + SingleChildScrollView( + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 16), + child: Column( + children: [ + sizedBoxHeight(25.h), + Announcementtile( + profileImg: "assets/images/png/Ellipse 43.png", + title: "title", + mainImg: "assets/images/png/Rectangle 22.png") + ], + ))) ])); } @@ -52,11 +53,11 @@ class _AnnouncementRequestState extends State { required String title, required String mainImg, }) { - return commonGlassContainer( + return commonGlassUI( width: double.infinity, height: 400.h, - borderradius: 10.r, - border: 1, + borderRadius: BorderRadius.circular( 10.r), + borderwidth: 1, customWidget: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column(children: [ @@ -103,14 +104,14 @@ class _AnnouncementRequestState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - commonGlassContainer( + commonGlassUI( width: 149.w, height: 30.h, opacity1: 0.05, opacity2: 0.07, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), customWidget: Center(child: text12w400_FCFCFC("Decline")), - border: 1), + borderwidth: 1), Container( height: 30.h, width: 150.h, diff --git a/lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart b/lib/sidemenu/Community/Announcements/ManageMembers.dart similarity index 88% rename from lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart rename to lib/sidemenu/Community/Announcements/ManageMembers.dart index 64c2bb4..b6efbf5 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart +++ b/lib/sidemenu/Community/Announcements/ManageMembers.dart @@ -7,7 +7,7 @@ import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -58,47 +58,46 @@ class _ManageMembersState extends State { ), ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), Column( - crossAxisAlignment: CrossAxisAlignment.start, + ), + Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + sizedBoxHeight(20.h), + DefaultTabController( + length: 4, + child: Column( children: [ - sizedBoxHeight(20.h), - DefaultTabController( - length: 4, - child: Column( - children: [ - CommonTabBar(tabs: const [ - Tab( - text: 'Members', - ), - Tab( - text: 'Admins', - ), - Tab( - text: 'Requests', - ), - Tab( - text: 'Invites', - ), - ]), - SizedBox( - height: 655.h, - child: TabBarView( - children: [ - membersTab(), - AdminsTab(), - RequestsTab(), - InvitesTab(), - ], - ), - ), - ], - )) - ]) + CommonTabBar(tabs: const [ + Tab( + text: 'Members', + ), + Tab( + text: 'Admins', + ), + Tab( + text: 'Requests', + ), + Tab( + text: 'Invites', + ), + ]), + SizedBox( + height: 655.h, + child: TabBarView( + children: [ + membersTab(), + AdminsTab(), + RequestsTab(), + InvitesTab(), + ], + ), + ), + ], + )) + ]) ])); } @@ -144,10 +143,10 @@ class _ManageMembersState extends State { hintText: "Start date - End date", )), Spacer(), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( @@ -157,7 +156,7 @@ class _ManageMembersState extends State { width: 23.w, ), ), - border: 0.5) + borderwidth: 0.5) ], ), ], @@ -237,32 +236,32 @@ class _ManageMembersState extends State { sizedBoxHeight(16.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("M")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Tu")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("W")), - border: 0.5), + borderwidth: 0.5), Spacer(), Row( children: [ @@ -282,32 +281,32 @@ class _ManageMembersState extends State { sizedBoxHeight(20.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Th")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("F")), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(15.w), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, customWidget: Center(child: text16w400_FCFCFC("Sa")), - border: 0.5), + borderwidth: 0.5), Spacer(), Row( children: [ @@ -416,10 +415,10 @@ class _ManageMembersState extends State { hintText: "Start date - End date", )), Spacer(), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( @@ -429,7 +428,7 @@ class _ManageMembersState extends State { width: 23.w, ), ), - border: 0.5) + borderwidth: 0.5) ], ), ], @@ -540,10 +539,10 @@ class _ManageMembersState extends State { hintText: "Start date - End date", )), Spacer(), - commonGlassContainer( + commonGlassUI( width: 40.w, height: 40.h, - borderradius: 100, + borderRadius: BorderRadius.circular(100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( @@ -553,7 +552,7 @@ class _ManageMembersState extends State { width: 23.w, ), ), - border: 0.5) + borderwidth: 0.5) ], ), ], diff --git a/lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart b/lib/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart similarity index 90% rename from lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart rename to lib/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart index a99b5bd..e4429e4 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart +++ b/lib/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomNextButton.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -28,30 +28,31 @@ class _NewAnnouncementState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( + ), + SingleChildScrollView( + child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ sizedBoxHeight(20.h), text16w400_FCFCFC("Description"), sizedBoxHeight(30.h), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 150.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 12.h), child: text14w400_FCFCFCblur( "Lorem Ipsum has been the industry's standard dummy text ever since the 1500s . . .Lorem Ipsum has been the industry's standard dummy text ever since the 1500s . . ."), ), - border: 1), + borderwidth: 1), sizedBoxHeight(80.h), CustomButton( text: "Post", diff --git a/lib/Feed Module/sidemenu/Community/Announcements/View/Announcements.dart b/lib/sidemenu/Community/Announcements/View/Announcements.dart similarity index 97% rename from lib/Feed Module/sidemenu/Community/Announcements/View/Announcements.dart rename to lib/sidemenu/Community/Announcements/View/Announcements.dart index 2b2493a..0973ce2 100644 --- a/lib/Feed Module/sidemenu/Community/Announcements/View/Announcements.dart +++ b/lib/sidemenu/Community/Announcements/View/Announcements.dart @@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -130,10 +130,10 @@ Widget announcementWidget({ required String date, required String subtitle, }) { - return commonGlassContainer( + return commonGlassUI( width: double.infinity, height: 120.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 12.h), child: Column( @@ -155,5 +155,5 @@ Widget announcementWidget({ ], ), ), - border: 1); + borderwidth: 1); } diff --git a/lib/Feed Module/sidemenu/Community/Group/view/Group.dart b/lib/sidemenu/Community/Group/view/Group.dart similarity index 94% rename from lib/Feed Module/sidemenu/Community/Group/view/Group.dart rename to lib/sidemenu/Community/Group/view/Group.dart index 11ba615..d2e5ff0 100644 --- a/lib/Feed Module/sidemenu/Community/Group/view/Group.dart +++ b/lib/sidemenu/Community/Group/view/Group.dart @@ -4,9 +4,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; -import 'package:regroup/Feed%20Module/sidemenu/view_model/getmethod.dart'; +import 'package:regroup/sidemenu/view_model/getmethod.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; @@ -39,7 +39,7 @@ class _GroupState extends State { }, ]; - late Future myfuture; + late Future myfuture; int id = Get.arguments["id"]; @override @@ -134,11 +134,11 @@ class _GroupState extends State { padding: EdgeInsets.only(bottom: 25.h), child: GestureDetector( onTap: () {}, - child: commonGlassContainer( - border: 0.9, + child: commonGlassUI( + borderwidth: 0.9, width: double.infinity, height: 162.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular(10.r), customWidget: Padding( padding: EdgeInsets.symmetric( horizontal: 16.w, vertical: 16.h), @@ -236,11 +236,12 @@ class _GroupState extends State { ), Spacer(), PopupMenuButton( - surfaceTintColor: Color(0xFF222935), + surfaceTintColor: + const Color(0xFF222935), constraints: BoxConstraints.tightFor( width: 200.w), - offset: Offset(0, 30), - color: Color(0xFF222935), + offset: const Offset(0, 30), + color: const Color(0xFF222935), tooltip: "", itemBuilder: (BuildContext context) => [ @@ -252,8 +253,8 @@ class _GroupState extends State { child: Row( children: [ text14w400_FCFCFC( - "Mute community"), - Spacer(), + "Mute group"), + const Spacer(), Image.asset( "assets/images/png/Black (1).png", height: 18.h, @@ -263,7 +264,7 @@ class _GroupState extends State { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -272,10 +273,30 @@ class _GroupState extends State { child: Row( children: [ text14w400_FCFCFC( - "Hide post"), - Spacer(), + "Pin group"), + const Spacer(), Image.asset( - "assets/images/png/mingcute_eye-close-line.png", + "assets/images/png/f7_pin-fill (2).png", + height: 27.h, + width: 27.w, + ) + ], + ), + ), + ), + const PopupMenuDivider(), + PopupMenuItem( + onTap: () {}, + child: Padding( + padding: EdgeInsets.symmetric( + horizontal: 8.w), + child: Row( + children: [ + text14w400_FCFCFC( + "Make primary"), + const Spacer(), + Image.asset( + "assets/images/png/leave group.png", height: 20.h, width: 20.w, ) @@ -283,7 +304,7 @@ class _GroupState extends State { ), ), ), - PopupMenuDivider(), + const PopupMenuDivider(), PopupMenuItem( onTap: () {}, child: Padding( @@ -291,30 +312,12 @@ class _GroupState extends State { horizontal: 8.w), child: Row( children: [ - text14w400_FCFCFC("Pin"), - Spacer(), + // text14w400_FCFCFC("Leave group"), + text14w400_D90B2E( + "Leave group"), + const Spacer(), Image.asset( - "assets/images/png/f7_pin-fill (2).png", - height: 25.h, - width: 25.w, - ) - ], - ), - ), - ), - PopupMenuDivider(), - PopupMenuItem( - onTap: () {}, - child: Padding( - padding: EdgeInsets.symmetric( - horizontal: 8.w), - child: Row( - children: [ - text14w400_FCFCFC( - "Leave community"), - Spacer(), - Image.asset( - "assets/images/png/logout 1 (traced).png", + "assets/images/png/LightGray22.png", height: 18.h, width: 18.w, ) @@ -325,8 +328,8 @@ class _GroupState extends State { ], child: Image.asset( "assets/images/png/Group 1000004071.png", - height: 13.h, - width: 3.w, + height: 18.h, + width: 20.w, )), ], ), @@ -335,7 +338,6 @@ class _GroupState extends State { sizedBoxHeight(10.h), Row( children: [ - stackContainersGroups( number: joinedgroupsobj! .data![index].membersCount diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart b/lib/sidemenu/Community/MyCommunity/AddGroups.dart similarity index 94% rename from lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart rename to lib/sidemenu/Community/MyCommunity/AddGroups.dart index e02620a..ff8d140 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart +++ b/lib/sidemenu/Community/MyCommunity/AddGroups.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -54,12 +54,13 @@ class _AddGroupState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( + ), + SingleChildScrollView( child: Column(children: [ Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), @@ -84,19 +85,19 @@ class _AddGroupState extends State { sizedBoxHeight(25.h), Row( children: [ - commonGlassContainer( + commonGlassUI( opacity1: 0.24, opacity2: 0.24, width: 50.w, height: 50.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( "assets/images/png/Black.png", height: 30.h, width: 30.w, )), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(8.w), text18w400_FCFCFC("Create group"), Spacer(), @@ -175,9 +176,9 @@ class _AddGroupState extends State { ), Spacer(), Obx(() { - return commonGlassContainer( - border: isCheckedList[index] ? 1.2 : 0.9, - borderradius: 2, + return commonGlassUI( + borderwidth: isCheckedList[index] ? 1.2 : 0.9, + borderRadius: BorderRadius.circular( 2), height: 23.h, width: 23.w, opacity1: 0.24, diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart b/lib/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart similarity index 91% rename from lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart rename to lib/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart index 8be3ddf..b00f1d2 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart +++ b/lib/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -28,13 +28,14 @@ class _CommunityInfoState extends State { ), resizeToAvoidBottomInset: false, body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Column(children: [ + ), + SingleChildScrollView( + child: Column(children: [ Stack(clipBehavior: Clip.none, children: [ GestureDetector( onTap: () { @@ -92,10 +93,10 @@ class _CommunityInfoState extends State { sizedBoxHeight(30.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, - borderradius: 100.r, + borderRadius: BorderRadius.circular( 100.r), customWidget: Center( child: Image.asset( "assets/images/png/Group 58645.png", @@ -103,7 +104,7 @@ class _CommunityInfoState extends State { width: 13.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(8.w), text16w400_white("Elm street london, United Kingdom") ], @@ -111,10 +112,10 @@ class _CommunityInfoState extends State { sizedBoxHeight(15.h), Row( children: [ - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, - borderradius: 100.r, + borderRadius: BorderRadius.circular( 100.r), customWidget: Center( child: Image.asset( "assets/images/png/puzzle-pieces 1 (traced).png", @@ -122,7 +123,7 @@ class _CommunityInfoState extends State { width: 20.w, ), ), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(8.w), text16w400_white("Sports") ], diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart b/lib/sidemenu/Community/MyCommunity/NewCommunity.dart similarity index 95% rename from lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart rename to lib/sidemenu/Community/MyCommunity/NewCommunity.dart index c3b1e58..f5f331f 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart +++ b/lib/sidemenu/Community/MyCommunity/NewCommunity.dart @@ -10,7 +10,7 @@ import 'package:regroup/Utils/Common/CommonAppbar.dart'; import 'package:regroup/Utils/Common/CommonDropdown.dart'; import 'package:regroup/Utils/Common/CustomTextformfield.dart'; import 'package:regroup/Utils/Common/ImageUpload.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -39,13 +39,14 @@ class _NewCommunityState extends State { titleTxt: "New community", ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), SingleChildScrollView( - child: Padding( + ), + SingleChildScrollView( + child: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -65,10 +66,10 @@ class _NewCommunityState extends State { }, ); }, - child: commonGlassContainer( + child: commonGlassUI( width: 95.w, height: 95.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: filePath.isNotEmpty && isImageAdded @@ -89,7 +90,7 @@ class _NewCommunityState extends State { width: 30.w, ), ), - border: 0.5), + borderwidth: 0.5), ), ), sizedBoxHeight(20.h), @@ -117,11 +118,11 @@ class _NewCommunityState extends State { borderType: BorderType.RRect, radius: Radius.circular(14.r), color: Color(0xFF434A53), - child: commonGlassContainer( - border: 0, + child: commonGlassUI( + borderwidth: 0, width: double.infinity, height: 130.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular(10.r), customWidget: bannerPath.isNotEmpty && isbannerAdded ? Stack(children: [ Image.file( diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart b/lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart similarity index 96% rename from lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart rename to lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart index ceadd24..ca481be 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart +++ b/lib/sidemenu/Community/MyCommunity/View/CommunityDetails.dart @@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonTabBar.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -152,12 +152,12 @@ class _CommunityDetailsState extends State { )), ), body: Stack(children: [ - Container( + Container( decoration: const BoxDecoration( image: DecorationImage( image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)), - ), + ), Positioned.fill( child: SingleChildScrollView( child: Column(children: [ @@ -210,10 +210,10 @@ class _CommunityDetailsState extends State { children: [ text20w700_FCFCFC("Active alliance network"), Spacer(), - commonGlassContainer( + commonGlassUI( width: 35.w, height: 35.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.24, opacity2: 0.24, customWidget: Center( @@ -222,16 +222,16 @@ class _CommunityDetailsState extends State { height: 18.w, width: 18.w, )), - border: 0.5), + borderwidth: 0.5), sizedBoxWidth(8.w), text16w400_FCFCFCblur("Public"), ], ), sizedBoxHeight(20.h), - commonGlassContainer( + commonGlassUI( width: double.infinity, height: 51.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ @@ -260,16 +260,16 @@ class _CommunityDetailsState extends State { ), ], ), - border: 1.w), + borderwidth: 1.w), sizedBoxHeight(20.h), GestureDetector( onTap: () { Get.toNamed(RouteName.addgroup); }, - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 51.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column( @@ -293,17 +293,17 @@ class _CommunityDetailsState extends State { ], ), ), - border: 1), + borderwidth: 1), ), sizedBoxHeight(20.h), GestureDetector( onTap: () { Get.toNamed(RouteName.announcement); }, - child: commonGlassContainer( + child: commonGlassUI( width: double.infinity, height: 51.h, - borderradius: 10.r, + borderRadius: BorderRadius.circular( 10.r), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: Column( @@ -331,7 +331,7 @@ class _CommunityDetailsState extends State { ], ), ), - border: 1), + borderwidth: 1), ), sizedBoxHeight(35.h), Container( @@ -598,13 +598,13 @@ class _CommunityDetailsState extends State { 'assets/images/png/party-popper 2.png' ]), Spacer(), - commonGlassContainer( - border: 0.43, + commonGlassUI( + borderwidth: 0.43, width: 30.w, height: 30.h, opacity1: 0.05, opacity2: 0.06, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), customWidget: Center( child: Image.asset( 'assets/images/png/Frame 1000004088.png', @@ -616,11 +616,11 @@ class _CommunityDetailsState extends State { sizedBoxWidth(12.w), text14w400_FCFCFC('20'), sizedBoxWidth(20.w), - commonGlassContainer( - border: 0.43, + commonGlassUI( + borderwidth: 0.43, width: 30.w, height: 30.h, - borderradius: 100, + borderRadius: BorderRadius.circular( 100), opacity1: 0.05, opacity2: 0.06, customWidget: Center( @@ -753,11 +753,11 @@ class _CommunityDetailsState extends State { } Widget containertile({required String text}) { - return commonGlassContainer( - border: 1, + return commonGlassUI( + borderwidth: 1, width: 100.w, height: 30.h, - borderradius: 30.r, + borderRadius: BorderRadius.circular( 30.r), borderColor: Color(0xFFD90B2E), customWidget: Padding( padding: EdgeInsets.symmetric(horizontal: 10.w), diff --git a/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart b/lib/sidemenu/Community/MyCommunity/View/MyCommunity.dart similarity index 98% rename from lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart rename to lib/sidemenu/Community/MyCommunity/View/MyCommunity.dart index 41c9543..c51834e 100644 --- a/lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart +++ b/lib/sidemenu/Community/MyCommunity/View/MyCommunity.dart @@ -4,7 +4,7 @@ import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -198,11 +198,11 @@ class _MyCommunityState extends State { Row( children: [ Stack(clipBehavior: Clip.none, children: [ - commonGlassContainer( - border: 0.9, + commonGlassUI( + borderwidth: 0.9, width: 30.w, height: 30.h, - borderradius: 100.r, + borderRadius: BorderRadius.circular(100.r), opacity1: 0.24, opacity2: 0.24, customWidget: Center( diff --git a/lib/Feed Module/sidemenu/Community/Watchlist.dart b/lib/sidemenu/Community/Watchlist.dart similarity index 99% rename from lib/Feed Module/sidemenu/Community/Watchlist.dart rename to lib/sidemenu/Community/Watchlist.dart index 5063a82..348f972 100644 --- a/lib/Feed Module/sidemenu/Community/Watchlist.dart +++ b/lib/sidemenu/Community/Watchlist.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; diff --git a/lib/sidemenu/Model/TagCommunityUserModel.dart b/lib/sidemenu/Model/TagCommunityUserModel.dart new file mode 100644 index 0000000..84cb06f --- /dev/null +++ b/lib/sidemenu/Model/TagCommunityUserModel.dart @@ -0,0 +1,98 @@ +class TagCommunityUserModel { + String? status; + int? statusCode; + String? message; + Data? data; + + TagCommunityUserModel( + {this.status, this.statusCode, this.message, this.data}); + + TagCommunityUserModel.fromJson(Map json) { + status = json['status']; + statusCode = json['status_code']; + message = json['message']; + data = json['data'] != null ? Data.fromJson(json['data']) : null; + } + + Map toJson() { + final Map data = {}; + data['status'] = status; + data['status_code'] = statusCode; + data['message'] = message; + if (this.data != null) { + data['data'] = this.data!.toJson(); + } + return data; + } +} + +class Data { + List? community; + List? tags; + + Data({this.community, this.tags}); + + Data.fromJson(Map json) { + if (json['community'] != null) { + community = []; + json['community'].forEach((v) { + community!.add(Community.fromJson(v)); + }); + } + if (json['tags'] != null) { + tags = []; + json['tags'].forEach((v) { + tags!.add(Tags.fromJson(v)); + }); + } + } + + Map toJson() { + final Map data = {}; + if (community != null) { + data['community'] = community!.map((v) => v.toJson()).toList(); + } + if (tags != null) { + data['tags'] = tags!.map((v) => v.toJson()).toList(); + } + return data; + } +} + +class Community { + int? id; + String? communityName; + + Community({this.id, this.communityName}); + + Community.fromJson(Map json) { + id = json['id']; + communityName = json['community_name']; + } + + Map toJson() { + final Map data = {}; + data['id'] = id; + data['community_name'] = communityName; + return data; + } +} + +class Tags { + int? id; + String? name; + + Tags({this.id, this.name}); + + Tags.fromJson(Map json) { + id = json['id']; + name = json['name']; + } + + Map toJson() { + final Map data = {}; + data['id'] = id; + data['name'] = name; + return data; + } +} diff --git a/lib/Feed Module/sidemenu/Model/joineGroupsModel.dart b/lib/sidemenu/Model/joineGroupsModel.dart similarity index 100% rename from lib/Feed Module/sidemenu/Model/joineGroupsModel.dart rename to lib/sidemenu/Model/joineGroupsModel.dart diff --git a/lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart b/lib/sidemenu/SavedPosts/SavedPosts.dart similarity index 97% rename from lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart rename to lib/sidemenu/SavedPosts/SavedPosts.dart index 8a31586..ef27041 100644 --- a/lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart +++ b/lib/sidemenu/SavedPosts/SavedPosts.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:regroup/Utils/Common/CommonAppbar.dart'; -import 'package:regroup/Utils/Common/blureffect.dart'; + import 'package:regroup/Utils/Common/sized_box.dart'; class SavedPosts extends StatefulWidget { diff --git a/lib/Feed Module/sidemenu/sidemenu.dart b/lib/sidemenu/sidemenu.dart similarity index 67% rename from lib/Feed Module/sidemenu/sidemenu.dart rename to lib/sidemenu/sidemenu.dart index 46b1503..25bb7aa 100644 --- a/lib/Feed Module/sidemenu/sidemenu.dart +++ b/lib/sidemenu/sidemenu.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; - import 'package:get/get.dart'; import 'package:regroup/Common/CommonGlassmorphism.dart'; -import 'package:regroup/Common/CommonWidget.dart'; import 'package:regroup/Utils/Common/sized_box.dart'; import 'package:regroup/Utils/texts.dart'; import 'package:regroup/resources/routes/route_name.dart'; @@ -69,84 +67,17 @@ class _SideMenuState extends State { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color(0xFF222935), + backgroundColor: const Color(0xFF222935), body: Column( children: [ sizedBoxHeight(50.h), Expanded( child: ListView(children: [ Padding( - padding: EdgeInsets.symmetric(horizontal: 10.w), - child: commonGlassUI( - width: double.infinity, - height: 330.h, - borderRadius: BorderRadius.circular(10.r), - customWidget: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.symmetric( - horizontal: 16.w, vertical: 12.h), - child: Row( - children: [ - text16w400_FCFCFC("Pinned"), - Spacer(), - Icon( - Icons.arrow_drop_up, - color: Colors.white, - size: 25, - ) - ], - ), - ), - commonDivider(), - sizedBoxHeight(10.h), - firstRowTile( - text: "Row bridge", - leadingimage: - "assets/images/png/sidemenu/rowing 1 (traced).png", - index: 1), - firstRowTile( - text: "Advice", - leadingimage: - "assets/images/png/sidemenu/solar_cloud-outline.png", - index: 2), - firstRowTile( - text: "Crush", - leadingimage: - "assets/images/png/sidemenu/Vector (4).png", - index: 3), - ListTile( - leading: CircleAvatar( - radius: 15.r, - foregroundImage: AssetImage( - "assets/images/png/sidemenu/Ellipse 52.png"), - ), - title: text14w400_FCFCFC("Ryan Dorwart"), - trailing: Image.asset( - "assets/images/png/sidemenu/f7_pin-fill (1).png", - width: 19.w, - height: 19.h, - ), - onTap: () {}, - ), - ListTile( - leading: CircleAvatar( - radius: 15.r, - foregroundImage: AssetImage( - "assets/images/png/sidemenu/Ellipse 53.png"), - ), - title: text14w400_FCFCFC("Ahmad Rhiel Madsen"), - trailing: Image.asset( - "assets/images/png/sidemenu/f7_pin-fill (1).png", - width: 19.w, - height: 19.h, - ), - onTap: () {}, - ), - ]), - ), + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: text16w400_FCFCFC("My pinned content"), ), + const Spacer(), sizedBoxHeight(18.h), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), @@ -156,7 +87,7 @@ class _SideMenuState extends State { decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Color.fromRGBO(255, 255, 255, 0.3), + color: const Color.fromRGBO(255, 255, 255, 0.3), width: 1.w, ), ), @@ -168,8 +99,8 @@ class _SideMenuState extends State { padding: EdgeInsets.symmetric(horizontal: 16.w), child: Row( children: [ - text16w400_FCFCFC("Communities"), - Spacer(), + text16w400_FCFCFC("Tags"), + const Spacer(), GestureDetector( onTap: () { Get.toNamed(RouteName.mycommunity); @@ -207,7 +138,7 @@ class _SideMenuState extends State { decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Color.fromRGBO(255, 255, 255, 0.3), + color: const Color.fromRGBO(255, 255, 255, 0.3), width: 1.w, ), ), @@ -219,59 +150,8 @@ class _SideMenuState extends State { padding: EdgeInsets.symmetric(horizontal: 16.w), child: Row( children: [ - text16w400_FCFCFC("Watchlist"), - Spacer(), - GestureDetector( - onTap: () { - Get.toNamed(RouteName.watchlist); - }, - child: text14w400_FCFCFC("View all")), - ], - ), - ), - sizedBoxHeight(20.h), - firstRowTile( - text: "Row bridge", - leadingimage: - "assets/images/png/sidemenu/rowing 1 (traced).png", - index: 8), - firstRowTile( - text: "Advice", - leadingimage: - "assets/images/png/sidemenu/solar_cloud-outline.png", - index: 9), - firstRowTile( - text: "Crush", - leadingimage: "assets/images/png/sidemenu/Vector (4).png", - index: 10), - firstRowTile( - text: "Row bridge", - leadingimage: - "assets/images/png/sidemenu/rowing 1 (traced).png", - index: 11), - sizedBoxHeight(18.h), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Container( - height: 1, - margin: EdgeInsets.symmetric(vertical: 10.h), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: Color.fromRGBO(255, 255, 255, 0.3), - width: 1.w, - ), - ), - ), - ), - ), - sizedBoxHeight(18.h), - Padding( - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Row( - children: [ - text16w400_FCFCFC("Recent"), - Spacer(), + text16w400_FCFCFC("Communities"), + const Spacer(), GestureDetector( onTap: () { Get.toNamed(RouteName.mycommunity); @@ -285,21 +165,21 @@ class _SideMenuState extends State { text: "Row bridge", leadingimage: "assets/images/png/sidemenu/rowing 1 (traced).png", - index: 8), + index: 4), firstRowTile( text: "Advice", leadingimage: "assets/images/png/sidemenu/solar_cloud-outline.png", - index: 9), + index: 5), firstRowTile( text: "Crush", leadingimage: "assets/images/png/sidemenu/Vector (4).png", - index: 10), + index: 6), firstRowTile( text: "Row bridge", leadingimage: "assets/images/png/sidemenu/rowing 1 (traced).png", - index: 11), + index: 7), sizedBoxHeight(18.h), Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), @@ -309,7 +189,7 @@ class _SideMenuState extends State { decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Color.fromRGBO(255, 255, 255, 0.3), + color: const Color.fromRGBO(255, 255, 255, 0.3), width: 1.w, ), ), @@ -322,7 +202,7 @@ class _SideMenuState extends State { child: Row( children: [ text16w400_FCFCFC("Users"), - Spacer(), + const Spacer(), GestureDetector( onTap: () { Get.toNamed(RouteName.mycommunity); diff --git a/lib/Feed Module/sidemenu/view_model/getmethod.dart b/lib/sidemenu/view_model/getmethod.dart similarity index 89% rename from lib/Feed Module/sidemenu/view_model/getmethod.dart rename to lib/sidemenu/view_model/getmethod.dart index 9b839b8..dc0f42b 100644 --- a/lib/Feed Module/sidemenu/view_model/getmethod.dart +++ b/lib/sidemenu/view_model/getmethod.dart @@ -3,7 +3,7 @@ import 'dart:developer'; import 'package:regroup/Common/api_urls.dart'; import 'package:regroup/Common/base_manager.dart'; import 'package:regroup/Common/controller/data/network/network_api.dart'; -import 'package:regroup/Feed%20Module/sidemenu/Model/joineGroupsModel.dart'; +import 'package:regroup/sidemenu/Model/joineGroupsModel.dart'; GetmyJoinedGroupsModel? joinedgroupsobj; diff --git a/lib/Feed Module/sidemenu/view_model/postmethod.dart b/lib/sidemenu/view_model/postmethod.dart similarity index 100% rename from lib/Feed Module/sidemenu/view_model/postmethod.dart rename to lib/sidemenu/view_model/postmethod.dart diff --git a/lib/sidemenu/view_model/tagcommunityuser.dart b/lib/sidemenu/view_model/tagcommunityuser.dart new file mode 100644 index 0000000..09ba926 --- /dev/null +++ b/lib/sidemenu/view_model/tagcommunityuser.dart @@ -0,0 +1,23 @@ +import 'dart:developer'; + +import 'package:regroup/Common/api_urls.dart'; +import 'package:regroup/Common/base_manager.dart'; +import 'package:regroup/Common/controller/data/network/network_api.dart'; +import 'package:regroup/sidemenu/Model/TagCommunityUserModel.dart'; +// import 'package:regroup/Feed%20Module/sidemenu/Model/TagCommunityUserModel.dart'; + +TagCommunityUserModel? tagcommunityuserobj; + +class Sidegetmethod { + Future> getJoinedusergroups(updata) async { + final response = await NetworkApiServices().getApi( + "${ApiUrls.tagcommunityuser}?=$updata", + // optionalpar: false + ); + if (response.status == ResponseStatus.SUCCESS) { + tagcommunityuserobj = TagCommunityUserModel.fromJson(response.data); + log(tagcommunityuserobj!.data.toString()); + } + return response; + } +}