refactor: Use APL
Krille Fear
5 years ago
parent
7474bd53d0
commit
544bc15022
@ -1,52 +0,0 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
enum FocusPage { FIRST, SECOND }
|
||||
|
||||
class AdaptivePageLayout extends StatelessWidget {
|
||||
final Widget firstScaffold;
|
||||
final Widget secondScaffold;
|
||||
final FocusPage primaryPage;
|
||||
final double minWidth;
|
||||
|
||||
static const double defaultMinWidth = 400;
|
||||
static bool columnMode(BuildContext context) =>
|
||||
MediaQuery.of(context).size.width > 2 * defaultMinWidth;
|
||||
|
||||
AdaptivePageLayout(
|
||||
{this.firstScaffold,
|
||||
this.secondScaffold,
|
||||
this.primaryPage = FocusPage.FIRST,
|
||||
this.minWidth = defaultMinWidth,
|
||||
Key key})
|
||||
: super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return OrientationBuilder(builder: (context, orientation) {
|
||||
if (orientation == Orientation.portrait || !columnMode(context)) {
|
||||
if (primaryPage == FocusPage.FIRST) {
|
||||
return firstScaffold;
|
||||
} else {
|
||||
return secondScaffold;
|
||||
}
|
||||
}
|
||||
return Row(
|
||||
children: <Widget>[
|
||||
Container(
|
||||
width: minWidth,
|
||||
child: firstScaffold,
|
||||
),
|
||||
Container(
|
||||
width: 1,
|
||||
color: Theme.of(context).secondaryHeaderColor, //Color(0xFFE8E8E8),
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
child: secondScaffold,
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,228 @@
|
||||
import 'package:adaptive_page_layout/adaptive_page_layout.dart';
|
||||
import 'package:famedlysdk/famedlysdk.dart';
|
||||
import 'package:fluffychat/components/matrix.dart';
|
||||
import 'package:fluffychat/views/archive.dart';
|
||||
import 'package:fluffychat/views/auth_web_view.dart';
|
||||
import 'package:fluffychat/views/chat.dart';
|
||||
import 'package:fluffychat/views/chat_details.dart';
|
||||
import 'package:fluffychat/views/chat_encryption_settings.dart';
|
||||
import 'package:fluffychat/views/chat_list.dart';
|
||||
import 'package:fluffychat/views/chat_permissions_settings.dart';
|
||||
import 'package:fluffychat/views/discover_view.dart';
|
||||
import 'package:fluffychat/views/empty_page.dart';
|
||||
import 'package:fluffychat/views/homeserver_picker.dart';
|
||||
import 'package:fluffychat/views/invitation_selection.dart';
|
||||
import 'package:fluffychat/views/loading_view.dart';
|
||||
import 'package:fluffychat/views/log_view.dart';
|
||||
import 'package:fluffychat/views/login.dart';
|
||||
import 'package:fluffychat/views/new_group.dart';
|
||||
import 'package:fluffychat/views/new_private_chat.dart';
|
||||
import 'package:fluffychat/views/settings.dart';
|
||||
import 'package:fluffychat/views/settings_3pid.dart';
|
||||
import 'package:fluffychat/views/settings_devices.dart';
|
||||
import 'package:fluffychat/views/settings_emotes.dart';
|
||||
import 'package:fluffychat/views/settings_ignore_list.dart';
|
||||
import 'package:fluffychat/views/settings_multiple_emotes.dart';
|
||||
import 'package:fluffychat/views/settings_notifications.dart';
|
||||
import 'package:fluffychat/views/settings_style.dart';
|
||||
import 'package:fluffychat/views/sign_up.dart';
|
||||
import 'package:fluffychat/views/sign_up_password.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class FluffyRoutes {
|
||||
final BuildContext context;
|
||||
|
||||
const FluffyRoutes(this.context);
|
||||
|
||||
ViewData onGenerateRoute(RouteSettings settings) {
|
||||
final parts = settings.name.split('/');
|
||||
Logs().v(settings.name);
|
||||
|
||||
// Routes if the app is loading
|
||||
if (Matrix.of(context).loginState == null) {
|
||||
return ViewData(mainView: (_) => LoadingView());
|
||||
// Routes if user is NOT logged in
|
||||
} else if (Matrix.of(context).loginState == LoginState.loggedOut) {
|
||||
switch (parts[1]) {
|
||||
case '':
|
||||
return ViewData(mainView: (_) => HomeserverPicker());
|
||||
case 'login':
|
||||
return ViewData(mainView: (_) => Login());
|
||||
case 'signup':
|
||||
if (parts.length == 5 && parts[2] == 'password') {
|
||||
return ViewData(
|
||||
mainView: (_) => SignUpPassword(
|
||||
parts[3],
|
||||
displayname: parts[4],
|
||||
avatar: settings.arguments,
|
||||
),
|
||||
);
|
||||
}
|
||||
return ViewData(mainView: (_) => SignUp());
|
||||
case 'authwebview':
|
||||
if (parts.length == 4) {
|
||||
return ViewData(
|
||||
mainView: (_) => AuthWebView(
|
||||
parts[2],
|
||||
Uri.decodeComponent(parts[3]),
|
||||
settings.arguments,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Routes IF user is logged in
|
||||
else {
|
||||
switch (parts[1]) {
|
||||
case '':
|
||||
return ViewData(
|
||||
mainView: (_) => ChatList(),
|
||||
emptyView: (_) => EmptyPage(),
|
||||
);
|
||||
case 'rooms':
|
||||
if (parts.length == 3) {
|
||||
return ViewData(
|
||||
leftView: (_) => ChatList(),
|
||||
mainView: (_) => Chat(parts[2]),
|
||||
);
|
||||
} else if (parts.length == 4) {
|
||||
final roomId = parts[2];
|
||||
final action = parts[3];
|
||||
switch (action) {
|
||||
case 'details':
|
||||
return ViewData(
|
||||
leftView: (_) => ChatList(),
|
||||
mainView: (_) => Chat(parts[2]),
|
||||
rightView: (_) => ChatDetails(roomId),
|
||||
);
|
||||
case 'encryption':
|
||||
return ViewData(
|
||||
leftView: (_) => ChatList(),
|
||||
mainView: (_) => Chat(parts[2]),
|
||||
rightView: (_) => ChatEncryptionSettings(roomId),
|
||||
);
|
||||
case 'permissions':
|
||||
return ViewData(
|
||||
leftView: (_) => ChatList(),
|
||||
mainView: (_) => Chat(parts[2]),
|
||||
rightView: (_) => ChatPermissionsSettings(roomId),
|
||||
);
|
||||
case 'invite':
|
||||
return ViewData(
|
||||
leftView: (_) => ChatList(),
|
||||
mainView: (_) => Chat(parts[2]),
|
||||
rightView: (_) => InvitationSelection(roomId),
|
||||
);
|
||||
case 'emotes':
|
||||
return ViewData(
|
||||
leftView: (_) => ChatList(),
|
||||
mainView: (_) => Chat(parts[2]),
|
||||
rightView: (_) => MultipleEmotesSettings(roomId),
|
||||
);
|
||||
}
|
||||
}
|
||||
return ViewData(
|
||||
mainView: (_) => ChatList(),
|
||||
emptyView: (_) => EmptyPage(),
|
||||
);
|
||||
case 'archive':
|
||||
return ViewData(
|
||||
mainView: (_) => Archive(),
|
||||
emptyView: (_) => Chat(parts[2]),
|
||||
);
|
||||
case 'discover':
|
||||
return ViewData(
|
||||
mainView: (_) =>
|
||||
DiscoverPage(alias: parts.length == 3 ? parts[2] : null),
|
||||
emptyView: (_) => EmptyPage(),
|
||||
);
|
||||
case 'logs':
|
||||
return ViewData(
|
||||
mainView: (_) => LogViewer(),
|
||||
);
|
||||
case 'newgroup':
|
||||
return ViewData(
|
||||
leftView: (_) => ChatList(),
|
||||
mainView: (_) => NewGroup(),
|
||||
);
|
||||
case 'newprivatechat':
|
||||
return ViewData(
|
||||
leftView: (_) => ChatList(),
|
||||
mainView: (_) => NewPrivateChat(),
|
||||
);
|
||||
case 'settings':
|
||||
if (parts.length == 3) {
|
||||
final action = parts[2];
|
||||
switch (action) {
|
||||
case '3pid':
|
||||
return ViewData(
|
||||
leftView: (_) => Settings(),
|
||||
mainView: (_) => Settings3Pid(),
|
||||
);
|
||||
case 'devices':
|
||||
return ViewData(
|
||||
leftView: (_) => Settings(),
|
||||
mainView: (_) => DevicesSettings(),
|
||||
);
|
||||
case 'emotes':
|
||||
return ViewData(
|
||||
leftView: (_) => Settings(),
|
||||
mainView: (_) => EmotesSettings(room: settings.arguments),
|
||||
);
|
||||
case 'ignore':
|
||||
return ViewData(
|
||||
leftView: (_) => Settings(),
|
||||
mainView: (_) => SettingsIgnoreList(),
|
||||
);
|
||||
case 'notifications':
|
||||
return ViewData(
|
||||
leftView: (_) => Settings(),
|
||||
mainView: (_) => SettingsNotifications(),
|
||||
);
|
||||
case 'style':
|
||||
return ViewData(
|
||||
leftView: (_) => Settings(),
|
||||
mainView: (_) => SettingsStyle(),
|
||||
);
|
||||
}
|
||||
}
|
||||
return ViewData(
|
||||
mainView: (_) => Settings(),
|
||||
emptyView: (_) => EmptyPage(),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// If route cant be found:
|
||||
return ViewData(
|
||||
mainView: (_) => Center(
|
||||
child: Text('Route "${settings.name}" not found...'),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class SettingsDevices {}
|
||||
|
||||
class FadeRoute extends PageRouteBuilder {
|
||||
final Widget page;
|
||||
FadeRoute({this.page})
|
||||
: super(
|
||||
pageBuilder: (
|
||||
BuildContext context,
|
||||
Animation<double> animation,
|
||||
Animation<double> secondaryAnimation,
|
||||
) =>
|
||||
page,
|
||||
transitionsBuilder: (
|
||||
BuildContext context,
|
||||
Animation<double> animation,
|
||||
Animation<double> secondaryAnimation,
|
||||
Widget child,
|
||||
) =>
|
||||
FadeTransition(
|
||||
opacity: animation,
|
||||
child: child,
|
||||
),
|
||||
);
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
import 'package:famedlysdk/famedlysdk.dart';
|
||||
import 'package:fluffychat/components/matrix.dart';
|
||||
import 'package:flushbar/flushbar_helper.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||
|
||||
import 'chat_list.dart';
|
||||
import 'homeserver_picker.dart';
|
||||
|
||||
class LoadingView extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return FutureBuilder<LoginState>(
|
||||
future: Matrix.of(context).client.onLoginStateChanged.stream.first,
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasError) {
|
||||
WidgetsBinding.instance
|
||||
.addPostFrameCallback((_) => FlushbarHelper.createError(
|
||||
title: L10n.of(context).oopsSomethingWentWrong,
|
||||
message: snapshot.error.toString(),
|
||||
).show(context));
|
||||
return HomeserverPicker();
|
||||
}
|
||||
if (!snapshot.hasData) {
|
||||
return Scaffold(
|
||||
body: Center(
|
||||
child: CircularProgressIndicator(),
|
||||
),
|
||||
);
|
||||
}
|
||||
if (Matrix.of(context).client.isLogged()) {
|
||||
return ChatList();
|
||||
}
|
||||
return HomeserverPicker();
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue