Compare commits
No commits in common. "trunk" and "perf" have entirely different histories.
|
|
@ -341,21 +341,21 @@ class MainActivity: FlutterActivity() {
|
|||
val profile: String = call.argument("ProfileOnion") ?: ""
|
||||
val conversation: Int = call.argument("conversation") ?: 0
|
||||
val indexI: Int = call.argument("index") ?: 0
|
||||
result.success(Cwtch.getMessage(profile, conversation.toLong(), indexI.toLong()))
|
||||
result.success(Data.Builder().putString("result", Cwtch.getMessage(profile, conversation.toLong(), indexI.toLong())).build())
|
||||
return
|
||||
}
|
||||
"GetMessageByID" -> {
|
||||
val profile: String = call.argument("ProfileOnion") ?: ""
|
||||
val conversation: Int = call.argument("conversation") ?: 0
|
||||
val id: Int = call.argument("id") ?: 0
|
||||
result.success(Cwtch.getMessageByID(profile, conversation.toLong(), id.toLong()))
|
||||
result.success(Data.Builder().putString("result", Cwtch.getMessageByID(profile, conversation.toLong(), id.toLong())).build())
|
||||
return
|
||||
}
|
||||
"GetMessageByContentHash" -> {
|
||||
val profile: String = call.argument("ProfileOnion") ?: ""
|
||||
val conversation: Int = call.argument("conversation") ?: 0
|
||||
val contentHash: String = call.argument("contentHash") ?: ""
|
||||
result.success(Cwtch.getMessagesByContentHash(profile, conversation.toLong(), contentHash))
|
||||
result.success(Data.Builder().putString("result", Cwtch.getMessagesByContentHash(profile, conversation.toLong(), contentHash)).build())
|
||||
return
|
||||
}
|
||||
"SetMessageAttribute" -> {
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
import 'package:cwtch/third_party/linkify/linkify.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
||||
void modalOpenLink(BuildContext ctx, LinkableElement link) {
|
||||
showModalBottomSheet<void>(
|
||||
context: ctx,
|
||||
builder: (BuildContext bcontext) {
|
||||
return Container(
|
||||
height: 200, // bespoke value courtesy of the [TextField] docs
|
||||
child: Center(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(30.0),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Text(AppLocalizations.of(bcontext)!.clickableLinksWarning),
|
||||
Flex(direction: Axis.horizontal, mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
|
||||
Container(
|
||||
margin: EdgeInsets.symmetric(vertical: 20, horizontal: 10),
|
||||
child: ElevatedButton(
|
||||
child: Text(AppLocalizations.of(bcontext)!.clickableLinksCopy, semanticsLabel: AppLocalizations.of(bcontext)!.clickableLinksCopy),
|
||||
onPressed: () {
|
||||
Clipboard.setData(new ClipboardData(text: link.url));
|
||||
|
||||
final snackBar = SnackBar(
|
||||
content: Text(AppLocalizations.of(bcontext)!.copiedToClipboardNotification),
|
||||
);
|
||||
|
||||
Navigator.pop(bcontext);
|
||||
ScaffoldMessenger.of(bcontext).showSnackBar(snackBar);
|
||||
},
|
||||
),
|
||||
),
|
||||
Container(
|
||||
margin: EdgeInsets.symmetric(vertical: 20, horizontal: 10),
|
||||
child: ElevatedButton(
|
||||
child: Text(AppLocalizations.of(bcontext)!.clickableLinkOpen, semanticsLabel: AppLocalizations.of(bcontext)!.clickableLinkOpen),
|
||||
onPressed: () async {
|
||||
if (await canLaunch(link.url)) {
|
||||
await launch(link.url);
|
||||
Navigator.pop(bcontext);
|
||||
} else {
|
||||
final snackBar = SnackBar(
|
||||
content: Text(AppLocalizations.of(bcontext)!.clickableLinkError),
|
||||
);
|
||||
ScaffoldMessenger.of(bcontext).showSnackBar(snackBar);
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
]),
|
||||
],
|
||||
)),
|
||||
));
|
||||
});
|
||||
}
|
||||
|
|
@ -215,9 +215,8 @@ class CwtchFfi implements Cwtch {
|
|||
// ignore: non_constant_identifier_names
|
||||
final StartCwtch = startCwtchC.asFunction<StartCwtchFn>();
|
||||
|
||||
final utf8CwtchDir = cwtchDir.toNativeUtf8();
|
||||
StartCwtch(utf8CwtchDir, utf8CwtchDir.length, bundledTor.toNativeUtf8(), bundledTor.length);
|
||||
malloc.free(utf8CwtchDir);
|
||||
final ut8CwtchDir = cwtchDir.toNativeUtf8();
|
||||
StartCwtch(ut8CwtchDir, ut8CwtchDir.length, bundledTor.toNativeUtf8(), bundledTor.length);
|
||||
|
||||
// Spawn an isolate to listen to events from libcwtch-go and then dispatch them when received on main thread to cwtchNotifier
|
||||
cwtchIsolate = await Isolate.spawn(_checkAppbusEvents, _receivePort.sendPort);
|
||||
|
|
@ -327,7 +326,6 @@ class CwtchFfi implements Cwtch {
|
|||
String jsonMessage = jsonMessageBytes.toDartString();
|
||||
_UnsafeFreePointerAnyUseOfThisFunctionMustBeDoubleApproved(jsonMessageBytes);
|
||||
malloc.free(utf8profile);
|
||||
|
||||
return jsonMessage;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,23 +2,23 @@
|
|||
"@@locale": "pl",
|
||||
"@@last_modified": "2022-04-21T21:35:58+02:00",
|
||||
"okButton": "OK",
|
||||
"settingsAndroidPowerReenablePopup": "Nie udało się ponownie włączyć optymalizacji użycia baterii dla Cwtch. Przejdź do Android \/ Ustawienia \/ Aplikacje \/ Cwtch \/ Bateria i ustaw Zużycie na 'Optymalizacja'",
|
||||
"settingAndroidPowerExemptionDescription": "Opcjonalne: wyłącz optymalizację użycia baterii przez Cwtch w systemie Android. Będzie to skutkować lepszą stabilnością w zamian za wyższy pobór energii",
|
||||
"settingAndroidPowerExemption": "Ignoruj optymalizację użycia baterii przez Cwtch (Android)",
|
||||
"thisFeatureRequiresGroupExpermientsToBeEnabled": "Ta funkcja wymaga włączenia w Ustawieniach funkcji eksperymentalnej: Grupy",
|
||||
"messageFormattingDescription": "Włącz formatowanie tekstu w wyświetlanych wiadomościach, np. **pogrubiony** and *kursywa*",
|
||||
"formattingExperiment": "Formatowanie wiadomości",
|
||||
"clickableLinkError": "Nie udało się otworzyć linku",
|
||||
"clickableLinksCopy": "Kopiuj link",
|
||||
"clickableLinkOpen": "Otwórz link",
|
||||
"clickableLinksWarning": "Otwarcie tego linku spowoduje uruchomienie aplikacji poza Cwtch i może ujawnić metadane lub w inny sposób obniżyć bezpieczeństwo Cwtch. Otwieraj tylko linki otrzymane od zaufanych osób. Czy na pewno chcesz kontynuować? ",
|
||||
"shuttingDownApp": "Zamykanie...",
|
||||
"successfullyImportedProfile": "Pomyślnie zaimportowano profil: %profile",
|
||||
"failedToImportProfile": "Importowanie profilu nie powiodło się",
|
||||
"importProfileTooltip": "Użyj zaszyfrowanej kopii zapasowej Cwtch aby zaimportować profil utworzony w Cwtch na innym urządzeniu.",
|
||||
"importProfile": "Importuj profil",
|
||||
"exportProfileTooltip": "Utwórz zaszyfrowany plik z kopią zapasową tego profilu. Zaszyfrowany plik można zaimportować do Cwtch na innym urządzeniu.",
|
||||
"exportProfile": "Eksportuj profil",
|
||||
"settingsAndroidPowerReenablePopup": "Cannot re-enable Battery Optimization from within Cwtch. Please go to Android \/ Settings \/ Apps \/ Cwtch \/ Battery and set Usage to 'Optimized'",
|
||||
"settingAndroidPowerExemptionDescription": "Optional: Request Android to exempt Cwtch from optimized power management. This will result in better stability at the cost of greater battery use.",
|
||||
"settingAndroidPowerExemption": "Android Ignore Battery Optimizations",
|
||||
"thisFeatureRequiresGroupExpermientsToBeEnabled": "This feature requires the Groups Experiment to be enabled in Settings",
|
||||
"messageFormattingDescription": "Enable rich text formatting in displayed messages e.g. **bold** and *italic*",
|
||||
"formattingExperiment": "Message Formatting",
|
||||
"clickableLinkError": "Error encountered while attempting to open URL",
|
||||
"clickableLinksCopy": "Copy URL",
|
||||
"clickableLinkOpen": "Open URL",
|
||||
"clickableLinksWarning": "Opening this URL will launch an application outside of Cwtch and may reveal metadata or otherwise compromise the security of Cwtch. Only open URLs from people you trust. Are you sure you want to continue?",
|
||||
"shuttingDownApp": "Shutting down...",
|
||||
"successfullyImportedProfile": "Successfully Imported Profile: %profile",
|
||||
"failedToImportProfile": "Error Importing Profile",
|
||||
"importProfileTooltip": "Use an encrypted Cwtch backup to bring in a profile created in another instance of Cwtch.",
|
||||
"importProfile": "Import Profile",
|
||||
"exportProfileTooltip": "Backup this profile to an encrypted file. The encrypted file can be imported into another Cwtch app.",
|
||||
"exportProfile": "Export Profile",
|
||||
"deleteConfirmLabel": "Wpisz USUŃ aby potwierdzić",
|
||||
"localeLb": "Luksemburski",
|
||||
"localeNo": "Norweski",
|
||||
|
|
@ -26,42 +26,42 @@
|
|||
"localeCy": "Walijski",
|
||||
"localeDa": "Duński",
|
||||
"localeRo": "Romanian",
|
||||
"newMessageNotificationConversationInfo": "Nowa wiadomość od %1",
|
||||
"newMessageNotificationSimple": "Nowa wiadomość",
|
||||
"notificationContentContactInfo": "Informacje o konwersacji",
|
||||
"notificationContentSimpleEvent": "Bez zawartości",
|
||||
"conversationNotificationPolicySettingDescription": "Zmień zachowanie powiadomień dla tej konwersacji",
|
||||
"conversationNotificationPolicySettingLabel": "Wyświetlanie powiadomień dla tej konwersacji",
|
||||
"settingsGroupExperiments": "Funkcje eksperymentalne",
|
||||
"settingsGroupAppearance": "Wygląd",
|
||||
"settingGroupBehaviour": "Zachowanie",
|
||||
"notificationContentSettingDescription": "Zmienia zawartość powiadomień dla konwersacji",
|
||||
"notificationPolicySettingDescription": "Zarządza domyślnymi ustawieniami wyświetlania powiadomień",
|
||||
"notificationContentSettingLabel": "Zawartość powiadomień",
|
||||
"notificationPolicySettingLabel": "Wyświetlanie powiadomień",
|
||||
"conversationNotificationPolicyNever": "Nie",
|
||||
"conversationNotificationPolicyOptIn": "Tak",
|
||||
"conversationNotificationPolicyDefault": "Domyślne",
|
||||
"notificationPolicyDefaultAll": "Dla wszystkich konwersacji (domyślne)",
|
||||
"notificationPolicyOptIn": "Tylko dla wybranych konwersacji",
|
||||
"notificationPolicyMute": "Wycisz",
|
||||
"tooltipSelectACustomProfileImage": "Ustaw zdjęcie profilowe",
|
||||
"torSettingsEnabledCacheDescription": "Zapamiętaj obecny konsensus Tor, aby użyć go przy następnym uruchomieniu Cwtch. Dzięki temu Tor uruchomi się szybciej. Jeśli opcja jest wyłączona, Cwtch usuwa zapisany konsensus przy uruchomieniu.",
|
||||
"torSettingsEnableCache": "Zapamiętaj konsensus Tor",
|
||||
"labelTorNetwork": "Sieć Tor",
|
||||
"descriptionACNCircuitInfo": "Szczegółowe informacje na temat trasy wykorzystywanej przez anonimową sieć komunikacji, aby połączyć się z tą konwersacją.",
|
||||
"labelACNCircuitInfo": "Informacje o trasie ACN",
|
||||
"fileSharingSettingsDownloadFolderTooltip": "Przeglądaj, aby wybrać inny folder dla pobranych plików.",
|
||||
"fileSharingSettingsDownloadFolderDescription": "Kiedy pliki są pobierane automatycznie (np. zdjęcia, kiedy opcja podglądu jest włączona), potrzebny jest folder dla pobranych plików.",
|
||||
"torSettingsErrorSettingPort": "Numer portu musi być między 1 a 65535",
|
||||
"torSettingsUseCustomTorServiceConfigurastionDescription": "Nadpisz domyślną konfigurację Tor. Uwaga: To może być niebezpieczne. Włącz tę funkcję tylko jeśli wiesz, co robisz.",
|
||||
"torSettingsUseCustomTorServiceConfiguration": "Użyj niestandardowej konfiguracji Tor (torrc)",
|
||||
"torSettingsCustomControlPortDescription": "Wybierz port dla połączeń kontrolnych z Tor proxy",
|
||||
"torSettingsCustomControlPort": "Port kontrolny",
|
||||
"torSettingsCustomSocksPortDescription": "Wybierz port dla połączeń przekazujących dane do Tor proxy",
|
||||
"torSettingsCustomSocksPort": "Port SOCKS",
|
||||
"torSettingsEnabledAdvancedDescription": "Użyj obecnego na twoim systemie serwisu Tor lub zmień parametry serwisu Tor w Cwtch",
|
||||
"torSettingsEnabledAdvanced": "Włącz zaawansowaną konfigurację Tor",
|
||||
"newMessageNotificationConversationInfo": "New Message From %1",
|
||||
"newMessageNotificationSimple": "New Message",
|
||||
"notificationContentContactInfo": "Conversation Information",
|
||||
"notificationContentSimpleEvent": "Plain Event",
|
||||
"conversationNotificationPolicySettingDescription": "Control notification behaviour for this conversation",
|
||||
"conversationNotificationPolicySettingLabel": "Conversation Notification Policy",
|
||||
"settingsGroupExperiments": "Experiments",
|
||||
"settingsGroupAppearance": "Appearance",
|
||||
"settingGroupBehaviour": "Behaviour",
|
||||
"notificationContentSettingDescription": "Controls the contents of conversation notifications",
|
||||
"notificationPolicySettingDescription": "Controls the default application notification behaviour",
|
||||
"notificationContentSettingLabel": "Notification Content",
|
||||
"notificationPolicySettingLabel": "Notification Policy",
|
||||
"conversationNotificationPolicyNever": "Never",
|
||||
"conversationNotificationPolicyOptIn": "Opt In",
|
||||
"conversationNotificationPolicyDefault": "Default",
|
||||
"notificationPolicyDefaultAll": "Default All",
|
||||
"notificationPolicyOptIn": "Opt In",
|
||||
"notificationPolicyMute": "Mute",
|
||||
"tooltipSelectACustomProfileImage": "Select a Custom Profile Image",
|
||||
"torSettingsEnabledCacheDescription": "Cache the current downloaded Tor consensus to reuse next time Cwtch is opened. This will allow Tor to start faster. When disabled, Cwtch will purge cached data on start up.",
|
||||
"torSettingsEnableCache": "Cache Tor Consensus",
|
||||
"labelTorNetwork": "Tor Network",
|
||||
"descriptionACNCircuitInfo": "In depth information about the path that the anonymous communication network is using to connect to this conversation.",
|
||||
"labelACNCircuitInfo": "ACN Circuit Info",
|
||||
"fileSharingSettingsDownloadFolderTooltip": "Browse to select a different default folder for downloaded files.",
|
||||
"fileSharingSettingsDownloadFolderDescription": "When files are downloaded automatically (e.g. image files, when image previews are enabled) a default location to download the files to is needed.",
|
||||
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
|
||||
"torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",
|
||||
"torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
|
||||
"torSettingsCustomControlPortDescription": "Use a custom port for control connections to the Tor proxy",
|
||||
"torSettingsCustomControlPort": "Custom Control Port",
|
||||
"torSettingsCustomSocksPortDescription": "Use a custom port for data connections to the Tor proxy",
|
||||
"torSettingsCustomSocksPort": "Custom SOCKS Port",
|
||||
"torSettingsEnabledAdvancedDescription": "Use an existing Tor service on your system, or change the parameters of the Cwtch Tor Service",
|
||||
"torSettingsEnabledAdvanced": "Enable Advanced Tor Configuration",
|
||||
"largeTextLabel": "Duży",
|
||||
"settingInterfaceZoom": "Przybliżenie",
|
||||
"localeDe": "Deutsche",
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
"password1Label": "Hasło",
|
||||
"currentPasswordLabel": "Obecne hasło",
|
||||
"yourDisplayName": "Nazwa",
|
||||
"profileOnionLabel": "Przekaż ten adres osobom, z którymi chcesz nawiązać kontakt",
|
||||
"profileOnionLabel": "Send this address to contacts you want to connect with",
|
||||
"noPasswordWarning": "Brak hasła do konta oznacza, że dane przechowywane na tym urządzeniu nie będą zaszyfrowane",
|
||||
"radioNoPassword": "Niezaszyfrowany (brak hasła)",
|
||||
"radioUsePassword": "Hasło",
|
||||
|
|
@ -102,13 +102,13 @@
|
|||
"profileName": "Nazwa",
|
||||
"editProfileTitle": "Edytuj profil",
|
||||
"addProfileTitle": "Dodaj nowy profil",
|
||||
"deleteBtn": "Usuń",
|
||||
"deleteBtn": "Delete",
|
||||
"unblockBtn": "Odblokuj",
|
||||
"dontSavePeerHistory": "Nie",
|
||||
"savePeerHistoryDescription": "Zapisywanie wiadomości",
|
||||
"savePeerHistory": "Tak",
|
||||
"blockBtn": "Zablokuj",
|
||||
"saveBtn": "Zapisz",
|
||||
"saveBtn": "Save",
|
||||
"displayNameLabel": "Nazwa",
|
||||
"addressLabel": "Adresy",
|
||||
"puzzleGameBtn": "Puzzle",
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
"membershipDescription": "Lista użytkowników, którzy wysyłali wiadomości w tej grupie. Członkowie grupy, którzy nie wysyłali żadnych wiadomości nie są na tej liście.",
|
||||
"addListItemBtn": "Dodaj",
|
||||
"peerNotOnline": "Znajomy jest niedostępny. Nie można użyć aplikacji.",
|
||||
"searchList": "Lista wyszukiwania",
|
||||
"searchList": "Search List",
|
||||
"update": "Zaktualizuj",
|
||||
"inviteBtn": "Zaproś",
|
||||
"inviteToGroupLabel": "Zaproś do grupy",
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
"tooltipRejectContactRequest": "Odrzuć zaproszenie do znajomych",
|
||||
"tooltipAcceptContactRequest": "Akceptuj zaproszenie do znajomych",
|
||||
"notificationNewMessageFromPeer": "Nowa wiadomość od znajomego!",
|
||||
"groupInviteSettingsWarning": "Zaproszono Cię do grupy! Aby wyświetlić to zaproszenie, włącz Grupy (eksperymentalne) w Ustawieniach",
|
||||
"groupInviteSettingsWarning": "Zaproszono Cię do grupy! Aby wyświetlić to zaproszenie, włącz Czaty Grupowe (eksperymentalne) w Ustawieniach",
|
||||
"shutdownCwtchDialog": "Zamknąć Cwtch? Wszystkie połączenia zostaną zakończone, a aplikacja zostanie zamknięta.",
|
||||
"malformedMessage": "Wiadomość uszkodzona",
|
||||
"profileDeleteSuccess": "Profil został usunięty",
|
||||
|
|
@ -248,21 +248,21 @@
|
|||
"inviteToGroup": "Zaproszono Cię do grupy:",
|
||||
"successfullAddedContact": "Dodano znajomego ",
|
||||
"descriptionBlockUnknownConnections": "Blokowanie połączeń od osób, które nie są na liście Twoich znajomych.",
|
||||
"descriptionExperimentsGroups": "Grupy (eksperymentalne) łączą się z niezaufanymi serwerami, aby umożliwić komunikację grupową.",
|
||||
"descriptionExperiments": "Funkcje eksperymentalne są opcjonalne. Dodają one funkcjonalności, które mogą być mniej prywatne niż domyślne konwersacje 1:1, np. Grupy, integracja z botami, itp.",
|
||||
"descriptionExperimentsGroups": "Czaty grupowe (eksperymentalne) łączą się z niezaufanymi serwerami, aby umożliwić komunikację grupową.",
|
||||
"descriptionExperiments": "Funkcje eksperymentalne są opcjonalne. Dodają one funkcjonalności, które mogą być mniej prywatne niż domyślne konwersacje 1:1, np. czaty grupowe, integracja z botami, itp.",
|
||||
"titleManageProfiles": "Zarządzaj Profilami",
|
||||
"tooltipUnlockProfiles": "Wprowadź hasło, aby odblokować zaszyfrowane profile.",
|
||||
"titleManageContacts": "Konwersacje",
|
||||
"tooltipAddContact": "Dodaj znajomego lub grupę",
|
||||
"tooltipOpenSettings": "Ustawienia",
|
||||
"contactAlreadyExists": "Ten znajomy już istnieje",
|
||||
"invalidImportString": "Niepoprawny ciąg importu",
|
||||
"invalidImportString": "Invalid import string",
|
||||
"conversationSettings": "Ustawienia konwersacji",
|
||||
"enterCurrentPasswordForDelete": "Aby usunąć ten profil, wprowadź hasło.",
|
||||
"enableGroups": "Włącz Grupy",
|
||||
"enableGroups": "Włącz czaty grupowe",
|
||||
"localeIt": "Italiana",
|
||||
"localeEs": "Espanol",
|
||||
"todoPlaceholder": "Do zrobienia...",
|
||||
"todoPlaceholder": "Do zdobienia...",
|
||||
"addNewItem": "Dodaj do listy",
|
||||
"addListItem": "Add a New List Item",
|
||||
"newConnectionPaneTitle": "Nowe połączenie",
|
||||
|
|
@ -321,7 +321,7 @@
|
|||
"fileSavedTo": "Zapisano do",
|
||||
"verfiyResumeButton": "Zweryfikuj\/wznów",
|
||||
"copyServerKeys": "Kopiuj klucze",
|
||||
"archiveConversation": "Zarchiwizuj tę konwersację",
|
||||
"archiveConversation": "Zarchiwizuj tę rozmowę",
|
||||
"streamerModeLabel": "Tryb streamera\/prezentacji",
|
||||
"retrievingManifestMessage": "Pobieranie informacji o pliku...",
|
||||
"openFolderButton": "Otwórz folder",
|
||||
|
|
@ -331,5 +331,5 @@
|
|||
"messageFileSent": "Plik został wysłany",
|
||||
"tooltipSendFile": "Wyślij plik",
|
||||
"settingFileSharing": "Udostępnianie plików",
|
||||
"copiedToClipboardNotification": "Skopiowano do schowka"
|
||||
"copiedToClipboardNotification": "Copied to Clipboard"
|
||||
}
|
||||
|
|
@ -1,125 +1,90 @@
|
|||
{
|
||||
"@@locale": "ru",
|
||||
"@@last_modified": "2022-06-22T00:46:01+02:00",
|
||||
"localeDe": "Немецкий \/ Deutsch",
|
||||
"localeDa": "Датский язык \/ Dansk",
|
||||
"settingImagePreviewsDescription": "Автоматическая загрузка изображений. Обратите внимание, что предварительный просмотр изображений часто может использоваться для взлома или деаномизации. Не используйте данную функцию если Вы контактируете с ненадежными контактами.",
|
||||
"localePt": "Португальский язык \/ Portuguesa",
|
||||
"localeIt": "Итальянский \/ Italiana",
|
||||
"tooltipBackToMessageEditing": "Назад к редактированию сообщений",
|
||||
"tooltipItalicize": "Курсив",
|
||||
"tooltipCode": "Код \/ Монопространство",
|
||||
"localeEn": "Английский \/ English",
|
||||
"localePl": "Польский \/ Polski",
|
||||
"localeNo": "Норвежский \/ Norsk",
|
||||
"tooltipSubscript": "Подстрочный",
|
||||
"tooltipBoldText": "Смелый",
|
||||
"localeCy": "Валлийский \/ Cymraeg",
|
||||
"tooltipSuperscript": "Надстрочный",
|
||||
"localeRo": "Румынский \/ Română",
|
||||
"localeEl": "Греческий \/ Ελληνικά",
|
||||
"localeLb": "Люксембургский \/ Lëtzebuergesch",
|
||||
"tooltipPreviewFormatting": "Предварительный просмотр форматирования сообщений",
|
||||
"tooltipStrikethrough": "Зачеркивание",
|
||||
"localeFr": "Французский \/ Français",
|
||||
"localeEs": "Испанский \/ Español",
|
||||
"localeRU": "Русский \/ Русский",
|
||||
"editProfile": "Изменить профиль",
|
||||
"@@last_modified": "2022-04-21T21:35:58+02:00",
|
||||
"okButton": "OK",
|
||||
"settingsAndroidPowerReenablePopup": "Невозможно перезапустить функцию оптимазации батарее для Cwtch. Перейдите в настройки Android \/ Настройки \/ Приложения и уведомления \/ Все приложения \/ Cwtch \/ Батарея \/ Эконоимя заряда \/ Отключена",
|
||||
"settingAndroidPowerExemptionDescription": "Необязательно: в настройках Android исключите Cwtch в параметрах оптимизации батареи. Это улучшит стабильность за счёт небольшого расхода батареи..",
|
||||
"settingAndroidPowerExemption": "Игнорировать оптимазацию батареи Android",
|
||||
"thisFeatureRequiresGroupExpermientsToBeEnabled": "Чтобы использовать данную функцию, в настройках необходимо включить \"Эксперементы\", затем \"Групповые чаты\"",
|
||||
"messageFormattingDescription": "Включите форматирование, если к примеру хотите использовать **жирный-текст** и *курсив*",
|
||||
"formattingExperiment": "Форматирование сообщений",
|
||||
"clickableLinkError": "Ошибка при попытке открыть данную ссылку",
|
||||
"clickableLinksCopy": "Копировать ссылку",
|
||||
"clickableLinkOpen": "Открыть ссылку",
|
||||
"clickableLinksWarning": "Открытие данной ссылки приведет к запуску приложения за пределами Cwtch и может раскрыть метаданные или иным образом поставить под угрозу безопасность Cwtch. Открывайте ссылки только от тех людей, которым вы доверяете. Вы уверены, что хотите продолжить?",
|
||||
"shuttingDownApp": "Выключение...",
|
||||
"successfullyImportedProfile": "Профиль успешно импортирован: %profile",
|
||||
"failedToImportProfile": "Ошибка импорта профиля",
|
||||
"importProfileTooltip": "Используйте зашифрованную резервную копию Cwtch, чтобы перенести профиль, созданный на другом устройстве где установлен Cwtch..",
|
||||
"importProfile": "Загрузить профиль",
|
||||
"exportProfileTooltip": "Сделать зашифрованную резервную копию в файл. Его потом потом можно импортировать на других устройствах где установлен Cwtch.",
|
||||
"exportProfile": "Экспорт профиля",
|
||||
"notificationContentContactInfo": "Показать текст сообщения",
|
||||
"notificationContentSimpleEvent": "Без подробностей",
|
||||
"conversationNotificationPolicySettingDescription": "Настройка уведомлений",
|
||||
"conversationNotificationPolicySettingLabel": "Настройка уведомлений",
|
||||
"settingsGroupAppearance": "НАСТРОЙКИ ОТОБРАЖЕНИЯ",
|
||||
"notificationContentSettingDescription": "Управление уведомлениями чатов",
|
||||
"notificationPolicySettingDescription": "Настройка уведомлений по-умолчанию",
|
||||
"notificationContentSettingLabel": "Содержимое уведомления",
|
||||
"notificationPolicySettingLabel": "Уведомления",
|
||||
"conversationNotificationPolicyOptIn": "Включить",
|
||||
"conversationNotificationPolicyDefault": "По-умолчанию",
|
||||
"notificationPolicyDefaultAll": "По-умолчанию",
|
||||
"notificationPolicyOptIn": "Включить",
|
||||
"notificationPolicyMute": "Без звука",
|
||||
"tooltipSelectACustomProfileImage": "Сменить изображение профиля",
|
||||
"torSettingsEnabledCacheDescription": "Кэшировать текущий загруженный узел Tor для повторного подключения при следующем запуске Cwtch. Это позволит Tor запускаться быстрее. Если этот параметр отключен, Cwtch будет очищать кэшированные данные при запуске.",
|
||||
"torSettingsEnableCache": "Кешировать узлы Tor",
|
||||
"descriptionACNCircuitInfo": "Подробная информация о соединении, который сеть анонимной связи использует для подключения к этому разговору.",
|
||||
"labelACNCircuitInfo": "Информация о цепи ACN",
|
||||
"fileSharingSettingsDownloadFolderTooltip": "Нажмите обзор чтобы выбрать другую папку по-умолчанию для загружаемых файлов.",
|
||||
"fileSharingSettingsDownloadFolderDescription": "При включение функции автоматическое скачивание файлов (например картинок), необходимо указать папку для сохранения.",
|
||||
"torSettingsErrorSettingPort": "Номер порта должен быть в диапазоне от 1 до 65535",
|
||||
"torSettingsUseCustomTorServiceConfigurastionDescription": "Переопределение конфигурации Tor по умолчанию. Предупреждение: это может быть опасно. Если не знаете, что делаете, лучше не трогать!",
|
||||
"torSettingsUseCustomTorServiceConfiguration": "Используйте пользовательскую конфигурацию службы Tor (torrc)",
|
||||
"torSettingsCustomControlPortDescription": "Используйте настраиваемый порт для управления подключениями к прокси-серверу Tor.",
|
||||
"torSettingsCustomControlPort": "Выберите контрольный порт",
|
||||
"torSettingsCustomSocksPortDescription": "Используйте настраиваемый порт для подключения к прокси-серверу Tor.",
|
||||
"torSettingsCustomSocksPort": "Выберите SOCKS порт",
|
||||
"torSettingsEnabledAdvancedDescription": "Использовать установленную службу Tor в вашей системе или измените параметры службы Cwtch Tor",
|
||||
"torSettingsEnabledAdvanced": "Включить расширенные настройки Tor",
|
||||
"themeColorLabel": "Основной цвет темы",
|
||||
"settingDownloadFolder": "Папка для загрузок",
|
||||
"importLocalServerLabel": "Использовать локальный сервер",
|
||||
"deleteServerConfirmBtn": "Вы точно хотите удалить сервер?",
|
||||
"unlockProfileTip": "Создайте или импортируйте профиль, чтобы начать",
|
||||
"unlockServerTip": "Создайте или импортируйте сервер, чтобы начать",
|
||||
"saveServerButton": "Сохранить",
|
||||
"serverEnabled": "Состояние сервера",
|
||||
"descriptionFileSharing": "Данная функция позволяет обмениваться файлами напрямую с контактами и группами в Cwtch. Отправляемый файл будет напрямую скачиваться с вашего устройства через Cwtch, внутри сети Tor",
|
||||
"settingUIColumnOptionSame": "Как в портретном режиме",
|
||||
"settingUIColumnSingle": "Один столбец",
|
||||
"createProfileToBegin": "Пожалуйста, создайте или импортируйте профиль, чтобы начать",
|
||||
"yesLeave": "Удалить",
|
||||
"leaveConversation": "Удалить",
|
||||
"enableGroups": "Групповые чаты",
|
||||
"settingTheme": "Ночной режим",
|
||||
"addNewProfileBtn": "Создать новый профиль",
|
||||
"profileOnionLabel": "Send this address to contacts you want to connect with",
|
||||
"savePeerHistoryDescription": "Определяет политику хранения или удаления сообщений с данным контактом",
|
||||
"savePeerHistory": "Настройка истории",
|
||||
"settingsAndroidPowerReenablePopup": "Cannot re-enable Battery Optimization from within Cwtch. Please go to Android \/ Settings \/ Apps \/ Cwtch \/ Battery and set Usage to 'Optimized'",
|
||||
"settingAndroidPowerExemptionDescription": "Optional: Request Android to exempt Cwtch from optimized power management. This will result in better stability at the cost of greater battery use.",
|
||||
"settingAndroidPowerExemption": "Android Ignore Battery Optimizations",
|
||||
"thisFeatureRequiresGroupExpermientsToBeEnabled": "This feature requires the Groups Experiment to be enabled in Settings",
|
||||
"messageFormattingDescription": "Enable rich text formatting in displayed messages e.g. **bold** and *italic*",
|
||||
"formattingExperiment": "Message Formatting",
|
||||
"clickableLinkError": "Error encountered while attempting to open URL",
|
||||
"clickableLinksCopy": "Copy URL",
|
||||
"clickableLinkOpen": "Open URL",
|
||||
"clickableLinksWarning": "Opening this URL will launch an application outside of Cwtch and may reveal metadata or otherwise compromise the security of Cwtch. Only open URLs from people you trust. Are you sure you want to continue?",
|
||||
"shuttingDownApp": "Shutting down...",
|
||||
"successfullyImportedProfile": "Successfully Imported Profile: %profile",
|
||||
"failedToImportProfile": "Error Importing Profile",
|
||||
"importProfileTooltip": "Use an encrypted Cwtch backup to bring in a profile created in another instance of Cwtch.",
|
||||
"importProfile": "Import Profile",
|
||||
"exportProfileTooltip": "Backup this profile to an encrypted file. The encrypted file can be imported into another Cwtch app.",
|
||||
"exportProfile": "Export Profile",
|
||||
"deleteConfirmLabel": "Введите УДАЛИТЬ, чтобы продолжить",
|
||||
"deleteConfirmText": "УДАЛИТЬ",
|
||||
"settingGroupBehaviour": "ПОВЕДЕНИЕ",
|
||||
"settingsGroupExperiments": "ЭКСПЕРИМЕНТЫ",
|
||||
"localeCy": "Валлийский",
|
||||
"localeDa": "Датский",
|
||||
"localeEl": "Греческий",
|
||||
"localeNo": "Норвежский",
|
||||
"localeLb": "Люксембургский",
|
||||
"settingsGroupAppearance": "Появление",
|
||||
"settingGroupBehaviour": "Поведение",
|
||||
"settingsGroupExperiments": "Эксперименты",
|
||||
"labelTorNetwork": "Сеть Tor",
|
||||
"conversationNotificationPolicyNever": "Отключить",
|
||||
"notificationPolicyMute": "Тишина",
|
||||
"conversationNotificationPolicyNever": "Никогда",
|
||||
"newMessageNotificationConversationInfo": "Новое сообщение от %1",
|
||||
"newMessageNotificationSimple": "Новое сообщение",
|
||||
"localeRo": "Румынский",
|
||||
"notificationContentContactInfo": "Conversation Information",
|
||||
"notificationContentSimpleEvent": "Plain Event",
|
||||
"conversationNotificationPolicySettingDescription": "Control notification behaviour for this conversation",
|
||||
"conversationNotificationPolicySettingLabel": "Conversation Notification Policy",
|
||||
"notificationContentSettingDescription": "Controls the contents of conversation notifications",
|
||||
"notificationPolicySettingDescription": "Controls the default application notification behaviour",
|
||||
"notificationContentSettingLabel": "Notification Content",
|
||||
"notificationPolicySettingLabel": "Notification Policy",
|
||||
"conversationNotificationPolicyOptIn": "Opt In",
|
||||
"conversationNotificationPolicyDefault": "Default",
|
||||
"notificationPolicyDefaultAll": "Default All",
|
||||
"notificationPolicyOptIn": "Opt In",
|
||||
"tooltipSelectACustomProfileImage": "Select a Custom Profile Image",
|
||||
"torSettingsEnabledCacheDescription": "Cache the current downloaded Tor consensus to reuse next time Cwtch is opened. This will allow Tor to start faster. When disabled, Cwtch will purge cached data on start up.",
|
||||
"torSettingsEnableCache": "Cache Tor Consensus",
|
||||
"descriptionACNCircuitInfo": "In depth information about the path that the anonymous communication network is using to connect to this conversation.",
|
||||
"labelACNCircuitInfo": "ACN Circuit Info",
|
||||
"fileSharingSettingsDownloadFolderTooltip": "Browse to select a different default folder for downloaded files.",
|
||||
"fileSharingSettingsDownloadFolderDescription": "When files are downloaded automatically (e.g. image files, when image previews are enabled) a default location to download the files to is needed.",
|
||||
"torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
|
||||
"msgAddToAccept": "Добавьте учетную запись в контакты, чтобы принять этот файл.",
|
||||
"btnSendFile": "Отправить файл",
|
||||
"msgConfirmSend": "Вы уверены, что хотите отправить?",
|
||||
"msgFileTooBig": "Размер файла не должен превышать 10GB",
|
||||
"storageMigrationModalMessage": "Перенос профилей в новый формат хранения. Это может занять несколько минут...",
|
||||
"loadingCwtch": "Загрузка Cwtch...",
|
||||
"themeColorLabel": "Светлая или Темная тема",
|
||||
"settingDownloadFolder": "Папка для скачивания",
|
||||
"serverConnectionsLabel": "Всего соединений:",
|
||||
"serverTotalMessagesLabel": "Всего сообщений:",
|
||||
"plainServerDescription": "Мы настоятельно рекомендуем защитить свой Onion сервер Cwtch паролем. Если Вы этого не сделаете, то любой у кого окажется доступ к серверу, сможет получить доступ к информации на этом сервере включая конфиденциальные криптографические ключи.",
|
||||
"settingServersDescription": "Экспериментальная функция которая позволяет добавлять сервер для Cwtch в скрытой сети Tor. В меню появится дополнительная опция Серверы",
|
||||
"streamerModeLabel": "Режим маскировки",
|
||||
"settingUIColumnSingle": "Один стобец",
|
||||
"settingUIColumnLandscape": "Столбцы чатов в ландшафтном режиме",
|
||||
"settingUIColumnPortrait": "Столбцы чатов в портретном режиме",
|
||||
"resetTor": "Сброс",
|
||||
"descriptionBlockUnknownConnections": "Если включить этот параметр, все соединения от людей, не состоящих в ваших контактах будут отклонены.",
|
||||
"descriptionExperimentsGroups": "Данная экспериментальная функция позволяет создавать группы в Cwtch, чтобы облегчить Вам общение с более чем одним контактом. Для создания групп необходимо включить функцию создания сервера и создать сервер в главном меню программы.",
|
||||
"descriptionExperiments": "Экспериментальные функции Cwtch это необязательные дополнительные функции, которые добавляют некоторые возможности, но не имеют такой же устойчивости к метаданным как если бы вы общались через традиционный чат 1 на 1.",
|
||||
"descriptionExperiments": "Экспериментальные функции Cwtch это необязательные дополнительные функции, которые добавляют некоторые возможности, но не имеют такой же устойчивости к метаданным как если бы вы общались через традиционный чат 1 на 1..",
|
||||
"settingLanguage": "Выбрать язык",
|
||||
"profileName": "Введите имя...",
|
||||
"torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",
|
||||
"torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
|
||||
"torSettingsCustomControlPortDescription": "Use a custom port for control connections to the Tor proxy",
|
||||
"torSettingsCustomControlPort": "Custom Control Port",
|
||||
"torSettingsCustomSocksPortDescription": "Use a custom port for data connections to the Tor proxy",
|
||||
"torSettingsCustomSocksPort": "Custom SOCKS Port",
|
||||
"torSettingsEnabledAdvancedDescription": "Use an existing Tor service on your system, or change the parameters of the Cwtch Tor Service",
|
||||
"torSettingsEnabledAdvanced": "Enable Advanced Tor Configuration",
|
||||
"themeNameNeon2": "Неон2",
|
||||
"themeNameNeon1": "Неон1",
|
||||
"themeNameMidnight": "Полночь",
|
||||
|
|
@ -129,6 +94,7 @@
|
|||
"themeNameVampire": "Вампир",
|
||||
"themeNameWitch": "Ведьма",
|
||||
"themeNameCwtch": "Cwtch",
|
||||
"settingImagePreviewsDescription": "Автоматическая загрузка изображений. Обратите внимание, что предварительный просмотр изображений часто может использоваться для взлома или деаномизации. Не используйте данную функцию если Вы контактируете с ненадежными контактами. Аватары профиля запланированы для версии Cwtch 1.6.",
|
||||
"settingImagePreviews": "Предпросмотр изображений и фотографий профиля",
|
||||
"experimentClickableLinksDescription": "Экспериментальная функция которая позволяет нажимать на URL адреса в сообщениях",
|
||||
"enableExperimentClickableLinks": "Включить кликабельные ссылки",
|
||||
|
|
@ -141,7 +107,11 @@
|
|||
"groupsOnThisServerLabel": "Группы, в которых я нахожусь, размещены на этом сервере",
|
||||
"importLocalServerButton": "Импорт %1",
|
||||
"importLocalServerSelectText": "Выбрать локальный сервер",
|
||||
"importLocalServerLabel": "Импортировать локальный сервер",
|
||||
"newMessagesLabel": "Новое сообщение",
|
||||
"localeRU": "Русский",
|
||||
"profileOnionLabel": "Send this address to contacts you want to connect with",
|
||||
"savePeerHistory": "Хранить историю",
|
||||
"saveBtn": "Сохранить",
|
||||
"networkStatusOnline": "В сети",
|
||||
"defaultProfileName": "Алиса",
|
||||
|
|
@ -157,23 +127,29 @@
|
|||
"fileInterrupted": "Прервано",
|
||||
"fileSavedTo": "Сохранить в",
|
||||
"encryptedServerDescription": "Шифрование сервера паролем защитит его от других людей у которых может оказаться доступ к этому устройству, включая Onion адрес сервера. Зашифрованный сервер нельзя расшифровать, пока не будет введен правильный пароль разблокировки.",
|
||||
"deleteServerConfirmBtn": "Точно удалить сервер?",
|
||||
"deleteServerSuccess": "Сервер успешно удален",
|
||||
"enterCurrentPasswordForDeleteServer": "Пожалуйста, введите пароль сервера, чтобы удалить его",
|
||||
"copyAddress": "Копировать адрес",
|
||||
"settingServers": "Использовать серверы",
|
||||
"enterServerPassword": "Введите пароль для разблокировки сервера",
|
||||
"unlockProfileTip": "Создайте или разблокируйте профиль, чтобы начать",
|
||||
"unlockServerTip": "Создайте или разблокируйте сервер, чтобы начать",
|
||||
"addServerTooltip": "Добавить сервер",
|
||||
"serversManagerTitleShort": "Серверы",
|
||||
"serversManagerTitleLong": "Личные серверы",
|
||||
"saveServerButton": "Сохранить сервер",
|
||||
"serverAutostartDescription": "Автозапуск сервера при старте программы",
|
||||
"serverAutostartLabel": "Автозапуск",
|
||||
"serverEnabledDescription": "Запустить или остановить сервер",
|
||||
"serverEnabled": "Сервер запущен",
|
||||
"serverDescriptionDescription": "Описание видите только Вы. Сделано для удобства",
|
||||
"serverDescriptionLabel": "Описание сервера",
|
||||
"serverAddress": "Адрес сервера",
|
||||
"editServerTitle": "Изменить сервер",
|
||||
"addServerTitle": "Добавить сервер",
|
||||
"titleManageProfilesShort": "Профили",
|
||||
"descriptionFileSharing": "Данная функция позволяет обмениваться файлами напрямую с контактами и группами в Cwtch. Отправляемый файл будет напрямую скачиваться с вашего устройства через Cwtch.",
|
||||
"settingFileSharing": "Передача файлов",
|
||||
"tooltipSendFile": "Отправить файл",
|
||||
"messageFileOffered": "Контакт предлагает загрузить вам файл",
|
||||
|
|
@ -195,8 +171,10 @@
|
|||
"addContactConfirm": "Добавить контакт %1",
|
||||
"addContact": "Добавить контакт",
|
||||
"contactGoto": "Перейти к сообщению от %1",
|
||||
"settingUIColumnOptionSame": "Как в настройках портретного режима",
|
||||
"settingUIColumnDouble14Ratio": "Двойной (1:4)",
|
||||
"settingUIColumnDouble12Ratio": "Двойной (1:2)",
|
||||
"localePl": "Польский",
|
||||
"tooltipRemoveThisQuotedMessage": "Удалить цитируемое сообщение.",
|
||||
"tooltipReplyToThisMessage": "Ответить на это сообщение",
|
||||
"tooltipRejectContactRequest": "Отклонить запрос в контакты.",
|
||||
|
|
@ -215,6 +193,7 @@
|
|||
"debugLog": "Влючить отладку через консоль",
|
||||
"torNetworkStatus": "Статус сети Tor",
|
||||
"addContactFirst": "Добавьте или выберите контакт, чтобы начать чат.",
|
||||
"createProfileToBegin": "Пожалуйста, создайте или разблокируйте профиль, чтобы начать",
|
||||
"nickChangeSuccess": "Имя профиля успешно изменено",
|
||||
"addServerFirst": "Перед созданием группы, необходимо создать сервер",
|
||||
"deleteProfileSuccess": "Профиль успешно удален",
|
||||
|
|
@ -229,7 +208,9 @@
|
|||
"accepted": "Принять!",
|
||||
"chatHistoryDefault": "Этот чат будет удален после закрытия Cwtch! Историю сообщений можно включить для каждого чата отдельно через меню настроек в правом верхнем углу..",
|
||||
"newPassword": "Новый пароль",
|
||||
"yesLeave": "Да, оставить этот чат",
|
||||
"reallyLeaveThisGroupPrompt": "Вы уверены, что хотите закончить этот разговор? Все сообщения будут удалены.",
|
||||
"leaveConversation": "Да, оставить этот чат",
|
||||
"inviteToGroup": "Вас пригласили присоединиться к группе:",
|
||||
"titleManageServers": "Управление серверами",
|
||||
"successfullAddedContact": "Успешно добавлен",
|
||||
|
|
@ -242,6 +223,9 @@
|
|||
"invalidImportString": "Недействительная строка импорта",
|
||||
"conversationSettings": "Настройки чата",
|
||||
"enterCurrentPasswordForDelete": "Пожалуйста, введите текущий пароль, чтобы удалить этот профиль.",
|
||||
"enableGroups": "Включить Групповые чаты",
|
||||
"localeIt": "Итальянский",
|
||||
"localeEs": "Испанский",
|
||||
"todoPlaceholder": "Выполняю...",
|
||||
"addNewItem": "Добавить новый элемент в список",
|
||||
"addListItem": "Добавить новый элемент",
|
||||
|
|
@ -259,8 +243,13 @@
|
|||
"experimentsEnabled": "Включить Экспериментальные функции",
|
||||
"themeDark": "Темная",
|
||||
"themeLight": "Светлая",
|
||||
"settingTheme": "Тема",
|
||||
"largeTextLabel": "Большой",
|
||||
"settingInterfaceZoom": "Уровень масштабирования",
|
||||
"localeDe": "Немецкий",
|
||||
"localePt": "Португальский",
|
||||
"localeFr": "Французский",
|
||||
"localeEn": "Английский",
|
||||
"blockUnknownLabel": "Блокировать неизвестные контакты",
|
||||
"zoomLabel": "Масштаб интерфейса (в основном влияет на размеры текста и кнопок)",
|
||||
"versionBuilddate": "Версия: %1 Сборка от: %2",
|
||||
|
|
@ -271,6 +260,7 @@
|
|||
"error0ProfilesLoadedForPassword": "0 профилей, загруженных с этим паролем",
|
||||
"password": "Пароль",
|
||||
"enterProfilePassword": "Введите пароль для просмотра ваших профилей",
|
||||
"addNewProfileBtn": "Добавить новый профиль",
|
||||
"deleteProfileConfirmBtn": "Действительно удалить профиль?",
|
||||
"deleteProfileBtn": "Удалить профиль",
|
||||
"passwordChangeError": "Ошибка при смене пароля: Введенный пароль отклонен",
|
||||
|
|
@ -285,11 +275,13 @@
|
|||
"noPasswordWarning": "Отсутствие пароля в этой учетной записи означает, что все данные, хранящиеся локально, не будут зашифрованы",
|
||||
"radioNoPassword": "Незашифрованный (без пароля)",
|
||||
"radioUsePassword": "Пароль",
|
||||
"editProfile": "Изменить профиль",
|
||||
"newProfile": "Новый профиль",
|
||||
"editProfileTitle": "Изменить профиль",
|
||||
"addProfileTitle": "Добавить новый профиль",
|
||||
"unblockBtn": "Разблокировать контакт",
|
||||
"dontSavePeerHistory": "Удалить историю",
|
||||
"savePeerHistoryDescription": "Определяет политуку хранения или удаления переписки с данным контактом.",
|
||||
"blockBtn": "Заблокировать контакт",
|
||||
"displayNameLabel": "Отображаемое имя",
|
||||
"addressLabel": "Адрес",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:cwtch/widgets/messagerow.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
|
||||
|
||||
import 'message.dart';
|
||||
import 'messagecache.dart';
|
||||
|
|
@ -43,9 +42,9 @@ class ContactInfoState extends ChangeNotifier {
|
|||
late int _totalMessages = 0;
|
||||
late DateTime _lastMessageTime;
|
||||
late Map<String, GlobalKey<MessageRowState>> keys;
|
||||
int _newMarkerMsgIndex = -1;
|
||||
int _newMarkerMsgId = -1;
|
||||
DateTime _newMarkerClearAt = DateTime.now();
|
||||
late MessageCache messageCache;
|
||||
ItemScrollController messageScrollController = new ItemScrollController();
|
||||
|
||||
// todo: a nicer way to model contacts, groups and other "entities"
|
||||
late bool _isGroup;
|
||||
|
|
@ -146,24 +145,25 @@ class ContactInfoState extends ChangeNotifier {
|
|||
notifyListeners();
|
||||
}
|
||||
|
||||
void selected() {
|
||||
this._newMarkerMsgIndex = this._unreadMessages - 1;
|
||||
this._unreadMessages = 0;
|
||||
}
|
||||
|
||||
void unselected() {
|
||||
this._newMarkerMsgIndex = -1;
|
||||
}
|
||||
|
||||
int get unreadMessages => this._unreadMessages;
|
||||
|
||||
set unreadMessages(int newVal) {
|
||||
if (newVal == 0) {
|
||||
// conversation has been selected, start the countdown for the New Messager marker to be reset
|
||||
this._newMarkerClearAt = DateTime.now().add(const Duration(minutes: 2));
|
||||
}
|
||||
this._unreadMessages = newVal;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
int get newMarkerMsgIndex {
|
||||
return this._newMarkerMsgIndex;
|
||||
int get newMarkerMsgId {
|
||||
if (DateTime.now().isAfter(this._newMarkerClearAt)) {
|
||||
// perform heresy
|
||||
this._newMarkerMsgId = -1;
|
||||
// no need to notifyListeners() because presumably this getter is
|
||||
// being called from a renderer anyway
|
||||
}
|
||||
return this._newMarkerMsgId;
|
||||
}
|
||||
|
||||
int get totalMessages => this._totalMessages;
|
||||
|
|
@ -243,12 +243,8 @@ class ContactInfoState extends ChangeNotifier {
|
|||
if (!selectedConversation) {
|
||||
unreadMessages++;
|
||||
}
|
||||
if (_newMarkerMsgIndex == -1) {
|
||||
if (!selectedConversation) {
|
||||
_newMarkerMsgIndex = 0;
|
||||
}
|
||||
} else {
|
||||
_newMarkerMsgIndex++;
|
||||
if (_newMarkerMsgId == -1) {
|
||||
_newMarkerMsgId = messageID;
|
||||
}
|
||||
|
||||
this._lastMessageTime = timestamp;
|
||||
|
|
|
|||
|
|
@ -32,33 +32,33 @@ const GroupConversationHandleLength = 32;
|
|||
abstract class Message {
|
||||
MessageMetadata getMetadata();
|
||||
|
||||
Widget getWidget(BuildContext context, Key key, int index);
|
||||
Widget getWidget(BuildContext context, Key key);
|
||||
|
||||
Widget getPreviewWidget(BuildContext context);
|
||||
}
|
||||
|
||||
Message compileOverlay(MessageInfo messageInfo) {
|
||||
Message compileOverlay(MessageMetadata metadata, String messageData) {
|
||||
try {
|
||||
dynamic message = jsonDecode(messageInfo.wrapper);
|
||||
dynamic message = jsonDecode(messageData);
|
||||
var content = message['d'] as dynamic;
|
||||
var overlay = int.parse(message['o'].toString());
|
||||
|
||||
switch (overlay) {
|
||||
case TextMessageOverlay:
|
||||
return TextMessage(messageInfo.metadata, content);
|
||||
return TextMessage(metadata, content);
|
||||
case SuggestContactOverlay:
|
||||
case InviteGroupOverlay:
|
||||
return InviteMessage(overlay, messageInfo.metadata, content);
|
||||
return InviteMessage(overlay, metadata, content);
|
||||
case QuotedMessageOverlay:
|
||||
return QuotedMessage(messageInfo.metadata, content);
|
||||
return QuotedMessage(metadata, content);
|
||||
case FileShareOverlay:
|
||||
return FileMessage(messageInfo.metadata, content);
|
||||
return FileMessage(metadata, content);
|
||||
default:
|
||||
// Metadata is valid, content is not..
|
||||
return MalformedMessage(messageInfo.metadata);
|
||||
return MalformedMessage(metadata);
|
||||
}
|
||||
} catch (e) {
|
||||
return MalformedMessage(messageInfo.metadata);
|
||||
return MalformedMessage(metadata);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ class ByIndex implements CacheHandler {
|
|||
|
||||
Future<MessageInfo?> get(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) async {
|
||||
// if in cache, get. But if the cache has unsynced or not in cache, we'll have to do a fetch
|
||||
if (index < cache.cacheByIndex.length) {
|
||||
if (cache.indexUnsynced == 0 && index < cache.cacheByIndex.length) {
|
||||
return cache.getByIndex(index);
|
||||
}
|
||||
|
||||
|
|
@ -92,6 +92,13 @@ class ByIndex implements CacheHandler {
|
|||
amount += index - start;
|
||||
}
|
||||
|
||||
// on android we may have recieved messages on the backend that we didn't process in the UI, get them
|
||||
// override the index chunk setting, the index math is wrong will we fetch these and these are all that should be missing
|
||||
if (cache.indexUnsynced > 0) {
|
||||
start = 0;
|
||||
amount = cache.indexUnsynced;
|
||||
}
|
||||
|
||||
// check that we aren't asking for messages beyond stored messages
|
||||
if (start + amount >= cache.storageMessageCount) {
|
||||
amount = cache.storageMessageCount - start;
|
||||
|
|
@ -101,27 +108,6 @@ class ByIndex implements CacheHandler {
|
|||
}
|
||||
|
||||
cache.lockIndexes(start, start + amount);
|
||||
await fetchAndProcess(start, amount, cwtch, profileOnion, conversationIdentifier, cache);
|
||||
|
||||
return cache.getByIndex(index);
|
||||
}
|
||||
|
||||
void loadUnsynced(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
|
||||
// return if inadvertently called when no unsynced messages
|
||||
if (cache.indexUnsynced == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// otherwise we are going to fetch, so we'll fetch a chunk of messages
|
||||
var start = 0;
|
||||
var amount = cache.indexUnsynced;
|
||||
|
||||
cache.lockIndexes(start, start + amount);
|
||||
fetchAndProcess(start, amount, cwtch, profileOnion, conversationIdentifier, cache);
|
||||
return;
|
||||
}
|
||||
|
||||
Future<void> fetchAndProcess(int start, int amount, Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) async {
|
||||
var msgs = await cwtch.GetMessages(profileOnion, conversationIdentifier, start, amount);
|
||||
int i = 0; // i used to loop through returned messages. if doesn't reach the requested count, we will use it in the finally stanza to error out the remaining asked for messages in the cache
|
||||
try {
|
||||
|
|
@ -138,6 +124,7 @@ class ByIndex implements CacheHandler {
|
|||
cache.malformIndexes(start + i, start + amount);
|
||||
}
|
||||
}
|
||||
return cache.getByIndex(index);
|
||||
}
|
||||
|
||||
void add(MessageCache cache, MessageInfo messageInfo) {
|
||||
|
|
@ -221,7 +208,7 @@ Future<Message> messageHandler(BuildContext context, String profileOnion, int co
|
|||
MessageInfo? messageInfo = await cacheHandler.get(cwtch, profileOnion, conversationIdentifier, cache);
|
||||
|
||||
if (messageInfo != null) {
|
||||
return compileOverlay(messageInfo);
|
||||
return compileOverlay(messageInfo.metadata, messageInfo.wrapper);
|
||||
} else {
|
||||
return MalformedMessage(malformedMetadata);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,13 +98,31 @@ class MessageCache extends ChangeNotifier {
|
|||
this._storageMessageCount = newval;
|
||||
}
|
||||
|
||||
// On android reconnect, if backend supplied message count > UI message count, add the differnce to the front of the index
|
||||
void addFrontIndexGap(int count) {
|
||||
this._indexUnsynced = count;
|
||||
// On android reconnect, get unread message cound and the last seen Id
|
||||
// sync this data with what we have cached to determine if/how many messages are now at the front of the index that we don't have cached
|
||||
void addFrontIndexGap(int count, int lastSeenId) {
|
||||
// scan across indexed message the unread count amount (that's the last time UI/BE acked a message)
|
||||
// if we find the last seen ID, the diff of unread count is what's unsynced
|
||||
for(var i = 0; i < (count+1) && i < cacheByIndex.length; i++) {
|
||||
if (this.cacheByIndex[i].messageId == lastSeenId) {
|
||||
// we have found the matching lastSeenId so we can calculate the unsynced as the unread messages before it
|
||||
this._indexUnsynced = count - i;
|
||||
notifyListeners();
|
||||
return;
|
||||
}
|
||||
}
|
||||
// we did not find a matching index, diff to the back end is too great, reset index cache
|
||||
resetIndexCache();
|
||||
}
|
||||
|
||||
|
||||
int get indexUnsynced => _indexUnsynced;
|
||||
|
||||
void resetIndexCache() {
|
||||
this._indexUnsynced = 0;
|
||||
cacheByIndex = List.empty(growable: true);
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
MessageInfo? getById(int id) => cache[id];
|
||||
|
||||
Future<MessageInfo?> getByIndex(int index) async {
|
||||
|
|
@ -126,6 +144,7 @@ class MessageCache extends ChangeNotifier {
|
|||
if (contenthash != null && contenthash != "") {
|
||||
this.cacheByHash[contenthash] = messageID;
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
// inserts place holder values into the index cache that will block on .get() until .finishLoad() is called on them with message contents
|
||||
|
|
@ -156,6 +175,7 @@ class MessageCache extends ChangeNotifier {
|
|||
this.cacheByIndex.insert(index, LocalIndexMessage(messageInfo.metadata.messageID));
|
||||
}
|
||||
this.cacheByHash[messageInfo.metadata.contenthash] = messageInfo.metadata.messageID;
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void addUnindexed(MessageInfo messageInfo) {
|
||||
|
|
@ -163,6 +183,7 @@ class MessageCache extends ChangeNotifier {
|
|||
if (messageInfo.metadata.contenthash != "") {
|
||||
this.cacheByHash[messageInfo.metadata.contenthash] = messageInfo.metadata.messageID;
|
||||
}
|
||||
notifyListeners();
|
||||
}
|
||||
|
||||
void ackCache(int messageID) {
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@ class FileMessage extends Message {
|
|||
FileMessage(this.metadata, this.content);
|
||||
|
||||
@override
|
||||
Widget getWidget(BuildContext context, Key key, int index) {
|
||||
Widget getWidget(BuildContext context, Key key) {
|
||||
return ChangeNotifierProvider.value(
|
||||
value: this.metadata,
|
||||
builder: (bcontext, child) {
|
||||
dynamic shareObj = jsonDecode(this.content);
|
||||
if (shareObj == null) {
|
||||
return MessageRow(MalformedBubble(), index);
|
||||
return MessageRow(MalformedBubble());
|
||||
}
|
||||
String nameSuggestion = shareObj['f'] as String;
|
||||
String rootHash = shareObj['h'] as String;
|
||||
|
|
@ -39,10 +39,10 @@ class FileMessage extends Message {
|
|||
}
|
||||
|
||||
if (!validHash(rootHash, nonce)) {
|
||||
return MessageRow(MalformedBubble(), index);
|
||||
return MessageRow(MalformedBubble());
|
||||
}
|
||||
|
||||
return MessageRow(FileBubble(nameSuggestion, rootHash, nonce, fileSize, isAuto: metadata.isAuto), index, key: key);
|
||||
return MessageRow(FileBubble(nameSuggestion, rootHash, nonce, fileSize, isAuto: metadata.isAuto), key: key);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -53,19 +53,17 @@ class FileMessage extends Message {
|
|||
builder: (bcontext, child) {
|
||||
dynamic shareObj = jsonDecode(this.content);
|
||||
if (shareObj == null) {
|
||||
return MessageRow(MalformedBubble(), 0);
|
||||
return MessageRow(MalformedBubble());
|
||||
}
|
||||
String nameSuggestion = shareObj['n'] as String;
|
||||
String rootHash = shareObj['h'] as String;
|
||||
String nonce = shareObj['n'] as String;
|
||||
int fileSize = shareObj['s'] as int;
|
||||
if (!validHash(rootHash, nonce)) {
|
||||
return MessageRow(MalformedBubble(), 0);
|
||||
return MessageRow(MalformedBubble());
|
||||
}
|
||||
return Container(
|
||||
alignment: Alignment.center,
|
||||
width: 50,
|
||||
height: 50,
|
||||
child: FileBubble(
|
||||
nameSuggestion,
|
||||
rootHash,
|
||||
|
|
@ -73,7 +71,6 @@ class FileMessage extends Message {
|
|||
fileSize,
|
||||
isAuto: metadata.isAuto,
|
||||
interactive: false,
|
||||
isPreview: true,
|
||||
));
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class InviteMessage extends Message {
|
|||
InviteMessage(this.overlay, this.metadata, this.content);
|
||||
|
||||
@override
|
||||
Widget getWidget(BuildContext context, Key key, int index) {
|
||||
Widget getWidget(BuildContext context, Key key) {
|
||||
return ChangeNotifierProvider.value(
|
||||
value: this.metadata,
|
||||
builder: (bcontext, child) {
|
||||
|
|
@ -36,10 +36,10 @@ class InviteMessage extends Message {
|
|||
inviteTarget = jsonObj['GroupID'];
|
||||
inviteNick = jsonObj['GroupName'];
|
||||
} else {
|
||||
return MessageRow(MalformedBubble(), index);
|
||||
return MessageRow(MalformedBubble());
|
||||
}
|
||||
}
|
||||
return MessageRow(InvitationBubble(overlay, inviteTarget, inviteNick, invite), index, key: key);
|
||||
return MessageRow(InvitationBubble(overlay, inviteTarget, inviteNick, invite), key: key);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ class MalformedMessage extends Message {
|
|||
MalformedMessage(this.metadata);
|
||||
|
||||
@override
|
||||
Widget getWidget(BuildContext context, Key key, int index) {
|
||||
Widget getWidget(BuildContext context, Key key) {
|
||||
return ChangeNotifierProvider.value(
|
||||
value: this.metadata,
|
||||
builder: (context, child) {
|
||||
return MessageRow(MalformedBubble(), index, key: key);
|
||||
return MessageRow(MalformedBubble(), key: key);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
import 'dart:convert';
|
||||
|
||||
import 'package:cwtch/models/message.dart';
|
||||
import 'package:cwtch/models/messages/malformedmessage.dart';
|
||||
import 'package:cwtch/widgets/malformedbubble.dart';
|
||||
import 'package:cwtch/widgets/messagerow.dart';
|
||||
import 'package:cwtch/widgets/quotedmessage.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import '../../main.dart';
|
||||
import '../messagecache.dart';
|
||||
import '../profile.dart';
|
||||
|
||||
class QuotedMessageStructure {
|
||||
final String quotedHash;
|
||||
final String body;
|
||||
|
|
@ -29,14 +34,8 @@ class QuotedMessage extends Message {
|
|||
value: this.metadata,
|
||||
builder: (bcontext, child) {
|
||||
try {
|
||||
dynamic message = jsonDecode(
|
||||
this.content,
|
||||
);
|
||||
var content = message["body"];
|
||||
return Text(
|
||||
content,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
);
|
||||
dynamic message = jsonDecode(this.content);
|
||||
return Text(message["body"]);
|
||||
} catch (e) {
|
||||
return MalformedBubble();
|
||||
}
|
||||
|
|
@ -49,7 +48,7 @@ class QuotedMessage extends Message {
|
|||
}
|
||||
|
||||
@override
|
||||
Widget getWidget(BuildContext context, Key key, int index) {
|
||||
Widget getWidget(BuildContext context, Key key) {
|
||||
try {
|
||||
dynamic message = jsonDecode(this.content);
|
||||
|
||||
|
|
@ -60,8 +59,7 @@ class QuotedMessage extends Message {
|
|||
return ChangeNotifierProvider.value(
|
||||
value: this.metadata,
|
||||
builder: (bcontext, child) {
|
||||
return MessageRow(QuotedMessageBubble(message["body"], messageHandler(bcontext, metadata.profileOnion, metadata.conversationIdentifier, ByContentHash(message["quotedHash"]))), index,
|
||||
key: key);
|
||||
return MessageRow(QuotedMessageBubble(message["body"], messageHandler(bcontext, metadata.profileOnion, metadata.conversationIdentifier, ByContentHash(message["quotedHash"]))), key: key);
|
||||
});
|
||||
} catch (e) {
|
||||
return MalformedBubble();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
import 'dart:math';
|
||||
|
||||
import 'package:cwtch/models/message.dart';
|
||||
import 'package:cwtch/models/messages/malformedmessage.dart';
|
||||
import 'package:cwtch/widgets/malformedbubble.dart';
|
||||
|
|
@ -21,10 +19,7 @@ class TextMessage extends Message {
|
|||
return ChangeNotifierProvider.value(
|
||||
value: this.metadata,
|
||||
builder: (bcontext, child) {
|
||||
return Text(
|
||||
this.content,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
);
|
||||
return SelectableText(this.content);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -34,13 +29,12 @@ class TextMessage extends Message {
|
|||
}
|
||||
|
||||
@override
|
||||
Widget getWidget(BuildContext context, Key key, int index) {
|
||||
Widget getWidget(BuildContext context, Key key) {
|
||||
return ChangeNotifierProvider.value(
|
||||
value: this.metadata,
|
||||
builder: (bcontext, child) {
|
||||
return MessageRow(
|
||||
MessageBubble(this.content),
|
||||
index,
|
||||
key: key,
|
||||
);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -176,13 +176,14 @@ class ProfileInfoState extends ChangeNotifier {
|
|||
this._unreadMessages += contact["numUnread"] as int;
|
||||
if (profileContact != null) {
|
||||
profileContact.status = contact["status"];
|
||||
|
||||
var newCount = contact["numMessages"];
|
||||
if (newCount != profileContact.totalMessages) {
|
||||
profileContact.messageCache.addFrontIndexGap(newCount - profileContact.totalMessages);
|
||||
}
|
||||
profileContact.totalMessages = newCount;
|
||||
profileContact.totalMessages = contact["numMessages"];
|
||||
profileContact.unreadMessages = contact["numUnread"];
|
||||
|
||||
if (contact["numUnread"] > MaxUnreadBeforeCacheReset || (contact["numUnread"] > 0 && contact["lastSeenMessageId"] == -1)) {
|
||||
profileContact.messageCache.resetIndexCache();
|
||||
} else if (contact["numUnread"] > 0) {
|
||||
profileContact.messageCache.addFrontIndexGap(contact["numUnread"], contact["lastSeenMessageId"]);
|
||||
}
|
||||
profileContact.lastMessageTime = DateTime.fromMillisecondsSinceEpoch(1000 * int.parse(contact["lastMsgTime"]));
|
||||
} else {
|
||||
this._contacts.add(ContactInfoState(
|
||||
|
|
@ -349,9 +350,4 @@ class ProfileInfoState extends ChangeNotifier {
|
|||
int cacheMemUsage() {
|
||||
return _contacts.cacheMemUsage();
|
||||
}
|
||||
|
||||
void downloadReset(String fileKey) {
|
||||
this._downloads.remove(fileKey);
|
||||
notifyListeners();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,10 +73,10 @@ class LinuxNotificationsManager implements NotificationsManager {
|
|||
|
||||
// Cwtch can install in non flutter supported ways on linux, this code detects where the assets are on Linux
|
||||
Future<String> detectLinuxAssetsPath() async {
|
||||
var devStat = FileStat.stat("assets");
|
||||
var localStat = FileStat.stat("data/flutter_assets");
|
||||
var homeStat = FileStat.stat((Platform.environment["HOME"] ?? "") + "/.local/share/cwtch/data/flutter_assets");
|
||||
var rootStat = FileStat.stat("/usr/share/cwtch/data/flutter_assets");
|
||||
var devStat = FileStat.stat("assets");
|
||||
var localStat = FileStat.stat("data/flutter_assets");
|
||||
var homeStat = FileStat.stat((Platform.environment["HOME"] ?? "") + "/.local/share/cwtch/data/flutter_assets");
|
||||
var rootStat = FileStat.stat("/usr/share/cwtch/data/flutter_assets");
|
||||
|
||||
if ((await devStat).type == FileSystemEntityType.directory) {
|
||||
return Directory.current.path; //appPath;
|
||||
|
|
@ -94,7 +94,7 @@ class LinuxNotificationsManager implements NotificationsManager {
|
|||
var iconPath = Uri.file(path.join(assetsPath, "assets/knott.png"));
|
||||
client.notify(message, appName: "cwtch", appIcon: iconPath.toString(), replacesId: this.previous_id).then((linux_notifications.Notification value) async {
|
||||
previous_id = value.id;
|
||||
if ((await value.closeReason) == linux_notifications.NotificationClosedReason.dismissed) {
|
||||
if ((await value.closeReason) == linux_notifications.NotificationClosedReason.dismissed) {
|
||||
this.notificationSelectConvo(profile, conversationId);
|
||||
}
|
||||
});
|
||||
|
|
@ -115,9 +115,9 @@ class NotificationPayload {
|
|||
convoId = json['convoId'];
|
||||
|
||||
Map<String, dynamic> toJson() => {
|
||||
'profileOnion': profileOnion,
|
||||
'convoId': convoId,
|
||||
};
|
||||
'profileOnion': profileOnion,
|
||||
'convoId': convoId,
|
||||
};
|
||||
}
|
||||
|
||||
// FlutterLocalNotificationsPlugin based NotificationManager that handles MacOS
|
||||
|
|
@ -138,10 +138,10 @@ class NixNotificationManager implements NotificationsManager {
|
|||
final InitializationSettings initializationSettings = InitializationSettings(android: null, iOS: null, macOS: initializationSettingsMacOS, linux: initializationSettingsLinux);
|
||||
scheduleMicrotask(() async {
|
||||
flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<MacOSFlutterLocalNotificationsPlugin>()?.requestPermissions(
|
||||
alert: true,
|
||||
badge: false,
|
||||
sound: false,
|
||||
);
|
||||
alert: true,
|
||||
badge: false,
|
||||
sound: false,
|
||||
);
|
||||
|
||||
await flutterLocalNotificationsPlugin.initialize(initializationSettings, onSelectNotification: selectNotification);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
|||
child: Container(
|
||||
margin: EdgeInsets.all(30),
|
||||
padding: EdgeInsets.all(20),
|
||||
child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: [
|
||||
child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch, children: [
|
||||
Visibility(
|
||||
visible: Provider.of<ProfileInfoState>(context).onion.isNotEmpty,
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
|
||||
|
|
@ -127,9 +127,6 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
|||
badgeEdit: Provider.of<Settings>(context).isExperimentEnabled(ImagePreviewsExperiment))))
|
||||
])),
|
||||
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
CwtchLabel(label: AppLocalizations.of(context)!.displayNameLabel),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
|
|
@ -276,71 +273,64 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
|||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: _createPressed,
|
||||
style: ElevatedButton.styleFrom(
|
||||
minimumSize: Size(400, 50),
|
||||
maximumSize: Size(800, 50),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))),
|
||||
),
|
||||
child: Text(
|
||||
Provider.of<ProfileInfoState>(context).onion.isEmpty ? AppLocalizations.of(context)!.addNewProfileBtn : AppLocalizations.of(context)!.saveProfileBtn,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Expanded(
|
||||
child: ElevatedButton(
|
||||
onPressed: _createPressed,
|
||||
child: Text(
|
||||
Provider.of<ProfileInfoState>(context).onion.isEmpty ? AppLocalizations.of(context)!.addNewProfileBtn : AppLocalizations.of(context)!.saveProfileBtn,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
Visibility(
|
||||
visible: Provider.of<ProfileInfoState>(context, listen: false).onion.isNotEmpty,
|
||||
child: Tooltip(
|
||||
message: AppLocalizations.of(context)!.exportProfileTooltip,
|
||||
child: ElevatedButton.icon(
|
||||
style: ElevatedButton.styleFrom(
|
||||
minimumSize: Size(400, 50),
|
||||
maximumSize: Size(800, 50),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))),
|
||||
),
|
||||
onPressed: () {
|
||||
if (Platform.isAndroid) {
|
||||
Provider.of<FlwtchState>(context, listen: false).cwtch.ExportProfile(ctrlrOnion.value.text, ctrlrOnion.value.text + ".tar.gz");
|
||||
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.fileSavedTo + " " + ctrlrOnion.value.text + ".tar.gz"));
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
} else {
|
||||
showCreateFilePicker(context).then((name) {
|
||||
if (name != null) {
|
||||
Provider.of<FlwtchState>(context, listen: false).cwtch.ExportProfile(ctrlrOnion.value.text, name);
|
||||
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.fileSavedTo + " " + name));
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
icon: Icon(Icons.import_export),
|
||||
label: Text(AppLocalizations.of(context)!.exportProfile),
|
||||
))),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.end, children: [
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Tooltip(
|
||||
message: AppLocalizations.of(context)!.exportProfileTooltip,
|
||||
child: ElevatedButton.icon(
|
||||
onPressed: () {
|
||||
if (Platform.isAndroid) {
|
||||
Provider.of<FlwtchState>(context, listen: false).cwtch.ExportProfile(ctrlrOnion.value.text, ctrlrOnion.value.text + ".tar.gz");
|
||||
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.fileSavedTo + " " + ctrlrOnion.value.text + ".tar.gz"));
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
} else {
|
||||
showCreateFilePicker(context).then((name) {
|
||||
if (name != null) {
|
||||
Provider.of<FlwtchState>(context, listen: false).cwtch.ExportProfile(ctrlrOnion.value.text, name);
|
||||
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.fileSavedTo + " " + name));
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
icon: Icon(Icons.import_export),
|
||||
label: Text(AppLocalizations.of(context)!.exportProfile),
|
||||
))
|
||||
])),
|
||||
Visibility(
|
||||
visible: Provider.of<ProfileInfoState>(context, listen: false).onion.isNotEmpty,
|
||||
child: Tooltip(
|
||||
message: AppLocalizations.of(context)!.enterCurrentPasswordForDelete,
|
||||
child: ElevatedButton.icon(
|
||||
style: ElevatedButton.styleFrom(
|
||||
minimumSize: Size(400, 50),
|
||||
maximumSize: Size(800, 50),
|
||||
shape: RoundedRectangleBorder(
|
||||
side: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor, width: 2.0),
|
||||
borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))),
|
||||
primary: Provider.of<Settings>(context).theme.backgroundMainColor,
|
||||
),
|
||||
onPressed: () {
|
||||
showAlertDialog(context);
|
||||
},
|
||||
icon: Icon(Icons.delete_forever),
|
||||
label: Text(AppLocalizations.of(context)!.deleteBtn),
|
||||
)))
|
||||
child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.end, children: [
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Tooltip(
|
||||
message: AppLocalizations.of(context)!.enterCurrentPasswordForDelete,
|
||||
child: ElevatedButton.icon(
|
||||
onPressed: () {
|
||||
showAlertDialog(context);
|
||||
},
|
||||
icon: Icon(Icons.delete_forever),
|
||||
label: Text(AppLocalizations.of(context)!.deleteBtn),
|
||||
))
|
||||
]))
|
||||
]))))));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -29,21 +29,16 @@ class ContactsView extends StatefulWidget {
|
|||
// selectConversation can be called from anywhere to set the active conversation
|
||||
void selectConversation(BuildContext context, int handle) {
|
||||
// requery instead of using contactinfostate directly because sometimes listview gets confused about data that resorts
|
||||
var unread = Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle)!.unreadMessages;
|
||||
var previouslySelected = Provider.of<AppState>(context, listen: false).selectedConversation;
|
||||
if (previouslySelected != null) {
|
||||
Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(previouslySelected)!.unselected();
|
||||
}
|
||||
Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle)!.selected();
|
||||
var initialIndex = Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle)!.unreadMessages;
|
||||
Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle)!.unreadMessages = 0;
|
||||
// triggers update in Double/TripleColumnView
|
||||
Provider.of<AppState>(context, listen: false).initialScrollIndex = unread;
|
||||
Provider.of<AppState>(context, listen: false).initialScrollIndex = initialIndex;
|
||||
Provider.of<AppState>(context, listen: false).selectedConversation = handle;
|
||||
Provider.of<AppState>(context, listen: false).selectedIndex = null;
|
||||
Provider.of<AppState>(context, listen: false).hoveredIndex = -1;
|
||||
// if in singlepane mode, push to the stack
|
||||
var isLandscape = Provider.of<AppState>(context, listen: false).isLandscape(context);
|
||||
if (Provider.of<Settings>(context, listen: false).uiColumns(isLandscape).length == 1) _pushMessageView(context, handle);
|
||||
|
||||
// Set last message seen time in backend
|
||||
Provider.of<FlwtchState>(context, listen: false)
|
||||
.cwtch
|
||||
|
|
@ -135,10 +130,7 @@ class _ContactsViewState extends State<ContactsView> {
|
|||
floatingActionButton: FloatingActionButton(
|
||||
onPressed: _modalAddImportChoice,
|
||||
tooltip: AppLocalizations.of(context)!.tooltipAddContact,
|
||||
child: Icon(
|
||||
CwtchIcons.person_add_alt_1_24px,
|
||||
color: Provider.of<Settings>(context).theme.defaultButtonTextColor,
|
||||
),
|
||||
child: Icon(CwtchIcons.person_add_alt_1_24px, color: Provider.of<Settings>(context).theme.defaultButtonTextColor,),
|
||||
),
|
||||
body: showSearchBar || Provider.of<ContactListState>(context).isFiltered ? _buildFilterable() : _buildContactList());
|
||||
}
|
||||
|
|
@ -255,86 +247,61 @@ class _ContactsViewState extends State<ContactsView> {
|
|||
height: 200, // bespoke value courtesy of the [TextField] docs
|
||||
child: Center(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(2.0),
|
||||
padding: EdgeInsets.all(10.0),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
|
||||
Spacer(),
|
||||
Expanded(
|
||||
child: Tooltip(
|
||||
message: AppLocalizations.of(context)!.tooltipAddContact,
|
||||
child: ElevatedButton(
|
||||
child: Text(AppLocalizations.of(context)!.addContact, semanticsLabel: AppLocalizations.of(context)!.addContact),
|
||||
onPressed: () {
|
||||
_pushAddContact(false);
|
||||
},
|
||||
))),
|
||||
Spacer()
|
||||
]),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Expanded(
|
||||
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
|
||||
Spacer(),
|
||||
Expanded(
|
||||
child: Tooltip(
|
||||
message: AppLocalizations.of(context)!.tooltipAddContact,
|
||||
message: groupsEnabled ? AppLocalizations.of(context)!.addServerTooltip : AppLocalizations.of(context)!.thisFeatureRequiresGroupExpermientsToBeEnabled,
|
||||
child: ElevatedButton(
|
||||
style: ElevatedButton.styleFrom(
|
||||
minimumSize: Size.fromWidth(double.infinity),
|
||||
maximumSize: Size.fromWidth(400),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))),
|
||||
),
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.addContact,
|
||||
semanticsLabel: AppLocalizations.of(context)!.addContact,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
onPressed: () {
|
||||
_pushAddContact(false);
|
||||
},
|
||||
))),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Expanded(
|
||||
child: Tooltip(
|
||||
message: groupsEnabled ? AppLocalizations.of(context)!.addServerTooltip : AppLocalizations.of(context)!.thisFeatureRequiresGroupExpermientsToBeEnabled,
|
||||
child: ElevatedButton(
|
||||
style: ElevatedButton.styleFrom(
|
||||
minimumSize: Size.fromWidth(double.infinity),
|
||||
maximumSize: Size.fromWidth(400),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))),
|
||||
),
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.addServerTitle,
|
||||
semanticsLabel: AppLocalizations.of(context)!.addServerTitle,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
onPressed: groupsEnabled
|
||||
? () {
|
||||
_pushAddContact(false);
|
||||
}
|
||||
: null,
|
||||
)),
|
||||
),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Expanded(
|
||||
child: Tooltip(
|
||||
message: groupsEnabled ? AppLocalizations.of(context)!.createGroupTitle : AppLocalizations.of(context)!.thisFeatureRequiresGroupExpermientsToBeEnabled,
|
||||
child: ElevatedButton(
|
||||
style: ElevatedButton.styleFrom(
|
||||
minimumSize: Size.fromWidth(double.infinity),
|
||||
maximumSize: Size.fromWidth(400),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))),
|
||||
),
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.createGroupTitle,
|
||||
semanticsLabel: AppLocalizations.of(context)!.createGroupTitle,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
child: Text(AppLocalizations.of(context)!.addServerTitle, semanticsLabel: AppLocalizations.of(context)!.addServerTitle),
|
||||
onPressed: groupsEnabled
|
||||
? () {
|
||||
_pushAddContact(true);
|
||||
_pushAddContact(false);
|
||||
}
|
||||
: null,
|
||||
))),
|
||||
)),
|
||||
),
|
||||
Spacer()
|
||||
]),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
|
||||
Spacer(),
|
||||
Expanded(
|
||||
child: Tooltip(
|
||||
message: groupsEnabled ? AppLocalizations.of(context)!.createGroupTitle : AppLocalizations.of(context)!.thisFeatureRequiresGroupExpermientsToBeEnabled,
|
||||
child: ElevatedButton(
|
||||
child: Text(AppLocalizations.of(context)!.createGroupTitle, semanticsLabel: AppLocalizations.of(context)!.createGroupTitle),
|
||||
onPressed: groupsEnabled
|
||||
? () {
|
||||
_pushAddContact(true);
|
||||
}
|
||||
: null,
|
||||
))),
|
||||
Spacer()
|
||||
]),
|
||||
],
|
||||
))),
|
||||
)));
|
||||
|
|
|
|||
|
|
@ -107,23 +107,20 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
ListTile(
|
||||
title: Text(AppLocalizations.of(context)!.settingLanguage, style: TextStyle(color: settings.current().mainTextColor)),
|
||||
leading: Icon(CwtchIcons.change_language, color: settings.current().mainTextColor),
|
||||
trailing: Container(
|
||||
width: MediaQuery.of(context).size.width / 4,
|
||||
child: DropdownButton(
|
||||
isExpanded: true,
|
||||
value: Provider.of<Settings>(context).locale.languageCode,
|
||||
onChanged: (String? newValue) {
|
||||
setState(() {
|
||||
settings.switchLocale(Locale(newValue!));
|
||||
saveSettings(context);
|
||||
});
|
||||
},
|
||||
items: AppLocalizations.supportedLocales.map<DropdownMenuItem<String>>((Locale value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value.languageCode,
|
||||
child: Text(getLanguageFull(context, value.languageCode)),
|
||||
);
|
||||
}).toList()))),
|
||||
trailing: DropdownButton(
|
||||
value: Provider.of<Settings>(context).locale.languageCode,
|
||||
onChanged: (String? newValue) {
|
||||
setState(() {
|
||||
settings.switchLocale(Locale(newValue!));
|
||||
saveSettings(context);
|
||||
});
|
||||
},
|
||||
items: AppLocalizations.supportedLocales.map<DropdownMenuItem<String>>((Locale value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value.languageCode,
|
||||
child: Text(getLanguageFull(context, value.languageCode)),
|
||||
);
|
||||
}).toList())),
|
||||
SwitchListTile(
|
||||
title: Text(AppLocalizations.of(context)!.settingTheme, style: TextStyle(color: settings.current().mainTextColor)),
|
||||
value: settings.current().mode == mode_light,
|
||||
|
|
@ -143,44 +140,39 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
),
|
||||
ListTile(
|
||||
title: Text(AppLocalizations.of(context)!.themeColorLabel),
|
||||
trailing: Container(
|
||||
width: MediaQuery.of(context).size.width / 4,
|
||||
child: DropdownButton<String>(
|
||||
key: Key("DropdownTheme"),
|
||||
isExpanded: true,
|
||||
value: Provider.of<Settings>(context).theme.theme,
|
||||
onChanged: (String? newValue) {
|
||||
setState(() {
|
||||
settings.setTheme(newValue!, settings.theme.mode);
|
||||
saveSettings(context);
|
||||
});
|
||||
},
|
||||
items: themes.keys.map<DropdownMenuItem<String>>((String themeId) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: themeId,
|
||||
child: Text(getThemeName(context, themeId)), //"ddi_$themeId", key: Key("ddi_$themeId")),
|
||||
);
|
||||
}).toList())),
|
||||
leading: Icon(Icons.palette, color: settings.current().mainTextColor),
|
||||
trailing: DropdownButton<String>(
|
||||
key: Key("DropdownTheme"),
|
||||
isDense: true,
|
||||
value: Provider.of<Settings>(context).theme.theme,
|
||||
onChanged: (String? newValue) {
|
||||
setState(() {
|
||||
settings.setTheme(newValue!, settings.theme.mode);
|
||||
saveSettings(context);
|
||||
});
|
||||
},
|
||||
items: themes.keys.map<DropdownMenuItem<String>>((String themeId) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: themeId,
|
||||
child: Text(getThemeName(context, themeId)), //"ddi_$themeId", key: Key("ddi_$themeId")),
|
||||
);
|
||||
}).toList()),
|
||||
leading: Icon(CwtchIcons.change_theme, color: settings.current().mainTextColor),
|
||||
),
|
||||
ListTile(
|
||||
title: Text(AppLocalizations.of(context)!.settingUIColumnPortrait, style: TextStyle(color: settings.current().mainTextColor)),
|
||||
leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
|
||||
trailing: Container(
|
||||
width: MediaQuery.of(context).size.width / 4,
|
||||
child: DropdownButton(
|
||||
isExpanded: true,
|
||||
value: settings.uiColumnModePortrait.toString(),
|
||||
onChanged: (String? newValue) {
|
||||
settings.uiColumnModePortrait = Settings.uiColumnModeFromString(newValue!);
|
||||
saveSettings(context);
|
||||
},
|
||||
items: Settings.uiColumnModeOptions(false).map<DropdownMenuItem<String>>((DualpaneMode value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value.toString(),
|
||||
child: Text(Settings.uiColumnModeToString(value, context)),
|
||||
);
|
||||
}).toList()))),
|
||||
trailing: DropdownButton(
|
||||
value: settings.uiColumnModePortrait.toString(),
|
||||
onChanged: (String? newValue) {
|
||||
settings.uiColumnModePortrait = Settings.uiColumnModeFromString(newValue!);
|
||||
saveSettings(context);
|
||||
},
|
||||
items: Settings.uiColumnModeOptions(false).map<DropdownMenuItem<String>>((DualpaneMode value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value.toString(),
|
||||
child: Text(Settings.uiColumnModeToString(value, context)),
|
||||
);
|
||||
}).toList())),
|
||||
ListTile(
|
||||
title: Text(
|
||||
AppLocalizations.of(context)!.settingUIColumnLandscape,
|
||||
|
|
@ -188,27 +180,25 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
softWrap: true,
|
||||
style: TextStyle(color: settings.current().mainTextColor),
|
||||
),
|
||||
leading: Icon(Icons.stay_primary_landscape, color: settings.current().mainTextColor),
|
||||
leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
|
||||
trailing: Container(
|
||||
width: MediaQuery.of(context).size.width / 4,
|
||||
child: Container(
|
||||
width: MediaQuery.of(context).size.width / 4,
|
||||
child: DropdownButton(
|
||||
isExpanded: true,
|
||||
value: settings.uiColumnModeLandscape.toString(),
|
||||
onChanged: (String? newValue) {
|
||||
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
|
||||
saveSettings(context);
|
||||
},
|
||||
items: Settings.uiColumnModeOptions(true).map<DropdownMenuItem<String>>((DualpaneMode value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value.toString(),
|
||||
child: Text(
|
||||
Settings.uiColumnModeToString(value, context),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
);
|
||||
}).toList())))),
|
||||
child: DropdownButton(
|
||||
isExpanded: true,
|
||||
value: settings.uiColumnModeLandscape.toString(),
|
||||
onChanged: (String? newValue) {
|
||||
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
|
||||
saveSettings(context);
|
||||
},
|
||||
items: Settings.uiColumnModeOptions(true).map<DropdownMenuItem<String>>((DualpaneMode value) {
|
||||
return DropdownMenuItem<String>(
|
||||
value: value.toString(),
|
||||
child: Text(
|
||||
Settings.uiColumnModeToString(value, context),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
);
|
||||
}).toList()))),
|
||||
SwitchListTile(
|
||||
title: Text(AppLocalizations.of(context)!.streamerModeLabel, style: TextStyle(color: settings.current().mainTextColor)),
|
||||
subtitle: Text(AppLocalizations.of(context)!.descriptionStreamerMode),
|
||||
|
|
@ -248,24 +238,21 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
ListTile(
|
||||
title: Text(AppLocalizations.of(context)!.notificationPolicySettingLabel),
|
||||
subtitle: Text(AppLocalizations.of(context)!.notificationPolicySettingDescription),
|
||||
trailing: Container(
|
||||
width: MediaQuery.of(context).size.width / 4,
|
||||
child: DropdownButton(
|
||||
isExpanded: true,
|
||||
value: settings.notificationPolicy,
|
||||
onChanged: (NotificationPolicy? newValue) {
|
||||
settings.notificationPolicy = newValue!;
|
||||
saveSettings(context);
|
||||
},
|
||||
items: NotificationPolicy.values.map<DropdownMenuItem<NotificationPolicy>>((NotificationPolicy value) {
|
||||
return DropdownMenuItem<NotificationPolicy>(
|
||||
value: value,
|
||||
child: Text(
|
||||
Settings.notificationPolicyToString(value, context),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
);
|
||||
}).toList())),
|
||||
trailing: DropdownButton(
|
||||
value: settings.notificationPolicy,
|
||||
onChanged: (NotificationPolicy? newValue) {
|
||||
settings.notificationPolicy = newValue!;
|
||||
saveSettings(context);
|
||||
},
|
||||
items: NotificationPolicy.values.map<DropdownMenuItem<NotificationPolicy>>((NotificationPolicy value) {
|
||||
return DropdownMenuItem<NotificationPolicy>(
|
||||
value: value,
|
||||
child: Text(
|
||||
Settings.notificationPolicyToString(value, context),
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
);
|
||||
}).toList()),
|
||||
leading: Icon(CwtchIcons.chat_bubble_empty_24px, color: settings.current().mainTextColor),
|
||||
),
|
||||
ListTile(
|
||||
|
|
@ -406,7 +393,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
},
|
||||
activeTrackColor: settings.theme.defaultButtonActiveColor,
|
||||
inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
|
||||
secondary: Icon(Icons.photo, color: settings.current().mainTextColor),
|
||||
secondary: Icon(Icons.attach_file, color: settings.current().mainTextColor),
|
||||
),
|
||||
Visibility(
|
||||
visible: settings.isExperimentEnabled(ImagePreviewsExperiment) && !Platform.isAndroid,
|
||||
|
|
@ -477,7 +464,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
Visibility(
|
||||
visible: EnvironmentConfig.BUILD_VER == dev_version && !Platform.isAndroid,
|
||||
child: FutureBuilder(
|
||||
future: EnvironmentConfig.BUILD_VER != dev_version || Platform.isAndroid ? null : Provider.of<FlwtchState>(context).cwtch.GetDebugInfo(),
|
||||
future: EnvironmentConfig.BUILD_VER != dev_version ||Platform.isAndroid ? null : Provider.of<FlwtchState>(context).cwtch.GetDebugInfo(),
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData) {
|
||||
return Column(
|
||||
|
|
|
|||
|
|
@ -183,9 +183,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
|
|||
onPressed: () {
|
||||
showAlertDialog(context);
|
||||
},
|
||||
style: ButtonStyle(
|
||||
backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor),
|
||||
foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)),
|
||||
style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor), foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)),
|
||||
icon: Icon(CwtchIcons.leave_group),
|
||||
label: Text(
|
||||
AppLocalizations.of(context)!.leaveConversation,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
import 'dart:ui';
|
||||
import 'package:crypto/crypto.dart';
|
||||
import 'package:cwtch/cwtch/cwtch.dart';
|
||||
import 'package:cwtch/cwtch_icons_icons.dart';
|
||||
|
|
@ -8,10 +7,8 @@ import 'package:cwtch/models/appstate.dart';
|
|||
import 'package:cwtch/models/chatmessage.dart';
|
||||
import 'package:cwtch/models/contact.dart';
|
||||
import 'package:cwtch/models/message.dart';
|
||||
import 'package:cwtch/models/messagecache.dart';
|
||||
import 'package:cwtch/models/messages/quotedmessage.dart';
|
||||
import 'package:cwtch/models/profile.dart';
|
||||
import 'package:cwtch/third_party/linkify/flutter_linkify.dart';
|
||||
import 'package:cwtch/widgets/malformedbubble.dart';
|
||||
import 'package:cwtch/widgets/messageloadingbubble.dart';
|
||||
import 'package:cwtch/widgets/profileimage.dart';
|
||||
|
|
@ -27,7 +24,6 @@ import 'package:provider/provider.dart';
|
|||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
|
||||
|
||||
import '../config.dart';
|
||||
import '../constants.dart';
|
||||
import '../main.dart';
|
||||
import '../settings.dart';
|
||||
|
|
@ -44,9 +40,8 @@ class _MessageViewState extends State<MessageView> {
|
|||
final focusNode = FocusNode();
|
||||
int selectedContact = -1;
|
||||
ItemPositionsListener scrollListener = ItemPositionsListener.create();
|
||||
ItemScrollController scrollController = ItemScrollController();
|
||||
File? imagePreview;
|
||||
bool showDown = false;
|
||||
bool showPreview = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
|
|
@ -57,12 +52,6 @@ class _MessageViewState extends State<MessageView> {
|
|||
Provider.of<AppState>(context, listen: false).initialScrollIndex = 0;
|
||||
Provider.of<AppState>(context, listen: false).unreadMessagesBelow = false;
|
||||
}
|
||||
|
||||
if (scrollListener.itemPositions.value.length != 0 && !scrollListener.itemPositions.value.any((element) => element.index == 0)) {
|
||||
showDown = true;
|
||||
} else {
|
||||
showDown = false;
|
||||
}
|
||||
});
|
||||
super.initState();
|
||||
}
|
||||
|
|
@ -90,11 +79,10 @@ class _MessageViewState extends State<MessageView> {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
// After leaving a conversation the selected conversation is set to null...
|
||||
if (Provider.of<ContactInfoState>(context, listen: false).profileOnion == "") {
|
||||
if (Provider.of<ContactInfoState>(context).profileOnion == "") {
|
||||
return Card(child: Center(child: Text(AppLocalizations.of(context)!.addContactFirst)));
|
||||
}
|
||||
|
||||
var showMessageFormattingPreview = Provider.of<Settings>(context).isExperimentEnabled(FormattingExperiment);
|
||||
var showFileSharing = Provider.of<Settings>(context).isExperimentEnabled(FileSharingExperiment);
|
||||
var appBarButtons = <Widget>[];
|
||||
if (Provider.of<ContactInfoState>(context).isOnline()) {
|
||||
|
|
@ -138,26 +126,18 @@ class _MessageViewState extends State<MessageView> {
|
|||
onWillPop: _onWillPop,
|
||||
child: Scaffold(
|
||||
backgroundColor: Provider.of<Settings>(context).theme.backgroundMainColor,
|
||||
floatingActionButton: showDown
|
||||
floatingActionButton: appState.unreadMessagesBelow
|
||||
? FloatingActionButton(
|
||||
child: Icon(Icons.arrow_downward, color: Provider.of<Settings>(context).current().defaultButtonTextColor),
|
||||
onPressed: () {
|
||||
Provider.of<AppState>(context, listen: false).initialScrollIndex = 0;
|
||||
Provider.of<AppState>(context, listen: false).unreadMessagesBelow = false;
|
||||
Provider.of<ContactInfoState>(context).messageScrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600));
|
||||
scrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600));
|
||||
})
|
||||
: null,
|
||||
appBar: AppBar(
|
||||
// setting leading(Width) to null makes it do the default behaviour; container() hides it
|
||||
leadingWidth: Provider.of<Settings>(context).uiColumns(appState.isLandscape(context)).length > 1 ? 0 : null,
|
||||
leading: Provider.of<Settings>(context).uiColumns(appState.isLandscape(context)).length > 1
|
||||
? Container(
|
||||
padding: EdgeInsets.zero,
|
||||
margin: EdgeInsets.zero,
|
||||
width: 0,
|
||||
height: 0,
|
||||
)
|
||||
: null,
|
||||
// setting leading to null makes it do the default behaviour; container() hides it
|
||||
leading: Provider.of<Settings>(context).uiColumns(appState.isLandscape(context)).length > 1 ? Container() : null,
|
||||
title: Row(children: [
|
||||
ProfileImage(
|
||||
imagePath: Provider.of<Settings>(context).isExperimentEnabled(ImagePreviewsExperiment)
|
||||
|
|
@ -179,23 +159,13 @@ class _MessageViewState extends State<MessageView> {
|
|||
]),
|
||||
actions: appBarButtons,
|
||||
),
|
||||
body: Padding(
|
||||
padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 182.0),
|
||||
child: MessageList(
|
||||
scrollListener,
|
||||
)),
|
||||
bottomSheet: showPreview && showMessageFormattingPreview ? _buildPreviewBox() : _buildComposeBox(),
|
||||
body: Padding(padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 108.0), child: MessageList(scrollController, scrollListener)),
|
||||
bottomSheet: _buildComposeBox(),
|
||||
));
|
||||
}
|
||||
|
||||
Future<bool> _onWillPop() async {
|
||||
Provider.of<ContactInfoState>(context, listen: false).unreadMessages = 0;
|
||||
|
||||
var previouslySelected = Provider.of<AppState>(context, listen: false).selectedConversation;
|
||||
if (previouslySelected != null) {
|
||||
Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(previouslySelected)!.unselected();
|
||||
}
|
||||
|
||||
Provider.of<AppState>(context, listen: false).selectedConversation = null;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -246,13 +216,14 @@ class _MessageViewState extends State<MessageView> {
|
|||
|
||||
if (ctrlrCompose.value.text.isNotEmpty && lengthOk) {
|
||||
if (Provider.of<AppState>(context, listen: false).selectedConversation != null && Provider.of<AppState>(context, listen: false).selectedIndex != null) {
|
||||
var conversationId = Provider.of<AppState>(context, listen: false).selectedConversation!;
|
||||
MessageCache? cache = Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(conversationId)?.messageCache;
|
||||
ById(Provider.of<AppState>(context, listen: false).selectedIndex!)
|
||||
.get(Provider.of<FlwtchState>(context, listen: false).cwtch, Provider.of<AppState>(context, listen: false).selectedProfile!, conversationId, cache!)
|
||||
.then((MessageInfo? data) {
|
||||
Provider.of<FlwtchState>(context, listen: false)
|
||||
.cwtch
|
||||
.GetMessageByID(Provider.of<AppState>(context, listen: false).selectedProfile!, Provider.of<AppState>(context, listen: false).selectedConversation!,
|
||||
Provider.of<AppState>(context, listen: false).selectedIndex!)
|
||||
.then((data) {
|
||||
try {
|
||||
var bytes1 = utf8.encode(data!.metadata.senderHandle + data.wrapper);
|
||||
var messageWrapper = jsonDecode(data! as String);
|
||||
var bytes1 = utf8.encode(messageWrapper["PeerID"] + messageWrapper['Message']);
|
||||
var digest1 = sha256.convert(bytes1);
|
||||
var contentHash = base64Encode(digest1.bytes);
|
||||
var quotedMessage = jsonEncode(QuotedMessageStructure(contentHash, ctrlrCompose.value.text));
|
||||
|
|
@ -261,9 +232,7 @@ class _MessageViewState extends State<MessageView> {
|
|||
.cwtch
|
||||
.SendMessage(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).identifier, jsonEncode(cm))
|
||||
.then(_sendMessageHandler);
|
||||
} catch (e) {
|
||||
EnvironmentConfig.debugLog("Exception: reply to message could not be found: " + e.toString());
|
||||
}
|
||||
} catch (e) {}
|
||||
Provider.of<AppState>(context, listen: false).selectedIndex = null;
|
||||
});
|
||||
} else {
|
||||
|
|
@ -317,216 +286,64 @@ class _MessageViewState extends State<MessageView> {
|
|||
Provider.of<FlwtchState>(context, listen: false).cwtch.SetConversationAttribute(profileOnion, identifier, LastMessageSeenTimeKey, DateTime.now().toIso8601String());
|
||||
}
|
||||
|
||||
Widget _buildPreviewBox() {
|
||||
var showClickableLinks = Provider.of<Settings>(context).isExperimentEnabled(ClickableLinksExperiment);
|
||||
Widget _buildComposeBox() {
|
||||
bool isOffline = Provider.of<ContactInfoState>(context).isOnline() == false;
|
||||
bool isGroup = Provider.of<ContactInfoState>(context).isGroup;
|
||||
|
||||
var wdgMessage = Padding(
|
||||
padding: EdgeInsets.all(8),
|
||||
child: SelectableLinkify(
|
||||
text: ctrlrCompose.text + '\n',
|
||||
options: LinkifyOptions(messageFormatting: true, parseLinks: showClickableLinks, looseUrl: true, defaultToHttps: true),
|
||||
linkifiers: [UrlLinkifier()],
|
||||
onOpen: showClickableLinks ? null : null,
|
||||
style: TextStyle(
|
||||
color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
|
||||
fontSize: 16,
|
||||
),
|
||||
linkStyle: TextStyle(
|
||||
color: Provider.of<Settings>(context).theme.messageFromMeTextColor,
|
||||
fontSize: 16,
|
||||
),
|
||||
codeStyle: TextStyle(
|
||||
// note: these colors are flipped
|
||||
fontSize: 16,
|
||||
color: Provider.of<Settings>(context).theme.messageFromOtherTextColor,
|
||||
backgroundColor: Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor),
|
||||
textAlign: TextAlign.left,
|
||||
textWidthBasis: TextWidthBasis.longestLine,
|
||||
));
|
||||
|
||||
var showMessageFormattingPreview = Provider.of<Settings>(context).isExperimentEnabled(FormattingExperiment);
|
||||
var preview = showMessageFormattingPreview
|
||||
? IconButton(
|
||||
icon: Icon(Icons.text_fields),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
showPreview = false;
|
||||
});
|
||||
})
|
||||
: Container();
|
||||
var charLength = ctrlrCompose.value.text.characters.length;
|
||||
var expectedLength = ctrlrCompose.value.text.length;
|
||||
var numberOfBytesMoreThanChar = (expectedLength - charLength);
|
||||
|
||||
var composeBox = Container(
|
||||
color: Provider.of<Settings>(context).theme.backgroundMainColor,
|
||||
padding: EdgeInsets.all(2),
|
||||
margin: EdgeInsets.all(2),
|
||||
|
||||
// 164 minimum height + 16px for every line of text so the entire message is displayed when previewed.
|
||||
height: 164 + ((ctrlrCompose.text.split("\n").length - 1) * 16),
|
||||
child: Column(
|
||||
children: [
|
||||
Row(mainAxisAlignment: MainAxisAlignment.start, mainAxisSize: MainAxisSize.max, children: [preview]),
|
||||
Container(
|
||||
decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor))),
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.start, children: [wdgMessage])),
|
||||
height: 100,
|
||||
child: Row(
|
||||
children: <Widget>[
|
||||
Expanded(
|
||||
child: Container(
|
||||
decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor))),
|
||||
child: RawKeyboardListener(
|
||||
focusNode: FocusNode(),
|
||||
onKey: handleKeyPress,
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(8),
|
||||
child: TextFormField(
|
||||
key: Key('txtCompose'),
|
||||
controller: ctrlrCompose,
|
||||
focusNode: focusNode,
|
||||
autofocus: !Platform.isAndroid,
|
||||
textInputAction: TextInputAction.newline,
|
||||
keyboardType: TextInputType.multiline,
|
||||
enableIMEPersonalizedLearning: false,
|
||||
minLines: 1,
|
||||
maxLength: (isGroup ? GroupMessageLengthMax : P2PMessageLengthMax) - numberOfBytesMoreThanChar,
|
||||
maxLengthEnforcement: MaxLengthEnforcement.enforced,
|
||||
maxLines: null,
|
||||
onFieldSubmitted: _sendMessage,
|
||||
enabled: true, // always allow editing...
|
||||
onChanged: (String x) {
|
||||
setState(() {
|
||||
// we need to force a rerender here to update the max length count
|
||||
});
|
||||
},
|
||||
decoration: InputDecoration(
|
||||
hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
|
||||
hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.sendHintTextColor),
|
||||
enabledBorder: InputBorder.none,
|
||||
focusedBorder: InputBorder.none,
|
||||
enabled: true,
|
||||
suffixIcon: ElevatedButton(
|
||||
key: Key("btnSend"),
|
||||
style: ElevatedButton.styleFrom(padding: EdgeInsets.all(0.0), shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(45.0))),
|
||||
child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.defaultButtonTextColor),
|
||||
onPressed: isOffline ? null : _sendMessage,
|
||||
))),
|
||||
)))),
|
||||
],
|
||||
),
|
||||
);
|
||||
return Container(
|
||||
color: Provider.of<Settings>(context).theme.backgroundMainColor, child: Column(mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [composeBox]));
|
||||
}
|
||||
|
||||
Widget _buildComposeBox() {
|
||||
bool isOffline = Provider.of<ContactInfoState>(context).isOnline() == false;
|
||||
bool isGroup = Provider.of<ContactInfoState>(context).isGroup;
|
||||
var showToolbar = Provider.of<Settings>(context).isExperimentEnabled(FormattingExperiment);
|
||||
var charLength = ctrlrCompose.value.text.characters.length;
|
||||
var expectedLength = ctrlrCompose.value.text.length;
|
||||
var numberOfBytesMoreThanChar = (expectedLength - charLength);
|
||||
|
||||
var bold = IconButton(
|
||||
icon: Icon(Icons.format_bold),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text);
|
||||
var selection = ctrlrCompose.selection;
|
||||
var start = ctrlrCompose.selection.start;
|
||||
var end = ctrlrCompose.selection.end;
|
||||
ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "**" + selected + "**");
|
||||
ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 2, extentOffset: selection.start + 2);
|
||||
});
|
||||
});
|
||||
|
||||
var italic = IconButton(
|
||||
icon: Icon(Icons.format_italic),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text);
|
||||
var selection = ctrlrCompose.selection;
|
||||
var start = ctrlrCompose.selection.start;
|
||||
var end = ctrlrCompose.selection.end;
|
||||
ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "*" + selected + "*");
|
||||
ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 1, extentOffset: selection.start + 1);
|
||||
});
|
||||
});
|
||||
|
||||
var code = IconButton(
|
||||
icon: Icon(Icons.code),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text);
|
||||
var selection = ctrlrCompose.selection;
|
||||
var start = ctrlrCompose.selection.start;
|
||||
var end = ctrlrCompose.selection.end;
|
||||
ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "`" + selected + "`");
|
||||
ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 1, extentOffset: selection.start + 1);
|
||||
});
|
||||
});
|
||||
|
||||
var superscript = IconButton(
|
||||
icon: Icon(Icons.superscript),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text);
|
||||
var selection = ctrlrCompose.selection;
|
||||
var start = ctrlrCompose.selection.start;
|
||||
var end = ctrlrCompose.selection.end;
|
||||
ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "^" + selected + "^");
|
||||
ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 1, extentOffset: selection.start + 1);
|
||||
});
|
||||
});
|
||||
|
||||
var subscript = IconButton(
|
||||
icon: Icon(Icons.subscript),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text);
|
||||
var selection = ctrlrCompose.selection;
|
||||
var start = ctrlrCompose.selection.start;
|
||||
var end = ctrlrCompose.selection.end;
|
||||
ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "_" + selected + "_");
|
||||
ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 1, extentOffset: selection.start + 1);
|
||||
});
|
||||
});
|
||||
|
||||
var strikethrough = IconButton(
|
||||
icon: Icon(Icons.format_strikethrough),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
var selected = ctrlrCompose.selection.textInside(ctrlrCompose.text);
|
||||
var selection = ctrlrCompose.selection;
|
||||
var start = ctrlrCompose.selection.start;
|
||||
var end = ctrlrCompose.selection.end;
|
||||
ctrlrCompose.text = ctrlrCompose.text.replaceRange(start, end, "~~" + selected + "~~");
|
||||
ctrlrCompose.selection = selection.copyWith(baseOffset: selection.start + 2, extentOffset: selection.start + 2);
|
||||
});
|
||||
});
|
||||
|
||||
var preview = IconButton(
|
||||
icon: Icon(Icons.text_format),
|
||||
onPressed: () {
|
||||
setState(() {
|
||||
showPreview = true;
|
||||
});
|
||||
});
|
||||
|
||||
var vline = Padding(
|
||||
padding: EdgeInsets.symmetric(vertical: 1, horizontal: 2),
|
||||
child: Container(height: 16, width: 1, decoration: BoxDecoration(color: Provider.of<Settings>(context).theme.messageFromMeTextColor)));
|
||||
|
||||
var formattingToolbar = Container(
|
||||
decoration: BoxDecoration(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor),
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.start, children: [bold, italic, code, superscript, subscript, strikethrough, vline, preview]));
|
||||
|
||||
var textField = Container(
|
||||
decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor))),
|
||||
child: RawKeyboardListener(
|
||||
focusNode: FocusNode(),
|
||||
onKey: handleKeyPress,
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(8),
|
||||
child: TextFormField(
|
||||
key: Key('txtCompose'),
|
||||
controller: ctrlrCompose,
|
||||
focusNode: focusNode,
|
||||
autofocus: !Platform.isAndroid,
|
||||
textInputAction: TextInputAction.newline,
|
||||
keyboardType: TextInputType.multiline,
|
||||
enableIMEPersonalizedLearning: false,
|
||||
minLines: 1,
|
||||
maxLength: (isGroup ? GroupMessageLengthMax : P2PMessageLengthMax) - numberOfBytesMoreThanChar,
|
||||
maxLengthEnforcement: MaxLengthEnforcement.enforced,
|
||||
maxLines: 3,
|
||||
onFieldSubmitted: _sendMessage,
|
||||
enabled: true, // always allow editing...
|
||||
|
||||
onChanged: (String x) {
|
||||
setState(() {
|
||||
// we need to force a rerender here to update the max length count
|
||||
});
|
||||
},
|
||||
decoration: InputDecoration(
|
||||
hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
|
||||
hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.sendHintTextColor),
|
||||
enabledBorder: InputBorder.none,
|
||||
focusedBorder: InputBorder.none,
|
||||
enabled: true,
|
||||
suffixIcon: ElevatedButton(
|
||||
key: Key("btnSend"),
|
||||
style: ElevatedButton.styleFrom(padding: EdgeInsets.all(0.0), shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(45.0))),
|
||||
child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.defaultButtonTextColor),
|
||||
onPressed: isOffline ? null : _sendMessage,
|
||||
))),
|
||||
)));
|
||||
|
||||
var textEditChildren;
|
||||
if (showToolbar) {
|
||||
textEditChildren = [formattingToolbar, textField];
|
||||
} else {
|
||||
textEditChildren = [textField];
|
||||
}
|
||||
|
||||
var composeBox =
|
||||
Container(color: Provider.of<Settings>(context).theme.backgroundMainColor, padding: EdgeInsets.all(2), margin: EdgeInsets.all(2), height: 164, child: Column(children: textEditChildren));
|
||||
|
||||
var children;
|
||||
if (Provider.of<AppState>(context).selectedConversation != null && Provider.of<AppState>(context).selectedIndex != null) {
|
||||
|
|
@ -575,7 +392,7 @@ class _MessageViewState extends State<MessageView> {
|
|||
children = [composeBox];
|
||||
}
|
||||
|
||||
return Container(color: Provider.of<Settings>(context).theme.backgroundMainColor, child: Column(mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: children));
|
||||
return Container(color: Provider.of<Settings>(context).theme.backgroundMainColor, child: Column(mainAxisSize: MainAxisSize.min, children: children));
|
||||
}
|
||||
|
||||
// Send the message if enter is pressed without the shift key...
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
|
|||
CwtchButtonTextField(
|
||||
controller: TextEditingController(text: Provider.of<ContactInfoState>(context, listen: false).onion),
|
||||
onPressed: _copyOnion,
|
||||
icon: Icon(CwtchIcons.address_copy_2),
|
||||
icon: Icon(Icons.copy),
|
||||
tooltip: AppLocalizations.of(context)!.copyBtn,
|
||||
)
|
||||
]),
|
||||
|
|
@ -269,9 +269,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
|
|||
onPressed: () {
|
||||
showAlertDialog(context);
|
||||
},
|
||||
style: ButtonStyle(
|
||||
backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor),
|
||||
foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)),
|
||||
style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor), foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)),
|
||||
icon: Icon(CwtchIcons.leave_group),
|
||||
label: Text(
|
||||
AppLocalizations.of(context)!.leaveConversation,
|
||||
|
|
|
|||
|
|
@ -194,66 +194,49 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
|
|||
padding: EdgeInsets.all(10.0),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
|
||||
Spacer(),
|
||||
Expanded(
|
||||
child: ElevatedButton(
|
||||
child: Text(AppLocalizations.of(context)!.addProfileTitle, semanticsLabel: AppLocalizations.of(context)!.addProfileTitle),
|
||||
onPressed: () {
|
||||
_pushAddProfile(context);
|
||||
},
|
||||
)),
|
||||
Spacer()
|
||||
]),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Expanded(
|
||||
child: ElevatedButton(
|
||||
style: ElevatedButton.styleFrom(
|
||||
minimumSize: Size(double.infinity, 20),
|
||||
maximumSize: Size(400, 20),
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))),
|
||||
),
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.addProfileTitle,
|
||||
semanticsLabel: AppLocalizations.of(context)!.addProfileTitle,
|
||||
style: TextStyle(fontWeight: FontWeight.bold),
|
||||
),
|
||||
onPressed: () {
|
||||
_pushAddProfile(context);
|
||||
},
|
||||
)),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
Expanded(
|
||||
child: Tooltip(
|
||||
message: AppLocalizations.of(context)!.importProfileTooltip,
|
||||
child: ElevatedButton(
|
||||
style: ElevatedButton.styleFrom(
|
||||
minimumSize: Size(double.infinity, 20),
|
||||
maximumSize: Size(400, 20),
|
||||
shape: RoundedRectangleBorder(
|
||||
side: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor, width: 2.0),
|
||||
borderRadius: BorderRadius.horizontal(left: Radius.circular(180), right: Radius.circular(180))),
|
||||
primary: Provider.of<Settings>(context).theme.backgroundMainColor,
|
||||
),
|
||||
child:
|
||||
Text(AppLocalizations.of(context)!.importProfile, semanticsLabel: AppLocalizations.of(context)!.importProfile, style: TextStyle(fontWeight: FontWeight.bold)),
|
||||
onPressed: () {
|
||||
// 10GB profiles should be enough for anyone?
|
||||
showFilePicker(context, MaxGeneralFileSharingSize, (file) {
|
||||
showPasswordDialog(context, AppLocalizations.of(context)!.importProfile, AppLocalizations.of(context)!.importProfile, (password) {
|
||||
Navigator.popUntil(context, (route) => route.isFirst);
|
||||
Provider.of<FlwtchState>(context, listen: false).cwtch.ImportProfile(file.path, password).then((value) {
|
||||
if (value == "") {
|
||||
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.successfullyImportedProfile.replaceFirst("%profile", file.path)));
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
} else {
|
||||
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.failedToImportProfile));
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
}
|
||||
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
|
||||
Spacer(),
|
||||
Expanded(
|
||||
child: Tooltip(
|
||||
message: AppLocalizations.of(context)!.importProfileTooltip,
|
||||
child: ElevatedButton(
|
||||
child: Text(AppLocalizations.of(context)!.importProfile, semanticsLabel: AppLocalizations.of(context)!.importProfile),
|
||||
onPressed: () {
|
||||
// 10GB profiles should be enough for anyone?
|
||||
showFilePicker(context, MaxGeneralFileSharingSize, (file) {
|
||||
showPasswordDialog(context, AppLocalizations.of(context)!.importProfile, AppLocalizations.of(context)!.importProfile, (password) {
|
||||
Navigator.popUntil(context, (route) => route.isFirst);
|
||||
Provider.of<FlwtchState>(context, listen: false).cwtch.ImportProfile(file.path, password).then((value) {
|
||||
if (value == "") {
|
||||
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.successfullyImportedProfile.replaceFirst("%profile", file.path)));
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
} else {
|
||||
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.failedToImportProfile));
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}, () {}, () {});
|
||||
},
|
||||
))),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
}, () {}, () {});
|
||||
},
|
||||
))),
|
||||
Spacer()
|
||||
]),
|
||||
],
|
||||
))),
|
||||
)));
|
||||
|
|
|
|||
|
|
@ -3,8 +3,11 @@ import 'dart:io';
|
|||
import 'package:cwtch/models/appstate.dart';
|
||||
import 'package:cwtch/models/contact.dart';
|
||||
import 'package:cwtch/models/profile.dart';
|
||||
import 'package:cwtch/models/profileservers.dart';
|
||||
import 'package:cwtch/views/contactsview.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/painting.dart';
|
||||
import 'package:cwtch/views/messageview.dart';
|
||||
import 'package:cwtch/widgets/profileimage.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
|
@ -77,52 +80,44 @@ class _ContactRowState extends State<ContactRow> {
|
|||
Visibility(
|
||||
visible: !Provider.of<Settings>(context).streamerMode,
|
||||
child: Text(contact.onion,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(color: contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor : Provider.of<Settings>(context).theme.mainTextColor)),
|
||||
),
|
||||
Container(
|
||||
padding: EdgeInsets.all(0),
|
||||
child: contact.isInvitation == true
|
||||
? Wrap(alignment: WrapAlignment.start, direction: Axis.vertical, children: <Widget>[
|
||||
Padding(
|
||||
padding: EdgeInsets.all(2),
|
||||
child: TextButton.icon(
|
||||
label: Text(
|
||||
AppLocalizations.of(context)!.tooltipAcceptContactRequest,
|
||||
),
|
||||
icon: Icon(
|
||||
Icons.favorite,
|
||||
size: 16,
|
||||
color: Provider.of<Settings>(context).theme.mainTextColor,
|
||||
),
|
||||
onPressed: _btnApprove,
|
||||
)),
|
||||
Padding(
|
||||
padding: EdgeInsets.all(2),
|
||||
child: TextButton.icon(
|
||||
label: Text(
|
||||
AppLocalizations.of(context)!.tooltipRejectContactRequest,
|
||||
style: TextStyle(decoration: TextDecoration.underline),
|
||||
),
|
||||
style: ButtonStyle(
|
||||
backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.backgroundPaneColor),
|
||||
foregroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.mainTextColor)),
|
||||
icon: Icon(Icons.delete, size: 16, color: Provider.of<Settings>(context).theme.mainTextColor),
|
||||
onPressed: _btnReject,
|
||||
))
|
||||
])
|
||||
: (contact.isBlocked != null && contact.isBlocked
|
||||
? IconButton(
|
||||
padding: EdgeInsets.zero,
|
||||
splashRadius: Material.defaultSplashRadius / 2,
|
||||
iconSize: 16,
|
||||
icon: Icon(Icons.block, color: Provider.of<Settings>(context).theme.mainTextColor),
|
||||
onPressed: () {},
|
||||
)
|
||||
: Text(dateToNiceString(contact.lastMessageTime))),
|
||||
),
|
||||
)
|
||||
],
|
||||
))),
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(5.0),
|
||||
child: contact.isInvitation == true
|
||||
? Wrap(direction: Axis.vertical, children: <Widget>[
|
||||
IconButton(
|
||||
padding: EdgeInsets.zero,
|
||||
splashRadius: Material.defaultSplashRadius / 2,
|
||||
iconSize: 16,
|
||||
icon: Icon(
|
||||
Icons.favorite,
|
||||
color: Provider.of<Settings>(context).theme.mainTextColor,
|
||||
),
|
||||
tooltip: AppLocalizations.of(context)!.tooltipAcceptContactRequest,
|
||||
onPressed: _btnApprove,
|
||||
),
|
||||
IconButton(
|
||||
padding: EdgeInsets.zero,
|
||||
splashRadius: Material.defaultSplashRadius / 2,
|
||||
iconSize: 16,
|
||||
icon: Icon(Icons.delete, color: Provider.of<Settings>(context).theme.mainTextColor),
|
||||
tooltip: AppLocalizations.of(context)!.tooltipRejectContactRequest,
|
||||
onPressed: _btnReject,
|
||||
)
|
||||
])
|
||||
: (contact.isBlocked != null && contact.isBlocked
|
||||
? IconButton(
|
||||
padding: EdgeInsets.zero,
|
||||
splashRadius: Material.defaultSplashRadius / 2,
|
||||
iconSize: 16,
|
||||
icon: Icon(Icons.block, color: Provider.of<Settings>(context).theme.mainTextColor),
|
||||
onPressed: () {},
|
||||
)
|
||||
: Text(dateToNiceString(contact.lastMessageTime))),
|
||||
),
|
||||
]),
|
||||
onTap: () {
|
||||
selectConversation(context, contact.identifier);
|
||||
|
|
@ -153,7 +148,7 @@ class _ContactRowState extends State<ContactRow> {
|
|||
return AppLocalizations.of(context)!.conversationNotificationPolicyNever;
|
||||
}
|
||||
// If the last message was over a day ago, just state the date
|
||||
if (DateTime.now().difference(date).inDays > 0) {
|
||||
if (DateTime.now().difference(date).inDays > 1) {
|
||||
return DateFormat.yMd(Platform.localeName).format(date.toLocal());
|
||||
}
|
||||
// Otherwise just state the time.
|
||||
|
|
|
|||
|
|
@ -25,9 +25,8 @@ class FileBubble extends StatefulWidget {
|
|||
final int fileSize;
|
||||
final bool interactive;
|
||||
final bool isAuto;
|
||||
final bool isPreview;
|
||||
|
||||
FileBubble(this.nameSuggestion, this.rootHash, this.nonce, this.fileSize, {this.isAuto = false, this.interactive = true, this.isPreview = false});
|
||||
FileBubble(this.nameSuggestion, this.rootHash, this.nonce, this.fileSize, {this.isAuto = false, this.interactive = true});
|
||||
|
||||
@override
|
||||
FileBubbleState createState() => FileBubbleState();
|
||||
|
|
@ -45,27 +44,11 @@ class FileBubbleState extends State<FileBubble> {
|
|||
super.initState();
|
||||
}
|
||||
|
||||
Widget getPreview(context) {
|
||||
return Image.file(
|
||||
myFile!,
|
||||
cacheWidth: (MediaQuery.of(context).size.width * 0.6).floor(),
|
||||
// limit the amount of space the image can decode too, we keep this high-ish to allow quality previews...
|
||||
filterQuality: FilterQuality.medium,
|
||||
fit: BoxFit.scaleDown,
|
||||
alignment: Alignment.center,
|
||||
height: MediaQuery.of(context).size.height * 0.30,
|
||||
isAntiAlias: false,
|
||||
errorBuilder: (context, error, stackTrace) {
|
||||
return MalformedBubble();
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var fromMe = Provider.of<MessageMetadata>(context).senderHandle == Provider.of<ProfileInfoState>(context).onion;
|
||||
var flagStarted = Provider.of<MessageMetadata>(context).attributes["file-downloaded"] == "true";
|
||||
var borderRadius = 15.0;
|
||||
var borderRadiousEh = 15.0;
|
||||
var showFileSharing = Provider.of<Settings>(context).isExperimentEnabled(FileSharingExperiment);
|
||||
DateTime messageDate = Provider.of<MessageMetadata>(context).timestamp;
|
||||
|
||||
|
|
@ -73,7 +56,7 @@ class FileBubbleState extends State<FileBubble> {
|
|||
var path = Provider.of<ProfileInfoState>(context).downloadFinalPath(widget.fileKey());
|
||||
|
||||
// If we haven't stored the filepath in message attributes then save it
|
||||
if (metadata.attributes["filepath"] != null && metadata.attributes["filepath"].toString().isNotEmpty) {
|
||||
if (metadata.attributes["filepath"] != null) {
|
||||
path = metadata.attributes["filepath"];
|
||||
} else if (path != null && metadata.attributes["filepath"] == null) {
|
||||
Provider.of<FlwtchState>(context).cwtch.SetMessageAttribute(metadata.profileOnion, metadata.conversationIdentifier, 0, metadata.messageID, "filepath", path);
|
||||
|
|
@ -89,21 +72,6 @@ class FileBubbleState extends State<FileBubble> {
|
|||
if (myFile == null) {
|
||||
setState(() {
|
||||
myFile = new File(path!);
|
||||
|
||||
// reset
|
||||
if (myFile?.existsSync() == false) {
|
||||
myFile = null;
|
||||
Provider.of<ProfileInfoState>(context).downloadReset(widget.fileKey());
|
||||
Provider.of<MessageMetadata>(context).attributes["filepath"] = null;
|
||||
Provider.of<MessageMetadata>(context).attributes["file-downloaded"] = "false";
|
||||
Provider.of<MessageMetadata>(context).attributes["file-missing"] = "true";
|
||||
Provider.of<FlwtchState>(context).cwtch.SetMessageAttribute(metadata.profileOnion, metadata.conversationIdentifier, 0, metadata.messageID, "file-downloaded", "false");
|
||||
Provider.of<FlwtchState>(context).cwtch.SetMessageAttribute(metadata.profileOnion, metadata.conversationIdentifier, 0, metadata.messageID, "filepath", "");
|
||||
Provider.of<FlwtchState>(context).cwtch.SetMessageAttribute(metadata.profileOnion, metadata.conversationIdentifier, 0, metadata.messageID, "file-missing", "true");
|
||||
} else {
|
||||
Provider.of<MessageMetadata>(context).attributes["file-missing"] = "false";
|
||||
Provider.of<FlwtchState>(context).cwtch.SetMessageAttribute(metadata.profileOnion, metadata.conversationIdentifier, 0, metadata.messageID, "file-missing", "false");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -126,12 +94,6 @@ class FileBubbleState extends State<FileBubble> {
|
|||
senderDisplayStr = Provider.of<MessageMetadata>(context).senderHandle;
|
||||
}
|
||||
}
|
||||
|
||||
// we don't preview a non downloaded file...
|
||||
if (widget.isPreview && myFile != null) {
|
||||
return getPreview(context);
|
||||
}
|
||||
|
||||
return LayoutBuilder(builder: (bcontext, constraints) {
|
||||
var wdgSender = Visibility(
|
||||
visible: widget.interactive,
|
||||
|
|
@ -156,7 +118,21 @@ class FileBubbleState extends State<FileBubble> {
|
|||
child: MouseRegion(
|
||||
cursor: SystemMouseCursors.click,
|
||||
child: GestureDetector(
|
||||
child: Padding(padding: EdgeInsets.all(1.0), child: getPreview(context)),
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(1.0),
|
||||
child: Image.file(
|
||||
myFile!,
|
||||
cacheWidth: 2048,
|
||||
// limit the amount of space the image can decode too, we keep this high-ish to allow quality previews...
|
||||
filterQuality: FilterQuality.medium,
|
||||
fit: BoxFit.scaleDown,
|
||||
alignment: Alignment.center,
|
||||
height: MediaQuery.of(bcontext).size.height * 0.30,
|
||||
isAntiAlias: false,
|
||||
errorBuilder: (context, error, stackTrace) {
|
||||
return MalformedBubble();
|
||||
},
|
||||
)),
|
||||
onTap: () {
|
||||
pop(bcontext, myFile!, wdgMessage);
|
||||
},
|
||||
|
|
@ -191,9 +167,7 @@ class FileBubbleState extends State<FileBubble> {
|
|||
}
|
||||
} else if (!senderIsContact) {
|
||||
wdgDecorations = Text(AppLocalizations.of(context)!.msgAddToAccept);
|
||||
} else if (!widget.isAuto || Provider.of<MessageMetadata>(context).attributes["file-missing"] == "false") {
|
||||
//Note: we need this second case to account for scenarios where a user deletes the downloaded file, we won't automatically
|
||||
// fetch it again, so we need to offer the user the ability to restart..
|
||||
} else if (!widget.isAuto) {
|
||||
wdgDecorations = Visibility(
|
||||
visible: widget.interactive,
|
||||
child: Center(
|
||||
|
|
@ -211,10 +185,10 @@ class FileBubbleState extends State<FileBubble> {
|
|||
color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor,
|
||||
border: Border.all(color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor, width: 1),
|
||||
borderRadius: BorderRadius.only(
|
||||
topLeft: Radius.circular(borderRadius),
|
||||
topRight: Radius.circular(borderRadius),
|
||||
bottomLeft: fromMe ? Radius.circular(borderRadius) : Radius.zero,
|
||||
bottomRight: fromMe ? Radius.zero : Radius.circular(borderRadius),
|
||||
topLeft: Radius.circular(borderRadiousEh),
|
||||
topRight: Radius.circular(borderRadiousEh),
|
||||
bottomLeft: fromMe ? Radius.circular(borderRadiousEh) : Radius.zero,
|
||||
bottomRight: fromMe ? Radius.zero : Radius.circular(borderRadiousEh),
|
||||
),
|
||||
),
|
||||
child: Padding(
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
import 'dart:io';
|
||||
|
||||
import 'package:cwtch/controllers/open_link_modal.dart';
|
||||
import 'package:cwtch/models/contact.dart';
|
||||
import 'package:cwtch/models/message.dart';
|
||||
import 'package:cwtch/third_party/linkify/flutter_linkify.dart';
|
||||
import 'package:cwtch/models/profile.dart';
|
||||
import 'package:cwtch/widgets/malformedbubble.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
import '../settings.dart';
|
||||
import 'messagebubbledecorations.dart';
|
||||
|
|
@ -52,7 +55,7 @@ class MessageBubbleState extends State<MessageBubble> {
|
|||
linkifiers: [UrlLinkifier()],
|
||||
onOpen: showClickableLinks
|
||||
? (link) {
|
||||
modalOpenLink(context, link);
|
||||
_modalOpenLink(context, link);
|
||||
}
|
||||
: null,
|
||||
//key: Key(myKey),
|
||||
|
|
@ -101,4 +104,59 @@ class MessageBubbleState extends State<MessageBubble> {
|
|||
children: fromMe ? [wdgMessage, wdgDecorations] : [wdgSender, wdgMessage, wdgDecorations])))));
|
||||
});
|
||||
}
|
||||
|
||||
void _modalOpenLink(BuildContext ctx, LinkableElement link) {
|
||||
showModalBottomSheet<void>(
|
||||
context: ctx,
|
||||
builder: (BuildContext bcontext) {
|
||||
return Container(
|
||||
height: 200, // bespoke value courtesy of the [TextField] docs
|
||||
child: Center(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(30.0),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
Text(AppLocalizations.of(context)!.clickableLinksWarning),
|
||||
Flex(direction: Axis.horizontal, mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
|
||||
Container(
|
||||
margin: EdgeInsets.symmetric(vertical: 20, horizontal: 10),
|
||||
child: ElevatedButton(
|
||||
child: Text(AppLocalizations.of(context)!.clickableLinksCopy, semanticsLabel: AppLocalizations.of(context)!.clickableLinksCopy),
|
||||
onPressed: () {
|
||||
Clipboard.setData(new ClipboardData(text: link.url));
|
||||
|
||||
final snackBar = SnackBar(
|
||||
content: Text(AppLocalizations.of(context)!.copiedToClipboardNotification),
|
||||
);
|
||||
|
||||
Navigator.pop(bcontext);
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
},
|
||||
),
|
||||
),
|
||||
Container(
|
||||
margin: EdgeInsets.symmetric(vertical: 20, horizontal: 10),
|
||||
child: ElevatedButton(
|
||||
child: Text(AppLocalizations.of(context)!.clickableLinkOpen, semanticsLabel: AppLocalizations.of(context)!.clickableLinkOpen),
|
||||
onPressed: () async {
|
||||
if (await canLaunch(link.url)) {
|
||||
await launch(link.url);
|
||||
Navigator.pop(bcontext);
|
||||
} else {
|
||||
final snackBar = SnackBar(
|
||||
content: Text(AppLocalizations.of(context)!.clickableLinkError),
|
||||
);
|
||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
]),
|
||||
],
|
||||
)),
|
||||
));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import 'package:cwtch/models/appstate.dart';
|
||||
import 'package:cwtch/models/contact.dart';
|
||||
import 'package:cwtch/models/message.dart';
|
||||
import 'package:cwtch/models/messagecache.dart';
|
||||
import 'package:cwtch/models/profile.dart';
|
||||
import 'package:cwtch/widgets/messageloadingbubble.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
|
@ -9,12 +8,12 @@ import 'package:flutter/rendering.dart';
|
|||
import 'package:provider/provider.dart';
|
||||
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
import '../main.dart';
|
||||
import '../settings.dart';
|
||||
|
||||
class MessageList extends StatefulWidget {
|
||||
ItemScrollController scrollController;
|
||||
ItemPositionsListener scrollListener;
|
||||
MessageList(this.scrollListener);
|
||||
MessageList(this.scrollController, this.scrollListener);
|
||||
|
||||
@override
|
||||
_MessageListState createState() => _MessageListState();
|
||||
|
|
@ -23,12 +22,6 @@ class MessageList extends StatefulWidget {
|
|||
class _MessageListState extends State<MessageList> {
|
||||
@override
|
||||
Widget build(BuildContext outerContext) {
|
||||
// On Android we can have unsynced messages at the front of the index from when the UI was asleep, if there are some, kick off sync of those first
|
||||
if (Provider.of<ContactInfoState>(context).messageCache.indexUnsynced != 0) {
|
||||
var conversationId = Provider.of<AppState>(outerContext, listen: false).selectedConversation!;
|
||||
MessageCache? cache = Provider.of<ProfileInfoState>(outerContext, listen: false).contactList.getContact(conversationId)?.messageCache;
|
||||
ByIndex(0).loadUnsynced(Provider.of<FlwtchState>(context, listen: false).cwtch, Provider.of<AppState>(outerContext, listen: false).selectedProfile!, conversationId, cache!);
|
||||
}
|
||||
var initi = Provider.of<AppState>(outerContext, listen: false).initialScrollIndex;
|
||||
bool isP2P = !Provider.of<ContactInfoState>(context).isGroup;
|
||||
bool isGroupAndSyncing = Provider.of<ContactInfoState>(context).isGroup == true && Provider.of<ContactInfoState>(context).status == "Authenticated";
|
||||
|
|
@ -80,7 +73,7 @@ class _MessageListState extends State<MessageList> {
|
|||
child: loadMessages
|
||||
? ScrollablePositionedList.builder(
|
||||
itemPositionsListener: widget.scrollListener,
|
||||
itemScrollController: Provider.of<ContactInfoState>(outerContext).messageScrollController,
|
||||
itemScrollController: widget.scrollController,
|
||||
initialScrollIndex: initi > 4 ? initi - 4 : 0,
|
||||
itemCount: Provider.of<ContactInfoState>(outerContext).totalMessages,
|
||||
reverse: true, // NOTE: There seems to be a bug in flutter that corrects the mouse wheel scroll, but not the drag direction...
|
||||
|
|
@ -98,7 +91,7 @@ class _MessageListState extends State<MessageList> {
|
|||
// reliably use this without running into duplicate keys...it isn't ideal as it means keys need to be re-built
|
||||
// when new messages are added...however it is better than the alternative of not having widget keys at all.
|
||||
var key = Provider.of<ContactInfoState>(outerContext, listen: false).getMessageKey(contactHandle, messageIndex);
|
||||
return message.getWidget(context, key, messageIndex);
|
||||
return message.getWidget(context, key);
|
||||
} else {
|
||||
return MessageLoadingBubble();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,9 +18,8 @@ import '../settings.dart';
|
|||
|
||||
class MessageRow extends StatefulWidget {
|
||||
final Widget child;
|
||||
final int index;
|
||||
|
||||
MessageRow(this.child, this.index, {Key? key}) : super(key: key);
|
||||
MessageRow(this.child, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
MessageRowState createState() => MessageRowState();
|
||||
|
|
@ -33,9 +32,12 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
|
|||
late Alignment _dragAlignment = Alignment.center;
|
||||
Alignment _dragAffinity = Alignment.center;
|
||||
|
||||
late int index;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
index = Provider.of<MessageMetadata>(context, listen: false).messageID;
|
||||
_controller = AnimationController(vsync: this);
|
||||
_controller.addListener(() {
|
||||
setState(() {
|
||||
|
|
@ -222,7 +224,8 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
|
|||
children: widgetRow,
|
||||
)))));
|
||||
|
||||
if (Provider.of<ContactInfoState>(context).newMarkerMsgIndex == widget.index) {
|
||||
var markMsgId = Provider.of<ContactInfoState>(context).newMarkerMsgId;
|
||||
if (markMsgId == Provider.of<MessageMetadata>(context).messageID) {
|
||||
return Column(crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start, children: [Align(alignment: Alignment.center, child: _bubbleNew()), mr]);
|
||||
} else {
|
||||
return mr;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,8 @@
|
|||
import 'package:cwtch/controllers/open_link_modal.dart';
|
||||
import 'package:cwtch/models/appstate.dart';
|
||||
import 'package:cwtch/models/contact.dart';
|
||||
import 'package:cwtch/models/message.dart';
|
||||
import 'package:cwtch/models/profile.dart';
|
||||
import 'package:cwtch/third_party/linkify/flutter_linkify.dart';
|
||||
import 'package:cwtch/views/contactsview.dart';
|
||||
import 'package:cwtch/widgets/malformedbubble.dart';
|
||||
import 'package:cwtch/widgets/messageloadingbubble.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
|
|
@ -48,29 +43,12 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
|
|||
var wdgSender = SelectableText(senderDisplayStr,
|
||||
style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor));
|
||||
|
||||
var showClickableLinks = Provider.of<Settings>(context).isExperimentEnabled(ClickableLinksExperiment);
|
||||
var formatMessages = Provider.of<Settings>(context).isExperimentEnabled(FormattingExperiment);
|
||||
|
||||
var wdgMessage = SelectableLinkify(
|
||||
text: widget.body + '\u202F',
|
||||
// TODO: onOpen breaks the "selectable" functionality. Maybe something to do with gesture handler?
|
||||
options: LinkifyOptions(messageFormatting: formatMessages, parseLinks: showClickableLinks, looseUrl: true, defaultToHttps: true),
|
||||
linkifiers: [UrlLinkifier()],
|
||||
onOpen: showClickableLinks
|
||||
? (link) {
|
||||
modalOpenLink(context, link);
|
||||
}
|
||||
: null,
|
||||
//key: Key(myKey),
|
||||
var wdgMessage = SelectableText(
|
||||
widget.body + '\u202F',
|
||||
focusNode: _focus,
|
||||
style: TextStyle(
|
||||
color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor,
|
||||
),
|
||||
linkStyle: TextStyle(color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor : Provider.of<Settings>(context).theme.messageFromOtherTextColor),
|
||||
codeStyle: TextStyle(
|
||||
// note: these colors are flipped
|
||||
color: fromMe ? Provider.of<Settings>(context).theme.messageFromOtherTextColor : Provider.of<Settings>(context).theme.messageFromMeTextColor,
|
||||
backgroundColor: fromMe ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor),
|
||||
textAlign: TextAlign.left,
|
||||
textWidthBasis: TextWidthBasis.longestLine,
|
||||
);
|
||||
|
|
@ -83,31 +61,14 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
|
|||
var qMessage = (snapshot.data! as Message);
|
||||
// Swap the background color for quoted tweets..
|
||||
var qTextColor = fromMe ? Provider.of<Settings>(context).theme.messageFromOtherTextColor : Provider.of<Settings>(context).theme.messageFromMeTextColor;
|
||||
return MouseRegion(
|
||||
cursor: SystemMouseCursors.click,
|
||||
child: GestureDetector(
|
||||
onTap: () {
|
||||
var index = Provider.of<ContactInfoState>(context, listen: false).messageCache.cacheByHash[qMessage.getMetadata().contenthash];
|
||||
var totalMessages = Provider.of<ContactInfoState>(context, listen: false).totalMessages;
|
||||
// we have to reverse here because the list itself is reversed...
|
||||
Provider.of<ContactInfoState>(context).messageScrollController.scrollTo(index: totalMessages - index!, duration: Duration(milliseconds: 100));
|
||||
},
|
||||
child: Container(
|
||||
margin: EdgeInsets.all(5),
|
||||
padding: EdgeInsets.all(5),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
decoration: BoxDecoration(),
|
||||
height: 75,
|
||||
color: fromMe ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor,
|
||||
child: Row(mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.start, children: [
|
||||
Padding(padding: EdgeInsets.symmetric(vertical: 5.0, horizontal: 10.0), child: Icon(Icons.reply, size: 32, color: qTextColor)),
|
||||
DefaultTextStyle(
|
||||
textWidthBasis: TextWidthBasis.parent,
|
||||
child: qMessage.getPreviewWidget(context),
|
||||
style: TextStyle(color: qTextColor),
|
||||
overflow: TextOverflow.fade,
|
||||
)
|
||||
]))));
|
||||
return Container(
|
||||
margin: EdgeInsets.all(5),
|
||||
padding: EdgeInsets.all(5),
|
||||
color: fromMe ? Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor : Provider.of<Settings>(context).theme.messageFromMeBackgroundColor,
|
||||
child: Wrap(runAlignment: WrapAlignment.spaceEvenly, alignment: WrapAlignment.spaceEvenly, runSpacing: 1.0, crossAxisAlignment: WrapCrossAlignment.center, children: [
|
||||
Center(widthFactor: 1, child: Padding(padding: EdgeInsets.all(10.0), child: Icon(Icons.reply, size: 32, color: qTextColor))),
|
||||
Center(widthFactor: 1.0, child: DefaultTextStyle(child: qMessage.getPreviewWidget(context), style: TextStyle(color: qTextColor)))
|
||||
]));
|
||||
} catch (e) {
|
||||
print(e);
|
||||
return MalformedBubble();
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
|||
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
||||
# Read more about iOS versioning at
|
||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||
version: 1.7.1+29
|
||||
version: 1.7.0+28
|
||||
|
||||
environment:
|
||||
sdk: ">=2.15.0 <3.0.0"
|
||||
|
|
|
|||
Loading…
Reference in New Issue