Formatting
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
This commit is contained in:
parent
a0f8be2d53
commit
7bf2e15009
|
@ -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';
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -138,22 +138,22 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
),
|
),
|
||||||
leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
|
leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
|
||||||
trailing: Container(
|
trailing: Container(
|
||||||
width: MediaQuery.of(context).size.width / 4,
|
width: MediaQuery.of(context).size.width / 4,
|
||||||
child: DropdownButton(
|
child: DropdownButton(
|
||||||
value: settings.uiColumnModeLandscape.toString(),
|
value: settings.uiColumnModeLandscape.toString(),
|
||||||
onChanged: (String? newValue) {
|
onChanged: (String? newValue) {
|
||||||
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
|
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
|
||||||
saveSettings(context);
|
saveSettings(context);
|
||||||
},
|
},
|
||||||
items: Settings.uiColumnModeOptions(true).map<DropdownMenuItem<String>>((DualpaneMode value) {
|
items: Settings.uiColumnModeOptions(true).map<DropdownMenuItem<String>>((DualpaneMode value) {
|
||||||
return DropdownMenuItem<String>(
|
return DropdownMenuItem<String>(
|
||||||
value: value.toString(),
|
value: value.toString(),
|
||||||
child: Text(
|
child: Text(
|
||||||
Settings.uiColumnModeToString(value, context),
|
Settings.uiColumnModeToString(value, context),
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}).toList()))),
|
}).toList()))),
|
||||||
SwitchListTile(
|
SwitchListTile(
|
||||||
title: Text(AppLocalizations.of(context)!.streamerModeLabel, style: TextStyle(color: settings.current().mainTextColor)),
|
title: Text(AppLocalizations.of(context)!.streamerModeLabel, style: TextStyle(color: settings.current().mainTextColor)),
|
||||||
subtitle: Text(AppLocalizations.of(context)!.descriptionStreamerMode),
|
subtitle: Text(AppLocalizations.of(context)!.descriptionStreamerMode),
|
||||||
|
@ -195,22 +195,22 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
title: Text(AppLocalizations.of(context)!.notificationContentSettingLabel),
|
title: Text(AppLocalizations.of(context)!.notificationContentSettingLabel),
|
||||||
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!;
|
||||||
saveSettings(context);
|
saveSettings(context);
|
||||||
},
|
},
|
||||||
items: NotificationContent.values.map<DropdownMenuItem<NotificationContent>>((NotificationContent value) {
|
items: NotificationContent.values.map<DropdownMenuItem<NotificationContent>>((NotificationContent value) {
|
||||||
return DropdownMenuItem<NotificationContent>(
|
return DropdownMenuItem<NotificationContent>(
|
||||||
value: value,
|
value: value,
|
||||||
child: Text(
|
child: Text(
|
||||||
Settings.notificationContentToString(value, context),
|
Settings.notificationContentToString(value, context),
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}).toList())),
|
}).toList())),
|
||||||
leading: Icon(CwtchIcons.chat_bubble_empty_24px, color: settings.current().mainTextColor),
|
leading: Icon(CwtchIcons.chat_bubble_empty_24px, color: settings.current().mainTextColor),
|
||||||
),
|
),
|
||||||
SwitchListTile(
|
SwitchListTile(
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue