Updated desktop structure, experimental linux build
This commit is contained in:
parent
c780564129
commit
7422d235d1
|
@ -18,6 +18,12 @@ migration:
|
||||||
- platform: android
|
- platform: android
|
||||||
create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
||||||
base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
||||||
|
- platform: linux
|
||||||
|
create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
||||||
|
base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
||||||
|
- platform: web
|
||||||
|
create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
||||||
|
base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
||||||
- platform: windows
|
- platform: windows
|
||||||
create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
create_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
||||||
base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
base_revision: a14f74ff3a1cbd521163c5f03d68113d50af93d3
|
||||||
|
|
393
lib/main.dart
393
lib/main.dart
|
@ -15,6 +15,7 @@ import 'screen_welcome.dart';
|
||||||
import 'worker/setter.dart';
|
import 'worker/setter.dart';
|
||||||
import 'worker/haptic.dart';
|
import 'worker/haptic.dart';
|
||||||
import 'worker/sender.dart';
|
import 'worker/sender.dart';
|
||||||
|
import 'worker/desktop.dart';
|
||||||
|
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
// ignore: depend_on_referenced_packages
|
// ignore: depend_on_referenced_packages
|
||||||
|
@ -83,7 +84,7 @@ Function? setMainState;
|
||||||
void main() {
|
void main() {
|
||||||
runApp(const App());
|
runApp(const App());
|
||||||
|
|
||||||
if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
|
if (desktopFeature()) {
|
||||||
doWhenWindowReady(() {
|
doWhenWindowReady(() {
|
||||||
appWindow.minSize = const Size(600, 450);
|
appWindow.minSize = const Size(600, 450);
|
||||||
appWindow.size = const Size(1200, 650);
|
appWindow.size = const Size(1200, 650);
|
||||||
|
@ -121,10 +122,15 @@ class _AppState extends State<App> {
|
||||||
prefs = tmp;
|
prefs = tmp;
|
||||||
});
|
});
|
||||||
|
|
||||||
if ((await Permission.bluetoothConnect.isGranted) &&
|
try {
|
||||||
(await Permission.microphone.isGranted)) {
|
if ((await Permission.bluetoothConnect.isGranted) &&
|
||||||
voiceSupported = await speech.initialize();
|
(await Permission.microphone.isGranted)) {
|
||||||
} else {
|
voiceSupported = await speech.initialize();
|
||||||
|
} else {
|
||||||
|
prefs!.setBool("voiceModeEnabled", false);
|
||||||
|
voiceSupported = false;
|
||||||
|
}
|
||||||
|
} catch (_) {
|
||||||
prefs!.setBool("voiceModeEnabled", false);
|
prefs!.setBool("voiceModeEnabled", false);
|
||||||
voiceSupported = false;
|
voiceSupported = false;
|
||||||
}
|
}
|
||||||
|
@ -248,12 +254,14 @@ class _MainAppState extends State<MainApp> {
|
||||||
int tipId = Random().nextInt(5);
|
int tipId = Random().nextInt(5);
|
||||||
|
|
||||||
List<Widget> sidebar(BuildContext context, Function setState) {
|
List<Widget> sidebar(BuildContext context, Function setState) {
|
||||||
|
var padding = EdgeInsets.only(
|
||||||
|
left: desktopLayoutRequired(context) ? 17 : 12,
|
||||||
|
right: desktopLayoutRequired(context) ? 17 : 12);
|
||||||
return List.from([
|
return List.from([
|
||||||
((Platform.isWindows || Platform.isLinux || Platform.isMacOS) &&
|
desktopLayout(context)
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
|
||||||
? const SizedBox.shrink()
|
? const SizedBox.shrink()
|
||||||
: (Padding(
|
: (Padding(
|
||||||
padding: const EdgeInsets.only(left: 12, right: 12),
|
padding: padding,
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
customBorder: const RoundedRectangleBorder(
|
customBorder: const RoundedRectangleBorder(
|
||||||
borderRadius: BorderRadius.all(Radius.circular(50))),
|
borderRadius: BorderRadius.all(Radius.circular(50))),
|
||||||
|
@ -273,24 +281,20 @@ class _MainAppState extends State<MainApp> {
|
||||||
),
|
),
|
||||||
const SizedBox(width: 16),
|
const SizedBox(width: 16),
|
||||||
]))))),
|
]))))),
|
||||||
((Platform.isWindows || Platform.isLinux || Platform.isMacOS) &&
|
desktopLayout(context)
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
|
||||||
? const SizedBox.shrink()
|
? const SizedBox.shrink()
|
||||||
: (!allowMultipleChats && !allowSettings)
|
: (!allowMultipleChats && !allowSettings)
|
||||||
? const SizedBox.shrink()
|
? const SizedBox.shrink()
|
||||||
: const Divider(),
|
: const Divider(),
|
||||||
(allowMultipleChats)
|
(allowMultipleChats)
|
||||||
? (Padding(
|
? (Padding(
|
||||||
padding: const EdgeInsets.only(left: 12, right: 12),
|
padding: padding,
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
customBorder: const RoundedRectangleBorder(
|
customBorder: const RoundedRectangleBorder(
|
||||||
borderRadius: BorderRadius.all(Radius.circular(50))),
|
borderRadius: BorderRadius.all(Radius.circular(50))),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
selectionHaptic();
|
selectionHaptic();
|
||||||
if (!(Platform.isWindows ||
|
if (!desktopLayout(context)) {
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context).size.width <= 1000) {
|
|
||||||
Navigator.of(context).pop();
|
Navigator.of(context).pop();
|
||||||
}
|
}
|
||||||
if (!chatAllowed && model != null) return;
|
if (!chatAllowed && model != null) return;
|
||||||
|
@ -317,16 +321,13 @@ class _MainAppState extends State<MainApp> {
|
||||||
: const SizedBox.shrink(),
|
: const SizedBox.shrink(),
|
||||||
(allowSettings)
|
(allowSettings)
|
||||||
? (Padding(
|
? (Padding(
|
||||||
padding: const EdgeInsets.only(left: 12, right: 12),
|
padding: padding,
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
customBorder: const RoundedRectangleBorder(
|
customBorder: const RoundedRectangleBorder(
|
||||||
borderRadius: BorderRadius.all(Radius.circular(50))),
|
borderRadius: BorderRadius.all(Radius.circular(50))),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
selectionHaptic();
|
selectionHaptic();
|
||||||
if (!(Platform.isWindows ||
|
if (!desktopLayout(context)) {
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context).size.width <= 1000) {
|
|
||||||
Navigator.of(context).pop();
|
Navigator.of(context).pop();
|
||||||
}
|
}
|
||||||
setState(() {
|
setState(() {
|
||||||
|
@ -355,17 +356,15 @@ class _MainAppState extends State<MainApp> {
|
||||||
])))))
|
])))))
|
||||||
: const SizedBox.shrink(),
|
: const SizedBox.shrink(),
|
||||||
Divider(
|
Divider(
|
||||||
color:
|
color: desktopLayout(context)
|
||||||
((Platform.isWindows || Platform.isLinux || Platform.isMacOS) &&
|
? (Theme.of(context).brightness == Brightness.light)
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
? Colors.grey[400]
|
||||||
? (Theme.of(context).brightness == Brightness.light)
|
: Colors.grey[900]
|
||||||
? Colors.grey[400]
|
: null),
|
||||||
: Colors.grey[900]
|
|
||||||
: null),
|
|
||||||
((prefs?.getStringList("chats") ?? []).isNotEmpty)
|
((prefs?.getStringList("chats") ?? []).isNotEmpty)
|
||||||
? const SizedBox.shrink()
|
? const SizedBox.shrink()
|
||||||
: (Padding(
|
: (Padding(
|
||||||
padding: const EdgeInsets.only(left: 12, right: 12),
|
padding: padding,
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
customBorder: const RoundedRectangleBorder(
|
customBorder: const RoundedRectangleBorder(
|
||||||
borderRadius: BorderRadius.all(Radius.circular(50))),
|
borderRadius: BorderRadius.all(Radius.circular(50))),
|
||||||
|
@ -405,7 +404,7 @@ class _MainAppState extends State<MainApp> {
|
||||||
!allowSettings)
|
!allowSettings)
|
||||||
? const SizedBox.shrink()
|
? const SizedBox.shrink()
|
||||||
: (Padding(
|
: (Padding(
|
||||||
padding: const EdgeInsets.only(left: 12, right: 12),
|
padding: padding,
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
splashFactory: NoSplash.splashFactory,
|
splashFactory: NoSplash.splashFactory,
|
||||||
highlightColor: Colors.transparent,
|
highlightColor: Colors.transparent,
|
||||||
|
@ -507,26 +506,20 @@ class _MainAppState extends State<MainApp> {
|
||||||
if (chatUuid == jsonDecode(item)["uuid"]) {
|
if (chatUuid == jsonDecode(item)["uuid"]) {
|
||||||
messages = [];
|
messages = [];
|
||||||
chatUuid = null;
|
chatUuid = null;
|
||||||
if (!(Platform.isWindows ||
|
if (!desktopLayout(context)) {
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context).size.width <= 1000) {
|
|
||||||
Navigator.of(context).pop();
|
Navigator.of(context).pop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
setState(() {});
|
setState(() {});
|
||||||
},
|
},
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.only(left: 12, right: 12),
|
padding: padding,
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
customBorder: const RoundedRectangleBorder(
|
customBorder: const RoundedRectangleBorder(
|
||||||
borderRadius: BorderRadius.all(Radius.circular(50))),
|
borderRadius: BorderRadius.all(Radius.circular(50))),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
selectionHaptic();
|
selectionHaptic();
|
||||||
if (!(Platform.isWindows ||
|
if (!desktopFeature()) {
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context).size.width <= 1000) {
|
|
||||||
Navigator.of(context).pop();
|
Navigator.of(context).pop();
|
||||||
}
|
}
|
||||||
if (!chatAllowed) return;
|
if (!chatAllowed) return;
|
||||||
|
@ -681,165 +674,113 @@ class _MainAppState extends State<MainApp> {
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: Row(
|
title: Row(
|
||||||
children: [
|
children: desktopFeature()
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
? [
|
||||||
? SizedBox(width: 85, height: 200, child: MoveWindow())
|
SizedBox(width: 85, height: 200, child: MoveWindow()),
|
||||||
: const SizedBox.shrink(),
|
Expanded(
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
child: SizedBox(height: 200, child: MoveWindow())),
|
||||||
? Expanded(
|
selector,
|
||||||
child: SizedBox(height: 200, child: MoveWindow()))
|
Expanded(
|
||||||
: const SizedBox.shrink(),
|
child: SizedBox(height: 200, child: MoveWindow()))
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
]
|
||||||
? selector
|
: [Expanded(child: selector)],
|
||||||
: Expanded(child: selector),
|
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
|
||||||
? Expanded(
|
|
||||||
child: SizedBox(height: 200, child: MoveWindow()))
|
|
||||||
: const SizedBox.shrink(),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
actions: (Platform.isWindows ||
|
actions: desktopControlsActions(context, [
|
||||||
Platform.isLinux ||
|
const SizedBox(width: 4),
|
||||||
Platform.isMacOS)
|
IconButton(
|
||||||
? [
|
onPressed: () {
|
||||||
SizedBox(
|
selectionHaptic();
|
||||||
height: 200,
|
if (!chatAllowed) return;
|
||||||
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;
|
|
||||||
|
|
||||||
if (prefs!.getBool("askBeforeDeletion") ??
|
if (prefs!.getBool("askBeforeDeletion") ??
|
||||||
// ignore: dead_code
|
// ignore: dead_code
|
||||||
false && messages.isNotEmpty) {
|
false && messages.isNotEmpty) {
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
return StatefulBuilder(
|
return StatefulBuilder(
|
||||||
builder: (context, setLocalState) {
|
builder: (context, setLocalState) {
|
||||||
return AlertDialog(
|
return AlertDialog(
|
||||||
title: Text(
|
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)!
|
AppLocalizations.of(context)!
|
||||||
.deleteDialogTitle),
|
.deleteDialogCancel)),
|
||||||
content: Column(
|
TextButton(
|
||||||
mainAxisSize: MainAxisSize.min,
|
onPressed: () {
|
||||||
children: [
|
selectionHaptic();
|
||||||
Text(AppLocalizations.of(
|
Navigator.of(context).pop();
|
||||||
context)!
|
|
||||||
.deleteDialogDescription),
|
|
||||||
]),
|
|
||||||
actions: [
|
|
||||||
TextButton(
|
|
||||||
onPressed: () {
|
|
||||||
selectionHaptic();
|
|
||||||
Navigator.of(context).pop();
|
|
||||||
},
|
|
||||||
child: Text(AppLocalizations.of(
|
|
||||||
context)!
|
|
||||||
.deleteDialogCancel)),
|
|
||||||
TextButton(
|
|
||||||
onPressed: () {
|
|
||||||
selectionHaptic();
|
|
||||||
Navigator.of(context).pop();
|
|
||||||
|
|
||||||
for (var i = 0;
|
for (var i = 0;
|
||||||
i <
|
i <
|
||||||
(prefs!.getStringList(
|
(prefs!.getStringList(
|
||||||
"chats") ??
|
"chats") ??
|
||||||
[])
|
[])
|
||||||
.length;
|
.length;
|
||||||
i++) {
|
i++) {
|
||||||
if (jsonDecode((prefs!
|
if (jsonDecode((prefs!
|
||||||
.getStringList(
|
|
||||||
"chats") ??
|
|
||||||
[])[i])["uuid"] ==
|
|
||||||
chatUuid) {
|
|
||||||
List<String> tmp = prefs!
|
|
||||||
.getStringList(
|
.getStringList(
|
||||||
"chats")!;
|
"chats") ??
|
||||||
tmp.removeAt(i);
|
[])[i])["uuid"] ==
|
||||||
prefs!.setStringList(
|
chatUuid) {
|
||||||
"chats", tmp);
|
List<String> tmp = prefs!
|
||||||
break;
|
.getStringList("chats")!;
|
||||||
}
|
tmp.removeAt(i);
|
||||||
}
|
prefs!.setStringList(
|
||||||
messages = [];
|
"chats", tmp);
|
||||||
chatUuid = null;
|
break;
|
||||||
setState(() {});
|
}
|
||||||
},
|
}
|
||||||
child: Text(AppLocalizations.of(
|
messages = [];
|
||||||
context)!
|
chatUuid = null;
|
||||||
.deleteDialogDelete))
|
setState(() {});
|
||||||
]);
|
},
|
||||||
});
|
child: Text(
|
||||||
});
|
AppLocalizations.of(context)!
|
||||||
} else {
|
.deleteDialogDelete))
|
||||||
for (var i = 0;
|
]);
|
||||||
i <
|
});
|
||||||
(prefs!.getStringList("chats") ?? [])
|
});
|
||||||
.length;
|
} else {
|
||||||
i++) {
|
for (var i = 0;
|
||||||
if (jsonDecode((prefs!.getStringList("chats") ??
|
i < (prefs!.getStringList("chats") ?? []).length;
|
||||||
[])[i])["uuid"] ==
|
i++) {
|
||||||
chatUuid) {
|
if (jsonDecode((prefs!.getStringList("chats") ??
|
||||||
List<String> tmp =
|
[])[i])["uuid"] ==
|
||||||
prefs!.getStringList("chats")!;
|
chatUuid) {
|
||||||
tmp.removeAt(i);
|
List<String> tmp = prefs!.getStringList("chats")!;
|
||||||
prefs!.setStringList("chats", tmp);
|
tmp.removeAt(i);
|
||||||
break;
|
prefs!.setStringList("chats", tmp);
|
||||||
}
|
break;
|
||||||
}
|
}
|
||||||
messages = [];
|
}
|
||||||
chatUuid = null;
|
messages = [];
|
||||||
}
|
chatUuid = null;
|
||||||
setState(() {});
|
}
|
||||||
},
|
setState(() {});
|
||||||
icon: const Icon(Icons.restart_alt_rounded))
|
},
|
||||||
],
|
icon: const Icon(Icons.restart_alt_rounded))
|
||||||
|
]),
|
||||||
bottom: PreferredSize(
|
bottom: PreferredSize(
|
||||||
preferredSize: const Size.fromHeight(1),
|
preferredSize: const Size.fromHeight(1),
|
||||||
child: (!chatAllowed && model != null)
|
child: (!chatAllowed && model != null)
|
||||||
? const LinearProgressIndicator()
|
? const LinearProgressIndicator()
|
||||||
: ((Platform.isWindows ||
|
: desktopLayout(context)
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
|
||||||
? AnimatedOpacity(
|
? AnimatedOpacity(
|
||||||
opacity: menuVisible ? 1.0 : 0.0,
|
opacity: menuVisible ? 1.0 : 0.0,
|
||||||
duration: const Duration(milliseconds: 500),
|
duration: const Duration(milliseconds: 300),
|
||||||
child: Divider(
|
child: Divider(
|
||||||
height: 2,
|
height: 2,
|
||||||
color: (Theme.of(context).brightness ==
|
color: (Theme.of(context).brightness ==
|
||||||
|
@ -847,41 +788,33 @@ class _MainAppState extends State<MainApp> {
|
||||||
? Colors.grey[400]
|
? Colors.grey[400]
|
||||||
: Colors.grey[900]))
|
: Colors.grey[900]))
|
||||||
: const SizedBox.shrink()),
|
: const SizedBox.shrink()),
|
||||||
leading: ((Platform.isWindows ||
|
leading:
|
||||||
Platform.isLinux ||
|
desktopLayoutRequired(context) ? const SizedBox() : null),
|
||||||
Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
|
||||||
? const SizedBox()
|
|
||||||
: null),
|
|
||||||
body: Row(
|
body: Row(
|
||||||
children: [
|
children: [
|
||||||
((Platform.isWindows || Platform.isLinux || Platform.isMacOS) &&
|
desktopLayoutRequired(context)
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
|
||||||
? SizedBox(
|
? SizedBox(
|
||||||
width: 304,
|
width: 304,
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
child: Padding(
|
child: VisibilityDetector(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 5),
|
key: const Key("menuVisible"),
|
||||||
child: VisibilityDetector(
|
onVisibilityChanged: (VisibilityInfo info) {
|
||||||
key: const Key("menuVisible"),
|
if (settingsOpen) return;
|
||||||
onVisibilityChanged: (VisibilityInfo info) {
|
menuVisible = info.visibleFraction > 0;
|
||||||
if (settingsOpen) return;
|
try {
|
||||||
menuVisible = info.visibleFraction > 0;
|
setState(() {});
|
||||||
try {
|
} catch (_) {}
|
||||||
setState(() {});
|
},
|
||||||
} catch (_) {}
|
child: AnimatedOpacity(
|
||||||
},
|
opacity: menuVisible ? 1.0 : 0.0,
|
||||||
child: AnimatedOpacity(
|
duration: const Duration(milliseconds: 300),
|
||||||
opacity: menuVisible ? 1.0 : 0.0,
|
child: ListView(
|
||||||
duration: const Duration(milliseconds: 500),
|
children: sidebar(context, setState)))))
|
||||||
child: ListView(
|
|
||||||
children: sidebar(context, setState))))))
|
|
||||||
: const SizedBox.shrink(),
|
: const SizedBox.shrink(),
|
||||||
((Platform.isWindows || Platform.isLinux || Platform.isMacOS) &&
|
desktopLayout(context)
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
|
||||||
? AnimatedOpacity(
|
? AnimatedOpacity(
|
||||||
opacity: menuVisible ? 1.0 : 0.0,
|
opacity: menuVisible ? 1.0 : 0.0,
|
||||||
duration: const Duration(milliseconds: 500),
|
duration: const Duration(milliseconds: 300),
|
||||||
child: VerticalDivider(
|
child: VerticalDivider(
|
||||||
width: 2,
|
width: 2,
|
||||||
color:
|
color:
|
||||||
|
@ -1069,12 +1002,7 @@ class _MainAppState extends State<MainApp> {
|
||||||
},
|
},
|
||||||
imageMessageBuilder: (p0, {required messageWidth}) {
|
imageMessageBuilder: (p0, {required messageWidth}) {
|
||||||
return SizedBox(
|
return SizedBox(
|
||||||
width: ((Platform.isWindows ||
|
width: desktopLayout(context) ? 360.0 : 160.0,
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
|
||||||
? 360.0
|
|
||||||
: 160.0,
|
|
||||||
child:
|
child:
|
||||||
MarkdownBody(data: ""));
|
MarkdownBody(data: ""));
|
||||||
},
|
},
|
||||||
|
@ -1188,11 +1116,7 @@ class _MainAppState extends State<MainApp> {
|
||||||
: () {
|
: () {
|
||||||
selectionHaptic();
|
selectionHaptic();
|
||||||
if (!chatAllowed || model == null) return;
|
if (!chatAllowed || model == null) return;
|
||||||
if (Platform.isWindows ||
|
if (desktopFeature()) {
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) {
|
|
||||||
selectionHaptic();
|
|
||||||
|
|
||||||
FilePicker.platform
|
FilePicker.platform
|
||||||
.pickFiles(type: FileType.image)
|
.pickFiles(type: FileType.image)
|
||||||
.then((value) async {
|
.then((value) async {
|
||||||
|
@ -1213,7 +1137,6 @@ class _MainAppState extends State<MainApp> {
|
||||||
"data:image/png;base64,$encoded"));
|
"data:image/png;base64,$encoded"));
|
||||||
|
|
||||||
setState(() {});
|
setState(() {});
|
||||||
selectionHaptic();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -1384,9 +1307,7 @@ class _MainAppState extends State<MainApp> {
|
||||||
sendable = p0.trim().isNotEmpty;
|
sendable = p0.trim().isNotEmpty;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
sendButtonVisibilityMode: (Platform.isWindows ||
|
sendButtonVisibilityMode: desktopFeature()
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS)
|
|
||||||
? SendButtonVisibilityMode.always
|
? SendButtonVisibilityMode.always
|
||||||
: (sendable)
|
: (sendable)
|
||||||
? SendButtonVisibilityMode.always
|
? SendButtonVisibilityMode.always
|
||||||
|
@ -1441,12 +1362,11 @@ class _MainAppState extends State<MainApp> {
|
||||||
.viewInsets
|
.viewInsets
|
||||||
.bottom ==
|
.bottom ==
|
||||||
0.0 &&
|
0.0 &&
|
||||||
!(Platform.isWindows ||
|
!desktopFeature())
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS))
|
|
||||||
? 0
|
? 0
|
||||||
: 8),
|
: 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 >= 1600)
|
||||||
? (MediaQuery.of(context).size.width >= 2200)
|
? (MediaQuery.of(context).size.width >= 2200)
|
||||||
? 1900
|
? 1900
|
||||||
|
@ -1483,7 +1403,7 @@ class _MainAppState extends State<MainApp> {
|
||||||
inputTextColor: (themeDark ?? ThemeData()).colorScheme.onSurface,
|
inputTextColor: (themeDark ?? ThemeData()).colorScheme.onSurface,
|
||||||
inputBorderRadius: const BorderRadius.all(Radius.circular(64)),
|
inputBorderRadius: const BorderRadius.all(Radius.circular(64)),
|
||||||
inputPadding: const EdgeInsets.all(16),
|
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)
|
messageMaxWidth: (MediaQuery.of(context).size.width >= 1000)
|
||||||
? (MediaQuery.of(context).size.width >= 1600)
|
? (MediaQuery.of(context).size.width >= 1600)
|
||||||
? (MediaQuery.of(context).size.width >= 2200)
|
? (MediaQuery.of(context).size.width >= 2200)
|
||||||
|
@ -1494,12 +1414,9 @@ class _MainAppState extends State<MainApp> {
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
drawerEdgeDragWidth:
|
drawerEdgeDragWidth:
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
desktopLayout(context) ? null : MediaQuery.of(context).size.width,
|
||||||
? null
|
|
||||||
: MediaQuery.of(context).size.width,
|
|
||||||
drawer: Builder(builder: (context) {
|
drawer: Builder(builder: (context) {
|
||||||
if ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) &&
|
if (desktopLayoutRequired(context)) {
|
||||||
MediaQuery.of(context).size.width >= 1000) {
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
if (Navigator.of(context).canPop()) {
|
if (Navigator.of(context).canPop()) {
|
||||||
Navigator.of(context).pop();
|
Navigator.of(context).pop();
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import 'main.dart';
|
import 'main.dart';
|
||||||
import 'worker/haptic.dart';
|
import 'worker/haptic.dart';
|
||||||
import 'worker/update.dart';
|
import 'worker/update.dart';
|
||||||
|
import 'worker/desktop.dart';
|
||||||
import 'package:ollama_app/worker/setter.dart';
|
import 'package:ollama_app/worker/setter.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
@ -255,48 +255,12 @@ class _ScreenSettingsState extends State<ScreenSettings> {
|
||||||
color: Theme.of(context).colorScheme.surface,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: Row(children: [
|
title: Row(children: [
|
||||||
Text(AppLocalizations.of(context)!.optionSettings),
|
Text(AppLocalizations.of(context)!.optionSettings),
|
||||||
Expanded(child: SizedBox(height: 200, child: MoveWindow()))
|
Expanded(
|
||||||
]),
|
child: SizedBox(height: 200, child: MoveWindow()))
|
||||||
actions: (Platform.isWindows ||
|
]),
|
||||||
Platform.isLinux ||
|
actions: desktopControlsActions(context)),
|
||||||
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,
|
|
||||||
),
|
|
||||||
body: Padding(
|
body: Padding(
|
||||||
padding: const EdgeInsets.only(left: 16, right: 16),
|
padding: const EdgeInsets.only(left: 16, right: 16),
|
||||||
child: Column(children: [
|
child: Column(children: [
|
||||||
|
@ -467,9 +431,7 @@ class _ScreenSettingsState extends State<ScreenSettings> {
|
||||||
builder: (context) =>
|
builder: (context) =>
|
||||||
const ScreenSettingsInterface()));
|
const ScreenSettingsInterface()));
|
||||||
}),
|
}),
|
||||||
(!(Platform.isWindows ||
|
(!desktopFeature())
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS))
|
|
||||||
? button(
|
? button(
|
||||||
AppLocalizations.of(context)!
|
AppLocalizations.of(context)!
|
||||||
.settingsTitleVoice,
|
.settingsTitleVoice,
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
import 'dart:io';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../main.dart';
|
import '../main.dart';
|
||||||
import '../screen_settings.dart';
|
import '../screen_settings.dart';
|
||||||
import '../worker/haptic.dart';
|
import '../worker/haptic.dart';
|
||||||
import '../worker/update.dart';
|
import '../worker/update.dart';
|
||||||
|
import '../worker/desktop.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
import 'package:bitsdojo_window/bitsdojo_window.dart';
|
import 'package:bitsdojo_window/bitsdojo_window.dart';
|
||||||
|
@ -43,41 +42,7 @@ class _ScreenSettingsAboutState extends State<ScreenSettingsAbout> {
|
||||||
Expanded(child: SizedBox(height: 200, child: MoveWindow()))
|
Expanded(child: SizedBox(height: 200, child: MoveWindow()))
|
||||||
]),
|
]),
|
||||||
actions:
|
actions:
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
desktopControlsActions(context)
|
||||||
? [
|
|
||||||
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,
|
|
||||||
),
|
),
|
||||||
body: Padding(
|
body: Padding(
|
||||||
padding: const EdgeInsets.only(left: 16, right: 16),
|
padding: const EdgeInsets.only(left: 16, right: 16),
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
import 'dart:io';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../main.dart';
|
import '../main.dart';
|
||||||
import '../worker/haptic.dart';
|
import '../worker/haptic.dart';
|
||||||
|
import '../worker/desktop.dart';
|
||||||
import '../screen_settings.dart';
|
import '../screen_settings.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
@ -38,41 +37,7 @@ class _ScreenSettingsBehaviorState extends State<ScreenSettingsBehavior> {
|
||||||
Expanded(child: SizedBox(height: 200, child: MoveWindow()))
|
Expanded(child: SizedBox(height: 200, child: MoveWindow()))
|
||||||
]),
|
]),
|
||||||
actions:
|
actions:
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
desktopControlsActions(context)
|
||||||
? [
|
|
||||||
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,
|
|
||||||
),
|
),
|
||||||
body: Padding(
|
body: Padding(
|
||||||
padding: const EdgeInsets.only(left: 16, right: 16),
|
padding: const EdgeInsets.only(left: 16, right: 16),
|
||||||
|
|
|
@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../main.dart';
|
import '../main.dart';
|
||||||
import '../worker/haptic.dart';
|
import '../worker/haptic.dart';
|
||||||
|
import '../worker/desktop.dart';
|
||||||
import '../screen_settings.dart';
|
import '../screen_settings.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
@ -32,41 +33,7 @@ class _ScreenSettingsExportState extends State<ScreenSettingsExport> {
|
||||||
Expanded(child: SizedBox(height: 200, child: MoveWindow()))
|
Expanded(child: SizedBox(height: 200, child: MoveWindow()))
|
||||||
]),
|
]),
|
||||||
actions:
|
actions:
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
desktopControlsActions(context)
|
||||||
? [
|
|
||||||
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,
|
|
||||||
),
|
),
|
||||||
body: Padding(
|
body: Padding(
|
||||||
padding: const EdgeInsets.only(left: 16, right: 16),
|
padding: const EdgeInsets.only(left: 16, right: 16),
|
||||||
|
@ -86,9 +53,7 @@ class _ScreenSettingsExportState extends State<ScreenSettingsExport> {
|
||||||
jsonEncode(prefs!.getStringList("chats") ?? [])));
|
jsonEncode(prefs!.getStringList("chats") ?? [])));
|
||||||
selectionHaptic();
|
selectionHaptic();
|
||||||
if (path == null) return;
|
if (path == null) return;
|
||||||
if (Platform.isWindows ||
|
if (desktopFeature()) {
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) {
|
|
||||||
File(path).writeAsString(
|
File(path).writeAsString(
|
||||||
jsonEncode(prefs!.getStringList("chats") ?? []));
|
jsonEncode(prefs!.getStringList("chats") ?? []));
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../main.dart';
|
import '../main.dart';
|
||||||
import '../worker/haptic.dart';
|
import '../worker/haptic.dart';
|
||||||
|
import '../worker/desktop.dart';
|
||||||
import '../screen_settings.dart';
|
import '../screen_settings.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
|
@ -31,41 +32,7 @@ class _ScreenSettingsInterfaceState extends State<ScreenSettingsInterface> {
|
||||||
Expanded(child: SizedBox(height: 200, child: MoveWindow()))
|
Expanded(child: SizedBox(height: 200, child: MoveWindow()))
|
||||||
]),
|
]),
|
||||||
actions:
|
actions:
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
desktopControlsActions(context)
|
||||||
? [
|
|
||||||
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,
|
|
||||||
),
|
),
|
||||||
body: Padding(
|
body: Padding(
|
||||||
padding: const EdgeInsets.only(left: 16, right: 16),
|
padding: const EdgeInsets.only(left: 16, right: 16),
|
||||||
|
@ -193,9 +160,7 @@ class _ScreenSettingsInterfaceState extends State<ScreenSettingsInterface> {
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
return Dialog(
|
return Dialog(
|
||||||
alignment: (Platform.isWindows ||
|
alignment: desktopLayout(context)
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS)
|
|
||||||
? null
|
? null
|
||||||
: Alignment.bottomRight,
|
: Alignment.bottomRight,
|
||||||
child: StatefulBuilder(
|
child: StatefulBuilder(
|
||||||
|
@ -279,7 +244,7 @@ class _ScreenSettingsInterfaceState extends State<ScreenSettingsInterface> {
|
||||||
selectionHaptic();
|
selectionHaptic();
|
||||||
setState(() {});
|
setState(() {});
|
||||||
}),
|
}),
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
desktopFeature()
|
||||||
? toggle(
|
? toggle(
|
||||||
context,
|
context,
|
||||||
AppLocalizations.of(context)!
|
AppLocalizations.of(context)!
|
||||||
|
@ -354,9 +319,7 @@ class _ScreenSettingsInterfaceState extends State<ScreenSettingsInterface> {
|
||||||
await prefs!.setString(
|
await prefs!.setString(
|
||||||
"brightness",
|
"brightness",
|
||||||
p0.elementAt(0));
|
p0.elementAt(0));
|
||||||
if (Platform.isWindows ||
|
if (desktopFeature()) {
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) {
|
|
||||||
exit(0);
|
exit(0);
|
||||||
} else {
|
} else {
|
||||||
Restart.restartApp();
|
Restart.restartApp();
|
||||||
|
@ -420,9 +383,7 @@ class _ScreenSettingsInterfaceState extends State<ScreenSettingsInterface> {
|
||||||
await prefs!.setBool(
|
await prefs!.setBool(
|
||||||
"useDeviceTheme",
|
"useDeviceTheme",
|
||||||
p0.elementAt(0) == "device");
|
p0.elementAt(0) == "device");
|
||||||
if (Platform.isWindows ||
|
if (desktopFeature()) {
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) {
|
|
||||||
exit(0);
|
exit(0);
|
||||||
} else {
|
} else {
|
||||||
Restart.restartApp();
|
Restart.restartApp();
|
||||||
|
|
|
@ -172,24 +172,12 @@ class _ScreenSettingsVoiceState extends State<ScreenSettingsVoice> {
|
||||||
setState(() {});
|
setState(() {});
|
||||||
},
|
},
|
||||||
child: Container(
|
child: Container(
|
||||||
width: ((Platform.isWindows ||
|
width: double.infinity,
|
||||||
Platform.isLinux ||
|
padding: const EdgeInsets.only(
|
||||||
Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context)
|
|
||||||
.size
|
|
||||||
.width >=
|
|
||||||
1000)
|
|
||||||
? null
|
|
||||||
: double.infinity,
|
|
||||||
padding: EdgeInsets.only(
|
|
||||||
left: 16,
|
left: 16,
|
||||||
right: 16,
|
right: 16,
|
||||||
top: 16,
|
top: 16,
|
||||||
bottom: (Platform.isWindows ||
|
bottom: 0),
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS)
|
|
||||||
? 16
|
|
||||||
: 0),
|
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
|
@ -219,25 +207,7 @@ class _ScreenSettingsVoiceState extends State<ScreenSettingsVoice> {
|
||||||
scrollDirection:
|
scrollDirection:
|
||||||
Axis.vertical,
|
Axis.vertical,
|
||||||
child: Wrap(
|
child: Wrap(
|
||||||
spacing: ((Platform.isWindows ||
|
spacing: 5.0,
|
||||||
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,
|
|
||||||
alignment:
|
alignment:
|
||||||
WrapAlignment
|
WrapAlignment
|
||||||
.center,
|
.center,
|
||||||
|
|
|
@ -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<Widget>? desktopControlsActions(BuildContext context,
|
||||||
|
[List<Widget>? ifNotAvailable]) {
|
||||||
|
return desktopFeature() ? <Widget>[desktopControls(context)] : ifNotAvailable;
|
||||||
|
}
|
|
@ -3,6 +3,7 @@ import 'dart:io';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
import 'package:ollama_app/worker/desktop.dart';
|
||||||
import 'haptic.dart';
|
import 'haptic.dart';
|
||||||
import '../main.dart';
|
import '../main.dart';
|
||||||
|
|
||||||
|
@ -89,45 +90,28 @@ void setModel(BuildContext context, Function setState) {
|
||||||
setState(() {});
|
setState(() {});
|
||||||
},
|
},
|
||||||
child: Container(
|
child: Container(
|
||||||
width:
|
width: desktopLayout(context) ? null : double.infinity,
|
||||||
((Platform.isWindows || Platform.isLinux || Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
|
||||||
? null
|
|
||||||
: double.infinity,
|
|
||||||
padding: EdgeInsets.only(
|
padding: EdgeInsets.only(
|
||||||
left: 16,
|
left: 16,
|
||||||
right: 16,
|
right: 16,
|
||||||
top: 16,
|
top: 16,
|
||||||
bottom:
|
bottom: desktopLayout(context) ? 16 : 0),
|
||||||
(Platform.isWindows || Platform.isLinux || Platform.isMacOS)
|
|
||||||
? 16
|
|
||||||
: 0),
|
|
||||||
child: (!loaded)
|
child: (!loaded)
|
||||||
? const LinearProgressIndicator()
|
? SizedBox(
|
||||||
|
width: desktopLayout(context) ? 300 : double.infinity,
|
||||||
|
child: const LinearProgressIndicator())
|
||||||
: Column(mainAxisSize: MainAxisSize.min, children: [
|
: Column(mainAxisSize: MainAxisSize.min, children: [
|
||||||
Container(
|
Container(
|
||||||
width: ((Platform.isWindows ||
|
width: desktopLayout(context) ? 300 : double.infinity,
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS) &&
|
|
||||||
MediaQuery.of(context).size.width >= 1000)
|
|
||||||
? 300
|
|
||||||
: double.infinity,
|
|
||||||
constraints: BoxConstraints(
|
constraints: BoxConstraints(
|
||||||
maxHeight:
|
maxHeight:
|
||||||
MediaQuery.of(context).size.height * 0.4),
|
MediaQuery.of(context).size.height * 0.4),
|
||||||
child: SingleChildScrollView(
|
child: SingleChildScrollView(
|
||||||
scrollDirection: Axis.vertical,
|
scrollDirection: Axis.vertical,
|
||||||
child: Wrap(
|
child: Wrap(
|
||||||
spacing: ((Platform.isWindows ||
|
spacing: desktopLayout(context) ? 10.0 : 5.0,
|
||||||
Platform.isLinux ||
|
runSpacing: desktopFeature()
|
||||||
Platform.isMacOS) &&
|
? desktopLayoutRequired(context)
|
||||||
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
|
? 10.0
|
||||||
: 5.0
|
: 5.0
|
||||||
: 0.0,
|
: 0.0,
|
||||||
|
@ -233,8 +217,7 @@ void setModel(BuildContext context, Function setState) {
|
||||||
])));
|
])));
|
||||||
});
|
});
|
||||||
|
|
||||||
if ((Platform.isWindows || Platform.isLinux || Platform.isMacOS) &&
|
if (desktopLayout(context)) {
|
||||||
MediaQuery.of(context).size.width >= 1000) {
|
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
|
@ -391,9 +374,7 @@ Future<String> prompt(BuildContext context,
|
||||||
left: 16,
|
left: 16,
|
||||||
right: 16,
|
right: 16,
|
||||||
top: 16,
|
top: 16,
|
||||||
bottom: (Platform.isWindows ||
|
bottom: desktopFeature()
|
||||||
Platform.isLinux ||
|
|
||||||
Platform.isMacOS)
|
|
||||||
? 16
|
? 16
|
||||||
: MediaQuery.of(context).viewInsets.bottom),
|
: MediaQuery.of(context).viewInsets.bottom),
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
|
|
|
@ -2,6 +2,7 @@ import 'dart:convert';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:ollama_app/worker/desktop.dart';
|
||||||
|
|
||||||
import 'haptic.dart';
|
import 'haptic.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
@ -37,7 +38,7 @@ Future<bool> updatesSupported(Function setState,
|
||||||
"com.machiav3lli.fdroid",
|
"com.machiav3lli.fdroid",
|
||||||
"nya.kitsunyan.foxydroid"
|
"nya.kitsunyan.foxydroid"
|
||||||
];
|
];
|
||||||
if (!(Platform.isWindows || Platform.isLinux || Platform.isMacOS)) {
|
if (!desktopFeature()) {
|
||||||
if ((await InstallReferrer.referrer !=
|
if ((await InstallReferrer.referrer !=
|
||||||
InstallationAppReferrer.androidManually) ||
|
InstallationAppReferrer.androidManually) ||
|
||||||
(installerApps
|
(installerApps
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
flutter/ephemeral
|
|
@ -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 "$<$<NOT:$<CONFIG:Debug>>:-O3>")
|
||||||
|
target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>: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()
|
|
@ -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}
|
||||||
|
)
|
|
@ -0,0 +1,27 @@
|
||||||
|
//
|
||||||
|
// Generated file. Do not edit.
|
||||||
|
//
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
|
|
||||||
|
#include "generated_plugin_registrant.h"
|
||||||
|
|
||||||
|
#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
|
||||||
|
#include <dynamic_color/dynamic_color_plugin.h>
|
||||||
|
#include <file_selector_linux/file_selector_plugin.h>
|
||||||
|
#include <url_launcher_linux/url_launcher_plugin.h>
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
|
@ -0,0 +1,15 @@
|
||||||
|
//
|
||||||
|
// Generated file. Do not edit.
|
||||||
|
//
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
|
|
||||||
|
#ifndef GENERATED_PLUGIN_REGISTRANT_
|
||||||
|
#define GENERATED_PLUGIN_REGISTRANT_
|
||||||
|
|
||||||
|
#include <flutter_linux/flutter_linux.h>
|
||||||
|
|
||||||
|
// Registers Flutter plugins.
|
||||||
|
void fl_register_plugins(FlPluginRegistry* registry);
|
||||||
|
|
||||||
|
#endif // GENERATED_PLUGIN_REGISTRANT_
|
|
@ -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 $<TARGET_FILE:${plugin}_plugin>)
|
||||||
|
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)
|
|
@ -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);
|
||||||
|
}
|
|
@ -0,0 +1,128 @@
|
||||||
|
#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
|
||||||
|
|
||||||
|
#include "my_application.h"
|
||||||
|
|
||||||
|
#include <flutter_linux/flutter_linux.h>
|
||||||
|
#ifdef GDK_WINDOWING_X11
|
||||||
|
#include <gdk/gdkx.h>
|
||||||
|
#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));
|
||||||
|
}
|
|
@ -0,0 +1,18 @@
|
||||||
|
#ifndef FLUTTER_MY_APPLICATION_H_
|
||||||
|
#define FLUTTER_MY_APPLICATION_H_
|
||||||
|
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
|
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_
|
Loading…
Reference in New Issue