Minor fixes
This commit is contained in:
parent
7e6212ff8a
commit
de29800f29
19 changed files with 156 additions and 104 deletions
|
|
@ -22,16 +22,17 @@ class ChatListItem extends StatelessWidget {
|
|||
title: Text(room.displayname),
|
||||
subtitle: MessageContent(room.lastEvent, textOnly: true),
|
||||
onTap: () {
|
||||
if (activeChat)
|
||||
if (activeChat) {
|
||||
Navigator.pushReplacement(
|
||||
context,
|
||||
AppRoute.defaultRoute(context, Chat(room.id)),
|
||||
);
|
||||
else
|
||||
} else {
|
||||
Navigator.push(
|
||||
context,
|
||||
AppRoute.defaultRoute(context, Chat(room.id)),
|
||||
);
|
||||
}
|
||||
},
|
||||
onLongPress: () {},
|
||||
trailing: Container(
|
||||
|
|
|
|||
|
|
@ -31,13 +31,14 @@ class Message extends StatelessWidget {
|
|||
color = event.status == -1 ? Colors.redAccent : Color(0xFF5625BA);
|
||||
}
|
||||
List<PopupMenuEntry<String>> popupMenuList = [];
|
||||
if (event.canRedact && !event.redacted && event.status > 1)
|
||||
if (event.canRedact && !event.redacted && event.status > 1) {
|
||||
popupMenuList.add(
|
||||
const PopupMenuItem<String>(
|
||||
value: "remove",
|
||||
child: Text('Remove message'),
|
||||
),
|
||||
);
|
||||
}
|
||||
if (ownMessage && event.status == -1) {
|
||||
popupMenuList.add(
|
||||
const PopupMenuItem<String>(
|
||||
|
|
@ -59,16 +60,16 @@ class Message extends StatelessWidget {
|
|||
onSelected: (String choice) async {
|
||||
switch (choice) {
|
||||
case "remove":
|
||||
showDialog(
|
||||
await showDialog(
|
||||
context: context,
|
||||
builder: (BuildContext context) => RedactMessageDialog(event),
|
||||
);
|
||||
break;
|
||||
case "resend":
|
||||
event.sendAgain();
|
||||
await event.sendAgain();
|
||||
break;
|
||||
case "delete":
|
||||
event.remove();
|
||||
await event.remove();
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
|
@ -113,10 +114,11 @@ class Message extends StatelessWidget {
|
|||
),
|
||||
),
|
||||
];
|
||||
if (ownMessage)
|
||||
if (ownMessage) {
|
||||
rowChildren.add(Avatar(event.sender.avatarUrl));
|
||||
else
|
||||
} else {
|
||||
rowChildren.insert(0, Avatar(event.sender.avatarUrl));
|
||||
}
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: Row(
|
||||
|
|
|
|||
|
|
@ -15,23 +15,23 @@ class ParticipantListItem extends StatelessWidget {
|
|||
final MatrixState matrix = Matrix.of(context);
|
||||
switch (action) {
|
||||
case "ban":
|
||||
matrix.tryRequestWithLoadingDialog(user.ban());
|
||||
await matrix.tryRequestWithLoadingDialog(user.ban());
|
||||
break;
|
||||
case "unban":
|
||||
matrix.tryRequestWithLoadingDialog(user.unban());
|
||||
await matrix.tryRequestWithLoadingDialog(user.unban());
|
||||
break;
|
||||
case "kick":
|
||||
matrix.tryRequestWithLoadingDialog(user.kick());
|
||||
await matrix.tryRequestWithLoadingDialog(user.kick());
|
||||
break;
|
||||
case "admin":
|
||||
matrix.tryRequestWithLoadingDialog(user.setPower(100));
|
||||
await matrix.tryRequestWithLoadingDialog(user.setPower(100));
|
||||
break;
|
||||
case "user":
|
||||
matrix.tryRequestWithLoadingDialog(user.setPower(100));
|
||||
await matrix.tryRequestWithLoadingDialog(user.setPower(100));
|
||||
break;
|
||||
case "message":
|
||||
final String roomId = await user.startDirectChat();
|
||||
Navigator.of(context).pushAndRemoveUntil(
|
||||
await Navigator.of(context).pushAndRemoveUntil(
|
||||
AppRoute.defaultRoute(
|
||||
context,
|
||||
Chat(roomId),
|
||||
|
|
@ -55,30 +55,35 @@ class ParticipantListItem extends StatelessWidget {
|
|||
List<PopupMenuEntry<String>> items = <PopupMenuEntry<String>>[];
|
||||
if (user.canChangePowerLevel &&
|
||||
user.room.ownPowerLevel == 100 &&
|
||||
user.powerLevel != 100)
|
||||
user.powerLevel != 100) {
|
||||
items.add(
|
||||
PopupMenuItem(child: Text("Make an admin"), value: "admin"),
|
||||
);
|
||||
if (user.canChangePowerLevel && user.powerLevel != 0)
|
||||
}
|
||||
if (user.canChangePowerLevel && user.powerLevel != 0) {
|
||||
items.add(
|
||||
PopupMenuItem(child: Text("Revoke all permissions"), value: "user"),
|
||||
);
|
||||
if (user.canKick)
|
||||
}
|
||||
if (user.canKick) {
|
||||
items.add(
|
||||
PopupMenuItem(child: Text("Kick from group"), value: "kick"),
|
||||
);
|
||||
if (user.canBan && user.membership != Membership.ban)
|
||||
}
|
||||
if (user.canBan && user.membership != Membership.ban) {
|
||||
items.add(
|
||||
PopupMenuItem(child: Text("Ban from group"), value: "ban"),
|
||||
);
|
||||
else if (user.canBan && user.membership == Membership.ban)
|
||||
} else if (user.canBan && user.membership == Membership.ban) {
|
||||
items.add(
|
||||
PopupMenuItem(child: Text("Remove exile"), value: "unban"),
|
||||
);
|
||||
if (user.id != Matrix.of(context).client.userID)
|
||||
}
|
||||
if (user.id != Matrix.of(context).client.userID) {
|
||||
items.add(
|
||||
PopupMenuItem(child: Text("Send a message"), value: "message"),
|
||||
);
|
||||
}
|
||||
return PopupMenuButton(
|
||||
onSelected: (action) => participantAction(context, action),
|
||||
itemBuilder: (c) => items,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue