diff --git a/lib/data/network/network_api_services.dart b/lib/data/network/network_api_services.dart index 6f9fc9d..4de2ee2 100644 --- a/lib/data/network/network_api_services.dart +++ b/lib/data/network/network_api_services.dart @@ -38,6 +38,14 @@ class NetworkApiServices { data: response.data, ResponseStatus.SUCCESS, ); + } else if (response.statusCode == 203) { + print(response.data); + return ResponseData("validation", ResponseStatus.PRIVATE, + data: response.data); + } else if (response.statusCode == 202) { + print(response.data); + return ResponseData("success", ResponseStatus.PRIVATE, + data: response.data); } else { try { return ResponseData( @@ -72,7 +80,7 @@ class NetworkApiServices { SharedPreferences prefs = await SharedPreferences.getInstance(); String? token = prefs.getString('accessToken'); try { - response = await dio.post(url, + response = await dio.post(url, data: data, options: (token == null || token == "") ? Options( @@ -99,9 +107,9 @@ class NetworkApiServices { return ResponseData("success", ResponseStatus.SUCCESS, data: response.data); } else if (response.statusCode == 203) { - print(response.data); + print(response.data['message'].toString()); return ResponseData("validation", ResponseStatus.PRIVATE, - data: response.data); + data: response.data['message'].toString()); } else if (response.statusCode == 202) { print(response.data); return ResponseData("success", ResponseStatus.PRIVATE, diff --git a/lib/view/MainScreen/HomeScreen.dart b/lib/view/MainScreen/HomeScreen.dart index 7bb4de5..d814644 100644 --- a/lib/view/MainScreen/HomeScreen.dart +++ b/lib/view/MainScreen/HomeScreen.dart @@ -186,6 +186,8 @@ class _HomeScreenState extends State { : SingleChildScrollView( scrollDirection: Axis.horizontal, child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceAround, children: [ commoncontainer( width: 250.w, @@ -210,7 +212,7 @@ class _HomeScreenState extends State { .nSEINDEXNifty50!.lastPrice!, ), ), - sizedBoxWidth(8.w), + sizedBoxWidth(10.w), commoncontainer( width: 250.w, text: homeModel @@ -417,7 +419,7 @@ class _HomeScreenState extends State { child: text16W400_DADADA( 'The Beauty and Power of Video')), // sizedBoxWidth(10.w), - const Spacer(), + SizedBox(width: 4), InkWell( onTap: () { Get.toNamed(RouteName.contentbytes); @@ -807,7 +809,7 @@ Widget commoncontainer({ ), ), child: Padding( - padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 5.w), + padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 4.w), child: Column( children: [ Row( @@ -832,7 +834,7 @@ Widget commoncontainer({ ), ], ), - sizedBoxHeight(8.w), + sizedBoxHeight(6.w), text14W400( rate.contains("-") ? "$rate ($percentageChange%)" diff --git a/lib/view/MainScreen/ShortTrade.dart b/lib/view/MainScreen/ShortTrade.dart index ca505a7..a72fed1 100644 --- a/lib/view/MainScreen/ShortTrade.dart +++ b/lib/view/MainScreen/ShortTrade.dart @@ -164,6 +164,8 @@ class _ShortTradeState extends State { SizedBox( height: 0.57.sh, child: TabBarView( + physics: + NeverScrollableScrollPhysics(), children: [ ActiveCallsTab(productsController .selectedIndex.value == @@ -460,8 +462,7 @@ class _ShortTradeState extends State { ), ), ); - - } + } void _unlockbottomsheet() { Get.bottomSheet( diff --git a/lib/view/login/LoginScreen.dart b/lib/view/login/LoginScreen.dart index ad440ea..09c17c3 100644 --- a/lib/view/login/LoginScreen.dart +++ b/lib/view/login/LoginScreen.dart @@ -250,7 +250,7 @@ class _LoginScreenState extends State { if (isValid!) { FocusManager.instance.primaryFocus ?.unfocus(); - if (isValid != null && isValid) { + if (isValid != null && isValid) { Map myLoginData = { "mobile_number": phonecontroller.text, }; diff --git a/lib/view_model/SendOtp/sendOtpbloc.dart b/lib/view_model/SendOtp/sendOtpbloc.dart index 0ba9db0..667784e 100644 --- a/lib/view_model/SendOtp/sendOtpbloc.dart +++ b/lib/view_model/SendOtp/sendOtpbloc.dart @@ -20,7 +20,8 @@ class SendOtpBloc extends Bloc { if (resp.status == ResponseStatus.SUCCESS) { emit(SendOtpState.success); - } else { + } + else { emit(SendOtpState.failure); } } catch (e) { diff --git a/pubspec.lock b/pubspec.lock index 0317477..d491882 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -732,26 +732,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lints: dependency: transitive description: @@ -844,10 +844,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mime: dependency: transitive description: @@ -1297,10 +1297,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timeago: dependency: "direct main" description: @@ -1474,10 +1474,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" wakelock: dependency: transitive description: @@ -1568,4 +1568,4 @@ packages: version: "6.3.0" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.16.0" + flutter: ">=3.18.0-18.0.pre.54"