Merge branch 'trunk' into serverOfflineIcon
continuous-integration/drone/pr Build is pending
Details
continuous-integration/drone/pr Build is pending
Details
This commit is contained in:
commit
16eda0ce8a
File diff suppressed because one or more lines are too long
|
@ -241,6 +241,9 @@ class FlwtchState extends State<Flwtch> with WindowListener {
|
||||||
transitionDuration: Duration(milliseconds: 200),
|
transitionDuration: Duration(milliseconds: 200),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
// On Gnome follows up a clicked notification with a "Cwtch is ready" notification that takes you to the app. AFAICT just because Gnome is bad
|
||||||
|
// https://askubuntu.com/questions/1286206/how-to-skip-the-is-ready-notification-and-directly-open-apps-in-ubuntu-20-4
|
||||||
|
windowManager.focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
// using windowManager flutter plugin until proper lifecycle management lands in desktop
|
// using windowManager flutter plugin until proper lifecycle management lands in desktop
|
||||||
|
|
|
@ -75,7 +75,8 @@ class NotificationPayload {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// FlutterLocalNotificationsPlugin based NotificationManager that handles MacOS and Linux
|
// FlutterLocalNotificationsPlugin based NotificationManager that handles MacOS <s>and Linux</s>
|
||||||
|
// TODO: Upgrade from 9.6 to 12.x but there are breaking changes (including for mac)
|
||||||
// TODO: Windows support is being worked on, check back and migrate to that too when it lands
|
// TODO: Windows support is being worked on, check back and migrate to that too when it lands
|
||||||
class NixNotificationManager implements NotificationsManager {
|
class NixNotificationManager implements NotificationsManager {
|
||||||
late FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin;
|
late FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin;
|
||||||
|
|
|
@ -18,6 +18,7 @@ class _DoubleColumnViewState extends State<DoubleColumnView> {
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
var flwtch = Provider.of<AppState>(context);
|
var flwtch = Provider.of<AppState>(context);
|
||||||
|
var selectedConversation = flwtch.selectedConversation;
|
||||||
var cols = Provider.of<Settings>(context).uiColumns(true);
|
var cols = Provider.of<Settings>(context).uiColumns(true);
|
||||||
return Flex(
|
return Flex(
|
||||||
direction: Axis.horizontal,
|
direction: Axis.horizontal,
|
||||||
|
@ -30,7 +31,7 @@ class _DoubleColumnViewState extends State<DoubleColumnView> {
|
||||||
),
|
),
|
||||||
Flexible(
|
Flexible(
|
||||||
flex: cols[1],
|
flex: cols[1],
|
||||||
child: flwtch.selectedConversation == null
|
child: selectedConversation == null
|
||||||
? Container(
|
? Container(
|
||||||
color: Provider.of<Settings>(context).theme.backgroundMainColor,
|
color: Provider.of<Settings>(context).theme.backgroundMainColor,
|
||||||
child: Card(
|
child: Card(
|
||||||
|
@ -40,9 +41,10 @@ class _DoubleColumnViewState extends State<DoubleColumnView> {
|
||||||
: //dev
|
: //dev
|
||||||
MultiProvider(providers: [
|
MultiProvider(providers: [
|
||||||
ChangeNotifierProvider.value(value: Provider.of<ProfileInfoState>(context)),
|
ChangeNotifierProvider.value(value: Provider.of<ProfileInfoState>(context)),
|
||||||
ChangeNotifierProvider.value(
|
// there is a potential timing issue here where selectConversation is changes as we move profiles, this will result
|
||||||
value: flwtch.selectedConversation != null ? Provider.of<ProfileInfoState>(context).contactList.getContact(flwtch.selectedConversation!)! : ContactInfoState("", -1, "")),
|
// in getContact being null, in that case we replace with an empty Contact Info State
|
||||||
], child: Container(key: Key(flwtch.selectedConversation!.toString()), child: MessageView())),
|
ChangeNotifierProvider.value(value: Provider.of<ProfileInfoState>(context).contactList.getContact(selectedConversation) ?? ContactInfoState("", -1, "")),
|
||||||
|
], child: Container(key: Key(selectedConversation.toString()), child: MessageView())),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
|
@ -630,7 +630,7 @@ packages:
|
||||||
name: screen_retriever
|
name: screen_retriever
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.1.2"
|
version: "0.1.4"
|
||||||
scrollable_positioned_list:
|
scrollable_positioned_list:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
|
@ -859,7 +859,7 @@ packages:
|
||||||
name: window_manager
|
name: window_manager
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.2.5"
|
version: "0.2.8"
|
||||||
xdg_directories:
|
xdg_directories:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
@ -41,7 +41,7 @@ dependencies:
|
||||||
file_picker: ^4.3.2
|
file_picker: ^4.3.2
|
||||||
file_picker_desktop: ^1.1.1
|
file_picker_desktop: ^1.1.1
|
||||||
url_launcher: ^6.0.18
|
url_launcher: ^6.0.18
|
||||||
window_manager: ^0.2.5
|
window_manager: ^0.2.8
|
||||||
# notification plugins
|
# notification plugins
|
||||||
win_toast: ^0.0.2
|
win_toast: ^0.0.2
|
||||||
flutter_local_notifications: ^9.6.1
|
flutter_local_notifications: ^9.6.1
|
||||||
|
|
Loading…
Reference in New Issue