make it work when built as release

pull/2/head
axtlos 3 years ago
parent 4bfa794208
commit b2dcceb644
No known key found for this signature in database
GPG Key ID: C642EA4B2F4096BE

@ -68,17 +68,15 @@ Widget desktopView(currDesktop, setDesktop, next) {
), ),
], ],
), ),
child: Expanded( child: SingleChildScrollView(
child: SingleChildScrollView( primary: false,
primary: false, child: Column(
child: Column( //mainAxisAlignment: MainAxisAlignment.spaceEvenly,
//mainAxisAlignment: MainAxisAlignment.spaceEvenly, //crossAxisAlignment: CrossAxisAlignment.stretch,
//crossAxisAlignment: CrossAxisAlignment.stretch, children: desktops
children: desktops .map<Widget>(
.map<Widget>( (desktop) => desktopTemplate(desktop, setDesktop))
(desktop) => desktopTemplate(desktop, setDesktop)) .toList(),
.toList(),
),
), ),
), ),
), ),

@ -117,17 +117,15 @@ Widget keyboard(
), ),
], ],
), ),
child: Expanded( child: SingleChildScrollView(
child: SingleChildScrollView( primary: false,
primary: false, child: Column(
child: Column( //mainAxisAlignment: MainAxisAlignment.spaceEvenly,
//mainAxisAlignment: MainAxisAlignment.spaceEvenly, //crossAxisAlignment: CrossAxisAlignment.stretch,
//crossAxisAlignment: CrossAxisAlignment.stretch, children: keymaps
children: keymaps .map<Widget>(
.map<Widget>((keymap) => (keymap) => layoutTemplate(keymap, setChosenLayout))
layoutTemplate(keymap, setChosenLayout)) .toList(),
.toList(),
),
), ),
), ),
), ),
@ -149,17 +147,15 @@ Widget keyboard(
), ),
], ],
), ),
child: Expanded( child: SingleChildScrollView(
child: SingleChildScrollView( primary: false,
primary: false, child: Column(
child: Column( //mainAxisAlignment: MainAxisAlignment.spaceEvenly,
//mainAxisAlignment: MainAxisAlignment.spaceEvenly, //crossAxisAlignment: CrossAxisAlignment.stretch,
//crossAxisAlignment: CrossAxisAlignment.stretch, children: chosenLayout.variant
children: chosenLayout.variant .map<Widget>((map) =>
.map<Widget>((map) => variantTemplate(map, chosenLayout, nextPage))
variantTemplate(map, chosenLayout, nextPage)) .toList(),
.toList(),
),
), ),
), ),
), ),

@ -73,46 +73,169 @@ Widget users(
), ),
], ],
), ),
child: Expanded( child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, children: [
children: [ const SizedBox(height: 10),
const SizedBox(height: 10), TextFormField(
TextFormField( autovalidateMode: AutovalidateMode.always,
autovalidateMode: AutovalidateMode.always, decoration: const InputDecoration(
decoration: const InputDecoration( border: OutlineInputBorder(),
border: OutlineInputBorder(), labelText: 'Username',
labelText: 'Username', labelStyle: TextStyle(color: Colors.white),
labelStyle: TextStyle(color: Colors.white), hintText: 'Enter your username',
hintText: 'Enter your username', iconColor: Colors.white,
iconColor: Colors.white, focusColor: Color.fromARGB(100, 169, 0, 255),
focusColor: Color.fromARGB(100, 169, 0, 255), hoverColor: Colors.blue,
hoverColor: Colors.blue, prefixIconColor: Colors.white,
prefixIconColor: Colors.white, suffixIconColor: Colors.white,
suffixIconColor: Colors.white, ),
), style: const TextStyle(color: Colors.white),
style: const TextStyle(color: Colors.white), onChanged: (String? value) {
onChanged: (String? value) { setUsername(value);
setUsername(value); debugPrint(value);
debugPrint(value); debugPrint("Username: $username");
debugPrint("Username: $username"); },
validator: (String? value) {
return (value != "" &&
value != null &&
!userRegex.hasMatch(value))
? 'Bad username, may not contain spaces, uppercase, or special characters'
: null;
},
),
const SizedBox(height: 10),
TextFormField(
//obscureText: true,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'Password',
labelStyle: TextStyle(color: Colors.white),
hintText: 'Enter your password',
iconColor: Colors.white,
focusColor: Color.fromARGB(100, 169, 0, 255),
hoverColor: Colors.blue,
prefixIconColor: Colors.white,
suffixIconColor: Colors.white,
),
style: const TextStyle(
color: Colors.white,
),
onChanged: (String? value) {
setPass(value);
debugPrint(value);
debugPrint("Password: $password");
debugPrint("Confirm: $confirmPassword");
},
),
const SizedBox(height: 10),
TextFormField(
//obscureText: true,
autovalidateMode: AutovalidateMode.always,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'Repeat password',
labelStyle: TextStyle(color: Colors.white),
hintText: 'Repeat your password',
iconColor: Colors.white,
focusColor: Color.fromARGB(100, 169, 0, 255),
hoverColor: Colors.blue,
prefixIconColor: Colors.white,
suffixIconColor: Colors.white,
),
style: const TextStyle(
color: Colors.white,
),
onChanged: (String? value) {
setConfirmPass(value);
debugPrint(password);
debugPrint(confirmPassword);
debugPrint(value);
},
validator: (String? value) {
debugPrint(value);
debugPrint("Password: $password");
debugPrint("Confirm: $confirmPassword");
return (value != password)
? 'Password does not match'
: null;
},
),
const SizedBox(height: 10),
Container(
padding: const EdgeInsets.all(2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5),
border: Border.all(color: Colors.black45),
color: const Color.fromARGB(100, 30, 30, 30),
),
child: CheckboxListTile(
title: const Text('Enable sudo for user',
style: TextStyle(color: Colors.white)),
value: enableSudo,
onChanged: (bool? value) {
setState(value!);
}, },
validator: (String? value) { secondary: Container(
return (value != "" && decoration: const BoxDecoration(
value != null && shape: BoxShape.circle,
!userRegex.hasMatch(value)) color: Colors.white,
? 'Bad username, may not contain spaces, uppercase, or special characters' ),
: null; padding: const EdgeInsets.fromLTRB(10, 10, 10, 13),
child: const Text(
'#',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
),
),
),
const SizedBox(height: 10),
Container(
padding: const EdgeInsets.all(2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5),
border: Border.all(color: Colors.black45),
color: const Color.fromARGB(100, 30, 30, 30),
),
child: CheckboxListTile(
title: const Text('Enable root user',
style: TextStyle(color: Colors.white)),
value: enableRoot,
onChanged: (bool? value) {
setRootUser(value!);
}, },
secondary: Container(
decoration: const BoxDecoration(
shape: BoxShape.circle,
color: Colors.white,
),
padding: const EdgeInsets.fromLTRB(10, 10, 10, 13),
child: const Text(
'#',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
),
), ),
const SizedBox(height: 10), ),
TextFormField( Visibility(
child: const SizedBox(height: 10), visible: enableRoot),
Visibility(
visible: enableRoot,
child: TextFormField(
//obscureText: true, //obscureText: true,
decoration: const InputDecoration( decoration: const InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: 'Password', labelText: 'Password for root user',
labelStyle: TextStyle(color: Colors.white), labelStyle: TextStyle(color: Colors.white),
hintText: 'Enter your password', hintText: 'Password for the root user',
iconColor: Colors.white, iconColor: Colors.white,
focusColor: Color.fromARGB(100, 169, 0, 255), focusColor: Color.fromARGB(100, 169, 0, 255),
hoverColor: Colors.blue, hoverColor: Colors.blue,
@ -123,21 +246,25 @@ Widget users(
color: Colors.white, color: Colors.white,
), ),
onChanged: (String? value) { onChanged: (String? value) {
setPass(value); setRootPass(value);
debugPrint(value); debugPrint(value);
debugPrint("Password: $password"); debugPrint("Root Password: $rootPass");
debugPrint("Confirm: $confirmPassword"); debugPrint("Root Confirm: $confirmRootPass");
}, },
), ),
const SizedBox(height: 10), ),
TextFormField( Visibility(
child: const SizedBox(height: 10), visible: enableRoot),
Visibility(
visible: enableRoot,
child: TextFormField(
//obscureText: true, //obscureText: true,
autovalidateMode: AutovalidateMode.always, autovalidateMode: AutovalidateMode.always,
decoration: const InputDecoration( decoration: const InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: 'Repeat password', labelText: 'Repeat root password',
labelStyle: TextStyle(color: Colors.white), labelStyle: TextStyle(color: Colors.white),
hintText: 'Repeat your password', hintText: 'Repeat root password',
iconColor: Colors.white, iconColor: Colors.white,
focusColor: Color.fromARGB(100, 169, 0, 255), focusColor: Color.fromARGB(100, 169, 0, 255),
hoverColor: Colors.blue, hoverColor: Colors.blue,
@ -148,154 +275,23 @@ Widget users(
color: Colors.white, color: Colors.white,
), ),
onChanged: (String? value) { onChanged: (String? value) {
setConfirmPass(value); setConfirmRootPass(value);
debugPrint(password); debugPrint(password);
debugPrint(confirmPassword); debugPrint(confirmPassword);
debugPrint(value); debugPrint(value);
}, },
validator: (String? value) { validator: (String? value) {
debugPrint(value); debugPrint(value);
debugPrint("Password: $password"); debugPrint("Root Password: $rootPass");
debugPrint("Confirm: $confirmPassword"); debugPrint("Root Confirm: $confirmRootPass");
return (value != password) return (value != rootPass)
? 'Password does not match' ? 'Password does not match'
: null; : null;
}, },
), ),
const SizedBox(height: 10), ),
Container( const SizedBox(height: 10),
padding: const EdgeInsets.all(2), ],
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5),
border: Border.all(color: Colors.black45),
color: const Color.fromARGB(100, 30, 30, 30),
),
child: CheckboxListTile(
title: const Text('Enable sudo for user',
style: TextStyle(color: Colors.white)),
value: enableSudo,
onChanged: (bool? value) {
setState(value!);
},
secondary: Container(
decoration: const BoxDecoration(
shape: BoxShape.circle,
color: Colors.white,
),
padding: const EdgeInsets.fromLTRB(10, 10, 10, 13),
child: const Text(
'#',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
),
),
),
const SizedBox(height: 10),
Container(
padding: const EdgeInsets.all(2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5),
border: Border.all(color: Colors.black45),
color: const Color.fromARGB(100, 30, 30, 30),
),
child: CheckboxListTile(
title: const Text('Enable root user',
style: TextStyle(color: Colors.white)),
value: enableRoot,
onChanged: (bool? value) {
setRootUser(value!);
},
secondary: Container(
decoration: const BoxDecoration(
shape: BoxShape.circle,
color: Colors.white,
),
padding: const EdgeInsets.fromLTRB(10, 10, 10, 13),
child: const Text(
'#',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
),
),
),
Visibility(
child: const SizedBox(height: 10),
visible: enableRoot),
Visibility(
visible: enableRoot,
child: TextFormField(
//obscureText: true,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'Password for root user',
labelStyle: TextStyle(color: Colors.white),
hintText: 'Password for the root user',
iconColor: Colors.white,
focusColor: Color.fromARGB(100, 169, 0, 255),
hoverColor: Colors.blue,
prefixIconColor: Colors.white,
suffixIconColor: Colors.white,
),
style: const TextStyle(
color: Colors.white,
),
onChanged: (String? value) {
setRootPass(value);
debugPrint(value);
debugPrint("Root Password: $rootPass");
debugPrint("Root Confirm: $confirmRootPass");
},
),
),
Visibility(
child: const SizedBox(height: 10),
visible: enableRoot),
Visibility(
visible: enableRoot,
child: TextFormField(
//obscureText: true,
autovalidateMode: AutovalidateMode.always,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'Repeat root password',
labelStyle: TextStyle(color: Colors.white),
hintText: 'Repeat root password',
iconColor: Colors.white,
focusColor: Color.fromARGB(100, 169, 0, 255),
hoverColor: Colors.blue,
prefixIconColor: Colors.white,
suffixIconColor: Colors.white,
),
style: const TextStyle(
color: Colors.white,
),
onChanged: (String? value) {
setConfirmRootPass(value);
debugPrint(password);
debugPrint(confirmPassword);
debugPrint(value);
},
validator: (String? value) {
debugPrint(value);
debugPrint("Root Password: $rootPass");
debugPrint("Root Confirm: $confirmRootPass");
return (value != rootPass)
? 'Password does not match'
: null;
},
),
),
const SizedBox(height: 10),
],
),
), ),
), ),
), ),

@ -370,7 +370,7 @@ class _JadeguiState extends State<Jadegui> {
}, },
); );
break; break;
case 5: /*case 5:
print("Desktop: ${currDesktop.name}"); print("Desktop: ${currDesktop.name}");
widget = const Text( widget = const Text(
'Showing Desktop screen', 'Showing Desktop screen',
@ -380,8 +380,8 @@ class _JadeguiState extends State<Jadegui> {
color: Color.fromARGB(255, 169, 0, 255), color: Color.fromARGB(255, 169, 0, 255),
), ),
); );
break; break;*/
case 6: case 5:
widget = const Text( widget = const Text(
'Showing Misc screen', 'Showing Misc screen',
style: TextStyle( style: TextStyle(
@ -391,7 +391,7 @@ class _JadeguiState extends State<Jadegui> {
), ),
); );
break; break;
case 7: case 6:
widget = const Text( widget = const Text(
'Showing Partitioning screen', 'Showing Partitioning screen',
style: TextStyle( style: TextStyle(
@ -401,7 +401,7 @@ class _JadeguiState extends State<Jadegui> {
), ),
); );
break; break;
case 8: case 7:
widget = const Text( widget = const Text(
'Showing Summary screen', 'Showing Summary screen',
style: TextStyle( style: TextStyle(
@ -411,7 +411,7 @@ class _JadeguiState extends State<Jadegui> {
), ),
); );
break; break;
case 9: case 8:
widget = const Text( widget = const Text(
'Showing Installing screen', 'Showing Installing screen',
style: TextStyle( style: TextStyle(

@ -5,6 +5,9 @@
list(APPEND FLUTTER_PLUGIN_LIST list(APPEND FLUTTER_PLUGIN_LIST
) )
list(APPEND FLUTTER_FFI_PLUGIN_LIST
)
set(PLUGIN_BUNDLED_LIBRARIES) set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST}) foreach(plugin ${FLUTTER_PLUGIN_LIST})
@ -13,3 +16,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)

@ -88,6 +88,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@ -101,7 +108,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"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -113,7 +120,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:
@ -148,7 +155,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.3" version: "0.4.9"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
@ -162,6 +169,6 @@ packages:
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"
sdks: sdks:
dart: ">=2.15.1 <3.0.0" dart: ">=2.15.1 <3.0.0"

Loading…
Cancel
Save