mirror of
https://github.com/krille-chan/fluffychat
synced 2024-09-10 13:05:11 +00:00
Merge branch 'main' into braid/message-position-desktop
This commit is contained in:
commit
19f0d80be3
10 changed files with 33 additions and 35 deletions
2
.github/workflows/versions.env
vendored
2
.github/workflows/versions.env
vendored
|
@ -1,2 +1,2 @@
|
|||
FLUTTER_VERSION=3.16.0
|
||||
FLUTTER_VERSION=3.16.2
|
||||
JAVA_VERSION=17
|
|
@ -986,26 +986,10 @@
|
|||
"type": "text",
|
||||
"placeholders": {}
|
||||
},
|
||||
"ignore": "Ignore",
|
||||
"@ignore": {
|
||||
"type": "text",
|
||||
"placeholders": {}
|
||||
},
|
||||
"ignoredUsers": "Ignored users",
|
||||
"@ignoredUsers": {
|
||||
"type": "text",
|
||||
"placeholders": {}
|
||||
},
|
||||
"ignoreListDescription": "You can ignore users who are disturbing you. You won't be able to receive any messages or room invites from the users on your personal ignore list.",
|
||||
"@ignoreListDescription": {
|
||||
"type": "text",
|
||||
"placeholders": {}
|
||||
},
|
||||
"ignoreUsername": "Ignore username",
|
||||
"@ignoreUsername": {
|
||||
"type": "text",
|
||||
"placeholders": {}
|
||||
},
|
||||
"block": "block",
|
||||
"blockedUsers": "Blocked users",
|
||||
"blockListDescription": "You can block users who are disturbing you. You won't be able to receive any messages or room invites from the users on your personal block list.",
|
||||
"blockUsername": "Ignore username",
|
||||
"iHaveClickedOnLink": "I have clicked on the link",
|
||||
"@iHaveClickedOnLink": {
|
||||
"type": "text",
|
||||
|
|
|
@ -281,10 +281,14 @@ abstract class AppRoutes {
|
|||
),
|
||||
GoRoute(
|
||||
path: 'ignorelist',
|
||||
pageBuilder: (context, state) => defaultPageBuilder(
|
||||
pageBuilder: (context, state) {
|
||||
return defaultPageBuilder(
|
||||
context,
|
||||
const SettingsIgnoreList(),
|
||||
SettingsIgnoreList(
|
||||
initialUserId: state.extra?.toString(),
|
||||
),
|
||||
);
|
||||
},
|
||||
redirect: loggedOutRedirect,
|
||||
),
|
||||
GoRoute(
|
||||
|
|
|
@ -20,10 +20,12 @@ class SettingsIgnoreListView extends StatelessWidget {
|
|||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
leading: const Center(child: BackButton()),
|
||||
title: Text(L10n.of(context)!.ignoredUsers),
|
||||
title: Text(L10n.of(context)!.blockedUsers),
|
||||
),
|
||||
body: MaxWidthBody(
|
||||
withScrolling: false,
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
|
@ -39,9 +41,9 @@ class SettingsIgnoreListView extends StatelessWidget {
|
|||
border: const OutlineInputBorder(),
|
||||
hintText: 'bad_guy:domain.abc',
|
||||
prefixText: '@',
|
||||
labelText: L10n.of(context)!.ignoreUsername,
|
||||
labelText: L10n.of(context)!.blockUsername,
|
||||
suffixIcon: IconButton(
|
||||
tooltip: L10n.of(context)!.ignore,
|
||||
tooltip: L10n.of(context)!.block,
|
||||
icon: const Icon(Icons.done_outlined),
|
||||
onPressed: () => controller.ignoreUser(context),
|
||||
),
|
||||
|
@ -49,7 +51,7 @@ class SettingsIgnoreListView extends StatelessWidget {
|
|||
),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
L10n.of(context)!.ignoreListDescription,
|
||||
L10n.of(context)!.blockListDescription,
|
||||
style: const TextStyle(color: Colors.orange),
|
||||
),
|
||||
],
|
||||
|
|
|
@ -31,7 +31,7 @@ class SettingsSecurityView extends StatelessWidget {
|
|||
ListTile(
|
||||
leading: const Icon(Icons.block_outlined),
|
||||
trailing: const Icon(Icons.chevron_right_outlined),
|
||||
title: Text(L10n.of(context)!.ignoredUsers),
|
||||
title: Text(L10n.of(context)!.blockedUsers),
|
||||
onTap: () => context.go('/rooms/settings/security/ignorelist'),
|
||||
),
|
||||
ListTile(
|
||||
|
|
|
@ -237,7 +237,10 @@ class UserBottomSheetController extends State<UserBottomSheet> {
|
|||
widget.outerContext.go('/rooms/$roomId');
|
||||
break;
|
||||
case UserBottomSheetAction.ignore:
|
||||
context.go('/rooms/settings/security/ignorelist');
|
||||
Navigator.of(context).pop();
|
||||
final userId = user?.id ?? widget.profile?.userId;
|
||||
widget.outerContext
|
||||
.go('/rooms/settings/security/ignorelist', extra: userId);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -93,6 +93,7 @@ class UserBottomSheetView extends StatelessWidget {
|
|||
padding: const EdgeInsets.only(right: 8.0),
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.block_outlined),
|
||||
tooltip: L10n.of(context)!.block,
|
||||
onPressed: () => controller
|
||||
.participantAction(UserBottomSheetAction.ignore),
|
||||
),
|
||||
|
|
|
@ -636,10 +636,10 @@ packages:
|
|||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_olm
|
||||
sha256: ea8da4b76b5005b1df80ff5afd705ba17a9e2db5ac8848512d3455a88b56fb67
|
||||
sha256: "69aaac45d854e74d17d04dac8a0ca3f548266d271a0f0fa7600e006e81432417"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.4.0"
|
||||
version: "1.3.2"
|
||||
flutter_openssl_crypto:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
|
|
@ -42,7 +42,7 @@ dependencies:
|
|||
sdk: flutter
|
||||
flutter_map: ^4.0.0
|
||||
flutter_math_fork: ^0.7.2
|
||||
flutter_olm: ^1.4.0
|
||||
flutter_olm: 1.3.2 # Keep in sync with scripts/prepare-web.sh ! 1.4.0 does currently not build on Android
|
||||
flutter_openssl_crypto: ^0.3.0
|
||||
flutter_ringtone_player: ^4.0.0+2
|
||||
flutter_secure_storage: ^9.0.0
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
#!/bin/sh -ve
|
||||
rm -r assets/js/package
|
||||
cd assets/js/ && curl -L $(curl -s 'https://api.github.com/repos/famedly/olm/releases' | jq -r '.[0] | .assets | .[0] | .browser_download_url') > olm.zip && cd ../../
|
||||
|
||||
OLM_VERSION=$(cat pubspec.yaml | yq .dependencies.flutter_olm)
|
||||
DOWNLOAD_PATH="https://github.com/famedly/olm/releases/download/v$OLM_VERSION/olm.zip"
|
||||
|
||||
cd assets/js/ && curl -L $DOWNLOAD_PATH > olm.zip && cd ../../
|
||||
cd assets/js/ && unzip olm.zip && cd ../../
|
||||
cd assets/js/ && rm olm.zip && cd ../../
|
||||
cd assets/js/ && mv javascript package && cd ../../
|
||||
|
|
Loading…
Reference in a new issue