fix: resolve 2 remaining strict analysis errors

- introPage.dart: Convert fireItems to proper static function closure
- mainDrawer.dart: Convert unreadCount int to String for Text widget
This commit is contained in:
vjrj 2026-03-06 11:21:06 +01:00
parent 1864e5b105
commit 7a4c9fb3bc
61 changed files with 1386 additions and 1202 deletions

View file

@ -16,12 +16,12 @@ import 'redux/reducers.dart';
import 'sentryReport.dart';
Future<PackageInfo> loadPackageInfo() async {
PackageInfo packageInfo = await PackageInfo.fromPlatform();
final PackageInfo packageInfo = await PackageInfo.fromPlatform();
return packageInfo;
}
Future<Map<String, dynamic>> loadSecrets() async {
return await SecretLoader(
return SecretLoader(
secretPath: globals.isDevelopment
? 'assets/private-settings-dev.json'
: 'assets/private-settings.json')
@ -34,29 +34,29 @@ Future<void> mainCommon(List<Middleware<AppState>> otherMiddleware) async {
// Initialize Firebase before any Firebase-dependent code runs
await Firebase.initializeApp();
final getIt = GetIt.instance;
final GetIt getIt = GetIt.instance;
getIt.registerSingleton<FiresApi>(FiresApi());
loadPackageInfo().then((packageInfo) {
loadPackageInfo().then((PackageInfo packageInfo) {
globals.appVersion = packageInfo.version;
print('Running version ${packageInfo.version}');
loadSecrets().then((secrets) {
final store = Store<AppState>(appStateReducer,
loadSecrets().then((Map<String, dynamic> secrets) {
final Store<AppState> store = Store<AppState>(appStateReducer,
initialState: AppState(
gmapKey: secrets['gmapKey'] as String,
firesApiKey: secrets['firesApiKey'] as String,
serverUrl: secrets['firesApiUrl'] as String,
firesApiUrl: (secrets['firesApiUrl'] as String) + "api/v1/"),
firesApiUrl: "${secrets['firesApiUrl'] as String}api/v1/"),
middleware: List.from(otherMiddleware)..add(fetchDataMiddleware));
getIt.registerSingleton<Store<AppState>>(store);
getIt.registerSingleton<String>(store.state.firesApiUrl,
instanceName: "firesApiUrl");
instanceName: 'firesApiUrl');
getIt.registerSingleton<String>(store.state.firesApiKey,
instanceName: "firesApiKey");
instanceName: 'firesApiKey');
getIt.registerSingleton<String>(store.state.serverUrl,
instanceName: "serverUrl");
instanceName: 'serverUrl');
getIt.registerSingleton<String>(store.state.gmapKey,
instanceName: "gmapKey");
instanceName: 'gmapKey');
// https://flutter.io/cookbook/maintenance/error-reporting/
runZonedGuarded<Future<void>>(() async {
@ -68,7 +68,7 @@ Future<void> mainCommon(List<Middleware<AppState>> otherMiddleware) async {
});
// Listen to store changes, and re-render when the state is updated
store.onChange.listen((state) {
store.onChange.listen((AppState state) {
// print('Store onChange');
});
FlutterError.onError = (FlutterErrorDetails details) {