diff --git a/assets/images/png/Delete.png b/assets/images/png/Delete.png new file mode 100644 index 0000000..661d0c5 Binary files /dev/null and b/assets/images/png/Delete.png differ diff --git a/lib/resources/routes/route_name.dart b/lib/resources/routes/route_name.dart index f5555f5..cde8a51 100644 --- a/lib/resources/routes/route_name.dart +++ b/lib/resources/routes/route_name.dart @@ -16,8 +16,6 @@ class RouteName { static const String notification = '/notification'; static const String exploreUnseen = '/exploreUnseen'; - - static const String verifyotp = '/verifyotp'; //secureaccess @@ -40,7 +38,6 @@ class RouteName { static const String termsandcondition = '/termsandcondition'; static const String privacypolicy = '/privacypolicy'; static const String aboutus = '/aboutus'; - + static const String settings = '/settings'; static const String faqscreen = '/faqscreen'; - } diff --git a/lib/resources/routes/routes.dart b/lib/resources/routes/routes.dart index 780542a..2bf0c2a 100644 --- a/lib/resources/routes/routes.dart +++ b/lib/resources/routes/routes.dart @@ -5,6 +5,7 @@ import 'package:traderscircuit/view/MainScreen/ExploreUnseen.dart'; import 'package:traderscircuit/view/Sidemenu/AboutUs.dart'; import 'package:traderscircuit/view/Sidemenu/FaqScreen.dart'; import 'package:traderscircuit/view/Sidemenu/PrivacyPolicy.dart'; +import 'package:traderscircuit/view/Sidemenu/Settings.dart'; import 'package:traderscircuit/view/Sidemenu/TermsAndCondition.dart'; import 'package:traderscircuit/view/login/AddDetails.dart'; @@ -141,9 +142,13 @@ class AppRoutes { name: RouteName.aboutus, page: () => const AboutUs(), ), - GetPage( + GetPage( name: RouteName.faqscreen, page: () => const FaqScreen(), ), + GetPage( + name: RouteName.settings, + page: () => const Settings(), + ), ]; } diff --git a/lib/view/Sidemenu/Settings.dart b/lib/view/Sidemenu/Settings.dart new file mode 100644 index 0000000..ac776fb --- /dev/null +++ b/lib/view/Sidemenu/Settings.dart @@ -0,0 +1,174 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:traderscircuit/Utils/Common/CommonAppbar.dart'; +import 'package:traderscircuit/Utils/text.dart'; +import 'package:traderscircuit/view/onBoarding/splashScreen1.dart'; + +class Settings extends StatefulWidget { + const Settings({super.key}); + + @override + State createState() => _SettingsState(); +} + +class _SettingsState extends State { + bool isSwitched = false; + + void _toggleSwitch(bool value) { + setState(() { + isSwitched = value; + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: CommonAppbar( + titleTxt: "Settings", + ), + backgroundColor: Colors.black, + extendBody: true, + body: Stack( + children: [ + CommonBlurLeft(), + CommonBlurRight(), + Stack( + children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 16, vertical: 16), + child: ListView( + physics: BouncingScrollPhysics(), + // mainAxisAlignment: MainAxisAlignment.start, + // crossAxisAlignment: CrossAxisAlignment.start, + + children: [ + // CommonDropdownBtn(hint: "hint", items: ["hi", "hii"]), + SizedBox( + height: 10.h, + ), + Row( + children: [ + text20W400("Dark Mode"), + Spacer(), + Switch( + value: isSwitched, + onChanged: _toggleSwitch, + activeTrackColor: Colors.green, + activeColor: Colors.white, + inactiveTrackColor: Colors.white, + inactiveThumbColor: Colors.black, + ), + ], + ), + SizedBox( + height: 40.h, + ), + Row( + children: [ + text18W500("Setup your security"), + Spacer(), + Icon( + Icons.arrow_forward_ios_rounded, + color: Colors.white, + size: 24, + ) + ], + ), + SizedBox( + height: 50.h, + ), + text25W600("Notifications"), + SizedBox( + height: 30.h, + ), + Row( + children: [ + text20W400("WhatsApp Notifications"), + Spacer(), + Switch( + value: isSwitched, + onChanged: _toggleSwitch, + activeTrackColor: Colors.green, + activeColor: Colors.white, + inactiveTrackColor: Colors.white, + inactiveThumbColor: Colors.black, + ), + ], + ), + SizedBox( + height: 40.h, + ), + Row( + children: [ + text20W400("In - App Notifications"), + Spacer(), + Switch( + value: isSwitched, + onChanged: _toggleSwitch, + activeTrackColor: Colors.green, + activeColor: Colors.white, + inactiveTrackColor: Colors.white, + inactiveThumbColor: Colors.black, + ), + ], + ), + SizedBox( + height: 40.h, + ), + Row( + children: [ + text20W400("Push Notifications"), + Spacer(), + Switch( + value: isSwitched, + onChanged: _toggleSwitch, + activeTrackColor: Colors.green, + activeColor: Colors.white, + inactiveTrackColor: Colors.white, + inactiveThumbColor: Colors.black, + ), + ], + ), + SizedBox( + height: 40.h, + ), + Row( + children: [ + text20W400("E-mail Notifications"), + Spacer(), + Switch( + value: isSwitched, + onChanged: _toggleSwitch, + activeTrackColor: Colors.green, + activeColor: Colors.white, + inactiveTrackColor: Colors.white, + inactiveThumbColor: Colors.black, + ), + ], + ), + SizedBox( + height: 60.h, + ), + Row( + children: [ + Image.asset( + "assets/images/png/Delete.png", + width: 20, + height: 22, + ), + SizedBox( + width: 15.w, + ), + text20W400("Delete Account") + ], + ), + ], + ), + ), + ], + ), + ], + ), + ); + } +} diff --git a/lib/view/Sidemenu/Sidemenu.dart b/lib/view/Sidemenu/Sidemenu.dart index 97c692a..a9a339a 100644 --- a/lib/view/Sidemenu/Sidemenu.dart +++ b/lib/view/Sidemenu/Sidemenu.dart @@ -430,7 +430,7 @@ void navigateTo(int index, BuildContext context) { break; case 6: { - // Get.toNamed(RouteName.settings); + Get.toNamed(RouteName.settings); } break; diff --git a/pubspec.lock b/pubspec.lock index 11fcd3a..51e3896 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -81,6 +81,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" + cross_file: + dependency: transitive + description: + name: cross_file + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + url: "https://pub.dev" + source: hosted + version: "0.3.3+8" crypto: dependency: transitive description: @@ -89,7 +97,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.3" - cupertino_icons: dependency: "direct main" description: @@ -261,10 +268,10 @@ packages: dependency: transitive description: name: http - sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba url: "https://pub.dev" source: hosted - version: "0.13.6" + version: "1.2.0" http_parser: dependency: transitive description: @@ -277,26 +284,26 @@ packages: dependency: "direct main" description: name: image_cropper - sha256: "542c3453109d16bcc388e43ae2276044d2cd6a6d20c68bdcff2c94ab9363ea15" + sha256: f4bad5ed2dfff5a7ce0dfbad545b46a945c702bb6182a921488ef01ba7693111 url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "5.0.1" image_cropper_for_web: dependency: transitive description: name: image_cropper_for_web - sha256: "89c936aa772a35b69ca67b78049ae9fa163a4fb8da2f6dee3893db8883fb49d2" + sha256: "865d798b5c9d826f1185b32e5d0018c4183ddb77b7b82a931e1a06aa3b74974e" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" image_cropper_platform_interface: dependency: transitive description: name: image_cropper_platform_interface - sha256: b232175c132b2f7ede3e1f101652bcd635cb4079a77c6dded8e6d32e6578d685 + sha256: ee160d686422272aa306125f3b6fb1c1894d9b87a5e20ed33fa008e7285da11e url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" image_picker: dependency: "direct main" description: @@ -376,9 +383,15 @@ packages: sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "2.1.1" - + lottie: + dependency: "direct main" + description: + name: lottie + sha256: ce2bb2605753915080e4ee47f036a64228c88dc7f56f7bc1dbe912d75b55b1e2 + url: "https://pub.dev" + source: hosted + version: "3.1.0" matcher: dependency: transitive description: @@ -689,5 +702,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index f352490..0903bb8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,12 +23,12 @@ dependencies: fluttertoast: ^8.0.9 dropdown_button2: ^2.1.4 - lottie: ^3.1.0 + lottie: ^3.0.0 gap: ^3.0.1 image_picker: ^1.0.7 dotted_border: ^2.1.0 - image_cropper: ^4.0.1 + image_cropper: ^5.0.1 dev_dependencies: