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

some bug fixes

Browse source
This commit is contained in:
otsmr 2025-02-07 19:52:14 +01:00
parent 2a98b6647f
commit d5bfd5944a
5 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/src/components/best_friends_selector.dart
View file

@ -89,10 +89,10 @@ class UserCheckbox extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
int? flameCounter = context int flameCounter = context
.watch<MessagesChangeProvider>() .watch<MessagesChangeProvider>()
.flamesCounter[user.userId.toInt()]; .flamesCounter[user.userId.toInt()] ??
flameCounter ??= 0; 0;
return Container( return Container(
padding: padding:

2
lib/src/model/messages_model.dart
View file

@ -225,7 +225,7 @@ class DbMessages extends CvModelBase {
tableName, tableName,
where: "$columnOtherUserId = ?", where: "$columnOtherUserId = ?",
whereArgs: [otherUserId], whereArgs: [otherUserId],
orderBy: "$columnUpdatedAt DESC", orderBy: "$columnSendAt DESC",
); );
List<DbMessage> messages = await convertToDbMessage(rows); List<DbMessage> messages = await convertToDbMessage(rows);

3
lib/src/providers/api/api.dart
View file

@ -83,8 +83,7 @@ Future<Result> encryptAndSendMessage(Int64 userId, Message msg) async {
Future sendTextMessage(Int64 target, String message) async { Future sendTextMessage(Int64 target, String message) async {
MessageContent content = TextMessageContent(text: message); MessageContent content = TextMessageContent(text: message);
DateTime messageSendAt = DateTime messageSendAt = DateTime.now();
DateTime.now().subtract(Duration(days: 1, minutes: 120));
int? messageId = await DbMessages.insertMyMessage( int? messageId = await DbMessages.insertMyMessage(
target.toInt(), MessageKind.textMessage, content, messageSendAt); target.toInt(), MessageKind.textMessage, content, messageSendAt);

9
lib/src/views/camera_to_share/share_image_view.dart
View file

@ -59,8 +59,8 @@ class _ShareImageView extends State<ShareImageView> {
// Sort contacts by flameCounter and then by totalMediaCounter // Sort contacts by flameCounter and then by totalMediaCounter
users.sort((a, b) { users.sort((a, b) {
// First, compare by flameCounter // First, compare by flameCounter
int flameComparison = flameCounters[b.userId.toInt()]! int flameComparison = (flameCounters[b.userId.toInt()] ?? 0)
.compareTo(flameCounters[a.userId.toInt()]!); .compareTo((flameCounters[a.userId.toInt()] ?? 0));
if (flameComparison != 0) { if (flameComparison != 0) {
return flameComparison; // Sort by flameCounter in descending order return flameComparison; // Sort by flameCounter in descending order
} }
@ -80,7 +80,7 @@ class _ShareImageView extends State<ShareImageView> {
List<Contact> otherUsers = []; List<Contact> otherUsers = [];
for (var contact in users) { for (var contact in users) {
if (flameCounters[contact.userId.toInt()]! > 0 && if ((flameCounters[contact.userId.toInt()] ?? 0) > 0 &&
bestFriends.length < 6) { bestFriends.length < 6) {
bestFriends.add(contact); bestFriends.add(contact);
} else { } else {
@ -231,8 +231,7 @@ class UserList extends StatelessWidget {
itemCount: users.length, itemCount: users.length,
itemBuilder: (BuildContext context, int i) { itemBuilder: (BuildContext context, int i) {
Contact user = users[i]; Contact user = users[i];
int? flameCounter = flameCounters[user.userId.toInt()]; int flameCounter = flameCounters[user.userId.toInt()] ?? 0;
flameCounter ??= 0;
return ListTile( return ListTile(
title: Row(children: [ title: Row(children: [
Text(user.displayName), Text(user.displayName),

8
lib/src/views/chats/chat_list_view.dart
View file

@ -182,10 +182,10 @@ class _UserListItem extends State<UserListItem> {
.contains(token.toString()); .contains(token.toString());
} }
int? flameCounter = context int flameCounter = context
.watch<MessagesChangeProvider>() .watch<MessagesChangeProvider>()
.flamesCounter[widget.user.userId.toInt()]; .flamesCounter[widget.user.userId.toInt()] ??
flameCounter ??= 0; 0;
return UserContextMenu( return UserContextMenu(
user: widget.user, user: widget.user,