Type Annotation Fixes:
- fireNotificationList.dart: Added DeleteFireNotificationFunction and TapFireNotificationFunction types to _buildRow and _buildSavedFireNotifications parameters
- homePage.dart: Added Object type to catchError handler parameters
- redux/appReducer.dart: Added dynamic type annotation to action parameter
- redux/fetchDataMiddleware.dart: Added explicit type annotations and improved type casting
- redux/reducers.dart: Added dynamic type annotation to action parameter
- redux/userReducer.dart: Added dynamic type annotation to action parameter
Android Build Configuration Updates:
- Updated compileSdkVersion and targetSdkVersion from 34 to 36 to match plugin requirements
- Moved plugins {} block to first position (Gradle 8.14 requirement)
- Added dev.flutter.flutter-gradle-plugin to plugins block for modern Flutter integration
- Removed deprecated useProguard setting, replaced with shrinkResources
- Disabled Jetifier (android.enableJetifier=false) to improve build performance
- Increased JVM heap allocation to 4096M for large project compilation
- Added Kotlin language version 1.8 override for plugin compatibility
- Added ProGuard rules to exclude optional Google Play Core classes
Build Results:
- ✅ APK builds successfully (146MB debug APK)
- ✅ Zero type inference errors detected by dart analyze
- ✅ Kotlin compilation passes
- ✅ R8 minification configured correctly
- ✅ 301 remaining issues are all INFO-level style suggestions (non-blocking)
169 lines
6.3 KiB
Dart
169 lines
6.3 KiB
Dart
import 'package:badges/badges.dart' as badges_pkg;
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_redux/flutter_redux.dart';
|
|
import 'package:redux/src/store.dart';
|
|
|
|
import 'activeFires.dart';
|
|
import 'colors.dart';
|
|
import 'fireAlert.dart';
|
|
import 'fireNotificationList.dart';
|
|
import 'generated/i18n.dart';
|
|
import 'globals.dart' as globals;
|
|
import 'models/appState.dart';
|
|
import 'monitoredAreas.dart';
|
|
import 'privacyPage.dart';
|
|
import 'sandbox.dart';
|
|
import 'supportPage.dart';
|
|
|
|
@immutable
|
|
class _ViewModel {
|
|
const _ViewModel({
|
|
required this.unreadCount,
|
|
});
|
|
final int unreadCount;
|
|
|
|
@override
|
|
bool operator ==(Object other) {
|
|
return identical(this, other) ||
|
|
other is _ViewModel &&
|
|
runtimeType == other.runtimeType &&
|
|
unreadCount == other.unreadCount;
|
|
}
|
|
|
|
@override
|
|
int get hashCode => unreadCount.hashCode;
|
|
}
|
|
|
|
class MainDrawer extends Drawer {
|
|
MainDrawer(BuildContext context, String currentRoute, {super.key})
|
|
: super(child: mainDrawer(context, currentRoute));
|
|
}
|
|
|
|
Widget mainDrawer(BuildContext context, String currentRoute) {
|
|
return StoreConnector<AppState, _ViewModel>(
|
|
distinct: true,
|
|
converter: (Store<AppState> store) {
|
|
return _ViewModel(unreadCount: store.state.fireNotificationsUnread);
|
|
},
|
|
builder: (BuildContext context, _ViewModel view) {
|
|
const TextStyle bottomTextStyle =
|
|
TextStyle(fontSize: 12.0, color: Colors.grey);
|
|
return ListView(
|
|
// Important: Remove any padding from the ListView.
|
|
padding: EdgeInsets.zero,
|
|
children: <Widget?>[
|
|
GestureDetector(
|
|
onTap: () {
|
|
Navigator.popAndPushNamed(context, '/');
|
|
},
|
|
child: DrawerHeader(
|
|
decoration: const BoxDecoration(
|
|
color: fires300,
|
|
),
|
|
child: Column(
|
|
children: <Widget>[
|
|
Image.asset(
|
|
'images/logo-200.png',
|
|
fit: BoxFit.scaleDown,
|
|
height: 80.0,
|
|
),
|
|
const SizedBox(height: 20.0),
|
|
Text(S.of(context).appName,
|
|
style: const TextStyle(
|
|
fontSize: 24.0,
|
|
color: Colors.white,
|
|
)),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
ListTile(
|
|
leading: const Icon(Icons.whatshot),
|
|
title: Text(S.of(context).activeFires),
|
|
selected: currentRoute == ActiveFiresPage.routeName,
|
|
onTap: () {
|
|
Navigator.popAndPushNamed(context, ActiveFiresPage.routeName);
|
|
},
|
|
),
|
|
ListTile(
|
|
leading: const Icon(Icons.notifications_active),
|
|
selected: currentRoute == FireAlert.routeName,
|
|
title: Text(S.of(context).notifyAFire),
|
|
onTap: () {
|
|
Navigator.popAndPushNamed(context, FireAlert.routeName);
|
|
},
|
|
),
|
|
ListTile(
|
|
leading: const Icon(Icons.notifications),
|
|
selected: currentRoute == FireNotificationList.routeName,
|
|
title: Text(S.of(context).fireNotificationsTitleShort),
|
|
trailing: badges_pkg.Badge(
|
|
position:
|
|
badges_pkg.BadgePosition.topEnd(top: -10, end: -12),
|
|
badgeContent: Text(
|
|
view.unreadCount.toString(),
|
|
style: const TextStyle(color: Colors.white),
|
|
),
|
|
child: const Icon(Icons.notifications)),
|
|
|
|
// Text(S.of(context).fireNotificationsTitleShort),
|
|
onTap: () {
|
|
Navigator.popAndPushNamed(
|
|
context, FireNotificationList.routeName);
|
|
},
|
|
),
|
|
ListTile(
|
|
leading: const Icon(Icons.map),
|
|
selected: currentRoute == MonitoredAreasPage.routeName,
|
|
title: Text(S.of(context).monitoredAreasTitle),
|
|
onTap: () {
|
|
Navigator.popAndPushNamed(
|
|
context, MonitoredAreasPage.routeName);
|
|
},
|
|
),
|
|
const Divider(),
|
|
ListTile(
|
|
leading: const Icon(Icons.favorite),
|
|
selected: currentRoute == SupportPage.routeName,
|
|
title: Text(S.of(context).supportThisInitiative),
|
|
onTap: () {
|
|
Navigator.popAndPushNamed(context, SupportPage.routeName);
|
|
},
|
|
),
|
|
ListTile(
|
|
leading: const Icon(Icons.lock),
|
|
selected: currentRoute == PrivacyPage.routeName,
|
|
title: Text(S.of(context).privacyPolicy),
|
|
onTap: () {
|
|
Navigator.popAndPushNamed(context, PrivacyPage.routeName);
|
|
},
|
|
),
|
|
if (globals.isDevelopment)
|
|
ListTile(
|
|
leading: const Icon(Icons.bug_report),
|
|
title: const Text('Sandbox'),
|
|
selected: currentRoute == Sandbox.routeName,
|
|
onTap: () {
|
|
Navigator.popAndPushNamed(context, Sandbox.routeName);
|
|
},
|
|
)
|
|
else
|
|
null,
|
|
AboutListTile(
|
|
icon: globals.appIcon,
|
|
applicationName: S.of(context).appName,
|
|
applicationVersion: globals.appVersion,
|
|
applicationIcon: globals.appMediumIcon,
|
|
applicationLegalese:
|
|
S.of(context).appLicense(DateTime.now().year.toString()),
|
|
aboutBoxChildren: <Widget>[
|
|
const SizedBox(height: 10.0),
|
|
Text(S.of(context).appMoto),
|
|
// , style: new TextStyle(fontStyle: FontStyle.italic)),
|
|
const SizedBox(height: 10.0),
|
|
Text(S.of(context).NASAAck, style: bottomTextStyle),
|
|
// More ?
|
|
])
|
|
].where((Widget? w) => w != null).cast<Widget>().toList());
|
|
});
|
|
}
|