♻️ migrate codebase to nullsafety

OkunaOrg · Jun 24, 2021 · b0f8d93 · b0f8d93
1 parent 1e68bc3
commit b0f8d93
Show file tree

Hide file tree

Showing 564 changed files with 8,109 additions and 7,941 deletions.
diff --git a/.devcontainer.json b/.devcontainer.json
@@ -0,0 +1,4 @@
+{
+  "image": "cirrusci/flutter:beta",
+  "forwardPorts": [ 5000 ]
+}
diff --git a/bin/split_locales.dart b/bin/split_locales.dart
@@ -18,7 +18,7 @@ void main() {
       translationStrings[mainKey] = {};
     }
 
-    translationStrings[mainKey][translationKey] = json[key];
+    translationStrings[mainKey]![translationKey] = json[key];
 
     if (!mainKey.startsWith('@') && !mainKeys.contains(mainKey)) {
       mainKeys.add(mainKey);
@@ -30,9 +30,9 @@ void main() {
     var output = {};
     var current = translationStrings[mainKey];
 
-    current.keys.forEach((key) {
+    current?.keys.forEach((key) {
       output[key] = current[key];
-      output['@$key'] = translationStrings['@$mainKey'][key];
+      output['@$key'] = translationStrings['@$mainKey']![key];
     });
 
     var str = jsonEncoder.convert(output);

diff --git a/lib/delegates/es_es_localizations_delegate.dart b/lib/delegates/es_es_localizations_delegate.dart
@@ -9,18 +9,24 @@ class MaterialLocalizationEsES extends MaterialLocalizationEs {
 
   const MaterialLocalizationEsES({
     String localeName = 'es-ES',
-    @required intl.DateFormat fullYearFormat,
-    @required intl.DateFormat mediumDateFormat,
-    @required intl.DateFormat longDateFormat,
-    @required intl.DateFormat yearMonthFormat,
-    @required intl.NumberFormat decimalFormat,
-    @required intl.NumberFormat twoDigitZeroPaddedFormat,
+    required intl.DateFormat fullYearFormat,
+    required intl.DateFormat shortDateFormat,
+    required intl.DateFormat mediumDateFormat,
+    required intl.DateFormat longDateFormat,
+    required intl.DateFormat compactDateFormat,
+    required intl.DateFormat yearMonthFormat,
+    required intl.DateFormat shortMonthDayFormat,
+    required intl.NumberFormat decimalFormat,
+    required intl.NumberFormat twoDigitZeroPaddedFormat,
   }) : super(
     localeName: localeName,
     fullYearFormat: fullYearFormat,
+    shortDateFormat: shortDateFormat,
     mediumDateFormat: mediumDateFormat,
     longDateFormat: longDateFormat,
+    compactDateFormat: compactDateFormat,
     yearMonthFormat: yearMonthFormat,
+    shortMonthDayFormat: shortMonthDayFormat,
     decimalFormat: decimalFormat,
     twoDigitZeroPaddedFormat: twoDigitZeroPaddedFormat,
   );
@@ -37,23 +43,32 @@ class MaterialLocalizationEsESDelegate extends LocalizationsDelegate<MaterialLoc
   @override
   Future<MaterialLocalizationEsES> load(Locale locale) {
     intl.DateFormat fullYearFormat;
+    intl.DateFormat shortDateFormat;
     intl.DateFormat mediumDateFormat;
     intl.DateFormat longDateFormat;
+    intl.DateFormat compactDateFormat;
     intl.DateFormat yearMonthFormat;
+    intl.DateFormat shortMonthDayFormat;
     intl.NumberFormat decimalFormat;
     intl.NumberFormat twoDigitZeroPaddedFormat;
     decimalFormat = intl.NumberFormat.decimalPattern(locale.languageCode);
     twoDigitZeroPaddedFormat = intl.NumberFormat('00', locale.languageCode);
     fullYearFormat = intl.DateFormat.y(locale.languageCode);
+    shortDateFormat = intl.DateFormat.MEd(locale.languageCode);
     mediumDateFormat = intl.DateFormat.MMMEd(locale.languageCode);
     longDateFormat = intl.DateFormat.yMMMMEEEEd(locale.languageCode);
+    compactDateFormat = intl.DateFormat.MEd(locale.languageCode);
     yearMonthFormat = intl.DateFormat.yMMMM(locale.languageCode);
+    shortMonthDayFormat = intl.DateFormat.Md(locale.languageCode);
 
     return SynchronousFuture(MaterialLocalizationEsES(
       fullYearFormat: fullYearFormat,
+      shortDateFormat: shortDateFormat,
       mediumDateFormat: mediumDateFormat,
       longDateFormat: longDateFormat,
+      compactDateFormat: compactDateFormat,
       yearMonthFormat: yearMonthFormat,
+      shortMonthDayFormat: shortMonthDayFormat,
       decimalFormat: decimalFormat,
       twoDigitZeroPaddedFormat: twoDigitZeroPaddedFormat
     ));
@@ -66,14 +81,14 @@ class CupertinoLocalizationEsES extends CupertinoLocalizationEs {
 
   const CupertinoLocalizationEsES({
     String localeName = 'es-ES',
-    @required intl.DateFormat fullYearFormat,
-    @required intl.DateFormat dayFormat,
-    @required intl.DateFormat mediumDateFormat,
-    @required intl.DateFormat singleDigitHourFormat,
-    @required intl.DateFormat singleDigitMinuteFormat,
-    @required intl.DateFormat doubleDigitMinuteFormat,
-    @required intl.DateFormat singleDigitSecondFormat,
-    @required intl.NumberFormat decimalFormat,
+    required intl.DateFormat fullYearFormat,
+    required intl.DateFormat dayFormat,
+    required intl.DateFormat mediumDateFormat,
+    required intl.DateFormat singleDigitHourFormat,
+    required intl.DateFormat singleDigitMinuteFormat,
+    required intl.DateFormat doubleDigitMinuteFormat,
+    required intl.DateFormat singleDigitSecondFormat,
+    required intl.NumberFormat decimalFormat,
   }) : super(
     localeName: localeName,
     fullYearFormat: fullYearFormat,
@@ -131,4 +146,4 @@ class CupertinoLocalizationEsESDelegate extends LocalizationsDelegate<CupertinoL
   @override
   bool shouldReload(CupertinoLocalizationEsESDelegate old) => false;
 
-}
+}
diff --git a/lib/delegates/pt_br_localizations_delegate.dart b/lib/delegates/pt_br_localizations_delegate.dart
@@ -9,18 +9,24 @@ class MaterialLocalizationPtBR extends MaterialLocalizationPt {
 
   const MaterialLocalizationPtBR({
     String localeName = 'pt-BR',
-    @required intl.DateFormat fullYearFormat,
-    @required intl.DateFormat mediumDateFormat,
-    @required intl.DateFormat longDateFormat,
-    @required intl.DateFormat yearMonthFormat,
-    @required intl.NumberFormat decimalFormat,
-    @required intl.NumberFormat twoDigitZeroPaddedFormat,
+    required intl.DateFormat fullYearFormat,
+    required intl.DateFormat shortDateFormat,
+    required intl.DateFormat mediumDateFormat,
+    required intl.DateFormat longDateFormat,
+    required intl.DateFormat compactDateFormat,
+    required intl.DateFormat yearMonthFormat,
+    required intl.DateFormat shortMonthDayFormat,
+    required intl.NumberFormat decimalFormat,
+    required intl.NumberFormat twoDigitZeroPaddedFormat,
   }) : super(
     localeName: localeName,
     fullYearFormat: fullYearFormat,
+    shortDateFormat: shortDateFormat,
     mediumDateFormat: mediumDateFormat,
     longDateFormat: longDateFormat,
+    compactDateFormat: compactDateFormat,
     yearMonthFormat: yearMonthFormat,
+    shortMonthDayFormat: shortMonthDayFormat,
     decimalFormat: decimalFormat,
     twoDigitZeroPaddedFormat: twoDigitZeroPaddedFormat,
   );
@@ -37,23 +43,32 @@ class MaterialLocalizationPtBRDelegate extends LocalizationsDelegate<MaterialLoc
   @override
   Future<MaterialLocalizationPtBR> load(Locale locale) {
     intl.DateFormat fullYearFormat;
+    intl.DateFormat shortDateFormat;
     intl.DateFormat mediumDateFormat;
     intl.DateFormat longDateFormat;
+    intl.DateFormat compactDateFormat;
     intl.DateFormat yearMonthFormat;
+    intl.DateFormat shortMonthDayFormat;
     intl.NumberFormat decimalFormat;
     intl.NumberFormat twoDigitZeroPaddedFormat;
     decimalFormat = intl.NumberFormat.decimalPattern(locale.languageCode);
     twoDigitZeroPaddedFormat = intl.NumberFormat('00', locale.languageCode);
     fullYearFormat = intl.DateFormat.y(locale.languageCode);
+    shortDateFormat = intl.DateFormat.MEd(locale.languageCode);
     mediumDateFormat = intl.DateFormat.MMMEd(locale.languageCode);
     longDateFormat = intl.DateFormat.yMMMMEEEEd(locale.languageCode);
+    compactDateFormat = intl.DateFormat.MEd(locale.languageCode);
     yearMonthFormat = intl.DateFormat.yMMMM(locale.languageCode);
+    shortMonthDayFormat = intl.DateFormat.Md(locale.languageCode);
 
     return SynchronousFuture(MaterialLocalizationPtBR(
       fullYearFormat: fullYearFormat,
+      shortDateFormat: shortDateFormat,
       mediumDateFormat: mediumDateFormat,
       longDateFormat: longDateFormat,
+      compactDateFormat: compactDateFormat,
       yearMonthFormat: yearMonthFormat,
+      shortMonthDayFormat: shortMonthDayFormat,
       decimalFormat: decimalFormat,
       twoDigitZeroPaddedFormat: twoDigitZeroPaddedFormat
     ));
@@ -66,14 +81,14 @@ class CupertinoLocalizationPtBR extends CupertinoLocalizationPt {
 
   const CupertinoLocalizationPtBR({
     String localeName = 'pt-BR',
-    @required intl.DateFormat fullYearFormat,
-    @required intl.DateFormat dayFormat,
-    @required intl.DateFormat mediumDateFormat,
-    @required intl.DateFormat singleDigitHourFormat,
-    @required intl.DateFormat singleDigitMinuteFormat,
-    @required intl.DateFormat doubleDigitMinuteFormat,
-    @required intl.DateFormat singleDigitSecondFormat,
-    @required intl.NumberFormat decimalFormat,
+    required intl.DateFormat fullYearFormat,
+    required intl.DateFormat dayFormat,
+    required intl.DateFormat mediumDateFormat,
+    required intl.DateFormat singleDigitHourFormat,
+    required intl.DateFormat singleDigitMinuteFormat,
+    required intl.DateFormat doubleDigitMinuteFormat,
+    required intl.DateFormat singleDigitSecondFormat,
+    required intl.NumberFormat decimalFormat,
   }) : super(
     localeName: localeName,
     fullYearFormat: fullYearFormat,
@@ -130,4 +145,4 @@ class CupertinoLocalizationPtBRDelegate extends LocalizationsDelegate<CupertinoL
   }
   @override
   bool shouldReload(CupertinoLocalizationPtBRDelegate old) => false;
-}
+}
diff --git a/lib/delegates/sv_se_localizations_delegate.dart b/lib/delegates/sv_se_localizations_delegate.dart
@@ -9,18 +9,24 @@ class MaterialLocalizationSvSE extends MaterialLocalizationSv {
 
   const MaterialLocalizationSvSE({
     String localeName = 'sv-SE',
-    @required intl.DateFormat fullYearFormat,
-    @required intl.DateFormat mediumDateFormat,
-    @required intl.DateFormat longDateFormat,
-    @required intl.DateFormat yearMonthFormat,
-    @required intl.NumberFormat decimalFormat,
-    @required intl.NumberFormat twoDigitZeroPaddedFormat,
+   required intl.DateFormat fullYearFormat,
+    required intl.DateFormat shortDateFormat,
+    required intl.DateFormat mediumDateFormat,
+    required intl.DateFormat longDateFormat,
+    required intl.DateFormat compactDateFormat,
+    required intl.DateFormat yearMonthFormat,
+    required intl.DateFormat shortMonthDayFormat,
+    required intl.NumberFormat decimalFormat,
+    required intl.NumberFormat twoDigitZeroPaddedFormat,
   }) : super(
     localeName: localeName,
     fullYearFormat: fullYearFormat,
+    shortDateFormat: shortDateFormat,
     mediumDateFormat: mediumDateFormat,
     longDateFormat: longDateFormat,
+    compactDateFormat: compactDateFormat,
     yearMonthFormat: yearMonthFormat,
+    shortMonthDayFormat: shortMonthDayFormat,
     decimalFormat: decimalFormat,
     twoDigitZeroPaddedFormat: twoDigitZeroPaddedFormat,
   );
@@ -37,23 +43,32 @@ class MaterialLocalizationSvSEDelegate extends LocalizationsDelegate<MaterialLoc
   @override
   Future<MaterialLocalizationSvSE> load(Locale locale) {
     intl.DateFormat fullYearFormat;
+    intl.DateFormat shortDateFormat;
     intl.DateFormat mediumDateFormat;
     intl.DateFormat longDateFormat;
+    intl.DateFormat compactDateFormat;
     intl.DateFormat yearMonthFormat;
+    intl.DateFormat shortMonthDayFormat;
     intl.NumberFormat decimalFormat;
     intl.NumberFormat twoDigitZeroPaddedFormat;
     decimalFormat = intl.NumberFormat.decimalPattern(locale.languageCode);
     twoDigitZeroPaddedFormat = intl.NumberFormat('00', locale.languageCode);
     fullYearFormat = intl.DateFormat.y(locale.languageCode);
+    shortDateFormat = intl.DateFormat.MEd(locale.languageCode);
     mediumDateFormat = intl.DateFormat.MMMEd(locale.languageCode);
     longDateFormat = intl.DateFormat.yMMMMEEEEd(locale.languageCode);
+    compactDateFormat = intl.DateFormat.MEd(locale.languageCode);
     yearMonthFormat = intl.DateFormat.yMMMM(locale.languageCode);
+    shortMonthDayFormat = intl.DateFormat.Md(locale.languageCode);
 
     return SynchronousFuture(MaterialLocalizationSvSE(
       fullYearFormat: fullYearFormat,
+      shortDateFormat: shortDateFormat,
       mediumDateFormat: mediumDateFormat,
       longDateFormat: longDateFormat,
+      compactDateFormat: compactDateFormat,
       yearMonthFormat: yearMonthFormat,
+      shortMonthDayFormat: shortMonthDayFormat,
       decimalFormat: decimalFormat,
       twoDigitZeroPaddedFormat: twoDigitZeroPaddedFormat
     ));
@@ -66,14 +81,14 @@ class CupertinoLocalizationSvSE extends CupertinoLocalizationSv {
 
   const CupertinoLocalizationSvSE({
     String localeName = 'sv-SE',
-    @required intl.DateFormat fullYearFormat,
-    @required intl.DateFormat dayFormat,
-    @required intl.DateFormat mediumDateFormat,
-    @required intl.DateFormat singleDigitHourFormat,
-    @required intl.DateFormat singleDigitMinuteFormat,
-    @required intl.DateFormat doubleDigitMinuteFormat,
-    @required intl.DateFormat singleDigitSecondFormat,
-    @required intl.NumberFormat decimalFormat,
+    required intl.DateFormat fullYearFormat,
+    required intl.DateFormat dayFormat,
+    required intl.DateFormat mediumDateFormat,
+    required intl.DateFormat singleDigitHourFormat,
+    required intl.DateFormat singleDigitMinuteFormat,
+    required intl.DateFormat doubleDigitMinuteFormat,
+    required intl.DateFormat singleDigitSecondFormat,
+    required intl.NumberFormat decimalFormat,
   }) : super(
     localeName: localeName,
     fullYearFormat: fullYearFormat,
@@ -130,4 +145,4 @@ class CupertinoLocalizationSvSEDelegate extends LocalizationsDelegate<CupertinoL
   }
   @override
   bool shouldReload(CupertinoLocalizationSvSEDelegate old) => false;
-}
+}
diff --git a/lib/libs/pretty_count.dart b/lib/libs/pretty_count.dart
@@ -1,8 +1,8 @@
 import 'package:Okuna/services/localization.dart';
 
 String getPrettyCount(int value, LocalizationService localizationService) {
-  String postfix;
-  double finalValue;
+  late String postfix;
+  late double finalValue;
 
   if (value < 0) {
     throw 'Invalid value';

diff --git a/lib/locale/messages_all.dart b/lib/locale/messages_all.dart
@@ -42,7 +42,7 @@ Map<String, LibraryLoader> _deferredLibraries = {
   'tr': () => new Future.value(null),
 };
 
-MessageLookupByLibrary _findExact(String localeName) {
+MessageLookupByLibrary? _findExact(String localeName) {
   switch (localeName) {
     case 'da':
       return messages_da.messages;
@@ -95,7 +95,7 @@ bool _messagesExistFor(String locale) {
   }
 }
 
-MessageLookupByLibrary _findGeneratedMessagesFor(String locale) {
+MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) {
   var actualLocale = Intl.verifiedLocale(locale, _messagesExistFor,
       onFailure: (_) => null);
   if (actualLocale == null) return null;

diff --git a/lib/main.dart b/lib/main.dart
@@ -44,18 +44,18 @@ class MyApp extends StatefulWidget {
   @override
   _MyAppState createState() => _MyAppState();
 
-  static void setLocale(BuildContext context, Locale newLocale) {
-    _MyAppState state = context.findAncestorStateOfType<_MyAppState>();
+  static void setLocale(BuildContext context, Locale? newLocale) {
+    _MyAppState? state = context.findAncestorStateOfType<_MyAppState>();
 
-    state.setState(() {
-      state.locale = newLocale;
+    state?.setState(() {
+      state.locale = newLocale ?? Locale('en', 'US');
     });
   }
 }
 
 class _MyAppState extends State<MyApp> {
-  Locale locale;
-  bool _needsBootstrap;
+  Locale? locale;
+  late bool _needsBootstrap;
 
   static const MAX_NETWORK_IMAGE_CACHE_MB = 200;
   static const MAX_NETWORK_IMAGE_CACHE_ENTRIES = 1000;
@@ -220,9 +220,9 @@ class _MyAppState extends State<MyApp> {
               },
               '/waitlist/subscribe_done_step': (BuildContext context) {
                 bootstrapOpenbookProviderInContext(context);
-                WaitlistSubscribeArguments args =
-                    ModalRoute.of(context).settings.arguments;
-                return OBWaitlistSubscribeDoneStep(count: args.count);
+                WaitlistSubscribeArguments? args =
+                    ModalRoute.of(context)?.settings.arguments as WaitlistSubscribeArguments?;
+                return OBWaitlistSubscribeDoneStep(count: args?.count ?? 0);
               }
             }),
       ),
@@ -232,7 +232,7 @@ class _MyAppState extends State<MyApp> {
   void bootstrapOpenbookProviderInContext(BuildContext context) {
     var openbookProvider = OpenbookProvider.of(context);
     var localizationService = LocalizationService.of(context);
-    if (this.locale.languageCode !=
+    if (this.locale?.languageCode !=
         localizationService.getLocale().languageCode) {
       Future.delayed(Duration(milliseconds: 0), () {
         MyApp.setLocale(context, this.locale);
@@ -260,11 +260,11 @@ Future<Null> main() async {
       return;
     }
 
-    SentryClient sentryClient =
-        app.openbookProviderKey.currentState.sentryClient;
+    SentryClient? sentryClient =
+        app.openbookProviderKey.currentState?.sentryClient;
 
     try {
-      sentryClient.captureException(
+      sentryClient?.captureException(
         error,
         stackTrace: stackTrace,
       );