From 6fd6ea9535acf3913e0c60e4a7c2dab0f7be88a7 Mon Sep 17 00:00:00 2001 From: Rajshinde046 Date: Fri, 10 May 2024 13:19:19 +0530 Subject: [PATCH] color change --- lib/Utils/Common/CommonTabBar.dart | 6 ++- lib/Utils/Common/commonBotton.dart | 42 +++++++++---------- .../Common/comonGlassmorphicContainer.dart | 10 ++--- lib/Utils/dialogs.dart | 2 +- lib/Utils/image_preview_screen.dart | 2 +- lib/Utils/utils.dart | 2 +- lib/data/network/network_api_services.dart | 2 +- lib/view/MainScreen/ExploreUnseen.dart | 7 +++- lib/view/MainScreen/HomeScreen.dart | 22 +++++----- lib/view/MainScreen/ShortTrade.dart | 4 +- lib/view/Sidemenu/AboutUs.dart | 2 +- lib/view/Sidemenu/ContentByte/AudioMore.dart | 2 +- .../Sidemenu/ContentByte/ContentBytes.dart | 2 +- .../Sidemenu/ContentByte/PlayerWidget.dart | 2 +- lib/view/Sidemenu/ContentByte/ReadMore.dart | 2 +- lib/view/Sidemenu/ContentByte/VideosMore.dart | 2 +- lib/view/Sidemenu/FaqScreen.dart | 2 +- lib/view/Sidemenu/PrivacyPolicy.dart | 2 +- lib/view/Sidemenu/TermsAndCondition.dart | 2 +- .../contactUs/contact_us_details.dart | 2 +- .../Sidemenu/contactUs/contact_us_main.dart | 2 +- .../Sidemenu/myProfile/my_profile_screen.dart | 2 +- lib/view/login/LoginScreen.dart | 12 ++++-- lib/view/login/UpdateRiskProfile.dart | 2 +- lib/view/onBoarding/splashScreen1.dart | 8 ++-- 25 files changed, 77 insertions(+), 68 deletions(-) diff --git a/lib/Utils/Common/CommonTabBar.dart b/lib/Utils/Common/CommonTabBar.dart index 0159a35..84be562 100644 --- a/lib/Utils/Common/CommonTabBar.dart +++ b/lib/Utils/Common/CommonTabBar.dart @@ -8,13 +8,15 @@ class MyTabBar extends StatelessWidget { Widget build(BuildContext context) { return Container( decoration: BoxDecoration( - border: Border.all(color: Color(0Xff3A3A3A)), + border: Border.all( + color: Color(0Xff4A73FB).withOpacity(0.6), + ), borderRadius: BorderRadius.circular(8.r), ), padding: const EdgeInsets.all(10.0), // Set the desired padding child: TabBar( indicator: BoxDecoration( - color: const Color(0xff6C0000), + color: const Color(0xff00C236), borderRadius: BorderRadius.circular(5), ), isScrollable: false, diff --git a/lib/Utils/Common/commonBotton.dart b/lib/Utils/Common/commonBotton.dart index 55d296a..f1d3e18 100644 --- a/lib/Utils/Common/commonBotton.dart +++ b/lib/Utils/Common/commonBotton.dart @@ -11,7 +11,7 @@ Widget CommonBtn({void Function()? onTap, required String text}) { width: double.infinity, height: 50.h, decoration: BoxDecoration( - color: Color(0xff9A0000), borderRadius: BorderRadius.circular(5)), + color: Color(0xFF0093FF), borderRadius: BorderRadius.circular(5)), child: Center( child: Text( text, @@ -84,26 +84,26 @@ Widget CommonYesNoBtn({ ); } - // InkWell( - // onTap: onTap, - // child: Container( - // width: double.infinity, - // height: 50.h, - // decoration: BoxDecoration( - // color: Color(0xff9A0000), borderRadius: BorderRadius.circular(5)), - // child: Center( - // child: Text( - // text, - // textAlign: TextAlign.center, - // style: TextStyle( - // color: Colors.white, - // fontSize: 20.sp, - // fontFamily: 'Cambria', - // fontWeight: FontWeight.w400, - // ), - // ), - // ), - // )); +// InkWell( +// onTap: onTap, +// child: Container( +// width: double.infinity, +// height: 50.h, +// decoration: BoxDecoration( +// color: Color(0xff9A0000), borderRadius: BorderRadius.circular(5)), +// child: Center( +// child: Text( +// text, +// textAlign: TextAlign.center, +// style: TextStyle( +// color: Colors.white, +// fontSize: 20.sp, +// fontFamily: 'Cambria', +// fontWeight: FontWeight.w400, +// ), +// ), +// ), +// )); Widget kycBtn({ void Function()? onTap, required String text, diff --git a/lib/Utils/Common/comonGlassmorphicContainer.dart b/lib/Utils/Common/comonGlassmorphicContainer.dart index 5f4ec00..686c79e 100644 --- a/lib/Utils/Common/comonGlassmorphicContainer.dart +++ b/lib/Utils/Common/comonGlassmorphicContainer.dart @@ -17,20 +17,20 @@ Widget commonGlassContainer( begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Colors.white.withOpacity(0.1), - const Color(0xFFFFFFFF).withOpacity(0.05), + Color(0xFF2D7AEE).withOpacity(0.14), + const Color(0xFF2D7AEE).withOpacity(0.14), ], stops: const [ 0.1, 1, ], ), - borderGradient: const LinearGradient( + borderGradient: LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xff3A3A3A), - Color(0xFF3A3A3A), + Color(0xff4A73FB).withOpacity(0.6), + Color(0xFF4A73FB).withOpacity(0.6), ], ), child: customWidget); diff --git a/lib/Utils/dialogs.dart b/lib/Utils/dialogs.dart index c9991a3..bd47f89 100644 --- a/lib/Utils/dialogs.dart +++ b/lib/Utils/dialogs.dart @@ -19,7 +19,7 @@ class utils { mainAxisAlignment: MainAxisAlignment.center, children: [ CircularProgressIndicator( - color: Colors.red, + color: Color(0xFF0093FF), ), ], ), diff --git a/lib/Utils/image_preview_screen.dart b/lib/Utils/image_preview_screen.dart index c231427..f3237d8 100644 --- a/lib/Utils/image_preview_screen.dart +++ b/lib/Utils/image_preview_screen.dart @@ -44,7 +44,7 @@ class _ImagePreviewScreenState extends State { placeholder: (context, url) { return const Center( child: CircularProgressIndicator( - color: Colors.redAccent, + color: Color(0xff0093FF), ), ); }, diff --git a/lib/Utils/utils.dart b/lib/Utils/utils.dart index 51bc70a..1ca7bad 100644 --- a/lib/Utils/utils.dart +++ b/lib/Utils/utils.dart @@ -57,7 +57,7 @@ class Utils { mainAxisAlignment: MainAxisAlignment.center, children: [ CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ], ), diff --git a/lib/data/network/network_api_services.dart b/lib/data/network/network_api_services.dart index f8d6f6f..6f9fc9d 100644 --- a/lib/data/network/network_api_services.dart +++ b/lib/data/network/network_api_services.dart @@ -72,7 +72,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( diff --git a/lib/view/MainScreen/ExploreUnseen.dart b/lib/view/MainScreen/ExploreUnseen.dart index fe3cb8c..bcd2cdf 100644 --- a/lib/view/MainScreen/ExploreUnseen.dart +++ b/lib/view/MainScreen/ExploreUnseen.dart @@ -47,7 +47,9 @@ class _ExploreUnseenState extends State { CommonBlurRight(), Obx( () => isApiCalling.value - ? CircularProgressIndicator() + ? Center( + child: CircularProgressIndicator( color: Color(0xFF0093FF),), + ) : Stack( children: [ Padding( @@ -56,7 +58,7 @@ class _ExploreUnseenState extends State { ), child: isApiCalling.value ? Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator( color: Color(0xFF0093FF),), ) : ListView( physics: BouncingScrollPhysics(), @@ -64,6 +66,7 @@ class _ExploreUnseenState extends State { text22W600('Explore The Unseen'), sizedBoxHeight(35.h), ListView.builder( + physics: NeverScrollableScrollPhysics(), shrinkWrap: true, itemCount: exploreModel.data! .exploreTheUnseenActiveCalls!.length, diff --git a/lib/view/MainScreen/HomeScreen.dart b/lib/view/MainScreen/HomeScreen.dart index 7c8df8f..ec4d9a3 100644 --- a/lib/view/MainScreen/HomeScreen.dart +++ b/lib/view/MainScreen/HomeScreen.dart @@ -106,7 +106,7 @@ class _HomeScreenState extends State { const EdgeInsets.symmetric(horizontal: 16, vertical: 16), child: isApiCalling.value ? Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator( color: Color(0xFF0093FF),), ) : ListView( physics: const BouncingScrollPhysics(), @@ -201,8 +201,8 @@ class _HomeScreenState extends State { height: 35.h, width: 105.w, decoration: BoxDecoration( - color: const Color(0xFF3A3A3A) - .withOpacity(0.6), + color: const Color(0xFF0093FF), + // .withOpacity(0.6), borderRadius: BorderRadius.circular(5.r), border: Border.all( @@ -588,8 +588,8 @@ Widget ProductWidget({required String text, required String subtext}) { begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Colors.white.withOpacity(0.1), - const Color(0xFFFFFFFF).withOpacity(0.05), + Color(0xFF2D7AEE).withOpacity(0.14), + const Color(0xFF2D7AEE).withOpacity(0.14), ], stops: [ 0.1, @@ -599,8 +599,8 @@ Widget ProductWidget({required String text, required String subtext}) { begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xff3A3A3A), - Color(0xFF3A3A3A), + Color(0xff0F2C53), + Color(0xFF0F2C53), ], ), child: Padding( @@ -633,8 +633,8 @@ Widget commoncontainer( begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Colors.white.withOpacity(0.1), - const Color(0xFFFFFFFF).withOpacity(0.05), + Color(0xFF2D7AEE).withOpacity(0.14), + const Color(0xFF2D7AEE).withOpacity(0.14), ], stops: [ 0.1, @@ -644,8 +644,8 @@ Widget commoncontainer( begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - Color(0xff3A3A3A), - Color(0xFF3A3A3A), + Color(0xff0F2C53), + Color(0xFF0F2C53), ], ), child: Padding( diff --git a/lib/view/MainScreen/ShortTrade.dart b/lib/view/MainScreen/ShortTrade.dart index 27fcac4..a58ef3f 100644 --- a/lib/view/MainScreen/ShortTrade.dart +++ b/lib/view/MainScreen/ShortTrade.dart @@ -148,7 +148,7 @@ class _ShortTradeState extends State { productsController.isLoaded.value ? const Center( child: CircularProgressIndicator( - color: Colors.redAccent, + color: Color(0xFF0093FF), ), ) : DefaultTabController( @@ -970,7 +970,7 @@ class _ShortTradeState extends State { width: 126.w, decoration: BoxDecoration( borderRadius: BorderRadius.circular(5), - color: const Color(0Xff6C0000), + color: const Color(0Xff0093FF), ), child: Center(child: text16W500(text)), ) diff --git a/lib/view/Sidemenu/AboutUs.dart b/lib/view/Sidemenu/AboutUs.dart index dd1d71c..f15cd6c 100644 --- a/lib/view/Sidemenu/AboutUs.dart +++ b/lib/view/Sidemenu/AboutUs.dart @@ -43,7 +43,7 @@ class _AboutUsState extends State { isLoading.value ? const Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ) : Stack( diff --git a/lib/view/Sidemenu/ContentByte/AudioMore.dart b/lib/view/Sidemenu/ContentByte/AudioMore.dart index f9c4d6b..646f63b 100644 --- a/lib/view/Sidemenu/ContentByte/AudioMore.dart +++ b/lib/view/Sidemenu/ContentByte/AudioMore.dart @@ -204,7 +204,7 @@ class _VideosMoreState extends State { isLoading.value ? const Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ) : Stack( diff --git a/lib/view/Sidemenu/ContentByte/ContentBytes.dart b/lib/view/Sidemenu/ContentByte/ContentBytes.dart index baeb179..9e42349 100644 --- a/lib/view/Sidemenu/ContentByte/ContentBytes.dart +++ b/lib/view/Sidemenu/ContentByte/ContentBytes.dart @@ -1124,7 +1124,7 @@ class _VideosState extends State { Gap(50), Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ), ], diff --git a/lib/view/Sidemenu/ContentByte/PlayerWidget.dart b/lib/view/Sidemenu/ContentByte/PlayerWidget.dart index 0d4bb05..b7f192b 100644 --- a/lib/view/Sidemenu/ContentByte/PlayerWidget.dart +++ b/lib/view/Sidemenu/ContentByte/PlayerWidget.dart @@ -76,6 +76,6 @@ class _PlayerWidgetState extends State { ), ), ) - : Center(child: CircularProgressIndicator()); + : Center(child: CircularProgressIndicator( color: Color(0xFF0093FF),)); } } diff --git a/lib/view/Sidemenu/ContentByte/ReadMore.dart b/lib/view/Sidemenu/ContentByte/ReadMore.dart index f7ffa64..7c38127 100644 --- a/lib/view/Sidemenu/ContentByte/ReadMore.dart +++ b/lib/view/Sidemenu/ContentByte/ReadMore.dart @@ -71,7 +71,7 @@ class _VideosMoreState extends State { isLoading.value ? const Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ) : Stack( diff --git a/lib/view/Sidemenu/ContentByte/VideosMore.dart b/lib/view/Sidemenu/ContentByte/VideosMore.dart index 55ba0b8..af99270 100644 --- a/lib/view/Sidemenu/ContentByte/VideosMore.dart +++ b/lib/view/Sidemenu/ContentByte/VideosMore.dart @@ -69,7 +69,7 @@ class _VideosMoreState extends State { isLoading.value ? const Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ) : SingleChildScrollView( diff --git a/lib/view/Sidemenu/FaqScreen.dart b/lib/view/Sidemenu/FaqScreen.dart index e7bbae1..514c852 100644 --- a/lib/view/Sidemenu/FaqScreen.dart +++ b/lib/view/Sidemenu/FaqScreen.dart @@ -68,7 +68,7 @@ class _FaqScreenState extends State { isLoading.value ? const Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ) : Stack(children: [ diff --git a/lib/view/Sidemenu/PrivacyPolicy.dart b/lib/view/Sidemenu/PrivacyPolicy.dart index ffb16f5..0a4bff5 100644 --- a/lib/view/Sidemenu/PrivacyPolicy.dart +++ b/lib/view/Sidemenu/PrivacyPolicy.dart @@ -43,7 +43,7 @@ class _PrivacyPolicyState extends State { isLoading.value ? const Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ) : Stack( diff --git a/lib/view/Sidemenu/TermsAndCondition.dart b/lib/view/Sidemenu/TermsAndCondition.dart index 71d2591..aad7c74 100644 --- a/lib/view/Sidemenu/TermsAndCondition.dart +++ b/lib/view/Sidemenu/TermsAndCondition.dart @@ -44,7 +44,7 @@ class _TermsAndConditionsState extends State { isLoading.value ? const Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ) : Stack( diff --git a/lib/view/Sidemenu/contactUs/contact_us_details.dart b/lib/view/Sidemenu/contactUs/contact_us_details.dart index 71b22fe..415d891 100644 --- a/lib/view/Sidemenu/contactUs/contact_us_details.dart +++ b/lib/view/Sidemenu/contactUs/contact_us_details.dart @@ -98,7 +98,7 @@ class _ContactUsDetailsScreenState extends State { contactUsController.isDetailsLoading.value ? const Center( child: - CircularProgressIndicator(color: Color(0xFF9A0000)), + CircularProgressIndicator( color: Color(0xFF0093FF),), ) : Stack(children: [ SingleChildScrollView( diff --git a/lib/view/Sidemenu/contactUs/contact_us_main.dart b/lib/view/Sidemenu/contactUs/contact_us_main.dart index 365c3a7..69e7e02 100644 --- a/lib/view/Sidemenu/contactUs/contact_us_main.dart +++ b/lib/view/Sidemenu/contactUs/contact_us_main.dart @@ -104,7 +104,7 @@ class _ContactUsMainScreenState extends State { child: contactUsController.isLoading.value ? const Center( child: CircularProgressIndicator( - color: Colors.redAccent, + color: Color(0xFF0093FF), )) : isEmpty.value ? Center(child: text18W800("No Data Available")) diff --git a/lib/view/Sidemenu/myProfile/my_profile_screen.dart b/lib/view/Sidemenu/myProfile/my_profile_screen.dart index 2022b0b..6435e7f 100644 --- a/lib/view/Sidemenu/myProfile/my_profile_screen.dart +++ b/lib/view/Sidemenu/myProfile/my_profile_screen.dart @@ -184,7 +184,7 @@ class _MyProfileScreenState extends State { isLoading.value ? const Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ) : Stack( diff --git a/lib/view/login/LoginScreen.dart b/lib/view/login/LoginScreen.dart index c61bad2..e705dd6 100644 --- a/lib/view/login/LoginScreen.dart +++ b/lib/view/login/LoginScreen.dart @@ -239,10 +239,14 @@ class _LoginScreenState extends State { print(state); if (state == SendOtpState.loading) { return Center( - child: Container( - height: 40, - width: 40, - child: CircularProgressIndicator())); + child: Container( + height: 40, + width: 40, + child: CircularProgressIndicator( + color: Color(0xFF0093FF), + ), + ), + ); } return CommonBtn( text: "Login/Signup", diff --git a/lib/view/login/UpdateRiskProfile.dart b/lib/view/login/UpdateRiskProfile.dart index 5a84500..41eaf81 100644 --- a/lib/view/login/UpdateRiskProfile.dart +++ b/lib/view/login/UpdateRiskProfile.dart @@ -66,7 +66,7 @@ class _UpdateRiskProfileState extends State { () => isLoading.value ? const Center( child: CircularProgressIndicator( - color: Color(0xFF9A0000), + color: Color(0xFF0093FF), ), ) : Stack( diff --git a/lib/view/onBoarding/splashScreen1.dart b/lib/view/onBoarding/splashScreen1.dart index 3ba3a93..b04ccfe 100644 --- a/lib/view/onBoarding/splashScreen1.dart +++ b/lib/view/onBoarding/splashScreen1.dart @@ -174,10 +174,10 @@ class CommonBlurLeft extends StatelessWidget { width: 200, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0xFF9A0000).withOpacity(0.5), + color: Color(0xFF001D54).withOpacity(0.5), ), child: BackdropFilter( - filter: ImageFilter.blur(sigmaX: 60, sigmaY: 60), + filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30), child: Container( height: 200, width: 200, @@ -204,10 +204,10 @@ class CommonBlurRight extends StatelessWidget { width: 200, decoration: BoxDecoration( shape: BoxShape.circle, - color: Color(0xFF9A0000).withOpacity(0.5), + color: Color(0xFF001D54).withOpacity(0.5), ), child: BackdropFilter( - filter: ImageFilter.blur(sigmaX: 60, sigmaY: 60), + filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30), child: Container( height: 200, width: 200,