Skip to content

Commit

Permalink
chore: Login page follow up
Browse files Browse the repository at this point in the history
  • Loading branch information
krille-chan committed Jul 23, 2023
1 parent cc873e7 commit 69a98d4
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 11 deletions.
9 changes: 8 additions & 1 deletion assets/l10n/intl_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2476,5 +2476,12 @@
"report": "report",
"signInWithPassword": "Sign in with password",
"continueWith": "Continue with:",
"pleaseTryAgainLaterOrChooseDifferentServer": "Please try again later or choose a different server."
"pleaseTryAgainLaterOrChooseDifferentServer": "Please try again later or choose a different server.",
"signInWith": "Sign in with {provider}",
"@signInWith": {
"type": "text",
"placeholders": {
"provider": {}
}
}
}
23 changes: 14 additions & 9 deletions lib/pages/homeserver_picker/homeserver_picker_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,15 @@ class HomeserverPickerView extends StatelessWidget {
? const Center(child: CircularProgressIndicator.adaptive())
: ListView(
children: [
if (FluffyThemes.isColumnMode(context))
Image.asset(
'assets/info-logo.png',
height: 96,
)
else
Image.asset('assets/banner_transparent.png'),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 8.0),
child: FluffyThemes.isColumnMode(context)
? Image.asset(
'assets/info-logo.png',
height: 96,
)
: Image.asset('assets/banner_transparent.png'),
),
const SizedBox(height: 12),
if (errorText != null) ...[
const Center(
Expand Down Expand Up @@ -114,8 +116,11 @@ class HomeserverPickerView extends StatelessWidget {
height: 24,
),
),
label:
'Sign in with ${provider.name ?? provider.brand ?? L10n.of(context)!.singlesignon}',
label: L10n.of(context)!.signInWith(
provider.name ??
provider.brand ??
L10n.of(context)!.singlesignon,
),
onPressed: () =>
controller.ssoLoginAction(provider.id!),
),
Expand Down
3 changes: 2 additions & 1 deletion lib/widgets/layouts/login_scaffold.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ class LoginScaffold extends StatelessWidget {
body: body,
bottomNavigationBar: isMobileMode
? Material(
color: Theme.of(context).colorScheme.onInverseSurface,
elevation: 4,
shadowColor: Theme.of(context).colorScheme.onBackground,
child: const _PrivacyButtons(
mainAxisAlignment: MainAxisAlignment.center,
),
Expand Down

0 comments on commit 69a98d4

Please sign in to comment.