GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-27 14:59:29 +01:00
Code Issues Projects Releases Wiki Activity

style: Nicer chips in encryption settings and icons showing device status

Browse Source
This commit is contained in:
Krille 2023-02-04 16:56:42 +01:00
parent 92fa8e1ca5
commit 4c91ea6002
2 changed files with 87 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
View File

@ -79,8 +79,8 @@ class ChatEncryptionSettingsView extends StatelessWidget {
), ),
StreamBuilder( StreamBuilder(
stream: room.onUpdate.stream, stream: room.onUpdate.stream,
builder: (context, snapshot) => builder: (context, snapshot) => FutureBuilder<
FutureBuilder<List<DeviceKeys>>( List<DeviceKeys>>(
future: room.getUserDeviceKeys(), future: room.getUserDeviceKeys(),
builder: (BuildContext context, snapshot) { builder: (BuildContext context, snapshot) {
if (snapshot.hasError) { if (snapshot.hasError) {
@ -105,35 +105,66 @@ class ChatEncryptionSettingsView extends StatelessWidget {
activeColor: deviceKeys[i].verified activeColor: deviceKeys[i].verified
? Colors.green ? Colors.green
: Colors.orange, : Colors.orange,
onChanged: (_) => controller onChanged: (_) =>
.toggleDeviceKey(deviceKeys[i]), controller.toggleDeviceKey(deviceKeys[i]),
title: Row( title: Row(
children: [ children: [
Expanded( Icon(
child: Text( deviceKeys[i].verified
? Icons.verified_outlined
: deviceKeys[i].blocked
? Icons.block_outlined
: Icons.info_outlined,
color: deviceKeys[i].verified
? Colors.green
: deviceKeys[i].blocked
? Colors.red
: Colors.orange,
size: 20,
),
Text(
deviceKeys[i].deviceId ?? deviceKeys[i].deviceId ??
L10n.of(context)!.unknownDevice, L10n.of(context)!.unknownDevice,
), ),
const SizedBox(width: 4),
Expanded(
child: Align(
alignment: Alignment.centerRight,
child: Material(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(
AppConfig.borderRadius),
side: BorderSide(
color: Theme.of(context)
.colorScheme
.primary,
), ),
Padding( ),
padding: const EdgeInsets.symmetric( color: Theme.of(context)
vertical: 4.0), .colorScheme
child: Chip( .primaryContainer,
label: Text( child: Padding(
padding: const EdgeInsets.all(4.0),
child: Text(
deviceKeys[i].userId, deviceKeys[i].userId,
style: const TextStyle( maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Theme.of(context)
.colorScheme
.primary,
fontSize: 12, fontSize: 12,
fontStyle: FontStyle.italic, fontStyle: FontStyle.italic,
), ),
), ),
), ),
), ),
),
),
], ],
), ),
subtitle: Text( subtitle: Text(
deviceKeys[i] deviceKeys[i].ed25519Key?.replaceAllMapped(
.ed25519Key
?.replaceAllMapped(
RegExp(r'.{4}'), RegExp(r'.{4}'),
(s) => '${s.group(0)} ') ?? (s) => '${s.group(0)} ') ??
L10n.of(context)! L10n.of(context)!

2
pubspec.lock
View File

@ -2277,5 +2277,5 @@ packages:
source: hosted source: hosted
version: "3.1.1" version: "3.1.1"
sdks: sdks:
dart: ">=2.19.0 <4.0.0" dart: ">=2.19.0 <3.0.0"
flutter: ">=3.4.0-17.0.pre" flutter: ">=3.4.0-17.0.pre"