SS-FCSC/uaestats_fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chat screen issue fix

Browse Source
This commit is contained in:
venbaittech 2025-02-11 17:36:57 +05:30
parent f99e8cd974
commit 3d6658e7c0
3 changed files with 230 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart
View File

@ -42,7 +42,9 @@ class UaeNumbers extends StatelessWidget {
'UAE Numbers', 'UAE Numbers',
'أرقام الإمارات', 'أرقام الإمارات',
)), )),
body: uaenumberWidget(), body: uaenumberWidget(),
), ),
); );
} }
@ -117,8 +119,8 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
hintStyle: TextStyle(color: Color(0xFF898C81)), hintStyle: TextStyle(color: Color(0xFF898C81)),
prefixIcon: Image.asset( prefixIcon: Image.asset(
MiscIconAssetPath.search, MiscIconAssetPath.search,
width: 15, // width: 15,
height: 10, // height: 10,
), ),
border: InputBorder.none, border: InputBorder.none,
contentPadding: contentPadding:

338
lib/presentation/Screens/charts/screens/chart_screen.dart
View File

@ -13,7 +13,7 @@ import 'package:uae_stat/presentation/Screens/charts/widgets/chart_widget.dart';
import 'package:uae_stat/presentation/components/indicators/locale_provider.dart'; import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
import 'package:uae_stat/presentation/components/my_toggle.dart'; import 'package:uae_stat/presentation/components/my_toggle.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
import 'package:uae_stat/presentation/Screens/app_tour/Target_content.dart'; import 'package:uae_stat/presentation/Screens/app_tour/Target_content.dart';
import '../filters/search_filter_helper.dart'; import '../filters/search_filter_helper.dart';
@ -1826,50 +1826,60 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
double mywidth = MediaQuery.of(context).size.width; double mywidth = MediaQuery.of(context).size.width;
final color = final color =
Color(int.parse(widget.bgColor.replaceFirst('0x', ''), radix: 16)); Color(int.parse(widget.bgColor.replaceFirst('0x', ''), radix: 16));
return Scaffold( return BaseScaffold(
key: _scaffoldKey, key: _scaffoldKey,
backgroundColor: color, // backgroundColor: color,
appBar: AppBar( // appBar: AppBar(
backgroundColor: color, // backgroundColor: color,
elevation: 0, // elevation: 0,
actions: [ // actions: [
// IconButton( // // IconButton(
// onPressed: () {}, // // onPressed: () {},
// icon: const Icon(Icons.toggle_off_outlined), // // icon: const Icon(Icons.toggle_off_outlined),
// ), // // ),
MyToggle( // MyToggle(
// key: toggleKey, // // key: toggleKey,
isOn: locale?.languageCode == 'en', // isOn: locale?.languageCode == 'en',
knobTextWhenOn: 'ع', // knobTextWhenOn: 'ع',
knobTextWhenOff: 'EN', // knobTextWhenOff: 'EN',
pathColorWhenOn: Colors.grey.shade300, // pathColorWhenOn: Colors.grey.shade300,
pathColorWhenOff: Colors.grey.shade300, // pathColorWhenOff: Colors.grey.shade300,
onTap: () { // onTap: () {
ref.read(localeProvider.notifier).toggleLocale(); // ref.read(localeProvider.notifier).toggleLocale();
}, // },
), // ),
], // ],
leading: IconButton( // leading: IconButton(
icon: Icon(Icons.arrow_back_ios_new, color: Colors.white), // icon: Icon(Icons.arrow_back_ios_new, color: Colors.white),
onPressed: () { // onPressed: () {
if (widget.keyParam == 'home') { // if (widget.keyParam == 'home') {
context.go('/myhomepage'); // context.go('/myhomepage');
} else { // } else {
context.go('/uaenumbers'); // context.go('/uaenumbers');
} // }
}, // },
), // ),
title: Text( // title: Text(
context.translate( // context.translate(
'UAE Numbers', // 'UAE Numbers',
'أرقام الإمارات', // 'أرقام الإمارات',
), // ),
style: TextStyle(color: Colors.white), // style: TextStyle(color: Colors.white),
), // ),
), // ),
title: Text(context.translate(
'UAE Numbers',
'أرقام الإمارات',
),),
appbarColor: Color(int.parse(widget.bgColor)), // Example color
showBackButton: true,
colorChange:true,
navBackArrow: Text(widget.keyParam ?? 'Default Value'),
body: isLoading body: isLoading
? Center(child: CircularProgressIndicator()) ? Center(child: CircularProgressIndicator())
: Column( : Container(
color: color,
child: Column(
children: [ children: [
Container( Container(
// height: myheight / 5, // height: myheight / 5,
@ -1877,7 +1887,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
color: color, color: color,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 30, right: 30, top: 10, bottom: 5), left: 30, right: 30, top: 8, bottom: 5),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -1886,18 +1896,23 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 26, fontSize: 26,
fontWeight: FontWeight.w400,
fontFamily: 'Roboto'
), ),
), ),
Container( Container(
width: mywidth / 4, width: mywidth / 7,
height: 1.5,
child: Divider( child: Divider(
thickness: 8, thickness: 3,
color: Colors.white, color: Colors.white,
)), )),
Text( Text(
widget.title, widget.title,
style: TextStyle(color: Colors.white, fontSize: 20), style: TextStyle(color: Colors.white, fontSize: 20,
), fontWeight: FontWeight.w400,
fontFamily: 'Roboto'),
),
// Row( // Row(
// mainAxisAlignment: MainAxisAlignment.end, // mainAxisAlignment: MainAxisAlignment.end,
// children: [ // children: [
@ -1920,97 +1935,132 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
], ],
), ),
)), )),
SizedBox(
// color: Colors.redAccent,
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Row(
key: bookMarkKey,
children: [
Text(
context.translate(
'Bookmark',
'إشارة مرجعية',
),
style: const TextStyle(
fontSize: 16,
color: Colors.white,
),
),
SizedBox(width: 5),
GestureDetector(
onTap: () {
if (isBookmarked) {
showRemoveBookmarkDialog();
} else {
showAddBookmarkDialog();
}
},
child: Row(
children: [
// Text(
// "Bookmark",
// style: const TextStyle(
// fontSize: 16,
// color: Colors.white),
// ),
// const SizedBox(width: 5),
Image.asset(
isBookmarked
? UaeNumbersAssetPath
.bookmarksSelectedUae // Filled bookmark image
: UaeNumbersAssetPath
.bookmarksUae, // Default bookmark image
// color: Colors.white,
width: 24,
height: 24,
),
],
),
),
],
),
SizedBox(width: 10),
Row(
children: [
Text(
context.translate(
'Share',
'يشارك',
),
style: const TextStyle(
fontSize: 16,
color: Colors.white,
),
),
SizedBox(width: 5),
Stack(
children: [
Image.asset(
UaeNumbersAssetPath.shareUae,
color: Colors.white, // Outline color
width: 24, // Slightly larger
height: 24,
),
Image.asset(
UaeNumbersAssetPath.shareUae,
color: Colors.white,
width: 24,
height: 24,
),
],
)
],
),
SizedBox(
width: 10), // Horizontal space between items
Row(
children: [
Text(
context.translate(
'Filter',
'فلتر',
),
style: const TextStyle(
fontSize: 16,
color: Colors.white,
),
),
IconButton(
icon: Icon(Icons.filter_alt_outlined,
color: Colors.white, size: 24),
onPressed: () {
showRightSideModal(
context, filterData, chartsData);
},
),
],
),
SizedBox(
width: 10),
],
),
],
),
),
Expanded( Expanded(
child: Padding(
padding: const EdgeInsets.all(10.0),
child: ListView( child: ListView(
children: [ children: [
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Row(
key: bookMarkKey,
children: [
Text(
context.translate(
'Bookmark',
'إشارة مرجعية',
),
style: const TextStyle(
fontSize: 16,
color: Colors.white,
),
),
SizedBox(width: 5),
GestureDetector(
onTap: () {
if (isBookmarked) {
showRemoveBookmarkDialog();
} else {
showAddBookmarkDialog();
}
},
child: Row(
children: [
Text(
"Bookmark",
style: const TextStyle(
fontSize: 16,
color: Colors.white),
),
const SizedBox(width: 5),
Image.asset(
isBookmarked
? UaeNumbersAssetPath
.bookmarksSelectedUae // Filled bookmark image
: UaeNumbersAssetPath
.bookmarksUae, // Default bookmark image
// color: Colors.white,
width: 24,
height: 24,
),
],
),
),
],
),
SizedBox(width: 10),
Row(
children: [
Text(
context.translate(
'Share',
'يشارك',
),
style: const TextStyle(
fontSize: 16,
color: Colors.white,
),
),
SizedBox(width: 5),
Image.asset(
UaeNumbersAssetPath.shareUae,
color: Colors.white,
width: 24,
height: 24,
),
],
),
SizedBox(
width: 5), // Horizontal space between items
IconButton(
icon: Icon(Icons.filter_alt_outlined,
color: Colors.white, size: 28),
onPressed: () {
showRightSideModal(
context, filterData, chartsData);
},
),
],
),
],
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
@ -2223,7 +2273,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
size: 30); // Fallback icon size: 30); // Fallback icon
}, },
), ),
const SizedBox(height: 5), const SizedBox(height: 1),
Flexible( Flexible(
fit: FlexFit.loose, fit: FlexFit.loose,
// child: FittedBox( // child: FittedBox(
@ -2242,12 +2292,15 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
), ),
// ), // ),
), ),
const SizedBox(height: 1), const SizedBox(height: 5),
Text( Flexible(
fit: FlexFit.loose,
child: FittedBox(
child:Text(
'(${data['firstYear'] ?? 'NA'} - ${data['lastYear'] ?? 'NA'})', '(${data['firstYear'] ?? 'NA'} - ${data['lastYear'] ?? 'NA'})',
style: const TextStyle( style: const TextStyle(
fontSize: 10, color: Colors.grey), fontSize: 10, color: Colors.grey),
), ),),),
const SizedBox(height: 1), const SizedBox(height: 1),
Flexible( Flexible(
fit: FlexFit.loose, fit: FlexFit.loose,
@ -2425,9 +2478,11 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
), ),
], ],
), ),
),
), ),
], ],
), ),
),
); );
} }
@ -2437,8 +2492,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
Color(int.parse(widget.bgColor.replaceFirst('0x', ''), radix: 16)); Color(int.parse(widget.bgColor.replaceFirst('0x', ''), radix: 16));
return Container( return Container(
margin: EdgeInsets.symmetric(horizontal: 5.0), margin: EdgeInsets.symmetric(horizontal: 5.0),
width: 35.0, // Set the width of the circle width: 30.0, // Set the width of the circle
height: 35.0, height: 30.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: onPressed == null ? Colors.grey[400] : Colors.white, color: onPressed == null ? Colors.grey[400] : Colors.white,
shape: BoxShape.circle, shape: BoxShape.circle,
@ -2479,6 +2534,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
style: TextStyle( style: TextStyle(
color: isActive ? Colors.black : Colors.white, color: isActive ? Colors.black : Colors.white,
fontWeight: isActive ? FontWeight.w500 : FontWeight.w400, fontWeight: isActive ? FontWeight.w500 : FontWeight.w400,
fontSize: 13,
), ),
), ),
), ),

38
lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
View File

@ -32,7 +32,9 @@ class BaseScaffold extends ConsumerStatefulWidget {
this.actions, this.actions,
this.showDivider = false, this.showDivider = false,
this.dividerColor, this.dividerColor,
this.navBackArrow,
this.showBackButton = false, this.showBackButton = false,
this.colorChange = false,
this.mycenterTitle = false, this.mycenterTitle = false,
this.appbarColor, this.appbarColor,
this.mytitleColor, this.mytitleColor,
@ -40,9 +42,11 @@ class BaseScaffold extends ConsumerStatefulWidget {
}); });
final Widget body; final Widget body;
final Widget title; final Widget title;
final Widget? navBackArrow;
final Color? dividerColor; final Color? dividerColor;
final bool showDivider; final bool showDivider;
final bool showBackButton; final bool showBackButton;
final bool colorChange;
final bool? mycenterTitle; final bool? mycenterTitle;
final List<Widget>? actions; final List<Widget>? actions;
final Color? bottomColor; final Color? bottomColor;
@ -636,13 +640,24 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBar( appBar: AppBar(
// title: widget.title, title: Padding(
title: Align( padding: EdgeInsets.only(top: 10),
alignment: Alignment.centerLeft, // Aligns the title to the left child: Align(
child: widget.title, alignment: Alignment.centerLeft,
child: DefaultTextStyle(
style: TextStyle(
color: widget.colorChange ? Colors.white : Color(0xFF414042),
fontSize: 22,
fontFamily: 'Roboto',
fontWeight: FontWeight.w500,
),
child: widget.title,
),
),
), ),
titleSpacing: 0, titleSpacing: 0,
backgroundColor: Colors.white, backgroundColor: widget.appbarColor ?? Colors.white,
leadingWidth: widget.showBackButton ? mywidth * 0.25 : null, leadingWidth: widget.showBackButton ? mywidth * 0.25 : null,
bottom: widget.showDivider bottom: widget.showDivider
? PreferredSize( ? PreferredSize(
@ -675,23 +690,28 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
children: [ children: [
if (widget.showBackButton == true) if (widget.showBackButton == true)
Positioned( Positioned(
left: 15, top: 10,
left: 18,
child: IconButton( child: IconButton(
color: Colors.white, color: Colors.white,
icon: const Icon(Icons.arrow_back_ios_new), icon: const Icon(Icons.arrow_back_ios_new),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); if ((widget.navBackArrow as Text).data == 'home') {
context.go('/myhomepage');
} else {
context.go('/uaenumbers');
}
}, },
), ),
), ),
Positioned( Positioned(
top: 8, top: 8,
right: 10, right: 4,
child: Builder( child: Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
return IconButton( return IconButton(
key: drawerKey, key: drawerKey,
color: Colors.black, color: widget.colorChange ? Colors.white : Colors.black,
icon: const Icon(Icons.menu, size: 30), icon: const Icon(Icons.menu, size: 30),
onPressed: () { onPressed: () {
Scaffold.of(context).openDrawer(); Scaffold.of(context).openDrawer();