♻️ Optimized the experience of cloud files

This commit is contained in:
2025-10-11 00:49:14 +08:00
parent 8c6bd0feaa
commit b55cbd08d1
5 changed files with 247 additions and 67 deletions

View File

@@ -1213,5 +1213,7 @@
"postUpdate": "Update", "postUpdate": "Update",
"fileMetadata": "File Metadata", "fileMetadata": "File Metadata",
"resend": "Resend", "resend": "Resend",
"fileInfoTitle": "File Information" "fileInfoTitle": "File Information",
"download": "Download",
"info": "Info"
} }

View File

@@ -9,6 +9,7 @@ import 'package:island/models/file.dart';
import 'package:island/pods/network.dart'; import 'package:island/pods/network.dart';
import 'package:mime/mime.dart'; import 'package:mime/mime.dart';
import 'package:native_exif/native_exif.dart'; import 'package:native_exif/native_exif.dart';
import 'package:path/path.dart' show extension;
class FileUploader { class FileUploader {
final Dio _client; final Dio _client;
@@ -276,7 +277,7 @@ class FileUploader {
} }
/// Gets the MIME type of a UniversalFile. /// Gets the MIME type of a UniversalFile.
static String getMimeType(UniversalFile file) { static String getMimeType(UniversalFile file, {bool useFallback = true}) {
final data = file.data; final data = file.data;
if (data is XFile) { if (data is XFile) {
final mime = data.mimeType; final mime = data.mimeType;
@@ -293,6 +294,11 @@ class FileUploader {
_ => 'application/unknown', _ => 'application/unknown',
}; };
} }
if (useFallback) {
final ext = extension(data.path).substring(1);
if (ext.isNotEmpty) return 'application/$ext';
return 'application/unknown';
}
throw Exception('Cannot detect mime type for file: $filename'); throw Exception('Cannot detect mime type for file: $filename');
} else if (data is List<int> || data is Uint8List) { } else if (data is List<int> || data is Uint8List) {
return 'application/octet-stream'; return 'application/octet-stream';

View File

@@ -1,7 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:intl/intl.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

View File

@@ -20,7 +20,6 @@ import 'package:path/path.dart' show extension;
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:styled_widget/styled_widget.dart'; import 'package:styled_widget/styled_widget.dart';
import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart'; import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
import 'package:url_launcher/url_launcher_string.dart';
import 'package:island/widgets/data_saving_gate.dart'; import 'package:island/widgets/data_saving_gate.dart';
import 'package:island/widgets/content/file_info_sheet.dart'; import 'package:island/widgets/content/file_info_sheet.dart';
@@ -69,32 +68,139 @@ class CloudFileWidget extends HookConsumerWidget {
); );
if (item.mimeType == 'application/pdf') { if (item.mimeType == 'application/pdf') {
return Stack( final pdfViewer = useMemoized(() => SfPdfViewer.network(uri), [uri]);
children: [
SizedBox(height: 600, child: SfPdfViewer.network(uri)), Future<void> downloadFile() async {
Positioned( try {
top: 8, showSnackBar('Downloading file...');
left: 8,
child: Container( final client = ref.read(apiClientProvider);
padding: const EdgeInsets.all(4), final tempDir = await getTemporaryDirectory();
decoration: BoxDecoration( var extName = extension(item.name).trim();
color: Colors.black54, if (extName.isEmpty) {
borderRadius: BorderRadius.circular(8), extName = item.mimeType?.split('/').lastOrNull ?? 'pdf';
), }
child: Row( final filePath = '${tempDir.path}/${item.id}.$extName';
mainAxisSize: MainAxisSize.min,
children: [ await client.download(
Icon(Symbols.picture_as_pdf, size: 16, color: Colors.white), '/drive/files/${item.id}',
const SizedBox(width: 4), filePath,
const Text( queryParameters: {'original': true},
'PDF', );
style: TextStyle(color: Colors.white, fontSize: 12),
), await FileSaver.instance.saveFile(
], name: item.name.isEmpty ? '${item.id}.$extName' : item.name,
file: File(filePath),
);
showSnackBar('File saved to downloads');
} catch (e) {
showErrorAlert(e);
}
}
return Container(
height: 400,
decoration: BoxDecoration(
border: Border.all(
color: Theme.of(context).colorScheme.outline,
width: 1,
),
borderRadius: BorderRadius.circular(8),
),
child: Stack(
children: [
pdfViewer,
Positioned(
top: 8,
left: 8,
child: Container(
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
color: Colors.black54,
borderRadius: BorderRadius.circular(8),
),
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 7,
children: [
Icon(
Symbols.picture_as_pdf,
size: 16,
color: Colors.white,
).padding(top: 2),
Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
item.name,
style: const TextStyle(
color: Colors.white,
fontSize: 12,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
Text(
formatFileSize(item.size),
style: const TextStyle(
color: Colors.white,
fontSize: 9,
),
),
],
),
],
).padding(vertical: 4, horizontal: 8),
), ),
), ),
), Positioned(
], top: 8,
right: 8,
child: Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: Colors.black54,
borderRadius: BorderRadius.circular(8),
),
child: Row(
mainAxisSize: MainAxisSize.min,
spacing: 4,
children: [
IconButton(
icon: const Icon(
Symbols.download,
color: Colors.white,
size: 16,
),
onPressed: downloadFile,
padding: EdgeInsets.all(4),
constraints: const BoxConstraints(),
),
IconButton(
icon: const Icon(
Symbols.info,
color: Colors.white,
size: 16,
),
onPressed: () {
showModalBottomSheet(
useRootNavigator: true,
context: context,
isScrollControlled: true,
builder: (context) => FileInfoSheet(item: item),
);
},
padding: EdgeInsets.all(4),
constraints: const BoxConstraints(),
),
],
),
),
),
],
),
); );
} }
@@ -140,7 +246,7 @@ class CloudFileWidget extends HookConsumerWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Theme.of(context).colorScheme.outline, color: Theme.of(context).colorScheme.outline,
width: 1 / MediaQuery.devicePixelRatioOf(context), width: 1,
), ),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
@@ -287,45 +393,99 @@ class CloudFileWidget extends HookConsumerWidget {
child: UniversalAudio(uri: uri, filename: item.name), child: UniversalAudio(uri: uri, filename: item.name),
), ),
), ),
_ => Column( _ => Builder(
mainAxisSize: MainAxisSize.min, builder: (context) {
mainAxisAlignment: MainAxisAlignment.center, Future<void> downloadFile() async {
children: [ try {
Icon( showSnackBar('Downloading file...');
Symbols.insert_drive_file,
size: 48, final client = ref.read(apiClientProvider);
color: Theme.of(context).colorScheme.onSurfaceVariant, final tempDir = await getTemporaryDirectory();
), var extName = extension(item.name).trim();
const Gap(8), if (extName.isEmpty) {
Text( extName = item.mimeType?.split('/').lastOrNull ?? 'bin';
item.name, }
maxLines: 1, final filePath = '${tempDir.path}/${item.id}.$extName';
overflow: TextOverflow.ellipsis,
style: TextStyle( await client.download(
fontSize: 14, '/drive/files/${item.id}',
color: Theme.of(context).colorScheme.onSurfaceVariant, filePath,
), queryParameters: {'original': true},
),
Text(
formatFileSize(item.size),
style: TextStyle(
fontSize: 12,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
const Gap(8),
TextButton.icon(
onPressed: () {
launchUrlString(
'https://solian.app/files/${item.id}',
mode: LaunchMode.externalApplication,
); );
},
icon: const Icon(Symbols.launch), await FileSaver.instance.saveFile(
label: Text('openInBrowser').tr(), name: item.name.isEmpty ? '${item.id}.$extName' : item.name,
), file: File(filePath),
], );
).padding(all: 8), showSnackBar('File saved to downloads');
} catch (e) {
showErrorAlert(e);
}
}
return Container(
decoration: BoxDecoration(
border: Border.all(
color: Theme.of(context).colorScheme.outline,
width: 1,
),
borderRadius: BorderRadius.circular(8),
),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Symbols.insert_drive_file,
size: 48,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
const Gap(8),
Text(
item.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
Text(
formatFileSize(item.size),
style: TextStyle(
fontSize: 12,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
const Gap(8),
Row(
mainAxisSize: MainAxisSize.min,
children: [
TextButton.icon(
onPressed: downloadFile,
icon: const Icon(Symbols.download),
label: Text('download').tr(),
),
const Gap(8),
TextButton.icon(
onPressed: () {
showModalBottomSheet(
useRootNavigator: true,
context: context,
isScrollControlled: true,
builder: (context) => FileInfoSheet(item: item),
);
},
icon: const Icon(Symbols.info),
label: Text('info').tr(),
),
],
),
],
).padding(all: 8),
);
},
),
}; };
if (heroTag != null) { if (heroTag != null) {

View File

@@ -9,6 +9,7 @@ import 'package:island/widgets/alert.dart';
import 'package:island/widgets/content/sheet.dart'; import 'package:island/widgets/content/sheet.dart';
import 'package:material_symbols_icons/symbols.dart'; import 'package:material_symbols_icons/symbols.dart';
import 'package:styled_widget/styled_widget.dart'; import 'package:styled_widget/styled_widget.dart';
import 'package:url_launcher/url_launcher_string.dart';
class FileInfoSheet extends StatelessWidget { class FileInfoSheet extends StatelessWidget {
final SnCloudFile item; final SnCloudFile item;
@@ -140,6 +141,18 @@ class FileInfoSheet extends StatelessWidget {
}, },
), ),
), ),
ListTile(
leading: const Icon(Symbols.launch),
title: Text('openInBrowser').tr(),
subtitle: Text('https://solian.app/files/${item.id}'),
contentPadding: EdgeInsets.symmetric(horizontal: 24),
onTap: () {
launchUrlString(
'https://solian.app/files/${item.id}',
mode: LaunchMode.externalApplication,
);
},
),
if (exifData.isNotEmpty) ...[ if (exifData.isNotEmpty) ...[
const Divider(height: 1), const Divider(height: 1),
Theme( Theme(