luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-25 11:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed splitview package

Browse source
This commit is contained in:
Juan Gilsanz Polo 2024-03-10 21:15:24 +01:00
parent fd25088791
commit 5be5377110
9 changed files with 71 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/screens/clients/added_list.dart
View file

@ -3,10 +3,10 @@
import 'package:flutter/material.dart';
import 'package:animations/animations.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_split_view/flutter_split_view.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/clients/clients.dart';
import 'package:adguard_home_manager/screens/clients/client/client_screen_functions.dart';
import 'package:adguard_home_manager/screens/clients/client/added_client_tile.dart';
import 'package:adguard_home_manager/screens/clients/client/remove_client_modal.dart';
@ -107,7 +107,7 @@ class _AddedListState extends State<AddedList> {
if (result == true) {
if (widget.splitView == true) {
SplitView.of(context).popUntil(0);
Navigator.of(clientsNavigatorKey.currentContext!).popUntil((route) => false);
}
showSnacbkar(
appConfigProvider: appConfigProvider,

37
lib/screens/clients/clients.dart
View file

@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_split_view/flutter_split_view.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/clients/clients_lists.dart';
import 'package:adguard_home_manager/models/clients.dart';
final clientsNavigatorKey = GlobalKey<NavigatorState>();
class Clients extends StatefulWidget {
const Clients({super.key});
@ -24,26 +24,23 @@ class _ClientsState extends State<Clients> with TickerProviderStateMixin {
body: LayoutBuilder(
builder: (context, constraints) {
if (constraints.maxWidth > 900) {
return SplitView.material(
hideDivider: true,
flexWidth: const FlexWidth(mainViewFlexWidth: 1, secondaryViewFlexWidth: 2),
placeholder: Center(
child: Padding(
padding: const EdgeInsets.all(24),
child: Text(
AppLocalizations.of(context)!.selectClientLeftColumn,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 24,
color: Theme.of(context).colorScheme.onSurfaceVariant
),
),
),
return Row(
children: [
const Expanded(
flex: 1,
child: ClientsLists(
splitView: true,
)
),
child: const ClientsLists(
splitView: true,
Expanded(
flex: 2,
child: Navigator(
key: clientsNavigatorKey,
onGenerateRoute: (settings) => MaterialPageRoute(builder: (ctx) => const SizedBox()),
),
)
);
],
);
}
else {
return const ClientsLists(

18
lib/screens/clients/clients_lists.dart
View file

@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_split_view/flutter_split_view.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:adguard_home_manager/screens/clients/clients.dart';
import 'package:adguard_home_manager/screens/clients/added_list.dart';
import 'package:adguard_home_manager/screens/clients/client/logs_list_client.dart';
import 'package:adguard_home_manager/screens/clients/clients_list.dart';
@ -68,7 +68,13 @@ class _ClientsListsState extends State<ClientsLists> with TickerProviderStateMix
splitView: widget.splitView,
);
if (widget.splitView) {
SplitView.of(context).push(w);
Navigator.of(clientsNavigatorKey.currentContext!).pushReplacement(
PageRouteBuilder(
pageBuilder: (context, animation1, animation2) => w,
transitionDuration: Duration.zero,
reverseTransitionDuration: Duration.zero,
)
);
}
else {
Navigator.of(context).push(
@ -88,7 +94,13 @@ class _ClientsListsState extends State<ClientsLists> with TickerProviderStateMix
splitView: widget.splitView,
);
if (widget.splitView) {
SplitView.of(context).push(w);
Navigator.of(clientsNavigatorKey.currentContext!).pushReplacement(
PageRouteBuilder(
pageBuilder: (context, animation1, animation2) => w,
transitionDuration: Duration.zero,
reverseTransitionDuration: Duration.zero,
)
);
}
else {
Navigator.of(context).push(