chore: Adjust onboarding design

lib/config/themes.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'app_config.dart';
@@ -59,7 +58,6 @@ abstract class FluffyThemes {
           filled: true,
         ),
         appBarTheme: AppBarTheme(
-          systemOverlayStyle: SystemUiOverlayStyle.dark,
           surfaceTintColor: Colors.white,
           shadowColor: Colors.black.withAlpha(64),
         ),
@@ -92,6 +90,10 @@ abstract class FluffyThemes {
           filled: true,
         ),
         dividerColor: Colors.blueGrey.shade900,
+        appBarTheme: AppBarTheme(
+          surfaceTintColor: Colors.black,
+          shadowColor: Colors.black.withAlpha(64),
+        ),
       );
 
   static Color blackWhiteColor(BuildContext context) =>

lib/pages/chat_list/chat_list_header.dart

@@ -1,9 +1,9 @@
-import 'package:fluffychat/config/app_config.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:vrouter/vrouter.dart';
 
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat_list/chat_list.dart';
 import 'package:fluffychat/pages/chat_list/client_chooser_button.dart';
 import 'package:fluffychat/widgets/matrix.dart';

lib/pages/connect/connect_page_view.dart

@@ -33,7 +33,7 @@ class ConnectPageView extends StatelessWidget {
         children: [
           if (Matrix.of(context).loginRegistrationSupported ?? false) ...[
             Padding(
-              padding: const EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(12.0),
               child: Center(
                 child: Stack(
                   children: [
@@ -85,7 +85,7 @@ class ConnectPageView extends StatelessWidget {
               ),
             ),
             Padding(
-              padding: const EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(12.0),
               child: TextField(
                 controller: controller.usernameController,
                 onSubmitted: (_) => controller.signUp(),
@@ -101,7 +101,7 @@ class ConnectPageView extends StatelessWidget {
               ),
             ),
             Padding(
-              padding: const EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(12.0),
               child: Hero(
                 tag: 'loginButton',
                 child: ElevatedButton(
@@ -116,7 +116,7 @@ class ConnectPageView extends StatelessWidget {
               children: [
                 const Expanded(child: Divider(color: Colors.white)),
                 Padding(
-                  padding: const EdgeInsets.all(16.0),
+                  padding: const EdgeInsets.all(12.0),
                   child: Text(
                     L10n.of(context)!.or,
                     style: const TextStyle(color: Colors.white),
@@ -138,7 +138,7 @@ class ConnectPageView extends StatelessWidget {
                 : Center(
                     child: identityProviders.length == 1
                         ? Padding(
-                            padding: const EdgeInsets.all(16.0),
+                            padding: const EdgeInsets.all(12.0),
                             child: ElevatedButton(
                               onPressed: () => controller
                                   .ssoLoginAction(identityProviders.single.id!),
@@ -160,7 +160,7 @@ class ConnectPageView extends StatelessWidget {
                   ),
           if (controller.supportsLogin)
             Padding(
-              padding: const EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(12.0),
               child: Hero(
                 tag: 'signinButton',
                 child: ElevatedButton(

lib/pages/homeserver_picker/homeserver_picker_view.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:vrouter/vrouter.dart';
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
@@ -18,11 +17,36 @@ class HomeserverPickerView extends StatelessWidget {
   Widget build(BuildContext context) {
     final benchmarkResults = controller.benchmarkResults;
     return LoginScaffold(
-      appBar: VRouter.of(context).path == '/home'
+      appBar: AppBar(
-          ? null
+        backgroundColor: Colors.transparent,
-          : AppBar(title: Text(L10n.of(context)!.addAccount)),
+        actions: [
-      body: SafeArea(
+          IconButton(
-        child: Column(
+            onPressed: controller.restoreBackup,
+            tooltip: L10n.of(context)!.hydrate,
+            icon: const Icon(
+              Icons.restore_outlined,
+              color: Colors.white,
+            ),
+          ),
+          IconButton(
+            tooltip: L10n.of(context)!.privacy,
+            onPressed: () => launch(AppConfig.privacyUrl),
+            icon: const Icon(
+              Icons.shield_outlined,
+              color: Colors.white,
+            ),
+          ),
+          IconButton(
+            tooltip: L10n.of(context)!.about,
+            onPressed: () => PlatformInfos.showDialog(context),
+            icon: const Icon(
+              Icons.info_outlined,
+              color: Colors.white,
+            ),
+          ),
+        ],
+      ),
+      body: Column(
         children: [
           // display a prominent banner to import session for TOR browser
           // users. This feature is just some UX sugar as TOR users are
@@ -52,11 +76,11 @@ class HomeserverPickerView extends StatelessWidget {
               children: [
                 Container(
                   alignment: Alignment.center,
-                    height: 256,
+                  height: 200,
                   child: Image.asset('assets/info-logo.png'),
                 ),
                 Padding(
-                    padding: const EdgeInsets.all(16.0),
+                  padding: const EdgeInsets.all(12.0),
                   child: TextField(
                     focusNode: controller.homeserverFocusNode,
                     controller: controller.homeserverController,
@@ -78,7 +102,7 @@ class HomeserverPickerView extends StatelessWidget {
                 ),
                 if (controller.displayServerList)
                   Padding(
-                      padding: const EdgeInsets.all(16.0),
+                    padding: const EdgeInsets.all(12.0),
                     child: Material(
                       borderRadius:
                           BorderRadius.circular(AppConfig.borderRadius),
@@ -87,7 +111,7 @@ class HomeserverPickerView extends StatelessWidget {
                       child: benchmarkResults == null
                           ? const Center(
                               child: Padding(
-                                padding: EdgeInsets.all(16.0),
+                              padding: EdgeInsets.all(12.0),
                               child: CircularProgressIndicator.adaptive(),
                             ))
                           : Column(
@@ -120,36 +144,11 @@ class HomeserverPickerView extends StatelessWidget {
                             ),
                     ),
                   ),
-                  Wrap(
-                    alignment: WrapAlignment.center,
-                    children: [
-                      TextButton(
-                        onPressed: () => launch(AppConfig.privacyUrl),
-                        child: Text(
-                          L10n.of(context)!.privacy,
-                          style: const TextStyle(
-                            decoration: TextDecoration.underline,
-                            color: Colors.white,
-                          ),
-                        ),
-                      ),
-                      TextButton(
-                        onPressed: () => PlatformInfos.showDialog(context),
-                        child: Text(
-                          L10n.of(context)!.about,
-                          style: const TextStyle(
-                            decoration: TextDecoration.underline,
-                            color: Colors.white,
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
               ],
             ),
           ),
           Container(
-              padding: const EdgeInsets.all(16),
+            padding: const EdgeInsets.all(12),
             width: double.infinity,
             child: Hero(
               tag: 'loginButton',
@@ -163,33 +162,8 @@ class HomeserverPickerView extends StatelessWidget {
               ),
             ),
           ),
-            Padding(
-              padding: const EdgeInsets.all(16),
-              child: ExpansionTile(
-                title: Text(L10n.of(context)!.advanced),
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.all(8.0),
-                    child: TextButton(
-                      onPressed: controller.isLoading
-                          ? () {}
-                          : controller.restoreBackup,
-                      style: ElevatedButton.styleFrom(
-                        primary: Colors.white.withAlpha(200),
-                        onPrimary: Colors.black,
-                        shadowColor: Colors.white,
-                      ),
-                      child: controller.isLoading
-                          ? const LinearProgressIndicator()
-                          : Text(L10n.of(context)!.hydrate),
-                    ),
-                  ),
         ],
       ),
-            ),
-          ],
-        ),
-      ),
     );
   }
 }

lib/pages/login/login_view.dart

@@ -34,7 +34,7 @@ class LoginView extends StatelessWidget {
           child: ListView(
             children: <Widget>[
               Padding(
-                padding: const EdgeInsets.all(16.0),
+                padding: const EdgeInsets.all(12.0),
                 child: TextField(
                   readOnly: controller.loading,
                   autocorrect: false,
@@ -57,7 +57,7 @@ class LoginView extends StatelessWidget {
                 ),
               ),
               Padding(
-                padding: const EdgeInsets.all(16.0),
+                padding: const EdgeInsets.all(12.0),
                 child: TextField(
                   readOnly: controller.loading,
                   autocorrect: false,
@@ -91,7 +91,7 @@ class LoginView extends StatelessWidget {
               Hero(
                 tag: 'signinButton',
                 child: Padding(
-                  padding: const EdgeInsets.all(16),
+                  padding: const EdgeInsets.all(12.0),
                   child: ElevatedButton(
                     onPressed: controller.loading
                         ? null
@@ -106,7 +106,7 @@ class LoginView extends StatelessWidget {
                 children: [
                   const Expanded(child: Divider(color: Colors.white)),
                   Padding(
-                    padding: const EdgeInsets.all(16.0),
+                    padding: const EdgeInsets.all(12.0),
                     child: Text(
                       L10n.of(context)!.or,
                       style: const TextStyle(color: Colors.white),
@@ -116,7 +116,7 @@ class LoginView extends StatelessWidget {
                 ],
               ),
               Padding(
-                padding: const EdgeInsets.all(16),
+                padding: const EdgeInsets.all(12.0),
                 child: ElevatedButton(
                   onPressed:
                       controller.loading ? () {} : controller.passwordForgotten,

lib/pages/sign_up/signup_view.dart

@@ -27,7 +27,7 @@ class SignupPageView extends StatelessWidget {
         child: ListView(
           children: [
             Padding(
-              padding: const EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(12.0),
               child: TextFormField(
                 readOnly: controller.loading,
                 autocorrect: false,
@@ -60,7 +60,7 @@ class SignupPageView extends StatelessWidget {
             ),
             if (controller.displaySecondPasswordField)
               Padding(
-                padding: const EdgeInsets.all(16.0),
+                padding: const EdgeInsets.all(12.0),
                 child: TextFormField(
                   readOnly: controller.loading,
                   autocorrect: false,
@@ -81,7 +81,7 @@ class SignupPageView extends StatelessWidget {
                 ),
               ),
             Padding(
-              padding: const EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(12.0),
               child: TextFormField(
                 readOnly: controller.loading,
                 autocorrect: false,
@@ -109,7 +109,7 @@ class SignupPageView extends StatelessWidget {
             Hero(
               tag: 'loginButton',
               child: Padding(
-                padding: const EdgeInsets.all(16),
+                padding: const EdgeInsets.all(12),
                 child: ElevatedButton(
                   onPressed: controller.loading ? () {} : controller.signup,
                   child: controller.loading