xevion/paperless-mobile
1
0
Fork 0
mirror of https://github.com/Xevion/paperless-mobile.git synced 2025-12-09 16:07:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat: Finalize notes feature, update translations

Browse Source
This commit is contained in:
Anton Stubenbord
2024-01-03 20:22:28 +01:00
parent c7d3d9207b
commit ddd950a8da
28 changed files with 281 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/features/document_details/view/pages/document_details_page.dart
View File

@@ -161,6 +161,7 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
bottom: ColoredTabBar(
tabBar: TabBar(
isScrollable: true,
tabAlignment: TabAlignment.start,
tabs: [
Tab(
child: Text(
@@ -203,19 +204,33 @@ class _DocumentDetailsPageState extends State<DocumentDetailsPage> {
),
),
Tab(
child: Text(
"Notes",
style: TextStyle(
color: Theme.of(context)
.colorScheme
.onPrimaryContainer,
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
S.of(context)!.notes(0),
style: TextStyle(
color: Theme.of(context)
.colorScheme
.onPrimaryContainer,
),
),
if ((state.document?.notes.length ?? 0) >
0)
Card(
child: Text(state
.document!.notes.length
.toString())
.paddedSymmetrically(
horizontal: 8, vertical: 2),
),
],
),
),
if (hasMultiUserSupport)
Tab(
child: Text(
"Permissions",
S.of(context)!.permissions,
style: TextStyle(
color: Theme.of(context)
.colorScheme

143
lib/features/document_details/view/widgets/document_notes_widget.dart
View File

@@ -1,12 +1,21 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:intl/intl.dart';
import 'package:paperless_api/paperless_api.dart';
import 'package:paperless_mobile/core/database/hive/hive_config.dart';
import 'package:paperless_mobile/core/extensions/flutter_extensions.dart';
import 'package:paperless_mobile/core/widgets/hint_card.dart';
import 'package:paperless_mobile/core/widgets/hint_state_builder.dart';
import 'package:paperless_mobile/features/document_details/cubit/document_details_cubit.dart';
import 'package:paperless_mobile/features/settings/view/widgets/global_settings_builder.dart';
import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
import 'package:paperless_mobile/helpers/message_helpers.dart';
import 'package:markdown/markdown.dart' show markdownToHtml;
import 'package:shared_preferences/shared_preferences.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:url_launcher/url_launcher_string.dart';
class DocumentNotesWidget extends StatefulWidget {
final DocumentModel document;
@@ -19,11 +28,29 @@ class DocumentNotesWidget extends StatefulWidget {
class _DocumentNotesWidgetState extends State<DocumentNotesWidget> {
final _noteContentController = TextEditingController();
final _formKey = GlobalKey<FormState>();
bool _isNoteSubmitting = false;
@override
Widget build(BuildContext context) {
const hintKey = "hideMarkdownSyntaxHint";
return SliverMainAxisGroup(
slivers: [
SliverPadding(
padding: const EdgeInsets.only(bottom: 16),
sliver: SliverToBoxAdapter(
child: HintStateBuilder(
listenKey: hintKey,
builder: (context, box) {
return HintCard(
hintText: S.of(context)!.notesMarkdownSyntaxSupportHint,
show: !box.get(hintKey, defaultValue: false)!,
onHintAcknowledged: () {
box.put(hintKey, true);
},
);
},
),
),
),
SliverToBoxAdapter(
child: Form(
key: _formKey,
@@ -33,79 +60,107 @@ class _DocumentNotesWidgetState extends State<DocumentNotesWidget> {
controller: _noteContentController,
maxLines: null,
validator: (value) {
if (value?.isEmpty ?? true) {
if (value?.trim().isEmpty ?? true) {
return S.of(context)!.thisFieldIsRequired;
}
return null;
},
textInputAction: TextInputAction.newline,
decoration: InputDecoration(
hintText: 'Your note here...',
labelText: 'New note',
floatingLabelBehavior: FloatingLabelBehavior.always,
labelText: S.of(context)!.newNote,
suffixIcon: IconButton(
icon: const Icon(Icons.clear),
onPressed: () {
_noteContentController.clear();
},
),
),
).padded(),
).paddedOnly(bottom: 8),
Align(
alignment: Alignment.centerRight,
child: FilledButton.icon(
icon: Icon(Icons.note_add_outlined),
label: Text("Add note"),
onPressed: () {
child: ElevatedButton.icon(
icon: _isNoteSubmitting
? const SizedBox.square(
dimension: 20,
child: Center(
child: CircularProgressIndicator(
strokeWidth: 3,
),
),
)
: const Icon(Icons.note_add_outlined),
label: Text(S.of(context)!.addNote),
onPressed: () async {
_formKey.currentState?.save();
if (_formKey.currentState?.validate() ?? false) {
context
.read<DocumentDetailsCubit>()
.addNote(_noteContentController.text);
setState(() {
_isNoteSubmitting = true;
});
try {
await context
.read<DocumentDetailsCubit>()
.addNote(_noteContentController.text.trim());
_noteContentController.clear();
} catch (error) {
showGenericError(context, error);
} finally {
setState(() {
_isNoteSubmitting = false;
});
}
}
},
).padded(),
),
),
],
).padded(),
),
),
),
const SliverToBoxAdapter(
child: SizedBox(height: 16),
),
SliverList.separated(
separatorBuilder: (context, index) => const SizedBox(height: 16),
itemBuilder: (context, index) {
final note = widget.document.notes.elementAt(index);
return Card(
// borderRadius: BorderRadius.circular(8),
// elevation: 1,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (note.created != null)
Text(
DateFormat.yMMMd(
Localizations.localeOf(context).toString())
.addPattern('\u2014')
.add_jm()
.format(note.created!),
style: Theme.of(context).textTheme.labelMedium?.copyWith(
color: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(.5),
),
),
const SizedBox(height: 8),
Text(
note.note!,
textAlign: TextAlign.justify,
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface,
),
Html(
data: markdownToHtml(note.note!),
onLinkTap: (url, attributes, element) async {
if (url?.isEmpty ?? true) {
return;
}
if (await canLaunchUrlString(url!)) {
launchUrlString(url);
}
},
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
if (note.created != null)
Text(
DateFormat.yMMMd(
Localizations.localeOf(context).toString())
.addPattern('\u2014')
.add_jm()
.format(note.created!),
style:
Theme.of(context).textTheme.labelMedium?.copyWith(
color: Theme.of(context)
.colorScheme
.onSurface
.withOpacity(.5),
),
),
IconButton(
icon: Icon(Icons.delete),
tooltip: S.of(context)!.delete,
icon: const Icon(Icons.delete),
onPressed: () {
context.read<DocumentDetailsCubit>().deleteNote(note);
showSnackBar(
context,
S.of(context)!.documentSuccessfullyUpdated,
);
},
),
],

2
lib/features/document_edit/view/document_edit_page.dart
View File

@@ -424,7 +424,7 @@ class _DocumentEditPageState extends State<DocumentEditPage>
initialValue: initialCreatedAtDate,
labelText: S.of(context)!.createdAt,
firstDate: DateTime(1970, 1, 1),
lastDate: DateTime.now(),
lastDate: DateTime(2100, 1, 1),
locale: Localizations.localeOf(context),
prefixIcon: Icon(Icons.calendar_today),
),

2
lib/features/document_search/view/document_search_bar.dart
View File

@@ -40,7 +40,7 @@ class _DocumentSearchBarState extends State<DocumentSearchBar> {
constraints: const BoxConstraints(
maxWidth: 720,
minWidth: 360,
maxHeight: 56,
maxHeight: 48,
minHeight: 48,
),
child: Row(

2
lib/features/document_upload/view/document_upload_preparation_page.dart
View File

@@ -222,7 +222,7 @@ class _DocumentUploadPreparationPageState
FormBuilderLocalizedDatePicker(
name: DocumentModel.createdKey,
firstDate: DateTime(1970, 1, 1),
lastDate: DateTime.now(),
lastDate: DateTime(2100, 1, 1),
locale: Localizations.localeOf(context),
labelText: S.of(context)!.createdAt + " *",
allowUnset: true,

15
lib/features/documents/view/pages/documents_page.dart
View File

@@ -21,6 +21,7 @@ import 'package:paperless_mobile/features/documents/view/widgets/selection/docum
import 'package:paperless_mobile/features/documents/view/widgets/selection/view_type_selection_widget.dart';
import 'package:paperless_mobile/features/documents/view/widgets/sort_documents_button.dart';
import 'package:paperless_mobile/features/labels/cubit/label_cubit.dart';
import 'package:paperless_mobile/features/logging/data/logger.dart';
import 'package:paperless_mobile/features/saved_view/cubit/saved_view_cubit.dart';
import 'package:paperless_mobile/features/tasks/model/pending_tasks_notifier.dart';
import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
@@ -308,8 +309,18 @@ class _DocumentsPageState extends State<DocumentsPage> {
// Listen for scroll notifications to load new data.
// Scroll controller does not work here due to nestedscrollview limitations.
final offset = notification.metrics.pixels;
if (offset > 128 && _savedViewsExpansionController.isExpanded) {
_savedViewsExpansionController.collapse();
try {
if (offset > 128 && _savedViewsExpansionController.isExpanded) {
_savedViewsExpansionController.collapse();
}
// Workaround for https://github.com/astubenbord/paperless-mobile/issues/341 probably caused by https://github.com/flutter/flutter/issues/138153
} on TypeError catch (error) {
logger.fw(
"An exception was thrown, but this message can probably be ignored. See issue #341 for more details.",
error: error,
className: runtimeType.toString(),
methodName: "_buildDocumentsTab",
);
}
final max = notification.metrics.maxScrollExtent;