SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2024-09-21 10:57:52 +00:00
Code Issues Projects Releases Wiki Activity

fix: Black bars on top of pages

Browse source
This commit is contained in:
Inex Code 2024-07-24 14:43:19 +03:00
parent da073b7454
commit 39babdeeaa
2 changed files with 89 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/ui/pages/more/console/console_page.dart
View file

@ -44,30 +44,28 @@ class _ConsolePageState extends State<ConsolePage> {
Widget build(final BuildContext context) {
final List<ConsoleLog> logs = console.logs;
return SafeArea(
child: Scaffold(
appBar: AppBar(
title: Text('console_page.title'.tr()),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () => Navigator.of(context).maybePop(),
),
actions: [
IconButton(
icon: Icon(
console.paused
? Icons.play_arrow_outlined
: Icons.pause_outlined,
),
onPressed: console.paused ? console.play : console.pause,
return Scaffold(
appBar: AppBar(
title: Text('console_page.title'.tr()),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () => Navigator.of(context).maybePop(),
),
actions: [
IconButton(
icon: Icon(
console.paused
? Icons.play_arrow_outlined
: Icons.pause_outlined,
),
],
),
body: Scrollbar(
child: logs.isEmpty
? const _ConsoleViewEmpty()
: _ConsoleViewLoaded(logs: logs),
),
onPressed: console.paused ? console.play : console.pause,
),
],
),
body: Scrollbar(
child: logs.isEmpty
? const _ConsoleViewEmpty()
: _ConsoleViewLoaded(logs: logs),
),
);
}

136
lib/ui/pages/server_storage/binds_migration/services_migration.dart
View file

@ -105,10 +105,10 @@ class _ServicesMigrationPageState extends State<ServicesMigrationPage> {
listItemHeight * widget.diskStatus.diskVolumes.length +
headerVerticalPadding * widget.diskStatus.diskVolumes.length,
);
return SafeArea(
child: Scaffold(
appBar: PreferredSize(
preferredSize: appBarHeight,
return Scaffold(
appBar: PreferredSize(
preferredSize: appBarHeight,
child: SafeArea(
child: Column(
children: [
BrandHeader(
@ -143,74 +143,74 @@ class _ServicesMigrationPageState extends State<ServicesMigrationPage> {
],
),
),
body: ListView(
padding: const EdgeInsets.all(16.0),
children: <Widget>[
if (widget.services.isEmpty)
const Center(child: CircularProgressIndicator.adaptive()),
...widget.services.map(
(final service) => Column(
children: [
const SizedBox(height: 8),
ServiceMigrationListItem(
service: service,
diskStatus: widget.diskStatus,
selectedVolume: serviceToDisk[service.id]!,
onChange: onChange,
),
const SizedBox(height: 4),
const Divider(),
],
),
),
body: ListView(
padding: const EdgeInsets.all(16.0),
children: <Widget>[
if (widget.services.isEmpty)
const Center(child: CircularProgressIndicator.adaptive()),
...widget.services.map(
(final service) => Column(
children: [
const SizedBox(height: 8),
ServiceMigrationListItem(
service: service,
diskStatus: widget.diskStatus,
selectedVolume: serviceToDisk[service.id]!,
onChange: onChange,
),
const SizedBox(height: 4),
const Divider(),
],
),
Padding(
padding: const EdgeInsets.all(8.0),
child: InfoBox(
text: 'storage.data_migration_notice'.tr(),
isWarning: true,
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: InfoBox(
text: 'storage.data_migration_notice'.tr(),
isWarning: true,
),
const SizedBox(height: 16),
if (widget.isMigration || (!widget.isMigration && isVolumePicked))
BrandButton.filled(
child: Text('storage.start_migration_button'.tr()),
onPressed: () {
if (widget.isMigration) {
context.read<ServerJobsBloc>().migrateToBinds(
serviceToDisk,
);
} else {
for (final service in widget.services) {
if (serviceToDisk[service.id] != null) {
context.read<ServicesBloc>().add(
ServiceMove(
service,
serviceToDisk[service.id]!,
),
);
}
),
const SizedBox(height: 16),
if (widget.isMigration || (!widget.isMigration && isVolumePicked))
BrandButton.filled(
child: Text('storage.start_migration_button'.tr()),
onPressed: () {
if (widget.isMigration) {
context.read<ServerJobsBloc>().migrateToBinds(
serviceToDisk,
);
} else {
for (final service in widget.services) {
if (serviceToDisk[service.id] != null) {
context.read<ServicesBloc>().add(
ServiceMove(
service,
serviceToDisk[service.id]!,
),
);
}
}
context.router.popUntilRoot();
showModalBottomSheet(
context: context,
useRootNavigator: true,
isScrollControlled: true,
builder: (final BuildContext context) =>
DraggableScrollableSheet(
expand: false,
maxChildSize: 0.9,
minChildSize: 0.4,
initialChildSize: 0.6,
builder: (final context, final scrollController) =>
JobsContent(controller: scrollController),
),
);
},
),
const SizedBox(height: 32),
],
),
}
context.router.popUntilRoot();
showModalBottomSheet(
context: context,
useRootNavigator: true,
isScrollControlled: true,
builder: (final BuildContext context) =>
DraggableScrollableSheet(
expand: false,
maxChildSize: 0.9,
minChildSize: 0.4,
initialChildSize: 0.6,
builder: (final context, final scrollController) =>
JobsContent(controller: scrollController),
),
);
},
),
const SizedBox(height: 32),
],
),
);
}