From 7422d235d1a8c4148ec5beefdd8cb1fe37508111 Mon Sep 17 00:00:00 2001 From: JHubi1 Date: Wed, 19 Jun 2024 22:05:11 +0200 Subject: [PATCH] Updated desktop structure, experimental linux build --- .metadata | 6 + lib/main.dart | 393 ++++++++----------- lib/screen_settings.dart | 54 +-- lib/settings/about.dart | 39 +- lib/settings/behavior.dart | 39 +- lib/settings/export.dart | 41 +- lib/settings/interface.dart | 51 +-- lib/settings/voice.dart | 38 +- lib/worker/desktop.dart | 66 ++++ lib/worker/setter.dart | 43 +- lib/worker/update.dart | 3 +- linux/.gitignore | 1 + linux/CMakeLists.txt | 145 +++++++ linux/flutter/CMakeLists.txt | 88 +++++ linux/flutter/generated_plugin_registrant.cc | 27 ++ linux/flutter/generated_plugin_registrant.h | 15 + linux/flutter/generated_plugins.cmake | 27 ++ linux/main.cc | 6 + linux/my_application.cc | 128 ++++++ linux/my_application.h | 18 + 20 files changed, 721 insertions(+), 507 deletions(-) create mode 100644 lib/worker/desktop.dart create mode 100644 linux/.gitignore create mode 100644 linux/CMakeLists.txt create mode 100644 linux/flutter/CMakeLists.txt create mode 100644 linux/flutter/generated_plugin_registrant.cc create mode 100644 linux/flutter/generated_plugin_registrant.h create mode 100644 linux/flutter/generated_plugins.cmake create mode 100644 linux/main.cc create mode 100644 linux/my_application.cc create mode 100644 linux/my_application.h diff --git a/.metadata b/.metadata index 6f1f43c..762cf4a 100644 --- a/.metadata +++ b/.metadata @@ -18,6 +18,12 @@ migration: - platform: android create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3 base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3 + - platform: linux + create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3 + base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3 + - platform: web + create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3 + base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3 - platform: windows create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3 base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3 diff --git a/lib/main.dart b/lib/main.dart index 963049a..6655918 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -15,6 +15,7 @@ import 'screen_welcome.dart'; import 'worker/setter.dart'; import 'worker/haptic.dart'; import 'worker/sender.dart'; +import 'worker/desktop.dart'; import 'package:shared_preferences/shared_preferences.dart'; // ignore: depend_on_referenced_packages @@ -83,7 +84,7 @@ Function? setMainState; void main() { runApp(const App()); - if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) { + if (desktopFeature()) { doWhenWindowReady(() { appWindow.minSize = const Size(600, 450); appWindow.size = const Size(1200, 650); @@ -121,10 +122,15 @@ class _AppState extends State { prefs = tmp; }); - if ((await Permission.bluetoothConnect.isGranted) && - (await Permission.microphone.isGranted)) { - voiceSupported = await speech.initialize(); - } else { + try { + if ((await Permission.bluetoothConnect.isGranted) && + (await Permission.microphone.isGranted)) { + voiceSupported = await speech.initialize(); + } else { + prefs!.setBool("voiceModeEnabled", false); + voiceSupported = false; + } + } catch (_) { prefs!.setBool("voiceModeEnabled", false); voiceSupported = false; } @@ -248,12 +254,14 @@ class _MainAppState extends State { int tipId = Random().nextInt(5); List sidebar(BuildContext context, Function setState) { + var padding = EdgeInsets.only( + left: desktopLayoutRequired(context) ? 17 : 12, + right: desktopLayoutRequired(context) ? 17 : 12); return List.from([ - ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) + desktopLayout(context) ? const SizedBox.shrink() : (Padding( - padding: const EdgeInsets.only(left: 12, right: 12), + padding: padding, child: InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.circular(50))), @@ -273,24 +281,20 @@ class _MainAppState extends State { ), const SizedBox(width: 16), ]))))), - ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) + desktopLayout(context) ? const SizedBox.shrink() : (!allowMultipleChats && !allowSettings) ? const SizedBox.shrink() : const Divider(), (allowMultipleChats) ? (Padding( - padding: const EdgeInsets.only(left: 12, right: 12), + padding: padding, child: InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.circular(50))), onTap: () { selectionHaptic(); - if (!(Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context).size.width <= 1000) { + if (!desktopLayout(context)) { Navigator.of(context).pop(); } if (!chatAllowed && model != null) return; @@ -317,16 +321,13 @@ class _MainAppState extends State { : const SizedBox.shrink(), (allowSettings) ? (Padding( - padding: const EdgeInsets.only(left: 12, right: 12), + padding: padding, child: InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.circular(50))), onTap: () { selectionHaptic(); - if (!(Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context).size.width <= 1000) { + if (!desktopLayout(context)) { Navigator.of(context).pop(); } setState(() { @@ -355,17 +356,15 @@ class _MainAppState extends State { ]))))) : const SizedBox.shrink(), Divider( - color: - ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) - ? (Theme.of(context).brightness == Brightness.light) - ? Colors.grey[400] - : Colors.grey[900] - : null), + color: desktopLayout(context) + ? (Theme.of(context).brightness == Brightness.light) + ? Colors.grey[400] + : Colors.grey[900] + : null), ((prefs?.getStringList("chats") ?? []).isNotEmpty) ? const SizedBox.shrink() : (Padding( - padding: const EdgeInsets.only(left: 12, right: 12), + padding: padding, child: InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.circular(50))), @@ -405,7 +404,7 @@ class _MainAppState extends State { !allowSettings) ? const SizedBox.shrink() : (Padding( - padding: const EdgeInsets.only(left: 12, right: 12), + padding: padding, child: InkWell( splashFactory: NoSplash.splashFactory, highlightColor: Colors.transparent, @@ -507,26 +506,20 @@ class _MainAppState extends State { if (chatUuid == jsonDecode(item)["uuid"]) { messages = []; chatUuid = null; - if (!(Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context).size.width <= 1000) { + if (!desktopLayout(context)) { Navigator.of(context).pop(); } } setState(() {}); }, child: Padding( - padding: const EdgeInsets.only(left: 12, right: 12), + padding: padding, child: InkWell( customBorder: const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.circular(50))), onTap: () { selectionHaptic(); - if (!(Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context).size.width <= 1000) { + if (!desktopFeature()) { Navigator.of(context).pop(); } if (!chatAllowed) return; @@ -681,165 +674,113 @@ class _MainAppState extends State { child: Scaffold( appBar: AppBar( title: Row( - children: [ - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? SizedBox(width: 85, height: 200, child: MoveWindow()) - : const SizedBox.shrink(), - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? Expanded( - child: SizedBox(height: 200, child: MoveWindow())) - : const SizedBox.shrink(), - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? selector - : Expanded(child: selector), - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? Expanded( - child: SizedBox(height: 200, child: MoveWindow())) - : const SizedBox.shrink(), - ], + children: desktopFeature() + ? [ + SizedBox(width: 85, height: 200, child: MoveWindow()), + Expanded( + child: SizedBox(height: 200, child: MoveWindow())), + selector, + Expanded( + child: SizedBox(height: 200, child: MoveWindow())) + ] + : [Expanded(child: selector)], ), - actions: (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) - ? [ - SizedBox( - height: 200, - child: WindowTitleBarBox( - child: Row( - children: [ - // Expanded(child: MoveWindow()), - SizedBox( - height: 200, - child: MinimizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: MaximizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: CloseWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - ], - ))) - ] - : [ - const SizedBox(width: 4), - IconButton( - onPressed: () { - selectionHaptic(); - if (!chatAllowed) return; + actions: desktopControlsActions(context, [ + const SizedBox(width: 4), + IconButton( + onPressed: () { + selectionHaptic(); + if (!chatAllowed) return; - if (prefs!.getBool("askBeforeDeletion") ?? - // ignore: dead_code - false && messages.isNotEmpty) { - showDialog( - context: context, - builder: (context) { - return StatefulBuilder( - builder: (context, setLocalState) { - return AlertDialog( - title: Text( + if (prefs!.getBool("askBeforeDeletion") ?? + // ignore: dead_code + false && messages.isNotEmpty) { + showDialog( + context: context, + builder: (context) { + return StatefulBuilder( + builder: (context, setLocalState) { + return AlertDialog( + title: Text(AppLocalizations.of(context)! + .deleteDialogTitle), + content: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text(AppLocalizations.of(context)! + .deleteDialogDescription), + ]), + actions: [ + TextButton( + onPressed: () { + selectionHaptic(); + Navigator.of(context).pop(); + }, + child: Text( AppLocalizations.of(context)! - .deleteDialogTitle), - content: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text(AppLocalizations.of( - context)! - .deleteDialogDescription), - ]), - actions: [ - TextButton( - onPressed: () { - selectionHaptic(); - Navigator.of(context).pop(); - }, - child: Text(AppLocalizations.of( - context)! - .deleteDialogCancel)), - TextButton( - onPressed: () { - selectionHaptic(); - Navigator.of(context).pop(); + .deleteDialogCancel)), + TextButton( + onPressed: () { + selectionHaptic(); + Navigator.of(context).pop(); - for (var i = 0; - i < - (prefs!.getStringList( - "chats") ?? - []) - .length; - i++) { - if (jsonDecode((prefs! - .getStringList( - "chats") ?? - [])[i])["uuid"] == - chatUuid) { - List tmp = prefs! + for (var i = 0; + i < + (prefs!.getStringList( + "chats") ?? + []) + .length; + i++) { + if (jsonDecode((prefs! .getStringList( - "chats")!; - tmp.removeAt(i); - prefs!.setStringList( - "chats", tmp); - break; - } - } - messages = []; - chatUuid = null; - setState(() {}); - }, - child: Text(AppLocalizations.of( - context)! - .deleteDialogDelete)) - ]); - }); - }); - } else { - for (var i = 0; - i < - (prefs!.getStringList("chats") ?? []) - .length; - i++) { - if (jsonDecode((prefs!.getStringList("chats") ?? - [])[i])["uuid"] == - chatUuid) { - List tmp = - prefs!.getStringList("chats")!; - tmp.removeAt(i); - prefs!.setStringList("chats", tmp); - break; - } - } - messages = []; - chatUuid = null; - } - setState(() {}); - }, - icon: const Icon(Icons.restart_alt_rounded)) - ], + "chats") ?? + [])[i])["uuid"] == + chatUuid) { + List tmp = prefs! + .getStringList("chats")!; + tmp.removeAt(i); + prefs!.setStringList( + "chats", tmp); + break; + } + } + messages = []; + chatUuid = null; + setState(() {}); + }, + child: Text( + AppLocalizations.of(context)! + .deleteDialogDelete)) + ]); + }); + }); + } else { + for (var i = 0; + i < (prefs!.getStringList("chats") ?? []).length; + i++) { + if (jsonDecode((prefs!.getStringList("chats") ?? + [])[i])["uuid"] == + chatUuid) { + List tmp = prefs!.getStringList("chats")!; + tmp.removeAt(i); + prefs!.setStringList("chats", tmp); + break; + } + } + messages = []; + chatUuid = null; + } + setState(() {}); + }, + icon: const Icon(Icons.restart_alt_rounded)) + ]), bottom: PreferredSize( preferredSize: const Size.fromHeight(1), child: (!chatAllowed && model != null) ? const LinearProgressIndicator() - : ((Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) + : desktopLayout(context) ? AnimatedOpacity( opacity: menuVisible ? 1.0 : 0.0, - duration: const Duration(milliseconds: 500), + duration: const Duration(milliseconds: 300), child: Divider( height: 2, color: (Theme.of(context).brightness == @@ -847,41 +788,33 @@ class _MainAppState extends State { ? Colors.grey[400] : Colors.grey[900])) : const SizedBox.shrink()), - leading: ((Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) - ? const SizedBox() - : null), + leading: + desktopLayoutRequired(context) ? const SizedBox() : null), body: Row( children: [ - ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) + desktopLayoutRequired(context) ? SizedBox( width: 304, height: double.infinity, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 5), - child: VisibilityDetector( - key: const Key("menuVisible"), - onVisibilityChanged: (VisibilityInfo info) { - if (settingsOpen) return; - menuVisible = info.visibleFraction > 0; - try { - setState(() {}); - } catch (_) {} - }, - child: AnimatedOpacity( - opacity: menuVisible ? 1.0 : 0.0, - duration: const Duration(milliseconds: 500), - child: ListView( - children: sidebar(context, setState)))))) + child: VisibilityDetector( + key: const Key("menuVisible"), + onVisibilityChanged: (VisibilityInfo info) { + if (settingsOpen) return; + menuVisible = info.visibleFraction > 0; + try { + setState(() {}); + } catch (_) {} + }, + child: AnimatedOpacity( + opacity: menuVisible ? 1.0 : 0.0, + duration: const Duration(milliseconds: 300), + child: ListView( + children: sidebar(context, setState))))) : const SizedBox.shrink(), - ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) + desktopLayout(context) ? AnimatedOpacity( opacity: menuVisible ? 1.0 : 0.0, - duration: const Duration(milliseconds: 500), + duration: const Duration(milliseconds: 300), child: VerticalDivider( width: 2, color: @@ -1069,12 +1002,7 @@ class _MainAppState extends State { }, imageMessageBuilder: (p0, {required messageWidth}) { return SizedBox( - width: ((Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) - ? 360.0 - : 160.0, + width: desktopLayout(context) ? 360.0 : 160.0, child: MarkdownBody(data: "![${p0.name}](${p0.uri})")); }, @@ -1188,11 +1116,7 @@ class _MainAppState extends State { : () { selectionHaptic(); if (!chatAllowed || model == null) return; - if (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) { - selectionHaptic(); - + if (desktopFeature()) { FilePicker.platform .pickFiles(type: FileType.image) .then((value) async { @@ -1213,7 +1137,6 @@ class _MainAppState extends State { "data:image/png;base64,$encoded")); setState(() {}); - selectionHaptic(); }); return; @@ -1384,9 +1307,7 @@ class _MainAppState extends State { sendable = p0.trim().isNotEmpty; }); }, - sendButtonVisibilityMode: (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) + sendButtonVisibilityMode: desktopFeature() ? SendButtonVisibilityMode.always : (sendable) ? SendButtonVisibilityMode.always @@ -1441,12 +1362,11 @@ class _MainAppState extends State { .viewInsets .bottom == 0.0 && - !(Platform.isWindows || - Platform.isLinux || - Platform.isMacOS)) + !desktopFeature()) ? 0 : 8), - messageMaxWidth: (MediaQuery.of(context).size.width >= 1000) + messageMaxWidth: (MediaQuery.of(context).size.width >= + 1000) ? (MediaQuery.of(context).size.width >= 1600) ? (MediaQuery.of(context).size.width >= 2200) ? 1900 @@ -1483,7 +1403,7 @@ class _MainAppState extends State { inputTextColor: (themeDark ?? ThemeData()).colorScheme.onSurface, inputBorderRadius: const BorderRadius.all(Radius.circular(64)), inputPadding: const EdgeInsets.all(16), - inputMargin: EdgeInsets.only(left: 8, right: 8, bottom: (MediaQuery.of(context).viewInsets.bottom == 0.0 && !(Platform.isWindows || Platform.isLinux || Platform.isMacOS)) ? 0 : 8), + inputMargin: EdgeInsets.only(left: 8, right: 8, bottom: (MediaQuery.of(context).viewInsets.bottom == 0.0 && !desktopFeature()) ? 0 : 8), messageMaxWidth: (MediaQuery.of(context).size.width >= 1000) ? (MediaQuery.of(context).size.width >= 1600) ? (MediaQuery.of(context).size.width >= 2200) @@ -1494,12 +1414,9 @@ class _MainAppState extends State { ], ), drawerEdgeDragWidth: - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? null - : MediaQuery.of(context).size.width, + desktopLayout(context) ? null : MediaQuery.of(context).size.width, drawer: Builder(builder: (context) { - if ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) { + if (desktopLayoutRequired(context)) { WidgetsBinding.instance.addPostFrameCallback((_) { if (Navigator.of(context).canPop()) { Navigator.of(context).pop(); diff --git a/lib/screen_settings.dart b/lib/screen_settings.dart index e4cf961..a4b8f23 100644 --- a/lib/screen_settings.dart +++ b/lib/screen_settings.dart @@ -1,11 +1,11 @@ import 'dart:convert'; -import 'dart:io'; import 'package:flutter/material.dart'; import 'main.dart'; import 'worker/haptic.dart'; import 'worker/update.dart'; +import 'worker/desktop.dart'; import 'package:ollama_app/worker/setter.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; @@ -255,48 +255,12 @@ class _ScreenSettingsState extends State { color: Theme.of(context).colorScheme.surface, child: Scaffold( appBar: AppBar( - title: Row(children: [ - Text(AppLocalizations.of(context)!.optionSettings), - Expanded(child: SizedBox(height: 200, child: MoveWindow())) - ]), - actions: (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) - ? [ - SizedBox( - height: 200, - child: WindowTitleBarBox( - child: Row( - children: [ - SizedBox( - height: 200, - child: MinimizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: MaximizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: CloseWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - ], - ))) - ] - : null, - ), + title: Row(children: [ + Text(AppLocalizations.of(context)!.optionSettings), + Expanded( + child: SizedBox(height: 200, child: MoveWindow())) + ]), + actions: desktopControlsActions(context)), body: Padding( padding: const EdgeInsets.only(left: 16, right: 16), child: Column(children: [ @@ -467,9 +431,7 @@ class _ScreenSettingsState extends State { builder: (context) => const ScreenSettingsInterface())); }), - (!(Platform.isWindows || - Platform.isLinux || - Platform.isMacOS)) + (!desktopFeature()) ? button( AppLocalizations.of(context)! .settingsTitleVoice, diff --git a/lib/settings/about.dart b/lib/settings/about.dart index 9d083bf..ad21ad0 100644 --- a/lib/settings/about.dart +++ b/lib/settings/about.dart @@ -1,11 +1,10 @@ -import 'dart:io'; - import 'package:flutter/material.dart'; import '../main.dart'; import '../screen_settings.dart'; import '../worker/haptic.dart'; import '../worker/update.dart'; +import '../worker/desktop.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:bitsdojo_window/bitsdojo_window.dart'; @@ -43,41 +42,7 @@ class _ScreenSettingsAboutState extends State { Expanded(child: SizedBox(height: 200, child: MoveWindow())) ]), actions: - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? [ - SizedBox( - height: 200, - child: WindowTitleBarBox( - child: Row( - children: [ - SizedBox( - height: 200, - child: MinimizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: MaximizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: CloseWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - ], - ))) - ] - : null, + desktopControlsActions(context) ), body: Padding( padding: const EdgeInsets.only(left: 16, right: 16), diff --git a/lib/settings/behavior.dart b/lib/settings/behavior.dart index 2cd833f..7293d88 100644 --- a/lib/settings/behavior.dart +++ b/lib/settings/behavior.dart @@ -1,9 +1,8 @@ -import 'dart:io'; - import 'package:flutter/material.dart'; import '../main.dart'; import '../worker/haptic.dart'; +import '../worker/desktop.dart'; import '../screen_settings.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; @@ -38,41 +37,7 @@ class _ScreenSettingsBehaviorState extends State { Expanded(child: SizedBox(height: 200, child: MoveWindow())) ]), actions: - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? [ - SizedBox( - height: 200, - child: WindowTitleBarBox( - child: Row( - children: [ - SizedBox( - height: 200, - child: MinimizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: MaximizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: CloseWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - ], - ))) - ] - : null, + desktopControlsActions(context) ), body: Padding( padding: const EdgeInsets.only(left: 16, right: 16), diff --git a/lib/settings/export.dart b/lib/settings/export.dart index aa0ec27..8239aff 100644 --- a/lib/settings/export.dart +++ b/lib/settings/export.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import '../main.dart'; import '../worker/haptic.dart'; +import '../worker/desktop.dart'; import '../screen_settings.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; @@ -32,41 +33,7 @@ class _ScreenSettingsExportState extends State { Expanded(child: SizedBox(height: 200, child: MoveWindow())) ]), actions: - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? [ - SizedBox( - height: 200, - child: WindowTitleBarBox( - child: Row( - children: [ - SizedBox( - height: 200, - child: MinimizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: MaximizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: CloseWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - ], - ))) - ] - : null, + desktopControlsActions(context) ), body: Padding( padding: const EdgeInsets.only(left: 16, right: 16), @@ -86,9 +53,7 @@ class _ScreenSettingsExportState extends State { jsonEncode(prefs!.getStringList("chats") ?? []))); selectionHaptic(); if (path == null) return; - if (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) { + if (desktopFeature()) { File(path).writeAsString( jsonEncode(prefs!.getStringList("chats") ?? [])); } diff --git a/lib/settings/interface.dart b/lib/settings/interface.dart index 6d608aa..1e4b865 100644 --- a/lib/settings/interface.dart +++ b/lib/settings/interface.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import '../main.dart'; import '../worker/haptic.dart'; +import '../worker/desktop.dart'; import '../screen_settings.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; @@ -31,41 +32,7 @@ class _ScreenSettingsInterfaceState extends State { Expanded(child: SizedBox(height: 200, child: MoveWindow())) ]), actions: - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? [ - SizedBox( - height: 200, - child: WindowTitleBarBox( - child: Row( - children: [ - SizedBox( - height: 200, - child: MinimizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: MaximizeWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - SizedBox( - height: 72, - child: CloseWindowButton( - animate: true, - colors: WindowButtonColors( - iconNormal: Theme.of(context) - .colorScheme - .primary))), - ], - ))) - ] - : null, + desktopControlsActions(context) ), body: Padding( padding: const EdgeInsets.only(left: 16, right: 16), @@ -193,9 +160,7 @@ class _ScreenSettingsInterfaceState extends State { context: context, builder: (context) { return Dialog( - alignment: (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) + alignment: desktopLayout(context) ? null : Alignment.bottomRight, child: StatefulBuilder( @@ -279,7 +244,7 @@ class _ScreenSettingsInterfaceState extends State { selectionHaptic(); setState(() {}); }), - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) + desktopFeature() ? toggle( context, AppLocalizations.of(context)! @@ -354,9 +319,7 @@ class _ScreenSettingsInterfaceState extends State { await prefs!.setString( "brightness", p0.elementAt(0)); - if (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) { + if (desktopFeature()) { exit(0); } else { Restart.restartApp(); @@ -420,9 +383,7 @@ class _ScreenSettingsInterfaceState extends State { await prefs!.setBool( "useDeviceTheme", p0.elementAt(0) == "device"); - if (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) { + if (desktopFeature()) { exit(0); } else { Restart.restartApp(); diff --git a/lib/settings/voice.dart b/lib/settings/voice.dart index 7f2a300..ddb6cf7 100644 --- a/lib/settings/voice.dart +++ b/lib/settings/voice.dart @@ -172,24 +172,12 @@ class _ScreenSettingsVoiceState extends State { setState(() {}); }, child: Container( - width: ((Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context) - .size - .width >= - 1000) - ? null - : double.infinity, - padding: EdgeInsets.only( + width: double.infinity, + padding: const EdgeInsets.only( left: 16, right: 16, top: 16, - bottom: (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) - ? 16 - : 0), + bottom: 0), child: Column( mainAxisSize: MainAxisSize.min, children: [ @@ -219,25 +207,7 @@ class _ScreenSettingsVoiceState extends State { scrollDirection: Axis.vertical, child: Wrap( - spacing: ((Platform.isWindows || - Platform - .isLinux || - Platform - .isMacOS) && - MediaQuery.of(context).size.width >= - 1000) - ? 10.0 - : 5.0, - runSpacing: (Platform.isWindows || - Platform - .isLinux || - Platform - .isMacOS) - ? (MediaQuery.of(context).size.width >= - 1000) - ? 10.0 - : 5.0 - : 0.0, + spacing: 5.0, alignment: WrapAlignment .center, diff --git a/lib/worker/desktop.dart b/lib/worker/desktop.dart new file mode 100644 index 0000000..e6e7992 --- /dev/null +++ b/lib/worker/desktop.dart @@ -0,0 +1,66 @@ +import 'dart:io'; + +import 'package:flutter/material.dart'; +import 'package:flutter/foundation.dart'; + +import 'package:bitsdojo_window/bitsdojo_window.dart'; + +bool desktopFeature() { + return (Platform.isWindows || Platform.isLinux || Platform.isMacOS); +} + +bool desktopWebFeature() { + return (Platform.isWindows || Platform.isLinux || Platform.isMacOS || kIsWeb); +} + +bool desktopLayout(BuildContext context) { + return (desktopFeature() || MediaQuery.of(context).size.width >= 1000); +} + +bool desktopLayoutRequired(BuildContext context) { + return (desktopFeature() && MediaQuery.of(context).size.width >= 1000); +} + +bool desktopWebLayout(BuildContext context) { + return (desktopWebFeature() || MediaQuery.of(context).size.width >= 1000); +} + +bool desktopWebLayoutRequired(BuildContext context) { + return (desktopWebFeature() && MediaQuery.of(context).size.width >= 1000); +} + +Widget desktopControls(BuildContext context) { + return SizedBox( + height: 200, + child: WindowTitleBarBox( + child: Row( + children: [ + SizedBox( + width: 46, + height: 200, + child: MinimizeWindowButton( + animate: true, + colors: WindowButtonColors( + iconNormal: Theme.of(context).colorScheme.primary))), + SizedBox( + width: 46, + height: 72, + child: MaximizeWindowButton( + animate: true, + colors: WindowButtonColors( + iconNormal: Theme.of(context).colorScheme.primary))), + SizedBox( + width: 46, + height: 72, + child: CloseWindowButton( + animate: true, + colors: WindowButtonColors( + iconNormal: Theme.of(context).colorScheme.primary))), + ], + ))); +} + +List? desktopControlsActions(BuildContext context, + [List? ifNotAvailable]) { + return desktopFeature() ? [desktopControls(context)] : ifNotAvailable; +} diff --git a/lib/worker/setter.dart b/lib/worker/setter.dart index aa5bf24..7a91b9b 100644 --- a/lib/worker/setter.dart +++ b/lib/worker/setter.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:ollama_app/worker/desktop.dart'; import 'haptic.dart'; import '../main.dart'; @@ -89,45 +90,28 @@ void setModel(BuildContext context, Function setState) { setState(() {}); }, child: Container( - width: - ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) - ? null - : double.infinity, + width: desktopLayout(context) ? null : double.infinity, padding: EdgeInsets.only( left: 16, right: 16, top: 16, - bottom: - (Platform.isWindows || Platform.isLinux || Platform.isMacOS) - ? 16 - : 0), + bottom: desktopLayout(context) ? 16 : 0), child: (!loaded) - ? const LinearProgressIndicator() + ? SizedBox( + width: desktopLayout(context) ? 300 : double.infinity, + child: const LinearProgressIndicator()) : Column(mainAxisSize: MainAxisSize.min, children: [ Container( - width: ((Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) - ? 300 - : double.infinity, + width: desktopLayout(context) ? 300 : double.infinity, constraints: BoxConstraints( maxHeight: MediaQuery.of(context).size.height * 0.4), child: SingleChildScrollView( scrollDirection: Axis.vertical, child: Wrap( - spacing: ((Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) - ? 10.0 - : 5.0, - runSpacing: (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) - ? (MediaQuery.of(context).size.width >= 1000) + spacing: desktopLayout(context) ? 10.0 : 5.0, + runSpacing: desktopFeature() + ? desktopLayoutRequired(context) ? 10.0 : 5.0 : 0.0, @@ -233,8 +217,7 @@ void setModel(BuildContext context, Function setState) { ]))); }); - if ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) && - MediaQuery.of(context).size.width >= 1000) { + if (desktopLayout(context)) { showDialog( context: context, builder: (context) { @@ -391,9 +374,7 @@ Future prompt(BuildContext context, left: 16, right: 16, top: 16, - bottom: (Platform.isWindows || - Platform.isLinux || - Platform.isMacOS) + bottom: desktopFeature() ? 16 : MediaQuery.of(context).viewInsets.bottom), width: double.infinity, diff --git a/lib/worker/update.dart b/lib/worker/update.dart index 6321c23..3cd7792 100644 --- a/lib/worker/update.dart +++ b/lib/worker/update.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter/material.dart'; +import 'package:ollama_app/worker/desktop.dart'; import 'haptic.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; @@ -37,7 +38,7 @@ Future updatesSupported(Function setState, "com.machiav3lli.fdroid", "nya.kitsunyan.foxydroid" ]; - if (!(Platform.isWindows || Platform.isLinux || Platform.isMacOS)) { + if (!desktopFeature()) { if ((await InstallReferrer.referrer != InstallationAppReferrer.androidManually) || (installerApps diff --git a/linux/.gitignore b/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt new file mode 100644 index 0000000..eb33c02 --- /dev/null +++ b/linux/CMakeLists.txt @@ -0,0 +1,145 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "ollama") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.freakurl.apps.ollama_app") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..816824e --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,27 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include +#include +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) bitsdojo_window_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "BitsdojoWindowPlugin"); + bitsdojo_window_plugin_register_with_registrar(bitsdojo_window_linux_registrar); + g_autoptr(FlPluginRegistrar) dynamic_color_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin"); + dynamic_color_plugin_register_with_registrar(dynamic_color_registrar); + g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); + file_selector_plugin_register_with_registrar(file_selector_linux_registrar); + g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); +} diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..9c63f18 --- /dev/null +++ b/linux/flutter/generated_plugins.cmake @@ -0,0 +1,27 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + bitsdojo_window_linux + dynamic_color + file_selector_linux + url_launcher_linux +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/linux/main.cc b/linux/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/linux/my_application.cc b/linux/my_application.cc new file mode 100644 index 0000000..5c27b6c --- /dev/null +++ b/linux/my_application.cc @@ -0,0 +1,128 @@ +#include + +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "Ollama App"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "Ollama App"); + } + + auto bdw = bitsdojo_window_from(window); + bdw->setCustomFrame(true); + // gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GApplication::startup. +static void my_application_startup(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/linux/my_application.h b/linux/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_