Formatting
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Sarah Jamie Lewis 2022-02-14 11:03:28 -08:00
parent a0f8be2d53
commit 7bf2e15009
5 changed files with 42 additions and 39 deletions

View File

@ -2,7 +2,6 @@ import 'package:cwtch/widgets/messagerow.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'message.dart';
import 'messagecache.dart';

View File

@ -296,16 +296,21 @@ class Settings extends ChangeNotifier {
static String notificationPolicyToString(NotificationPolicy np, BuildContext context) {
switch (np) {
case NotificationPolicy.Mute: return AppLocalizations.of(context)!.notificationPolicyMute;
case NotificationPolicy.OptIn: return AppLocalizations.of(context)!.notificationPolicyOptIn;
case NotificationPolicy.DefaultAll: return AppLocalizations.of(context)!.notificationPolicyDefaultAll;
case NotificationPolicy.Mute:
return AppLocalizations.of(context)!.notificationPolicyMute;
case NotificationPolicy.OptIn:
return AppLocalizations.of(context)!.notificationPolicyOptIn;
case NotificationPolicy.DefaultAll:
return AppLocalizations.of(context)!.notificationPolicyDefaultAll;
}
}
static String notificationContentToString(NotificationContent nc, BuildContext context) {
switch (nc) {
case NotificationContent.SimpleEvent: return AppLocalizations.of(context)!.notificationContentSimpleEvent;
case NotificationContent.ContactInfo: return AppLocalizations.of(context)!.notificationContentContactInfo;
case NotificationContent.SimpleEvent:
return AppLocalizations.of(context)!.notificationContentSimpleEvent;
case NotificationContent.ContactInfo:
return AppLocalizations.of(context)!.notificationContentContactInfo;
}
}

View File

@ -138,22 +138,22 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
),
leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
trailing: Container(
width: MediaQuery.of(context).size.width / 4,
width: MediaQuery.of(context).size.width / 4,
child: DropdownButton(
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()))),
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),
@ -195,22 +195,22 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
title: Text(AppLocalizations.of(context)!.notificationContentSettingLabel),
subtitle: Text(AppLocalizations.of(context)!.notificationContentSettingDescription),
trailing: Container(
width: MediaQuery.of(context).size.width / 4,
child:DropdownButton(
value: settings.notificationContent,
onChanged: (NotificationContent? newValue) {
settings.notificationContent = newValue!;
saveSettings(context);
},
items: NotificationContent.values.map<DropdownMenuItem<NotificationContent>>((NotificationContent value) {
return DropdownMenuItem<NotificationContent>(
value: value,
child: Text(
Settings.notificationContentToString(value, context),
overflow: TextOverflow.ellipsis,
),
);
}).toList())),
width: MediaQuery.of(context).size.width / 4,
child: DropdownButton(
value: settings.notificationContent,
onChanged: (NotificationContent? newValue) {
settings.notificationContent = newValue!;
saveSettings(context);
},
items: NotificationContent.values.map<DropdownMenuItem<NotificationContent>>((NotificationContent value) {
return DropdownMenuItem<NotificationContent>(
value: value,
child: Text(
Settings.notificationContentToString(value, context),
overflow: TextOverflow.ellipsis,
),
);
}).toList())),
leading: Icon(CwtchIcons.chat_bubble_empty_24px, color: settings.current().mainTextColor),
),
SwitchListTile(

View File

@ -197,7 +197,6 @@ class _MessageViewState extends State<MessageView> {
static const GroupMessageLengthMax = 1600;
void _sendMessage([String? ignoredParam]) {
// Trim message
final messageWithoutNewLine = ctrlrCompose.value.text.trimRight();
ctrlrCompose.value = TextEditingValue(text: messageWithoutNewLine);

View File

@ -17,7 +17,7 @@ class _SplashViewState extends State<SplashView> {
Widget build(BuildContext context) {
var cwtch = Provider.of<FlwtchState>(context, listen: false).cwtch;
if (!cwtch.isL10nInit()) {
if (AppLocalizations.of(context) != null && AppLocalizations.of(context)!.newMessageNotificationSimple.isNotEmpty ) {
if (AppLocalizations.of(context) != null && AppLocalizations.of(context)!.newMessageNotificationSimple.isNotEmpty) {
cwtch.l10nInit(AppLocalizations.of(context)!.newMessageNotificationSimple, AppLocalizations.of(context)!.newMessageNotificationConversationInfo);
}
}