chore: Upgrade to latest sdk and dep versions.

TokTok · Nov 2, 2024 · a06f2fe · a06f2fe
1 parent d13ebc8
commit a06f2fe
Show file tree

Hide file tree

Showing 17 changed files with 215 additions and 253 deletions.
diff --git a/.heroku/entrypoint.sh b/.heroku/entrypoint.sh
diff --git a/.heroku/keys b/.heroku/keys
diff --git a/.heroku/wasm.cpp b/.heroku/wasm.cpp
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -5,3 +5,7 @@ include: package:flutter_lints/flutter.yaml
 linter:
   rules:
     prefer_single_quotes: true
+
+analyzer:
+  exclude:
+    - '**/*.g.dart'
diff --git a/heroku.yml b/heroku.yml
diff --git a/lib/add_contact_page.dart b/lib/add_contact_page.dart
@@ -3,8 +3,7 @@ import 'package:flutter/material.dart';
 import 'strings.dart';
 
 class AddContactPage extends StatefulWidget {
-  const AddContactPage({Key? key, required this.onAddContact})
-      : super(key: key);
+  const AddContactPage({super.key, required this.onAddContact});
 
   final Function(String, String) onAddContact;
 
@@ -45,7 +44,7 @@ class _AddContactPageState extends State<AddContactPage> {
                   validator: (value) {
                     value ??= '';
                     if (value.length != 76) {
-                      return Strings.toxIdLengthError + ' (${value.length}/76)';
+                      return '${Strings.toxIdLengthError} (${value.length}/76)';
                     }
                     return null;
                   },

diff --git a/lib/app.dart b/lib/app.dart
@@ -5,10 +5,10 @@ import 'db/database.dart';
 import 'strings.dart';
 
 class App extends StatelessWidget {
-  const App({Key? key, required this.database}) : super(key: key);
-
   final Database database;
 
+  const App({super.key, required this.database});
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(

diff --git a/lib/chat_page.dart b/lib/chat_page.dart
@@ -5,11 +5,11 @@ import 'strings.dart';
 
 class ChatPage extends StatefulWidget {
   const ChatPage({
-    Key? key,
+    super.key,
     required this.contact,
     required this.messages,
     required this.onSendMessage,
-  }) : super(key: key);
+  });
 
   final Stream<Contact> contact;
   final Stream<List<Message>> messages;

diff --git a/lib/contact_list_page.dart b/lib/contact_list_page.dart
@@ -11,8 +11,8 @@ import 'settings.dart';
 import 'strings.dart';
 
 class ContactListItem extends StatelessWidget {
-  const ContactListItem({Key? key, required this.contact, required this.onTap})
-      : super(key: key);
+  const ContactListItem(
+      {super.key, required this.contact, required this.onTap});
 
   final Contact contact;
   final Function(Contact) onTap;
@@ -28,8 +28,7 @@ class ContactListItem extends StatelessWidget {
 }
 
 class ContactListPage extends StatefulWidget {
-  ContactListPage({Key? key, required this.title, required this.database})
-      : super(key: key);
+  ContactListPage({super.key, required this.title, required this.database});
 
   final String title;
   final Database database;
@@ -115,16 +114,14 @@ class _ContactListPageState extends State<ContactListPage> {
                 );
               },
             ),
-            defaultTargetPlatform == TargetPlatform.android
-                ? ListTile(
-                    leading: const Icon(Icons.close),
-                    title: const Text(Strings.menuQuit),
-                    onTap: () {
-                      SystemChannels.platform
-                          .invokeMethod('SystemNavigator.pop');
-                    },
-                  )
-                : const SizedBox.shrink(),
+            if (defaultTargetPlatform == TargetPlatform.android)
+              ListTile(
+                leading: const Icon(Icons.close),
+                title: const Text(Strings.menuQuit),
+                onTap: () {
+                  SystemChannels.platform.invokeMethod('SystemNavigator.pop');
+                },
+              )
           ],
         ),
       ),

diff --git a/lib/db/database.dart b/lib/db/database.dart
@@ -16,7 +16,7 @@ class Messages extends Table {
 
 @DriftDatabase(tables: [Contacts, Messages])
 class Database extends _$Database {
-  Database(QueryExecutor e) : super(e);
+  Database(super.e);
 
   @override
   int get schemaVersion => 2;

diff --git a/lib/profile.dart b/lib/profile.dart
@@ -6,7 +6,7 @@ import 'strings.dart';
 class UserProfilePage extends StatefulWidget {
   final AppState appState;
 
-  const UserProfilePage({Key? key, required this.appState}) : super(key: key);
+  const UserProfilePage({super.key, required this.appState});
 
   @override
   State<UserProfilePage> createState() => _UserProfilePageState();
@@ -114,15 +114,15 @@ class _UserProfilePageState extends State<UserProfilePage> {
               ),
             ),
             ElevatedButton(
-              child: _applyButtonPressed
-                  ? const Text(Strings.applied)
-                  : const Text(Strings.applyChanges),
               style: ElevatedButton.styleFrom(
                 backgroundColor:
                     _applyButtonPressed ? Colors.green : Colors.blue,
                 foregroundColor: Colors.white,
               ),
               onPressed: () => _onValidate(),
+              child: _applyButtonPressed
+                  ? const Text(Strings.applied)
+                  : const Text(Strings.applyChanges),
             ),
           ],
         ),

diff --git a/lib/settings.dart b/lib/settings.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'strings.dart';
 
 class SettingsPage extends StatefulWidget {
-  const SettingsPage({Key? key}) : super(key: key);
+  const SettingsPage({super.key});
 
   @override
   State<SettingsPage> createState() => _SettingsPageState();