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

conflict resolved

Browse Source
This commit is contained in:
Dakshesh42
2024-08-01 13:45:01 +05:30
parent 2dcae88e7e 1f33ab55bc
commit 26e997447c
130 changed files with 1747 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 */

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 {

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

@@ -6,11 +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/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';

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(() {});
}

13
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);

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,7 @@ 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/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';

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

11
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';
@@ -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:
@@ -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,

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

49
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']);
},
),
)
]))
]));
}

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

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

40
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';
@@ -128,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();
@@ -154,7 +152,7 @@ class _ProfileTabState extends State<ProfileTab> {
int? certificationsremoveid;
RemoveTimelineUploadata() async {
removeTimelineUploadata() async {
utils.loader();
Map<String, dynamic> updata = {
"timeline_id": timelineremoveid,
@@ -162,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);
}
}
@@ -179,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);
}
}
@@ -219,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(
@@ -235,7 +228,7 @@ class _ProfileTabState extends State<ProfileTab> {
children: [
Stack(
children: [
Container(
SizedBox(
height: 484.h,
width: double.infinity,
child: getEditProfileIndi!
@@ -367,7 +360,7 @@ class _ProfileTabState extends State<ProfileTab> {
getEditProfileIndi!.data!.about == null ||
getEditProfileIndi!
.data!.about!.isEmpty
? SizedBox()
? const SizedBox()
: text14400white(
getEditProfileIndi!.data!.about!),
sizedBoxHeight(25.h),
@@ -392,7 +385,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileIndi!
.data!.location!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileIndi!
.data!.location!),
@@ -590,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(
@@ -1105,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(
@@ -1121,7 +1113,7 @@ class _ProfileTabState extends State<ProfileTab> {
children: [
Stack(
children: [
Container(
SizedBox(
height: 484.h,
width: double.infinity,
child: getEditProfileBus!.data!
@@ -1221,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),
@@ -1320,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),
@@ -1346,7 +1338,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!.data!
.businessOwnerName!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.businessOwnerName!),
@@ -1374,7 +1366,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!
.data!.websiteLink!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.websiteLink!),
@@ -1403,7 +1395,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!.data!
.businessLocation!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.businessLocation!),
@@ -1434,7 +1426,7 @@ class _ProfileTabState extends State<ProfileTab> {
null ||
getEditProfileBus!
.data!.foundedon!.isEmpty
? SizedBox()
? const SizedBox()
: text14400whiteblur(
getEditProfileBus!
.data!.foundedon!),
@@ -1520,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);
}
}

100
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,47 +84,45 @@ 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: commonGlassUI(

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: [

13
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);

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(

19
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,
@@ -253,7 +252,7 @@ class _SettingsState extends State<Settings> {
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),
),
),
// ),

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

@@ -8,8 +8,8 @@ import 'package:get/get.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/ViewModel/BlockedUserApi.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/sized_box.dart';

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

@@ -4,9 +4,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/dialogs.dart';
import 'package:regroup/Utils/texts.dart';

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

@@ -3,7 +3,7 @@ import 'dart:async';
import 'package:regroup/Common/api_urls.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Common/controller/data/network/network_api.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchBlockUser.dart';
FetchBlockedUser? fetchblockuserobj;

2
lib/Feed Module/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.dart → lib/Main_Screens/ProfileTab/Settings/ViewModel/NotificationApi.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/Settings/Model/FetchNotification.dart';
import 'package:regroup/Main_Screens/ProfileTab/Settings/Model/FetchNotification.dart';
FetchNotification? fetchNoti;

5
lib/Feed Module/Main_Screens/ProfileTab/Share profile/ShareProfile.dart → lib/Main_Screens/ProfileTab/Share profile/ShareProfile.dart
View File

@@ -6,7 +6,7 @@ import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Common/CommonWidget.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomTextformfield.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
@@ -65,7 +65,8 @@ class _ShareProfileState extends State<ShareProfile> {
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Column(children: [

1002
lib/Main_Screens/ProfileTab/TimeLine/AddTimeline.dart Normal file
View File

File diff suppressed because it is too large Load Diff

2
lib/Feed Module/Main_Screens/ProfileTab/view_model/gettimelineability.dart → lib/Main_Screens/ProfileTab/view_model/gettimelineability.dart
View File

@@ -4,7 +4,7 @@
import 'package:regroup/Common/api_urls.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Common/controller/data/network/network_api.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart';
class TimelineAbilityListApi {
TimelineAbilityListApi();

18
lib/Feed Module/Main_Screens/ProfileTab/view_model/profileGetmethod.dart → lib/Main_Screens/ProfileTab/view_model/profileGetmethod.dart
View File

@@ -4,15 +4,15 @@ import 'dart:developer';
import 'package:regroup/Common/api_urls.dart';
import 'package:regroup/Common/base_manager.dart';
import 'package:regroup/Common/controller/data/network/network_api.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/accountSessionModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/certificateModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/editTimelineModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/faqModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followersModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/followingModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart';
import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/termsconditionsModel.dart';
// import 'package:regroup/Feed%20Module/Main_Screens/ProfileTab/Model/timelineabilityModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/accountSessionModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/certificateModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/editTimelineModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/faqModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/followersModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/followingModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/privacyPolicyModel.dart';
import 'package:regroup/Main_Screens/ProfileTab/Model/termsconditionsModel.dart';
// import 'package:regroup/Main_Screens/ProfileTab/Model/timelineabilityModel.dart';
FaqModel? faqobj;
PrivacypolicyModel? privacyobj;

43
lib/Feed Module/Main_Screens/ProfileTab/view_model/profilePostmethod.dart → lib/Main_Screens/ProfileTab/view_model/profilePostmethod.dart
View File

@@ -17,112 +17,82 @@ class Profilepostmethod {
utf8.encode('RegroupUserName:71%@L%es^bUX94`J9XT*@bh,._WWM{\$%^^&&'));
Future<ResponseData<dynamic>> postContactus(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postcontactus,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postReportandbug(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postreportbug,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postBlockuser(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postblock,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postunfollowuser(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postunfollow,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postRemoveuser(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postremoveuser,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postChangepassword(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postchangepassword,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postChangepassverifyotp(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postchangepassverify,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postTimeline(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.posttimeline,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postAccountvisibility(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postaccountvisibility,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postDeleteaccount(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postdeleteaccount,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
@@ -179,7 +149,6 @@ class Profilepostmethod {
return ResponseData<dynamic>("success", ResponseStatus.SUCCESS,
data: response.data);
} else if (response.statusCode == 203) {
print(response.data);
return ResponseData<dynamic>("success", ResponseStatus.PRIVATE,
data: response.data);
} else {
@@ -194,46 +163,34 @@ class Profilepostmethod {
}
Future<ResponseData<dynamic>> postEditTimeline(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postedittimeline,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postRemoveTimeline(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postremovetimeline,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postRemoveCertification(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postremovecertification,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}
Future<ResponseData<dynamic>> postCertification(updata) async {
print("updata is $updata");
final response = await NetworkApiServices().postApi(
updata,
ApiUrls.postcertification,
);
print("response is ${response.data}");
print("response message is ${response.message}");
return response;
}

2
lib/Feed Module/Notification/View/notification.dart → lib/Notifications/notification.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CustomNextButton.dart';
import 'package:regroup/Utils/Common/blureffect.dart';
import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';

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