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

merge issue

Browse Source
This commit is contained in:
Kalonkarthik 2025-03-24 18:19:03 +05:30
commit a0d7a733a4
5 changed files with 1570 additions and 1404 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 = "42" flutterVersionCode = "43"
} }
def flutterVersionName = localProperties.getProperty("flutter.versionName") def flutterVersionName = localProperties.getProperty("flutter.versionName")
if (flutterVersionName == null) { if (flutterVersionName == null) {
flutterVersionName = "1.0.41" flutterVersionName = "1.0.42"
} }
def keystorePropertiesFile = rootProject.file("key.properties") def keystorePropertiesFile = rootProject.file("key.properties")

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

File diff suppressed because it is too large Load Diff

7
lib/presentation/routes/drawer_routes/Drawer Items/feedback.dart
View File

@ -777,9 +777,6 @@ class _FeedbackFormState extends ConsumerState<FeedbackForm>
} }
Future<void> _submitFeedback() async { Future<void> _submitFeedback() async {
setState(() {
isLoading = true;
});
if (_selectedEmojiIndex == null) { if (_selectedEmojiIndex == null) {
setState(() { setState(() {
_isSmileySelected = false; _isSmileySelected = false;
@ -802,6 +799,10 @@ class _FeedbackFormState extends ConsumerState<FeedbackForm>
return; return;
} }
setState(() {
isLoading = true;
});
final feedbackData = { final feedbackData = {
"userId": userId, "userId": userId,
"ease_of_use": _easeOfUseRating, "ease_of_use": _easeOfUseRating,

12
lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart
View File

@ -357,8 +357,7 @@ class NotificationTile extends StatelessWidget {
print('isPushed $isPushed , $id'); print('isPushed $isPushed , $id');
return GestureDetector( return GestureDetector(
onTap: isPushed onTap: () {
? () {
readedNotification(userID, id); readedNotification(userID, id);
final encodedKey = Uri.encodeQueryComponent('notification'); final encodedKey = Uri.encodeQueryComponent('notification');
context.go('/notification_details', extra: { context.go('/notification_details', extra: {
@ -369,8 +368,7 @@ class NotificationTile extends StatelessWidget {
'id': id, 'id': id,
'backNavigation': encodedKey 'backNavigation': encodedKey
}); });
} },
: null,
child: ListTile( child: ListTile(
leading: isPushed leading: isPushed
? const Icon(Icons.circle, size: 12, color: Color(0xFFFF274E)) ? const Icon(Icons.circle, size: 12, color: Color(0xFFFF274E))
@ -390,10 +388,8 @@ class NotificationTile extends StatelessWidget {
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
), ),
trailing: isPushed trailing: const Icon(Icons.arrow_forward_ios,
? const Icon(Icons.arrow_forward_ios, size: 16, color: Color(0xFF898C81)),
size: 16, color: Color(0xFF898C81))
: null,
), ),
); );
} }

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.41+40 version: 1.0.42+43
environment: environment:
sdk: ">=3.2.3 <4.0.0" sdk: ">=3.2.3 <4.0.0"