Skip to content

GitLab

Commit 6f73c3f4 authored by Sai Srinivas's avatar Sai Srinivas
Browse files

UI changes

parent 72fe8e92
Expand all Hide whitespace changes
Inline Side-by-side
lib/Screens/HelpAndComplaintScreens/ComplaintListScreen.dart
View file @ 6f73c3f4
...@@ -204,7 +204,7 @@ class _ComplaintListScreenState extends State<ComplaintListScreen> { ...@@ -204,7 +204,7 @@ class _ComplaintListScreenState extends State<ComplaintListScreen> {
physics: const ClampingScrollPhysics(), physics: const ClampingScrollPhysics(),
slivers: <Widget>[ slivers: <Widget>[
SliverAppBar( SliverAppBar(
leading: Container(), automaticallyImplyLeading: false,
stretch: _stretch, stretch: _stretch,
backgroundColor: const Color(0xFF4076FF), backgroundColor: const Color(0xFF4076FF),
onStretchTrigger: () async { onStretchTrigger: () async {
...@@ -221,7 +221,7 @@ class _ComplaintListScreenState extends State<ComplaintListScreen> { ...@@ -221,7 +221,7 @@ class _ComplaintListScreenState extends State<ComplaintListScreen> {
StretchMode.blurBackground, StretchMode.blurBackground,
], ],
background: Container( background: Container(
decoration: const BoxDecoration(color: AppColors.primary), decoration: const BoxDecoration(gradient: AppColors.commonAppBarGradient),
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 16, horizontal: 16,
...@@ -259,7 +259,7 @@ class _ComplaintListScreenState extends State<ComplaintListScreen> { ...@@ -259,7 +259,7 @@ class _ComplaintListScreenState extends State<ComplaintListScreen> {
SliverToBoxAdapter( SliverToBoxAdapter(
child: Container( child: Container(
padding: const EdgeInsets.only(top: 1), padding: const EdgeInsets.only(top: 1),
color: AppColors.primary, color: AppColors.backgroundBottom,
child: Container( child: Container(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 16, horizontal: 16,
......
lib/Screens/HelpAndComplaintScreens/SelectOrderHelpScreen.dart
View file @ 6f73c3f4
...@@ -387,49 +387,76 @@ class _SelectOrderHelpScreenState extends State<SelectOrderHelpScreen> { ...@@ -387,49 +387,76 @@ class _SelectOrderHelpScreenState extends State<SelectOrderHelpScreen> {
/// AMC & Warranty tags /// AMC & Warranty tags
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
// Status Badge with checkmark for AMC Protected
if (amc == "1" || amc == "2") if (amc == "1" || amc == "2")
Container( Container(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 8, horizontal: 5,
vertical: 4, vertical: 4,
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: gradient:
amc == "1" amc == "1"
? AppColors.greenStripGradient ? AppColors.greenStripGradient
: AppColors.fadeGradient, : AppColors.fadeGradient,
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
SvgPicture.asset( Row(
"assets/svg/tick_ic.svg", children: [
height: 14, SvgPicture.asset(
color: "assets/svg/tick_ic.svg",
height: 14,
color:
amc == "1" amc == "1"
? AppColors.greenICBg ? AppColors.greenICBg
: AppColors.subtitleText, : AppColors.subtitleText,
), ),
const SizedBox(width: 4), const SizedBox(width: 2),
Text( Text(
"AMC Protected", "AMC ",
style: TextStyle( style: TextStyle(
fontSize: 11, fontSize: 11,
fontFamily: "PoppinsBold", fontFamily: "PoppinsBold",
fontStyle: FontStyle.italic, fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: color:
amc == "1" amc == "1"
? AppColors.greenICBg ? AppColors.greenICBg
: AppColors.subtitleText, : AppColors.subtitleText,
), ),
),
Text(
"Protected",
style: TextStyle(
fontSize: 11,
fontFamily: "PoppinsBold",
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700,
color:
amc == "1"
? AppColors.normalText
: AppColors.subtitleText,
),
),
SizedBox(width: 4),
if (amc == "2")
const Icon(
Icons.info_outline,
color: Colors.red,
size: 12,
),
],
), ),
], ],
), ),
), ),
if (amc == "1" || amc == "2") SizedBox(width: 16),
// for warranty
if (warranty == "1" || warranty == "2") if (warranty == "1" || warranty == "2")
Container( Container(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
...@@ -438,35 +465,44 @@ class _SelectOrderHelpScreenState extends State<SelectOrderHelpScreen> { ...@@ -438,35 +465,44 @@ class _SelectOrderHelpScreenState extends State<SelectOrderHelpScreen> {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: gradient:
warranty == "1" warranty == "1"
? AppColors.yellowStripGradient ? AppColors.yellowStripGradient
: AppColors.fadeGradient, : AppColors.fadeGradient,
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
SvgPicture.asset( Row(
"assets/svg/tick2_ic.svg", children: [
height: 14, SvgPicture.asset(
color: height: 14,
warranty == "1" warranty == "1"
? AppColors.warning ? "assets/svg/tick2_ic.svg"
: AppColors.subtitleText, : "assets/svg/tick3_ic.svg",
), ),
const SizedBox(width: 4), const SizedBox(width: 2),
Text( Text(
"Warranty", "Warranty",
style: TextStyle( style: TextStyle(
fontSize: 11, fontSize: 11,
fontFamily: "PoppinsBold", fontFamily: "PoppinsBold",
fontStyle: FontStyle.italic, fontStyle: FontStyle.italic,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: color:
warranty == "1" warranty == "1"
? AppColors.normalText ? AppColors.normalText
: AppColors.subtitleText, : AppColors.subtitleText,
), ),
),
SizedBox(width: 4),
if (warranty == "2")
const Icon(
Icons.info_outline,
color: Colors.red,
size: 12,
),
],
), ),
], ],
), ),
......
lib/Screens/HomeScreen.dart
View file @ 6f73c3f4
This diff is collapsed.
lib/Screens/SplashScreen.dart
View file @ 6f73c3f4
...@@ -399,7 +399,7 @@ class _SplashScreenState extends State<SplashScreen> with SingleTickerProviderSt ...@@ -399,7 +399,7 @@ class _SplashScreenState extends State<SplashScreen> with SingleTickerProviderSt
child: Column( child: Column(
children: [ children: [
Text( Text(
"Gen Services", "My Gen",
style: TextStyle( style: TextStyle(
fontSize: 36, fontSize: 36,
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
......
lib/Screens/generatorDetailsScreen.dart
View file @ 6f73c3f4
This diff is collapsed.
lib/main.dart
View file @ 6f73c3f4
...@@ -41,7 +41,7 @@ class MyApp extends StatelessWidget { ...@@ -41,7 +41,7 @@ class MyApp extends StatelessWidget {
builder: (context, themeProvider, child) { builder: (context, themeProvider, child) {
return MaterialApp( return MaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
title: 'Gen Services', title: 'My Gen',
theme: ThemeData( theme: ThemeData(
fontFamily: 'Poppins', fontFamily: 'Poppins',
), ),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment