|
|
|
@ -157,12 +157,10 @@ class ToolbarDisplayController {
|
|
|
|
// If message portion is too tall, decrease toolbar height
|
|
|
|
// If message portion is too tall, decrease toolbar height
|
|
|
|
// as necessary to prevent toolbar from acting strange
|
|
|
|
// as necessary to prevent toolbar from acting strange
|
|
|
|
// Problems may still occur if toolbar height is decreased too much
|
|
|
|
// Problems may still occur if toolbar height is decreased too much
|
|
|
|
? Flexible(
|
|
|
|
? toolbar!
|
|
|
|
child: toolbar!,
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
: overlayMessage,
|
|
|
|
: overlayMessage,
|
|
|
|
const SizedBox(height: 6),
|
|
|
|
const SizedBox(height: 6),
|
|
|
|
toolbarUp ? overlayMessage : Flexible(child: toolbar!),
|
|
|
|
toolbarUp ? overlayMessage : toolbar!,
|
|
|
|
],
|
|
|
|
],
|
|
|
|
);
|
|
|
|
);
|
|
|
|
} catch (err) {
|
|
|
|
} catch (err) {
|
|
|
|
@ -421,83 +419,85 @@ class MessageToolbarState extends State<MessageToolbar> {
|
|
|
|
|
|
|
|
|
|
|
|
@override
|
|
|
|
@override
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
Widget build(BuildContext context) {
|
|
|
|
return Material(
|
|
|
|
return Flexible(
|
|
|
|
type: MaterialType.transparency,
|
|
|
|
child: Material(
|
|
|
|
child: Container(
|
|
|
|
type: MaterialType.transparency,
|
|
|
|
padding: const EdgeInsets.all(10),
|
|
|
|
child: Container(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
padding: const EdgeInsets.all(10),
|
|
|
|
color: Theme.of(context).cardColor,
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
border: Border.all(
|
|
|
|
color: Theme.of(context).cardColor,
|
|
|
|
width: 2,
|
|
|
|
border: Border.all(
|
|
|
|
color: Theme.of(context).colorScheme.primary,
|
|
|
|
width: 2,
|
|
|
|
|
|
|
|
color: Theme.of(context).colorScheme.primary,
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
borderRadius: const BorderRadius.all(
|
|
|
|
|
|
|
|
Radius.circular(25),
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
borderRadius: const BorderRadius.all(
|
|
|
|
constraints: const BoxConstraints(
|
|
|
|
Radius.circular(25),
|
|
|
|
maxWidth: 300,
|
|
|
|
|
|
|
|
minWidth: 300,
|
|
|
|
|
|
|
|
maxHeight: 300,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
child: Column(
|
|
|
|
constraints: const BoxConstraints(
|
|
|
|
mainAxisSize: MainAxisSize.min,
|
|
|
|
maxWidth: 300,
|
|
|
|
children: [
|
|
|
|
minWidth: 300,
|
|
|
|
Flexible(
|
|
|
|
maxHeight: 300,
|
|
|
|
child: SingleChildScrollView(
|
|
|
|
),
|
|
|
|
child: AnimatedSize(
|
|
|
|
child: Column(
|
|
|
|
duration: FluffyThemes.animationDuration,
|
|
|
|
mainAxisSize: MainAxisSize.min,
|
|
|
|
child: Column(
|
|
|
|
children: [
|
|
|
|
children: [
|
|
|
|
Flexible(
|
|
|
|
Padding(
|
|
|
|
child: SingleChildScrollView(
|
|
|
|
padding: const EdgeInsets.all(8.0),
|
|
|
|
child: AnimatedSize(
|
|
|
|
child: toolbarContent ?? const SizedBox(),
|
|
|
|
duration: FluffyThemes.animationDuration,
|
|
|
|
),
|
|
|
|
child: Column(
|
|
|
|
SizedBox(height: toolbarContent == null ? 0 : 20),
|
|
|
|
children: [
|
|
|
|
],
|
|
|
|
Padding(
|
|
|
|
),
|
|
|
|
padding: const EdgeInsets.all(8.0),
|
|
|
|
|
|
|
|
child: toolbarContent ?? const SizedBox(),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
SizedBox(height: toolbarContent == null ? 0 : 20),
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
Row(
|
|
|
|
Row(
|
|
|
|
mainAxisSize: MainAxisSize.min,
|
|
|
|
mainAxisSize: MainAxisSize.min,
|
|
|
|
children: MessageMode.values.map((mode) {
|
|
|
|
children: MessageMode.values.map((mode) {
|
|
|
|
if ([
|
|
|
|
if ([
|
|
|
|
MessageMode.definition,
|
|
|
|
MessageMode.definition,
|
|
|
|
MessageMode.textToSpeech,
|
|
|
|
MessageMode.textToSpeech,
|
|
|
|
MessageMode.translation,
|
|
|
|
MessageMode.translation,
|
|
|
|
].contains(mode) &&
|
|
|
|
].contains(mode) &&
|
|
|
|
widget.pangeaMessageEvent.isAudioMessage) {
|
|
|
|
widget.pangeaMessageEvent.isAudioMessage) {
|
|
|
|
return const SizedBox.shrink();
|
|
|
|
return const SizedBox.shrink();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (mode == MessageMode.speechToText &&
|
|
|
|
if (mode == MessageMode.speechToText &&
|
|
|
|
!widget.pangeaMessageEvent.isAudioMessage) {
|
|
|
|
!widget.pangeaMessageEvent.isAudioMessage) {
|
|
|
|
return const SizedBox.shrink();
|
|
|
|
return const SizedBox.shrink();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Tooltip(
|
|
|
|
return Tooltip(
|
|
|
|
message: mode.tooltip(context),
|
|
|
|
message: mode.tooltip(context),
|
|
|
|
child: IconButton(
|
|
|
|
child: IconButton(
|
|
|
|
icon: Icon(mode.icon),
|
|
|
|
icon: Icon(mode.icon),
|
|
|
|
color: mode.iconColor(
|
|
|
|
color: mode.iconColor(
|
|
|
|
widget.pangeaMessageEvent,
|
|
|
|
widget.pangeaMessageEvent,
|
|
|
|
currentMode,
|
|
|
|
currentMode,
|
|
|
|
context,
|
|
|
|
context,
|
|
|
|
),
|
|
|
|
|
|
|
|
onPressed: () => updateMode(mode),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
}).toList() +
|
|
|
|
|
|
|
|
[
|
|
|
|
|
|
|
|
Tooltip(
|
|
|
|
|
|
|
|
message: L10n.of(context)!.more,
|
|
|
|
|
|
|
|
child: IconButton(
|
|
|
|
|
|
|
|
icon: const Icon(Icons.add_reaction_outlined),
|
|
|
|
|
|
|
|
onPressed: showMore,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
onPressed: () => updateMode(mode),
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
}).toList() +
|
|
|
|
|
|
|
|
[
|
|
|
|
|
|
|
|
Tooltip(
|
|
|
|
|
|
|
|
message: L10n.of(context)!.more,
|
|
|
|
|
|
|
|
child: IconButton(
|
|
|
|
|
|
|
|
icon: const Icon(Icons.add_reaction_outlined),
|
|
|
|
|
|
|
|
onPressed: showMore,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
],
|
|
|
|
],
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
Kelrap
1 year ago