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

Merge pull request 'Development' (#6) from Development into main

Browse Source 
Reviewed-on: #6
This commit is contained in:
Priyanka Hadpad
2024-07-01 14:30:55 +00:00
parent 483b4a23d8 41ce3aadbb
commit abf29d2441
107 changed files with 3230 additions and 3212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/png/Choice screen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 MiB

BIN
assets/images/png/Ellipse 1496.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 MiB

3
assets/images/svg/fluent_home-20-regular.svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.2475 2.98502C11.5917 2.67581 12.038 2.50476 12.5006 2.50476C12.9633 2.50476 13.4096 2.67581 13.7537 2.98502L20.6287 9.16252C20.8242 9.3383 20.9805 9.55323 21.0876 9.79334C21.1946 10.0334 21.2499 10.2934 21.25 10.5563V19.375C21.25 19.8723 21.0525 20.3492 20.7008 20.7008C20.3492 21.0525 19.8723 21.25 19.375 21.25H16.25C15.7527 21.25 15.2758 21.0525 14.9242 20.7008C14.5725 20.3492 14.375 19.8723 14.375 19.375V15C14.375 14.8343 14.3092 14.6753 14.1919 14.5581C14.0747 14.4409 13.9158 14.375 13.75 14.375H11.25C11.0842 14.375 10.9253 14.4409 10.8081 14.5581C10.6908 14.6753 10.625 14.8343 10.625 15V19.375C10.625 19.8723 10.4275 20.3492 10.0758 20.7008C9.72419 21.0525 9.24728 21.25 8.75 21.25H5.625C5.12772 21.25 4.65081 21.0525 4.29917 20.7008C3.94754 20.3492 3.75 19.8723 3.75 19.375V10.5563C3.75 10.025 3.975 9.51877 4.3725 9.16252L11.2475 2.98502ZM12.9175 3.91502C12.8028 3.81207 12.6541 3.75512 12.5 3.75512C12.3459 3.75512 12.1972 3.81207 12.0825 3.91502L5.2075 10.0925C5.14237 10.151 5.09025 10.2225 5.0545 10.3024C5.01876 10.3822 5.00019 10.4688 5 10.5563V19.375C5 19.5408 5.06585 19.6998 5.18306 19.817C5.30027 19.9342 5.45924 20 5.625 20H8.75C8.91576 20 9.07473 19.9342 9.19194 19.817C9.30915 19.6998 9.375 19.5408 9.375 19.375V15C9.375 14.5027 9.57254 14.0258 9.92417 13.6742C10.2758 13.3226 10.7527 13.125 11.25 13.125H13.75C14.2473 13.125 14.7242 13.3226 15.0758 13.6742C15.4275 14.0258 15.625 14.5027 15.625 15V19.375C15.625 19.5408 15.6908 19.6998 15.8081 19.817C15.9253 19.9342 16.0842 20 16.25 20H19.375C19.5408 20 19.6997 19.9342 19.8169 19.817C19.9342 19.6998 20 19.5408 20 19.375V10.5563C19.9998 10.4688 19.9812 10.3822 19.9455 10.3024C19.9098 10.2225 19.8576 10.151 19.7925 10.0925L12.9175 3.91502Z" fill="#FCFCFC"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

1
ios/Flutter/Debug.xcconfig
View File

@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "Generated.xcconfig"

1
ios/Flutter/Release.xcconfig
View File

@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "Generated.xcconfig"

44
ios/Podfile Normal file
View File

@@ -0,0 +1,44 @@
# Uncomment this line to define a global platform for your project
platform :ios, '12.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
project 'Runner', {
'Debug' => :debug,
'Profile' => :release,
'Release' => :release,
}
def flutter_root
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
unless File.exist?(generated_xcode_build_settings_path)
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
end
File.foreach(generated_xcode_build_settings_path) do |line|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
return matches[1].strip if matches
end
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
end
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
flutter_ios_podfile_setup
target 'Runner' do
use_frameworks!
use_modular_headers!
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
# target 'RunnerTests' do
# inherit! :search_paths
# end
end
post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
end
end

154
ios/Podfile.lock Normal file
View File

@@ -0,0 +1,154 @@
PODS:
- connectivity_plus (0.0.1):
- Flutter
- FlutterMacOS
- device_info_plus (0.0.1):
- Flutter
- DKImagePickerController/Core (4.3.9):
- DKImagePickerController/ImageDataManager
- DKImagePickerController/Resource
- DKImagePickerController/ImageDataManager (4.3.9)
- DKImagePickerController/PhotoGallery (4.3.9):
- DKImagePickerController/Core
- DKPhotoGallery
- DKImagePickerController/Resource (4.3.9)
- DKPhotoGallery (0.0.19):
- DKPhotoGallery/Core (= 0.0.19)
- DKPhotoGallery/Model (= 0.0.19)
- DKPhotoGallery/Preview (= 0.0.19)
- DKPhotoGallery/Resource (= 0.0.19)
- SDWebImage
- SwiftyGif
- DKPhotoGallery/Core (0.0.19):
- DKPhotoGallery/Model
- DKPhotoGallery/Preview
- SDWebImage
- SwiftyGif
- DKPhotoGallery/Model (0.0.19):
- SDWebImage
- SwiftyGif
- DKPhotoGallery/Preview (0.0.19):
- DKPhotoGallery/Model
- DKPhotoGallery/Resource
- SDWebImage
- SwiftyGif
- DKPhotoGallery/Resource (0.0.19):
- SDWebImage
- SwiftyGif
- file_picker (0.0.1):
- DKImagePickerController/PhotoGallery
- Flutter
- Flutter (1.0.0)
- fluttertoast (0.0.2):
- Flutter
- Toast
- geolocator_apple (1.2.0):
- Flutter
- google_maps_flutter_ios (0.0.1):
- Flutter
- GoogleMaps (< 9.0)
- GoogleMaps (6.2.1):
- GoogleMaps/Maps (= 6.2.1)
- GoogleMaps/Base (6.2.1)
- GoogleMaps/Maps (6.2.1):
- GoogleMaps/Base
- image_cropper (0.0.4):
- Flutter
- TOCropViewController (~> 2.7.3)
- image_gallery_saver (2.0.2):
- Flutter
- image_picker_ios (0.0.1):
- Flutter
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- permission_handler_apple (9.3.0):
- Flutter
- SDWebImage (5.19.2):
- SDWebImage/Core (= 5.19.2)
- SDWebImage/Core (5.19.2)
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- SwiftyGif (5.4.5)
- Toast (4.1.1)
- TOCropViewController (2.7.4)
DEPENDENCIES:
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- file_picker (from `.symlinks/plugins/file_picker/ios`)
- Flutter (from `Flutter`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
- geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
- google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
- image_cropper (from `.symlinks/plugins/image_cropper/ios`)
- image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
SPEC REPOS:
trunk:
- DKImagePickerController
- DKPhotoGallery
- GoogleMaps
- SDWebImage
- SwiftyGif
- Toast
- TOCropViewController
EXTERNAL SOURCES:
connectivity_plus:
:path: ".symlinks/plugins/connectivity_plus/darwin"
device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios"
file_picker:
:path: ".symlinks/plugins/file_picker/ios"
Flutter:
:path: Flutter
fluttertoast:
:path: ".symlinks/plugins/fluttertoast/ios"
geolocator_apple:
:path: ".symlinks/plugins/geolocator_apple/ios"
google_maps_flutter_ios:
:path: ".symlinks/plugins/google_maps_flutter_ios/ios"
image_cropper:
:path: ".symlinks/plugins/image_cropper/ios"
image_gallery_saver:
:path: ".symlinks/plugins/image_gallery_saver/ios"
image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
permission_handler_apple:
:path: ".symlinks/plugins/permission_handler_apple/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
SPEC CHECKSUMS:
connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
fluttertoast: 9f2f8e81bb5ce18facb9748d7855bf5a756fe3db
geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
google_maps_flutter_ios: d1318b4ff711612cab16862d7a87e31a7403d458
GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4
image_cropper: 2c150b3d63f4feaad31054d20381ddac0a460e63
image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
PODFILE CHECKSUM: 87eb8569d101acc3edb071281a9b070909b01eb4
COCOAPODS: 1.15.2

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

@@ -8,6 +8,7 @@
/* 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 */; };
@@ -29,12 +30,15 @@
/* 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>"; };
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>"; };
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>"; };
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; };
@@ -42,6 +46,7 @@
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
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>"; };
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 */
@@ -49,12 +54,23 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2105BA461347F33698D3FD7B /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
01448FBCAC46C16EC8BC1181 /* Pods */ = {
isa = PBXGroup;
children = (
8DA153E7FEAC51D97681DB93 /* Pods-Runner.debug.xcconfig */,
3E093EFD052120EBB5EFE242 /* Pods-Runner.release.xcconfig */,
01A8D59FC22474B9D47BC82F /* Pods-Runner.profile.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
};
9740EEB11CF90186004384FC /* Flutter */ = {
isa = PBXGroup;
children = (
@@ -72,6 +88,8 @@
9740EEB11CF90186004384FC /* Flutter */,
97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */,
01448FBCAC46C16EC8BC1181 /* Pods */,
DE8E73CF7AB07643531FB23E /* Frameworks */,
);
sourceTree = "<group>";
};
@@ -98,6 +116,14 @@
path = Runner;
sourceTree = "<group>";
};
DE8E73CF7AB07643531FB23E /* Frameworks */ = {
isa = PBXGroup;
children = (
DC7FC30109CCD5376F6BFA0F /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -105,12 +131,15 @@
isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
2427B225240D99C3274E4E9F /* [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 */,
);
buildRules = (
);
@@ -127,7 +156,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
@@ -169,6 +198,45 @@
/* 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 */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
@@ -176,6 +244,7 @@
files = (
);
inputPaths = (
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
@@ -199,6 +268,23 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
};
A1A5C179E86574032091061E /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -274,7 +360,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -290,13 +376,18 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = A89AY6VY4F;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Regroup;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.example.regroup;
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.regroup.wdi;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
@@ -351,7 +442,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -400,7 +491,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -418,13 +509,18 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = A89AY6VY4F;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Regroup;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.example.regroup;
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.regroup.wdi;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -440,13 +536,18 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = A89AY6VY4F;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Regroup;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.example.regroup;
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.regroup.wdi;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;

2
ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

3
ios/Runner.xcworkspace/contents.xcworkspacedata generated
View File

@@ -4,4 +4,7 @@
<FileRef
location = "group:Runner.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>

12
ios/Runner/Info.plist
View File

@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
@@ -24,6 +26,8 @@
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
@@ -43,9 +47,9 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Regroup get write-only access to the user photo library</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Allow access to photo library</string>
</dict>
</plist>

8
ios/Runner/Runner.entitlements Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
</dict>
</plist>

70
lib/Common/CommonBottomNavigationBar.dart
View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:regroup/Common/controller/MainController.dart';
@@ -8,7 +9,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
width: double.infinity,
height: 83.h,
borderRadius: 2,
blur: 30,
blur: 6,
alignment: Alignment.center,
border: 0,
linearGradient: LinearGradient(
@@ -16,7 +17,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
end: Alignment.bottomRight,
colors: [
Colors.white.withOpacity(0.04),
Color(0xFFFFFFFF).withOpacity(0.05),
const Color(0xFFFFFFFF).withOpacity(0.05),
],
stops: const [
0.1,
@@ -31,7 +32,6 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
],
),
child: BottomNavigationBar(
// backgroundColor: ,
type: BottomNavigationBarType.fixed,
backgroundColor: const Color(0xFFFFFFFF).withOpacity(0),
showUnselectedLabels: true,
@@ -41,22 +41,22 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
fontSize: 10.sp,
color: const Color(0xFF676767),
fontWeight: FontWeight.w400,
fontFamily: 'hiragino'),
fontFamily: 'Helvetica'),
selectedLabelStyle: TextStyle(
fontSize: 10.sp,
color: const Color(0xFFFFFFFF),
fontWeight: FontWeight.w400,
fontFamily: 'hiragino'),
fontFamily: 'Helvetica'),
currentIndex: _mainController.selectedIndex.value,
onTap: (index) {
_mainController.updateTab(index);
},
items: [
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/png/BottomBar/inactiveHome.png',
height: 26.h,
width: 26.w,
icon: SvgPicture.asset(
'assets/images/svg/fluent_home-20-regular.svg',
height: 25.h,
width: 25.w,
),
// Icon(
// Icons.home,
@@ -67,13 +67,13 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
children: [
if (_mainController.selectedIndex.value == 0)
Container(
height: 40.h,
width: 40.w,
height: 39.h,
// width: 40.w,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Color(0xFFD90B2E).withOpacity(0.16),
color: Colors.amber,
spreadRadius: 15,
blurRadius: 25,
offset: const Offset(0, 10),
@@ -81,27 +81,27 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
],
),
),
Positioned(
left: 0,
right: 0,
top: -15,
child: Container(
height: 2.h,
width: 20.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: Color(0xFFD90B2E)),
)),
// Positioned(
// left: 0,
// right: 0,
// top: -15,
// child: Container(
// height: 2.h,
// width: 20.w,
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(10.r),
// color: const Color(0xFFD90B2E)),
// )),
Positioned(
top: 0,
bottom: 0,
right: 0,
left: 0,
child: Center(
child: Image.asset(
'assets/images/png/BottomBar/ActiveHome.png',
height: 30.h,
width: 30.w,
child: SvgPicture.asset(
'assets/images/svg/fluent_home-20-regular.svg',
// height: 25.h,
// width: 25.w,
),
),
)
@@ -128,7 +128,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Color(0xFFD90B2E).withOpacity(0.16),
color: const Color(0xFFD90B2E).withOpacity(0.16),
spreadRadius: 15,
blurRadius: 25,
offset: const Offset(0, 10),
@@ -145,7 +145,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
width: 20.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: Color(0xFFD90B2E)),
color: const Color(0xFFD90B2E)),
)),
Positioned(
left: 0,
@@ -182,7 +182,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Color(0xFFD90B2E).withOpacity(0.16),
color: const Color(0xFFD90B2E).withOpacity(0.16),
spreadRadius: 15,
blurRadius: 25,
offset: const Offset(0, 10),
@@ -199,7 +199,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
width: 20.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: Color(0xFFD90B2E)),
color: const Color(0xFFD90B2E)),
)),
Positioned(
left: 0,
@@ -236,7 +236,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Color(0xFFD90B2E).withOpacity(0.16),
color: const Color(0xFFD90B2E).withOpacity(0.16),
spreadRadius: 15,
blurRadius: 25,
offset: const Offset(0, 10),
@@ -253,7 +253,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
width: 20.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: Color(0xFFD90B2E)),
color: const Color(0xFFD90B2E)),
)),
Positioned(
left: 0,
@@ -290,7 +290,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Color(0xFFD90B2E).withOpacity(0.16),
color: const Color(0xFFD90B2E).withOpacity(0.16),
spreadRadius: 15,
blurRadius: 25,
offset: const Offset(0, 10),
@@ -307,7 +307,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
width: 20.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.r),
color: Color(0xFFD90B2E)),
color: const Color(0xFFD90B2E)),
)),
Positioned(
left: 0,

4
lib/Common/CommonGlassmorphism.dart
View File

@@ -15,7 +15,7 @@ Widget commonGlassContainer({
width: width,
height: height,
borderRadius: borderradius,
blur: 10,
blur: 6,
alignment: Alignment.topCenter,
border: border,
linearGradient: LinearGradient(
@@ -53,7 +53,7 @@ Widget commonGlassContainerblue({
width: width,
height: height,
borderRadius: borderradius,
blur: 10,
blur: 6,
alignment: Alignment.topCenter,
border: border,
linearGradient: LinearGradient(

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

@@ -61,7 +61,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
width: double.infinity,
height: 50.h,
borderRadius: 30,
blur: 10,
blur: 6,
alignment: Alignment.center,
border: 1,
linearGradient: LinearGradient(

15
lib/Feed Module/Main_Screens/CalenderTab/AddEvent/AddEvent.dart
View File

@@ -50,16 +50,17 @@ class _AddEventState extends State<AddEvent> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
@@ -508,7 +509,7 @@ class _AddEventState extends State<AddEvent> {
sizedBoxHeight(70.h),
]),
),
))
)
]));
}

17
lib/Feed Module/Main_Screens/CalenderTab/AddUsers/AddUsers.dart
View File

@@ -63,18 +63,19 @@ class _AddUsersState extends State<AddUsers> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Add users",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -123,7 +124,7 @@ class _AddUsersState extends State<AddUsers> {
),
),
]))
])))
]))
]));
}
@@ -394,7 +395,7 @@ class _AddUsersState extends State<AddUsers> {
Color(0xFFD90B2E),
],
),
blur: 10,
blur: 6,
child: Center(child: text16w400_FCFCFC("Su")),
),
sizedBoxWidth(8.w),

68
lib/Feed Module/Main_Screens/CalenderTab/CalenderTab.dart
View File

@@ -133,6 +133,7 @@ class _CalenderTabState extends State<CalenderTab> {
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
@@ -191,43 +192,42 @@ class _CalenderTabState extends State<CalenderTab> {
],
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Stack(children: [
Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
child: Column(children: [
Expanded(
child: DefaultTabController(
length: 2,
// initialIndex: selectedIndex.value,
child: Column(
children: [
CommonTabBar(tabs: const [
Tab(
text: 'My sessions',
),
Tab(
text: 'Community session',
),
]),
Expanded(
child: TabBarView(
children: [
MySessionsTab(),
ComSessionTab(),
],
),
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
child: Column(children: [
Expanded(
child: DefaultTabController(
length: 2,
// initialIndex: selectedIndex.value,
child: Column(
children: [
CommonTabBar(tabs: const [
Tab(
text: 'My sessions',
),
sizedBoxHeight(90.h),
],
),
Tab(
text: 'Community session',
),
]),
Expanded(
child: TabBarView(
children: [
MySessionsTab(),
ComSessionTab(),
],
),
),
sizedBoxHeight(90.h),
],
),
),
]))
])
),
]))
]),
bottomNavigationBar: bottomnavigationbar(mainController),
);

15
lib/Feed Module/Main_Screens/CalenderTab/EventDetails.dart
View File

@@ -28,6 +28,7 @@ class _EventDetailsState extends State<EventDetails> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "",
customActionWidget: Row(
@@ -64,12 +65,12 @@ class _EventDetailsState extends State<EventDetails> {
),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(
children: [
Padding(
@@ -361,7 +362,7 @@ class _EventDetailsState extends State<EventDetails> {
),
),
],
)))
))
]));
}

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

@@ -62,6 +62,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Manage members",
customActionWidget: InkWell(
@@ -88,12 +89,12 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -133,7 +134,7 @@ class _ManageMembersCalState extends State<ManageMembersCal> {
);
},
),
])))
]))
]));
}

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

@@ -47,13 +47,14 @@ class _ResourcePoolState extends State<ResourcePool> {
appBar: CommonAppbar(
titleTxt: "Resource pool",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
sizedBoxHeight(10.h),
@@ -85,7 +86,7 @@ class _ResourcePoolState extends State<ResourcePool> {
),
)
]),
))
)
]));
}

287
lib/Feed Module/Main_Screens/CalenderTab/SetAvailabillity.dart
View File

@@ -37,158 +37,159 @@ class _SetAvailabillityState extends State<SetAvailabillity> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Set availability",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(10.h),
text16400white("Select event type"),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
sizedBoxHeight(18.h),
text16400white("Select sport"),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
sizedBoxHeight(18.h),
text16400white("Select role "),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
sizedBoxHeight(18.h),
text16400white("Space selection"),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
sizedBoxHeight(18.h),
Row(
children: [
sizedBoxHeight(10.h),
text16400white("Select event type"),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
sizedBoxHeight(18.h),
text16400white("Select sport"),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
sizedBoxHeight(18.h),
text16400white("Select role "),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
sizedBoxHeight(18.h),
text16400white("Space selection"),
sizedBoxHeight(15.h),
CommonDropdownBtn(hint: "", items: []),
sizedBoxHeight(18.h),
Row(
text16w400_white("Availability"),
Spacer(),
Transform.scale(
scaleY: 1,
child: CupertinoSwitch(
value: swichvalue,
trackColor: Colors.white.withOpacity(0.4),
activeColor: Color(0xFF3192D8),
onChanged: (bool? value) {
setState(() {
swichvalue = value ?? false;
});
}))
],
),
sizedBoxHeight(30.h),
text16400white("Select days"),
sizedBoxHeight(15.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
commondayContainer(text: "M", index: 1),
commondayContainer(text: "Tu", index: 2),
commondayContainer(text: "W", index: 3),
commondayContainer(text: "Th", index: 4),
commondayContainer(text: "F", index: 5),
commondayContainer(text: "Sa", index: 6),
commondayContainer(text: "Su", index: 7),
// GlassmorphicContainer(
// width: 40.w,
// height: 40.h,
// borderRadius: 100,
// blur: 10,
// alignment: Alignment.topCenter,
// border: 0.5,
// linearGradient: LinearGradient(
// begin: Alignment.topLeft,
// end: Alignment.bottomRight,
// colors: [
// Color(0xFFD90B2E).withOpacity(0.18),
// const Color(0xFFD90B2E).withOpacity(0.4),
// ],
// stops: const [
// 0.1,
// 1,
// ],
// ),
// borderGradient: LinearGradient(
// begin: Alignment.topLeft,
// end: Alignment.bottomRight,
// colors: [
// Color(0xffD90B2E),
// Color(0xFFD90B2E),
// ],
// ),
// child: Center(child: text16w400_FCFCFC("Su")),
// ),
],
),
sizedBoxHeight(20.h),
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text16w400_white("Availability"),
Spacer(),
Transform.scale(
scaleY: 1,
child: CupertinoSwitch(
value: swichvalue,
trackColor:
Colors.white.withOpacity(0.4),
activeColor: Color(0xFF3192D8),
onChanged: (bool? value) {
setState(() {
swichvalue = value ?? false;
});
}))
],
),
sizedBoxHeight(30.h),
text16400white("Select days"),
sizedBoxHeight(15.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
commondayContainer(text: "M", index: 1),
commondayContainer(text: "Tu", index: 2),
commondayContainer(text: "W", index: 3),
commondayContainer(text: "Th", index: 4),
commondayContainer(text: "F", index: 5),
commondayContainer(text: "Sa", index: 6),
commondayContainer(text: "Su", index: 7),
// GlassmorphicContainer(
// width: 40.w,
// height: 40.h,
// borderRadius: 100,
// blur: 10,
// alignment: Alignment.topCenter,
// border: 0.5,
// linearGradient: LinearGradient(
// begin: Alignment.topLeft,
// end: Alignment.bottomRight,
// colors: [
// Color(0xFFD90B2E).withOpacity(0.18),
// const Color(0xFFD90B2E).withOpacity(0.4),
// ],
// stops: const [
// 0.1,
// 1,
// ],
// ),
// borderGradient: LinearGradient(
// begin: Alignment.topLeft,
// end: Alignment.bottomRight,
// colors: [
// Color(0xffD90B2E),
// Color(0xFFD90B2E),
// ],
// ),
// child: Center(child: text16w400_FCFCFC("Su")),
// ),
],
),
sizedBoxHeight(20.h),
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text16400white("Start time"),
sizedBoxHeight(14.h),
commonGlassContainer(
width: 174.w,
height: 50.h,
borderradius: 30.r,
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
Image.asset(
"assets/images/png/clock.png",
height: 20.h,
width: 20.w,
),
sizedBoxWidth(8.w),
text16w400_white("3:00 pm")
]),
text16400white("Start time"),
sizedBoxHeight(14.h),
commonGlassContainer(
width: 174.w,
height: 50.h,
borderradius: 30.r,
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
Image.asset(
"assets/images/png/clock.png",
height: 20.h,
width: 20.w,
),
border: 1)
],
),
Spacer(),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text16400white("End time"),
sizedBoxHeight(14.h),
commonGlassContainer(
width: 174.w,
height: 50.h,
borderradius: 30.r,
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
Image.asset(
"assets/images/png/clock.png",
height: 20.h,
width: 20.w,
),
sizedBoxWidth(8.w),
text16w400_white("5:00 pm")
]),
),
border: 1)
],
),
sizedBoxWidth(8.w),
text16w400_white("3:00 pm")
]),
),
border: 1)
],
),
sizedBoxHeight(30.h),
CommonBtn(text: "Send"),
sizedBoxHeight(30.h),
]))))
Spacer(),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text16400white("End time"),
sizedBoxHeight(14.h),
commonGlassContainer(
width: 174.w,
height: 50.h,
borderradius: 30.r,
customWidget: Center(
child: Row(children: [
sizedBoxWidth(16.w),
Image.asset(
"assets/images/png/clock.png",
height: 20.h,
width: 20.w,
),
sizedBoxWidth(8.w),
text16w400_white("5:00 pm")
]),
),
border: 1)
],
),
],
),
sizedBoxHeight(30.h),
CommonBtn(text: "Send"),
sizedBoxHeight(30.h),
])))
]));
}

117
lib/Feed Module/Main_Screens/Chats/View/chatsmainscreen.dart
View File

@@ -149,70 +149,71 @@ class _ChatsMainScreenState extends State<ChatsMainScreen> {
child: Image.asset('assets/images/png/editicon.png')),
)
],
bottom: PreferredSize(
preferredSize: Size.fromHeight(90),
child: Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: CustomTextFormField(
textEditingController: searchcontroller,
texttype: TextInputType.text,
hintText: "Search chats",
leadingIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
Icons.search,
size: 35,
color: Colors.white,
),
),
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
],
),
),
],
),
),
// bottom: PreferredSize(
// preferredSize: Size.fromHeight(90),
// child:
// ),
),
body: Stack(
children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Stack(
children: [
SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 0,
),
child: Column(children: [
DefaultTabController(
length: 3,
// initialIndex: selectedIndex.value,
child: Column(
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: MyTabBar(),
),
SizedBox(
height: 600.h,
child: TabBarView(
children: [feedTab(), clubsTab(), teamsTab()],
),
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 0,
),
child: Column(children: [
Column(
children: [
sizedBoxHeight(25.h),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: CustomTextFormField(
textEditingController: searchcontroller,
texttype: TextInputType.text,
hintText: "Search chats",
leadingIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
Icons.search,
size: 35,
color: Colors.white,
),
),
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
],
),
),
])),
)
],
sizedBoxHeight(25.h)
],
),
DefaultTabController(
length: 3,
// initialIndex: selectedIndex.value,
child: Column(
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: MyTabBar(),
),
SizedBox(
height: 600.h,
child: TabBarView(
children: [feedTab(), clubsTab(), teamsTab()],
),
),
],
),
),
])),
)
],
),
@@ -225,6 +226,7 @@ class _ChatsMainScreenState extends State<ChatsMainScreen> {
return SingleChildScrollView(
child: Column(
children: [
sizedBoxHeight(30.h),
ListView.separated(
separatorBuilder: (context, index) {
return Divider(
@@ -804,7 +806,6 @@ class _SecondChatListState extends State<SecondChatList> {
// String message;
// bool isMessageRead;
// SecondChatList({
// Key? key,
// required this.name,

21
lib/Feed Module/Main_Screens/Chats/View/groupchat.dart
View File

@@ -293,7 +293,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
image: DecorationImage(
image:
AssetImage("assets/images/png/groupchat.png"),
fit: BoxFit.fill)),
fit: BoxFit.cover)),
),
SizedBox(
width: 12.w,
@@ -348,16 +348,19 @@ class _GroupChatPageState extends State<GroupChatPage> {
),
body: Stack(
children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
GlassmorphicContainer(
width: MediaQuery.of(context).size.width,
height:
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(
@@ -563,7 +566,7 @@ class _GroupChatPageState extends State<GroupChatPage> {
width: double.infinity,
height: 48.h,
borderRadius: 30.r,
blur: 10,
blur: 6,
alignment: Alignment.bottomCenter,
border: 0.8,
linearGradient: LinearGradient(
@@ -677,10 +680,8 @@ class _GroupChatPageState extends State<GroupChatPage> {
),
minLines: 1,
maxLines: 1,
onChanged: (text) {
setState(() {
});
onChanged: (text) {
setState(() {});
},
),
),

245
lib/Feed Module/Main_Screens/Chats/View/newchatpage.dart
View File

@@ -71,154 +71,123 @@ class _NewChatPageState extends State<NewChatPage> {
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
child: Scaffold(
// backgroundColor: Color(0xFF222935),
backgroundColor: Color.fromARGB(255, 18, 32, 47),
appBar: CommonAppbar(titleTxt: 'New chat'),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
GlassmorphicContainer(
width: MediaQuery.of(context).size.width,
height:
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
],
),
borderGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
],
),
child: ListView(children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: CustomTextFormField(
textEditingController: searchcontroller,
texttype: TextInputType.text,
hintText: "Search people",
leadingIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
Icons.search,
size: 35,
color: Colors.white,
),
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
ListView(children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: CustomTextFormField(
textEditingController: searchcontroller,
texttype: TextInputType.text,
hintText: "Search people",
leadingIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
Icons.search,
size: 35,
color: Colors.white,
),
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
),
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
],
),
),
sizedBoxHeight(30.h),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.newgrouppage);
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 50,
height: 50,
decoration: ShapeDecoration(
image: DecorationImage(
image: AssetImage(
'assets/images/png/chatgroup.png'),
),
gradient: LinearGradient(
begin: Alignment(0.71, -0.70),
end: Alignment(-0.71, 0.7),
colors: [
Colors.white
.withOpacity(0.30000001192092896),
Colors.white
.withOpacity(0.30000001192092896)
],
),
shape: OvalBorder(
side: BorderSide(
width: 0.50, color: Color(0xFF434A53)),
),
),
),
sizedBoxWidth(10.w),
text18w400white('New group')
],
),
Image.asset('assets/images/png/arrow-left (2).png')
],
),
),
sizedBoxHeight(30.h),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.newgrouppage);
},
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 50,
height: 50,
decoration: ShapeDecoration(
image: DecorationImage(
image: AssetImage(
'assets/images/png/chatgroup.png'),
),
gradient: LinearGradient(
begin: Alignment(0.71, -0.70),
end: Alignment(-0.71, 0.7),
colors: [
Colors.white.withOpacity(0.30000001192092896),
Colors.white.withOpacity(0.30000001192092896)
],
),
shape: OvalBorder(
side: BorderSide(
width: 0.50, color: Color(0xFF434A53)),
),
),
),
sizedBoxWidth(10.w),
text18w400white('New group')
],
),
Image.asset('assets/images/png/arrow-left (2).png')
],
),
sizedBoxHeight(30.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: text18w700_FCFCFC('Contacts'),
),
sizedBoxHeight(20.h),
ListView.separated(
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: chatcontents.length,
shrinkWrap: true,
padding: const EdgeInsets.only(top: 10.0),
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
return GestureDetector(
onTap: () {},
child: SecondChatList(
name: chatcontents[index]['tittle'],
imageurl: chatcontents[index]['image'],
message: chatcontents[index]['subtittle'],
),
),
),
sizedBoxHeight(30.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: text18w700_FCFCFC('Contacts'),
),
sizedBoxHeight(20.h),
ListView.separated(
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: chatcontents.length,
shrinkWrap: true,
padding: const EdgeInsets.only(top: 10.0),
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
return GestureDetector(
onTap: () {},
child: SecondChatList(
name: chatcontents[index]['tittle'],
imageurl: chatcontents[index]['image'],
message: chatcontents[index]['subtittle'],
),
);
},
),
sizedBoxHeight(20.h),
],
),
]),
),
);
},
),
sizedBoxHeight(20.h),
],
),
]),
]),
),
);

318
lib/Feed Module/Main_Screens/Chats/View/newgroup.dart
View File

@@ -84,189 +84,161 @@ class _NewGroupPageState extends State<NewGroupPage> {
appBar: CommonAppbar(titleTxt: 'New group'),
body: Stack(
children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
GlassmorphicContainer(
width: MediaQuery.of(context).size.width,
height:
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
],
),
borderGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
],
),
child: ListView(children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.h),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap: () {
ImageUploadBottomSheet().showModal(
context,
false,
(result) {
var file = File(result);
filePath.add(file);
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
ListView(children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.h),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap: () {
ImageUploadBottomSheet().showModal(
context,
false,
(result) {
var file = File(result);
filePath.add(file);
setState(() {});
},
);
},
child: Container(
width: 50,
height: 50,
decoration: ShapeDecoration(
// image: DecorationImage(
// image: AssetImage('assets/images/png/camera1.png'),
// ),
gradient: LinearGradient(
begin: Alignment(0.71, -0.70),
end: Alignment(-0.71, 0.7),
colors: [
Colors.white
.withOpacity(0.30000001192092896),
Colors.white
.withOpacity(0.30000001192092896)
],
),
shape: OvalBorder(
side: BorderSide(
width: 0.50, color: Color(0xFF434A53)),
),
),
child:
// Obx(
// () =>
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
// addgroupImage.profilePicPath.value != ''
filePath.isNotEmpty
? ClipOval(
child: SizedBox.fromSize(
size: Size.fromRadius(24.r),
child: Image.file(
filePath[0]!,
fit: BoxFit.cover,
width: double.infinity,
),
),
)
: Image.asset(
'assets/images/png/camera1.png')
setState(() {});
},
);
},
child: Container(
width: 50,
height: 50,
decoration: ShapeDecoration(
// image: DecorationImage(
// image: AssetImage('assets/images/png/camera1.png'),
// ),
gradient: LinearGradient(
begin: Alignment(0.71, -0.70),
end: Alignment(-0.71, 0.7),
colors: [
Colors.white.withOpacity(0.30000001192092896),
Colors.white.withOpacity(0.30000001192092896)
],
),
// ),
shape: OvalBorder(
side: BorderSide(
width: 0.50, color: Color(0xFF434A53)),
),
),
),
sizedBoxWidth(10.w),
Expanded(
child: CustomTextFormField(
textEditingController: groupnamecontroller,
texttype: TextInputType.text,
hintText: "Group name",
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
child:
// Obx(
// () =>
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
// addgroupImage.profilePicPath.value != ''
filePath.isNotEmpty
? ClipOval(
child: SizedBox.fromSize(
size: Size.fromRadius(24.r),
child: Image.file(
filePath[0]!,
fit: BoxFit.cover,
width: double.infinity,
),
),
)
: Image.asset(
'assets/images/png/camera1.png')
],
),
),
],
),
),
sizedBoxHeight(20.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child:
text18w700_FCFCFC('Select contacts to add to group'),
),
sizedBoxHeight(20.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: CustomTextFormField(
textEditingController: searchcontroller,
texttype: TextInputType.text,
hintText: "Search people",
leadingIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
Icons.search,
size: 35,
color: Colors.white,
// ),
),
),
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
],
),
),
sizedBoxHeight(20.h),
ListView.separated(
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: chatcontents.length,
shrinkWrap: true,
padding: const EdgeInsets.only(top: 10.0),
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
return GestureDetector(
onTap: () {},
child: GroupsList(
name: chatcontents[index]['tittle'],
imageurl: chatcontents[index]['image'],
message: chatcontents[index]['subtittle'],
sizedBoxWidth(10.w),
Expanded(
child: CustomTextFormField(
textEditingController: groupnamecontroller,
texttype: TextInputType.text,
hintText: "Group name",
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
],
),
);
},
),
],
),
sizedBoxHeight(20.h),
CustomButton(
text: 'Create group',
onPressed: () {
// Get.toNamed(RouteName.mainscreen);
Get.offUntil(
MaterialPageRoute(
builder: (context) => MainScreen()),
(Route<dynamic> route) => false);
}),
sizedBoxHeight(20.h)
],
),
]),
),
),
sizedBoxHeight(20.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: text18w700_FCFCFC('Select contacts to add to group'),
),
sizedBoxHeight(20.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: CustomTextFormField(
textEditingController: searchcontroller,
texttype: TextInputType.text,
hintText: "Search people",
leadingIcon: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Icon(
Icons.search,
size: 35,
color: Colors.white,
),
),
// validatorText: "Enter your full name",
inputFormatters: [
// LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter(),
],
),
),
sizedBoxHeight(20.h),
ListView.separated(
separatorBuilder: (context, index) {
return Divider(
thickness: 0.6.h,
color: Color(0xffFFFFFF).withOpacity(0.72),
);
},
itemCount: chatcontents.length,
shrinkWrap: true,
padding: const EdgeInsets.only(top: 10.0),
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
return GestureDetector(
onTap: () {},
child: GroupsList(
name: chatcontents[index]['tittle'],
imageurl: chatcontents[index]['image'],
message: chatcontents[index]['subtittle'],
),
);
},
),
sizedBoxHeight(20.h),
CustomButton(
text: 'Create group',
onPressed: () {
// Get.toNamed(RouteName.mainscreen);
Get.offUntil(
MaterialPageRoute(
builder: (context) => MainScreen()),
(Route<dynamic> route) => false);
}),
sizedBoxHeight(20.h)
],
),
]),
],
),
),

538
lib/Feed Module/Main_Screens/Chats/View/userchat.dart
View File

@@ -225,7 +225,7 @@ class _UserChatPageState extends State<UserChatPage> {
}
}
void _sendMessage() {
void _sendMessage() {
if (messageController.text.isNotEmpty) {
setState(() {
messages.add(ChatMessage(
@@ -270,6 +270,8 @@ class _UserChatPageState extends State<UserChatPage> {
border: 0.9,
width: 40.w,
height: 40.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
customWidget: Center(
child: Image.asset(
@@ -342,321 +344,265 @@ class _UserChatPageState extends State<UserChatPage> {
),
body: Stack(
children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
GlassmorphicContainer(
width: MediaQuery.of(context).size.width,
height:
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
],
),
borderGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
],
),
child: Stack(
children: [
ListView.builder(
controller: myController,
itemCount: messages.length,
padding: const EdgeInsets.only(top: 10.0, bottom: 70.0),
physics: const BouncingScrollPhysics(),
itemBuilder: (context, index) {
return messages[index].messageType == "receiver"
? Padding(
padding: const EdgeInsets.only(
left: 16.0,
top: 5.0,
bottom: 5.0,
right: 90.0),
child: Align(
alignment: Alignment.topLeft,
child: Row(
mainAxisSize: MainAxisSize.min,
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
ListView.builder(
controller: myController,
itemCount: messages.length,
padding: const EdgeInsets.only(top: 10.0, bottom: 70.0),
physics: const BouncingScrollPhysics(),
itemBuilder: (context, index) {
return messages[index].messageType == "receiver"
? Padding(
padding: const EdgeInsets.only(
left: 16.0, top: 5.0, bottom: 5.0, right: 90.0),
child: Align(
alignment: Alignment.topLeft,
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Flexible(
child: Container(
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(1.00, -0.03),
end: Alignment(-1, 0.03),
colors: [
Colors.white
.withOpacity(0.05999999865889549),
Colors.white
.withOpacity(0.07999999821186066)
],
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
bottomRight: Radius.circular(20),
),
),
),
padding: const EdgeInsets.all(10.0),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.end,
children: [
Flexible(
child: Container(
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(1.00, -0.03),
end: Alignment(-1, 0.03),
colors: [
Colors.white.withOpacity(
0.05999999865889549),
Colors.white.withOpacity(
0.07999999821186066)
],
),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.only(
topLeft:
Radius.circular(20),
topRight:
Radius.circular(20),
bottomRight:
Radius.circular(20),
),
),
),
padding:
const EdgeInsets.all(10.0),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
messages[index].messageContent,
style: TextStyle(
fontSize: 16.sp,
color: Colors.white,
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica',
),
),
sizedBoxHeight(2.h),
messages[index].isread == true
? Image.asset(
'assets/images/png/messagereadcheckmark.png')
: Image.asset(
'assets/images/png/messagedelivered.png'),
],
),
Text(
messages[index].messageContent,
style: TextStyle(
fontSize: 16.sp,
color: Colors.white,
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica',
),
)
),
sizedBoxHeight(2.h),
messages[index].isread == true
? Image.asset(
'assets/images/png/messagereadcheckmark.png')
: Image.asset(
'assets/images/png/messagedelivered.png'),
],
),
),
)
: Padding(
padding: const EdgeInsets.only(
right: 16.0,
top: 5.0,
bottom: 5.0,
left: 90.0),
child: Align(
alignment: Alignment.topRight,
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.end,
],
),
),
)
: Padding(
padding: const EdgeInsets.only(
right: 16.0, top: 5.0, bottom: 5.0, left: 90.0),
child: Align(
alignment: Alignment.topRight,
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
children: [
Flexible(
child: Container(
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(1.00, 0.05),
end: Alignment(-1, -0.05),
colors: [
Color(0xFFD90B2E),
Color(0x38D90B2E)
],
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
bottomLeft: Radius.circular(20),
)),
),
padding: const EdgeInsets.all(10.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Flexible(
child: Container(
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(1.00, 0.05),
end: Alignment(-1, -0.05),
colors: [
Color(0xFFD90B2E),
Color(0x38D90B2E)
],
),
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
bottomLeft:
Radius.circular(20),
)),
),
padding:
const EdgeInsets.all(10.0),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.end,
children: [
Text(
messages[index].messageContent,
style: TextStyle(
fontSize: 16.sp,
color: Colors.white,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,
),
),
sizedBoxHeight(2.h),
messages[index].isread == true
? Image.asset(
'assets/images/png/messagereadcheckmark.png')
: Image.asset(
'assets/images/png/messagedelivered.png'),
],
),
Text(
messages[index].messageContent,
style: TextStyle(
fontSize: 16.sp,
color: Colors.white,
fontFamily: 'Helvetica',
fontWeight: FontWeight.w400,
),
),
sizedBoxHeight(2.h),
messages[index].isread == true
? Image.asset(
'assets/images/png/messagereadcheckmark.png')
: Image.asset(
'assets/images/png/messagedelivered.png'),
],
),
),
);
},
),
Align(
alignment: Alignment.bottomCenter,
child: Padding(
padding: EdgeInsets.only(top: 15, bottom: 15),
child: Row(
children: <Widget>[
sizedBoxWidth(16.w),
Expanded(
child: GlassmorphicContainer(
width: double.infinity,
height: 48.h,
borderRadius: 30.r,
blur: 10,
alignment: Alignment.bottomCenter,
border: 0.8,
linearGradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xFFffffff).withOpacity(0.50),
const Color(0xFFFFFFFF).withOpacity(0.50),
],
stops: [
0.1,
1,
]),
borderGradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Color(0xff434A53),
Color(0xFF434A53),
],
),
child: TextFormField(
controller: messageController,
inputFormatters: [
RemoveEmojiInputFormatter(),
],
style: TextStyle(
fontSize: 16.sp,
color: Colors.white,
),
autovalidateMode:
AutovalidateMode.onUserInteraction,
decoration: InputDecoration(
contentPadding: const EdgeInsets.all(10.0),
filled: true,
fillColor: Color(0XFF434A53),
border: InputBorder.none,
hintStyle: TextStyle(
fontSize: 14.sp,
color:
Color(0XFFFCFCFC).withOpacity(0.80),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
hintText: "Type your message",
suffixIcon: messageController
.text.isNotEmpty ||
isImageAdded == true
? GestureDetector(
// onTap: () => _chatItemsAdd(),
onTap: _sendMessage,
// () {
// setState(() {
// // UploadData();
// messageController.clear();
// });
// },
// => UploadData(),
child: Padding(
padding: EdgeInsets.only(
right: 8.w,
top: 2.h,
bottom: 2.h),
child: Container(
width: 45.w,
height: 30.h,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
borderRadius:
BorderRadius.circular(
30.r)),
child: Center(
child: Icon(
Icons.send_outlined,
color: Colors.white,
)
// Text(
// 'Send',
// style: TextStyle(
// color: Colors.white,
// fontSize: 16.sp),
// )
)),
),
)
: IconButton(
onPressed: () {
ImageUploadBottomSheet()
.showModal(
context,
true,
(result) {
attachimage = result;
var filenameresult =
extractFileName(result);
messageController.text =
filenameresult;
setState(() {
isImageAdded = true;
});
},
);
},
icon: Icon(
Icons.attach_file,
color: Colors.white,
size: 23.h,
),
),
),
minLines: 1,
maxLines: 1,
onChanged: (text) {
setState(() {
});
},
),
),
),
sizedBoxWidth(12.w),
],
),
),
);
},
),
Align(
alignment: Alignment.bottomCenter,
child: Padding(
padding: EdgeInsets.only(top: 15, bottom: 15),
child: Row(
children: <Widget>[
sizedBoxWidth(16.w),
Expanded(
child: GlassmorphicContainer(
width: double.infinity,
height: 48.h,
borderRadius: 30.r,
blur: 6,
alignment: Alignment.bottomCenter,
border: 0.8,
linearGradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xFFffffff).withOpacity(0.50),
const Color(0xFFFFFFFF).withOpacity(0.50),
],
stops: [
0.1,
1,
]),
borderGradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Color(0xff434A53),
Color(0xFF434A53),
],
),
child: TextFormField(
controller: messageController,
inputFormatters: [
RemoveEmojiInputFormatter(),
],
style: TextStyle(
fontSize: 16.sp,
color: Colors.white,
),
autovalidateMode: AutovalidateMode.onUserInteraction,
decoration: InputDecoration(
contentPadding: const EdgeInsets.all(10.0),
filled: true,
fillColor: Color(0XFF434A53),
border: InputBorder.none,
hintStyle: TextStyle(
fontSize: 14.sp,
color: Color(0XFFFCFCFC).withOpacity(0.80),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
hintText: "Type your message",
suffixIcon: messageController.text.isNotEmpty ||
isImageAdded == true
? GestureDetector(
// onTap: () => _chatItemsAdd(),
onTap: _sendMessage,
// () {
// setState(() {
// // UploadData();
// messageController.clear();
// });
// },
// => UploadData(),
child: Padding(
padding: EdgeInsets.only(
right: 8.w, top: 2.h, bottom: 2.h),
child: Container(
width: 45.w,
height: 30.h,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
borderRadius:
BorderRadius.circular(30.r)),
child: Center(
child: Icon(
Icons.send_outlined,
color: Colors.white,
)
// Text(
// 'Send',
// style: TextStyle(
// color: Colors.white,
// fontSize: 16.sp),
// )
)),
),
)
: IconButton(
onPressed: () {
ImageUploadBottomSheet().showModal(
context,
true,
(result) {
attachimage = result;
var filenameresult =
extractFileName(result);
messageController.text =
filenameresult;
setState(() {
isImageAdded = true;
});
},
);
},
icon: Icon(
Icons.attach_file,
color: Colors.white,
size: 23.h,
),
),
),
minLines: 1,
maxLines: 1,
onChanged: (text) {
setState(() {});
},
),
),
),
sizedBoxWidth(12.w),
],
)),
),
),
),
],
),
),

159
lib/Feed Module/Main_Screens/Community/Community.dart
View File

@@ -34,13 +34,13 @@ class _CommunityScreenState extends State<CommunityScreen> {
Widget build(BuildContext context) {
return Scaffold(
key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
backgroundColor: const Color(0xFF222935),
// drawerEnableOpenDragGesture: false,
drawer: SizedBox(width: 300.w, child: SideMenu()),
drawer: SizedBox(width: 300.w, child: const SideMenu()),
extendBody: true,
appBar: AppBar(
scrolledUnderElevation: 0.0,
backgroundColor: Color(0xff222935),
backgroundColor: const Color(0xff222935),
elevation: 0,
automaticallyImplyLeading: false,
titleSpacing: 0,
@@ -86,53 +86,52 @@ class _CommunityScreenState extends State<CommunityScreen> {
sizedBoxWidth(16.w),
],
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Stack(children: [
Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
child: Column(children: [
Expanded(
child: DefaultTabController(
length: 3,
// initialIndex: selectedIndex.value,
child: Column(
children: [
CommonTabBar(tabs: const [
Tab(
text: 'Feed',
),
Tab(
text: 'Popular',
),
Tab(
text: 'Latest',
),
]),
Expanded(
child: TabBarView(
children: [
feedTab(),
popularTab(),
latestTab(),
],
),
body:
// const CommonBlurLeftRed(),
// const CommonBlurRightRed(),
// const CommonBlurLeft(),
// const CommonBlurRight(),
Stack(children: [
Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
child: Column(children: [
Expanded(
child: DefaultTabController(
length: 3,
// initialIndex: selectedIndex.value,
child: Column(
children: [
CommonTabBar(tabs: const [
Tab(
text: 'Feed',
),
sizedBoxHeight(90.h)
],
),
Tab(
text: 'Popular',
),
Tab(
text: 'Latest',
),
]),
Expanded(
child: TabBarView(
children: [
feedTab(),
popularTab(),
latestTab(),
],
),
),
sizedBoxHeight(90.h)
],
),
),
]))
])
),
]))
]),
floatingActionButton: Container(
height: 55.h,
width: 55.w,
decoration: BoxDecoration(
decoration: const BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
@@ -146,9 +145,9 @@ class _CommunityScreenState extends State<CommunityScreen> {
onPressed: () {
Get.toNamed(RouteName.postscreen);
},
backgroundColor: Color(0xFFD90B2E),
backgroundColor: const Color(0xFFD90B2E),
autofocus: true,
shape: CircleBorder(),
shape: const CircleBorder(),
child: Image.asset(
"assets/images/png/iconamoon_edit-thin.png",
height: 30.h,
@@ -251,7 +250,7 @@ Widget announcecardtile({
sizedBoxWidth(7.w),
Icon(
Icons.circle,
color: Color(0xFFFCFCFC),
color: const Color(0xFFFCFCFC),
size: 4.sp,
),
sizedBoxWidth(6.w),
@@ -260,12 +259,12 @@ Widget announcecardtile({
)
],
),
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(
@@ -283,7 +282,7 @@ Widget announcecardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Vector (5).png",
height: 15.h,
@@ -293,7 +292,7 @@ Widget announcecardtile({
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -309,7 +308,7 @@ Widget announcecardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/share.png",
height: 20.h,
@@ -319,7 +318,7 @@ Widget announcecardtile({
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -335,7 +334,7 @@ Widget announcecardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
@@ -405,7 +404,7 @@ Widget announcecardtile({
'assets/images/png/party-popper 2.png'
]),
),
Spacer(),
const Spacer(),
commonGlassContainer(
border: 0.43,
width: 30.w,
@@ -490,11 +489,13 @@ Widget announcecardtile({
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),
@@ -592,7 +593,7 @@ Widget normalcardtile({
sizedBoxWidth(7.w),
Icon(
Icons.circle,
color: Color(0xFFFCFCFC),
color: const Color(0xFFFCFCFC),
size: 4.sp,
),
sizedBoxWidth(6.w),
@@ -601,12 +602,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(
@@ -624,7 +625,7 @@ Widget normalcardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/Vector (5).png",
height: 15.h,
@@ -634,7 +635,7 @@ Widget normalcardtile({
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -650,7 +651,7 @@ Widget normalcardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/share.png",
height: 20.h,
@@ -660,7 +661,7 @@ Widget normalcardtile({
),
),
),
PopupMenuDivider(),
const PopupMenuDivider(),
PopupMenuItem(
onTap: () {},
child: Padding(
@@ -676,7 +677,7 @@ Widget normalcardtile({
fontFamily: "Nunito Sans",
),
),
Spacer(),
const Spacer(),
Image.asset(
"assets/images/png/f7_pin-fill (2).png",
height: 25.h,
@@ -747,7 +748,7 @@ Widget normalcardtile({
'assets/images/png/party-popper 2.png'
]),
),
Spacer(),
const Spacer(),
commonGlassContainer(
border: 0.43,
width: 30.w,
@@ -833,11 +834,13 @@ 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,
direction: ReactionsBoxAlignment.rtl,
@@ -915,7 +918,7 @@ Widget containertile({required String text}) {
width: 130.w,
height: 30.h,
borderradius: 30.r,
borderColor: Color(0xFFD90B2E),
borderColor: const Color(0xFFD90B2E),
customWidget: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.w),
child: Center(child: text14w400_FCFCFC(text)),

15
lib/Feed Module/Main_Screens/Community/CycleScreen.dart
View File

@@ -25,6 +25,7 @@ class _CycleScreenState extends State<CycleScreen> {
return Scaffold(
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Cycle",
customActionWidget: Image.asset(
@@ -33,12 +34,12 @@ class _CycleScreenState extends State<CycleScreen> {
width: 26.w,
)),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned(
child: Column(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Column(children: [
sizedBoxHeight(10.h),
DefaultTabController(
length: 2,
@@ -64,7 +65,7 @@ class _CycleScreenState extends State<CycleScreen> {
),
],
))
]))
])
]));
}
}

21
lib/Feed Module/Main_Screens/Community/PostDetailScreen/View/PostDetailScreen.dart
View File

@@ -22,21 +22,22 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Post",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
postCards(
profileImg: 'assets/images/png/Ellipse 52.png',
title: 'Ryan Dorwat',
@@ -95,7 +96,7 @@ class _PostDetailsScreenState extends State<PostDetailsScreen> {
),
),
sizedBoxHeight(85.h)
])))
]))
]));
}

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

@@ -72,13 +72,14 @@ class _ReactionViewState extends State<ReactionView> {
appBar: CommonAppbar(
titleTxt: "Post",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(10.h),
@@ -168,7 +169,7 @@ class _ReactionViewState extends State<ReactionView> {
sizedBoxHeight(20.h)
])),
)
]))
])
]));
}

18
lib/Feed Module/Main_Screens/Community/PostScreen.dart
View File

@@ -44,16 +44,18 @@ class _PostScreenState extends State<PostScreen> {
return Scaffold(
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Create a post",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(
@@ -221,7 +223,7 @@ class _PostScreenState extends State<PostScreen> {
CustomDropDownRadio(
header: "",
title: "",
listData: ['Individual', 'Anonymous'],
listData: ['Individual'],
onItemSelected: (p0) {},
leadingImage: SizedBox()),
// CommonDropdownradioBtn(
@@ -273,7 +275,7 @@ class _PostScreenState extends State<PostScreen> {
sizedBoxHeight(150.h),
]),
),
))
),
]));
}

15
lib/Feed Module/Main_Screens/ExploreDesign/DetailExplore.dart
View File

@@ -22,14 +22,15 @@ class _DetailExploreState extends State<DetailExplore> {
return Scaffold(
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
body: SafeArea(
child: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Column(children: [
sizedBoxHeight(20.h),
commonDivider(),
sizedBoxHeight(20.h),
@@ -105,7 +106,7 @@ class _DetailExploreState extends State<DetailExplore> {
),
])),
)
]))
])
])));
}

15
lib/Feed Module/Main_Screens/ExploreDesign/ExploreScreen.dart
View File

@@ -58,13 +58,14 @@ class _ExploreScreenState extends State<ExploreScreen> {
// appBar: CommonAppbar(
// titleTxt: "",
// ),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Stack(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Stack(children: [
GoogleMap(
mapType: MapType.normal,
mapToolbarEnabled: true,
@@ -131,7 +132,7 @@ class _ExploreScreenState extends State<ExploreScreen> {
),
),
))
]))
])
]));
}

15
lib/Feed Module/Main_Screens/GroupTab/View/ConnectCommunity.dart
View File

@@ -36,16 +36,17 @@ class _ConnectCommunityState extends State<ConnectCommunity> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Connect with communities",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
@@ -65,7 +66,7 @@ class _ConnectCommunityState extends State<ConnectCommunity> {
),
)
]),
))
)
]));
}

15
lib/Feed Module/Main_Screens/GroupTab/View/GoupSettings.dart
View File

@@ -37,16 +37,17 @@ class _GroupSettingsState extends State<GroupSettings> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Group settings",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(30.h),
@@ -91,7 +92,7 @@ class _GroupSettingsState extends State<GroupSettings> {
),
),
),
]))
])
]));
}

14
lib/Feed Module/Main_Screens/GroupTab/View/GroupDetail.dart
View File

@@ -256,12 +256,12 @@ class _GroupDetailState extends State<GroupDetail> {
]),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
sizedBoxHeight(20.h),
@@ -551,7 +551,7 @@ class _GroupDetailState extends State<GroupDetail> {
),
),
]),
))
)
]));
}

15
lib/Feed Module/Main_Screens/GroupTab/View/GroupEvent.dart
View File

@@ -48,18 +48,19 @@ class _GroupEventState extends State<GroupEvent> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
@@ -522,7 +523,7 @@ class _GroupEventState extends State<GroupEvent> {
sizedBoxHeight(70.h),
]),
),
))
)
]));
}

15
lib/Feed Module/Main_Screens/GroupTab/View/GroupInfo.dart
View File

@@ -27,13 +27,14 @@ class _GroupInfoState extends State<GroupInfo> {
appBar: CommonAppbar(
titleTxt: "Groups info",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
@@ -139,7 +140,7 @@ class _GroupInfoState extends State<GroupInfo> {
],
),
),
]))
])
]));
}
}

17
lib/Feed Module/Main_Screens/GroupTab/View/GroupManage.dart
View File

@@ -36,6 +36,7 @@ class _GroupManageState extends State<GroupManage> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Manage members",
customActionWidget: Container(
@@ -57,12 +58,12 @@ class _GroupManageState extends State<GroupManage> {
),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
@@ -97,7 +98,7 @@ class _GroupManageState extends State<GroupManage> {
),
],
))
]))
])
]));
}
@@ -351,7 +352,7 @@ class _GroupManageState extends State<GroupManage> {
Color(0xFFD90B2E),
],
),
blur: 10,
blur: 6,
child: Center(child: text16w400_FCFCFC("Su")),
),
sizedBoxWidth(8.w),

18
lib/Feed Module/Main_Screens/GroupTab/View/GroupTab.dart
View File

@@ -40,6 +40,7 @@ class _GroupTabState extends State<GroupTab> {
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
@@ -98,12 +99,13 @@ class _GroupTabState extends State<GroupTab> {
],
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(children: [
sizedBoxHeight(25.h),
@@ -150,7 +152,7 @@ class _GroupTabState extends State<GroupTab> {
),
)
]),
)),
),
]),
bottomNavigationBar: bottomnavigationbar(mainController),
);
@@ -330,6 +332,4 @@ class _GroupTabState extends State<GroupTab> {
),
);
}
}

15
lib/Feed Module/Main_Screens/GroupTab/View/NewPost.dart
View File

@@ -40,16 +40,17 @@ class _NewPostState extends State<NewPost> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "New post",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(
@@ -240,7 +241,7 @@ class _NewPostState extends State<NewPost> {
sizedBoxHeight(60.h),
]),
),
))
)
]));
}

42
lib/Feed Module/Main_Screens/GroupTab/View/RequestedGroups.dart
View File

@@ -43,28 +43,26 @@ class _RequestedGroupsState extends State<RequestedGroups> {
titleTxt: "Requested groups",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
ListView.builder(
shrinkWrap: true,
physics: BouncingScrollPhysics(),
itemCount: groupData.length,
itemBuilder: (context, index) {
return groupCard(
ontap: () {},
imagepath: groupData[index]['imagePath'],
title: groupData[index]['text'],
members: groupData[index]['members']);
},
)
]))
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
sizedBoxHeight(20.h),
ListView.builder(
shrinkWrap: true,
physics: BouncingScrollPhysics(),
itemCount: groupData.length,
itemBuilder: (context, index) {
return groupCard(
ontap: () {},
imagepath: groupData[index]['imagePath'],
title: groupData[index]['text'],
members: groupData[index]['members']);
},
)
])
]));
}

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

@@ -30,16 +30,16 @@ class _EditSubgroupInfoState extends State<EditSubgroupInfo> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Edit subgroup info",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
), Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(
@@ -206,7 +206,7 @@ class _EditSubgroupInfoState extends State<EditSubgroupInfo> {
sizedBoxHeight(40.h),
],
),
)))
))
]));
}
}

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

@@ -44,6 +44,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "",
customActionWidget: Row(children: [
@@ -241,12 +242,12 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
]),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
sizedBoxHeight(20.h),
@@ -360,7 +361,7 @@ class _SubGroupInfoState extends State<SubGroupInfo> {
),
),
]),
))
)
]));
}

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

@@ -37,13 +37,14 @@ class _SubGroupSettingState extends State<SubGroupSetting> {
appBar: CommonAppbar(
titleTxt: "Subgroup settings",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(30.h),
@@ -88,7 +89,7 @@ class _SubGroupSettingState extends State<SubGroupSetting> {
),
),
),
]))
])
]));
}

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

@@ -41,6 +41,7 @@ class _SubGroupsState extends State<SubGroups> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Subgroups",
customActionWidget: InkWell(
@@ -67,12 +68,12 @@ class _SubGroupsState extends State<SubGroups> {
),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -94,7 +95,7 @@ class _SubGroupsState extends State<SubGroups> {
},
),
)
])))
]))
]));
}

85
lib/Feed Module/Main_Screens/ProfileTab/Badges/Badges.dart
View File

@@ -46,53 +46,54 @@ class _BadgesState extends State<Badges> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Badges",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
sizedBoxHeight(25.h),
Container(
height: 600.h,
child: GridView.builder(
scrollDirection: Axis.vertical,
gridDelegate:
const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
mainAxisSpacing: 35,
crossAxisSpacing: 8,
childAspectRatio: 0.65,
),
itemCount: BadgesData.length,
itemBuilder: (context, index) {
return Column(
children: [
Image.asset(
BadgesData[index]["imagePath"],
height: 100.h,
width: 105.w,
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
sizedBoxHeight(25.h),
Container(
height: 600.h,
child: GridView.builder(
scrollDirection: Axis.vertical,
gridDelegate:
const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
mainAxisSpacing: 35,
crossAxisSpacing: 8,
childAspectRatio: 0.65,
),
itemCount: BadgesData.length,
itemBuilder: (context, index) {
return Column(
children: [
Image.asset(
BadgesData[index]["imagePath"],
height: 100.h,
width: 105.w,
),
Expanded(
child: Center(
child: text14w400_FCFCFC(
BadgesData[index]["text"],
textAlign: TextAlign.center,
),
Expanded(
child: Center(
child: text14w400_FCFCFC(
BadgesData[index]["text"],
textAlign: TextAlign.center,
),
),
),
],
);
}),
)
]))))
),
),
],
);
}),
)
]))),
]));
}
}

15
lib/Feed Module/Main_Screens/ProfileTab/Certificate/Certificate.dart
View File

@@ -51,13 +51,14 @@ class _CertificateState extends State<Certificate> {
appBar: CommonAppbar(
titleTxt: "Certifications/Qualifications",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
@@ -94,7 +95,7 @@ class _CertificateState extends State<Certificate> {
);
}),
)
]))))
])))
]));
}
}

15
lib/Feed Module/Main_Screens/ProfileTab/Clubs/Clubs.dart
View File

@@ -42,13 +42,14 @@ class _ClubsState extends State<Clubs> {
appBar: CommonAppbar(
titleTxt: "Clubs",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
@@ -65,7 +66,7 @@ class _ClubsState extends State<Clubs> {
},
)
]),
)))
))
]));
}

428
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/EditProfile.dart
View File

@@ -36,241 +36,241 @@ class _EditProfileState extends State<EditProfile> {
titleTxt: "",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
sizedBoxHeight(25.h),
Stack(
children: [
filePath.isNotEmpty
? ClipOval(
child: SizedBox.fromSize(
size: Size.fromRadius(50.r),
child: Image.file(
filePath[0]!,
fit: BoxFit.cover,
width: double.infinity,
),
),
)
: CircleAvatar(
backgroundImage: AssetImage(
"assets/images/png/cimg3.png",
),
radius: 50.r,
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
sizedBoxHeight(25.h),
Stack(
children: [
filePath.isNotEmpty
? ClipOval(
child: SizedBox.fromSize(
size: Size.fromRadius(50.r),
child: Image.file(
filePath[0]!,
fit: BoxFit.cover,
width: double.infinity,
),
Positioned(
bottom: 0,
right: 0,
child: InkWell(
onTap: () {
ImageUploadBottomSheet().showModal(
context,
true,
(result) {
var file = File(result);
),
)
: CircleAvatar(
backgroundImage: AssetImage(
"assets/images/png/cimg3.png",
),
radius: 50.r,
),
Positioned(
bottom: 0,
right: 0,
child: InkWell(
onTap: () {
ImageUploadBottomSheet().showModal(
context,
true,
(result) {
var file = File(result);
filePath.add(file);
isImageAdded = true;
setState(() {});
},
);
filePath.add(file);
isImageAdded = true;
setState(() {});
},
child: Container(
height: 35.h,
width: 35.w,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Color(0xFFD90B2E)),
child: Center(
child: Image.asset(
"assets/images/png/cameraicon2.png",
height: 19.h,
width: 19.w,
),
),
);
},
child: Container(
height: 35.h,
width: 35.w,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Color(0xFFD90B2E)),
child: Center(
child: Image.asset(
"assets/images/png/cameraicon2.png",
height: 19.h,
width: 19.w,
),
))
],
),
),
))
],
),
sizedBoxHeight(15.h),
text16400white("Edit profile picture"),
sizedBoxHeight(20.h),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text16400white("Full name"),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
width: 18.w,
height: 17.h,
child: Center(
child: Image.asset(
"assets/images/png/Frame 24.png",
width: 18.w,
height: 17.h,
),
),
),
hintText: "Edward Hackett",
),
sizedBoxHeight(15.h),
text16400white("Edit profile picture"),
sizedBoxHeight(20.h),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text16400white("Full name"),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
text16400white("User name"),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
width: 18.w,
height: 17.h,
child: Center(
child: Image.asset(
"assets/images/png/Frame 24.png",
width: 18.w,
height: 17.h,
child: Center(
child: Image.asset(
"assets/images/png/Frame 24.png",
width: 18.w,
height: 17.h,
),
),
),
hintText: "Edward Hackett",
),
sizedBoxHeight(20.h),
text16400white("User name"),
sizedBoxHeight(16.h),
CustomTextFormField(
),
hintText: "edward_01",
),
sizedBoxHeight(20.h),
text16400white("Date of birth"),
sizedBoxHeight(16.h),
GestureDetector(
onTap: () => datePicker(context, dateController),
child: AbsorbPointer(
child: CustomTextFormField(
leadingIcon: Container(
width: 18.w,
height: 17.h,
width: 18.0,
height: 17.0,
child: Center(
child: Image.asset(
"assets/images/png/Frame 24.png",
width: 18.w,
height: 17.h,
),
),
),
hintText: "edward_01",
),
sizedBoxHeight(20.h),
text16400white("Date of birth"),
sizedBoxHeight(16.h),
GestureDetector(
onTap: () => datePicker(context, dateController),
child: AbsorbPointer(
child: CustomTextFormField(
leadingIcon: Container(
"assets/images/png/calender.png",
width: 18.0,
height: 17.0,
child: Center(
child: Image.asset(
"assets/images/png/calender.png",
width: 18.0,
height: 17.0,
),
),
),
hintText: "12-04-2024",
textEditingController: dateController,
),
),
hintText: "12-04-2024",
textEditingController: dateController,
),
),
),
sizedBoxHeight(20.h),
text16400white("Gender"),
sizedBoxHeight(16.h),
CustomDropDownRadio(
header: "Male",
title: "",
showOtherOption: true,
listData: ["Male", "Female", "Prefer not to say"],
onItemSelected: (p0) {},
leadingImage: Image.asset(
"assets/images/png/Vector ws.png",
width: 18.w,
height: 17.h,
),
),
sizedBoxHeight(25.h),
Row(
children: [
text16400white("Location"),
sizedBoxWidth(6.w),
Image.asset(
"assets/images/png/octicon_question-24.png",
height: 16.h,
width: 16.w,
)
],
),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
width: 18.w,
height: 17.h,
child: Center(
child: Image.asset(
"assets/images/png/Group 58645.png",
width: 18.w,
height: 17.h,
),
),
),
hintText: "Elm street london, United Kingdom",
),
sizedBoxHeight(20.h),
Row(
children: [
text16400white("Primary sport"),
sizedBoxWidth(6.w),
Image.asset(
"assets/images/png/octicon_question-24.png",
height: 16.h,
width: 16.w,
)
],
),
sizedBoxHeight(16.h),
CustomDropDownRadio(
showOtherOption: true,
header: "Rowing, Rugby, Swimming",
title: "",
listData: [
"Rowing",
"Cycling",
"Running",
"Swimming",
"Triathlon",
"Hiking",
"Football",
"Rugby"
],
onItemSelected: (p0) {},
leadingImage: Image.asset(
"assets/images/png/Vector (4).png",
width: 18.w,
height: 17.h,
),
),
// CommonDropdownradioBtn(
// hint: "Rowing, Rugby, Swimming",
// items: [
// "Rowing",
// "Cycling",
// "Running",
// "Swimming",
// "Triathlon",
// "Hiking",
// "Football",
// "Rugby"
// ],
// leadingIcon: Image.asset(
// "assets/images/png/Vector (4).png",
// width: 18.w,
// height: 17.h,
// ),
// showOtherOption: true,
// ),
sizedBoxHeight(20.h),
text16400white("Bio"),
sizedBoxHeight(16.h),
CustomTextFormField2(
hintText:
"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(60.h),
CommonBtn(text: "Save"),
sizedBoxHeight(60.h),
sizedBoxHeight(20.h),
text16400white("Gender"),
sizedBoxHeight(16.h),
CustomDropDownRadio(
header: "Male",
title: "",
showOtherOption: true,
listData: ["Male", "Female", "Prefer not to say"],
onItemSelected: (p0) {},
leadingImage: Image.asset(
"assets/images/png/Vector ws.png",
width: 18.w,
height: 17.h,
),
),
sizedBoxHeight(25.h),
Row(
children: [
text16400white("Location"),
sizedBoxWidth(6.w),
Image.asset(
"assets/images/png/octicon_question-24.png",
height: 16.h,
width: 16.w,
)
],
)
]))))
),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
width: 18.w,
height: 17.h,
child: Center(
child: Image.asset(
"assets/images/png/Group 58645.png",
width: 18.w,
height: 17.h,
),
),
),
hintText: "Elm street london, United Kingdom",
),
sizedBoxHeight(20.h),
Row(
children: [
text16400white("Primary sport"),
sizedBoxWidth(6.w),
Image.asset(
"assets/images/png/octicon_question-24.png",
height: 16.h,
width: 16.w,
)
],
),
sizedBoxHeight(16.h),
CustomDropDownRadio(
showOtherOption: true,
header: "Rowing, Rugby, Swimming",
title: "",
listData: [
"Rowing",
"Cycling",
"Running",
"Swimming",
"Triathlon",
"Hiking",
"Football",
"Rugby"
],
onItemSelected: (p0) {},
leadingImage: Image.asset(
"assets/images/png/Vector (4).png",
width: 18.w,
height: 17.h,
),
),
// CommonDropdownradioBtn(
// hint: "Rowing, Rugby, Swimming",
// items: [
// "Rowing",
// "Cycling",
// "Running",
// "Swimming",
// "Triathlon",
// "Hiking",
// "Football",
// "Rugby"
// ],
// leadingIcon: Image.asset(
// "assets/images/png/Vector (4).png",
// width: 18.w,
// height: 17.h,
// ),
// showOtherOption: true,
// ),
sizedBoxHeight(20.h),
text16400white("Bio"),
sizedBoxHeight(16.h),
CustomTextFormField2(
hintText:
"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(60.h),
CommonBtn(text: "Save"),
sizedBoxHeight(60.h),
],
)
])))
]));
}
}

15
lib/Feed Module/Main_Screens/ProfileTab/Followers/Followers.dart
View File

@@ -62,13 +62,14 @@ class _FollowersState extends State<Followers> {
appBar: CommonAppbar(
titleTxt: "Followers",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(children: [
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Padding(
@@ -105,7 +106,7 @@ class _FollowersState extends State<Followers> {
},
)
])
])))
]))
]));
}

15
lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart
View File

@@ -59,16 +59,17 @@ class _FollowingState extends State<Following> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Following",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(children: [
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Padding(
@@ -105,7 +106,7 @@ class _FollowingState extends State<Following> {
},
)
])
])))
]))
]));
}

688
lib/Feed Module/Main_Screens/ProfileTab/ProfileTab.dart
View File

@@ -64,366 +64,358 @@ class _ProfileTabState extends State<ProfileTab> {
backgroundColor: Color(0xFF222935),
extendBody: true,
body: Stack(clipBehavior: Clip.none, children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: commonGlassContainer(
border: 0,
width: double.infinity,
height: MediaQuery.of(context).size.height,
borderradius: 1,
customWidget: SafeArea(
child: SingleChildScrollView(
child: Column(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SafeArea(
child: SingleChildScrollView(
child: Column(
children: [
Stack(
children: [
Stack(
children: [
Container(
height: 484.h,
width: double.infinity,
child: Image.asset(
"assets/images/png/profileimg.png",
fit: BoxFit.cover,
),
),
Positioned.fill(
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color.fromRGBO(34, 41, 53, 0.1),
Color.fromRGBO(34, 41, 53, 0.79),
],
stops: [
0.5788,
0.8,
],
),
),
),
),
Positioned(
bottom: 0,
right: 0,
left: 0,
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Column(
children: [
text20700white("Edward Hackett"),
sizedBoxHeight(5.h),
text18w400white("@edward_01"),
sizedBoxHeight(15.h),
Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
GestureDetector(
onTap: () {
Get.toNamed(RouteName.followers);
},
child: Column(
children: [
text16400white("254"),
sizedBoxHeight(6.h),
text12400whiteblur("Followers")
],
),
),
sizedBoxWidth(20.w),
Container(
height: 58.h,
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(
color: Colors.white,
width: 1.0,
),
boxShadow: [
BoxShadow(
color: Color(0x66000000),
offset: Offset(0, 4),
blurRadius: 4.0,
),
],
),
),
sizedBoxWidth(20.w),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.following);
},
child: Column(
children: [
text16400white("254"),
sizedBoxHeight(6.h),
text12400whiteblur("Following")
],
),
),
sizedBoxWidth(20.w),
Container(
height: 58.h,
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(
color: Colors.white,
width: 1.0,
),
boxShadow: [
BoxShadow(
color: Color(0x66000000),
offset: Offset(0, 4),
blurRadius: 4.0,
),
],
),
),
sizedBoxWidth(20.w),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.clubs);
},
child: Column(
children: [
text16400white("10"),
sizedBoxHeight(6.h),
text12400whiteblur("Clubs")
],
),
),
],
),
sizedBoxHeight(20.h),
],
),
],
),
),
),
],
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(30.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
onTap: () {
Get.toNamed(RouteName.editProfile);
},
child: Container(
height: 40.h,
width: 170.w,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
borderRadius: BorderRadius.circular(30.r),
),
child: Center(
child: text16w400_FCFCFC("Edit profile")),
),
),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.shareProfile);
},
child: commonGlassContainer(
width: 170.w,
height: 40.h,
opacity1: 0.05,
opacity2: 0.07,
borderradius: 30.r,
customWidget: Center(
child: text16w400_FCFCFC("Share profile"),
),
border: 1,
),
)
],
),
sizedBoxHeight(30.h),
text18w700white("Bio"),
sizedBoxHeight(10.h),
text14400white(
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s."),
sizedBoxHeight(25.h),
Row(
children: [
commonGlassContainer(
width: 25.w,
height: 25.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
customWidget: Center(
child: Image.asset(
"assets/images/png/Group 58645.png",
height: 12.h,
width: 12.w,
)),
border: 0.5),
sizedBoxWidth(12.w),
text14400whiteblur(
"Elm street london, United Kingdom"),
],
),
sizedBoxHeight(20.h),
Row(
children: [
commonGlassContainer(
width: 25.w,
height: 25.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
customWidget: Center(
child: Image.asset(
"assets/images/png/Vector (4).png",
height: 12.h,
width: 12.w,
)),
border: 0.5),
sizedBoxWidth(12.w),
text14400whiteblur("Rowing, Football, Swimming"),
],
),
sizedBoxHeight(30.h),
commonGlassContainer(
width: double.infinity,
height: 135.h,
borderradius: 10,
customWidget: Padding(
padding: EdgeInsets.symmetric(
vertical: 12.h, horizontal: 16.w),
child: Column(
children: [
Row(
children: [
text16w700white("Badges"),
Spacer(),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.badges);
},
child: text12400white("View more"))
],
),
sizedBoxHeight(8.h),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Image.asset(
"assets/images/png/Frame 1000004056.png",
height: 70.h,
width: 74.w,
),
Image.asset(
"assets/images/png/Frame 1000004056.png",
height: 70.h,
width: 74.w,
),
Image.asset(
"assets/images/png/Frame 1000004056.png",
height: 70.h,
width: 74.w,
),
Image.asset(
"assets/images/png/Frame 1000004056.png",
height: 70.h,
width: 74.w,
),
],
),
],
),
),
border: 1),
sizedBoxHeight(40.h),
],
Container(
height: 484.h,
width: double.infinity,
child: Image.asset(
"assets/images/png/profileimg.png",
fit: BoxFit.cover,
),
),
SizedBox(
height: 190.h,
child: ListView.builder(
shrinkWrap: true,
scrollDirection: Axis.horizontal,
padding: EdgeInsets.only(left: 16.w),
itemCount: cardtile.length,
itemBuilder: (context, index) {
return Padding(
padding: EdgeInsets.only(right: 20.w),
child: profilecardtile(
imagePath: cardtile[index]["imagePath"],
title: cardtile[index]["title"]),
);
},
Positioned.fill(
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color.fromRGBO(34, 41, 53, 0.1),
Color.fromRGBO(34, 41, 53, 0.79),
],
stops: [
0.5788,
0.8,
],
),
),
),
),
sizedBoxHeight(20.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
Positioned(
bottom: 0,
right: 0,
left: 0,
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Row(
Column(
children: [
text18w700white("Timeline"),
Spacer(),
InkWell(
onTap: () {
Get.toNamed(RouteName.addtimeline);
},
child: Image.asset(
"assets/images/png/iconamoon_edit-thin.png",
height: 20.h,
width: 20.w,
),
)
text20700white("Edward Hackett"),
sizedBoxHeight(5.h),
text18w400white("@edward_01"),
sizedBoxHeight(15.h),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
GestureDetector(
onTap: () {
Get.toNamed(RouteName.followers);
},
child: Column(
children: [
text16400white("254"),
sizedBoxHeight(6.h),
text12400whiteblur("Followers")
],
),
),
sizedBoxWidth(20.w),
Container(
height: 58.h,
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(
color: Colors.white,
width: 1.0,
),
boxShadow: [
BoxShadow(
color: Color(0x66000000),
offset: Offset(0, 4),
blurRadius: 4.0,
),
],
),
),
sizedBoxWidth(20.w),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.following);
},
child: Column(
children: [
text16400white("254"),
sizedBoxHeight(6.h),
text12400whiteblur("Following")
],
),
),
sizedBoxWidth(20.w),
Container(
height: 58.h,
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(
color: Colors.white,
width: 1.0,
),
boxShadow: [
BoxShadow(
color: Color(0x66000000),
offset: Offset(0, 4),
blurRadius: 4.0,
),
],
),
),
sizedBoxWidth(20.w),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.clubs);
},
child: Column(
children: [
text16400white("10"),
sizedBoxHeight(6.h),
text12400whiteblur("Clubs")
],
),
),
],
),
sizedBoxHeight(20.h),
],
),
sizedBoxHeight(20.h),
SizedBox(
height: 300.h,
child: ListView.builder(
shrinkWrap: true,
itemCount: timeline.length,
itemBuilder: (context, index) {
return commonTimelineCard(
imagePath: timeline[index]["imagePath"],
title: timeline[index]["title"]);
},
)),
sizedBoxHeight(30.h),
text18w700white("Posts"),
]),
],
),
),
),
normalcardtile(
profileImg: 'assets/images/png/Ellipse 48.png',
title: 'Jocelyn Dokidis',
mainImg: 'assets/images/png/Rectangle 46.png',
containerTitle: [
'Race',
'Swimming',
'Events',
'Marathon',
'Events'
]),
sizedBoxHeight(120.h),
],
),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(30.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
onTap: () {
Get.toNamed(RouteName.editProfile);
},
child: Container(
height: 40.h,
width: 170.w,
decoration: BoxDecoration(
color: Color(0xFFD90B2E),
borderRadius: BorderRadius.circular(30.r),
),
child: Center(
child: text16w400_FCFCFC("Edit profile")),
),
),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.shareProfile);
},
child: commonGlassContainer(
width: 170.w,
height: 40.h,
opacity1: 0.05,
opacity2: 0.07,
borderradius: 30.r,
customWidget: Center(
child: text16w400_FCFCFC("Share profile"),
),
border: 1,
),
)
],
),
sizedBoxHeight(30.h),
text18w700white("Bio"),
sizedBoxHeight(10.h),
text14400white(
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s."),
sizedBoxHeight(25.h),
Row(
children: [
commonGlassContainer(
width: 25.w,
height: 25.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
customWidget: Center(
child: Image.asset(
"assets/images/png/Group 58645.png",
height: 12.h,
width: 12.w,
)),
border: 0.5),
sizedBoxWidth(12.w),
text14400whiteblur(
"Elm street london, United Kingdom"),
],
),
sizedBoxHeight(20.h),
Row(
children: [
commonGlassContainer(
width: 25.w,
height: 25.h,
opacity1: 0.24,
opacity2: 0.24,
borderradius: 100,
customWidget: Center(
child: Image.asset(
"assets/images/png/Vector (4).png",
height: 12.h,
width: 12.w,
)),
border: 0.5),
sizedBoxWidth(12.w),
text14400whiteblur("Rowing, Football, Swimming"),
],
),
sizedBoxHeight(30.h),
commonGlassContainer(
width: double.infinity,
height: 135.h,
borderradius: 10,
customWidget: Padding(
padding: EdgeInsets.symmetric(
vertical: 12.h, horizontal: 16.w),
child: Column(
children: [
Row(
children: [
text16w700white("Badges"),
Spacer(),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.badges);
},
child: text12400white("View more"))
],
),
sizedBoxHeight(8.h),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Image.asset(
"assets/images/png/Frame 1000004056.png",
height: 70.h,
width: 74.w,
),
Image.asset(
"assets/images/png/Frame 1000004056.png",
height: 70.h,
width: 74.w,
),
Image.asset(
"assets/images/png/Frame 1000004056.png",
height: 70.h,
width: 74.w,
),
Image.asset(
"assets/images/png/Frame 1000004056.png",
height: 70.h,
width: 74.w,
),
],
),
],
),
),
border: 1),
sizedBoxHeight(40.h),
],
),
),
SizedBox(
height: 190.h,
child: ListView.builder(
shrinkWrap: true,
scrollDirection: Axis.horizontal,
padding: EdgeInsets.only(left: 16.w),
itemCount: cardtile.length,
itemBuilder: (context, index) {
return Padding(
padding: EdgeInsets.only(right: 20.w),
child: profilecardtile(
imagePath: cardtile[index]["imagePath"],
title: cardtile[index]["title"]),
);
},
),
),
sizedBoxHeight(20.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
text18w700white("Timeline"),
Spacer(),
InkWell(
onTap: () {
Get.toNamed(RouteName.addtimeline);
},
child: Image.asset(
"assets/images/png/iconamoon_edit-thin.png",
height: 20.h,
width: 20.w,
),
)
],
),
sizedBoxHeight(20.h),
SizedBox(
height: 300.h,
child: ListView.builder(
shrinkWrap: true,
itemCount: timeline.length,
itemBuilder: (context, index) {
return commonTimelineCard(
imagePath: timeline[index]["imagePath"],
title: timeline[index]["title"]);
},
)),
sizedBoxHeight(30.h),
text18w700white("Posts"),
]),
),
normalcardtile(
profileImg: 'assets/images/png/Ellipse 48.png',
title: 'Jocelyn Dokidis',
mainImg: 'assets/images/png/Rectangle 46.png',
containerTitle: [
'Race',
'Swimming',
'Events',
'Marathon',
'Events'
]),
sizedBoxHeight(120.h),
],
),
),
),

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

@@ -24,18 +24,19 @@ class _AccountSessionState extends State<AccountSession> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Account sessions",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
@@ -50,7 +51,7 @@ class _AccountSessionState extends State<AccountSession> {
},
)
]),
))
)
]));
}

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

@@ -22,21 +22,25 @@ class _AccountSettingsState extends State<AccountSettings> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Account settings",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(
"assets/images/png/Ellipse 1496.png",
),
fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
@@ -114,7 +118,7 @@ class _AccountSettingsState extends State<AccountSettings> {
]),
),
)
])))
]))
]));
}

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

@@ -59,59 +59,57 @@ class _BlockedUsersState extends State<BlockedUsers> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Blocked users",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(25.h),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: CustomTextFormField(
leadingIcon: SizedBox(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
sizedBoxHeight(25.h),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: CustomTextFormField(
leadingIcon: SizedBox(
height: 23,
width: 23,
child: Center(
child: Image.asset(
"assets/images/png/ion_search-outline.png",
height: 23,
width: 23,
child: Center(
child: Image.asset(
"assets/images/png/ion_search-outline.png",
height: 23,
width: 23,
),
),
),
hintText: "Search people",
),
),
sizedBoxHeight(25.h),
Expanded(
child: ListView.builder(
shrinkWrap: true,
itemCount: blockedUserData.length,
itemBuilder: (context, index) {
return Column(
children: [
blockedUser(
imagePath: blockedUserData[index]["imagePath"],
title: blockedUserData[index]["title"],
subtitle: blockedUserData[index]["subtitle"]),
if (index != blockedUserData.length - 1)
commonDivider(),
],
);
},
),
),
sizedBoxHeight(20.h)
]))
hintText: "Search people",
),
),
sizedBoxHeight(25.h),
Expanded(
child: ListView.builder(
shrinkWrap: true,
itemCount: blockedUserData.length,
itemBuilder: (context, index) {
return Column(
children: [
blockedUser(
imagePath: blockedUserData[index]["imagePath"],
title: blockedUserData[index]["title"],
subtitle: blockedUserData[index]["subtitle"]),
if (index != blockedUserData.length - 1) commonDivider(),
],
);
},
),
),
sizedBoxHeight(20.h)
])
]));
}

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

@@ -22,6 +22,7 @@ class _ChangePasswordState extends State<ChangePassword> {
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
@@ -29,12 +30,12 @@ class _ChangePasswordState extends State<ChangePassword> {
titleTxt: "Change password",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(
@@ -127,7 +128,7 @@ class _ChangePasswordState extends State<ChangePassword> {
)
]),
),
))
)
]));
}
}

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

@@ -28,82 +28,81 @@ class _ContactUsState extends State<ContactUs> {
titleTxt: "Contact us",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
text16400white("Full name"),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
height: 17.h,
width: 18.w,
child: Center(
child: Image.asset(
"assets/images/png/Frame 24.png",
height: 17.h,
width: 18.w,
fit: BoxFit.cover,
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
text16400white("Full name"),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
height: 17.h,
width: 18.w,
child: Center(
child: Image.asset(
"assets/images/png/Frame 24.png",
height: 17.h,
width: 18.w,
fit: BoxFit.cover,
),
),
),
hintText: "Edward Hackett",
),
hintText: "Edward Hackett",
),
text16400white("Email address"),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
height: 17.h,
width: 18.w,
child: Center(
child: Image.asset(
"assets/images/png/Frame 12.png",
height: 17.h,
width: 18.w,
fit: BoxFit.cover,
text16400white("Email address"),
sizedBoxHeight(16.h),
CustomTextFormField(
leadingIcon: Container(
height: 17.h,
width: 18.w,
child: Center(
child: Image.asset(
"assets/images/png/Frame 12.png",
height: 17.h,
width: 18.w,
fit: BoxFit.cover,
),
),
),
hintText: "loremipsum@gmail.com",
),
hintText: "loremipsum@gmail.com",
),
text16400white("Reason to contact"),
sizedBoxHeight(16.h),
CustomDropDownRadio(
header: "",
title: "",
listData: [
"Feature suggestion",
"Issues with app",
"Scoreboard",
"Feedback"
],
onItemSelected: (p0) {},
leadingImage: Image.asset(
"assets/images/png/fluent_person-support-20-regular.png",
height: 17.h,
width: 18.w,
text16400white("Reason to contact"),
sizedBoxHeight(16.h),
CustomDropDownRadio(
header: "",
title: "",
listData: [
"Feature suggestion",
"Issues with app",
"Scoreboard",
"Feedback"
],
onItemSelected: (p0) {},
leadingImage: Image.asset(
"assets/images/png/fluent_person-support-20-regular.png",
height: 17.h,
width: 18.w,
),
),
),
sizedBoxHeight(25.h),
text16400white("Query"),
sizedBoxHeight(16.h),
CustomTextFormField2(
maxlines: 3,
hintText:
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard",
),
CommonBtn(text: "Send")
]),
),
))
sizedBoxHeight(25.h),
text16400white("Query"),
sizedBoxHeight(16.h),
CustomTextFormField2(
maxlines: 3,
hintText:
"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s. Lorem Ipsum has been the industry's standard",
),
CommonBtn(text: "Send")
]),
))
]));
}
}

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

@@ -19,18 +19,19 @@ class _DeleteAccountState extends State<DeleteAccount> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(children: [
@@ -61,7 +62,7 @@ class _DeleteAccountState extends State<DeleteAccount> {
text16400white("Yes I am ready to delete my account"),
]),
),
))
)
]));
}
}

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

@@ -61,15 +61,17 @@ class _FaqScreenState extends State<FaqScreen> {
return Scaffold(
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
resizeToAvoidBottomInset: false,
extendBody: true,
appBar: CommonAppbar(
titleTxt: "FAQ’s",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Positioned.fill(
child: SingleChildScrollView(
child: Padding(

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

@@ -20,21 +20,22 @@ class _HelpAndSupportState extends State<HelpAndSupport> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Help & Support",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
GestureDetector(
onTap: () {
@@ -66,7 +67,7 @@ class _HelpAndSupportState extends State<HelpAndSupport> {
text: "Report a bug",
),
),
])))
]))
]));
}

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

@@ -20,6 +20,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
@@ -27,13 +28,13 @@ class _NotificationScreenState extends State<NotificationScreen> {
titleTxt: "Notifications",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
child: Column(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Column(children: [
sizedBoxHeight(20.h),
rowTile(text: "Group notification", index: 0),
commonDivider(),
@@ -44,7 +45,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
rowTile(text: "New follower notification", index: 3),
commonDivider(),
rowTile(text: "Direct message notification", index: 4),
])))
]))
]));
}

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

@@ -19,16 +19,17 @@ class _PrivacyPolicyState extends State<PrivacyPolicy> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Privacy policy",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(children: [
@@ -43,7 +44,7 @@ class _PrivacyPolicyState extends State<PrivacyPolicy> {
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.")
]),
),
))
)
]));
}
}

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

@@ -21,18 +21,19 @@ class _ReportABugState extends State<ReportABug> {
Widget build(BuildContext context) {
return Scaffold(
// key: _scaffoldKey1,
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFF222935),
extendBody: true,
appBar: CommonAppbar(
titleTxt: "Report a bug",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(
@@ -140,7 +141,7 @@ class _ReportABugState extends State<ReportABug> {
sizedBoxHeight(20.h),
CommonBtn(text: "Send")
])),
))
)
]));
}
}

15
lib/Feed Module/Main_Screens/ProfileTab/Settings/Settings.dart
View File

@@ -24,16 +24,17 @@ class _SettingsState extends State<Settings> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Settings",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Column(children: [
GestureDetector(
onTap: () {
Get.toNamed(RouteName.accountsettings);
@@ -94,7 +95,7 @@ class _SettingsState extends State<Settings> {
text: "Logout",
),
),
]))
])
]));
}

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

@@ -19,16 +19,17 @@ class _TermsConditionState extends State<TermsCondition> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Terms & Condition",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(children: [
@@ -43,7 +44,7 @@ class _TermsConditionState extends State<TermsCondition> {
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.")
]),
),
))
)
]));
}
}

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

@@ -25,56 +25,57 @@ class _VerifyCodeState extends State<VerifyCode> {
return Scaffold(
backgroundColor: const Color(0xFF222935),
appBar: CommonAppbar(titleTxt: ""),
resizeToAvoidBottomInset: false,
body: Stack(
children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
text20700white("Check your email"),
sizedBoxHeight(10.h),
text14400whiteblur(
"Enter the verification code that we sent to loremipsum@gmail.com"),
sizedBoxHeight(30.h),
text16400white("Enter code"),
sizedBoxHeight(20.h),
commonGlassContainer(
width: double.infinity,
height: 50.h,
borderradius: 30.r,
border: 1,
customWidget: CustomPinCodeField(
controller: pincodeController,
onChanged: (value) {
print(value);
},
onCompleted: (value) {
print("Completed");
pincodeController.text = value;
},
),
),
sizedBoxHeight(70.h),
CustomButton(
text: 'Continue',
onPressed: () {
if (pincodeController.text.isEmpty) {
utils.showToast("Pin field is empty");
} else {
return;
}
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: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
text20700white("Check your email"),
sizedBoxHeight(10.h),
text14400whiteblur(
"Enter the verification code that we sent to loremipsum@gmail.com"),
sizedBoxHeight(30.h),
text16400white("Enter code"),
sizedBoxHeight(20.h),
commonGlassContainer(
width: double.infinity,
height: 50.h,
borderradius: 30.r,
border: 1,
customWidget: CustomPinCodeField(
controller: pincodeController,
onChanged: (value) {
print(value);
},
onCompleted: (value) {
print("Completed");
pincodeController.text = value;
},
),
],
),
),
sizedBoxHeight(70.h),
CustomButton(
text: 'Continue',
onPressed: () {
if (pincodeController.text.isEmpty) {
utils.showToast("Pin field is empty");
} else {
return;
}
},
),
],
),
),
),

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

@@ -62,13 +62,13 @@ class _ShareProfileState extends State<ShareProfile> {
titleTxt: "Share profile",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
child: Column(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"), fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Column(children: [
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
sizedBoxHeight(10.h),
Padding(
@@ -118,7 +118,7 @@ class _ShareProfileState extends State<ShareProfile> {
child: CommonBtn(text: "Send"),
)
])
])))
])),
]));
}

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

@@ -26,6 +26,7 @@ class _AddTimelineState extends State<AddTimeline> {
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
@@ -33,13 +34,14 @@ class _AddTimelineState extends State<AddTimeline> {
titleTxt: "Add timeline",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
@@ -154,7 +156,7 @@ class _AddTimelineState extends State<AddTimeline> {
child: CommonBtn(text: "Add timeline"),
),
]),
)))
))
]));
}
}

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

@@ -69,7 +69,7 @@ class _NotificationPageState extends State<NotificationPage> {
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

15
lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/CommunitySetting.dart
View File

@@ -22,16 +22,17 @@ class _CommunitySettingState extends State<CommunitySetting> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Community settings",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Column(children: [
sizedBoxHeight(30.h),
GestureDetector(
onTap: () {
@@ -57,7 +58,7 @@ class _CommunitySettingState extends State<CommunitySetting> {
},
child: rowTile(text: 'Manage tags')),
sizedBoxHeight(20.h),
]))
])
]));
}

16
lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/EditCommunity/EditCommunity.dart
View File

@@ -46,13 +46,15 @@ class _EditCommunityState extends State<EditCommunity> {
appBar: CommonAppbar(
titleTxt: "Edit community info",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
SingleChildScrollView(
child: Column(children: [
sizedBoxHeight(30.h),
Stack(
@@ -299,7 +301,7 @@ class _EditCommunityState extends State<EditCommunity> {
),
)
]),
))
)
]));
}
}

15
lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageGroup.dart
View File

@@ -50,6 +50,7 @@ class _ManageGroupsState extends State<ManageGroups> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Manage groups",
customActionWidget: InkWell(
@@ -74,12 +75,12 @@ class _ManageGroupsState extends State<ManageGroups> {
),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
@@ -148,7 +149,7 @@ class _ManageGroupsState extends State<ManageGroups> {
},
)
]),
))
)
]));
}
}

15
lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/ManageTags.dart
View File

@@ -28,13 +28,14 @@ class _ManageTagsState extends State<ManageTags> {
appBar: CommonAppbar(
titleTxt: "Manage tags",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(children: [
sizedBoxHeight(20.h),
DefaultTabController(
@@ -59,7 +60,7 @@ class _ManageTagsState extends State<ManageTags> {
),
),
]))
])))
]))
]),
floatingActionButtonLocation: CustomFloatingActionButtonLocation(60.0),
floatingActionButton: Container(

15
lib/Feed Module/sidemenu/Community/Admin/PopupItem/Community settings/ManageTags.dart/NewTag/NewTag.dart
View File

@@ -24,13 +24,14 @@ class _NewTagState extends State<NewTag> {
appBar: CommonAppbar(
titleTxt: "New tag",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
@@ -52,7 +53,7 @@ class _NewTagState extends State<NewTag> {
sizedBoxHeight(80.h),
CustomButton(text: "Add", onPressed: () {})
]),
)))
))
]));
}
}

15
lib/Feed Module/sidemenu/Community/Announcements/AnnouncementRequest.dart
View File

@@ -22,16 +22,17 @@ class _AnnouncementRequestState extends State<AnnouncementRequest> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Announcement requests",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16),
child: Column(
@@ -42,7 +43,7 @@ class _AnnouncementRequestState extends State<AnnouncementRequest> {
title: "title",
mainImg: "assets/images/png/Rectangle 22.png")
],
))))
)))
]));
}

17
lib/Feed Module/sidemenu/Community/Announcements/ManageMembers.dart
View File

@@ -36,6 +36,7 @@ class _ManageMembersState extends State<ManageMembers> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "Manage members",
customActionWidget: Container(
@@ -57,12 +58,12 @@ class _ManageMembersState extends State<ManageMembers> {
),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Column(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
@@ -97,7 +98,7 @@ class _ManageMembersState extends State<ManageMembers> {
),
],
))
]))
])
]));
}
@@ -351,7 +352,7 @@ class _ManageMembersState extends State<ManageMembers> {
Color(0xFFD90B2E),
],
),
blur: 10,
blur: 6,
child: Center(child: text16w400_FCFCFC("Su")),
),
sizedBoxWidth(8.w),

15
lib/Feed Module/sidemenu/Community/Announcements/NewAnnouncement/NewAnnounceent.dart
View File

@@ -26,13 +26,14 @@ class _NewAnnouncementState extends State<NewAnnouncement> {
appBar: CommonAppbar(
titleTxt: "New announcement",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child:
@@ -58,7 +59,7 @@ class _NewAnnouncementState extends State<NewAnnouncement> {
Get.toNamed(RouteName.announcement);
})
]),
)))
))
]));
}
}

15
lib/Feed Module/sidemenu/Community/Group/view/Group.dart
View File

@@ -45,13 +45,14 @@ class _GroupState extends State<Group> {
appBar: CommonAppbar(
titleTxt: "Groups",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Padding(
padding: EdgeInsets.symmetric(horizontal: 16),
child: SingleChildScrollView(
child: Column(
@@ -67,7 +68,7 @@ class _GroupState extends State<Group> {
}),
)
],
))))
)))
]));
}

15
lib/Feed Module/sidemenu/Community/MyCommunity/AddGroups.dart
View File

@@ -52,13 +52,14 @@ class _AddGroupState extends State<AddGroup> {
appBar: CommonAppbar(
titleTxt: "Add groups",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
@@ -144,7 +145,7 @@ class _AddGroupState extends State<AddGroup> {
),
),
]),
))
)
]));
}

15
lib/Feed Module/sidemenu/Community/MyCommunity/Community_Info-Page/view/communityInfo.dart
View File

@@ -26,13 +26,14 @@ class _CommunityInfoState extends State<CommunityInfo> {
appBar: CommonAppbar(
titleTxt: "Community info page",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Column(children: [
Stack(clipBehavior: Clip.none, children: [
GestureDetector(
@@ -128,7 +129,7 @@ class _CommunityInfoState extends State<CommunityInfo> {
)
]),
)
])))
]))
]));
}
}

16
lib/Feed Module/sidemenu/Community/MyCommunity/NewCommunity.dart
View File

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:regroup/Common/CommonButton.dart';
import 'package:regroup/Common/CommonDropDown.dart';
import 'package:regroup/Common/CommonGlassmorphism.dart';
import 'package:regroup/Utils/Common/CommonAppbar.dart';
import 'package:regroup/Utils/Common/CommonDropdown.dart';
@@ -35,16 +34,17 @@ class _NewCommunityState extends State<NewCommunity> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "New community",
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: SingleChildScrollView(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), SingleChildScrollView(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child:
@@ -234,7 +234,7 @@ class _NewCommunityState extends State<NewCommunity> {
sizedBoxHeight(25.h),
sizedBoxHeight(150.h),
]),
)))
))
]));
}
}

11
lib/Feed Module/sidemenu/Community/MyCommunity/View/CommunityDetails.dart
View File

@@ -25,6 +25,7 @@ class _CommunityDetailsState extends State<CommunityDetails> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "",
customActionWidget: PopupMenuButton(
@@ -151,10 +152,12 @@ class _CommunityDetailsState extends State<CommunityDetails> {
)),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
),
Positioned.fill(
child: SingleChildScrollView(
child: Column(children: [

15
lib/Feed Module/sidemenu/Community/MyCommunity/View/MyCommunity.dart
View File

@@ -63,6 +63,7 @@ class _MyCommunityState extends State<MyCommunity> {
// key: _scaffoldKey1,
backgroundColor: Color(0xFF222935),
extendBody: true,
resizeToAvoidBottomInset: false,
appBar: CommonAppbar(
titleTxt: "My Communities",
customActionWidget: Row(
@@ -101,12 +102,12 @@ class _MyCommunityState extends State<MyCommunity> {
),
),
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Ellipse 1496.png"),
fit: BoxFit.fill)),
), Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: SingleChildScrollView(
child: Column(
@@ -145,7 +146,7 @@ class _MyCommunityState extends State<MyCommunity> {
}),
)
]),
)))
))
]));
}

72
lib/Feed Module/sidemenu/SavedPosts/SavedPosts.dart
View File

@@ -33,42 +33,44 @@ class _SavedPostsState extends State<SavedPosts> {
appBar: CommonAppbar(
titleTxt: "Saved posts",
),
resizeToAvoidBottomInset: false,
body: Stack(children: [
const CommonBlurLeftRed(),
const CommonBlurRightRed(),
const CommonBlurLeft(),
const CommonBlurRight(),
Positioned.fill(
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
children: [
sizedBoxHeight(40.h),
Expanded(
child: GridView.builder(
scrollDirection: Axis.vertical,
gridDelegate:
const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
mainAxisSpacing: 8,
crossAxisSpacing: 8,
childAspectRatio: 1,
),
itemCount: images.length,
itemBuilder: (context, index) {
return Container(
width: 115.w,
height: 115.h,
child: Image.asset(
images[index],
width: 115.w,
height: 115.h,
fit: BoxFit.cover,
));
}),
)
],
))),
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(
children: [
sizedBoxHeight(40.h),
Expanded(
child: GridView.builder(
scrollDirection: Axis.vertical,
gridDelegate:
const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
mainAxisSpacing: 8,
crossAxisSpacing: 8,
childAspectRatio: 1,
),
itemCount: images.length,
itemBuilder: (context, index) {
return Container(
width: 115.w,
height: 115.h,
child: Image.asset(
images[index],
width: 115.w,
height: 115.h,
fit: BoxFit.cover,
));
}),
)
],
))
]));
}
}

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

@@ -13,6 +13,7 @@ import 'package:regroup/Utils/Common/sized_box.dart';
import 'package:regroup/Utils/texts.dart';
import 'package:regroup/resources/routes/route_name.dart';
import 'package:remove_emoji_input_formatter/remove_emoji_input_formatter.dart';
import 'package:show_fps/show_fps.dart';
class LoginScreen extends StatefulWidget {
const LoginScreen({super.key});
@@ -22,471 +23,260 @@ class LoginScreen extends StatefulWidget {
}
class _LoginScreenState extends State<LoginScreen> {
TextEditingController _email = TextEditingController();
final TextEditingController _email = TextEditingController();
RxBool isObscured = true.obs;
TextEditingController _password = TextEditingController();
final TextEditingController _password = TextEditingController();
// final GlobalKey<FormState> _form = GlobalKey<FormState>();
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color.fromARGB(255, 18, 32, 47),
body: Stack(
children: [
Positioned(top: 210, left: -30, child: CommonBlurLeftSecond()),
Positioned(top: 400, right: -30, child: CommonBlurRightSecond()),
Positioned(top: 550, left: -30, child: CommonBlurLeftBlue()),
SingleChildScrollView(
child: GlassmorphicContainer(
width: MediaQuery.of(context).size.width,
height:
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
],
),
borderGradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
// Color.fromARGB(255, 18, 32, 47).withOpacity(0.50),
Color(0XFF222935).withOpacity(0.60),
Color(0XFF222935).withOpacity(0.60),
],
),
resizeToAvoidBottomInset:
false, // Prevent resizing when the keyboard opens
backgroundColor: const Color.fromARGB(255, 18, 32, 47),
body: Stack(
clipBehavior: Clip.none,
children: [
Container(
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage("assets/images/png/Choice screen.png"),
fit: BoxFit.cover)),
),
Center(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: 150.h,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: double.infinity,
height: 271.h,
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage(
"assets/images/png/blurwhole.png"),
fit: BoxFit.fill)),
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Padding(
padding: EdgeInsets.only(top: 100.h),
child: Center(
child: SvgPicture.asset(
"assets/images/svg/onboarding2.svg",
width: 104.w,
height: 104.h,
),
),
),
sizedBoxHeight(15.h),
Center(
child: text22400white('Find your community')),
],
Align(
alignment: Alignment.center,
child: Container(
width: 107.w,
height: 70.h,
child: SvgPicture.asset(
"assets/images/svg/onboarding2.svg",
fit: BoxFit.cover,
),
),
),
sizedBoxHeight(20.h),
Align(
alignment: Alignment.center,
child: text22400FCFCFC("Find your community")),
sizedBoxHeight(40.h),
text16400white('Email address'),
sizedBoxHeight(10.h),
CustomTextFormField(
textEditingController: _email,
hintText: "Enter your email address",
leadingIcon:
// const Icon(Icons.mail_outline),
SizedBox(
width: 22.w,
height: 17.h,
child: Image.asset(
'assets/images/png/mail.png',
width: 22.w,
height: 17.h,
),
),
// validatorText: "Email Id",
validator: (value) {
if (value!.isEmpty) {
return 'Enter your e-mail address';
}
if (!RegExp(
r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$')
.hasMatch(value)) {
return 'Enter a valid e-mail address';
}
return null;
},
inputFormatters: [
LengthLimitingTextInputFormatter(30),
RemoveEmojiInputFormatter()
],
),
sizedBoxHeight(10.h),
text16400white('Password'),
sizedBoxHeight(10.h),
CustomTextFormField(
isInputPassword: true,
textEditingController: _password,
hintText: 'Enter your password',
leadingIcon: Image.asset(
'assets/images/png/lock.png',
width: 22.w,
height: 17.h,
),
validator: (val) {
if (val == null || val.isEmpty) {
return 'Please enter your password';
}
return null;
},
inputFormatters: [
LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter()
],
),
sizedBoxHeight(10.h),
Align(
alignment: Alignment.centerRight,
child: Padding(
padding: EdgeInsets.only(right: 6.w),
child: text14400white('Forgot password ?'),
)),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
child: Column(
sizedBoxHeight(40.h),
CustomButton(
text: "Login",
onPressed: () {
Get.toNamed(RouteName.mainscreen);
}),
sizedBoxHeight(20.h),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.signupscreen);
},
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(35.h),
text16400white('Email address'),
sizedBoxHeight(10.h),
// TextFormField(
// style: TextStyle(
// fontSize: 16.sp, color: Colors.white),
// validator: (value) {
// if (value == null || value.isEmpty) {
// return "Please enter email";
// }
// // Check if the entered value is a valid email address
// bool isEmailValid = RegExp(
// r'^[\w-]+(\.[\w-]+)*@([\w-]+\.)+[a-zA-Z]{2,7}$')
// .hasMatch(value);
// if (!isEmailValid) {
// return "Please enter valid email";
// }
// return null;
// },
// inputFormatters: [
// RemoveEmojiInputFormatter(),
// LengthLimitingTextInputFormatter(50)
// ],
// controller: _email,
// cursorColor: Colors.white,
// autovalidateMode:
// AutovalidateMode.onUserInteraction,
// decoration: InputDecoration(
// fillColor: Color(0xFFFFFFFF).withOpacity(0.10),
// filled: true,
// prefixIcon: Image.asset(
// 'assets/images/png/mail.png',
// width: 22.w,
// height: 17.h,
// ),
// // Icon(
// // Icons.mail_outline,
// // color: Colors.white,
// // ),
// hintText: 'Enter your email address',
// hintStyle: TextStyle(
// color: Colors.white,
// fontSize: 14.sp,
// fontWeight: FontWeight.w400,
// fontFamily:
// "Helvetica" // Default label color
// ),
// enabledBorder: OutlineInputBorder(
// borderSide: const BorderSide(
// color: Color(0xFF434A53),
// ),
// borderRadius: BorderRadius.all(
// Radius.circular(30.r),
// ),
// ),
// focusedBorder: OutlineInputBorder(
// borderSide: BorderSide(
// color: Color(
// 0xFF434A53), // Border color when focused
// ),
// borderRadius: BorderRadius.all(
// Radius.circular(30.r),
// ),
// ),
// errorBorder: OutlineInputBorder(
// borderRadius: BorderRadius.circular(30.r),
// borderSide:
// const BorderSide(color: Colors.red),
// ),
// focusedErrorBorder: OutlineInputBorder(
// // borderRadius: BorderRadius.circular(8.r),
// borderSide: BorderSide(
// color: Colors.red,
// ),
// borderRadius: BorderRadius.all(
// Radius.circular(30.r),
// ),
// ),
// ),
// ),
CustomTextFormField(
textEditingController: _email,
hintText: "Enter your email address",
leadingIcon:
// const Icon(Icons.mail_outline),
SizedBox(
width: 22.w,
height: 17.h,
child: Image.asset(
'assets/images/png/mail.png',
width: 22.w,
height: 17.h,
),
),
// validatorText: "Email Id",
validator: (value) {
if (value!.isEmpty) {
return 'Enter your e-mail address';
}
if (!RegExp(
r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$')
.hasMatch(value)) {
return 'Enter a valid e-mail address';
}
return null;
},
inputFormatters: [
LengthLimitingTextInputFormatter(30),
RemoveEmojiInputFormatter()
],
),
sizedBoxHeight(10.h),
text16400white('Password'),
sizedBoxHeight(10.h),
// Obx(() {
// return TextFormField(
// style: TextStyle(
// fontSize: 16.sp, color: Colors.white),
// cursorColor: Colors.white,
// autovalidateMode:
// AutovalidateMode.onUserInteraction,
// obscureText: isObscured.value,
// controller: _password,
// decoration: InputDecoration(
// filled: true,
// fillColor:
// Color(0xFFFFFFFF).withOpacity(0.10),
// prefixIcon: Image.asset(
// 'assets/images/png/lock.png',
// width: 22.w,
// height: 17.h,
// ),
// // const Icon(
// // Icons.lock_outline,
// // color: Colors.white,
// // ),
// suffixIcon: Padding(
// padding: EdgeInsets.only(right: 5.w),
// child: IconButton(
// onPressed: () {
// isObscured.value = !isObscured.value;
// },
// color: Color(0xFF959595),
// icon: isObscured.value
// // ? const Icon(Icons.visibility_off)
// // : const Icon(Icons.visibility)),
// ? SvgPicture.asset(
// "assets/images/svg/loginpasswordclose.svg")
// // const Icon(Icons.remove_red_eye)
// : SvgPicture.asset(
// 'assets/images/svg/loginpasswordopen.svg')
// // const Icon(
// // Icons.remove_red_eye_outlined)
// ),
// ),
// hintText: 'Enter your password',
// hintStyle: TextStyle(
// color: Colors.white,
// fontSize: 14.sp,
// fontWeight: FontWeight.w400,
// fontFamily:
// "Helvetica" // Default label color
// ),
// enabledBorder: OutlineInputBorder(
// borderSide: const BorderSide(
// color: Color(0xFF434A53),
// ),
// borderRadius: BorderRadius.all(
// Radius.circular(30.r),
// ),
// ),
// focusedBorder: OutlineInputBorder(
// borderSide: BorderSide(
// color: Color(
// 0xFF434A53), // Border color when focused
// ),
// borderRadius: BorderRadius.all(
// Radius.circular(30.r),
// ),
// ),
// errorBorder: OutlineInputBorder(
// borderRadius: BorderRadius.circular(30.r),
// borderSide:
// const BorderSide(color: Colors.red),
// ),
// focusedErrorBorder: OutlineInputBorder(
// // borderRadius: BorderRadius.circular(8.r),
// borderSide: BorderSide(
// color: Colors.red,
// ),
// borderRadius: BorderRadius.all(
// Radius.circular(30.r),
// ),
// ),
// ),
// validator: (val) {
// if (val == null || val.isEmpty) {
// return 'Please enter your password';
// }
// return null;
// },
// inputFormatters: [
// RemoveEmojiInputFormatter(),
// LengthLimitingTextInputFormatter(50)
// ],
// );
// }),
CustomTextFormField(
isInputPassword: true,
textEditingController: _password,
hintText: 'Enter your password',
leadingIcon: Image.asset(
'assets/images/png/lock.png',
width: 22.w,
height: 17.h,
),
// const Icon(Icons.lock_outline),
// validationMessage: "Enter your password",
validator: (val) {
if (val == null || val.isEmpty) {
return 'Please enter your password';
}
return null;
},
inputFormatters: [
LengthLimitingTextInputFormatter(20),
RemoveEmojiInputFormatter()
],
),
sizedBoxHeight(10.h),
Align(
alignment: Alignment.centerRight,
child: Padding(
padding: EdgeInsets.only(right: 6.w),
child: text14400white('Forgot password ?'),
)),
sizedBoxHeight(40.h),
CustomButton(text: "Login", onPressed: () {
Get.toNamed(RouteName.mainscreen);
}),
sizedBoxHeight(20.h),
GestureDetector(
onTap: () {
Get.toNamed(RouteName.signupscreen);
},
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text14400white('Don’t have account ? '),
sizedBoxWidth(5.w),
text14700white('Sign up')
],
),
),
sizedBoxHeight(30.h),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
width: 160,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(
width: 0.50,
strokeAlign:
BorderSide.strokeAlignCenter,
color: Color(0xFF434A53),
),
),
),
),
sizedBoxWidth(6.w),
text14400white('Or'),
sizedBoxWidth(6.w),
Container(
width: 160,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(
width: 0.50,
strokeAlign:
BorderSide.strokeAlignCenter,
color: Color(0xFF434A53),
),
),
),
),
],
),
sizedBoxHeight(20.h),
Center(
child: SizedBox(
width: 220.w,
child: Row(
children: [
Container(
width: 55,
height: 55,
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(0.71, -0.70),
end: Alignment(-0.71, 0.7),
colors: [
Colors.white.withOpacity(
0.07999999821186066),
Colors.white.withOpacity(
0.12999999523162842)
],
),
shape: OvalBorder(
side: BorderSide(
width: 0.50,
color: Color(0xFF434A53)),
),
image: DecorationImage(
image: AssetImage(
'assets/images/png/login2.png'))),
),
Spacer(),
Container(
width: 55,
height: 55,
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(0.71, -0.70),
end: Alignment(-0.71, 0.7),
colors: [
Colors.white.withOpacity(
0.07999999821186066),
Colors.white.withOpacity(
0.12999999523162842)
],
),
shape: OvalBorder(
side: BorderSide(
width: 0.50,
color: Color(0xFF434A53)),
),
image: DecorationImage(
image: AssetImage(
'assets/images/png/login3.png'))),
),
Spacer(),
Container(
width: 55,
height: 55,
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: Alignment(0.71, -0.70),
end: Alignment(-0.71, 0.7),
colors: [
Colors.white.withOpacity(
0.07999999821186066),
Colors.white.withOpacity(
0.12999999523162842)
],
),
shape: OvalBorder(
side: BorderSide(
width: 0.50,
color: Color(0xFF434A53)),
),
image: DecorationImage(
image: AssetImage(
'assets/images/png/login4.png'))),
),
],
),
),
)
text14400white('Don’t have account ? '),
sizedBoxWidth(5.w),
text14700white('Sign up')
],
),
),
sizedBoxHeight(30.h),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
width: 160,
decoration: const ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(
width: 0.50,
strokeAlign: BorderSide.strokeAlignCenter,
color: Color(0xFF434A53),
),
),
),
),
sizedBoxWidth(6.w),
text14400white('Or'),
sizedBoxWidth(6.w),
Container(
width: 160,
decoration: const ShapeDecoration(
shape: RoundedRectangleBorder(
side: BorderSide(
width: 0.50,
strokeAlign: BorderSide.strokeAlignCenter,
color: Color(0xFF434A53),
),
),
),
),
],
),
sizedBoxHeight(20.h),
Center(
child: SizedBox(
width: 220.w,
child: Row(
children: [
Container(
width: 55,
height: 55,
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: const Alignment(0.71, -0.70),
end: const Alignment(-0.71, 0.7),
colors: [
Colors.white
.withOpacity(0.07999999821186066),
Colors.white
.withOpacity(0.12999999523162842)
],
),
shape: const OvalBorder(
side: BorderSide(
width: 0.50,
color: Color(0xFF434A53)),
),
image: const DecorationImage(
image: AssetImage(
'assets/images/png/login2.png'))),
),
const Spacer(),
Container(
width: 55,
height: 55,
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: const Alignment(0.71, -0.70),
end: const Alignment(-0.71, 0.7),
colors: [
Colors.white
.withOpacity(0.07999999821186066),
Colors.white
.withOpacity(0.12999999523162842)
],
),
shape: const OvalBorder(
side: BorderSide(
width: 0.50,
color: Color(0xFF434A53)),
),
image: const DecorationImage(
image: AssetImage(
'assets/images/png/login3.png'))),
),
const Spacer(),
Container(
width: 55,
height: 55,
decoration: ShapeDecoration(
gradient: LinearGradient(
begin: const Alignment(0.71, -0.70),
end: const Alignment(-0.71, 0.7),
colors: [
Colors.white
.withOpacity(0.07999999821186066),
Colors.white
.withOpacity(0.12999999523162842)
],
),
shape: const OvalBorder(
side: BorderSide(
width: 0.50,
color: Color(0xFF434A53)),
),
image: const DecorationImage(
image: AssetImage(
'assets/images/png/login4.png'))),
),
],
),
),
)
],
)),
),
)
],
),
],
));
),
],
),
);
}
}

43
lib/Utils/Common/CustomTextformfield.dart
View File

@@ -83,7 +83,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
width: double.infinity,
height: 50,
borderRadius: 30,
blur: 10,
blur: 6,
alignment: Alignment.bottomCenter,
border: 0.8,
linearGradient: LinearGradient(
@@ -93,7 +93,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
const Color(0xFFffffff).withOpacity(widget.opacity1),
const Color(0xFFFFFFFF).withOpacity(widget.opacity2),
],
stops: [
stops: const [
0.1,
1,
]),
@@ -120,7 +120,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
decoration: InputDecoration(
hintText: widget.hintText,
prefixIconColor: widget.prefixIconColor,
constraints: BoxConstraints(minHeight: 50),
constraints: const BoxConstraints(minHeight: 50),
hintStyle: TextStyle(
fontSize: 16.sp,
color: Colors.white,
@@ -129,7 +129,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
prefixIcon: widget.leadingIcon == null
? null
: Padding(
padding: EdgeInsets.symmetric(horizontal: 10),
padding: const EdgeInsets.symmetric(horizontal: 10),
child: widget.leadingIcon!,
),
suffixIcon: widget.isInputPassword
@@ -140,7 +140,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.only(right: 20.0),
padding: const EdgeInsets.only(right: 20.0),
child: SvgPicture.asset(
"assets/images/svg/loginpasswordclose.svg",
),
@@ -151,7 +151,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.only(right: 20.0),
padding: const EdgeInsets.only(right: 20.0),
child: SvgPicture.asset(
'assets/images/svg/loginpasswordopen.svg',
),
@@ -176,7 +176,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
),
sizedBoxHeight(5.h),
widget.validationMessage == null
? SizedBox()
? const SizedBox()
: Text(
widget.validationMessage ?? '',
style: TextStyle(color: Colors.red, fontSize: 12.sp),
@@ -256,7 +256,7 @@ class _CustomTextFormField2State extends State<CustomTextFormField2> {
width: double.infinity,
height: 100.h,
borderRadius: 10,
blur: 10,
blur: 6,
alignment: Alignment.bottomCenter,
border: 0.8,
linearGradient: LinearGradient(
@@ -266,7 +266,7 @@ class _CustomTextFormField2State extends State<CustomTextFormField2> {
const Color(0xFFffffff).withOpacity(0.04),
const Color(0xFFFFFFFF).withOpacity(0.05),
],
stops: [
stops: const [
0.1,
1,
]),
@@ -293,7 +293,7 @@ class _CustomTextFormField2State extends State<CustomTextFormField2> {
decoration: InputDecoration(
hintText: widget.hintText,
prefixIconColor: widget.prefixIconColor,
constraints: BoxConstraints(minHeight: 50),
constraints: const BoxConstraints(minHeight: 50),
hintStyle: TextStyle(
fontSize: 16.sp,
@@ -442,7 +442,7 @@ class _CustomtextFormFieldPasswordState
width: double.infinity,
height: 50,
borderRadius: 30,
blur: 10,
blur: 6,
alignment: Alignment.bottomCenter,
border: 0.8,
linearGradient: LinearGradient(
@@ -452,7 +452,7 @@ class _CustomtextFormFieldPasswordState
const Color(0xFFffffff).withOpacity(0.04),
const Color(0xFFFFFFFF).withOpacity(0.05),
],
stops: [0.1, 1],
stops: const [0.1, 1],
),
borderGradient: const LinearGradient(
begin: Alignment.topLeft,
@@ -485,9 +485,10 @@ class _CustomtextFormFieldPasswordState
labelStyle: const TextStyle(color: Colors.white),
errorStyle: TextStyle(
fontSize: 13.sp,
color: Color.fromARGB(255, 245, 130, 122),
color: const Color.fromARGB(255, 245, 130, 122),
),
contentPadding: EdgeInsets.symmetric(vertical: 10, horizontal: 0),
contentPadding:
const EdgeInsets.symmetric(vertical: 10, horizontal: 0),
filled: true,
fillColor:
Colors.transparent, // Make sure fillColor is transparent
@@ -504,7 +505,7 @@ class _CustomtextFormFieldPasswordState
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.only(right: 20.0),
padding: const EdgeInsets.only(right: 20.0),
child: SvgPicture.asset(
"assets/images/svg/loginpasswordclose.svg",
),
@@ -515,7 +516,7 @@ class _CustomtextFormFieldPasswordState
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.only(right: 20.0),
padding: const EdgeInsets.only(right: 20.0),
child: SvgPicture.asset(
'assets/images/svg/loginpasswordopen.svg',
),
@@ -614,7 +615,7 @@ class _SearchTextFormFieldState extends State<SearchTextFormField> {
width: double.infinity,
height: 50,
borderRadius: 10,
blur: 10,
blur: 6,
alignment: Alignment.bottomCenter,
border: 0.8,
linearGradient: LinearGradient(
@@ -624,7 +625,7 @@ class _SearchTextFormFieldState extends State<SearchTextFormField> {
const Color(0xFFffffff).withOpacity(0.04),
const Color(0xFFFFFFFF).withOpacity(0.05),
],
stops: [
stops: const [
0.1,
1,
]),
@@ -651,7 +652,7 @@ class _SearchTextFormFieldState extends State<SearchTextFormField> {
decoration: InputDecoration(
hintText: widget.hintText,
prefixIconColor: widget.prefixIconColor,
constraints: BoxConstraints(minHeight: 50),
constraints: const BoxConstraints(minHeight: 50),
hintStyle: TextStyle(
fontSize: 16.sp,
color: Colors.white,
@@ -667,7 +668,7 @@ class _SearchTextFormFieldState extends State<SearchTextFormField> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.only(right: 20.0),
padding: const EdgeInsets.only(right: 20.0),
child: SvgPicture.asset(
"assets/images/svg/loginpasswordclose.svg",
),
@@ -678,7 +679,7 @@ class _SearchTextFormFieldState extends State<SearchTextFormField> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
Padding(
padding: EdgeInsets.only(right: 20.0),
padding: const EdgeInsets.only(right: 20.0),
child: SvgPicture.asset(
'assets/images/svg/loginpasswordopen.svg',
),

77
lib/Utils/Common/blureffect.dart
View File

@@ -19,13 +19,10 @@ class CommonBlurLeftRed extends StatelessWidget {
shape: BoxShape.circle,
color: Color(0x4CD90B2E).withOpacity(0.5),
),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
),
);
@@ -49,13 +46,10 @@ class CommonBlurRightRed extends StatelessWidget {
shape: BoxShape.circle,
color: Color(0x4CD90B2E).withOpacity(0.5),
),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
),
);
@@ -79,13 +73,10 @@ class CommonBlurLeft extends StatelessWidget {
shape: BoxShape.circle,
color: Color(0xFF009DAB).withOpacity(0.50),
),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
),
);
@@ -109,13 +100,10 @@ class CommonBlurRight extends StatelessWidget {
shape: BoxShape.circle,
color: Color(0xFF009DAB).withOpacity(0.50),
),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
),
);
@@ -136,13 +124,10 @@ class CommonBlurLeftSecond extends StatelessWidget {
shape: BoxShape.circle,
color: Color(0x4CD90B2E).withOpacity(0.5),
),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
);
}
@@ -162,13 +147,10 @@ class CommonBlurRightSecond extends StatelessWidget {
shape: BoxShape.circle,
color: Color(0x4CD90B2E).withOpacity(0.5),
),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
);
}
@@ -188,13 +170,10 @@ class CommonBlurLeftBlue extends StatelessWidget {
shape: BoxShape.circle,
color: Color(0xFF009DAB).withOpacity(0.50),
),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
child: Container(
height: 200,
width: 200,
color: Colors.transparent,
),
);
}

11
lib/Utils/texts.dart
View File

@@ -21,6 +21,17 @@ Widget text22400white(String text) {
fontFamily: 'Helvetica'),
);
}
Widget text22400FCFCFC(String text) {
return Text(
text,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 22.sp,
color: Color(0xFFFCFCFC),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
);
}
Widget text20400white(String text) {
return Text(

18
lib/main.dart
View File

@@ -11,19 +11,15 @@ import 'package:permission_handler/permission_handler.dart';
import 'package:regroup/Utils/dialogs.dart';
import 'package:regroup/resources/routes/route_name.dart';
import 'package:regroup/resources/routes/routes.dart';
import 'package:shared_preferences/shared_preferences.dart';
// void main() {
// runApp(const MyApp());
// }
import 'package:statsfl/statsfl.dart';
Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
SharedPreferences prefs = await SharedPreferences.getInstance();
SystemChrome.setPreferredOrientations([
DeviceOrientation.portraitUp,
]).then((value) => runApp(const MyApp()));
]).then((value) => runApp(StatsFl(
align: Alignment.center, width: 200, height: 100, child: const MyApp())));
}
class MyApp extends StatefulWidget {
@@ -40,16 +36,14 @@ class _MyAppState extends State<MyApp> {
builder: (BuildContext context, Widget? child) => GetMaterialApp(
title: 'Regroup',
theme: ThemeData(
primarySwatch:
// createPrimarySwatch(Color(0xFF737373)),
Colors.grey,
primarySwatch: Colors.grey,
fontFamily: 'Cambria',
),
debugShowCheckedModeBanner: false,
initialRoute: RouteName.mainscreen,
initialRoute: RouteName.splashScreen,
getPages: AppRoutes.appRoutes(),
),
designSize: const Size(390, 848),
designSize: const Size(390, 844),
);
}
}

2
lib/onboarding/Signup/View/Business/step1Letusunderstandbetter.dart
View File

@@ -56,7 +56,7 @@ class _LetusUnderstandState extends State<LetusUnderstand> {
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

2
lib/onboarding/Signup/View/Business/step2Selectgroup.dart
View File

@@ -39,7 +39,7 @@ class _SelectgroupStep2State extends State<SelectgroupStep2> {
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

2
lib/onboarding/Signup/View/Business/step3SelectCommunity.dart
View File

@@ -39,7 +39,7 @@ class _SelectBusinessCommunityState extends State<SelectBusinessCommunity> {
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

2
lib/onboarding/Signup/View/Business/tellusbusiness.dart
View File

@@ -58,7 +58,7 @@ class _TellusaboutBusinessState extends State<TellusaboutBusiness> {
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

2
lib/onboarding/Signup/View/Individual/step1Selectprofile.dart
View File

@@ -35,7 +35,7 @@ class _SelectIndividualProfileState extends State<SelectIndividualProfile> {
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

2
lib/onboarding/Signup/View/Individual/step2Selectactivity.dart
View File

@@ -65,7 +65,7 @@ class _SelectIndividualActivityState extends State<SelectIndividualActivity> {
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

2
lib/onboarding/Signup/View/Individual/step3Selectyourgroup.dart
View File

@@ -39,7 +39,7 @@ class _SelectIndividualGroupState extends State<SelectIndividualGroup> {
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

2
lib/onboarding/Signup/View/Individual/step4Selectyourcommunity.dart
View File

@@ -39,7 +39,7 @@ class _SelectIndividualCommunityState extends State<SelectIndividualCommunity> {
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

2
lib/onboarding/Signup/View/Individual/tellusindividual.dart
View File

@@ -128,7 +128,7 @@ class _TellusaboutIndividualState extends State<TellusaboutIndividual> {
// 500.h,
MediaQuery.of(context).size.height,
borderRadius: 2,
blur: 10,
blur: 6,
alignment: Alignment.bottomLeft,
border: 2,
linearGradient: LinearGradient(

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