twonly/twonly-app
1
0
Fork 0
mirror of https://github.com/twonlyapp/twonly-app.git synced 2026-06-25 08:44:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hide link preview for qr codes in normal camera mode
Some checks are pending
Flutter analyze & test / flutter_analyze_and_test (push) Waiting to run
Details

Browse source
This commit is contained in:
otsmr 2026-06-15 23:10:39 +02:00
parent f8c5ba17c6
commit 52489a3a98
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_view.dart
View file

@ -742,9 +742,10 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
), ),
if (!mc.isSharePreviewIsShown && if (!mc.isSharePreviewIsShown &&
mc.sharedLinkForPreview != null && mc.sharedLinkForPreview != null &&
mc.sharedLinkForPreview!.shouldGeneratePreview &&
!mc.isVideoRecording) !mc.isVideoRecording)
ShowTitleText( ShowTitleText(
title: mc.sharedLinkForPreview?.host ?? '', title: mc.sharedLinkForPreview!.url.host,
desc: 'Link', desc: 'Link',
isLink: true, isLink: true,
), ),

20
lib/src/visual/views/camera/camera_preview_components/main_camera_controller.dart
View file

@ -28,6 +28,16 @@ import 'package:twonly/src/visual/views/camera/camera_preview_components/painter
import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart'; import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/dog_filter_painter.dart';
import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart'; import 'package:twonly/src/visual/views/camera/camera_preview_components/painters/face_filters/face_filter_painter.dart';
class PreviewLink {
const PreviewLink({
required this.url,
required this.shouldGeneratePreview,
});
final Uri url;
final bool shouldGeneratePreview;
}
class ScannedVerifiedContact { class ScannedVerifiedContact {
ScannedVerifiedContact({required this.contact, required this.verificationOk}); ScannedVerifiedContact({required this.contact, required this.verificationOk});
Contact contact; Contact contact;
@ -58,10 +68,12 @@ class MainCameraController {
bool isVideoRecording = false; bool isVideoRecording = false;
DateTime? timeSharedLinkWasSetWithQr; DateTime? timeSharedLinkWasSetWithQr;
Uri? sharedLinkForPreview; PreviewLink? sharedLinkForPreview;
void setSharedLinkForPreview(Uri? url) { void setSharedLinkForPreview(Uri? url, {bool generatePreview = true}) {
sharedLinkForPreview = url; sharedLinkForPreview = url == null
? null
: PreviewLink(url: url, shouldGeneratePreview: generatePreview);
setState?.call(); setState?.call();
} }
@ -450,7 +462,7 @@ class MainCameraController {
scannedUrl = link; scannedUrl = link;
if (sharedLinkForPreview == null) { if (sharedLinkForPreview == null) {
timeSharedLinkWasSetWithQr = clock.now(); timeSharedLinkWasSetWithQr = clock.now();
setSharedLinkForPreview(Uri.parse(scannedUrl!)); setSharedLinkForPreview(Uri.parse(scannedUrl!), generatePreview: false);
} }
} }
} }

8
lib/src/visual/views/camera/share_image_editor.view.dart
View file

@ -51,7 +51,7 @@ class ShareImageEditorView extends StatefulWidget {
final bool sharedFromGallery; final bool sharedFromGallery;
final MediaFileService mediaFileService; final MediaFileService mediaFileService;
final MainCameraController? mainCameraController; final MainCameraController? mainCameraController;
final Uri? previewLink; final PreviewLink? previewLink;
@override @override
State<ShareImageEditorView> createState() => _ShareImageEditorView(); State<ShareImageEditorView> createState() => _ShareImageEditorView();
} }
@ -81,9 +81,9 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
layers.add(FilterLayerData(key: GlobalKey())); layers.add(FilterLayerData(key: GlobalKey()));
} }
if (widget.previewLink != null) { if (widget.previewLink != null && widget.previewLink!.shouldGeneratePreview) {
layers.add( layers.add(
LinkPreviewLayerData(key: GlobalKey(), link: widget.previewLink!), LinkPreviewLayerData(key: GlobalKey(), link: widget.previewLink!.url),
); );
} }
@ -635,7 +635,7 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
if (widget.previewLink != null) { if (widget.previewLink != null) {
additionalData = AdditionalMessageData( additionalData = AdditionalMessageData(
type: AdditionalMessageData_Type.LINK, type: AdditionalMessageData_Type.LINK,
link: widget.previewLink.toString(), link: widget.previewLink!.url.toString(),
); );
} }
return additionalData; return additionalData;