ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fluffychat merge

Browse source
This commit is contained in:
ggurdin 2026-02-05 16:36:50 -05:00
commit e947cac301
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
5 changed files with 31 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/l10n/intl_de.arb
View file

@ -380,7 +380,7 @@
"type": "String",
"placeholders": {}
},
"chatBackupDescription": "Deine alten Nachrichten sind mit einem Wiederherstellungsschlüssel gesichert. Bitte stellen sicher, dass du ihn nicht verlierst.",
"chatBackupDescription": "Deine Nachrichten sind mit einem Wiederherstellungsschlüssel gesichert. Bitte stelle sicher, dass du ihn nicht verlierst.",
"@chatBackupDescription": {
"type": "String",
"placeholders": {}
@ -462,7 +462,7 @@
"type": "String",
"description": "Usage hint for the command /plain"
},
"commandHint_react": "Sende die Antwort als Reaction",
"commandHint_react": "Sende die Antwort als Reaktion",
"@commandHint_react": {
"type": "String",
"description": "Usage hint for the command /react"
@ -3495,6 +3495,20 @@
"@thread": {},
"backToMainChat": "Zurück zum Hauptchat",
"@backToMainChat": {},
"changedTheChatDescription": "{username} hat die Chatbeschreibung geändert",
"@changedTheChatDescription": {},
"changedTheChatName": "{username} den Chatnamen geändert",
"@changedTheChatName": {},
"saveChanges": "Änderungen speichern",
"@saveChanges": {},
"skipChatBackup": "Chatsicherung überspringen",
"@skipChatBackup": {},
"skipChatBackupWarning": "Bist du sicher? Ohne die Chatsicherung zu aktivieren, kannst du den Zugriff auf deine Nachrichten verlieren, wenn du dein Gerät wechselst.",
"@skipChatBackupWarning": {},
"loadingMessages": "Nachrichten werden geladen",
"@loadingMessages": {},
"setupChatBackup": "Chatsicherung einrichten",
"@setupChatBackup": {},
"writeAMessageLangCodes": "Geben Sie in {l1} oder {l2} ein...",
"requests": "Anfragen",
"holdForInfo": "Klicken und halten für Wortinformationen.",
@ -3536,7 +3550,6 @@
"updateLanguage": "Meine Sprachen",
"whatLanguageYouWantToLearn": "Welche Sprache möchtest du lernen?",
"whatIsYourBaseLanguage": "Was ist deine Ausgangssprache?",
"saveChanges": "Änderungen speichern",
"publicProfileTitle": "Erlauben Sie, dass mein Profil in der Suche gefunden wird",
"publicProfileDesc": "Wenn Sie es einschalten, können andere Benutzer Ihr Profil in der globalen Suchleiste finden und Chat-Anfragen senden. An diesem Punkt können Sie die Anfrage akzeptieren oder ablehnen.",
"errorDisableIT": "Übersetzungshilfe ist deaktiviert.",
@ -4797,10 +4810,6 @@
"type": "String",
"placeholders": {}
},
"@saveChanges": {
"type": "String",
"placeholders": {}
},
"@publicProfileTitle": {
"type": "String",
"placeholders": {}

4
lib/l10n/intl_pt_BR.arb
View file

@ -3511,6 +3511,10 @@
"@loadingMessages": {},
"setupChatBackup": "Configurar backup de conversas",
"@setupChatBackup": {},
"changedTheChatDescription": "{username} alterou a descrição da conversa",
"@changedTheChatDescription": {},
"changedTheChatName": "{username} alterou o nome da conversa",
"@changedTheChatName": {},
"writeAMessageLangCodes": "Digite em {l1} ou {l2}...",
"requests": "Solicitações",
"holdForInfo": "Clique e segure para informações da palavra.",

2
lib/l10n/intl_zh.arb
View file

@ -1216,7 +1216,7 @@
"type": "String",
"placeholders": {}
},
"ok": "好",
"ok": "确认",
"@ok": {
"type": "String",
"placeholders": {}

41
lib/pages/settings_security/settings_security.dart
View file

@ -1,8 +1,3 @@
import 'package:flutter/material.dart';
import 'package:matrix/matrix.dart';
import 'package:url_launcher/url_launcher_string.dart';
import 'package:fluffychat/config/setting_keys.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart';
@ -10,6 +5,10 @@ import 'package:fluffychat/widgets/adaptive_dialogs/show_text_input_dialog.dart'
import 'package:fluffychat/widgets/app_lock.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
import 'package:matrix/matrix.dart';
import 'package:url_launcher/url_launcher_string.dart';
import 'settings_security_view.dart';
class SettingsSecurity extends StatefulWidget {
@ -101,33 +100,6 @@ class SettingsSecurityController extends State<SettingsSecurity> {
if (mxid == null || mxid.isEmpty || mxid != supposedMxid) {
return;
}
// #Pangea
// final input = await showTextInputDialog(
// useRootNavigator: false,
// context: context,
// title: L10n.of(context).pleaseEnterYourPassword,
// okLabel: L10n.of(context).ok,
// cancelLabel: L10n.of(context).cancel,
// isDestructive: true,
// obscureText: true,
// hintText: '******',
// minLines: 1,
// maxLines: 1,
// );
// if (input == null) return;
// await showFutureLoadingDialog(
// context: context,
// future: () => Matrix.of(context).client.deactivateAccount(
// auth: AuthenticationPassword(
// password: input,
// identifier: AuthenticationUserIdentifier(
// user: Matrix.of(context).client.userID!,
// ),
// ),
// ),
// );
// Pangea#
final resp = await showFutureLoadingDialog(
context: context,
delay: false,
@ -138,7 +110,10 @@ class SettingsSecurityController extends State<SettingsSecurity> {
);
if (!resp.isError) {
await Matrix.of(context).client.logout();
await showFutureLoadingDialog(
context: context,
future: () => Matrix.of(context).client.logout(),
);
}
}

4
pubspec.yaml
View file

@ -48,12 +48,12 @@ dependencies:
flutter_web_auth_2: ^4.1.0
flutter_webrtc: ^1.2.1
geolocator: ^14.0.2
go_router: ^17.0.0
go_router: ^17.0.1
handy_window: ^0.4.0
highlight: ^0.7.0
html: ^0.15.4
http: ^1.6.0
image: ^4.1.7
image: ^4.6.0
image_picker: ^1.2.1
intl: any
just_audio: ^0.10.5