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

fix layout issue

Browse source
This commit is contained in:
otsmr 2025-07-18 10:53:04 +02:00
parent 991f86802f
commit a4e5c59446
2 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
lib/src/views/camera/share_image_editor_view.dart
View file

@ -471,6 +471,64 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
setState(() {});
},
child: MediaViewSizing(
bottomNavigation: ColoredBox(
color: Theme.of(context).colorScheme.surface,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SaveToGalleryButton(
getMergedImage: getMergedImage,
mediaUploadId: mediaUploadId,
videoFilePath: widget.videoFilePath,
displayButtonLabel: widget.sendTo == null,
isLoading: loadingImage,
),
if (widget.sendTo != null) const SizedBox(width: 10),
if (widget.sendTo != null)
OutlinedButton(
style: OutlinedButton.styleFrom(
iconColor: Theme.of(context).colorScheme.primary,
foregroundColor:
Theme.of(context).colorScheme.primary,
),
onPressed: pushShareImageView,
child: const FaIcon(FontAwesomeIcons.userPlus),
),
SizedBox(width: widget.sendTo == null ? 20 : 10),
FilledButton.icon(
icon: sendingOrLoadingImage
? SizedBox(
height: 12,
width: 12,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Theme.of(context)
.colorScheme
.inversePrimary,
),
)
: const FaIcon(FontAwesomeIcons.solidPaperPlane),
onPressed: () async {
if (sendingOrLoadingImage) return;
if (widget.sendTo == null) return pushShareImageView();
await sendImageToSinglePerson();
},
style: ButtonStyle(
padding: WidgetStateProperty.all<EdgeInsets>(
const EdgeInsets.symmetric(
vertical: 10, horizontal: 30),
),
),
label: Text(
(widget.sendTo == null)
? context.lang.shareImagedEditorShareWith
: getContactDisplayName(widget.sendTo!),
style: const TextStyle(fontSize: 17),
),
),
],
),
),
child: SizedBox(
height: currentImage.height / pixelRatio,
width: currentImage.width / pixelRatio,
@ -530,65 +588,6 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
),
],
),
bottomNavigationBar: ColoredBox(
color: Theme.of(context).colorScheme.surface,
child: SafeArea(
child: Padding(
padding: const EdgeInsets.only(bottom: 20),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SaveToGalleryButton(
getMergedImage: getMergedImage,
mediaUploadId: mediaUploadId,
videoFilePath: widget.videoFilePath,
displayButtonLabel: widget.sendTo == null,
isLoading: loadingImage,
),
if (widget.sendTo != null) const SizedBox(width: 10),
if (widget.sendTo != null)
OutlinedButton(
style: OutlinedButton.styleFrom(
iconColor: Theme.of(context).colorScheme.primary,
foregroundColor: Theme.of(context).colorScheme.primary,
),
onPressed: pushShareImageView,
child: const FaIcon(FontAwesomeIcons.userPlus),
),
SizedBox(width: widget.sendTo == null ? 20 : 10),
FilledButton.icon(
icon: sendingOrLoadingImage
? SizedBox(
height: 12,
width: 12,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Theme.of(context).colorScheme.inversePrimary,
),
)
: const FaIcon(FontAwesomeIcons.solidPaperPlane),
onPressed: () async {
if (sendingOrLoadingImage) return;
if (widget.sendTo == null) return pushShareImageView();
await sendImageToSinglePerson();
},
style: ButtonStyle(
padding: WidgetStateProperty.all<EdgeInsets>(
const EdgeInsets.symmetric(vertical: 10, horizontal: 30),
),
),
label: Text(
(widget.sendTo == null)
? context.lang.shareImagedEditorShareWith
: getContactDisplayName(widget.sendTo!),
style: const TextStyle(fontSize: 17),
),
),
],
),
),
),
),
);
}
}

11
lib/src/views/components/media_view_sizing.dart
View file

@ -1,11 +1,12 @@
import 'package:flutter/material.dart';
class MediaViewSizing extends StatefulWidget {
const MediaViewSizing(
{required this.child,
super.key,
this.requiredHeight,
this.bottomNavigation});
const MediaViewSizing({
required this.child,
super.key,
this.requiredHeight,
this.bottomNavigation,
});
final double? requiredHeight;
final Widget? bottomNavigation;