Browse Source

Merge pull request 'streamerMode' (#183) from streamerMode into trunk

Reviewed-on: https://git.openprivacy.ca/cwtch.im/cwtch-ui/pulls/183
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>
reply-fixes
Sarah Jamie Lewis 2 weeks ago
parent
commit
3a34044f8e
  1. 2
      LIBCWTCH-GO.version
  2. 4
      lib/l10n/intl_de.arb
  3. 4
      lib/l10n/intl_en.arb
  4. 4
      lib/l10n/intl_es.arb
  5. 4
      lib/l10n/intl_fr.arb
  6. 4
      lib/l10n/intl_it.arb
  7. 4
      lib/l10n/intl_pl.arb
  8. 4
      lib/l10n/intl_pt.arb
  9. 13
      lib/settings.dart
  10. 13
      lib/views/globalsettingsview.dart
  11. 6
      lib/widgets/contactrow.dart
  12. 14
      lib/widgets/profilerow.dart

2
LIBCWTCH-GO.version

@ -1 +1 @@
v1.2.1-2021-08-30-22-14
v1.2.1-2-ga8e7bba-2021-09-14-21-04

4
lib/l10n/intl_de.arb

@ -1,6 +1,8 @@
{
"@@locale": "de",
"@@last_modified": "2021-08-29T18:35:41+02:00",
"@@last_modified": "2021-09-14T22:34:57+02:00",
"descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact onions",
"streamerModeLabel": "Streamer\/Presentation Mode",
"archiveConversation": "Archive this Conversation",
"profileOnionLabel": "Senden Sie diese Adresse an Peers, mit denen Sie sich verbinden möchten",
"addPeerTab": "Einen anderen Nutzer hinzufügen",

4
lib/l10n/intl_en.arb

@ -1,6 +1,8 @@
{
"@@locale": "en",
"@@last_modified": "2021-08-29T18:35:41+02:00",
"@@last_modified": "2021-09-14T22:34:57+02:00",
"descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact onions",
"streamerModeLabel": "Streamer\/Presentation Mode",
"archiveConversation": "Archive this Conversation",
"profileOnionLabel": "Send this address to people you want to connect with",
"addPeerTab": "Add a contact",

4
lib/l10n/intl_es.arb

@ -1,6 +1,8 @@
{
"@@locale": "es",
"@@last_modified": "2021-08-29T18:35:41+02:00",
"@@last_modified": "2021-09-14T22:34:57+02:00",
"descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact onions",
"streamerModeLabel": "Streamer\/Presentation Mode",
"archiveConversation": "Archive this Conversation",
"profileOnionLabel": "Envía esta dirección a los contactos con los que quieras conectarte",
"addPeerTab": "Agregar Contacto",

4
lib/l10n/intl_fr.arb

@ -1,6 +1,8 @@
{
"@@locale": "fr",
"@@last_modified": "2021-08-29T18:35:41+02:00",
"@@last_modified": "2021-09-14T22:34:57+02:00",
"descriptionStreamerMode": "Si elle est activée, cette option donne un rendu visuel plus privé à l'application pour la diffusion ou la présentation, par exemple en masquant les profils et les contacts.",
"streamerModeLabel": "Mode Streamer\/Présentation",
"archiveConversation": "Archiver cette conversation",
"profileOnionLabel": "Envoyez cette adresse aux personnes avec lesquelles vous souhaitez entrer en contact.",
"addPeerTab": "Ajouter un contact",

4
lib/l10n/intl_it.arb

@ -1,6 +1,8 @@
{
"@@locale": "it",
"@@last_modified": "2021-08-29T18:35:41+02:00",
"@@last_modified": "2021-09-14T22:34:57+02:00",
"descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact onions",
"streamerModeLabel": "Streamer\/Presentation Mode",
"archiveConversation": "Archive this Conversation",
"profileOnionLabel": "Inviare questo indirizzo ai peer con cui si desidera connettersi",
"addPeerTab": "Aggiungi un peer",

4
lib/l10n/intl_pl.arb

@ -1,6 +1,8 @@
{
"@@locale": "pl",
"@@last_modified": "2021-08-29T18:35:41+02:00",
"@@last_modified": "2021-09-14T22:34:57+02:00",
"descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact onions",
"streamerModeLabel": "Streamer\/Presentation Mode",
"archiveConversation": "Archive this Conversation",
"profileOnionLabel": "Send this address to contacts you want to connect with",
"addPeerTab": "Add a contact",

4
lib/l10n/intl_pt.arb

@ -1,6 +1,8 @@
{
"@@locale": "pt",
"@@last_modified": "2021-08-29T18:35:41+02:00",
"@@last_modified": "2021-09-14T22:34:57+02:00",
"descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact onions",
"streamerModeLabel": "Streamer\/Presentation Mode",
"archiveConversation": "Archive this Conversation",
"profileOnionLabel": "Send this address to contacts you want to connect with",
"addPeerTab": "Add a contact",

13
lib/settings.dart

@ -31,6 +31,7 @@ class Settings extends ChangeNotifier {
DualpaneMode _uiColumnModeLandscape = DualpaneMode.CopyPortrait;
bool blockUnknownConnections = false;
bool streamerMode = false;
/// Set the dark theme.
void setDark() {
@ -74,11 +75,11 @@ class Settings extends ChangeNotifier {
// Set Locale and notify listeners
switchLocale(Locale(settings["Locale"]));
// Decide whether to enable Experiments
blockUnknownConnections = settings["BlockUnknownConnections"];
blockUnknownConnections = settings["BlockUnknownConnections"] ?? false;
streamerMode = settings["StreamerMode"] ?? false;
// Decide whether to enable Experiments
experimentsEnabled = settings["ExperimentsEnabled"];
experimentsEnabled = settings["ExperimentsEnabled"] ?? false;
// Set the internal experiments map. Casting from the Map<dynamic, dynamic> that we get from JSON
experiments = new HashMap<String, bool>.from(settings["Experiments"]);
@ -105,6 +106,11 @@ class Settings extends ChangeNotifier {
notifyListeners();
}
setStreamerMode(bool newSteamerMode) {
streamerMode = newSteamerMode;
notifyListeners();
}
/// Block Unknown Connections will autoblock connections if they authenticate with public key not in our contacts list.
/// This is one of the best tools we have to combat abuse, while it isn't ideal it does allow a user to curate their contacts
/// list without being bothered by spurious requests (either permanently, or as a short term measure).
@ -227,6 +233,7 @@ class Settings extends ChangeNotifier {
"Theme": themeString,
"PreviousPid": -1,
"BlockUnknownConnections": blockUnknownConnections,
"StreamerMode": streamerMode,
"ExperimentsEnabled": this.experimentsEnabled,
"Experiments": experiments,
"StateRootPane": 0,

13
lib/views/globalsettingsview.dart

@ -137,6 +137,19 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
secondary: Icon(CwtchIcons.block_unknown, color: settings.current().mainTextColor()),
),
SwitchListTile(
title: Text(AppLocalizations.of(context)!.streamerModeLabel, style: TextStyle(color: settings.current().mainTextColor())),
subtitle: Text(AppLocalizations.of(context)!.descriptionStreamerMode),
value: settings.streamerMode,
onChanged: (bool value) {
settings.setStreamerMode(value);
// Save Settings...
saveSettings(context);
},
activeTrackColor: settings.theme.defaultButtonActiveColor(),
inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
secondary: Icon(CwtchIcons.block_unknown, color: settings.current().mainTextColor()),
),
SwitchListTile(
title: Text(AppLocalizations.of(context)!.experimentsEnabled, style: TextStyle(color: settings.current().mainTextColor())),
subtitle: Text(AppLocalizations.of(context)!.descriptionExperiments),

6
lib/widgets/contactrow.dart

@ -65,9 +65,11 @@ class _ContactRowState extends State<ContactRow> {
child: LinearProgressIndicator(
color: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
)),
Text(contact.onion,
Visibility(
visible: !Provider.of<Settings>(context).streamerMode,
child: Text(contact.onion,
style: TextStyle(color: contact.isBlocked ? Provider.of<Settings>(context).theme.portraitBlockedTextColor() : Provider.of<Settings>(context).theme.mainTextColor())),
],
)],
))),
Padding(
padding: const EdgeInsets.all(5.0),

14
lib/widgets/profilerow.dart

@ -46,12 +46,14 @@ class _ProfileRowState extends State<ProfileRow> {
softWrap: true,
overflow: TextOverflow.ellipsis,
),
ExcludeSemantics(
child: Text(
profile.onion,
softWrap: true,
overflow: TextOverflow.ellipsis,
))
Visibility(
visible: !Provider.of<Settings>(context).streamerMode,
child: ExcludeSemantics(
child: Text(
profile.onion,
softWrap: true,
overflow: TextOverflow.ellipsis,
)))
],
)),
IconButton(

Loading…
Cancel
Save