forked from cwtch.im/cwtch-ui
Merge pull request 'cwtch1.6.1-fixes' (#373) from cwtch1.6.1-fixes into trunk
Reviewed-on: cwtch.im/cwtch-ui#373
This commit is contained in:
commit
6859780873
|
@ -196,7 +196,7 @@ class CwtchGomobile implements Cwtch {
|
|||
@override
|
||||
// ignore: non_constant_identifier_names
|
||||
void DeleteContact(String profileOnion, int conversation) {
|
||||
cwtchPlatform.invokeMethod("DeleteContact", {"ProfileOnion": profileOnion, "conversation": conversation});
|
||||
cwtchPlatform.invokeMethod("DeleteConversation", {"ProfileOnion": profileOnion, "conversation": conversation});
|
||||
}
|
||||
|
||||
@override
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -137,7 +137,9 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
style: TextStyle(color: settings.current().mainTextColor),
|
||||
),
|
||||
leading: Icon(Icons.table_chart, color: settings.current().mainTextColor),
|
||||
trailing: DropdownButton(
|
||||
trailing: Container(
|
||||
width: MediaQuery.of(context).size.width / 4,
|
||||
child: DropdownButton(
|
||||
value: settings.uiColumnModeLandscape.toString(),
|
||||
onChanged: (String? newValue) {
|
||||
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
|
||||
|
@ -151,7 +153,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
);
|
||||
}).toList())),
|
||||
}).toList()))),
|
||||
SwitchListTile(
|
||||
title: Text(AppLocalizations.of(context)!.streamerModeLabel, style: TextStyle(color: settings.current().mainTextColor)),
|
||||
subtitle: Text(AppLocalizations.of(context)!.descriptionStreamerMode),
|
||||
|
@ -192,7 +194,9 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
ListTile(
|
||||
title: Text(AppLocalizations.of(context)!.notificationContentSettingLabel),
|
||||
subtitle: Text(AppLocalizations.of(context)!.notificationContentSettingDescription),
|
||||
trailing: DropdownButton(
|
||||
trailing: Container(
|
||||
width: MediaQuery.of(context).size.width / 4,
|
||||
child: DropdownButton(
|
||||
value: settings.notificationContent,
|
||||
onChanged: (NotificationContent? newValue) {
|
||||
settings.notificationContent = newValue!;
|
||||
|
@ -206,7 +210,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
|||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
);
|
||||
}).toList()),
|
||||
}).toList())),
|
||||
leading: Icon(CwtchIcons.chat_bubble_empty_24px, color: settings.current().mainTextColor),
|
||||
),
|
||||
SwitchListTile(
|
||||
|
|
|
@ -197,6 +197,10 @@ 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);
|
||||
|
||||
var isGroup = Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(Provider.of<AppState>(context, listen: false).selectedConversation!)!.isGroup;
|
||||
|
||||
// peers and groups currently have different length constraints (servers can store less)...
|
||||
|
@ -372,11 +376,9 @@ class _MessageViewState extends State<MessageView> {
|
|||
}
|
||||
|
||||
// Send the message if enter is pressed without the shift key...
|
||||
void handleKeyPress(event) {
|
||||
var data = event.data as RawKeyEventData;
|
||||
if (data.logicalKey == LogicalKeyboardKey.enter && !event.isShiftPressed) {
|
||||
final messageWithoutNewLine = ctrlrCompose.value.text.trimRight();
|
||||
ctrlrCompose.value = TextEditingValue(text: messageWithoutNewLine);
|
||||
void handleKeyPress(RawKeyEvent event) {
|
||||
var data = event.data;
|
||||
if ((data.logicalKey == LogicalKeyboardKey.enter && !event.isShiftPressed) || data.logicalKey == LogicalKeyboardKey.numpadEnter && !event.isShiftPressed) {
|
||||
_sendMessage();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
|||
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
||||
# Read more about iOS versioning at
|
||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||
version: 1.6.0+25
|
||||
version: 1.6.1+26
|
||||
|
||||
environment:
|
||||
sdk: ">=2.15.0 <3.0.0"
|
||||
|
|
Loading…
Reference in New Issue