2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Migrate routes to go router

Browse source
This commit is contained in:
krille-chan 2023-08-07 18:40:02 +02:00
commit ee957ab1f6
No known key found for this signature in database
52 changed files with 584 additions and 612 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/widgets/layouts/loading_view.dart
View file

@ -1,31 +0,0 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/update_checker_no_store.dart';
import 'package:fluffychat/widgets/layouts/empty_page.dart';
import 'package:fluffychat/widgets/matrix.dart';
class LoadingView extends StatelessWidget {
const LoadingView({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
WidgetsBinding.instance.addPostFrameCallback(
(_) async {
await UpdateCheckerNoStore(context).checkUpdate();
VRouter.of(context).to(
Matrix.of(context).widget.clients.any(
(client) =>
client.onLoginStateChanged.value == LoginState.loggedIn,
)
? '/rooms'
: '/home',
queryParameters: VRouter.of(context).queryParameters,
);
},
);
return const EmptyPage(loading: true);
}
}

10
lib/widgets/layouts/side_view_layout.dart
View file

@ -1,7 +1,5 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:fluffychat/config/themes.dart';
class SideViewLayout extends StatelessWidget {
@ -12,14 +10,12 @@ class SideViewLayout extends StatelessWidget {
: super(key: key);
@override
Widget build(BuildContext context) {
var currentUrl = Uri.decodeFull(VRouter.of(context).url);
if (!currentUrl.endsWith('/')) currentUrl += '/';
final hideSideView = currentUrl.split('/').length == 4;
final sideView = this.sideView;
final hideSideView =
!FluffyThemes.isThreeColumnMode(context) || sideView == null;
return sideView == null
? mainView
: MediaQuery.of(context).size.width < FluffyThemes.columnWidth * 3.5 &&
!hideSideView
: hideSideView
? sideView
: Row(
children: [

7
lib/widgets/layouts/two_column_layout.dart
View file

@ -1,15 +1,15 @@
import 'package:flutter/material.dart';
import '../../config/themes.dart';
class TwoColumnLayout extends StatelessWidget {
final Widget mainView;
final Widget sideView;
final bool displayNavigationRail;
const TwoColumnLayout({
Key? key,
required this.mainView,
required this.sideView,
required this.displayNavigationRail,
}) : super(key: key);
@override
Widget build(BuildContext context) {
@ -20,8 +20,7 @@ class TwoColumnLayout extends StatelessWidget {
Container(
clipBehavior: Clip.antiAlias,
decoration: const BoxDecoration(),
width: 360.0 +
(FluffyThemes.getDisplayNavigationRail(context) ? 64 : 0),
width: 360.0 + (displayNavigationRail ? 64 : 0),
child: mainView,
),
Container(