diff --git a/lib/functions/summary.dart b/lib/functions/summary.dart index f271167..55d5e4e 100644 --- a/lib/functions/summary.dart +++ b/lib/functions/summary.dart @@ -38,20 +38,23 @@ String diskType(String disk, String diskType) { } Widget summary( - String keymap, - String layout, - bool enableSudo, - bool enableRoot, - String username, - String disk, - String diskSize, - Desktop currDesktop, - Location locale, - nextPage, - setDiskType, - String rotational, - bool isEfi, -) { + Location locale, + String keymap, + String layout, + String username, + bool enableSudo, + bool enableRoot, + Desktop desktop, + String disk, + bool isEfi, + String bootloader, + String hostname, + bool ipv6, + bool enableTimeshift, + String rotational, + String diskSize, + setDiskType, + nextPage) { getDiskType(setDiskType, disk); return Column( children: [ @@ -201,7 +204,7 @@ Widget summary( ), const SizedBox(height: 10), Text( - currDesktop.name, + desktop.name, style: const TextStyle( fontSize: 20, fontWeight: FontWeight.bold, @@ -211,7 +214,7 @@ Widget summary( ], ), ), - const SizedBox(height: 10), + //const SizedBox(height: 10), Container( padding: const EdgeInsets.all(10), decoration: BoxDecoration( @@ -248,6 +251,42 @@ Widget summary( ], ), ), + //const SizedBox(height: 10), + Container( + padding: const EdgeInsets.all(10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + border: Border.all(color: Colors.black), + color: const Color.fromARGB(255, 30, 30, 30), + boxShadow: const [ + BoxShadow( + color: Colors.black, + blurRadius: 2, + offset: Offset(-2, 3), + ), + ], + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Text( + "Misc:", + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: Color.fromARGB(255, 169, 0, 255), + ), + ), + const SizedBox(height: 10), + infoTextTemplate("Hostname", hostname), + const SizedBox(height: 10), + infoTextTemplate("Enable IPv6", ipv6.toString()), + const SizedBox(height: 10), + infoTextTemplate( + "Enable timeshift", enableTimeshift.toString()), + ], + ), + ), ], ), ), diff --git a/lib/main.dart b/lib/main.dart index e2cfdf2..4c65f58 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -433,41 +433,50 @@ class _JadeguiState extends State { }); }); widget = summary( + getSelectedLocPack(), getChosenLayout(), getChosenVariant(), + username, enableSudo, enableRoot, - username, + currDesktop, selectedDisk, + isEfi, + "grub-efi", + hostname, + ipv6, + enableTimeshift, + _diskType, partitionInfo, - currDesktop, - getSelectedLocPack(), - () { + (value) { setState(() { - _selectedIndex = _selectedIndex + 1; + _diskType = value; }); }, - (value) { + () { setState(() { - _diskType = value; + _selectedIndex = _selectedIndex + 1; }); }, - _diskType, - isEfi, ); break; case 8: - /*widget = install( + widget = install( + getSelectedLocPack(), getChosenLayout(), getChosenVariant(), - enableSudo, - enableRoot, username, - selectedDisk, + password, + enableSudo, + rootPass, currDesktop, - getSelectedLocPack(), - );*/ - widget = Text("Install"); + disks, + isEfi, + "grub-efi", + hostname, + ipv6, + enableTimeshift, + ); break; default: widget = const Text(