mirror of
https://github.com/krille-chan/fluffychat
synced 2024-10-05 13:52:46 +00:00
refactor: Update to Matrix Dart SDK 0.29.9
This commit is contained in:
parent
bfd8d7f99c
commit
3d35a6adcf
10 changed files with 62 additions and 17 deletions
|
@ -2659,5 +2659,7 @@
|
||||||
"@thereAreCountUsersBlocked": {
|
"@thereAreCountUsersBlocked": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"count": {}
|
"count": {}
|
||||||
}
|
},
|
||||||
|
"restricted": "Restricted",
|
||||||
|
"knockRestricted": "Knock restricted"
|
||||||
}
|
}
|
||||||
|
|
3
devtools_options.yaml
Normal file
3
devtools_options.yaml
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
description: This file stores settings for Dart & Flutter DevTools.
|
||||||
|
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
|
||||||
|
extensions:
|
|
@ -197,6 +197,7 @@
|
||||||
9705A1C41CF9048500538489 /* Embed Frameworks */,
|
9705A1C41CF9048500538489 /* Embed Frameworks */,
|
||||||
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
|
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
|
||||||
F9C8EE392B9AB471149C306E /* [CP] Embed Pods Frameworks */,
|
F9C8EE392B9AB471149C306E /* [CP] Embed Pods Frameworks */,
|
||||||
|
064CBD7CE0D4CD6850C6880A /* [CP] Copy Pods Resources */,
|
||||||
);
|
);
|
||||||
buildRules = (
|
buildRules = (
|
||||||
);
|
);
|
||||||
|
@ -288,6 +289,23 @@
|
||||||
/* End PBXResourcesBuildPhase section */
|
/* End PBXResourcesBuildPhase section */
|
||||||
|
|
||||||
/* Begin PBXShellScriptBuildPhase section */
|
/* Begin PBXShellScriptBuildPhase section */
|
||||||
|
064CBD7CE0D4CD6850C6880A /* [CP] Copy Pods Resources */ = {
|
||||||
|
isa = PBXShellScriptBuildPhase;
|
||||||
|
buildActionMask = 2147483647;
|
||||||
|
files = (
|
||||||
|
);
|
||||||
|
inputFileListPaths = (
|
||||||
|
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
|
||||||
|
);
|
||||||
|
name = "[CP] Copy Pods Resources";
|
||||||
|
outputFileListPaths = (
|
||||||
|
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
|
||||||
|
);
|
||||||
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
shellPath = /bin/sh;
|
||||||
|
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
|
||||||
|
showEnvVarsInLog = 0;
|
||||||
|
};
|
||||||
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
|
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
|
||||||
isa = PBXShellScriptBuildPhase;
|
isa = PBXShellScriptBuildPhase;
|
||||||
alwaysOutOfDate = 1;
|
alwaysOutOfDate = 1;
|
||||||
|
|
|
@ -266,6 +266,10 @@ extension JoinRulesDisplayString on JoinRules {
|
||||||
return l10n.usersMustKnock;
|
return l10n.usersMustKnock;
|
||||||
case JoinRules.private:
|
case JoinRules.private:
|
||||||
return l10n.noOneCanJoin;
|
return l10n.noOneCanJoin;
|
||||||
|
case JoinRules.restricted:
|
||||||
|
return l10n.restricted;
|
||||||
|
case JoinRules.knockRestricted:
|
||||||
|
return l10n.knockRestricted;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,8 +62,14 @@ class SettingsIgnoreListView extends StatelessWidget {
|
||||||
),
|
),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: StreamBuilder<Object>(
|
child: StreamBuilder<Object>(
|
||||||
stream: client.onAccountData.stream
|
stream: client.onSync.stream.where(
|
||||||
.where((a) => a.type == 'm.ignored_user_list'),
|
(syncUpdate) =>
|
||||||
|
syncUpdate.accountData?.any(
|
||||||
|
(accountData) =>
|
||||||
|
accountData.type == 'm.ignored_user_list',
|
||||||
|
) ??
|
||||||
|
false,
|
||||||
|
),
|
||||||
builder: (context, snapshot) {
|
builder: (context, snapshot) {
|
||||||
return ListView.builder(
|
return ListView.builder(
|
||||||
itemCount: client.ignoredUsers.length,
|
itemCount: client.ignoredUsers.length,
|
||||||
|
|
|
@ -22,11 +22,13 @@ class SettingsNotificationsView extends StatelessWidget {
|
||||||
),
|
),
|
||||||
body: MaxWidthBody(
|
body: MaxWidthBody(
|
||||||
child: StreamBuilder(
|
child: StreamBuilder(
|
||||||
stream: Matrix.of(context)
|
stream: Matrix.of(context).client.onSync.stream.where(
|
||||||
.client
|
(syncUpdate) =>
|
||||||
.onAccountData
|
syncUpdate.accountData?.any(
|
||||||
.stream
|
(accountData) => accountData.type == 'm.push_rules',
|
||||||
.where((event) => event.type == 'm.push_rules'),
|
) ??
|
||||||
|
false,
|
||||||
|
),
|
||||||
builder: (BuildContext context, _) {
|
builder: (BuildContext context, _) {
|
||||||
return Column(
|
return Column(
|
||||||
children: [
|
children: [
|
||||||
|
|
|
@ -205,10 +205,14 @@ class SettingsStyleView extends StatelessWidget {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
StreamBuilder(
|
StreamBuilder(
|
||||||
stream: client.onAccountData.stream.where(
|
stream: client.onSync.stream.where(
|
||||||
(data) =>
|
(syncUpdate) =>
|
||||||
data.type ==
|
syncUpdate.accountData?.any(
|
||||||
ApplicationAccountConfigExtension.accountDataKey,
|
(accountData) =>
|
||||||
|
accountData.type ==
|
||||||
|
ApplicationAccountConfigExtension.accountDataKey,
|
||||||
|
) ??
|
||||||
|
false,
|
||||||
),
|
),
|
||||||
builder: (context, snapshot) {
|
builder: (context, snapshot) {
|
||||||
final accountConfig = client.applicationAccountConfig;
|
final accountConfig = client.applicationAccountConfig;
|
||||||
|
|
|
@ -37,9 +37,15 @@ class ChatSettingsPopupMenuState extends State<ChatSettingsPopupMenu> {
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
notificationChangeSub ??= Matrix.of(context)
|
notificationChangeSub ??= Matrix.of(context)
|
||||||
.client
|
.client
|
||||||
.onAccountData
|
.onSync
|
||||||
.stream
|
.stream
|
||||||
.where((u) => u.type == 'm.push_rules')
|
.where(
|
||||||
|
(syncUpdate) =>
|
||||||
|
syncUpdate.accountData?.any(
|
||||||
|
(accountData) => accountData.type == 'm.push_rules',
|
||||||
|
) ??
|
||||||
|
false,
|
||||||
|
)
|
||||||
.listen(
|
.listen(
|
||||||
(u) => setState(() {}),
|
(u) => setState(() {}),
|
||||||
);
|
);
|
||||||
|
|
|
@ -1210,10 +1210,10 @@ packages:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: matrix
|
name: matrix
|
||||||
sha256: b96f16ec227138a61d148f2812c4d558b2930edbb6cd05d03b3a41c4fffd2f47
|
sha256: "668ed9b7279ac9c364c687585e606c1122f88d6e2e3410ba781a167b47cd9471"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.29.7"
|
version: "0.29.9"
|
||||||
meta:
|
meta:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
@ -64,7 +64,7 @@ dependencies:
|
||||||
keyboard_shortcuts: ^0.1.4
|
keyboard_shortcuts: ^0.1.4
|
||||||
latlong2: ^0.9.1
|
latlong2: ^0.9.1
|
||||||
linkify: ^5.0.0
|
linkify: ^5.0.0
|
||||||
matrix: ^0.29.7
|
matrix: ^0.29.9
|
||||||
native_imaging: ^0.1.1
|
native_imaging: ^0.1.1
|
||||||
package_info_plus: ^6.0.0
|
package_info_plus: ^6.0.0
|
||||||
pasteboard: ^0.2.0
|
pasteboard: ^0.2.0
|
||||||
|
|
Loading…
Reference in a new issue