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

bhavin feedback changes done

Browse Source
This commit is contained in:
Surendiran 2025-04-15 17:01:20 +05:30
parent a3c9f8c708
commit 080e2368e9
6 changed files with 106 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/build.gradle
View File

@ -20,12 +20,12 @@ if (project.hasProperty('google-services.json')) {
def flutterVersionCode = localProperties.getProperty("flutter.versionCode") def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
if (flutterVersionCode == null) { if (flutterVersionCode == null) {
flutterVersionCode = "49" flutterVersionCode = "50"
} }
def flutterVersionName = localProperties.getProperty("flutter.versionName") def flutterVersionName = localProperties.getProperty("flutter.versionName")
if (flutterVersionName == null) { if (flutterVersionName == null) {
flutterVersionName = "1.0.48" flutterVersionName = "1.0.49"
} }
def keystorePropertiesFile = rootProject.file("key.properties") def keystorePropertiesFile = rootProject.file("key.properties")

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

@ -2256,15 +2256,15 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
mainTopic, mainTopic,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 26, fontSize: 28,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w600,
fontFamily: 'Roboto'), fontFamily: 'Roboto'),
), ),
Container( Container(
width: mywidth / 7, width: mywidth / 7,
height: 1.5, height: 1.5,
child: Divider( child: Divider(
thickness: 3, thickness: 4,
color: Colors.white, color: Colors.white,
)), )),
Text( Text(
@ -2273,7 +2273,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 20, fontSize: 20,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w500,
fontFamily: 'Roboto'), fontFamily: 'Roboto'),
), ),
], ],
@ -2838,7 +2838,7 @@ class CardWidget extends StatelessWidget {
elevation: 2, elevation: 2,
child: Container( child: Container(
// height: cardHeight, // height: cardHeight,
height: 175, height: 158 ,
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 16.0, right: 16.0, bottom: 2.0, top: 1.0), left: 16.0, right: 16.0, bottom: 2.0, top: 1.0),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -2969,7 +2969,7 @@ class CardWidget extends StatelessWidget {
elevation: 0, // Remove shadow to keep only the outli elevation: 0, // Remove shadow to keep only the outli
child: Container( child: Container(
height: 175, height: 158,
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
// padding: const EdgeInsets.only( // padding: const EdgeInsets.only(
// left: 10.0, right: 10.0, bottom: 5.0, top: 1.0), // left: 10.0, right: 10.0, bottom: 5.0, top: 1.0),

108
lib/presentation/Screens/charts/widgets/chart_widget.dart
View File

@ -276,6 +276,14 @@ class ChartWidget extends StatelessWidget {
) { ) {
debugPrint('Chart Data: ${jsonEncode(chartData)}'); debugPrint('Chart Data: ${jsonEncode(chartData)}');
// var groupByKeyValue;
// if (chartData['chart_type_json']['chart_type'] == 'bar_chart_horizontal' ||
// chartData['chart_type_json']['chart_type'] == 'horizontal_rotate') {
// groupByKeyValue = chartData['chart_type_json']['y_group'] ?? '';
// } else {
// groupByKeyValue = chartData['chart_type_json']['x_group'] ?? '';
// }
return chartData['response'].asMap().entries.map<PieChartSectionData>(( return chartData['response'].asMap().entries.map<PieChartSectionData>((
entry, entry,
) { ) {
@ -285,6 +293,7 @@ class ChartWidget extends StatelessWidget {
// Handle different types: int, double, and String // Handle different types: int, double, and String
double value = 0.0; double value = 0.0;
var rawValue = data['ObsValue']['Value']; var rawValue = data['ObsValue']['Value'];
// String title = data['ObsKey'][groupByKeyValue] ?? '';
if (rawValue is String) { if (rawValue is String) {
value = double.tryParse(rawValue) ?? 0.0; value = double.tryParse(rawValue) ?? 0.0;
@ -1172,27 +1181,27 @@ class ChartWidget extends StatelessWidget {
), ),
), ),
), ),
Padding( // Padding(
padding: const EdgeInsets.all(8.0), // padding: const EdgeInsets.all(8.0),
child: Wrap( // child: Wrap(
spacing: 12, // spacing: 12,
runSpacing: 8, // runSpacing: 8,
children: groupByValues.map((group) { // children: groupByValues.map((group) {
return Row( // return Row(
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
children: [ // children: [
Container( // Container(
width: 12, // width: 12,
height: 12, // height: 12,
color: groupColorMap[group], // color: groupColorMap[group],
), // ),
SizedBox(width: 6), // SizedBox(width: 6),
Text(group, style: TextStyle(fontSize: 14)), // Text(group, style: TextStyle(fontSize: 14)),
], // ],
); // );
}).toList(), // }).toList(),
), // ),
), // ),
], ],
); );
case 'line_trend_population': case 'line_trend_population':
@ -1749,20 +1758,21 @@ class ChartWidget extends StatelessWidget {
top: 8.0, top: 8.0,
left: 75.0, left: 75.0,
), ),
child: SizedBox( // child: SizedBox(
width: // width:
60, // Limit width to force wrapping // 60, // Limit width to force wrapping
child: Transform.rotate( child: Transform.rotate(
// angle: -0.5, // angle: -0.5,
angle: -1.5, angle: -1.5,
child: TooltipTheme( child: TooltipTheme(
data: TooltipThemeData( data: TooltipThemeData(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.blueGrey[ color: Colors
800], // Change background color .black, // Change background color
// color: Colors.blueGrey[800], // Change background color
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
8, 8,
), // Optional: rounded corners ), // Optional: rounded corners
), ),
@ -1770,40 +1780,24 @@ class ChartWidget extends StatelessWidget {
color: Colors.white, color: Colors.white,
), // Change text color ), // Change text color
), ),
child: TooltipTheme( child: Tooltip(
data: TooltipThemeData( message: title,
decoration: BoxDecoration( child: Text(
color: Colors // title,
.black, // Change background color displayTitle,
// color: Colors.blueGrey[800], // Change background color softWrap: true,
borderRadius: textAlign:
BorderRadius.circular( TextAlign.right,
8, style: TextStyle(
), // Optional: rounded corners fontSize: 10,
),
textStyle: TextStyle(
color: Colors.white,
), // Change text color
),
child: Tooltip(
message: title,
child: Text(
// title,
displayTitle,
softWrap: true,
textAlign:
TextAlign.right,
style: TextStyle(
fontSize: 10,
),
overflow:
TextOverflow.ellipsis,
), ),
overflow:
TextOverflow.ellipsis,
), ),
), ),
), ),
), ),
), // ),
); );
} }
return Container(); return Container();

63
lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart
View File

@ -1258,7 +1258,7 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
), ),
), ),
SizedBox( SizedBox(
height: myheight / 4.8, // Set dynamic height height: myheight / 4.5, // Set dynamic height
child: Container( child: Container(
key: mainTopic['main_topic'] == firstMainTopic key: mainTopic['main_topic'] == firstMainTopic
? cardsKey ? cardsKey
@ -1488,13 +1488,13 @@ class InfoCard extends StatelessWidget {
'/chartScreen/$dataset?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle&key=$encodedKey'); '/chartScreen/$dataset?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle&key=$encodedKey');
}, },
child: Container( child: Container(
height: myheight / 12, height: myheight / 10.9,
width: mywidth / 4, width: mywidth / 4,
margin: const EdgeInsets.symmetric(horizontal: 8), margin: const EdgeInsets.symmetric(horizontal: 8),
// padding: const EdgeInsets.all(10), // padding: const EdgeInsets.all(10),
padding: const EdgeInsets.only(bottom: 1, top: 1, left: 10, right: 10), padding: const EdgeInsets.only(bottom: 0.5, top: 1, left: 10, right: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all(color: bordercolor), border: Border.all(color: bordercolor),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
@ -1527,37 +1527,48 @@ class InfoCard extends StatelessWidget {
Text( Text(
title, title,
style: const TextStyle( style: const TextStyle(
// fontSize: 11, fontSize: 11,
fontSize: 12,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
letterSpacing: 0,
// color: Colors.black, // color: Colors.black,
fontFamily: 'Roboto', fontFamily: 'Roboto',
color: Color(0xFF000000), color: Color(0xFF000000),
), ),
), ),
const SizedBox(height: 0.3), const SizedBox(height: 0.3),
Text(
Flexible( subtitle,
fit: FlexFit.loose, textAlign: TextAlign.center,
child: FittedBox( style: const TextStyle(
fit: BoxFit.contain, fontSize: 11,
child: Column( // fontSize: 12 * 1.1,
children: [ fontFamily: 'Roboto',
Text( fontWeight: FontWeight.w400,
subtitle, color: Color(0xFF8E8E8E),
textAlign: TextAlign.center,
style: const TextStyle(
// fontSize: 11,
fontSize: 12 * 1.1,
fontFamily: 'Roboto',
fontWeight: FontWeight.w400,
color: Color(0xFF8E8E8E),
),
),
],
),
), ),
), ),
// Flexible(
// fit: FlexFit.loose,
// child: FittedBox(
// fit: BoxFit.contain,
// child: Column(
// children: [
// Text(
// subtitle,
// textAlign: TextAlign.center,
// style: const TextStyle(
// // fontSize: 11,
// fontSize: 12 * 1.1,
// fontFamily: 'Roboto',
// fontWeight: FontWeight.w400,
// color: Color(0xFF8E8E8E),
// ),
// ),
// ],
// ),
// ),
// ),
const SizedBox(height: 1), const SizedBox(height: 1),
// Flexible( // Flexible(
@ -1568,7 +1579,7 @@ class InfoCard extends StatelessWidget {
Text( Text(
value, value,
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 26,
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
fontFamily: 'Roboto', fontFamily: 'Roboto',
color: textcolor ?? Colors.black, color: textcolor ?? Colors.black,

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

@ -747,7 +747,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
scrolledUnderElevation: 0, scrolledUnderElevation: 0,
titleSpacing: 0, titleSpacing: 0,
backgroundColor: widget.appbarColor ?? Colors.white, backgroundColor: widget.appbarColor ?? Colors.white,
leadingWidth: widget.showBackButton ? mywidth * 0.25 : null, leadingWidth: widget.showBackButton ? mywidth * 0.18 : null,
bottom: widget.showDivider bottom: widget.showDivider
? PreferredSize( ? PreferredSize(
preferredSize: Size.fromHeight(1), // Height of the line preferredSize: Size.fromHeight(1), // Height of the line
@ -1073,8 +1073,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
color: _getSelectedIndex(currentRoute) == 0 color: _getSelectedIndex(currentRoute) == 0
? Colors.black ? Colors.black
: Color(0xFF989898), : Color(0xFF989898),
width: 20, width: 23.98,
height: 20, height: 25,
), ),
), ),
// label: 'Home', // label: 'Home',
@ -1090,8 +1090,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
color: _getSelectedIndex(currentRoute) == 1 color: _getSelectedIndex(currentRoute) == 1
? Colors.black ? Colors.black
: Color(0xFF989898), : Color(0xFF989898),
width: 20, width: 23.98,
height: 20, height: 25,
), ),
), ),
// label: 'UAE Numbers' // label: 'UAE Numbers'
@ -1106,8 +1106,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
color: _getSelectedIndex(currentRoute) == 2 color: _getSelectedIndex(currentRoute) == 2
? Colors.black ? Colors.black
: Color(0xFF989898), : Color(0xFF989898),
width: 20, width: 23.98,
height: 20, height: 25,
), ),
), ),
// label: 'Competitiveness', // label: 'Competitiveness',
@ -1122,8 +1122,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
color: _getSelectedIndex(currentRoute) == 3 color: _getSelectedIndex(currentRoute) == 3
? Colors.black ? Colors.black
: Color(0xFF989898), : Color(0xFF989898),
width: 20, width: 23.98,
height: 20, height: 25,
), ),
), ),
// label: 'Country Profile', // label: 'Country Profile',

2
pubspec.yaml
View File

@ -1,7 +1,7 @@
name: uae_stat name: uae_stat
description: "View statistics about the UAE from the Federal Center for Statistics and Competitiveness." description: "View statistics about the UAE from the Federal Center for Statistics and Competitiveness."
publish_to: "none" publish_to: "none"
version: 1.0.48+49 version: 1.0.49+50
environment: environment:
sdk: ">=3.2.3 <4.0.0" sdk: ">=3.2.3 <4.0.0"