luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-04-20 13:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvements clients view

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-05-04 01:59:50 +02:00
parent dafff9b242
commit 769238cff9
3 changed files with 206 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
);
}
Widget tabBarView() {
Widget tabBarView(bool sliver) {
return TabBarView(
controller: tabController,
children: [
@ -149,6 +149,7 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
)
)),
splitView: false,
sliver: sliver,
),
AddedList(
scrollController: scrollController,
@ -169,7 +170,6 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
);
}
if (!(Platform.isAndroid || Platform.isIOS)) {
if (width > 900) {
return SplitView.material(
hideDivider: true,
@ -195,6 +195,7 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
);
}
else {
if (!(Platform.isAndroid || Platform.isIOS)) {
return DefaultTabController(
length: 2,
child: Scaffold(
@ -217,11 +218,10 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
],
bottom: tabBar()
),
body: tabBarView(),
body: tabBarView(false),
),
);
}
}
else {
return DefaultTabController(
length: 2,
@ -295,9 +295,10 @@ class _ClientsWidgetState extends State<ClientsWidget> with TickerProviderStateM
)
];
}),
body: tabBarView()
body: tabBarView(true)
)
);
}
}
}
}

68
lib/screens/clients/clients_desktop_view.dart
View file

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_split_view/flutter_split_view.dart';
import 'package:provider/provider.dart';
@ -84,7 +86,7 @@ class _ClientsDesktopViewState extends State<ClientsDesktopView> with TickerPro
);
}
Widget tabBarView() {
Widget tabBarView(bool sliver) {
return TabBarView(
controller: tabController,
children: [
@ -107,7 +109,8 @@ class _ClientsDesktopViewState extends State<ClientsDesktopView> with TickerPro
);
}),
selectedClient: selectedActiveClient,
splitView: true
splitView: true,
sliver: sliver,
),
AddedList(
scrollController: scrollController,
@ -134,12 +137,9 @@ class _ClientsDesktopViewState extends State<ClientsDesktopView> with TickerPro
);
}
return DefaultTabController(
length: 2,
child: Scaffold(
appBar: AppBar(
title: searchMode == true
? Row(
Widget title() {
if (searchMode == true) {
return Row(
children: [
IconButton(
onPressed: () {
@ -180,8 +180,19 @@ class _ClientsDesktopViewState extends State<ClientsDesktopView> with TickerPro
),
)
],
)
: Text(AppLocalizations.of(context)!.clients),
);
}
else {
return Text(AppLocalizations.of(context)!.clients);
}
}
if (!(Platform.isAndroid || Platform.isIOS)) {
return DefaultTabController(
length: 2,
child: Scaffold(
appBar: AppBar(
title: title(),
centerTitle: false,
actions: [
if (serversProvider.clients.loadStatus == LoadStatus.loaded && searchMode == false) ...[
@ -195,8 +206,43 @@ class _ClientsDesktopViewState extends State<ClientsDesktopView> with TickerPro
],
bottom: tabBar()
),
body: tabBarView(),
body: tabBarView(false),
),
);
}
else {
return DefaultTabController(
length: 2,
child: NestedScrollView(
controller: scrollController,
headerSliverBuilder: ((context, innerBoxIsScrolled) {
return [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar(
title: title(),
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
actions: [
if (serversProvider.clients.loadStatus == LoadStatus.loaded && searchMode == false) ...[
IconButton(
onPressed: () => setState(() => searchMode = true),
icon: const Icon(Icons.search),
tooltip: AppLocalizations.of(context)!.searchClients,
),
const SizedBox(width: 10),
]
],
bottom: tabBar()
),
)
];
}),
body: tabBarView(true)
)
);
}
}
}

6
lib/screens/clients/clients_list.dart
View file

@ -18,6 +18,7 @@ class ClientsList extends StatelessWidget {
final void Function(AutoClient) onClientSelected;
final AutoClient? selectedClient;
final bool splitView;
final bool sliver;
const ClientsList({
Key? key,
@ -27,7 +28,8 @@ class ClientsList extends StatelessWidget {
required this.fetchClients,
required this.onClientSelected,
this.selectedClient,
required this.splitView
required this.splitView,
required this.sliver
}) : super(key: key);
@override
@ -36,7 +38,7 @@ class ClientsList extends StatelessWidget {
listPadding: splitView == true
? const EdgeInsets.only(top: 8)
: null,
noSliver: !(Platform.isAndroid || Platform.isIOS),
noSliver: !sliver,
loadingGenerator: () => SizedBox(
width: double.maxFinite,
height: MediaQuery.of(context).size.height-171,