@ -1,11 +1,9 @@
import ' package:fluffychat/config/app_config.dart ' ; import ' package:fluffychat/config/app_config.dart ' ;
import ' package:fluffychat/config/themes.dart ' ;
import ' package:fluffychat/pangea/pages/connect/p_sso_button.dart ' ;
import ' package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart ' ;
import ' package:fluffychat/pangea/widgets/signup/signup_buttons.dart ' ;
import ' package:fluffychat/widgets/layouts/login_scaffold.dart ' ; import ' package:fluffychat/widgets/layouts/login_scaffold.dart ' ;
import ' package:flutter/material.dart ' ; import ' package:flutter/material.dart ' ;
import ' package:flutter_gen/gen_l10n/l10n.dart ' ; import ' package:flutter_gen/gen_l10n/l10n.dart ' ;
import ' package:flutter_linkify/flutter_linkify.dart ' ;
import ' package:url_launcher/url_launcher.dart ' ;
import ' homeserver_picker.dart ' ; import ' homeserver_picker.dart ' ;
@ -18,25 +16,15 @@ class HomeserverPickerView extends StatelessWidget {
Widget build ( BuildContext context ) {
Widget build ( BuildContext context ) {
final theme = Theme . of ( context ) ;
final theme = Theme . of ( context ) ;
final identityProviders = controller . identityProviders ;
final errorText = controller . error ;
/ / # Pangea
/ / final publicHomeserver = controller . cachedHomeservers ? . singleWhereOrNull (
/ / ( homeserver ) = >
/ / homeserver . name = =
/ / controller . homeserverController . text . trim ( ) . toLowerCase ( ) ,
/ / ) ;
/ / final regLink = publicHomeserver ? . regLink ;
/ / Pangea #
return LoginScaffold (
return LoginScaffold (
/ / # Pangea
/ / # Pangea
/ / enforceMobileMode: Matrix . of ( context ) . client . isLogged ( ) ,
/ / enforceMobileMode: Matrix . of ( context ) . client . isLogged ( ) ,
/ / appBar: AppBar(
/ / appBar: controller . widget . addMultiAccount
/ / titleSpacing , : 12 ,
/ / ? AppBar (
/ / automaticallyImplyLeading: fals ,
/ / centerTitle: true ,
/ / surfaceTintColor: theme . colorScheme . surface ,
/ / title: Text ( L10n . of ( context ) ! . addAccount ) ,
/ / title: HomeserverAppBar ( controller: controller ) ,
/ / )
/ / ) ,
/ / : null ,
appBar: AppBar (
appBar: AppBar (
centerTitle: true ,
centerTitle: true ,
title: Text (
title: Text (
@ -44,7 +32,7 @@ class HomeserverPickerView extends StatelessWidget {
) ,
) ,
) ,
) ,
/ / Pangea #
/ / Pangea #
body: Column (
body: ListView (
children: [
children: [
/ / display a prominent banner to import session for TOR browser
/ / display a prominent banner to import session for TOR browser
/ / users . This feature is just some UX sugar as TOR users are
/ / users . This feature is just some UX sugar as TOR users are
@ -70,217 +58,135 @@ class HomeserverPickerView extends StatelessWidget {
/ / ) ,
/ / ) ,
/ / ) ,
/ / ) ,
/ / ) ,
/ / ) ,
/ / Image . asset (
/ / ' assets/banner_transparent.png ' ,
/ / ) ,
/ / Pangea #
/ / Pangea #
Expanded (
Padding (
child: controller . isLoading
padding: const EdgeInsets . only (
/ / # Pangea
top: 16.0 ,
/ / ? const Center ( child: CircularProgressIndicator . adaptive ( ) )
right: 8.0 ,
? const Center (
left: 8.0 ,
child: CircularProgressIndicator (
bottom: 16.0 ,
valueColor: AlwaysStoppedAnimation < Color > ( Colors . black ) ,
) ,
) ,
child: Column (
)
crossAxisAlignment: CrossAxisAlignment . stretch ,
/ / Pangea #
mainAxisSize: MainAxisSize . min ,
: ListView (
children: [
children: [
if ( errorText ! = null ) . . . [
Padding (
const SizedBox ( height: 12 ) ,
padding: const EdgeInsets . all ( 16.0 ) ,
const Center (
child: TextField (
child: Icon (
onChanged: controller . tryCheckHomeserverActionWithCooldown ,
Icons . error_outline ,
onEditingComplete:
size: 48 ,
controller . tryCheckHomeserverActionWithoutCooldown ,
color: Colors . orange ,
onSubmitted:
controller . tryCheckHomeserverActionWithoutCooldown ,
onTap: controller . tryCheckHomeserverActionWithCooldown ,
controller: controller . homeserverController ,
decoration: InputDecoration (
prefixIcon: controller . isLoading
? Container (
width: 16 ,
height: 16 ,
alignment: Alignment . center ,
child: const SizedBox (
width: 16 ,
height: 16 ,
child: CircularProgressIndicator . adaptive (
strokeWidth: 2 ,
) ,
) ,
) ,
) ,
const SizedBox ( height: 12 ) ,
)
Center (
: const Icon ( Icons . search_outlined ) ,
filled: false ,
border: OutlineInputBorder (
borderRadius:
BorderRadius . circular ( AppConfig . borderRadius ) ,
) ,
hintText: AppConfig . defaultHomeserver ,
labelText: L10n . of ( context ) ! . homeserver ,
errorText: controller . error ,
suffixIcon: IconButton (
onPressed: ( ) {
showDialog (
context: context ,
builder: ( context ) = > AlertDialog . adaptive (
title: Text ( L10n . of ( context ) ! . whatIsAHomeserver ) ,
content: Linkify (
text: L10n . of ( context ) ! . homeserverDescription ,
) ,
actions: [
TextButton (
onPressed: ( ) = > launchUrl (
Uri . https ( ' servers.joinmatrix.org ' ) ,
) ,
child: Text (
child: Text (
errorText ,
L10n . of ( context ) ! . discoverHomeservers ,
textAlign: TextAlign . center ,
style: TextStyle (
color: theme . colorScheme . error ,
fontSize: 18 ,
) ,
) ,
) ,
) ,
TextButton (
onPressed: Navigator . of ( context ) . pop ,
child: Text ( L10n . of ( context ) ! . close ) ,
) ,
) ,
/ / # Pangea
] ,
/ / Center (
/ / child: Text (
/ / L10n . of ( context ) !
/ / . pleaseTryAgainLaterOrChooseDifferentServer ,
/ / textAlign: TextAlign . center ,
/ / style: TextStyle (
/ / color: theme . colorScheme . error ,
/ / fontSize: 12 ,
/ / ) ,
/ / ) ,
/ / ) ,
/ / Pangea #
const SizedBox ( height: 36 ) ,
] else
/ / # Pangea
const SignupButtons ( ) ,
/ / Padding (
/ / padding: const EdgeInsets . only (
/ / top: 0.0 ,
/ / right: 8.0 ,
/ / left: 8.0 ,
/ / bottom: 16.0 ,
/ / ) ,
/ / child: Image . asset (
/ / ' assets/banner_transparent.png ' ,
/ / ) ,
/ / ) ,
/ / Pangea #
if ( identityProviders ! = null ) . . . [
/ / # Pangea
. . . identityProviders . map (
( provider ) = > Padding (
padding: const EdgeInsets . all ( 12.0 ) ,
child: Hero (
tag: " ssobutton ${ provider . id ? ? provider . name } " ,
child: PangeaSsoButton (
identityProvider: provider ,
onPressed: ( ) = >
controller . ssoLoginAction ( provider ) ,
) ,
) ,
) ;
} ,
icon: const Icon ( Icons . info_outlined ) ,
) ,
) ,
) ,
) ,
) ,
) ,
/ / . . . identityProviders . map (
) ,
/ / ( provider ) = > _LoginButton (
if ( controller . supportsPasswordLogin | | controller . supportsSso )
/ / icon: provider . icon = = null
/ / ? const Icon (
/ / Icons . open_in_new_outlined ,
/ / size: 16 ,
/ / )
/ / : Material (
/ / borderRadius: BorderRadius . circular (
/ / AppConfig . borderRadius ,
/ / ) ,
/ / clipBehavior: Clip . hardEdge ,
/ / child: MxcImage (
/ / placeholder: ( _ ) = > const Icon (
/ / Icons . open_in_new_outlined ,
/ / size: 16 ,
/ / ) ,
/ / uri: Uri . parse ( provider . icon ! ) ,
/ / width: 24 ,
/ / height: 24 ,
/ / isThumbnail: false ,
/ / / / isThumbnail: false ,
/ / ) ,
/ / ) ,
/ / label: L10n . of ( context ) ! . signInWith (
/ / provider . name ? ?
/ / provider . brand ? ?
/ / L10n . of ( context ) ! . singlesignon ,
/ / ) ,
/ / onPressed: ( ) = >
/ / controller . ssoLoginAction ( provider . id ) ,
/ / ) ,
/ / ) ,
/ / ] ,
/ / Pangea #
if ( controller . supportsPasswordLogin )
/ / # Pangea
Padding (
padding: const EdgeInsets . all ( 12.0 ) ,
child: Hero (
tag: ' signinButton ' ,
child: ElevatedButton (
onPressed: controller . login ,
child: Row (
mainAxisAlignment: MainAxisAlignment . center ,
children: [
const PangeaLogoSvg ( width: 20 ) ,
Padding (
Padding (
padding: const EdgeInsets . symmetric (
padding: const EdgeInsets . symmetric (
horizontal: 10 ,
horizontal: 16.0 ,
) ,
vertical: 8.0 ,
child: Text (
" ${ L10n . of ( context ) ! . loginOrSignup } Pangea Chat " ,
) ,
) ,
) ,
] ,
child: ElevatedButton (
style: ElevatedButton . styleFrom (
backgroundColor: theme . colorScheme . primary ,
foregroundColor: theme . colorScheme . onPrimary ,
) ,
) ,
onPressed: controller . isLoggingIn | | controller . isLoading
? null
: controller . supportsSso
? controller . ssoLoginAction
: controller . login ,
child: Text ( L10n . of ( context ) ! . connect ) ,
) ,
) ,
) ,
) ,
if ( controller . supportsPasswordLogin & & controller . supportsSso )
Padding (
padding: const EdgeInsets . symmetric ( horizontal: 16.0 ) ,
child: TextButton (
style: TextButton . styleFrom (
foregroundColor: theme . colorScheme . secondary ,
textStyle: theme . textTheme . labelMedium ,
) ,
) ,
/ / _LoginButton (
onPressed: controller . isLoggingIn | | controller . isLoading
/ / onPressed: controller . login ,
? null
/ / label: L10n . of ( context ) ! . signInWithPassword ,
: controller . login ,
/ / icon: const Icon ( Icons . lock_open_outlined , size: 16 ) ,
child: Text ( L10n . of ( context ) ! . loginWithMatrixId ) ,
/ / ) ,
/ / if ( regLink ! = null )
/ / _LoginButton (
/ / onPressed: ( ) = > launchUrlString ( regLink ) ,
/ / icon: const Icon (
/ / Icons . open_in_new_outlined ,
/ / size: 16 ,
/ / ) ,
/ / label: L10n . of ( context ) ! . register ,
/ / ) ,
/ / _LoginButton (
/ / onPressed: controller . restoreBackup ,
/ / label: L10n . of ( context ) ! . hydrate ,
/ / withBorder: false ,
/ / ) ,
/ / const SizedBox ( height: 16 ) ,
/ / Pangea #
] ,
] ,
) ,
) ,
) ,
) ,
] ,
Padding (
padding: const EdgeInsets . symmetric ( horizontal: 16.0 ) ,
child: TextButton (
style: TextButton . styleFrom (
textStyle: theme . textTheme . labelMedium ,
foregroundColor: theme . colorScheme . secondary ,
) ,
) ,
) ;
onPressed: controller . isLoggingIn | | controller . isLoading
}
? null
} : controller . restoreBackup ,
child: Text ( L10n . of ( context ) ! . hydrate ) ,
class _LoginButton extends StatelessWidget {
final Widget ? icon ;
final String label ;
final void Function ( ) onPressed ;
final bool withBorder ;
const _LoginButton ( {
this . icon ,
required this . label ,
required this . onPressed ,
this . withBorder = true ,
} ) ;
@ override
Widget build ( BuildContext context ) {
final theme = Theme . of ( context ) ;
final icon = this . icon ;
return Container (
margin: const EdgeInsets . only ( bottom: 12 ) ,
padding: const EdgeInsets . symmetric ( horizontal: 16 ) ,
alignment: Alignment . center ,
child: SizedBox (
width: double . infinity ,
child: OutlinedButton . icon (
style: OutlinedButton . styleFrom (
side: FluffyThemes . isColumnMode ( context )
? BorderSide . none
: BorderSide (
color: theme . colorScheme . outlineVariant ,
width: 1 ,
) ,
) ,
shape: RoundedRectangleBorder (
borderRadius: BorderRadius . circular ( 99 ) ,
) ,
) ,
foregroundColor: theme . colorScheme . onSurface ,
] ,
backgroundColor:
withBorder ? theme . colorScheme . surface : Colors . transparent ,
) ,
) ,
onPressed: onPressed ,
label: Text ( label ) ,
icon: icon ? ? const SizedBox . shrink ( ) ,
) ,
) ,
] ,
) ,
) ,
) ;
) ;
}
}
ggurdin
1 year ago