GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-25 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

chore: Adjust onboarding design

Browse Source
This commit is contained in:
Krille Fear 2022-12-29 20:38:13 +01:00
parent 7da70ebeba
commit d930b569fc
7 changed files with 101 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/banner_transparent.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 82 KiB

3
assets/l10n/intl_en.arb
View File

@ -2985,5 +2985,6 @@
"endToEndEncryption": "End to end encryption", "endToEndEncryption": "End to end encryption",
"disableEncryptionWarning": "For security reasons you can not disable encryption in a chat, where it has been enabled before.", "disableEncryptionWarning": "For security reasons you can not disable encryption in a chat, where it has been enabled before.",
"sorryThatsNotPossible": "Sorry... that is not possible", "sorryThatsNotPossible": "Sorry... that is not possible",
"deviceKeys": "Device keys:" "deviceKeys": "Device keys:",
"letsStart": "Let's start"
} }

17
lib/pages/connect/connect_page_view.dart
View File

@ -40,9 +40,12 @@ class ConnectPageView extends StatelessWidget {
elevation: Theme.of(context) elevation: Theme.of(context)
.appBarTheme .appBarTheme
.scrolledUnderElevation ?? .scrolledUnderElevation ??
4, 10,
color: Colors.transparent, color: Colors.transparent,
shadowColor: Theme.of(context).appBarTheme.shadowColor, shadowColor: Theme.of(context)
.colorScheme
.onBackground
.withAlpha(64),
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
child: CircleAvatar( child: CircleAvatar(
radius: 64, radius: 64,
@ -103,13 +106,14 @@ class ConnectPageView extends StatelessWidget {
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: Hero( child: Hero(
tag: 'loginButton', tag: 'loginButton',
child: ElevatedButton( child: ElevatedButton.icon(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.primary, backgroundColor: Theme.of(context).colorScheme.primary,
foregroundColor: Theme.of(context).colorScheme.onPrimary, foregroundColor: Theme.of(context).colorScheme.onPrimary,
), ),
onPressed: controller.loading ? () {} : controller.signUp, onPressed: controller.loading ? () {} : controller.signUp,
child: controller.loading icon: const Icon(Icons.person_add_outlined),
label: controller.loading
? const LinearProgressIndicator() ? const LinearProgressIndicator()
: Text(L10n.of(context)!.signUp), : Text(L10n.of(context)!.signUp),
), ),
@ -198,7 +202,8 @@ class ConnectPageView extends StatelessWidget {
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: Hero( child: Hero(
tag: 'signinButton', tag: 'signinButton',
child: ElevatedButton( child: ElevatedButton.icon(
icon: const Icon(Icons.login_outlined),
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: backgroundColor:
Theme.of(context).colorScheme.primaryContainer, Theme.of(context).colorScheme.primaryContainer,
@ -206,7 +211,7 @@ class ConnectPageView extends StatelessWidget {
Theme.of(context).colorScheme.onPrimaryContainer, Theme.of(context).colorScheme.onPrimaryContainer,
), ),
onPressed: controller.loading ? () {} : controller.login, onPressed: controller.loading ? () {} : controller.login,
child: Text(L10n.of(context)!.login), label: Text(L10n.of(context)!.login),
), ),
), ),
), ),

66
lib/pages/homeserver_picker/homeserver_picker_view.dart
View File

@ -48,7 +48,8 @@ class HomeserverPickerView extends StatelessWidget {
), ),
), ),
Expanded( Expanded(
child: ListView( child: controller.displayServerList
? ListView(
children: [ children: [
if (controller.displayServerList) if (controller.displayServerList)
Padding( Padding(
@ -56,13 +57,16 @@ class HomeserverPickerView extends StatelessWidget {
child: Material( child: Material(
borderRadius: borderRadius:
BorderRadius.circular(AppConfig.borderRadius), BorderRadius.circular(AppConfig.borderRadius),
color: Theme.of(context).colorScheme.onInverseSurface, color: Theme.of(context)
.colorScheme
.onInverseSurface,
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
child: benchmarkResults == null child: benchmarkResults == null
? const Center( ? const Center(
child: Padding( child: Padding(
padding: EdgeInsets.all(12.0), padding: EdgeInsets.all(12.0),
child: CircularProgressIndicator.adaptive(), child:
CircularProgressIndicator.adaptive(),
)) ))
: Column( : Column(
children: controller.filteredHomeservers children: controller.filteredHomeservers
@ -73,50 +77,39 @@ class HomeserverPickerView extends StatelessWidget {
Icons.info_outlined, Icons.info_outlined,
color: Colors.black, color: Colors.black,
), ),
onPressed: () => onPressed: () => controller
controller.showServerInfo(server), .showServerInfo(server),
), ),
onTap: () => controller.setServer( onTap: () => controller.setServer(
server.homeserver.baseUrl.host), server
.homeserver.baseUrl.host),
title: Text( title: Text(
server.homeserver.baseUrl.host, server.homeserver.baseUrl.host,
style: const TextStyle( style: const TextStyle(
color: Colors.black), color: Colors.black),
), ),
subtitle: Text( subtitle: Text(
server.homeserver.description ?? '', server.homeserver.description ??
'',
style: TextStyle( style: TextStyle(
color: Colors.grey.shade700), color:
Colors.grey.shade700),
), ),
), ),
) )
.toList(), .toList(),
), ),
), ),
),
],
) )
else ...[ : Container(
Container( alignment: Alignment.topCenter,
alignment: Alignment.center,
height: 200,
child: Image.asset( child: Image.asset(
'assets/info-logo.png', 'assets/banner_transparent.png',
filterQuality: FilterQuality.medium, filterQuality: FilterQuality.medium,
), ),
), ),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Center(
child: Text(
AppConfig.applicationWelcomeMessage ??
L10n.of(context)!.welcomeText,
textAlign: TextAlign.center,
style: const TextStyle(fontSize: 20),
),
),
),
],
],
),
), ),
SafeArea( SafeArea(
child: Container( child: Container(
@ -126,21 +119,17 @@ class HomeserverPickerView extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
TextButton(
style: TextButton.styleFrom(
foregroundColor:
Theme.of(context).colorScheme.onSurfaceVariant,
),
onPressed: controller.restoreBackup,
child: Text(L10n.of(context)!.hydrate),
),
TextButton( TextButton(
onPressed: () => launch(AppConfig.privacyUrl), onPressed: () => launch(AppConfig.privacyUrl),
child: Text(L10n.of(context)!.privacy), child: Text(L10n.of(context)!.privacy),
), ),
TextButton(
onPressed: controller.restoreBackup,
child: Text(L10n.of(context)!.hydrate),
),
Hero( Hero(
tag: 'loginButton', tag: 'loginButton',
child: ElevatedButton( child: ElevatedButton.icon(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: backgroundColor:
Theme.of(context).colorScheme.primary, Theme.of(context).colorScheme.primary,
@ -150,9 +139,10 @@ class HomeserverPickerView extends StatelessWidget {
onPressed: controller.isLoading onPressed: controller.isLoading
? null ? null
: controller.checkHomeserverAction, : controller.checkHomeserverAction,
child: controller.isLoading icon: const Icon(Icons.start_outlined),
label: controller.isLoading
? const LinearProgressIndicator() ? const LinearProgressIndicator()
: Text(L10n.of(context)!.connect), : Text(L10n.of(context)!.letsStart),
), ),
), ),
], ],

10
lib/pages/login/login_view.dart
View File

@ -82,7 +82,7 @@ class LoginView extends StatelessWidget {
tag: 'signinButton', tag: 'signinButton',
child: Padding( child: Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: ElevatedButton( child: ElevatedButton.icon(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.primary, backgroundColor: Theme.of(context).colorScheme.primary,
foregroundColor: Theme.of(context).colorScheme.onPrimary, foregroundColor: Theme.of(context).colorScheme.onPrimary,
@ -90,7 +90,8 @@ class LoginView extends StatelessWidget {
onPressed: controller.loading onPressed: controller.loading
? null ? null
: () => controller.login(context), : () => controller.login(context),
child: controller.loading icon: const Icon(Icons.login_outlined),
label: controller.loading
? const LinearProgressIndicator() ? const LinearProgressIndicator()
: Text(L10n.of(context)!.login), : Text(L10n.of(context)!.login),
), ),
@ -124,14 +125,15 @@ class LoginView extends StatelessWidget {
), ),
Padding( Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: ElevatedButton( child: ElevatedButton.icon(
onPressed: onPressed:
controller.loading ? () {} : controller.passwordForgotten, controller.loading ? () {} : controller.passwordForgotten,
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
foregroundColor: Theme.of(context).colorScheme.error, foregroundColor: Theme.of(context).colorScheme.error,
backgroundColor: Theme.of(context).colorScheme.onError, backgroundColor: Theme.of(context).colorScheme.onError,
), ),
child: Text(L10n.of(context)!.passwordForgotten), icon: const Icon(Icons.safety_check_outlined),
label: Text(L10n.of(context)!.passwordForgotten),
), ),
), ),
], ],

5
lib/pages/sign_up/signup_view.dart
View File

@ -94,13 +94,14 @@ class SignupPageView extends StatelessWidget {
tag: 'loginButton', tag: 'loginButton',
child: Padding( child: Padding(
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
child: ElevatedButton( child: ElevatedButton.icon(
icon: const Icon(Icons.person_add_outlined),
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
foregroundColor: Theme.of(context).colorScheme.onPrimary, foregroundColor: Theme.of(context).colorScheme.onPrimary,
backgroundColor: Theme.of(context).colorScheme.primary, backgroundColor: Theme.of(context).colorScheme.primary,
), ),
onPressed: controller.loading ? () {} : controller.signup, onPressed: controller.loading ? () {} : controller.signup,
child: controller.loading label: controller.loading
? const LinearProgressIndicator() ? const LinearProgressIndicator()
: Text(L10n.of(context)!.signUp), : Text(L10n.of(context)!.signUp),
), ),

13
lib/widgets/layouts/login_scaffold.dart
View File

@ -43,15 +43,13 @@ class LoginScaffold extends StatelessWidget {
), ),
), ),
child: Center( child: Center(
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Material( child: Material(
color: Theme.of(context).brightness == Brightness.light color: Theme.of(context).scaffoldBackgroundColor.withOpacity(0.925),
? Theme.of(context).scaffoldBackgroundColor.withOpacity(0.9) borderRadius: BorderRadius.circular(AppConfig.borderRadius),
: Theme.of(context).scaffoldBackgroundColor.withOpacity(0.75),
borderRadius: isMobileMode
? null
: BorderRadius.circular(AppConfig.borderRadius),
elevation: isMobileMode ? 0 : 10,
clipBehavior: Clip.hardEdge, clipBehavior: Clip.hardEdge,
elevation: 10,
shadowColor: Colors.black, shadowColor: Colors.black,
child: ConstrainedBox( child: ConstrainedBox(
constraints: isMobileMode constraints: isMobileMode
@ -61,6 +59,7 @@ class LoginScaffold extends StatelessWidget {
), ),
), ),
), ),
),
); );
} }
} }