notification and chart changes done
This commit is contained in:
venbaittech
parent
f4186a876b
commit
4917749f65
@ -15,12 +15,12 @@ if (localPropertiesFile.exists()) {
|
||||
|
||||
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
|
||||
if (flutterVersionCode == null) {
|
||||
flutterVersionCode = "17"
|
||||
flutterVersionCode = "20"
|
||||
}
|
||||
|
||||
def flutterVersionName = localProperties.getProperty("flutter.versionName")
|
||||
if (flutterVersionName == null) {
|
||||
flutterVersionName = "1.0.16"
|
||||
flutterVersionName = "1.0.19"
|
||||
}
|
||||
|
||||
def keystorePropertiesFile = rootProject.file("key.properties")
|
||||
|
||||
@ -15,6 +15,11 @@
|
||||
"exit": "خروج",
|
||||
|
||||
"bookmark_title": "إشارة مرجعية",
|
||||
"failed_To_Remove": "فشلت الإزالة",
|
||||
"removed_from_Bookmark": "تمت الإزالة من الإشارة المرجعية",
|
||||
"added_to_Bookmark":"تمت إضافته إلى الإشارة المرجعية",
|
||||
"guide_title": "نموذج الملاحظات",
|
||||
"notification": "إشعار",
|
||||
|
||||
"guide_title": "نموذج الملاحظات",
|
||||
|
||||
|
||||
@ -16,6 +16,10 @@
|
||||
"cancel": "Cancel",
|
||||
"exit": "Exit",
|
||||
"bookmark_title": "Bookmark",
|
||||
"failed_To_Remove": "Failed to Remove",
|
||||
"removed_from_Bookmark": "Removed from Bookmark",
|
||||
"added_to_Bookmark": "Added to Bookmark.",
|
||||
"notification": "Notification",
|
||||
|
||||
"register_title": "Register",
|
||||
"register_details": "Please enter your details",
|
||||
|
||||
@ -148,9 +148,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
|
||||
// ToastUtil.showSuccessToast("Added to Bookmark.");
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
'Added to Bookmark.',
|
||||
AppLocalizations.of(context)!.added_to_Bookmark,
|
||||
style: TextStyle(
|
||||
color: Color(0xFF2F692C), fontWeight: FontWeight.w600),
|
||||
),
|
||||
@ -164,7 +164,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
'Failed to Add',
|
||||
AppLocalizations.of(context)!.failed_To_Remove,
|
||||
style: TextStyle(
|
||||
color: Color(0xFF544C4C), fontWeight: FontWeight.w600),
|
||||
),
|
||||
@ -194,9 +194,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
});
|
||||
// ToastUtil.showSuccessToast("Removed from Bookmark.");
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
'Removed from Bookmark.',
|
||||
AppLocalizations.of(context)!.removed_from_Bookmark,
|
||||
style: TextStyle(
|
||||
color: Color(0xFF2F692C), fontWeight: FontWeight.w600),
|
||||
),
|
||||
@ -1189,19 +1189,6 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// });
|
||||
// }
|
||||
|
||||
void processCardData(cardData){
|
||||
|
||||
print('PRocessCardData');
|
||||
setState(() {
|
||||
filteredAndSortedData = (cardData as List)
|
||||
.where((card) => (card as Map<String, dynamic>)['is_chart'] == 'false')
|
||||
.map((card) => card as Map<String, dynamic>)
|
||||
.toList()
|
||||
..sort((a, b) => (a['order_id'] as int).compareTo(b['order_id'] as int));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
void processChartData(chartsData) {
|
||||
// Group data by 'kpi'
|
||||
Map<String, List<Map<String, dynamic>>> groupedData = {};
|
||||
@ -1236,7 +1223,6 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
return {'id': kpi, 'name': tabHeading, 'order': tabOrder.toString()};
|
||||
}).toList();
|
||||
|
||||
|
||||
// Sort tabs by tab_order
|
||||
_tabs.sort((a, b) {
|
||||
int orderA = int.tryParse(a['order'] ?? '0') ?? 0;
|
||||
@ -1244,7 +1230,6 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
return orderA.compareTo(orderB);
|
||||
});
|
||||
|
||||
|
||||
print('Sorted Tabs: $_tabs');
|
||||
|
||||
print('Grouped Data: $groupedData');
|
||||
@ -1282,10 +1267,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
cardData = nonChartData;
|
||||
chartScreenData = data['chartScreenData'] ?? {};
|
||||
|
||||
processCardData(cardData);
|
||||
processChartData(chartsData);
|
||||
|
||||
|
||||
print('chartsData :- $chartsData');
|
||||
print('cardData :- $cardData');
|
||||
print('chartScreenData :- $chartScreenData');
|
||||
@ -1436,16 +1419,16 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
children: [
|
||||
// Header Section
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top:16.0, bottom: 0.0, left: 16.0, right: 16.0),
|
||||
padding: const EdgeInsets.only(
|
||||
top: 16.0, bottom: 0.0, left: 16.0, right: 16.0),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
|
||||
Image.asset(
|
||||
UaeNumbersAssetPath.filterUae,
|
||||
color:Color(0xFF8E8E8E), // Outline color
|
||||
color: Color(0xFF8E8E8E), // Outline color
|
||||
width: 24, // Slightly larger
|
||||
height: 24,
|
||||
),
|
||||
@ -1460,7 +1443,6 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.w500,
|
||||
fontFamily: 'Roboto',
|
||||
|
||||
),
|
||||
),
|
||||
],
|
||||
@ -1582,7 +1564,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: 16.0, vertical: 12.0),
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(color: Color(0xFF7296BE)),
|
||||
border:
|
||||
Border.all(color: Color(0xFF7296BE)),
|
||||
borderRadius: BorderRadius.circular(8.0),
|
||||
),
|
||||
child: Wrap(
|
||||
@ -1745,8 +1728,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
fit: BoxFit
|
||||
.scaleDown, // Ensures text resizes if necessary
|
||||
child: Text(
|
||||
context.translate(
|
||||
'Filter', 'فلتر'),
|
||||
context.translate('Filter', 'فلتر'),
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 13,
|
||||
@ -1826,8 +1808,14 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
return chart['kpi'] == tabId;
|
||||
}).toList(); // Convert to list after filtering
|
||||
|
||||
print('tabFilteredCardData Data for Tab $tabId: $tabFilteredCardData');
|
||||
print(
|
||||
'tabFilteredCardData Data for Tab before $tabId: $tabFilteredCardData');
|
||||
|
||||
tabFilteredCardData
|
||||
.sort((a, b) => (a['order_id'] as int).compareTo(b['order_id'] as int));
|
||||
|
||||
print(
|
||||
'tabFilteredCardData Data for Tab after $tabId: $tabFilteredCardData');
|
||||
setState(() {
|
||||
cardData = tabFilteredCardData;
|
||||
originalTabCardData = List.from(tabFilteredCardData);
|
||||
@ -1858,14 +1846,12 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// return crossAxisCount == 1 ? 0.2 : (crossAxisCount > 2 ? 0.9 : 0.7);
|
||||
return crossAxisCount == 2 ? 1.0 : 0.7; // Larger Content
|
||||
// return crossAxisCount == 2 ? 1.5 : 0.9;
|
||||
|
||||
} else {
|
||||
return crossAxisCount == 2 ? 1.5 : 0.9;
|
||||
// Shorter Content
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// double calculateAspectRatio(int crossAxisCount, List<dynamic> cardData) {
|
||||
// if (cardData.any((item) =>
|
||||
// item['chart_type'] == 'total' || item['chart_type'] == 'average')) {
|
||||
@ -1888,8 +1874,6 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// return 1.0; // Default fallback (should never be reached)
|
||||
// }
|
||||
|
||||
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final locale = ref.watch(localeProvider);
|
||||
@ -1957,17 +1941,19 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// style: TextStyle(color: Colors.white),
|
||||
// ),
|
||||
// ),
|
||||
title: Text(context.translate(
|
||||
title: Text(
|
||||
context.translate(
|
||||
'UAE Numbers',
|
||||
'أرقام الإمارات',
|
||||
),),
|
||||
// appbarColor: Color(int.parse(widget.bgColor)), // Example color
|
||||
appbarColor: Color(
|
||||
int.parse((chartScreenData['header_color'] ?? '#ffffff').replaceFirst('#', '0xff'))
|
||||
),
|
||||
),
|
||||
// appbarColor: Color(int.parse(widget.bgColor)), // Example color
|
||||
appbarColor: Color(int.parse(
|
||||
(chartScreenData['header_color'] ?? '#ffffff')
|
||||
.replaceFirst('#', '0xff'))),
|
||||
// Example color
|
||||
showBackButton: true,
|
||||
colorChange:true,
|
||||
colorChange: true,
|
||||
navBackArrow: Text(widget.keyParam ?? 'Default Value'),
|
||||
body: isLoading
|
||||
? Center(child: CircularProgressIndicator())
|
||||
@ -1979,7 +1965,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// height: myheight / 5,
|
||||
width: double.infinity,
|
||||
// color: color,
|
||||
color: Color(int.parse((chartScreenData['header_color']?? '#898C81').replaceFirst('#', '0xff'))),
|
||||
color: Color(int.parse(
|
||||
(chartScreenData['header_color'] ?? '#898C81')
|
||||
.replaceFirst('#', '0xff'))),
|
||||
child: Padding(
|
||||
padding: EdgeInsets.only(
|
||||
left: 30, right: 30, top: 8, bottom: 5),
|
||||
@ -1993,8 +1981,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
color: Colors.white,
|
||||
fontSize: 26,
|
||||
fontWeight: FontWeight.w400,
|
||||
fontFamily: 'Roboto'
|
||||
),
|
||||
fontFamily: 'Roboto'),
|
||||
),
|
||||
Container(
|
||||
width: mywidth / 7,
|
||||
@ -2006,7 +1993,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
Text(
|
||||
// widget.title,
|
||||
chartScreenData['data_set_tile_heading'] ?? '',
|
||||
style: TextStyle(color: Colors.white, fontSize: 20,
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight.w400,
|
||||
fontFamily: 'Roboto'),
|
||||
),
|
||||
@ -2033,7 +2022,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
),
|
||||
)),
|
||||
Container(
|
||||
color: Color(int.parse((chartScreenData['header_color']?? '#898C81').replaceFirst('#', '0xff'))),
|
||||
color: Color(int.parse(
|
||||
(chartScreenData['header_color'] ?? '#898C81')
|
||||
.replaceFirst('#', '0xff'))),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.end,
|
||||
children: [
|
||||
@ -2042,6 +2033,16 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
children: [
|
||||
Row(
|
||||
key: bookMarkKey,
|
||||
children: [
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
if (isBookmarked) {
|
||||
showRemoveBookmarkDialog();
|
||||
} else {
|
||||
showAddBookmarkDialog();
|
||||
}
|
||||
},
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
context.translate(
|
||||
@ -2054,17 +2055,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
),
|
||||
),
|
||||
SizedBox(width: 5),
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
if (isBookmarked) {
|
||||
showRemoveBookmarkDialog();
|
||||
} else {
|
||||
showAddBookmarkDialog();
|
||||
}
|
||||
},
|
||||
|
||||
child: Row(
|
||||
children: [
|
||||
// Text(
|
||||
// "Bookmark",
|
||||
// style: const TextStyle(
|
||||
@ -2082,7 +2073,12 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// width: 24,
|
||||
// height: 24,
|
||||
// ),
|
||||
Icon(Icons.bookmarks_rounded, color:isBookmarked ? Colors.black:Colors.white ,),
|
||||
Icon(
|
||||
Icons.bookmarks_rounded,
|
||||
color: isBookmarked
|
||||
? Colors.black
|
||||
: Colors.white,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@ -2142,7 +2138,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
),
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
showRightSideModal(context, filterData, chartsData);
|
||||
showRightSideModal(
|
||||
context, filterData, chartsData);
|
||||
},
|
||||
child: Image.asset(
|
||||
UaeNumbersAssetPath.filterUae,
|
||||
@ -2159,11 +2156,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// context, filterData, chartsData);
|
||||
// },
|
||||
// ),
|
||||
|
||||
],
|
||||
),
|
||||
SizedBox(
|
||||
width: 10),
|
||||
SizedBox(width: 10),
|
||||
],
|
||||
),
|
||||
],
|
||||
@ -2171,7 +2166,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
color: Color(int.parse((chartScreenData['body_color']?? '#898C81').replaceFirst('#', '0xff'))),
|
||||
color: Color(int.parse(
|
||||
(chartScreenData['body_color'] ?? '#898C81')
|
||||
.replaceFirst('#', '0xff'))),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(10.0),
|
||||
child: ListView(
|
||||
@ -2182,8 +2179,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// Left arrow button
|
||||
if (_tabsData.length > 1)
|
||||
_buildArrowButton(
|
||||
onPressed:
|
||||
_activeTabIndex > 0 ? _scrollLeft : null,
|
||||
onPressed: _activeTabIndex > 0
|
||||
? _scrollLeft
|
||||
: null,
|
||||
icon: Icons.arrow_back_ios_new,
|
||||
),
|
||||
// Tabs with horizontal scroll
|
||||
@ -2193,11 +2191,12 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
controller: _scrollController,
|
||||
scrollDirection: Axis.horizontal,
|
||||
child: Row(
|
||||
children:
|
||||
List.generate(_tabsData.length, (index) {
|
||||
children: List.generate(
|
||||
_tabsData.length, (index) {
|
||||
return _buildTab(
|
||||
_tabsData[index],
|
||||
isActive: index == _activeTabIndex,
|
||||
isActive:
|
||||
index == _activeTabIndex,
|
||||
);
|
||||
}),
|
||||
),
|
||||
@ -2206,7 +2205,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// Right arrow button
|
||||
if (_tabsData.length > 1)
|
||||
_buildArrowButton(
|
||||
onPressed: _activeTabIndex < _tabsData.length - 1
|
||||
onPressed:
|
||||
_activeTabIndex < _tabsData.length - 1
|
||||
? _scrollRight
|
||||
: null,
|
||||
icon: Icons.arrow_forward_ios,
|
||||
@ -2232,7 +2232,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
gridDelegate:
|
||||
SliverGridDelegateWithFixedCrossAxisCount(
|
||||
// crossAxisCount:2,
|
||||
crossAxisCount: cardData.length % 2 == 0 ? 2 : 3,
|
||||
crossAxisCount:
|
||||
cardData.length % 2 == 0 ? 2 : 3,
|
||||
// crossAxisCount: cardData.length == 2
|
||||
// ? 2
|
||||
// : cardData.length == 3
|
||||
@ -2242,8 +2243,13 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// : 3, // Default to 3 if more than 4 items // 2 cards per row
|
||||
crossAxisSpacing: 2,
|
||||
mainAxisSpacing: 5,
|
||||
childAspectRatio: MediaQuery.of(context).size.width /
|
||||
(MediaQuery.of(context).size.height / (cardData.length % 2 == 0 ? 2 : 1.3)),
|
||||
childAspectRatio: MediaQuery.of(context)
|
||||
.size
|
||||
.width /
|
||||
(MediaQuery.of(context).size.height /
|
||||
(cardData.length % 2 == 0
|
||||
? 2
|
||||
: 1.3)),
|
||||
// childAspectRatio:
|
||||
// calculateAspectRatio(cardData.length, cardData),
|
||||
),
|
||||
@ -2251,19 +2257,20 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// Sort and filter the cardData
|
||||
|
||||
itemBuilder: (context, index) {
|
||||
final item = filteredAndSortedData[index];
|
||||
|
||||
// print('item');
|
||||
// final item = cardData[index];
|
||||
final item = cardData[index];
|
||||
print('item item item $item');
|
||||
final chart_type = item['chart_type'];
|
||||
final chart_heading = item['chart_heading'];
|
||||
final response = item['response'] as List<dynamic>? ?? [];
|
||||
final response =
|
||||
item['response'] as List<dynamic>? ??
|
||||
[];
|
||||
final card_logo = item['card_logo'];
|
||||
final data = apiService.processNonChartData(item);
|
||||
final data =
|
||||
apiService.processNonChartData(item);
|
||||
print('processNonChartData');
|
||||
|
||||
double cardHeight = (chart_type == 'totals' ||
|
||||
double cardHeight =
|
||||
(chart_type == 'totals' ||
|
||||
chart_type == 'averages')
|
||||
? 180.0
|
||||
: 130.0;
|
||||
@ -2278,38 +2285,50 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
return Container(
|
||||
margin: const EdgeInsets.all(10),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderRadius:
|
||||
BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: Color(int.parse(
|
||||
(chartScreenData['border_color']?? '#898C81')
|
||||
.replaceFirst('#', '0xff'))),
|
||||
(chartScreenData[
|
||||
'border_color'] ??
|
||||
'#898C81')
|
||||
.replaceFirst(
|
||||
'#', '0xff'))),
|
||||
// Dynamic border color
|
||||
width: 1, // Adjust border thickness
|
||||
width:
|
||||
1, // Adjust border thickness
|
||||
),
|
||||
),
|
||||
child: Card(
|
||||
margin: const EdgeInsets.all(0),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderRadius:
|
||||
BorderRadius.circular(12),
|
||||
),
|
||||
elevation: 2,
|
||||
child: Container(
|
||||
height: cardHeight,
|
||||
padding: const EdgeInsets.only(left:16.0, right: 16.0, bottom: 1.0 , top: 1.0),
|
||||
padding: const EdgeInsets.only(
|
||||
left: 16.0,
|
||||
right: 16.0,
|
||||
bottom: 1.0,
|
||||
top: 1.0),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment
|
||||
.center,
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.center,
|
||||
children: [
|
||||
Image.network(
|
||||
card_logo ?? '',
|
||||
width: 30,
|
||||
height: 30,
|
||||
errorBuilder:
|
||||
(context, error, stackTrace) {
|
||||
errorBuilder: (context,
|
||||
error, stackTrace) {
|
||||
return Icon(Icons.public,
|
||||
color: Color(0xFF90B0D5),
|
||||
size: 30); // Fallback icon
|
||||
color:
|
||||
Color(0xFF90B0D5),
|
||||
size:
|
||||
30); // Fallback icon
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 1),
|
||||
@ -2317,18 +2336,18 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
fit: FlexFit.loose,
|
||||
// child: FittedBox(
|
||||
child: Text(
|
||||
|
||||
'${chart_heading ?? 'NA'}',
|
||||
textAlign: TextAlign.center,
|
||||
textAlign:
|
||||
TextAlign.center,
|
||||
maxLines: 2,
|
||||
// Limit to 2 lines
|
||||
softWrap:
|
||||
true,
|
||||
softWrap: true,
|
||||
// Enable soft wrapping
|
||||
// overflow: TextOverflow.ellipsis, // Handle overflow gracefully
|
||||
style: TextStyle(
|
||||
fontSize: 9,
|
||||
fontWeight: FontWeight.w400,
|
||||
fontWeight:
|
||||
FontWeight.w400,
|
||||
color: Colors.black87,
|
||||
),
|
||||
),
|
||||
@ -2339,14 +2358,16 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
fit: FlexFit.loose,
|
||||
child: FittedBox(
|
||||
child: Text(
|
||||
'(${ response[0]['display_value'] ?? 'NA'})',
|
||||
'(${response[0]['display_value'] ?? 'NA'})',
|
||||
// '(${data['firstYear'] ??
|
||||
// 'NA'} - ${data['lastYear'] ??
|
||||
// 'NA'})',
|
||||
style: const TextStyle(
|
||||
fontSize: 10,
|
||||
color: Colors.grey),
|
||||
),),),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 1),
|
||||
Flexible(
|
||||
fit: FlexFit.loose,
|
||||
@ -2355,14 +2376,18 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
child: FittedBox(
|
||||
fit: BoxFit.contain,
|
||||
child: Text(
|
||||
response[0]['value'] ?? 'NA',
|
||||
response[0]
|
||||
['value'] ??
|
||||
'NA',
|
||||
// '${data['roundedAverage'] ??
|
||||
// 'NA'}',
|
||||
style: const TextStyle(
|
||||
style:
|
||||
const TextStyle(
|
||||
fontSize: 20,
|
||||
fontWeight: FontWeight
|
||||
.w900,
|
||||
color: Color(0xFF90B0D5),
|
||||
fontWeight:
|
||||
FontWeight.w900,
|
||||
color: Color(
|
||||
0xFF90B0D5),
|
||||
),
|
||||
),
|
||||
),
|
||||
@ -2372,24 +2397,29 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
),
|
||||
),
|
||||
));
|
||||
}
|
||||
else{
|
||||
return
|
||||
Container(
|
||||
} else {
|
||||
return Container(
|
||||
margin: const EdgeInsets.all(10),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderRadius:
|
||||
BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: Color(int.parse((chartScreenData['border_color']?? '#898C81').replaceFirst('#', '0xff'))), // Dynamic border color
|
||||
color: Color(int.parse((chartScreenData[
|
||||
'border_color'] ??
|
||||
'#898C81')
|
||||
.replaceFirst('#',
|
||||
'0xff'))), // Dynamic border color
|
||||
width: 1, // Adjust border thickness
|
||||
),
|
||||
),
|
||||
child: Card(
|
||||
margin: const EdgeInsets.all(0),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
borderRadius:
|
||||
BorderRadius.circular(12),
|
||||
),
|
||||
elevation: 0, // Remove shadow to keep only the outli
|
||||
elevation:
|
||||
0, // Remove shadow to keep only the outli
|
||||
|
||||
child: Container(
|
||||
height: cardHeight,
|
||||
@ -2397,7 +2427,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize
|
||||
.min, // Adjust card height based on content
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
mainAxisAlignment:
|
||||
MainAxisAlignment.center,
|
||||
children: [
|
||||
// const Icon(Icons.public,
|
||||
// color: Color(0xFF90B0D5), size: 30),
|
||||
@ -2405,11 +2436,13 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
card_logo ?? '',
|
||||
width: 30,
|
||||
height: 30,
|
||||
errorBuilder:
|
||||
(context, error, stackTrace) {
|
||||
errorBuilder: (context, error,
|
||||
stackTrace) {
|
||||
return Icon(Icons.public,
|
||||
color: Color(0xFF90B0D5),
|
||||
size: 30); // Fallback icon
|
||||
color:
|
||||
Color(0xFF90B0D5),
|
||||
size:
|
||||
30); // Fallback icon
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 3),
|
||||
@ -2421,14 +2454,17 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
child: Text(
|
||||
'${chart_heading ?? 'NA'}',
|
||||
// "TOTAL",
|
||||
textAlign: TextAlign.center,
|
||||
maxLines: 2, // Limit to 2 lines
|
||||
textAlign:
|
||||
TextAlign.center,
|
||||
maxLines:
|
||||
2, // Limit to 2 lines
|
||||
softWrap:
|
||||
true, // Enable soft wrapping
|
||||
// overflow: TextOverflow.ellipsis, // Handle overflow gracefully
|
||||
style: TextStyle(
|
||||
fontSize: 8,
|
||||
fontWeight: FontWeight.w400,
|
||||
fontWeight:
|
||||
FontWeight.w400,
|
||||
color: Colors.black87,
|
||||
),
|
||||
),
|
||||
@ -2441,7 +2477,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
|
||||
// '(${data['lastYear'] ?? 'NA'})',
|
||||
style: const TextStyle(
|
||||
fontSize: 10, color: Colors.grey),
|
||||
fontSize: 10,
|
||||
color: Colors.grey),
|
||||
),
|
||||
const SizedBox(height: 1),
|
||||
Flexible(
|
||||
@ -2449,7 +2486,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
child: FittedBox(
|
||||
fit: BoxFit.contain,
|
||||
child: Text(
|
||||
response[0]['value'] ?? 'NA',
|
||||
response[0]['value'] ??
|
||||
'NA',
|
||||
|
||||
// apiService.formatAmount(
|
||||
// data['lastYearValue']),
|
||||
@ -2457,14 +2495,17 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
// data['lastYearValue']),
|
||||
style: const TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w900,
|
||||
color: Color(0xFF90B0D5),
|
||||
fontWeight:
|
||||
FontWeight.w900,
|
||||
color:
|
||||
Color(0xFF90B0D5),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: 2, // Height of the divider
|
||||
height:
|
||||
2, // Height of the divider
|
||||
child: Divider(
|
||||
color: Color(0xFFBBBCBD),
|
||||
thickness:
|
||||
@ -2476,33 +2517,35 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
child: FittedBox(
|
||||
fit: BoxFit.contain,
|
||||
child: Text(
|
||||
response[1]['value'] ?? 'NA',
|
||||
response[1]['value'] ??
|
||||
'NA',
|
||||
// apiService.formatAmount(
|
||||
// data['secondLastYearValue']),
|
||||
style: const TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Color(0xFFD83731),
|
||||
fontWeight:
|
||||
FontWeight.w600,
|
||||
color:
|
||||
Color(0xFFD83731),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Text(
|
||||
|
||||
'(${response[1]['display_value'] ?? 'NA'})',
|
||||
// '(${data['secondLastYear'] ?? 'NA'})',
|
||||
style: const TextStyle(
|
||||
fontSize: 9,
|
||||
fontWeight: FontWeight.w500,
|
||||
fontWeight:
|
||||
FontWeight.w500,
|
||||
color: Colors.grey),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),);
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
),
|
||||
),
|
||||
@ -2517,17 +2560,21 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.start,
|
||||
children: [
|
||||
const SizedBox(height: 10),
|
||||
ConstrainedBox(
|
||||
constraints: const BoxConstraints(
|
||||
minHeight: 200, // Minimum height
|
||||
maxHeight: 400, // Maximum height
|
||||
minHeight:
|
||||
200, // Minimum height
|
||||
maxHeight:
|
||||
400, // Maximum height
|
||||
),
|
||||
// child: buildChart(chartsData[index]),
|
||||
child: ChartWidget(
|
||||
chartData: chartsData[index])),
|
||||
chartData:
|
||||
chartsData[index])),
|
||||
],
|
||||
),
|
||||
),
|
||||
@ -2542,7 +2589,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
|
||||
],
|
||||
),
|
||||
),
|
||||
),);
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildArrowButton(
|
||||
|
||||
@ -231,6 +231,15 @@ class ChartWidget extends StatelessWidget {
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Text(
|
||||
chartData['chart_sub_heading'] ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w300,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 20),
|
||||
Expanded(
|
||||
child: ValueListenableBuilder<int?>(
|
||||
@ -307,6 +316,15 @@ class ChartWidget extends StatelessWidget {
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Text(
|
||||
chartData['chart_sub_heading'] ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w300,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 10),
|
||||
AspectRatio(
|
||||
aspectRatio: 1.5,
|
||||
@ -522,6 +540,15 @@ class ChartWidget extends StatelessWidget {
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Text(
|
||||
chartData['chart_sub_heading'] ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w300,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 10),
|
||||
// Chart
|
||||
Expanded(
|
||||
@ -624,6 +651,15 @@ class ChartWidget extends StatelessWidget {
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Text(
|
||||
chartData['chart_sub_heading'] ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w300,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 10),
|
||||
|
||||
Expanded(
|
||||
@ -631,8 +667,8 @@ class ChartWidget extends StatelessWidget {
|
||||
scrollDirection: Axis.horizontal, // Enable horizontal scrolling
|
||||
padding: const EdgeInsets.only(right: 40),
|
||||
child: SizedBox(
|
||||
width: (uniqueXValues.length * 80) +
|
||||
80, // Adjust width dynamically
|
||||
width: (uniqueXValues.length * 50) +
|
||||
50, // Adjust width dynamically
|
||||
child: LineChart(LineChartData(
|
||||
lineTouchData: lineTouchData1(),
|
||||
gridData: gridData(),
|
||||
@ -735,6 +771,15 @@ class ChartWidget extends StatelessWidget {
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Text(
|
||||
chartData['chart_sub_heading'] ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w300,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 10),
|
||||
// Chart
|
||||
Expanded(
|
||||
@ -742,8 +787,8 @@ class ChartWidget extends StatelessWidget {
|
||||
scrollDirection: Axis.horizontal, // Enable horizontal scrolling
|
||||
padding: const EdgeInsets.only(right: 40),
|
||||
child: SizedBox(
|
||||
width: (uniqueXValues.length * 80) +
|
||||
80, // Adjust width dynamically
|
||||
width: (uniqueXValues.length * 50) +
|
||||
50, // Adjust width dynamically
|
||||
child: LineChart(
|
||||
LineChartData(
|
||||
lineTouchData: lineTouchData1(),
|
||||
@ -753,6 +798,7 @@ class ChartWidget extends StatelessWidget {
|
||||
lineBarsData: lineBars,
|
||||
minX: uniqueXValues.reduce((a, b) => a < b ? a : b),
|
||||
maxX: uniqueXValues.reduce((a, b) => a > b ? a : b),
|
||||
minY: 0,
|
||||
),
|
||||
),
|
||||
),
|
||||
@ -781,6 +827,15 @@ class ChartWidget extends StatelessWidget {
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Text(
|
||||
chartData['chart_sub_heading'] ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w300,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 10),
|
||||
// Chart
|
||||
Expanded(
|
||||
@ -888,6 +943,15 @@ class ChartWidget extends StatelessWidget {
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Text(
|
||||
chartData['chart_sub_heading'] ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w300,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 10),
|
||||
// Chart
|
||||
Expanded(
|
||||
@ -1019,6 +1083,15 @@ class ChartWidget extends StatelessWidget {
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Text(
|
||||
chartData['chart_sub_heading'] ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w300,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 10),
|
||||
// Chart
|
||||
Expanded(
|
||||
@ -1224,6 +1297,15 @@ class ChartWidget extends StatelessWidget {
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 5),
|
||||
Text(
|
||||
chartData['chart_sub_heading'] ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.w300,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 10),
|
||||
// Chart
|
||||
Expanded(
|
||||
@ -1790,12 +1872,15 @@ class ChartWidget extends StatelessWidget {
|
||||
bottomTitles: AxisTitles(
|
||||
sideTitles: SideTitles(
|
||||
showTitles: true,
|
||||
interval: 1, // Ensure each year is shown only once
|
||||
interval: 10, // Ensure each year is shown only once
|
||||
getTitlesWidget: (value, meta) {
|
||||
if (xValues.contains(value)) {
|
||||
return Text(
|
||||
return Transform.rotate(
|
||||
angle: -0.5, // Slight rotation to improve readability
|
||||
child: Text(
|
||||
value.toInt().toString(),
|
||||
style: TextStyle(color: Colors.black, fontSize: 12),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return SizedBox.shrink(); // Hide non-relevant labels
|
||||
|
||||
@ -21,6 +21,7 @@ class _ManageUserRouterState extends State<ManageUserRouter> {
|
||||
int _sortColumnIndex = 0;
|
||||
bool _isAscending = true;
|
||||
List<User> filteredUserData = [];
|
||||
bool isLoading = true;
|
||||
|
||||
// final List<String> statusOptions = ['Approved', 'Denied', 'Pending'];
|
||||
|
||||
@ -52,9 +53,9 @@ class _ManageUserRouterState extends State<ManageUserRouter> {
|
||||
);
|
||||
|
||||
setState(() {
|
||||
isLoading = true;
|
||||
userData = result.map((record) {
|
||||
final createdDate =
|
||||
DateTime.parse(record.created); // Parse the created date
|
||||
final createdDate = DateTime.parse(record.created).add(Duration(hours: 4));// Parse the created date
|
||||
final formattedDate = DateFormat('dd/MM/yyyy').format(createdDate);
|
||||
return User(
|
||||
id: record.id, // Correctly passing the ID
|
||||
@ -64,7 +65,17 @@ class _ManageUserRouterState extends State<ManageUserRouter> {
|
||||
status: record.getStringValue('status'),
|
||||
);
|
||||
}).toList();
|
||||
|
||||
userData.sort((a,b){
|
||||
DateTime dateA= DateFormat('dd/MM/yyyy').parse(a.registrationDate);
|
||||
DateTime dateB = DateFormat('dd/MM/yyyy').parse(b.registrationDate);
|
||||
return dateB.compareTo(dateA);
|
||||
});
|
||||
|
||||
|
||||
filteredUserData = List.from(userData);
|
||||
|
||||
isLoading = false;
|
||||
});
|
||||
} catch (e) {
|
||||
print('Error fetching unverified users: $e');
|
||||
@ -337,6 +348,7 @@ class _ManageUserRouterState extends State<ManageUserRouter> {
|
||||
image: ExactAssetImage(MiscIconAssetPath.search),
|
||||
width: 24,
|
||||
height: 24,
|
||||
color: Color(0xFFAA8E83)
|
||||
),
|
||||
|
||||
|
||||
@ -348,10 +360,13 @@ class _ManageUserRouterState extends State<ManageUserRouter> {
|
||||
contentPadding:
|
||||
EdgeInsets.symmetric(vertical: 8.0, horizontal: 18.0),
|
||||
),
|
||||
onChanged: filterUsers,
|
||||
),),
|
||||
),
|
||||
SizedBox(height: myheight / 40),
|
||||
filteredUserData.isEmpty
|
||||
isLoading
|
||||
? Center(child: CircularProgressIndicator())
|
||||
:filteredUserData.isEmpty
|
||||
? Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:pocketbase/pocketbase.dart';
|
||||
import '../../custom_drawer_routes.dart';
|
||||
|
||||
class NotificationPage extends StatefulWidget {
|
||||
@ -9,23 +11,63 @@ class NotificationPage extends StatefulWidget {
|
||||
|
||||
class _NotificationPageState extends State<NotificationPage> {
|
||||
// Example notification data
|
||||
List<Map<String, dynamic>> notifications = [
|
||||
{"title": "Social datasets are updated", "date": "04 Nov 2024 08:25 PM", "category": "Social"},
|
||||
{"title": "New feature updated", "date": "04 Nov 2024 08:25 PM", "category": "App updates"},
|
||||
];
|
||||
final _pb = PocketBase('https://pb.venbait.in');
|
||||
List<Map<String, dynamic>> notifications = [];
|
||||
|
||||
// Current selected tab index
|
||||
int selectedTabIndex = 0;
|
||||
|
||||
// Tab categories
|
||||
final List<String> tabs = ["All updates", "App updates", "Social", "Economy", "Environment", "Favourites"];
|
||||
final List<String> tabs = [
|
||||
"All updates",
|
||||
"App updates",
|
||||
"Social",
|
||||
"Economy",
|
||||
"Environment",
|
||||
"Favourites"
|
||||
];
|
||||
|
||||
String formatDate(String dateString) {
|
||||
try {
|
||||
DateTime dateTime =
|
||||
DateTime.parse(dateString); // Convert API date to DateTime
|
||||
return DateFormat('dd MMM yyyy hh:mm a')
|
||||
.format(dateTime); // Format DateTime
|
||||
} catch (e) {
|
||||
return 'Invalid Date'; // Handle parsing errors
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> fetchNotifications() async {
|
||||
try {
|
||||
await _pb.admins
|
||||
.authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
|
||||
|
||||
final result = await _pb.collection('notification').getFullList();
|
||||
|
||||
setState(() {
|
||||
notifications = result.map((record) => record.toJson()).toList();
|
||||
});
|
||||
} catch (e) {
|
||||
print('Error fetching notifications: $e');
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
fetchNotifications();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// Filter notifications based on the selected tab
|
||||
List<Map<String, dynamic>> filteredNotifications = selectedTabIndex == 0
|
||||
? notifications
|
||||
: notifications.where((notification) => notification["category"] == tabs[selectedTabIndex]).toList();
|
||||
: notifications
|
||||
.where((notification) =>
|
||||
notification["category"] == tabs[selectedTabIndex])
|
||||
.toList();
|
||||
|
||||
return PopScope(
|
||||
canPop: false,
|
||||
@ -72,11 +114,13 @@ class _NotificationPageState extends State<NotificationPage> {
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Icon(Icons.info_outline, size: 100, color: Colors.grey[400]),
|
||||
Icon(Icons.info_outline,
|
||||
size: 100, color: Colors.grey[400]),
|
||||
SizedBox(height: 16),
|
||||
Text(
|
||||
'No notifications available.',
|
||||
style: TextStyle(fontSize: 16, color: Colors.grey),
|
||||
style:
|
||||
TextStyle(fontSize: 16, color: Colors.grey),
|
||||
),
|
||||
],
|
||||
),
|
||||
@ -86,9 +130,9 @@ class _NotificationPageState extends State<NotificationPage> {
|
||||
itemBuilder: (context, index) {
|
||||
final notification = filteredNotifications[index];
|
||||
return NotificationTile(
|
||||
title: notification["title"]!,
|
||||
date: notification["date"]!,
|
||||
category: notification["category"]!,
|
||||
title: notification['title'] ?? 'No Title',
|
||||
date: formatDate(notification['created'] ?? ''),
|
||||
category: notification['category'] ?? 'Unknown',
|
||||
);
|
||||
},
|
||||
),
|
||||
@ -128,8 +172,11 @@ class TabBarHeader extends StatelessWidget {
|
||||
TextButton(
|
||||
onPressed: () => onTabSelected(index),
|
||||
style: ButtonStyle(
|
||||
foregroundColor: MaterialStateProperty.resolveWith((states) {
|
||||
return selectedIndex == index ? Color(0xFF985400) : Colors.grey[700];
|
||||
foregroundColor:
|
||||
MaterialStateProperty.resolveWith((states) {
|
||||
return selectedIndex == index
|
||||
? Color(0xFF985400)
|
||||
: Colors.grey[700];
|
||||
}),
|
||||
),
|
||||
child: Text(text),
|
||||
@ -169,7 +216,8 @@ class NotificationTile extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ListTile(
|
||||
leading: Icon(Icons.circle, size: 12, color: category == "Social" ? Colors.red : Colors.grey),
|
||||
leading: Icon(Icons.circle,
|
||||
size: 12, color: category == "Social" ? Colors.red : Colors.grey),
|
||||
title: Text(title, style: const TextStyle(fontWeight: FontWeight.bold)),
|
||||
subtitle: Text(date),
|
||||
);
|
||||
|
||||
@ -698,9 +698,9 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
||||
),
|
||||
],
|
||||
leading: Padding(
|
||||
padding: const EdgeInsets.only(top: 7.0,left: 4),
|
||||
padding: const EdgeInsets.only(top: 7.0, left: 4),
|
||||
child: Row(
|
||||
mainAxisSize:MainAxisSize.min,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (widget.showBackButton == true)
|
||||
SizedBox(
|
||||
@ -721,7 +721,9 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
||||
},
|
||||
),
|
||||
),
|
||||
SizedBox(width: 7,),
|
||||
SizedBox(
|
||||
width: 7,
|
||||
),
|
||||
Builder(
|
||||
builder: (BuildContext context) {
|
||||
return SizedBox(
|
||||
@ -743,8 +745,6 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
|
||||
),
|
||||
drawer: Drawer(
|
||||
backgroundColor: Colors.white,
|
||||
@ -824,7 +824,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
||||
if (userId != 'guest')
|
||||
ListTile(
|
||||
leading: Icon(Icons.notifications_none),
|
||||
title: const Text('Notification'),
|
||||
title: Text(AppLocalizations.of(context)!.notification),
|
||||
onTap: () => _navigateTo(context, '/notification'),
|
||||
),
|
||||
ListTile(
|
||||
@ -837,7 +837,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
||||
// ),
|
||||
// title: const Text('Feedback'),
|
||||
title: Text(AppLocalizations.of(context)!.feedback_title),
|
||||
onTap: () => _navigateTo(context, '/feedback', extra: userName),
|
||||
onTap: () =>
|
||||
_navigateTo(context, '/feedback', extra: userName),
|
||||
),
|
||||
if (role == 'admin')
|
||||
ListTile(
|
||||
@ -1012,6 +1013,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
|
||||
body: widget.body,
|
||||
);
|
||||
}
|
||||
|
||||
//drawer close code
|
||||
void _navigateTo(BuildContext context, String route, {Object? extra}) {
|
||||
Navigator.pop(context); // Close the drawer
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
name: uae_stat
|
||||
description: "View statistics about the UAE from the Federal Center for Statistics and Competitiveness."
|
||||
publish_to: "none"
|
||||
version: 1.0.16+17
|
||||
version: 1.0.19+20
|
||||
|
||||
environment:
|
||||
sdk: ">=3.2.3 <4.0.0"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user