Update Landing page

This commit is contained in:
Anton Stubenbord
2023-08-01 21:58:20 +02:00
parent b79375cbe0
commit 8e5eb5a6c6
6 changed files with 166 additions and 158 deletions

View File

@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/database/tables/local_user_account.dart';
import 'package:paperless_mobile/extensions/flutter_extensions.dart';
@@ -9,12 +8,10 @@ import 'package:paperless_mobile/features/document_search/view/sliver_search_bar
import 'package:paperless_mobile/features/landing/view/widgets/expansion_card.dart';
import 'package:paperless_mobile/features/landing/view/widgets/mime_types_pie_chart.dart';
import 'package:paperless_mobile/features/saved_view/cubit/saved_view_cubit.dart';
import 'package:paperless_mobile/features/saved_view_details/view/saved_view_details_preview.dart';
import 'package:paperless_mobile/features/saved_view_details/view/saved_view_preview.dart';
import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
import 'package:paperless_mobile/routes/routes.dart';
import 'package:paperless_mobile/routes/typed/branches/documents_route.dart';
import 'package:paperless_mobile/routes/typed/branches/inbox_route.dart';
import 'package:fl_chart/fl_chart.dart';
class LandingPage extends StatefulWidget {
const LandingPage({super.key});
@@ -45,7 +42,7 @@ class _LandingPageState extends State<LandingPage> {
slivers: [
SliverToBoxAdapter(
child: Text(
"Welcome to Paperless Mobile, ${currentUser.fullName ?? currentUser.username}!",
"Welcome, ${currentUser.fullName ?? currentUser.username}!",
textAlign: TextAlign.center,
style: Theme.of(context)
.textTheme
@@ -54,17 +51,34 @@ class _LandingPageState extends State<LandingPage> {
).padded(24),
),
SliverToBoxAdapter(child: _buildStatisticsCard(context)),
SliverPadding(
padding: const EdgeInsets.fromLTRB(16, 16, 0, 8),
sliver: SliverToBoxAdapter(
child: Text(
"Saved Views",
style: Theme.of(context).textTheme.titleMedium,
),
),
),
BlocBuilder<SavedViewCubit, SavedViewState>(
builder: (context, state) {
return state.maybeWhen(
loaded: (savedViews) {
final dashboardViews = savedViews.values
.where((element) => element.showOnDashboard)
.toList();
if (dashboardViews.isEmpty) {
return const SliverToBoxAdapter(
child: Text("No views"),
);
}
return SliverList.builder(
itemBuilder: (context, index) {
return SavedViewDetailsPreview(
savedView: savedViews.values.elementAt(index),
return SavedViewPreview(
savedView: dashboardViews.elementAt(index),
);
},
itemCount: savedViews.length,
itemCount: dashboardViews.length,
);
},
orElse: () => const SliverToBoxAdapter(
@@ -83,6 +97,7 @@ class _LandingPageState extends State<LandingPage> {
}
Widget _buildStatisticsCard(BuildContext context) {
final currentUser = context.read<LocalUserAccount>().paperlessUser;
return FutureBuilder<PaperlessServerStatisticsModel>(
future: context.read<PaperlessServerStatsApi>().getServerStatistics(),
builder: (context, snapshot) {
@@ -118,19 +133,13 @@ class _LandingPageState extends State<LandingPage> {
child: ListTile(
shape: Theme.of(context).cardTheme.shape,
titleTextStyle: Theme.of(context).textTheme.labelLarge,
title: Text("Documents in inbox:"),
onTap: () {
InboxRoute().go(context);
},
trailing: Chip(
padding: EdgeInsets.symmetric(
horizontal: 4,
vertical: 2,
),
labelPadding: EdgeInsets.symmetric(horizontal: 4),
label: Text(
stats.documentsInInbox.toString(),
),
title: const Text("Documents in inbox:"),
onTap: currentUser.canViewTags && currentUser.canViewDocuments
? () => InboxRoute().go(context)
: null,
trailing: Text(
stats.documentsInInbox.toString(),
style: Theme.of(context).textTheme.labelLarge,
),
),
),
@@ -139,16 +148,16 @@ class _LandingPageState extends State<LandingPage> {
child: ListTile(
shape: Theme.of(context).cardTheme.shape,
titleTextStyle: Theme.of(context).textTheme.labelLarge,
title: Text("Total documents:"),
title: const Text("Total documents:"),
onTap: () {
DocumentsRoute().go(context);
},
trailing: Chip(
padding: EdgeInsets.symmetric(
padding: const EdgeInsets.symmetric(
horizontal: 4,
vertical: 2,
),
labelPadding: EdgeInsets.symmetric(horizontal: 4),
labelPadding: const EdgeInsets.symmetric(horizontal: 4),
label: Text(
stats.documentsTotal.toString(),
),
@@ -160,13 +169,13 @@ class _LandingPageState extends State<LandingPage> {
child: ListTile(
shape: Theme.of(context).cardTheme.shape,
titleTextStyle: Theme.of(context).textTheme.labelLarge,
title: Text("Total characters:"),
title: const Text("Total characters:"),
trailing: Chip(
padding: const EdgeInsets.symmetric(
horizontal: 4,
vertical: 2,
),
labelPadding: EdgeInsets.symmetric(horizontal: 4),
labelPadding: const EdgeInsets.symmetric(horizontal: 4),
label: Text(
stats.totalChars.toString(),
),

View File

@@ -4,7 +4,14 @@ class ExpansionCard extends StatelessWidget {
final Widget title;
final Widget content;
const ExpansionCard({super.key, required this.title, required this.content});
final bool initiallyExpanded;
const ExpansionCard({
super.key,
required this.title,
required this.content,
this.initiallyExpanded = false,
});
@override
Widget build(BuildContext context) {
@@ -23,7 +30,7 @@ class ExpansionCard extends StatelessWidget {
),
child: ExpansionTile(
backgroundColor: Theme.of(context).colorScheme.surface,
initiallyExpanded: true,
initiallyExpanded: initiallyExpanded,
title: title,
children: [content],
),

View File

@@ -75,7 +75,7 @@ class _MimeTypesPieChartState extends State<MimeTypesPieChart> {
),
),
Wrap(
alignment: WrapAlignment.start,
alignment: WrapAlignment.spaceAround,
spacing: 8,
runSpacing: 8,
children: [
@@ -126,25 +126,18 @@ class _MimeTypesPieChartState extends State<MimeTypesPieChart> {
for (int i = 0; i < widget.statistics.fileTypeCounts.length; i++) {
final type = widget.statistics.fileTypeCounts[i];
final isTouched = i == _touchedIndex;
final fontSize = isTouched ? 24.0 : 16.0;
final fontSize = isTouched ? 18.0 : 16.0;
final radius = isTouched ? 60.0 : 50.0;
const shadows = [
Shadow(color: Colors.black, blurRadius: 2),
];
final color = colorShades[i % colorShades.length];
final textColor =
color.computeLuminance() > 0.5 ? Colors.black : Colors.white;
final percentage = type.count / widget.statistics.documentsTotal * 100;
yield PieChartSectionData(
color: colorShades[i % colorShades.length],
value: type.count.toDouble(),
title: ((type.count / widget.statistics.documentsTotal) * 100)
.toStringAsFixed(1) +
"%",
title: percentage.toStringAsFixed(1) + "%",
radius: radius,
titleStyle: TextStyle(
fontSize: fontSize,
fontWeight: FontWeight.bold,
color: textColor,
color: Colors.black,
),
);
}

View File

@@ -1,84 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/features/documents/cubit/documents_cubit.dart';
import 'package:paperless_mobile/features/documents/view/widgets/adaptive_documents_view.dart';
import 'package:paperless_mobile/features/documents/view/widgets/items/document_list_item.dart';
import 'package:paperless_mobile/features/landing/view/widgets/expansion_card.dart';
import 'package:paperless_mobile/features/saved_view_details/cubit/saved_view_details_cubit.dart';
import 'package:paperless_mobile/features/saved_view_details/cubit/saved_view_preview_cubit.dart';
import 'package:paperless_mobile/routes/typed/branches/documents_route.dart';
import 'package:provider/provider.dart';
class SavedViewDetailsPreview extends StatelessWidget {
final SavedView savedView;
const SavedViewDetailsPreview({
super.key,
required this.savedView,
});
@override
Widget build(BuildContext context) {
return Provider(
create: (context) =>
SavedViewPreviewCubit(context.read(), savedView)..initialize(),
builder: (context, child) {
return ExpansionCard(
title: Text(savedView.name),
content: BlocBuilder<SavedViewPreviewCubit, SavedViewPreviewState>(
builder: (context, state) {
return Column(
children: [
state.maybeWhen(
loaded: (documents) {
return Column(
children: [
for (final document in documents)
DocumentListItem(
document: document,
isLabelClickable: false,
isSelected: false,
isSelectionActive: false,
onTap: (document) {
DocumentDetailsRoute($extra: document)
.push(context);
},
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
TextButton(
child: Text("Show more"),
onPressed: documents.length >= 5 ? () {} : null,
),
TextButton.icon(
icon: Icon(Icons.open_in_new),
label: Text("Show in documents"),
onPressed: () {
context.read<DocumentsCubit>().updateFilter(
filter: savedView.toDocumentFilter(),
);
DocumentsRoute().go(context);
},
),
],
),
],
);
},
error: () =>
const Text("Error loading preview"), //TODO: INTL
orElse: () => const Padding(
padding: EdgeInsets.all(8.0),
child: Center(child: CircularProgressIndicator()),
),
),
],
);
},
),
);
},
);
}
}

View File

@@ -0,0 +1,78 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/features/documents/cubit/documents_cubit.dart';
import 'package:paperless_mobile/features/documents/view/widgets/items/document_list_item.dart';
import 'package:paperless_mobile/features/landing/view/widgets/expansion_card.dart';
import 'package:paperless_mobile/features/saved_view_details/cubit/saved_view_preview_cubit.dart';
import 'package:paperless_mobile/routes/typed/branches/documents_route.dart';
import 'package:provider/provider.dart';
class SavedViewPreview extends StatelessWidget {
final SavedView savedView;
const SavedViewPreview({
super.key,
required this.savedView,
});
@override
Widget build(BuildContext context) {
return Provider(
create: (context) =>
SavedViewPreviewCubit(context.read(), savedView)..initialize(),
builder: (context, child) {
return ExpansionCard(
initiallyExpanded: true,
title: Text(savedView.name),
content: BlocBuilder<SavedViewPreviewCubit, SavedViewPreviewState>(
builder: (context, state) {
return state.maybeWhen(
loaded: (documents) {
return Column(
children: [
for (final document in documents)
DocumentListItem(
document: document,
isLabelClickable: false,
isSelected: false,
isSelectionActive: false,
onTap: (document) {
DocumentDetailsRoute($extra: document)
.push(context);
},
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
TextButton(
child: Text("Show"),
onPressed: documents.length >= 5 ? () {} : null,
),
TextButton.icon(
icon: Icon(Icons.open_in_new),
label: Text("Show in documents"),
onPressed: () {
context.read<DocumentsCubit>().updateFilter(
filter: savedView.toDocumentFilter(),
);
DocumentsRoute().go(context);
},
),
],
),
],
);
},
error: () => const Text("Error loading preview"), //TODO: INTL
orElse: () => const Padding(
padding: EdgeInsets.all(8.0),
child: Center(child: CircularProgressIndicator()),
),
);
},
),
);
},
);
}
}