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 ecd0fa6..d8d2085 100644 --- a/lib/view/MainScreen/HomeScreen.dart +++ b/lib/view/MainScreen/HomeScreen.dart @@ -185,6 +185,8 @@ class _HomeScreenState extends State { : SingleChildScrollView( scrollDirection: Axis.horizontal, child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceAround, children: [ commoncontainer( width: 250.w, @@ -209,7 +211,7 @@ class _HomeScreenState extends State { .nSEINDEXNifty50!.lastPrice!, ), ), - sizedBoxWidth(8.w), + sizedBoxWidth(10.w), commoncontainer( width: 250.w, text: homeModel @@ -416,7 +418,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); @@ -805,7 +807,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( @@ -830,7 +832,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 b94c4ed..fe70e15 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1273,10 +1273,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: