inex
/
FurryChat
1
0
Fork 0
Code Issues Releases 2 Activity

fix: Desktop file picker

This commit is contained in:
Christian Pauly 2020-10-04 17:01:54 +02:00
parent 5409fe864b
commit 662e2f10a0
12 changed files with 188 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
lib/views/chat.dart
View File

@ -3,7 +3,8 @@ import 'dart:io';
import 'dart:math';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:file_picker_platform_interface/file_picker_platform_interface.dart';
import 'package:file_picker_cross/file_picker_cross.dart';
import 'package:fluffychat/components/adaptive_page_layout.dart';
import 'package:fluffychat/components/avatar.dart';
import 'package:fluffychat/components/chat_settings_popup_menu.dart';
@ -17,6 +18,7 @@ import 'package:fluffychat/components/reply_content.dart';
import 'package:fluffychat/config/app_emojis.dart';
import 'package:fluffychat/utils/app_route.dart';
import 'package:fluffychat/utils/matrix_locals.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/utils/room_status_extension.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
@ -24,7 +26,6 @@ import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:image_picker/image_picker.dart';
import 'package:memoryfilepicker/memoryfilepicker.dart';
import 'package:pedantic/pedantic.dart';
import 'package:scroll_to_index/scroll_to_index.dart';
@ -211,38 +212,66 @@ class _ChatState extends State<_Chat> {
}
void sendFileAction(BuildContext context) async {
var file = await MemoryFilePicker.getFile();
if (file == null) return;
final result =
await FilePickerCross.importFromStorage(type: FileTypeCross.any);
if (result == null) return;
await showDialog(
context: context,
builder: (context) => SendFileDialog(
file:
MatrixFile(bytes: file.bytes, name: file.path).detectFileType,
room: room,
));
context: context,
builder: (context) => SendFileDialog(
file: MatrixFile(
bytes: result.toUint8List(),
name: result.fileName,
).detectFileType,
room: room,
),
);
}
void sendImageAction(BuildContext context) async {
var file = await MemoryFilePicker.getFile(type: FileType.image);
if (file == null) return;
final bytes = await file.bytes;
MatrixFile file;
if (PlatformInfos.isMobile) {
final result = await ImagePicker().getImage(
source: ImageSource.gallery,
imageQuality: 50,
maxWidth: 1600,
maxHeight: 1600);
if (result == null) return;
file = MatrixFile(
bytes: await result.readAsBytes(),
name: result.path,
);
} else {
final result =
await FilePickerCross.importFromStorage(type: FileTypeCross.image);
if (result == null) return;
file = MatrixFile(
bytes: result.toUint8List(),
name: result.fileName,
);
}
await showDialog(
context: context,
builder: (context) => SendFileDialog(
file: MatrixImageFile(bytes: bytes, name: file.path),
room: room,
));
context: context,
builder: (context) => SendFileDialog(
file: file,
room: room,
),
);
}
void openCameraAction(BuildContext context) async {
var file = await MemoryFilePicker.getImage(source: ImageSource.camera);
var file = await ImagePicker().getImage(source: ImageSource.camera);
if (file == null) return;
final bytes = await file.readAsBytes();
await showDialog(
context: context,
builder: (context) => SendFileDialog(
file: MatrixImageFile(bytes: file.bytes, name: file.path),
room: room,
));
context: context,
builder: (context) => SendFileDialog(
file: MatrixImageFile(
bytes: bytes,
name: file.path,
),
room: room,
),
);
}
void voiceMessageAction(BuildContext context) async {
@ -888,7 +917,7 @@ class _ChatState extends State<_Chat> {
contentPadding: EdgeInsets.all(0),
),
),
if (!kIsWeb)
if (PlatformInfos.isMobile)
PopupMenuItem<String>(
value: 'camera',
child: ListTile(
@ -902,7 +931,7 @@ class _ChatState extends State<_Chat> {
contentPadding: EdgeInsets.all(0),
),
),
if (!kIsWeb)
if (PlatformInfos.isMobile)
PopupMenuItem<String>(
value: 'voice',
child: ListTile(
@ -972,7 +1001,7 @@ class _ChatState extends State<_Chat> {
),
),
),
if (!kIsWeb && inputText.isEmpty)
if (PlatformInfos.isMobile && inputText.isEmpty)
Container(
height: 56,
alignment: Alignment.center,

40
lib/views/chat_details.dart
View File

@ -1,6 +1,8 @@
import 'package:bot_toast/bot_toast.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:famedlysdk/matrix_api.dart';
import 'package:file_picker_cross/file_picker_cross.dart';
import 'package:fluffychat/components/adaptive_page_layout.dart';
import 'package:fluffychat/components/chat_settings_popup_menu.dart';
import 'package:fluffychat/components/content_banner.dart';
@ -8,6 +10,7 @@ import 'package:fluffychat/components/dialogs/simple_dialogs.dart';
import 'package:fluffychat/components/list_items/participant_list_item.dart';
import 'package:fluffychat/utils/app_route.dart';
import 'package:fluffychat/utils/matrix_locals.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/views/chat_list.dart';
import 'package:fluffychat/views/invitation_selection.dart';
import 'package:flutter/foundation.dart';
@ -16,7 +19,6 @@ import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:image_picker/image_picker.dart';
import 'package:matrix_link_text/link_text.dart';
import 'package:memoryfilepicker/memoryfilepicker.dart';
import './settings_emotes.dart';
import './settings_multiple_emotes.dart';
@ -104,19 +106,31 @@ class _ChatDetailsState extends State<ChatDetails> {
}
void setAvatarAction(BuildContext context) async {
final tempFile = await MemoryFilePicker.getImage(
source: ImageSource.gallery,
imageQuality: 50,
maxWidth: 1600,
maxHeight: 1600);
if (tempFile == null) return;
MatrixFile file;
if (PlatformInfos.isMobile) {
final result = await ImagePicker().getImage(
source: ImageSource.gallery,
imageQuality: 50,
maxWidth: 1600,
maxHeight: 1600);
if (result == null) return;
file = MatrixFile(
bytes: await result.readAsBytes(),
name: result.path,
);
} else {
final result = await FilePickerCross.importFromStorage(
type: FileTypeCross.image,
);
if (result == null) return;
file = MatrixFile(
bytes: result.toUint8List(),
name: result.fileName,
);
}
final success = await SimpleDialogs(context).tryRequestWithLoadingDialog(
widget.room.setAvatar(
MatrixFile(
bytes: tempFile.bytes,
name: tempFile.path,
),
),
widget.room.setAvatar(file),
);
if (success != false) {
BotToast.showText(text: L10n.of(context).avatarHasBeenChanged);

38
lib/views/settings.dart
View File

@ -2,8 +2,11 @@ import 'dart:io';
import 'package:bot_toast/bot_toast.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:file_picker_cross/file_picker_cross.dart';
import 'package:fluffychat/components/settings_themes.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/utils/sentry_controller.dart';
import 'package:fluffychat/views/settings_devices.dart';
import 'package:fluffychat/views/settings_ignore_list.dart';
@ -11,7 +14,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:image_picker/image_picker.dart';
import 'package:memoryfilepicker/memoryfilepicker.dart';
import 'package:url_launcher/url_launcher.dart';
import '../components/adaptive_page_layout.dart';
@ -138,20 +140,30 @@ class _SettingsState extends State<Settings> {
}
void setAvatarAction(BuildContext context) async {
final tempFile = await MemoryFilePicker.getImage(
source: ImageSource.gallery,
imageQuality: 50,
maxWidth: 1600,
maxHeight: 1600);
if (tempFile == null) return;
MatrixFile file;
if (PlatformInfos.isMobile) {
final result = await ImagePicker().getImage(
source: ImageSource.gallery,
imageQuality: 50,
maxWidth: 1600,
maxHeight: 1600);
if (result == null) return;
file = MatrixFile(
bytes: await result.readAsBytes(),
name: result.path,
);
} else {
final result =
await FilePickerCross.importFromStorage(type: FileTypeCross.image);
if (result == null) return;
file = MatrixFile(
bytes: result.toUint8List(),
name: result.fileName,
);
}
final matrix = Matrix.of(context);
final success = await SimpleDialogs(context).tryRequestWithLoadingDialog(
matrix.client.setAvatar(
MatrixFile(
bytes: tempFile.bytes,
name: tempFile.path,
),
),
matrix.client.setAvatar(file),
);
if (success != false) {
setState(() {

33
lib/views/settings_emotes.dart
View File

@ -1,12 +1,13 @@
import 'package:bot_toast/bot_toast.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:file_picker_cross/file_picker_cross.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:image_picker/image_picker.dart';
import 'package:memoryfilepicker/memoryfilepicker.dart';
import '../components/adaptive_page_layout.dart';
import '../components/dialogs/simple_dialogs.dart';
@ -458,16 +459,30 @@ class _EmoteImagePickerState extends State<_EmoteImagePicker> {
BotToast.showText(text: L10n.of(context).notSupportedInWeb);
return;
}
var file = await MemoryFilePicker.getImage(
source: ImageSource.gallery,
imageQuality: 50,
maxWidth: 128,
maxHeight: 128);
if (file == null) return;
final matrixFile = MatrixFile(bytes: file.bytes, name: file.path);
MatrixFile file;
if (PlatformInfos.isMobile) {
final result = await ImagePicker().getImage(
source: ImageSource.gallery,
imageQuality: 50,
maxWidth: 1600,
maxHeight: 1600);
if (result == null) return;
file = MatrixFile(
bytes: await result.readAsBytes(),
name: result.path,
);
} else {
final result = await FilePickerCross.importFromStorage(
type: FileTypeCross.image);
if (result == null) return;
file = MatrixFile(
bytes: result.toUint8List(),
name: result.fileName,
);
}
final uploadResp =
await SimpleDialogs(context).tryRequestWithLoadingDialog(
Matrix.of(context).client.upload(matrixFile.bytes, matrixFile.name),
Matrix.of(context).client.upload(file.bytes, file.name),
);
setState(() {
widget.controller.text = uploadResp;

23
lib/views/sign_up.dart
View File

@ -1,6 +1,8 @@
import 'dart:math';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:file_picker_cross/file_picker_cross.dart';
import 'package:fluffychat/components/matrix.dart';
import 'package:fluffychat/utils/app_route.dart';
import 'package:fluffychat/views/login.dart';
@ -8,8 +10,6 @@ import 'package:fluffychat/views/sign_up_password.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:image_picker/image_picker.dart';
import 'package:memoryfilepicker/memoryfilepicker.dart';
class SignUp extends StatefulWidget {
@override
@ -20,16 +20,19 @@ class _SignUpState extends State<SignUp> {
final TextEditingController usernameController = TextEditingController();
String usernameError;
bool loading = false;
MemoryFile avatar;
MatrixFile avatar;
void setAvatarAction() async {
var file = await MemoryFilePicker.getImage(
source: ImageSource.gallery,
maxHeight: 512,
maxWidth: 512,
imageQuality: 50,
);
if (file != null) setState(() => avatar = file);
var file =
await FilePickerCross.importFromStorage(type: FileTypeCross.image);
if (file != null) {
setState(
() => avatar = MatrixFile(
bytes: file.toUint8List(),
name: file.fileName,
),
);
}
}
void signUpAction(BuildContext context) async {

11
lib/views/sign_up_password.dart
View File

@ -2,17 +2,17 @@ import 'dart:math';
import 'package:bot_toast/bot_toast.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/components/matrix.dart';
import 'package:fluffychat/utils/app_route.dart';
import 'package:fluffychat/views/auth_web_view.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:memoryfilepicker/memoryfilepicker.dart';
import 'chat_list.dart';
class SignUpPassword extends StatefulWidget {
final MemoryFile avatar;
final MatrixFile avatar;
final String username;
final String displayname;
const SignUpPassword(this.username, {this.avatar, this.displayname});
@ -99,12 +99,7 @@ class _SignUpPasswordState extends State<SignUpPassword> {
}
if (widget.avatar != null) {
try {
await matrix.client.setAvatar(
MatrixFile(
bytes: widget.avatar.bytes,
name: widget.avatar.path,
),
);
await matrix.client.setAvatar(widget.avatar);
} catch (exception) {
BotToast.showText(text: L10n.of(context).couldNotSetAvatar);
}

4
linux/flutter/generated_plugin_registrant.cc
View File

@ -4,9 +4,13 @@
#include "generated_plugin_registrant.h"
#include <file_chooser/file_chooser_plugin.h>
#include <url_launcher_linux/url_launcher_plugin.h>
void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) file_chooser_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FileChooserPlugin");
file_chooser_plugin_register_with_registrar(file_chooser_registrar);
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);

1
linux/flutter/generated_plugins.cmake
View File

@ -3,6 +3,7 @@
#
list(APPEND FLUTTER_PLUGIN_LIST
file_chooser
url_launcher_linux
)

37
pubspec.lock
View File

@ -162,6 +162,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.6"
disk_space:
dependency: transitive
description:
name: disk_space
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.3"
encrypt:
dependency: transitive
description:
@ -199,6 +206,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "5.2.1"
file_chooser:
dependency: transitive
description:
name: file_chooser
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.5"
file_picker:
dependency: transitive
description:
@ -206,6 +220,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.13.3"
file_picker_cross:
dependency: "direct main"
description:
name: file_picker_cross
url: "https://pub.dartlang.org"
source: hosted
version: "4.2.2"
file_picker_platform_interface:
dependency: transitive
description:
@ -409,7 +430,7 @@ packages:
source: hosted
version: "2.1.18"
image_picker:
dependency: transitive
dependency: "direct main"
description:
name: image_picker
url: "https://pub.dartlang.org"
@ -499,13 +520,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.5"
memoryfilepicker:
dependency: "direct main"
description:
name: memoryfilepicker
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
meta:
dependency: transitive
description:
@ -592,6 +606,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.3"
package_info:
dependency: transitive
description:
name: package_info
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.3"
password_hash:
dependency: transitive
description:

3
pubspec.yaml
View File

@ -30,7 +30,8 @@ dependencies:
ref: 84cc925b08e97098d00c54fff9c1244f91055de3
localstorage: ^3.0.1+4
memoryfilepicker: ^0.1.3
file_picker_cross: ^4.2.2
image_picker: ^0.6.7+11
url_launcher: ^5.4.1
url_launcher_web: ^0.1.0
cached_network_image: ^2.3.2+1

3
windows/flutter/generated_plugin_registrant.cc
View File

@ -4,9 +4,12 @@
#include "generated_plugin_registrant.h"
#include <file_chooser/file_chooser_plugin.h>
#include <url_launcher_windows/url_launcher_plugin.h>
void RegisterPlugins(flutter::PluginRegistry* registry) {
FileChooserPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FileChooserPlugin"));
UrlLauncherPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("UrlLauncherPlugin"));
}

1
windows/flutter/generated_plugins.cmake
View File

@ -3,6 +3,7 @@
#
list(APPEND FLUTTER_PLUGIN_LIST
file_chooser
url_launcher_windows
)