refactor: Use flutter redux for state management.

TokTok · Nov 2, 2024 · bf0d5e6 · bf0d5e6
1 parent d798045
commit bf0d5e6
Show file tree

Hide file tree

Showing 20 changed files with 232 additions and 145 deletions.
diff --git a/lib/add_contact_page.dart b/lib/add_contact_page.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 import 'strings.dart';
 
-class AddContactPage extends StatefulWidget {
+final class AddContactPage extends StatefulWidget {
   const AddContactPage({super.key, required this.onAddContact});
 
   final Function(String, String) onAddContact;
@@ -11,7 +11,7 @@ class AddContactPage extends StatefulWidget {
   State<AddContactPage> createState() => _AddContactPageState();
 }
 
-class _AddContactPageState extends State<AddContactPage> {
+final class _AddContactPageState extends State<AddContactPage> {
   final _formKey = GlobalKey<FormState>();
   final _toxIdInputController = TextEditingController();
   final _messageInputController =

diff --git a/lib/app.dart b/lib/app.dart
diff --git a/lib/app_state.dart b/lib/app_state.dart
diff --git a/lib/btox_actions.dart b/lib/btox_actions.dart
@@ -0,0 +1,11 @@
+class BtoxUpdateNicknameAction {
+  final String nickname;
+
+  const BtoxUpdateNicknameAction(this.nickname);
+}
+
+class BtoxUpdateStatusMessageAction {
+  final String statusMessage;
+
+  const BtoxUpdateStatusMessageAction(this.statusMessage);
+}
diff --git a/lib/btox_app.dart b/lib/btox_app.dart
@@ -0,0 +1,32 @@
+import 'package:btox/btox_state.dart';
+import 'package:btox/contact_list_page.dart';
+import 'package:btox/db/database.dart';
+import 'package:btox/strings.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_redux/flutter_redux.dart';
+import 'package:redux/redux.dart';
+
+final class BtoxApp extends StatelessWidget {
+  final Database database;
+  final Store<BtoxState> store;
+
+  const BtoxApp({
+    super.key,
+    required this.database,
+    required this.store,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return StoreProvider<BtoxState>(
+      store: store,
+      child: MaterialApp(
+        title: Strings.title,
+        theme: ThemeData(
+          primarySwatch: Colors.blue,
+        ),
+        home: ContactListPage(title: Strings.title, database: database),
+      ),
+    );
+  }
+}
diff --git a/lib/btox_reducer.dart b/lib/btox_reducer.dart
@@ -0,0 +1,18 @@
+import 'package:btox/btox_state.dart';
+import 'package:btox/btox_actions.dart';
+import 'package:redux/redux.dart';
+
+final btoxReducer = combineReducers<BtoxState>([
+  TypedReducer<BtoxState, BtoxUpdateNicknameAction>(_updateNickname).call,
+  TypedReducer<BtoxState, BtoxUpdateStatusMessageAction>(_updateStatusMessage)
+      .call,
+]);
+
+BtoxState _updateNickname(BtoxState state, BtoxUpdateNicknameAction action) {
+  return state.copyWith(nickname: action.nickname);
+}
+
+BtoxState _updateStatusMessage(
+    BtoxState state, BtoxUpdateStatusMessageAction action) {
+  return state.copyWith(statusMessage: action.statusMessage);
+}
diff --git a/lib/btox_state.dart b/lib/btox_state.dart
@@ -0,0 +1,23 @@
+final class BtoxState {
+  final String nickname;
+  final String statusMessage;
+
+  const BtoxState({
+    required this.nickname,
+    required this.statusMessage,
+  });
+
+  const BtoxState.initial()
+      : nickname = 'Yanciman',
+        statusMessage = 'Producing works of art in Kannywood';
+
+  BtoxState copyWith({
+    String? nickname,
+    String? statusMessage,
+  }) {
+    return BtoxState(
+      nickname: nickname ?? this.nickname,
+      statusMessage: statusMessage ?? this.statusMessage,
+    );
+  }
+}
diff --git a/lib/chat_page.dart b/lib/chat_page.dart
@@ -1,34 +1,27 @@
+import 'package:btox/db/database.dart';
+import 'package:btox/strings.dart';
 import 'package:flutter/material.dart';
 
-import 'db/database.dart';
-import 'strings.dart';
+final class ChatPage extends StatefulWidget {
+  final Stream<Contact> contact;
+  final Stream<List<Message>> messages;
+  final void Function(String message) onSendMessage;
 
-class ChatPage extends StatefulWidget {
   const ChatPage({
     super.key,
     required this.contact,
     required this.messages,
     required this.onSendMessage,
   });
 
-  final Stream<Contact> contact;
-  final Stream<List<Message>> messages;
-  final void Function(String message) onSendMessage;
-
   @override
   State<ChatPage> createState() => _ChatPageState();
 }
 
-class _ChatPageState extends State<ChatPage> {
+final class _ChatPageState extends State<ChatPage> {
   final _messageInputFocus = FocusNode();
   final _messageInputController = TextEditingController();
 
-  void _onSendMessage() {
-    widget.onSendMessage(_messageInputController.text);
-    _messageInputController.clear();
-    _messageInputFocus.requestFocus();
-  }
-
   @override
   Widget build(BuildContext context) {
     return StreamBuilder<Contact>(
@@ -82,4 +75,10 @@ class _ChatPageState extends State<ChatPage> {
       ),
     );
   }
+
+  void _onSendMessage() {
+    widget.onSendMessage(_messageInputController.text);
+    _messageInputController.clear();
+    _messageInputFocus.requestFocus();
+  }
 }
diff --git a/lib/contact_list_page.dart b/lib/contact_list_page.dart
@@ -1,22 +1,25 @@
+import 'package:btox/add_contact_page.dart';
+import 'package:btox/btox_state.dart';
+import 'package:btox/chat_page.dart';
+import 'package:btox/db/database.dart';
+import 'package:btox/profile.dart';
+import 'package:btox/settings.dart';
+import 'package:btox/strings.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_redux/flutter_redux.dart';
 
-import 'add_contact_page.dart';
-import 'app_state.dart';
-import 'chat_page.dart';
-import 'db/database.dart';
-import 'profile.dart';
-import 'settings.dart';
-import 'strings.dart';
-
-class ContactListItem extends StatelessWidget {
-  const ContactListItem(
-      {super.key, required this.contact, required this.onTap});
-
+final class ContactListItem extends StatelessWidget {
   final Contact contact;
   final Function(Contact) onTap;
 
+  const ContactListItem({
+    super.key,
+    required this.contact,
+    required this.onTap,
+  });
+
   @override
   Widget build(BuildContext context) {
     return ListTile(
@@ -27,25 +30,15 @@ class ContactListItem extends StatelessWidget {
   }
 }
 
-class ContactListPage extends StatefulWidget {
-  ContactListPage({super.key, required this.title, required this.database});
-
+final class ContactListPage extends StatelessWidget {
   final String title;
   final Database database;
-  final appState = AppState();
 
-  @override
-  State<ContactListPage> createState() => _ContactListPageState();
-}
-
-class _ContactListPageState extends State<ContactListPage> {
-  void _onAddContact(String toxID, String message) {
-    widget.database.addContact(
-      ContactsCompanion.insert(
-        publicKey: toxID.substring(0, toxID.length - 12),
-      ),
-    );
-  }
+  const ContactListPage({
+    super.key,
+    required this.title,
+    required this.database,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -59,9 +52,9 @@ class _ContactListPageState extends State<ContactListPage> {
                 color: Colors.blue,
               ),
               child: ListTile(
-                title: ValueListenableBuilder(
-                  valueListenable: widget.appState.nickname,
-                  builder: (context, String nickname, _) {
+                title: StoreConnector<BtoxState, String>(
+                  converter: (store) => store.state.nickname,
+                  builder: (context, nickname) {
                     return Text(
                       nickname,
                       style: const TextStyle(
@@ -72,9 +65,9 @@ class _ContactListPageState extends State<ContactListPage> {
                     );
                   },
                 ),
-                subtitle: ValueListenableBuilder(
-                  valueListenable: widget.appState.statusMessage,
-                  builder: (context, String statusMessage, _) {
+                subtitle: StoreConnector<BtoxState, String>(
+                  converter: (store) => store.state.statusMessage,
+                  builder: (context, String statusMessage) {
                     return Text(
                       statusMessage,
                       style: const TextStyle(
@@ -95,8 +88,13 @@ class _ContactListPageState extends State<ContactListPage> {
                 Navigator.push(
                   context,
                   MaterialPageRoute(
-                    builder: (context) =>
-                        UserProfilePage(appState: widget.appState),
+                    builder: (context) => StoreConnector<BtoxState, BtoxState>(
+                      converter: (store) => store.state,
+                      builder: (context, state) => UserProfilePage(
+                        state: state,
+                        store: StoreProvider.of(context),
+                      ),
+                    ),
                   ),
                 );
               },
@@ -137,10 +135,10 @@ class _ContactListPageState extends State<ContactListPage> {
             );
           },
         ),
-        title: Text(widget.title),
+        title: Text(title),
       ),
       body: StreamBuilder<List<Contact>>(
-        stream: widget.database.watchContacts(),
+        stream: database.watchContacts(),
         builder: ((context, snapshot) {
           final contacts = snapshot.data ?? [];
 
@@ -154,10 +152,10 @@ class _ContactListPageState extends State<ContactListPage> {
                     context,
                     MaterialPageRoute(
                       builder: (context) => ChatPage(
-                        contact: widget.database.watchContact(contact.id),
-                        messages: widget.database.watchMessagesFor(contact.id),
+                        contact: database.watchContact(contact.id),
+                        messages: database.watchMessagesFor(contact.id),
                         onSendMessage: (String message) {
-                          widget.database.addMessage(MessagesCompanion.insert(
+                          database.addMessage(MessagesCompanion.insert(
                             contactId: contact.id,
                             content: message,
                             timestamp: DateTime.now().toUtc(),
@@ -184,4 +182,12 @@ class _ContactListPageState extends State<ContactListPage> {
       ),
     );
   }
+
+  void _onAddContact(String toxID, String message) {
+    database.addContact(
+      ContactsCompanion.insert(
+        publicKey: toxID.substring(0, toxID.length - 12),
+      ),
+    );
+  }
 }
diff --git a/lib/db/database.dart b/lib/db/database.dart
@@ -15,7 +15,7 @@ class Messages extends Table {
 }
 
 @DriftDatabase(tables: [Contacts, Messages])
-class Database extends _$Database {
+final class Database extends _$Database {
   Database(super.e);
 
   @override

diff --git a/lib/db/native.dart b/lib/db/native.dart
@@ -1,12 +1,11 @@
 import 'dart:io';
 
+import 'package:btox/db/database.dart';
 import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider/path_provider.dart';
 
-import 'database.dart';
-
 Database constructDb() {
   return Database(
     LazyDatabase(() async {

diff --git a/lib/db/unsupported.dart b/lib/db/unsupported.dart
@@ -1,3 +1,3 @@
-import 'database.dart';
+import 'package:btox/db/database.dart';
 
 Database constructDb() => throw UnimplementedError();
diff --git a/lib/db/web.dart b/lib/db/web.dart
@@ -1,8 +1,7 @@
+import 'package:btox/db/database.dart';
 import 'package:drift/drift.dart';
 import 'package:drift/wasm.dart';
 
-import 'database.dart';
-
 Database constructDb() => Database(
     DatabaseConnection.delayed(Future(() async => (await WasmDatabase.open(
           databaseName: 'db',