kishan.bhuta/Regroup
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/WDI-Ideas/Regroup_flutter into Communitypost

Browse Source
This commit is contained in:
Shubhamshirva
2024-08-01 17:53:30 +05:30
parent 01cb284b43 dad5d8d9cf
commit a5e52eae4f
155 changed files with 4102 additions and 2542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/png/Connected world-amico 1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 KiB

BIN
assets/images/png/Group 1000004385.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

BIN
assets/images/png/Group 1000004420.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
assets/images/png/Organizing projects-pana 1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 118 KiB

BIN
assets/images/png/correct 1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
assets/images/png/x-circle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

26
ios/Podfile.lock
View File

@@ -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

84
ios/Runner.xcodeproj/project.pbxproj
View File

@@ -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 = "<group>"; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
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 = "<group>"; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
5210D9302C4006FC0040021E /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
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 = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
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 = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
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 = "<group>"; };
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D4274500C33C54346ECA2D49 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
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 = "<group>";
@@ -92,8 +92,8 @@
97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */,
01448FBCAC46C16EC8BC1181 /* Pods */,
DE8E73CF7AB07643531FB23E /* Frameworks */,
D4274500C33C54346ECA2D49 /* GoogleService-Info.plist */,
F4C62E65C792A2B03ABD303E /* Frameworks */,
);
sourceTree = "<group>";
};
@@ -121,10 +121,10 @@
path = Runner;
sourceTree = "<group>";
};
DE8E73CF7AB07643531FB23E /* Frameworks */ = {
F4C62E65C792A2B03ABD303E /* Frameworks */ = {
isa = PBXGroup;
children = (
DC7FC30109CCD5376F6BFA0F /* Pods_Runner.framework */,
2E6D63EEFD9353D7ADC2CB4D /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -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 */

4
lib/Common/api_urls.dart
View File

@@ -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";

12
lib/Common/controller/MainController.dart
View File

@@ -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;

2
lib/Common/controller/MainScreen.dart
View File

@@ -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());

6
lib/Common/controller/data/network/network_api.dart
View File

@@ -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<ResponseData> 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 {

29
lib/Feed Module/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart
View File

@@ -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<AddTimeline> {
],
),
sizedBoxHeight(25.h),
text16400white("Role in the club"),
text16400white("Role in "),
sizedBoxHeight(15.h),
CustomTextFormField(
textEditingController:
@@ -404,9 +403,9 @@ class _AddTimelineState extends State<AddTimeline> {
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<AddTimeline> {
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<AddTimeline> {
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,

22
lib/Feed Module/sidemenu/view_model/tagcommunityuser.dart Normal file
View File

@@ -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<ResponseData<dynamic>> 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;
}
}

8
lib/Login/View/loginscreen.dart
View File

@@ -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<LoginScreen> {
AccessToken? _accessToken;
final TextEditingController _emailController = TextEditingController();
RxBool isObscured = true.obs;
final TextEditingController _passwordController = TextEditingController();
@@ -124,7 +120,6 @@ class _LoginScreenState extends State<LoginScreen> {
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<LoginScreen> {
_logout() async {
await FacebookAuth.instance.logOut();
_accessToken = null;
setState(() {});
}

104
lib/Login/View/verifygoogleapple.dart
View File

@@ -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<Verifygoogleandapple> {
}
}
final Map<String, int> _accountTypeMap = {
final Map<String, int> _accountTypeMap = {
'Individual': 1,
'Business': 2,
};
@@ -68,12 +68,11 @@ class _VerifygoogleandappleState extends State<Verifygoogleandapple> {
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<Verifygoogleandapple> {
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<Verifygoogleandapple> {
],
),
),
)
],
),
),
);
] )
));
}
}

48
lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart → lib/Main_Screens/CalenderTab/AddEvent/AddEvent.dart
View File

@@ -103,11 +103,11 @@ class _AddEventState extends State<AddEvent> {
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<AddEvent> {
),
),
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<AddEvent> {
]),
),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(20.h),
text16400white("Type of event"),
sizedBoxHeight(14.h),
@@ -313,10 +313,10 @@ class _AddEventState extends State<AddEvent> {
});
}
},
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<AddEvent> {
formatTimeOfDay(starttime!)),
]),
),
border: 1),
borderwidth: 1),
)
],
),
@@ -351,10 +351,10 @@ class _AddEventState extends State<AddEvent> {
});
}
},
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<AddEvent> {
formatTimeOfDay(endtime!)),
]),
),
border: 1),
borderwidth: 1),
)
],
),
@@ -378,9 +378,9 @@ class _AddEventState extends State<AddEvent> {
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<AddEvent> {
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<AddEvent> {
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<AddEvent> {
),
),
),
border: 1);
borderwidth: 1);
}
}

54
lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart → lib/Main_Screens/CalenderTab/AddUsers/AddUsers.dart
View File

@@ -138,10 +138,10 @@ class _AddUsersState extends State<AddUsers> {
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<AddUsers> {
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<AddUsers> {
width: 18.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
),
@@ -237,9 +237,9 @@ class _AddUsersState extends State<AddUsers> {
],
),
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<AddUsers> {
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<AddUsers> {
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: [

9
lib/Feed Module/Main_Screens/CalenderTab/Availabillity.dart → lib/Main_Screens/CalenderTab/Availabillity.dart
View File

@@ -121,14 +121,15 @@ class _AvailabilityState extends State<Availability> {
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,

43
lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart → lib/Main_Screens/CalenderTab/CalenderTab.dart
View File

@@ -177,10 +177,7 @@ class _CalenderTabState extends State<CalenderTab> {
// initialIndex: selectedIndex.value,
child: Column(
children: [
const CommonTabBar(
tabs: [
const CommonTabBar(tabs: [
Tab(
text: 'My sessions',
),
@@ -190,7 +187,6 @@ class _CalenderTabState extends State<CalenderTab> {
]),
Expanded(
child: TabBarView(
children: [
mySessionsTab(),
comSessionTab(),
@@ -215,10 +211,11 @@ class _CalenderTabState extends State<CalenderTab> {
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<CalenderTab> {
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<CalenderTab> {
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<CalenderTab> {
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<CalenderTab> {
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<CalenderTab> {
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<CalenderTab> {
),
],
),
border: 1)
)
],
),
);

130
lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart → lib/Main_Screens/CalenderTab/EventDetails.dart
View File

@@ -36,41 +36,44 @@ class _EventDetailsState extends State<EventDetails> {
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<EventDetails> {
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<EventDetails> {
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<EventDetails> {
width: 17.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(10.w),
text16400white("3 hours"),
],
@@ -139,10 +143,10 @@ class _EventDetailsState extends State<EventDetails> {
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<EventDetails> {
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<EventDetails> {
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<EventDetails> {
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<EventDetails> {
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<EventDetails> {
],
),
),
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<EventDetails> {
text18w400white("90 Attending")
],
),
border: 1)),
borderwidth: 1)),
text18w700white("Messages"),
sizedBoxHeight(20.h),
Row(
@@ -306,20 +310,20 @@ class _EventDetailsState extends State<EventDetails> {
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<EventDetails> {
)
]),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(50.h),
CommonBtn(text: "Join the event"),
sizedBoxHeight(40.h),

50
lib/Feed Module/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart → lib/Main_Screens/CalenderTab/ManageMenmbers/ManageMembersCal.dart
View File

@@ -189,12 +189,12 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
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<ManageMembersCal> {
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<ManageMembersCal> {
width: 13.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(12.w)
],
),
@@ -244,32 +244,32 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
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<ManageMembersCal> {
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<ManageMembersCal> {
),
));
}
}

12
lib/Feed Module/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart → lib/Main_Screens/CalenderTab/Resource Pool/ResourcePool.dart
View File

@@ -89,10 +89,10 @@ class _ResourcePoolState extends State<ResourcePool> {
}
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<ResourcePool> {
),
]),
),
border: 1);
borderwidth: 1);
}
void inviteBottomSheet() {
@@ -258,9 +258,9 @@ class _ResourcePoolState extends State<ResourcePool> {
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,

12
lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart → lib/Main_Screens/CalenderTab/SetAvailabillity.dart
View File

@@ -138,10 +138,10 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
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<SetAvailabillity> {
text16w400_white("3:00 pm")
]),
),
border: 1)
borderwidth: 1)
],
),
const Spacer(),
@@ -163,10 +163,10 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
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<SetAvailabillity> {
text16w400_white("5:00 pm")
]),
),
border: 1)
borderwidth: 1)
],
),
],

0
lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart → lib/Main_Screens/Chats/View/chatsmainscreen.dart
View File

6
lib/Feed Module/Main_Screens/Chats/View/groupchat.dart → lib/Main_Screens/Chats/View/groupchat.dart
View File

@@ -264,13 +264,13 @@ class _GroupChatPageState extends State<GroupChatPage> {
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')

0
lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart → lib/Main_Screens/Chats/View/newchatpage.dart
View File

0
lib/Feed Module/Main_Screens/Chats/View/newgroup.dart → lib/Main_Screens/Chats/View/newgroup.dart
View File

6
lib/Feed Module/Main_Screens/Chats/View/userchat.dart → lib/Main_Screens/Chats/View/userchat.dart
View File

@@ -266,13 +266,13 @@ class _UserChatPageState extends State<UserChatPage> {
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')

457
lib/Feed Module/Main_Screens/Community/Community.dart → lib/Main_Screens/Community/Community.dart
View File

@@ -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<CommunityScreen> {
Expanded(
child: TabBarView(
children: [
feedTab(),
feedTabData(),
popularTab(),
latestTab(),
const LatestTab(),
],
),
),
@@ -178,13 +182,19 @@ class _CommunityScreenState extends State<CommunityScreen> {
}
}
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<String> 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<LatestTab> createState() => _LatestTabState();
}
class _LatestTabState extends State<LatestTab> {
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();
},
);
}
}

34
lib/Feed Module/Main_Screens/Community/CycleScreen.dart → lib/Main_Screens/Community/CycleScreen.dart
View File

@@ -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<CycleScreen> {
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,

183
lib/Main_Screens/Community/Model/LatestPostModel.dart Normal file
View File

@@ -0,0 +1,183 @@
class LatestpostModel {
String? status;
int? statusCode;
String? message;
List<Data>? data;
LatestpostModel({this.status, this.statusCode, this.message, this.data});
LatestpostModel.fromJson(Map<String, dynamic> json) {
status = json['status'];
statusCode = json['status_code'];
message = json['message'];
if (json['data'] != null) {
data = <Data>[];
json['data'].forEach((v) {
data!.add(Data.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
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<int>? 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<String>? 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<String, dynamic> json) {
id = json['id'];
likecount = json['likecount'];
tagsXid = json['tags_xid'].cast<int>();
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<String>();
likeIcon = json['likeIcon'];
iamPrincipal = json['iam_principal'] != null
? IamPrincipal.fromJson(json['iam_principal'])
: null;
community = json['community'] != null
? Community.fromJson(json['community'])
: null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
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<String, dynamic> json) {
id = json['id'];
principalTypeXid = json['principal_type_xid'];
userName = json['user_name'];
fullName = json['full_name'];
profilePhoto = json['profile_photo'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
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<String, dynamic> json) {
id = json['id'];
communityProfilePhoto = json['community_profile_photo'];
communityName = json['community_name'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['community_profile_photo'] = communityProfilePhoto;
data['community_name'] = communityName;
return data;
}
}

30
lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart → lib/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart
View File

@@ -125,11 +125,11 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
}
}
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<PostDetailsScreen> {
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<PostDetailsScreen> {
'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<PostDetailsScreen> {
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<PostDetailsScreen> {
}
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),

18
lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart → lib/Main_Screens/Community/PostDetailScreen/View/ReactionView.dart
View File

@@ -93,13 +93,13 @@ class _ReactionViewState extends State<ReactionView> {
),
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<ReactionView> {
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<ReactionView> {
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<ReactionView> {
width: 17.w,
),
),
border: 1.71),
borderwidth: 1.71),
const Spacer(),
text14400white("7.4K"),
]),

0
lib/Feed Module/Main_Screens/Community/PostScreen.dart → lib/Main_Screens/Community/PostScreen.dart
View File

26
lib/Main_Screens/Community/ViewModel/LatestPost.dart Normal file
View File

@@ -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<ResponseData<dynamic>> 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<dynamic>(
response.data['message'], ResponseStatus.SUCCESS,
data: response.data);
} else {
return ResponseData<dynamic>(
response.data['message'], ResponseStatus.FAILED);
}
}
}

6
lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart → lib/Main_Screens/ExploreDesign/DetailExplore.dart
View File

@@ -41,16 +41,16 @@ class _DetailExploreState extends State<DetailExplore> {
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),

18
lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart → lib/Main_Screens/ExploreDesign/ExploreScreen.dart
View File

@@ -191,10 +191,10 @@ class _ExploreScreenState extends State<ExploreScreen> {
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<ExploreScreen> {
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<ExploreScreen> {
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,

6
lib/Feed Module/Main_Screens/ExploreDesign/SearchGroup.dart → lib/Main_Screens/ExploreDesign/SearchGroup.dart
View File

@@ -125,10 +125,10 @@ class _SearchGroupState extends State<SearchGroup> {
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<SearchGroup> {
width: 16.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(12.w),
text16400white(title),
const Spacer(),

6
lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart → lib/Main_Screens/GroupTab/View/ConnectCommunity.dart
View File

@@ -78,11 +78,11 @@ class _ConnectCommunityState extends State<ConnectCommunity> {
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(

0
lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart → lib/Main_Screens/GroupTab/View/GoupSettings.dart
View File

24
lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart → lib/Main_Screens/GroupTab/View/GroupDetail.dart
View File

@@ -111,12 +111,12 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
],
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<GroupDetail> {
width: 17.w,
),
),
border: 0.5),
borderwidth: 0.5),
),
sizedBoxWidth(16.w),
PopupMenuButton(
@@ -370,10 +370,10 @@ class _GroupDetailState extends State<GroupDetail> {
],
),
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<GroupDetail> {
],
),
),
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<GroupDetail> {
]),
),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(20.h),
Row(
children: [
@@ -484,10 +484,10 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
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<GroupDetail> {
)
]),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(25.h),
],
),

48
lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart → lib/Main_Screens/GroupTab/View/GroupEvent.dart
View File

@@ -109,11 +109,11 @@ class _GroupEventState extends State<GroupEvent> {
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<GroupEvent> {
),
),
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<GroupEvent> {
]),
),
),
border: 1),
borderwidth: 1),
sizedBoxHeight(20.h),
text16400white("Type of event"),
sizedBoxHeight(14.h),
@@ -319,10 +319,10 @@ class _GroupEventState extends State<GroupEvent> {
});
}
},
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<GroupEvent> {
formatTimeOfDay(starttime!)),
]),
),
border: 1),
borderwidth: 1),
)
],
),
@@ -357,10 +357,10 @@ class _GroupEventState extends State<GroupEvent> {
});
}
},
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<GroupEvent> {
formatTimeOfDay(endtime!)),
]),
),
border: 1),
borderwidth: 1),
)
],
),
@@ -384,9 +384,9 @@ class _GroupEventState extends State<GroupEvent> {
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<GroupEvent> {
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<GroupEvent> {
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<GroupEvent> {
),
),
),
border: 1);
borderwidth: 1);
}
}

12
lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart → lib/Main_Screens/GroupTab/View/GroupInfo.dart
View File

@@ -94,12 +94,12 @@ class _GroupInfoState extends State<GroupInfo> {
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<GroupInfo> {
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<GroupInfo> {
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<GroupInfo> {
width: 20.w,
),
),
border: 0.5),
borderwidth: 0.5),
sizedBoxWidth(12.w),
text16400white("www.exampledummywebsite.com")
],

54
lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart → lib/Main_Screens/GroupTab/View/GroupManage.dart
View File

@@ -142,10 +142,10 @@ class _GroupManageState extends State<GroupManage> {
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<GroupManage> {
width: 23.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
],
@@ -235,32 +235,32 @@ class _GroupManageState extends State<GroupManage> {
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<GroupManage> {
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<GroupManage> {
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<GroupManage> {
width: 23.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
],
@@ -538,10 +538,10 @@ class _GroupManageState extends State<GroupManage> {
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<GroupManage> {
width: 23.w,
),
),
border: 0.5)
borderwidth: 0.5)
],
),
],

61
lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart → lib/Main_Screens/GroupTab/View/GroupTab.dart
View File

@@ -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<GroupTab> {
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<GroupTab> {
),
),
),
const PopupMenuDivider(),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -251,29 +251,10 @@ class _GroupTabState extends State<GroupTab> {
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<GroupTab> {
),
),
),
const PopupMenuDivider(),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -289,11 +270,29 @@ class _GroupTabState extends State<GroupTab> {
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,
)

6
lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart → lib/Main_Screens/GroupTab/View/NewPost.dart
View File

@@ -84,11 +84,11 @@ class _NewPostState extends State<NewPost> {
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(

59
lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart → lib/Main_Screens/GroupTab/View/RequestedGroups.dart
View File

@@ -144,8 +144,8 @@ class _RequestedGroupsState extends State<RequestedGroups> {
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<RequestedGroups> {
),
),
),
const PopupMenuDivider(),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -163,29 +163,10 @@ class _RequestedGroupsState extends State<RequestedGroups> {
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<RequestedGroups> {
),
),
),
const PopupMenuDivider(),
PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -201,11 +182,29 @@ class _RequestedGroupsState extends State<RequestedGroups> {
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,
)

24
lib/Feed Module/Main_Screens/GroupTab/View/Sessions.dart → lib/Main_Screens/GroupTab/View/Sessions.dart
View File

@@ -245,9 +245,9 @@ class _SessionsState extends State<Sessions> {
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<Sessions> {
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<Sessions> {
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: [

6
lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart → lib/Main_Screens/GroupTab/View/SubGroup/EditSubgroupInfo.dart
View File

@@ -123,11 +123,11 @@ class _EditSubgroupInfoState extends State<EditSubgroupInfo> {
},
);
},
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(

59
lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart → lib/Main_Screens/GroupTab/View/SubGroup/SubGroupInfo.dart
View File

@@ -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<SubGroupInfo> {
),
),
],
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<SubGroupInfo> {
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<SubGroupInfo> {
width: 20.w,
),
),
border: 0.5),
borderwidth: 0.5),
),
sizedBoxWidth(16.w),
PopupMenuButton(
@@ -245,7 +245,8 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
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<SubGroupInfo> {
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<SubGroupInfo> {
}
}
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<SubGroupInfo> {
]),
),
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<SubGroupInfo> {
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<SubGroupInfo> {
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<SubGroupInfo> {
}
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),

89
lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart → lib/Main_Screens/GroupTab/View/SubGroup/SubgroupSetting.dart
View File

@@ -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<SubGroupSetting> {
),
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,
)
],
),
])
),
),
])
]));
}

55
lib/Feed Module/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart → lib/Main_Screens/GroupTab/View/SubGroup/Subgroups.dart
View File

@@ -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<SubGroups> {
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<SubGroups> {
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(

5
lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart → lib/Main_Screens/ProfileTab/Badges/Badges.dart
View File

@@ -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<Badges> {
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(

2
lib/Feed Module/Main_Screens/ProfileTab/Certificate/AddCertificate.dart → lib/Main_Screens/ProfileTab/Certificate/AddCertificate.dart
View File

@@ -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';

4
lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart → lib/Main_Screens/ProfileTab/Certificate/Certificate.dart
View File

@@ -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';

16
lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart → lib/Main_Screens/ProfileTab/Clubs/Clubs.dart
View File

@@ -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<Clubs> {
),
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<Clubs> {
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<Clubs> {
),
);
}
}

0
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart → lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileBus.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart → lib/Main_Screens/ProfileTab/EditProfile/Model/GetEditProfileIndi.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart → lib/Main_Screens/ProfileTab/EditProfile/Model/InterestModel.dart
View File

4
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart → lib/Main_Screens/ProfileTab/EditProfile/View/BusEditProfile.dart
View File

@@ -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';

62
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart → lib/Main_Screens/ProfileTab/EditProfile/View/EditProfile.dart
View File

@@ -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<EditProfile> createState() => _EditProfileState();
}
//location in normal profile individual api
class _EditProfileState extends State<EditProfile> {
TextEditingController fullNameController = TextEditingController();
@@ -72,7 +73,7 @@ class _EditProfileState extends State<EditProfile> {
RxBool isloading = true.obs;
void getCatIdFromName(List<String> 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<EditProfile> {
: 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<EditProfile> {
"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<EditProfile> {
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<EditProfile> {
snackStyle: SnackStyle.FLOATING,
snackPosition: SnackPosition.BOTTOM,
);
// _controller.isTextFieldEnabled.value = true;
}
}
@@ -224,7 +222,6 @@ class _EditProfileState extends State<EditProfile> {
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<EditProfile> {
.value !=
''
? Image(
// File(profilePicture),
image: FileImage(
File(
editProfileImage
@@ -314,16 +311,14 @@ class _EditProfileState extends State<EditProfile> {
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<EditProfile> {
),
sizedBoxHeight(16.h),
//Obx(() {
//return
CustomDropDownChexkBox(
header: 'Select interest',
title: "",
@@ -500,10 +495,10 @@ class _EditProfileState extends State<EditProfile> {
width: 18.w,
height: 17.h,
),
// showOtherOption: true,
initiallySelected: listofUserInterests,
),
// }),
sizedBoxHeight(20.h),
text16400white("About"),
@@ -514,7 +509,7 @@ class _EditProfileState extends State<EditProfile> {
"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<EditProfile> {
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<EditProfile> {
colorText: Colors.white,
);
}
// else if (profilePicture == "") {
// utils.showToast(
// 'Upload edit profile picture!');
// }
else {
print(selectedinterestid.toString());
saveEditProfileInd();
}
},

74
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart → lib/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart
View File

@@ -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<ProfileTab> {
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<ProfileTab> {
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<ProfileTab> {
int? certificationsremoveid;
RemoveTimelineUploadata() async {
removeTimelineUploadata() async {
utils.loader();
Map<String, dynamic> updata = {
"timeline_id": timelineremoveid,
@@ -160,11 +160,9 @@ class _ProfileTabState extends State<ProfileTab> {
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<ProfileTab> {
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<ProfileTab> {
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<ProfileTab> {
children: [
Stack(
children: [
Container(
SizedBox(
height: 484.h,
width: double.infinity,
child: getEditProfileIndi!
@@ -362,9 +357,10 @@ class _ProfileTabState extends State<ProfileTab> {
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<ProfileTab> {
)),
),
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<ProfileTab> {
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<ProfileTab> {
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<ProfileTab> {
children: [
Stack(
children: [
Container(
SizedBox(
height: 484.h,
width: double.infinity,
child: getEditProfileBus!.data!
@@ -1217,8 +1213,8 @@ class _ProfileTabState extends State<ProfileTab> {
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<ProfileTab> {
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<ProfileTab> {
null ||
getEditProfileBus!.data!
.businessOwnerName!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.businessOwnerName!),
@@ -1370,7 +1366,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!
.data!.websiteLink!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.websiteLink!),
@@ -1399,7 +1395,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!.data!
.businessLocation!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.businessLocation!),
@@ -1430,7 +1426,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!
.data!.foundedon!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.foundedon!),
@@ -1516,7 +1512,7 @@ class _ProfileTabState extends State<ProfileTab> {
}) {
return Row(
children: [
Container(
SizedBox(
width: 10,
height: 170.h,
child: Stack(

0
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart → lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/indiprofileimagecontroller.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart → lib/Main_Screens/ProfileTab/EditProfile/View/picturecontroller/profileimagecontoller.dart
View File

4
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart → lib/Main_Screens/ProfileTab/EditProfile/ViewModel/EditProfileApi.dart
View File

@@ -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;

2
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart → lib/Main_Screens/ProfileTab/EditProfile/ViewModel/InterestApiList.dart
View File

@@ -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<String> listofInterests = [];

14
lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart → lib/Main_Screens/ProfileTab/Followers/Followers.dart
View File

@@ -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<Followers> {
@override
void initState() {
// TODO: implement initState
var updata = "";
if (fromMainBusProfile == 'MainBusProfile') {
Profilegetmethod()

12
lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart → lib/Main_Screens/ProfileTab/Following/Following.dart
View File

@@ -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';

0
lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart → lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowers.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart → lib/Main_Screens/ProfileTab/Guest User/Model/GetGuestFollowing.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart → lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataBus.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart → lib/Main_Screens/ProfileTab/Guest User/Model/GuestGetProfileDataIndi.dart
View File

130
lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart → lib/Main_Screens/ProfileTab/Guest User/View/Business/ProfileTabBusGuest.dart
View File

@@ -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<profiletabBusGest> {
// 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<profiletabBusGest> {
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<profiletabBusGest> {
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<profiletabBusGest> {
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<profiletabBusGest> {
).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<profiletabBusGest> {
),
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<profiletabBusGest> {
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<profiletabBusGest> {
followunfollowid =
guestGetProfileBus!.data!.id;
FollowUnfollowUploadata();
print(followunfollowid);
},
child: guestGetProfileBus!.data!
.isIamFollowingToGuestUser ==
@@ -306,7 +302,7 @@ class _profiletabBusGestState extends State<profiletabBusGest> {
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<profiletabBusGest> {
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<profiletabBusGest> {
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<profiletabBusGest> {
)),
),
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<profiletabBusGest> {
)),
),
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<profiletabBusGest> {
),
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<profiletabBusGest> {
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<profiletabBusGest> {
),
)),
),
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) => <PopupMenuEntry>[
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),

31
lib/Feed Module/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart → lib/Main_Screens/ProfileTab/Guest User/View/Individual/ProfileTabIndGuest.dart
View File

@@ -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<ProfileTabIndGuest> {
).image,
fit: BoxFit.cover,
),
shape: LinearBorder(),
shape: const LinearBorder(),
),
)
: Container(
@@ -450,7 +449,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
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<ProfileTabIndGuest> {
)),
),
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<ProfileTabIndGuest> {
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<ProfileTabIndGuest> {
width: 1.w,
height: 170.h,
decoration:
BoxDecoration(
const BoxDecoration(
color: Colors
.white),
),
@@ -705,7 +706,7 @@ class _ProfileTabIndGuestState extends State<ProfileTabIndGuest> {
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<ProfileTabIndGuest> {
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<ProfileTabIndGuest> {
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<ProfileTabIndGuest> {
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<ProfileTabIndGuest> {
).image,
fit: BoxFit.cover,
),
shape: LinearBorder(),
shape: const LinearBorder(),
),
)
: Container(

9
lib/Feed Module/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart → lib/Main_Screens/ProfileTab/Guest User/ViewModel/GuestProfileApi.dart
View File

@@ -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;

0
lib/Feed Module/Main_Screens/ProfileTab/Model/accountSessionModel.dart → lib/Main_Screens/ProfileTab/Model/accountSessionModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/certificateModel.dart → lib/Main_Screens/ProfileTab/Model/certificateModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart → lib/Main_Screens/ProfileTab/Model/editTimelineModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/faqModel.dart → lib/Main_Screens/ProfileTab/Model/faqModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/followersModel.dart → lib/Main_Screens/ProfileTab/Model/followersModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/followingModel.dart → lib/Main_Screens/ProfileTab/Model/followingModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart → lib/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart → lib/Main_Screens/ProfileTab/Model/termsconditionsModel.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart → lib/Main_Screens/ProfileTab/Model/timelineabilityModel.dart
View File

14
lib/Feed Module/Main_Screens/ProfileTab/My Network/MyNetwork.dart → lib/Main_Screens/ProfileTab/My Network/MyNetwork.dart
View File

@@ -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<FollowersTab> {
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<FollowersTab> {
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<FollowingTab> {
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<FollowingTab> {
return utils.showToast(data.message);
} else {
Get.back();
print("unfollow not done");
return utils.showToast(data.message);
}
}

112
lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSessions.dart → lib/Main_Screens/ProfileTab/Settings/AccountSessions.dart
View File

@@ -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<AccountSession> {
@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<AccountSession> {
: _buildBody(context);
},
),
);
);
}
Widget _buildNoDataBody(context) {
Widget _buildNoDataBody(context) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -86,65 +84,63 @@ class _AccountSessionState extends State<AccountSession> {
}
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<AccountSession> {
width: 9.w,
),
),
border: 1),
borderwidth: 1),
sizedBoxWidth(10.w),
text16400white(title),
],
@@ -174,7 +170,7 @@ class _AccountSessionState extends State<AccountSession> {
],
),
),
border: 1),
borderwidth: 1),
);
}
}

101
lib/Feed Module/Main_Screens/ProfileTab/Settings/AccountSetting.dart → lib/Main_Screens/ProfileTab/Settings/AccountSetting.dart
View File

@@ -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<AccountSettings> {
// bool swichvalue = false;
String? accountTypeValue;
String? accountTypeValue;
String? accounTypeLogin;
@override
@@ -44,15 +44,14 @@ class _AccountSettingsState extends State<AccountSettings> {
});
}
Future<void> UploadData() async {
Future<void> 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<String, dynamic> updata = {
@@ -64,24 +63,20 @@ class _AccountSettingsState extends State<AccountSettings> {
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);

21
lib/Feed Module/Main_Screens/ProfileTab/Settings/ChangePassword.dart → lib/Main_Screens/ProfileTab/Settings/ChangePassword.dart
View File

@@ -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<ChangePassword> {
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<ChangePassword> {
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<ChangePassword> {
utils.showToast('Please fill all fields');
} else {
Uploadata();
}
},
)

2
lib/Feed Module/Main_Screens/ProfileTab/Settings/ContactUs.dart → lib/Main_Screens/ProfileTab/Settings/ContactUs.dart
View File

@@ -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';

8
lib/Feed Module/Main_Screens/ProfileTab/Settings/DeleteAccount.dart → lib/Main_Screens/ProfileTab/Settings/DeleteAccount.dart
View File

@@ -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<DeleteAccount> {
child: Scaffold(
// key: _scaffoldKey1,
// resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "",
),
body: Stack(children: [

19
lib/Feed Module/Main_Screens/ProfileTab/Settings/FaqScreen.dart → lib/Main_Screens/ProfileTab/Settings/FaqScreen.dart
View File

@@ -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<FaqScreen> {
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<FaqScreen> {
);
}
}
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<FaqScreen> {
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<FaqScreen> {
),
),
),
border: 1),
borderwidth: 1),
],
),
);

5
lib/Feed Module/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart → lib/Main_Screens/ProfileTab/Settings/HelpAndSupport.dart
View File

@@ -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<HelpAndSupport> {
),
),
accounTypeLogin == '1'
? Column(
children: [
? Column(children: [
commonDivider(),
GestureDetector(
onTap: () {

0
lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart → lib/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart
View File

0
lib/Feed Module/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart → lib/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart
View File

5
lib/Feed Module/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart → lib/Main_Screens/ProfileTab/Settings/PrivacyPolicy.dart
View File

@@ -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';

16
lib/Feed Module/Main_Screens/ProfileTab/Settings/ReportABug.dart → lib/Main_Screens/ProfileTab/Settings/ReportABug.dart
View File

@@ -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<ReportABug> {
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<ReportABug> {
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<ReportABug> {
),
sizedBoxHeight(15.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 25.h,
width: 15.w,
child: Center(
@@ -145,7 +145,7 @@ class _ReportABugState extends State<ReportABug> {
),
sizedBoxHeight(15.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 23.h,
width: 23.w,
child: Center(
@@ -174,7 +174,7 @@ class _ReportABugState extends State<ReportABug> {
text16400white("Email address"),
sizedBoxHeight(15.h),
CustomTextFormField(
leadingIcon: Container(
leadingIcon: SizedBox(
height: 17.h,
width: 24.w,
child: Center(

31
lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart → lib/Main_Screens/ProfileTab/Settings/Settings.dart
View File

@@ -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<Settings> {
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<Settings> {
commonDivider(),
],
)
: SizedBox(),
: const SizedBox(),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.helpandsupport);
@@ -157,7 +156,7 @@ class _SettingsState extends State<Settings> {
),
commonDivider(),
accounTypeLogin == '1'
? SizedBox()
? const SizedBox()
: Column(
children: [
GestureDetector(
@@ -199,8 +198,8 @@ class _SettingsState extends State<Settings> {
),
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<Settings> {
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<Settings> {
// 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")),

7
lib/Feed Module/Main_Screens/ProfileTab/Settings/TermsCondition.dart → lib/Main_Screens/ProfileTab/Settings/TermsCondition.dart
View File

@@ -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<TermsCondition> {
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<TermsCondition> {
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) {

37
lib/Feed Module/Main_Screens/ProfileTab/Settings/VerifyCode.dart → lib/Main_Screens/ProfileTab/Settings/VerifyCode.dart
View File

@@ -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<VerifyCode> {
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<VerifyCode> {
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<VerifyCode> {
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<VerifyCode> {
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<VerifyCode> {
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<VerifyCode> {
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<VerifyCode> {
fontFamily: 'Helvetica',
),
beforeTextPaste: (text) {
print("Allowing to paste $text");
return true;
},
appContext: context,
@@ -166,9 +157,9 @@ class _VerifyCodeState extends State<VerifyCode> {
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<VerifyCode> {
});
},
// disabledColor: Colors.white,
color: Color(0XFF222935).withOpacity(0.10),
color: const Color(0XFF222935).withOpacity(0.10),
),
),
// ),

Some files were not shown because too many files have changed in this diff Show More