Merge pull request 'New Icons, New Translations, More Complete Profile Menu' (#728) from stable-blockers into trunk
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #728 Reviewed-by: Dan Ballard <dan@openprivacy.ca>
This commit is contained in:
commit
feccc04933
Binary file not shown.
|
@ -40,14 +40,14 @@ StepDefinitionGeneric TorVersionPresent() {
|
||||||
context.expect(versionString, "#.#.#", reason: "error reading version string from fetch-tor.sh");
|
context.expect(versionString, "#.#.#", reason: "error reading version string from fetch-tor.sh");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
context.world.attach( versionString.substring(0,4), "text/plain", "Then I expect the Tor version to be present");
|
context.world.attach(versionString.substring(0, 4), "text/plain", "Then I expect the Tor version to be present");
|
||||||
//context.reporter.message("test!!!", MessageLevel.info);
|
//context.reporter.message("test!!!", MessageLevel.info);
|
||||||
print("looking for version string $versionString");
|
print("looking for version string $versionString");
|
||||||
|
|
||||||
return await context.world.appDriver.waitUntil(() async {
|
return await context.world.appDriver.waitUntil(() async {
|
||||||
context.world.appDriver.waitForAppToSettle();
|
context.world.appDriver.waitForAppToSettle();
|
||||||
final finder = context.world.appDriver.findBy(
|
final finder = context.world.appDriver.findBy(
|
||||||
versionString.substring(0,4),
|
versionString.substring(0, 4),
|
||||||
FindType.text,
|
FindType.text,
|
||||||
);
|
);
|
||||||
return await context.world.appDriver.isPresent(finder);
|
return await context.world.appDriver.isPresent(finder);
|
||||||
|
|
|
@ -155,5 +155,5 @@ abstract class Cwtch {
|
||||||
Future<String> SearchConversations(String profile, String pattern);
|
Future<String> SearchConversations(String profile, String pattern);
|
||||||
void DeleteServerInfo(String profile, String handle);
|
void DeleteServerInfo(String profile, String handle);
|
||||||
|
|
||||||
void ConfigureConnections(String onion, bool listen, bool peers, bool servers);
|
Future<void> ConfigureConnections(String onion, bool listen, bool peers, bool servers);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1102,7 +1102,7 @@ class CwtchFfi implements Cwtch {
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void ConfigureConnections(String profile, bool listen, bool peers, bool servers) {
|
Future<void> ConfigureConnections(String profile, bool listen, bool peers, bool servers) async {
|
||||||
var configureConnections = library.lookup<NativeFunction<void_from_string_bool_bool_bool>>("c_ConfigureConnections");
|
var configureConnections = library.lookup<NativeFunction<void_from_string_bool_bool_bool>>("c_ConfigureConnections");
|
||||||
// ignore: non_constant_identifier_names
|
// ignore: non_constant_identifier_names
|
||||||
final ConfigureConnections = configureConnections.asFunction<VoidFromStringBoolBoolBool>();
|
final ConfigureConnections = configureConnections.asFunction<VoidFromStringBoolBoolBool>();
|
||||||
|
|
|
@ -460,7 +460,8 @@ class CwtchGomobile implements Cwtch {
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void ConfigureConnections(String profile, bool listen, bool peers, bool servers) {
|
Future<void> ConfigureConnections(String profile, bool listen, bool peers, bool servers) async {
|
||||||
cwtchPlatform.invokeMethod("ConfigureConnections", {"ProfileOnion": profile, "listen": listen, "peers": peers, "servers": servers});
|
cwtchPlatform.invokeMethod("ConfigureConnections", {"ProfileOnion": profile, "listen": listen, "peers": peers, "servers": servers});
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/// Flutter icons Cwtch
|
/// Flutter icons Cwtch
|
||||||
/// Copyright (C) 2021-2022 by Open Privacy Research Society
|
/// Copyright (C) 2021-2023 by Open Privacy Research Society
|
||||||
/// This font was generated by FlutterIcon.com, which is derived from Fontello.
|
/// This font was generated by FlutterIcon.com, which is derived from Fontello.
|
||||||
///
|
///
|
||||||
/// To use this font, place it in your fonts/ directory and include the
|
/// To use this font, place it in your fonts/ directory and include the
|
||||||
|
@ -124,6 +124,7 @@ class CwtchIcons {
|
||||||
static const IconData view_replies = IconData(0xe869, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
static const IconData view_replies = IconData(0xe869, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
static const IconData anti_spam_2 = IconData(0xe86b, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
static const IconData anti_spam_2 = IconData(0xe86b, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
static const IconData manage_files = IconData(0xe86c, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
static const IconData manage_files = IconData(0xe86c, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
static const IconData attached_file_2 = IconData(0xe86d, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
|
||||||
static const IconData anti_spam_3 = IconData(0xe86e, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
static const IconData anti_spam_3 = IconData(0xe86e, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
|
static const IconData attached_file_3 = IconData(0xe86f, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
|
static const IconData disconnect_from_contact = IconData(0xe870, fontFamily: _kFontFam, fontPackage: _kFontPkg);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "cy",
|
"@@locale": "cy",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "da",
|
"@@locale": "da",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "de",
|
"@@locale": "de",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "el",
|
"@@locale": "el",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "en",
|
"@@locale": "en",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "es",
|
"@@locale": "es",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "fr",
|
"@@locale": "fr",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "it",
|
"@@locale": "it",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "ja",
|
"@@locale": "ja",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "ko",
|
"@@locale": "ko",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "lb",
|
"@@locale": "lb",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "nl",
|
"@@locale": "nl",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "no",
|
"@@locale": "no",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "pl",
|
"@@locale": "pl",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "pt",
|
"@@locale": "pt",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "pt_BR",
|
"@@locale": "pt_BR",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "ro",
|
"@@locale": "ro",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "ru",
|
"@@locale": "ru",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "sk",
|
"@@locale": "sk",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "sv",
|
"@@locale": "sv",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "sw",
|
"@@locale": "sw",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "tr",
|
"@@locale": "tr",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"@@locale": "uk",
|
"@@locale": "uk",
|
||||||
"@@last_modified": "2023-09-13T18:51:59+02:00",
|
"@@last_modified": "2023-09-20T21:00:37+02:00",
|
||||||
|
"profileAllowUnknownContacts": "Allow Unknown Contacts",
|
||||||
|
"profileBlockUnknownContacts": "Block Unknown Contacts",
|
||||||
|
"profileDisableProfile": "Disable Profile",
|
||||||
|
"profileEnableProfile": "Enable Profile",
|
||||||
|
"profileAppearOnline": "Appear Online",
|
||||||
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
"contactDisconnect": "Disconnect from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
|
||||||
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
"profileAppearOfflineDescription": "By default, when Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
|
||||||
"profileAppearOffline": "Appear Offline",
|
"profileAppearOffline": "Appear Offline",
|
||||||
|
|
|
@ -286,6 +286,8 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
||||||
if (value == true && Provider.of<ProfileInfoState>(context, listen: false).enabled) {
|
if (value == true && Provider.of<ProfileInfoState>(context, listen: false).enabled) {
|
||||||
Provider.of<ProfileInfoState>(context, listen: false).deactivatePeerEngine(context);
|
Provider.of<ProfileInfoState>(context, listen: false).deactivatePeerEngine(context);
|
||||||
Provider.of<FlwtchState>(context, listen: false).cwtch.ConfigureConnections(onion, false, false, false);
|
Provider.of<FlwtchState>(context, listen: false).cwtch.ConfigureConnections(onion, false, false, false);
|
||||||
|
} else {
|
||||||
|
Provider.of<FlwtchState>(context, listen: false).cwtch.ConfigureConnections(onion, true, true, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -8,6 +8,7 @@ import 'package:cwtch/models/contactlist.dart';
|
||||||
import 'package:cwtch/models/profile.dart';
|
import 'package:cwtch/models/profile.dart';
|
||||||
import 'package:cwtch/models/profilelist.dart';
|
import 'package:cwtch/models/profilelist.dart';
|
||||||
import 'package:cwtch/models/search.dart';
|
import 'package:cwtch/models/search.dart';
|
||||||
|
import 'package:cwtch/views/globalsettingsview.dart';
|
||||||
import 'package:cwtch/views/profileserversview.dart';
|
import 'package:cwtch/views/profileserversview.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:cwtch/widgets/contactrow.dart';
|
import 'package:cwtch/widgets/contactrow.dart';
|
||||||
|
@ -30,7 +31,7 @@ import 'messageview.dart';
|
||||||
|
|
||||||
enum ShareMenu { copyCode, qrcode }
|
enum ShareMenu { copyCode, qrcode }
|
||||||
|
|
||||||
enum ProfileStatusMenu { available, away, busy, appearOffline, editProfile }
|
enum ProfileStatusMenu { available, away, busy, appearOnline, appearOffline, allowUnknownContacts, blockUnknownContacts, enableProfile, disableProfile, editProfile }
|
||||||
|
|
||||||
class ContactsView extends StatefulWidget {
|
class ContactsView extends StatefulWidget {
|
||||||
const ContactsView({Key? key}) : super(key: key);
|
const ContactsView({Key? key}) : super(key: key);
|
||||||
|
@ -117,6 +118,9 @@ class _ContactsViewState extends State<ContactsView> {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
var enabled = Provider.of<ProfileInfoState>(context, listen: false).enabled;
|
||||||
|
var appearOffline = Provider.of<ProfileInfoState>(context, listen: false).appearOffline;
|
||||||
|
var settings = Provider.of<Settings>(context, listen: false);
|
||||||
return ScaffoldMessenger(
|
return ScaffoldMessenger(
|
||||||
key: scaffoldKey,
|
key: scaffoldKey,
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
|
@ -181,6 +185,8 @@ class _ContactsViewState extends State<ContactsView> {
|
||||||
Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(onion, "profile.profile-status", "busy");
|
Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(onion, "profile.profile-status", "busy");
|
||||||
break;
|
break;
|
||||||
case ProfileStatusMenu.appearOffline:
|
case ProfileStatusMenu.appearOffline:
|
||||||
|
Provider.of<ProfileInfoState>(context, listen: false).appearOffline = true;
|
||||||
|
Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(onion, "profile.appear-offline", "true");
|
||||||
Provider.of<ProfileInfoState>(context, listen: false).deactivatePeerEngine(context);
|
Provider.of<ProfileInfoState>(context, listen: false).deactivatePeerEngine(context);
|
||||||
Provider.of<FlwtchState>(context, listen: false).cwtch.ConfigureConnections(onion, false, false, false);
|
Provider.of<FlwtchState>(context, listen: false).cwtch.ConfigureConnections(onion, false, false, false);
|
||||||
break;
|
break;
|
||||||
|
@ -199,29 +205,131 @@ class _ContactsViewState extends State<ContactsView> {
|
||||||
transitionDuration: Duration(milliseconds: 200),
|
transitionDuration: Duration(milliseconds: 200),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
break;
|
||||||
|
case ProfileStatusMenu.appearOnline:
|
||||||
|
Provider.of<ProfileInfoState>(context, listen: false).appearOffline = false;
|
||||||
|
Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(onion, "profile.appear-offline", "false");
|
||||||
|
// we only need to toggle all connections on here..
|
||||||
|
Provider.of<FlwtchState>(context, listen: false).cwtch.ConfigureConnections(onion, true, true, true);
|
||||||
|
break;
|
||||||
|
case ProfileStatusMenu.allowUnknownContacts:
|
||||||
|
settings.blockUnknownConnections = false;
|
||||||
|
saveSettings(context);
|
||||||
|
break;
|
||||||
|
case ProfileStatusMenu.blockUnknownContacts:
|
||||||
|
settings.blockUnknownConnections = true;
|
||||||
|
saveSettings(context);
|
||||||
|
break;
|
||||||
|
case ProfileStatusMenu.enableProfile:
|
||||||
|
Provider.of<ProfileInfoState>(context, listen: false).enabled = true;
|
||||||
|
if (Provider.of<ProfileInfoState>(context, listen: false).appearOffline) {
|
||||||
|
Provider.of<FlwtchState>(context, listen: false).cwtch.ConfigureConnections(onion, false, false, false);
|
||||||
|
} else {
|
||||||
|
Provider.of<FlwtchState>(context, listen: false).cwtch.ConfigureConnections(onion, true, true, true);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ProfileStatusMenu.disableProfile:
|
||||||
|
Provider.of<ProfileInfoState>(context, listen: false).enabled = false;
|
||||||
|
Provider.of<ProfileInfoState>(context, listen: false).deactivatePeerEngine(context);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
itemBuilder: (BuildContext context) => <PopupMenuEntry<ProfileStatusMenu>>[
|
itemBuilder: (BuildContext context) => <PopupMenuEntry<ProfileStatusMenu>>[
|
||||||
PopupMenuItem<ProfileStatusMenu>(
|
PopupMenuItem<ProfileStatusMenu>(
|
||||||
value: ProfileStatusMenu.available,
|
value: ProfileStatusMenu.available,
|
||||||
child: Text(AppLocalizations.of(context)!.availabilityStatusAvailable!, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)),
|
enabled: enabled,
|
||||||
|
child: Row(children: [
|
||||||
|
Icon(
|
||||||
|
CwtchIcons.account_circle_24px,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Text(AppLocalizations.of(context)!.availabilityStatusAvailable!,
|
||||||
|
textAlign: TextAlign.right, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)))
|
||||||
|
]),
|
||||||
),
|
),
|
||||||
PopupMenuItem<ProfileStatusMenu>(
|
PopupMenuItem<ProfileStatusMenu>(
|
||||||
value: ProfileStatusMenu.away,
|
value: ProfileStatusMenu.away,
|
||||||
child: Text(AppLocalizations.of(context)!.availabilityStatusAway!, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)),
|
enabled: enabled,
|
||||||
|
child: Row(children: [
|
||||||
|
Icon(
|
||||||
|
CwtchIcons.account_circle_24px,
|
||||||
|
color: Colors.yellowAccent,
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Text(AppLocalizations.of(context)!.availabilityStatusAway!,
|
||||||
|
textAlign: TextAlign.right, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)))
|
||||||
|
]),
|
||||||
),
|
),
|
||||||
PopupMenuItem<ProfileStatusMenu>(
|
PopupMenuItem<ProfileStatusMenu>(
|
||||||
value: ProfileStatusMenu.busy,
|
value: ProfileStatusMenu.busy,
|
||||||
child: Text(AppLocalizations.of(context)!.availabilityStatusBusy!, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)),
|
enabled: enabled,
|
||||||
),
|
child: Row(children: [
|
||||||
PopupMenuItem<ProfileStatusMenu>(
|
Icon(
|
||||||
value: ProfileStatusMenu.appearOffline,
|
CwtchIcons.account_circle_24px,
|
||||||
child: Text(AppLocalizations.of(context)!.profileAppearOffline!, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)),
|
color: Colors.redAccent,
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Text(AppLocalizations.of(context)!.availabilityStatusBusy!,
|
||||||
|
textAlign: TextAlign.right, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)))
|
||||||
|
]),
|
||||||
),
|
),
|
||||||
PopupMenuDivider(),
|
PopupMenuDivider(),
|
||||||
|
PopupMenuItem<ProfileStatusMenu>(
|
||||||
|
value: ProfileStatusMenu.appearOffline,
|
||||||
|
enabled: enabled && !appearOffline,
|
||||||
|
child: Row(children: [
|
||||||
|
Icon(CwtchIcons.disconnect_from_contact),
|
||||||
|
Expanded(
|
||||||
|
child: Text(AppLocalizations.of(context)!.profileAppearOffline!,
|
||||||
|
textAlign: TextAlign.right, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)))
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
PopupMenuItem<ProfileStatusMenu>(
|
||||||
|
value: ProfileStatusMenu.appearOnline,
|
||||||
|
enabled: enabled && appearOffline,
|
||||||
|
child: Row(children: [
|
||||||
|
Icon(CwtchIcons.disconnect_from_contact),
|
||||||
|
Expanded(
|
||||||
|
child: Text(AppLocalizations.of(context)!.profileAppearOnline!,
|
||||||
|
textAlign: TextAlign.right, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)))
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
PopupMenuDivider(),
|
||||||
|
PopupMenuItem<ProfileStatusMenu>(
|
||||||
|
value: !settings.blockUnknownConnections ? ProfileStatusMenu.blockUnknownContacts : ProfileStatusMenu.allowUnknownContacts,
|
||||||
|
child: Row(children: [
|
||||||
|
Icon(
|
||||||
|
CwtchIcons.block_unknown,
|
||||||
|
color: settings.theme.mainTextColor,
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Text((settings.blockUnknownConnections ? AppLocalizations.of(context)!.profileAllowUnknownContacts! : AppLocalizations.of(context)!.profileBlockUnknownContacts!),
|
||||||
|
textAlign: TextAlign.right, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)))
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
PopupMenuDivider(),
|
||||||
|
PopupMenuItem<ProfileStatusMenu>(
|
||||||
|
value: enabled ? ProfileStatusMenu.disableProfile : ProfileStatusMenu.enableProfile,
|
||||||
|
child: Row(children: [
|
||||||
|
Icon(CwtchIcons.favorite_24dp, color: settings.theme.mainTextColor),
|
||||||
|
Expanded(
|
||||||
|
child: Text((enabled ? AppLocalizations.of(context)!.profileDisableProfile! : AppLocalizations.of(context)!.profileEnableProfile!),
|
||||||
|
textAlign: TextAlign.right, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)))
|
||||||
|
]),
|
||||||
|
),
|
||||||
PopupMenuItem<ProfileStatusMenu>(
|
PopupMenuItem<ProfileStatusMenu>(
|
||||||
value: ProfileStatusMenu.editProfile,
|
value: ProfileStatusMenu.editProfile,
|
||||||
child: Text(AppLocalizations.of(context)!.editProfile!, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)),
|
enabled: true,
|
||||||
|
child: Row(children: [
|
||||||
|
Icon(
|
||||||
|
CwtchIcons.edit_24px,
|
||||||
|
color: settings.theme.mainTextColor,
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child:
|
||||||
|
Text(AppLocalizations.of(context)!.editProfile!, textAlign: TextAlign.right, style: Provider.of<Settings>(context, listen: false).scaleFonts(defaultTextButtonStyle)))
|
||||||
|
]),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|
|
@ -60,7 +60,7 @@ class _FileSharingViewState extends State<FileSharingView> {
|
||||||
value: sharedFiles[index]["Active"],
|
value: sharedFiles[index]["Active"],
|
||||||
activeTrackColor: Provider.of<Settings>(context).theme.defaultButtonColor,
|
activeTrackColor: Provider.of<Settings>(context).theme.defaultButtonColor,
|
||||||
inactiveTrackColor: Provider.of<Settings>(context).theme.defaultButtonDisabledColor,
|
inactiveTrackColor: Provider.of<Settings>(context).theme.defaultButtonDisabledColor,
|
||||||
secondary: Icon(CwtchIcons.attached_file_2, color: Provider.of<Settings>(context).current().mainTextColor),
|
secondary: Icon(CwtchIcons.attached_file_3, color: Provider.of<Settings>(context).current().mainTextColor),
|
||||||
onChanged: (newValue) {
|
onChanged: (newValue) {
|
||||||
setState(() {
|
setState(() {
|
||||||
if (newValue) {
|
if (newValue) {
|
||||||
|
|
|
@ -455,7 +455,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
},
|
},
|
||||||
activeTrackColor: settings.theme.defaultButtonColor,
|
activeTrackColor: settings.theme.defaultButtonColor,
|
||||||
inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
|
inactiveTrackColor: settings.theme.defaultButtonDisabledColor,
|
||||||
secondary: Icon(CwtchIcons.attached_file_2, color: settings.current().mainTextColor),
|
secondary: Icon(CwtchIcons.attached_file_3, color: settings.current().mainTextColor),
|
||||||
),
|
),
|
||||||
Visibility(
|
Visibility(
|
||||||
visible: settings.isExperimentEnabled(FileSharingExperiment),
|
visible: settings.isExperimentEnabled(FileSharingExperiment),
|
||||||
|
|
|
@ -109,7 +109,7 @@ class _MessageViewState extends State<MessageView> {
|
||||||
if (Provider.of<ContactInfoState>(context, listen: false).isOnline()) {
|
if (Provider.of<ContactInfoState>(context, listen: false).isOnline()) {
|
||||||
appBarButtons.add(IconButton(
|
appBarButtons.add(IconButton(
|
||||||
splashRadius: Material.defaultSplashRadius / 2,
|
splashRadius: Material.defaultSplashRadius / 2,
|
||||||
icon: Icon(Icons.speaker_notes_off),
|
icon: Icon(CwtchIcons.disconnect_from_contact),
|
||||||
tooltip: AppLocalizations.of(context)!.contactDisconnect,
|
tooltip: AppLocalizations.of(context)!.contactDisconnect,
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
if (Provider.of<ContactInfoState>(context, listen: false).isGroup) {
|
if (Provider.of<ContactInfoState>(context, listen: false).isGroup) {
|
||||||
|
@ -146,7 +146,7 @@ class _MessageViewState extends State<MessageView> {
|
||||||
if (showFileSharing) {
|
if (showFileSharing) {
|
||||||
appBarButtons.add(IconButton(
|
appBarButtons.add(IconButton(
|
||||||
splashRadius: Material.defaultSplashRadius / 2,
|
splashRadius: Material.defaultSplashRadius / 2,
|
||||||
icon: Icon(CwtchIcons.attached_file_2, size: 26, color: Provider.of<Settings>(context).theme.mainTextColor),
|
icon: Icon(CwtchIcons.attached_file_3, size: 26, color: Provider.of<Settings>(context).theme.mainTextColor),
|
||||||
tooltip: AppLocalizations.of(context)!.tooltipSendFile,
|
tooltip: AppLocalizations.of(context)!.tooltipSendFile,
|
||||||
onPressed: Provider.of<AppState>(context).disableFilePicker
|
onPressed: Provider.of<AppState>(context).disableFilePicker
|
||||||
? null
|
? null
|
||||||
|
|
|
@ -139,7 +139,7 @@ class FileBubbleState extends State<FileBubble> {
|
||||||
} else if (widget.isPreview && myFile == null) {
|
} else if (widget.isPreview && myFile == null) {
|
||||||
return Row(
|
return Row(
|
||||||
children: [
|
children: [
|
||||||
Icon(CwtchIcons.attached_file_2, size: 32, color: Provider.of<Settings>(context).theme.messageFromMeTextColor),
|
Icon(CwtchIcons.attached_file_3, size: 32, color: Provider.of<Settings>(context).theme.messageFromMeTextColor),
|
||||||
Flexible(child: Text(widget.nameSuggestion, style: TextStyle(fontWeight: FontWeight.bold, fontFamily: "Inter", color: Provider.of<Settings>(context).theme.messageFromMeTextColor)))
|
Flexible(child: Text(widget.nameSuggestion, style: TextStyle(fontWeight: FontWeight.bold, fontFamily: "Inter", color: Provider.of<Settings>(context).theme.messageFromMeTextColor)))
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
@ -340,7 +340,7 @@ class FileBubbleState extends State<FileBubble> {
|
||||||
maxLines: 4,
|
maxLines: 4,
|
||||||
textWidthBasis: TextWidthBasis.parent,
|
textWidthBasis: TextWidthBasis.parent,
|
||||||
),
|
),
|
||||||
leading: Icon(CwtchIcons.attached_file_2, size: 32, color: Provider.of<Settings>(context).theme.messageFromMeTextColor));
|
leading: Icon(CwtchIcons.attached_file_3, size: 32, color: Provider.of<Settings>(context).theme.messageFromMeTextColor));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Construct an file chrome
|
// Construct an file chrome
|
||||||
|
@ -378,7 +378,7 @@ class FileBubbleState extends State<FileBubble> {
|
||||||
maxLines: 4,
|
maxLines: 4,
|
||||||
textWidthBasis: TextWidthBasis.parent,
|
textWidthBasis: TextWidthBasis.parent,
|
||||||
),
|
),
|
||||||
leading: Icon(CwtchIcons.attached_file_2, size: 32, color: Provider.of<Settings>(context).theme.messageFromOtherTextColor),
|
leading: Icon(CwtchIcons.attached_file_3, size: 32, color: Provider.of<Settings>(context).theme.messageFromOtherTextColor),
|
||||||
trailing: Visibility(
|
trailing: Visibility(
|
||||||
visible: speed != "0 B/s",
|
visible: speed != "0 B/s",
|
||||||
child: SelectableText(
|
child: SelectableText(
|
||||||
|
@ -402,7 +402,7 @@ class FileBubbleState extends State<FileBubble> {
|
||||||
padding: EdgeInsets.all(10),
|
padding: EdgeInsets.all(10),
|
||||||
child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: [
|
child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: [
|
||||||
ListTile(
|
ListTile(
|
||||||
leading: Icon(CwtchIcons.attached_file_2),
|
leading: Icon(CwtchIcons.attached_file_3),
|
||||||
title: Text(meta),
|
title: Text(meta),
|
||||||
trailing: IconButton(
|
trailing: IconButton(
|
||||||
icon: Icon(Icons.close),
|
icon: Icon(Icons.close),
|
||||||
|
|
Loading…
Reference in New Issue