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

Changed file directories, added clear storage setting, updated readme w/ Google Play reference

Browse Source
This commit is contained in:
Anton Stubenbord
2022-11-12 20:48:09 +01:00
parent c4104e75a7
commit afbd4bddb4
21 changed files with 380 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lib/features/home/view/home_page.dart
View File

@@ -37,47 +37,39 @@ class _HomePageState extends State<HomePage> {
@override
Widget build(BuildContext context) {
return BlocListener<GlobalErrorCubit, GlobalErrorState>(
return BlocConsumer<ConnectivityCubit, ConnectivityState>(
//Only re-initialize data if the connectivity changed from not connected to connected
listenWhen: (previous, current) => current == ConnectivityState.connected,
listener: (context, state) {
if (state.hasError) {
showSnackBar(context, translateError(context, state.error!.code));
}
initializeLabelData(context);
},
child: BlocConsumer<ConnectivityCubit, ConnectivityState>(
//Only re-initialize data if the connectivity changed from not connected to connected
listenWhen: (previous, current) =>
current == ConnectivityState.connected,
listener: (context, state) {
initializeLabelData(context);
},
builder: (context, connectivityState) {
return Scaffold(
appBar: connectivityState == ConnectivityState.connected
? null
: const OfflineBanner(),
key: rootScaffoldKey,
bottomNavigationBar: BottomNavBar(
selectedIndex: _currentIndex,
onNavigationChanged: (index) =>
setState(() => _currentIndex = index),
builder: (context, connectivityState) {
return Scaffold(
appBar: connectivityState == ConnectivityState.connected
? null
: const OfflineBanner(),
key: rootScaffoldKey,
bottomNavigationBar: BottomNavBar(
selectedIndex: _currentIndex,
onNavigationChanged: (index) =>
setState(() => _currentIndex = index),
),
drawer: const InfoDrawer(),
body: [
MultiBlocProvider(
providers: [
BlocProvider.value(value: getIt<DocumentsCubit>()),
],
child: const DocumentsPage(),
),
drawer: const InfoDrawer(),
body: [
MultiBlocProvider(
providers: [
BlocProvider.value(value: getIt<DocumentsCubit>()),
],
child: const DocumentsPage(),
),
BlocProvider.value(
value: getIt<DocumentScannerCubit>(),
child: const ScannerPage(),
),
const LabelsPage(),
][_currentIndex],
);
},
),
BlocProvider.value(
value: getIt<DocumentScannerCubit>(),
child: const ScannerPage(),
),
const LabelsPage(),
][_currentIndex],
);
},
);
}

19
lib/features/labels/tags/model/tag.model.dart
View File

@@ -10,6 +10,7 @@ class Tag extends Label {
static const colorKey = 'color';
static const isInboxTagKey = 'is_inbox_tag';
static const textColorKey = 'text_color';
static const legacyColourKey = 'colour';
final Color? color;
final Color? textColor;
@@ -31,11 +32,23 @@ class Tag extends Label {
Tag.fromJson(JSON json)
: isInboxTag = json[isInboxTagKey],
textColor = Color(_colorStringToInt(json[textColorKey]) ?? 0),
color = (json[colorKey] is Color)
? json[colorKey]
: Color(_colorStringToInt(json[colorKey]) ?? 0),
color = _parseColorFromJson(json),
super.fromJson(json);
///
/// The `color` field of the json object can either be of type [Color] or a hex [String].
/// Since API version 2, the old attribute `colour` has been replaced with `color`.
///
static Color _parseColorFromJson(JSON json) {
if (json.containsKey(legacyColourKey)) {
return Color(_colorStringToInt(json[legacyColourKey]) ?? 0);
}
if (json[colorKey] is Color) {
return json[colorKey];
}
return Color(_colorStringToInt(json[colorKey]) ?? 0);
}
@override
String toString() {
return name;

11
lib/features/login/bloc/authentication_cubit.dart
View File

@@ -79,6 +79,17 @@ class AuthenticationCubit extends Cubit<AuthenticationState> {
errorCubit.add(error);
}
throw error;
} on SocketException catch (err) {
late ErrorMessage error;
if (err.message.contains("connection timed out")) {
error = const ErrorMessage(ErrorCode.requestTimedOut);
} else {
error = ErrorMessage.unknown();
}
if (propagateEventOnError) {
errorCubit.add(error);
}
rethrow;
} on ErrorMessage catch (error) {
if (propagateEventOnError) {
errorCubit.add(error);

6
lib/features/scan/bloc/document_scanner_cubit.dart
View File

@@ -1,5 +1,7 @@
import 'dart:developer';
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_mobile/core/model/error_message.dart';
@@ -27,7 +29,11 @@ class DocumentScannerCubit extends Cubit<List<File>> {
void reset() {
for (final doc in state) {
doc.deleteSync();
if (kDebugMode) {
log('[ScannerCubit]: Removed ${doc.path}');
}
}
imageCache.clear();
emit(initialState);
}

46
lib/features/scan/view/scanner_page.dart
View File

@@ -1,3 +1,4 @@
import 'dart:developer' as dev;
import 'dart:io';
import 'dart:math';
@@ -7,8 +8,10 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:mime/mime.dart';
import 'package:paperless_mobile/core/bloc/global_error_cubit.dart';
import 'package:paperless_mobile/core/bloc/label_bloc_provider.dart';
import 'package:paperless_mobile/core/model/error_message.dart';
import 'package:paperless_mobile/core/service/file_service.dart';
import 'package:paperless_mobile/di_initializer.dart';
import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
import 'package:paperless_mobile/features/home/view/widget/info_drawer.dart';
@@ -16,7 +19,6 @@ import 'package:paperless_mobile/features/scan/bloc/document_scanner_cubit.dart'
import 'package:paperless_mobile/features/scan/view/document_upload_page.dart';
import 'package:paperless_mobile/features/scan/view/widgets/grid_image_item_widget.dart';
import 'package:paperless_mobile/generated/l10n.dart';
import 'package:paperless_mobile/util.dart';
import 'package:pdf/pdf.dart';
import 'package:pdf/widgets.dart' as pw;
import 'package:permission_handler/permission_handler.dart';
@@ -38,8 +40,10 @@ class _ScannerPageState extends State<ScannerPage>
'jpg',
'jpeg'
];
late final AnimationController _fabPulsingController;
late final Animation _animation;
@override
void initState() {
super.initState();
@@ -47,9 +51,7 @@ class _ScannerPageState extends State<ScannerPage>
AnimationController(vsync: this, duration: const Duration(seconds: 1))
..repeat(reverse: true);
_animation = Tween(begin: 1.0, end: 1.2).animate(_fabPulsingController)
..addListener(() {
setState(() {});
});
..addListener(() => setState((() {})));
}
@override
@@ -101,7 +103,9 @@ class _ScannerPageState extends State<ScannerPage>
BlocBuilder<DocumentScannerCubit, List<File>>(
builder: (context, state) {
return IconButton(
onPressed: state.isEmpty ? null : () => _export(context),
onPressed: state.isEmpty
? null
: () => _onPrepareDocumentUpload(context),
icon: const Icon(Icons.done),
tooltip: S.of(context).documentScannerPageUploadButtonTooltip,
);
@@ -113,17 +117,31 @@ class _ScannerPageState extends State<ScannerPage>
void _openDocumentScanner(BuildContext context) async {
await _requestCameraPermissions();
final imagePath = await EdgeDetection.detectEdge;
if (imagePath == null) {
final file = await FileService.allocateTemporaryFile(
PaperlessDirectoryType.scans,
extension: 'jpeg',
);
if (kDebugMode) {
dev.log('[ScannerPage] Created temporary file: ${file.path}');
}
final success = await EdgeDetection.detectEdge(file.path);
if (!success) {
if (kDebugMode) {
dev.log(
'[ScannerPage] Scan either not successful or canceled by user.');
}
return;
}
final file = File(imagePath);
if (kDebugMode) {
dev.log('[ScannerPage] Wrote image to temporary file: ${file.path}');
}
BlocProvider.of<DocumentScannerCubit>(context).addScan(file);
}
void _export(BuildContext context) async {
void _onPrepareDocumentUpload(BuildContext context) async {
final doc = _buildDocumentFromImageFiles(
BlocProvider.of<DocumentScannerCubit>(context).state);
BlocProvider.of<DocumentScannerCubit>(context).state,
);
final bytes = await doc.save();
Navigator.of(context).push(
MaterialPageRoute(
@@ -202,7 +220,7 @@ class _ScannerPageState extends State<ScannerPage>
Future<void> _requestCameraPermissions() async {
final hasPermission = await Permission.camera.isGranted;
if (!hasPermission) {
Permission.camera.request();
await Permission.camera.request();
}
}
@@ -214,7 +232,11 @@ class _ScannerPageState extends State<ScannerPage>
);
if (result?.files.single.path != null) {
File file = File(result!.files.single.path!);
if (!_supportedExtensions.contains(file.path.split('.').last)) {
return getIt<GlobalErrorCubit>().add(
const ErrorMessage(ErrorCode.unsupportedFileFormat),
);
}
final mimeType = lookupMimeType(file.path) ?? '';
late Uint8List fileBytes;
if (mimeType.startsWith('image')) {

21
lib/features/settings/view/pages/storage_settings_page.dart Normal file
View File

@@ -0,0 +1,21 @@
import 'package:flutter/material.dart';
import 'package:paperless_mobile/features/settings/view/widgets/clear_storage_setting.dart';
import 'package:paperless_mobile/generated/l10n.dart';
class StorageSettingsPage extends StatelessWidget {
const StorageSettingsPage({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(S.of(context).settingsPageStorageSettingsLabel),
),
body: ListView(
children: const [
ClearStorageSetting(),
],
),
);
}
}

20
lib/features/settings/view/settings_page.dart
View File

@@ -3,16 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:paperless_mobile/features/settings/bloc/application_settings_cubit.dart';
import 'package:paperless_mobile/features/settings/view/pages/application_settings_page.dart';
import 'package:paperless_mobile/features/settings/view/pages/security_settings_page.dart';
import 'package:paperless_mobile/features/settings/view/pages/storage_settings_page.dart';
import 'package:paperless_mobile/generated/l10n.dart';
class SettingsPage extends StatefulWidget {
class SettingsPage extends StatelessWidget {
const SettingsPage({super.key});
@override
State<SettingsPage> createState() => _SettingsPageState();
}
class _SettingsPageState extends State<SettingsPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -25,20 +21,26 @@ class _SettingsPageState extends State<SettingsPage> {
title: Text(S.of(context).settingsPageApplicationSettingsLabel),
subtitle: Text(
S.of(context).settingsPageApplicationSettingsDescriptionText),
onTap: () => _goto(const ApplicationSettingsPage()),
onTap: () => _goto(const ApplicationSettingsPage(), context),
),
ListTile(
title: Text(S.of(context).settingsPageSecuritySettingsLabel),
subtitle:
Text(S.of(context).settingsPageSecuritySettingsDescriptionText),
onTap: () => _goto(const SecuritySettingsPage()),
onTap: () => _goto(const SecuritySettingsPage(), context),
),
ListTile(
title: Text(S.of(context).settingsPageStorageSettingsLabel),
subtitle:
Text(S.of(context).settingsPageStorageSettingsDescriptionText),
onTap: () => _goto(const StorageSettingsPage(), context),
),
],
),
);
}
void _goto(Widget page) {
void _goto(Widget page, BuildContext context) {
Navigator.push(
context,
MaterialPageRoute(

23
lib/features/settings/view/widgets/clear_storage_setting.dart Normal file
View File

@@ -0,0 +1,23 @@
import 'package:flutter/material.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart' as cm;
import 'package:paperless_mobile/core/service/file_service.dart';
import 'package:paperless_mobile/di_initializer.dart';
class ClearStorageSetting extends StatelessWidget {
const ClearStorageSetting({super.key});
@override
Widget build(BuildContext context) {
return ListTile(
title: Text("Clear data"),
subtitle:
Text("Remove downloaded files, scans and clear the cache's content"),
onTap: _clearCache,
);
}
void _clearCache() async {
getIt<cm.CacheManager>().emptyCache();
FileService.clearUserData();
}
}