cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 89 Pull Requests 1 Projects 2 Releases 28 Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/models/contact.dart
View File

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

15
lib/settings.dart
View File

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

2
lib/views/globalsettingsview.dart
View File

@ -196,7 +196,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
subtitle: Text(AppLocalizations.of(context)!.notificationContentSettingDescription), subtitle: Text(AppLocalizations.of(context)!.notificationContentSettingDescription),
trailing: Container( trailing: Container(
width: MediaQuery.of(context).size.width / 4, width: MediaQuery.of(context).size.width / 4,
child:DropdownButton( child: DropdownButton(
value: settings.notificationContent, value: settings.notificationContent,
onChanged: (NotificationContent? newValue) { onChanged: (NotificationContent? newValue) {
settings.notificationContent = newValue!; settings.notificationContent = newValue!;

1
lib/views/messageview.dart
View File

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

2
lib/views/splashView.dart
View File

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