Turn off autocorrect/capitalization for login

Was something for my local matrix
environment, committed
accidentally.

lib/login.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:matrix/matrix.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:zenith/rooms.dart';
@@ -18,18 +19,23 @@ class _LoginPageState extends State<LoginPage> {
   bool loggingIn = false;
   String failedMessage = '';
 
-  void connectMatrix() async {
+  void login() async {
     setState(() {
       loggingIn = true;
     });
 
+    final provider = Provider.of<ZenithClientProvider>(context, listen: false);
+
     try {
-      final provider =
-          Provider.of<ZenithClientProvider>(context, listen: false);
-      await provider.initialize(serverController.text, usernameController.text,
-          passwordController.text);
+      await provider.client.checkHomeserver(Uri.parse(serverController.text));
+      await provider.client.login(
+        LoginType.mLoginPassword,
+        password: passwordController.text,
+        identifier: AuthenticationUserIdentifier(user: usernameController.text),
+        refreshToken: true,
+      );
     } catch (error) {
-      print("Error signing in $error");
+      print(error);
       setState(() {
         failedMessage = error.toString();
         loggingIn = false;
@@ -73,26 +79,30 @@ class _LoginPageState extends State<LoginPage> {
             title: const Text("Login"),
           ),
           body: Padding(
-            padding: const EdgeInsets.all(16.0),
+            padding: const EdgeInsets.all(8.0),
             child: Center(
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   TextFormField(
                     controller: serverController,
+                    autocorrect: false,
+                    textCapitalization: TextCapitalization.none,
                     decoration: const InputDecoration(
                         labelText: 'Server', hintText: 'https://matrix.org'),
                   ),
                   TextFormField(
                     controller: usernameController,
+                    autocorrect: false,
                     decoration: const InputDecoration(
                         labelText: 'Username', hintText: 'john'),
                   ),
                   TextFormField(
                     controller: passwordController,
+                    autocorrect: false,
                     decoration: const InputDecoration(labelText: 'Password'),
                     obscureText: true,
-                    onFieldSubmitted: (value) => connectMatrix(),
+                    onFieldSubmitted: (value) => login(),
                   ),
                   Text(failedMessage,
                       style: Theme.of(context).textTheme.headlineSmall)
@@ -101,7 +111,7 @@ class _LoginPageState extends State<LoginPage> {
             ),
           ),
           floatingActionButton: FloatingActionButton(
-            onPressed: loggingIn ? null : connectMatrix,
+            onPressed: loggingIn ? null : login,
             tooltip: 'Log in',
             child: loggingIn
                 ? const CircularProgressIndicator()

lib/main.dart

@@ -37,7 +37,8 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  bool savedCreds = false;
+  bool showRooms = false;
+  String errorMessage = "";
 
   void getCreds() async {
     final prefs = await SharedPreferences.getInstance();
@@ -46,13 +47,25 @@ class _MyHomePageState extends State<MyHomePage> {
     final password = prefs.getString("password");
 
     if (homeserver == null || username == null || password == null) return;
-    setState(() {
-      savedCreds = true;
-    });
 
     if (!mounted) return;
     final provider = Provider.of<ZenithClientProvider>(context, listen: false);
-    await provider.initialize(homeserver, username, password);
+    setState(() {
+      showRooms = true;
+    });
+
+    try {
+      await provider.client.checkHomeserver(Uri.parse(homeserver));
+      if (!provider.client.isLogged())
+        await provider.client.login(LoginType.mLoginPassword,
+            password: password,
+            identifier: AuthenticationUserIdentifier(user: username));
+    } catch (error) {
+      print(error);
+      setState(() {
+        errorMessage = error.toString();
+      });
+    }
   }
 
   @override
@@ -63,10 +76,22 @@ class _MyHomePageState extends State<MyHomePage> {
 
   @override
   Widget build(BuildContext context) {
-    if (!savedCreds) {
-      return const LoginPage();
-    } else {
+    if (errorMessage.isNotEmpty)
+      return Column(
+        children: [
+          ElevatedButton(
+              onPressed: () {
+                setState(() {
+                  errorMessage = "";
+                });
+              },
+              child: const Text("Clear")),
+          ErrorWidget(errorMessage),
+        ],
+      );
+    if (showRooms)
       return const RoomsPage();
-    }
+    else
+      return const LoginPage();
   }
 }

lib/room.dart

@@ -1,5 +1,7 @@
 import 'dart:async';
+import 'dart:io';
 
+import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:matrix/matrix.dart';
 
@@ -34,6 +36,16 @@ class _RoomPageState extends State<RoomPage> {
     });
   }
 
+  void setAvatar() async {
+    final participants = widget.room.getParticipants();
+    final picked = await FilePicker.platform.pickFiles(type: FileType.image);
+    if (picked == null) return;
+    final file = File(picked.files.single.path!);
+    final bytes = await file.readAsBytes();
+    final uri = await widget.room.client.uploadContent(bytes);
+    await widget.room.client.setAvatarUrl(participants[0].id, uri);
+  }
+
   @override
   void dispose() {
     super.dispose();
@@ -42,27 +54,43 @@ class _RoomPageState extends State<RoomPage> {
 
   void sendMessage() {}
 
+  List<Event>? get messages => timeline?.events
+      .where((element) => element.type == EventTypes.Message)
+      .toList();
+
   List<Widget> getChildren() {
     if (timeline == null) return [const CircularProgressIndicator()];
     return [
       Expanded(
         child: ListView.builder(
-            itemCount: timeline?.events.length,
+            itemCount: messages?.length,
             reverse: true,
             itemBuilder: (context, index) => ListTile(
-                  title: Text(timeline!.events[index].senderFromMemoryOrFallback
-                          .displayName ??
+                  title: Text(
+                      messages![index].senderFromMemoryOrFallback.displayName ??
                           ""),
-                  subtitle: Text(timeline!.events[index].body),
+                  subtitle: Text(messages![index].body),
+                  leading:
+                      messages![index].senderFromMemoryOrFallback.avatarUrl !=
+                              null
+                          ? CircleAvatar(
+                              foregroundImage: NetworkImage(messages![index]
+                                  .senderFromMemoryOrFallback
+                                  .avatarUrl!
+                                  .getThumbnail(widget.room.client,
+                                      width: 50, height: 50)
+                                  .toString()))
+                          : null,
                 )),
       ),
       TextFormField(
         controller: chatController,
+        textCapitalization: TextCapitalization.sentences,
+        textInputAction: TextInputAction.send,
         decoration: const InputDecoration(hintText: 'Message'),
         onFieldSubmitted: (value) async {
-          print("Sending text event $value to room ${widget.room.id}...");
-          await widget.room.sendTextEvent(value);
           chatController.text = '';
+          await widget.room.sendTextEvent(value);
         },
       ),
     ];
@@ -73,18 +101,18 @@ class _RoomPageState extends State<RoomPage> {
     return Scaffold(
       appBar: AppBar(
         backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-        title: Text(widget.room.getLocalizedDisplayname()),
+        title: Text(widget.room
+            .getLocalizedDisplayname()
+            .replaceFirst(RegExp("Group with "), "")),
+        actions: [
+          IconButton(onPressed: setAvatar, icon: const Icon(Icons.image))
+        ],
       ),
       body: Padding(
-          padding: const EdgeInsets.all(16.0),
+          padding: const EdgeInsets.all(8.0),
           child: Column(
             children: getChildren(),
           )),
-      floatingActionButton: FloatingActionButton(
-        onPressed: sendMessage,
-        tooltip: 'Send message',
-        child: const Icon(Icons.send),
-      ),
     );
   }
 }

lib/rooms.dart

@@ -14,6 +14,8 @@ class RoomsPage extends StatefulWidget {
 }
 
 class _RoomsPageState extends State<RoomsPage> {
+  bool loadingRooms = true;
+
   @override
   void initState() {
     super.initState();
@@ -76,27 +78,36 @@ class _RoomsPageState extends State<RoomsPage> {
         ],
       ),
       body: Padding(
-        padding: const EdgeInsets.all(16.0),
+        padding: const EdgeInsets.all(8.0),
         child: Center(child: Consumer<ZenithClientProvider>(
           builder: (context, provider, child) {
-            if (provider.loading)
+            provider.client.onRoomState.stream.listen((event) {
+              setState(() {
+                loadingRooms = false;
+              });
+            });
+
+            if (provider.client.rooms.isEmpty)
               return const CircularProgressIndicator();
             else
               return ListView.builder(
                   itemCount: provider.client.rooms.length,
                   itemBuilder: (context, index) => ListTile(
                         title: Text(provider.client.rooms[index]
-                            .getLocalizedDisplayname()),
+                            .getLocalizedDisplayname()
+                            .replaceFirst(RegExp("Group with "), "")),
+                        leading: CircleAvatar(
+                            foregroundImage: NetworkImage(provider
+                                    .client.rooms[index].avatar
+                                    ?.getThumbnail(provider.client,
+                                        width: 50, height: 50)
+                                    .toString() ??
+                                "")),
                         onTap: () => viewRoom(provider.client.rooms[index]),
                       ));
           },
         )),
       ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: sendMessage,
-        tooltip: 'Send message',
-        child: const Icon(Icons.send),
-      ),
     );
   }
 }

lib/zenith_client_provider.dart

@@ -1,30 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:matrix/matrix.dart';
+import 'package:path_provider/path_provider.dart';
 
 class ZenithClientProvider extends ChangeNotifier {
-  late Client _client;
-  bool _loading = true;
-
-  Client get client => _client;
-
-  bool get loading => _loading;
-
-  Future<void> initialize(
-      String homeserver, String username, String password) async {
-    _loading = true;
-    _client = Client("zenith");
-    try {
-      print("Checking homeserver...");
-      await client.checkHomeserver(Uri.parse(homeserver));
-      print("Logging in...");
-      await client.login(LoginType.mLoginPassword,
-          identifier: AuthenticationUserIdentifier(user: username),
-          password: password);
-      await client.roomsLoading;
-      await client.accountDataLoading;
-    } finally {
-      _loading = false;
-    }
-    notifyListeners();
-  }
+  final client = Client("zenith", databaseBuilder: (_) async {
+    final dir =
+        await getApplicationSupportDirectory(); // Recommend path_provider package
+    final db = HiveCollectionsDatabase('matrix_example_chat', dir.path);
+    await db.open();
+    return db;
+  });
 }

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,8 +5,10 @@
 import FlutterMacOS
 import Foundation
 
+import path_provider_foundation
 import shared_preferences_foundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
 }

pubspec.lock

@@ -145,6 +145,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
+  file_picker:
+    dependency: "direct main"
+    description:
+      name: file_picker
+      sha256: "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -174,6 +182,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.0"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.17"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -328,6 +344,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.8.3"
+  path_provider:
+    dependency: "direct main"
+    description:
+      name: path_provider
+      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -607,4 +647,4 @@ packages:
     version: "6.3.0"
 sdks:
   dart: ">=3.1.5 <4.0.0"
-  flutter: ">=3.7.0"
+  flutter: ">=3.10.0"

pubspec.yaml

@@ -40,6 +40,8 @@ dependencies:
   flutter_openssl_crypto: ^0.3.0
   provider: ^6.1.1
   shared_preferences: ^2.2.2
+  file_picker: ^6.1.1
+  path_provider: ^2.1.1
 
 dev_dependencies:
   flutter_test: