fix crash on misc screen

pull/2/head
axtlos 3 years ago
parent 7de76f6740
commit de00e2bd98

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 KiB

@ -1,3 +1,2 @@
Disks:widget /dev/sda Disks:widget
/dev/nvme0n1

@ -11,8 +11,8 @@ test(setOutput, running, setRunning, config, writeToLog) async {
await File(filename).writeAsString(config); await File(filename).writeAsString(config);
writeToLog("Json config: $config"); writeToLog("Json config: $config");
var process = var process =
await Process.start('pkexec', ['/opt/jade_gui/scripts/jadewrapper.sh']); //await Process.start('pkexec', ['/opt/jade_gui/scripts/jadewrapper.sh']);
//await Process.start('/opt/jade_gui/scripts/jadeemu.sh', []); await Process.start('/opt/jade_gui/scripts/jadeemu.sh', []);
process.stdout.transform(utf8.decoder).forEach(setOutput); process.stdout.transform(utf8.decoder).forEach(setOutput);
setRunning(true); setRunning(true);
} }
@ -75,14 +75,30 @@ Widget install(
test(setOutput, running, setRunning, jsonPrefs, writeToLog); test(setOutput, running, setRunning, jsonPrefs, writeToLog);
return Column( return Column(
children: [ children: [
Text( Row(
output.toString().contains("Installation finished! You may reboot now!") mainAxisAlignment: MainAxisAlignment.center,
? "Installed!" children: [
: "Installing...", Image(
style: const TextStyle( image: output
fontSize: 50, .toString()
fontWeight: FontWeight.bold, .contains("Installation finished! You may reboot now!")
color: Color.fromARGB(255, 169, 0, 255)), ? const AssetImage("assets/success.png")
: const AssetImage("assets/loadanim.gif"),
width: 50,
height: 50,
),
Text(
output
.toString()
.contains("Installation finished! You may reboot now!")
? "Installed!"
: " Installing...",
style: const TextStyle(
fontSize: 50,
fontWeight: FontWeight.bold,
color: Color.fromARGB(255, 169, 0, 255)),
),
],
), ),
const SizedBox( const SizedBox(
height: 20, height: 20,

@ -567,11 +567,6 @@ class _JadeguiState extends State<Jadegui> {
}, },
rootPass, rootPass,
confirmRootPass, confirmRootPass,
() {
setState(() {
_selectedIndex = _selectedIndex + 1;
});
},
enableFlatpak, enableFlatpak,
(value) { (value) {
setState(() { setState(() {
@ -579,6 +574,11 @@ class _JadeguiState extends State<Jadegui> {
writeToLog("Enable flatpak: $enableFlatpak"); writeToLog("Enable flatpak: $enableFlatpak");
}); });
}, },
() {
setState(() {
_selectedIndex = _selectedIndex + 1;
});
},
), ),
), ),
), ),

@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
window_size window_size
) )
list(APPEND FLUTTER_FFI_PLUGIN_LIST
)
set(PLUGIN_BUNDLED_LIBRARIES) set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST}) foreach(plugin ${FLUTTER_PLUGIN_LIST})
@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>) list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin) 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)

@ -21,7 +21,7 @@ packages:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.8.2" version: "2.9.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
@ -56,7 +56,7 @@ packages:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.15.0" version: "1.16.0"
cupertino_icons: cupertino_icons:
dependency: "direct main" dependency: "direct main"
description: description:
@ -70,7 +70,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.3.0"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
@ -129,7 +129,7 @@ packages:
name: material_color_utilities name: material_color_utilities
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.3" version: "0.1.4"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@ -143,7 +143,7 @@ packages:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0" version: "1.8.1"
path_drawing: path_drawing:
dependency: transitive dependency: transitive
description: description:
@ -260,7 +260,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.1" version: "1.8.2"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@ -302,21 +302,14 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.8" version: "0.4.9"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "2.1.2"
win32: win32:
dependency: transitive dependency: transitive
description: description:
@ -355,5 +348,5 @@ packages:
source: hosted source: hosted
version: "3.1.0" version: "3.1.0"
sdks: sdks:
dart: ">=2.15.1 <3.0.0" dart: ">=2.17.0-0 <3.0.0"
flutter: ">=2.8.0" flutter: ">=2.8.0"

Loading…
Cancel
Save