Bugfixes, some visual updates

This commit is contained in:
Anton Stubenbord
2022-11-15 01:24:26 +01:00
parent d77b08e3b1
commit 7fac53522a
12 changed files with 99 additions and 69 deletions

View File

@@ -6,6 +6,7 @@ import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
import 'package:paperless_mobile/features/documents/bloc/documents_state.dart';
import 'package:paperless_mobile/features/documents/view/widgets/selection/bulk_delete_confirmation_dialog.dart';
import 'package:paperless_mobile/features/documents/view/widgets/selection/saved_view_selection_widget.dart';
import 'package:paperless_mobile/features/documents/view/widgets/sort_documents_button.dart';
import 'package:paperless_mobile/generated/l10n.dart';
import 'package:paperless_mobile/util.dart';
@@ -28,12 +29,14 @@ class _DocumentsPageAppBarState extends State<DocumentsPageAppBar> {
Widget build(BuildContext context) {
return BlocBuilder<DocumentsCubit, DocumentsState>(
builder: (context, documentsState) {
if (documentsState.selection.isNotEmpty) {
final hasSelection = documentsState.selection.isNotEmpty;
if (hasSelection) {
return SliverAppBar(
expandedHeight: kToolbarHeight + _flexibleAreaHeight,
snap: true,
floating: true,
pinned: true,
expandedHeight: kToolbarHeight,
flexibleSpace: _buildFlexibleArea(false),
leading: IconButton(
icon: const Icon(Icons.close),
onPressed: () =>
@@ -51,13 +54,10 @@ class _DocumentsPageAppBarState extends State<DocumentsPageAppBar> {
} else {
return SliverAppBar(
expandedHeight: kToolbarHeight + _flexibleAreaHeight,
snap: true,
floating: true,
pinned: true,
flexibleSpace: const FlexibleSpaceBar(
background: Padding(
padding: EdgeInsets.all(8.0),
child: SavedViewSelectionWidget(height: _flexibleAreaHeight),
),
),
flexibleSpace: _buildFlexibleArea(true),
title: BlocBuilder<DocumentsCubit, DocumentsState>(
builder: (context, state) {
return Text(
@@ -65,13 +65,30 @@ class _DocumentsPageAppBarState extends State<DocumentsPageAppBar> {
);
},
),
actions: widget.actions,
actions: [
...widget.actions,
],
);
}
},
);
}
Widget _buildFlexibleArea(bool enabled) {
return FlexibleSpaceBar(
background: Padding(
padding: EdgeInsets.all(8.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
//TODO: replace with sorting stuff...
SavedViewSelectionWidget(height: 48, enabled: enabled),
],
),
),
);
}
void _onDelete(BuildContext context, DocumentsState documentsState) async {
final shouldDelete = await showDialog<bool>(
context: context,

View File

@@ -1,5 +1,3 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_mobile/core/model/error_message.dart';
@@ -17,9 +15,11 @@ class SavedViewSelectionWidget extends StatelessWidget {
const SavedViewSelectionWidget({
Key? key,
required this.height,
required this.enabled,
}) : super(key: key);
final double height;
final bool enabled;
@override
Widget build(BuildContext context) {
@@ -33,7 +33,7 @@ class SavedViewSelectionWidget extends StatelessWidget {
return Text(S.of(context).savedViewsEmptyStateText);
}
return SizedBox(
height: 48.0,
height: height,
child: ListView.separated(
itemCount: state.value.length,
scrollDirection: Axis.horizontal,
@@ -44,8 +44,10 @@ class SavedViewSelectionWidget extends StatelessWidget {
child: FilterChip(
label: Text(state.value.values.toList()[index].name),
selected: view.id == state.selectedSavedViewId,
onSelected: (isSelected) =>
_onSelected(isSelected, context, view),
onSelected: enabled
? (isSelected) =>
_onSelected(isSelected, context, view)
: null,
),
);
},
@@ -65,7 +67,7 @@ class SavedViewSelectionWidget extends StatelessWidget {
),
TextButton.icon(
icon: const Icon(Icons.add),
onPressed: () => _onCreatePressed(context),
onPressed: enabled ? () => _onCreatePressed(context) : null,
label: Text(S.of(context).savedViewCreateNewLabel),
),
],