Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bruig: emoji improvements #656

Merged
merged 2 commits into from
Oct 3, 2024
Merged

bruig: emoji improvements #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed1e298
bruig: add emoji selection while typing
Sep 30, 2024
fafbf74
bruig: add select emoji panel
Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions bruig/flutterui/bruig/lib/components/chat/active_chat.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ import 'dart:async';

import 'package:bruig/components/chat/chat_side_menu.dart';
import 'package:bruig/components/manage_gc.dart';
import 'package:bruig/components/typing_emoji_panel.dart';
import 'package:bruig/models/emoji.dart';
import 'package:bruig/models/snackbar.dart';
import 'package:bruig/models/uistate.dart';
import 'package:bruig/screens/chats.dart';
import 'package:bruig/models/client.dart';
import 'package:flutter/material.dart';
import 'package:bruig/components/profile.dart';
import 'package:bruig/components/chat/messages.dart';
import 'package:provider/provider.dart';
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
import 'package:bruig/components/chat/input.dart';

Expand Down Expand Up @@ -126,8 +129,20 @@ class _ActiveChatState extends State<ActiveChat> {
Column(
children: [
Expanded(
child: Messages(
chat, client, _itemScrollController, _itemPositionsListener),
child: Stack(children: [
Messages(chat, client, _itemScrollController,
_itemPositionsListener),
Positioned(
bottom: 10,
left: 10,
right: 10,
child: Consumer<TypingEmojiSelModel>(
builder: (context, typingEmoji, child) =>
TypingEmojiPanel(
model: typingEmoji,
focusNode: inputFocusNode,
)))
]),
),
Container(
padding: isScreenSmall
Expand Down
49 changes: 49 additions & 0 deletions bruig/flutterui/bruig/lib/components/chat/input.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import 'dart:math';

import 'package:bruig/components/attach_file.dart';
import 'package:bruig/models/emoji.dart';
import 'package:bruig/models/uistate.dart';
import 'package:bruig/screens/chats.dart';
import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
import 'package:flutter/material.dart';
import 'package:bruig/components/chat/types.dart';
import 'package:bruig/models/client.dart';
Expand Down Expand Up @@ -92,6 +94,7 @@ class _ChatInputState extends State<ChatInput> {
controller.text = widget.chat.workingMsg;
widget.inputFocusNode.noModEnterKeyHandler = sendMsg;
widget.inputFocusNode.pasteEventHandler = pasteEvent;
widget.inputFocusNode.addEmojiHandler = addEmoji;
}

@override
Expand All @@ -107,12 +110,15 @@ class _ChatInputState extends State<ChatInput> {
}
oldWidget.inputFocusNode.pasteEventHandler = null;
widget.inputFocusNode.pasteEventHandler = pasteEvent;
oldWidget.inputFocusNode.addEmojiHandler = null;
widget.inputFocusNode.addEmojiHandler = addEmoji;
}

@override
void dispose() {
widget.inputFocusNode.noModEnterKeyHandler = null;
widget.inputFocusNode.pasteEventHandler = null;
widget.inputFocusNode.addEmojiHandler = null;
super.dispose();
}

Expand Down Expand Up @@ -145,6 +151,34 @@ class _ChatInputState extends State<ChatInput> {
embeds = [];
});
}

Provider.of<TypingEmojiSelModel>(context, listen: false).clearSelection();
}

void addEmoji(Emoji? e) {
if (e != null) {
// Selected emoji from panel eidget.
var oldPos = controller.selection.start;
var newText = controller.selection.textBefore(controller.text) +
e.emoji +
controller.selection.textAfter(controller.text);
widget.chat.workingMsg = newText;
controller.value = TextEditingValue(
text: newText,
selection: TextSelection.collapsed(offset: oldPos + e.emoji.length));
return;
}

// Selected emoji from typing panel.
var typingEmoji = Provider.of<TypingEmojiSelModel>(context, listen: false);
var newText = typingEmoji.replaceTypedEmojiCode(controller);
if (newText == "") return;

var oldPos =
controller.selection.start - typingEmoji.lastEmojiCode.length + 1;
widget.chat.workingMsg = newText;
controller.value = TextEditingValue(
text: newText, selection: TextSelection.collapsed(offset: oldPos));
}

void attachFile() {
Expand Down Expand Up @@ -185,10 +219,25 @@ class _ChatInputState extends State<ChatInput> {
onPressed: attachFile,
icon: const Icon(Icons.add_outlined)),
const SizedBox(width: 5),
IconButton(
padding: const EdgeInsets.all(0),
iconSize: 25,
onPressed: () {
var emojiModel =
TypingEmojiSelModel.of(context, listen: false);
emojiModel.showAddEmojiPanel.value =
!emojiModel.showAddEmojiPanel.value;
},
icon: const Icon(Icons.emoji_emotions_outlined)),
const SizedBox(width: 5),
Expanded(
child: TextField(
onChanged: (value) {
widget.chat.workingMsg = value;

// Check if user is typing an emoji code (:foo:).
TypingEmojiSelModel.of(context, listen: false)
.maybeSelectEmojis(controller);
},
autofocus: isScreenSmall ? false : true,
focusNode: widget.inputFocusNode.inputFocusNode,
Expand Down
113 changes: 113 additions & 0 deletions bruig/flutterui/bruig/lib/components/typing_emoji_panel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
import 'package:bruig/components/containers.dart';
import 'package:bruig/components/empty_widget.dart';
import 'package:bruig/components/text.dart';
import 'package:bruig/models/emoji.dart';
import 'package:bruig/screens/chats.dart';
import 'package:bruig/theme_manager.dart';
import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
import 'package:flutter/material.dart';

class TypingEmojiPanel extends StatefulWidget {
final TypingEmojiSelModel model;
final CustomInputFocusNode focusNode;
const TypingEmojiPanel(
{required this.model, required this.focusNode, super.key});

@override
State<TypingEmojiPanel> createState() => _TypingEmojiPanelState();
}

class _TypingEmojiPanelState extends State<TypingEmojiPanel> {
TypingEmojiSelModel get model => widget.model;
List<Emoji> emojis = [];
int selected = -1;
ScrollController scroll = ScrollController();

void updated() {
setState(() {
emojis = model.selectionList.toList();
});
}

void updatedSelected() {
setState(() {
selected = model.selected.value;
var offset = selected.toDouble() * 48; // 48 == height of tile
if (scroll.hasClients && offset >= 0) {
scroll.animateTo(offset,
duration: const Duration(milliseconds: 500),
curve: Easing.standard);
}
});
}

void updatedShowAddPanel() {
setState(() {});
}

void emojiSelectedOnEmojiPicker(category, emoji) {
if (widget.focusNode.addEmojiHandler != null) {
widget.focusNode.addEmojiHandler!(emoji);
}
}

@override
void initState() {
super.initState();
model.addListener(updated);
model.selected.addListener(updatedSelected);
model.showAddEmojiPanel.addListener(updatedShowAddPanel);
}

@override
void dispose() {
model.removeListener(updated);
model.selected.removeListener(updatedSelected);
model.showAddEmojiPanel.removeListener(updatedShowAddPanel);
super.dispose();
}

@override
Widget build(BuildContext context) {
var theme = ThemeNotifier.of(context);

if (model.showAddEmojiPanel.value) {
return EmojiPicker(
onEmojiSelected: emojiSelectedOnEmojiPicker,
config: theme.emojiPickerConfig,
);
}

if (!model.isTypingEmoji) {
return const Empty();
}

return Box(
color: SurfaceColor.primaryContainer,
child: Container(
constraints: const BoxConstraints(maxHeight: 200),
child: Scrollbar(
thumbVisibility: true,
controller: scroll,
child: ListView.builder(
shrinkWrap: true,
itemCount: emojis.length,
controller: scroll,
itemBuilder: (BuildContext context, int index) {
var e = emojis[index];
return ListTile(
onTap: () {},
// hoverColor: Colors.amber,
selectedTileColor: Colors.transparent,
selectedColor:
theme.extraColors.selectedItemOnSurfaceListView,
selected: index == selected,
leading: Txt.H(e.emoji),
title: Txt.M(e.name),
);
},
),
)),
);
}
}
2 changes: 2 additions & 0 deletions bruig/flutterui/bruig/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'dart:math';
import 'dart:developer' as developer;

import 'package:bruig/components/route_error.dart';
import 'package:bruig/models/emoji.dart';
import 'package:bruig/models/menus.dart';
import 'package:bruig/models/payments.dart';
import 'package:bruig/models/resources.dart';
Expand Down Expand Up @@ -159,6 +160,7 @@ Future<void> runMainApp(Config cfg) async {
ChangeNotifierProvider(create: (c) => SnackBarModel()),
ChangeNotifierProvider(create: (c) => PaymentsModel()),
ChangeNotifierProvider(create: (c) => WalletModel()),
ChangeNotifierProvider(create: (c) => TypingEmojiSelModel()),
],
child: App(cfg, globalLogModel, globalShutdownModel),
));
Expand Down
Loading
Loading