diff --git a/jade_gui-1.0.1-1-any.pkg.tar.zst b/jade_gui-1.0.1-1-any.pkg.tar.zst deleted file mode 100644 index 33c4931..0000000 Binary files a/jade_gui-1.0.1-1-any.pkg.tar.zst and /dev/null differ diff --git a/jade_gui-1.0.2-1-any.pkg.tar.zst b/jade_gui-1.0.2-1-any.pkg.tar.zst deleted file mode 100644 index 76f3c96..0000000 Binary files a/jade_gui-1.0.2-1-any.pkg.tar.zst and /dev/null differ diff --git a/jade_gui-1.0.3-1-any.pkg.tar.zst b/jade_gui-1.0.3-1-any.pkg.tar.zst deleted file mode 100644 index d084254..0000000 Binary files a/jade_gui-1.0.3-1-any.pkg.tar.zst and /dev/null differ diff --git a/jade_gui-1.0.3-1-any.pkg.tar.zst.sig b/jade_gui-1.0.3-1-any.pkg.tar.zst.sig deleted file mode 100644 index c666b5f..0000000 Binary files a/jade_gui-1.0.3-1-any.pkg.tar.zst.sig and /dev/null differ diff --git a/lib/Locales/locales.dart b/lib/Locales/locales.dart deleted file mode 100644 index 845eddb..0000000 --- a/lib/Locales/locales.dart +++ /dev/null @@ -1,42 +0,0 @@ -import 'package:jade_gui/Locales/arctic.dart'; - -import 'africa.dart'; -import 'america.dart'; -import 'antarctica.dart'; -import 'asia.dart'; -import 'atlantic.dart'; -import 'australia.dart'; -import 'brazil.dart'; -import 'canada.dart'; -import 'chile.dart'; -import 'europe.dart'; -import 'indian.dart'; -import 'mexico.dart'; -import 'pacific.dart'; -import 'us.dart'; -import 'package:jade_gui/classes/location.dart'; - -class Local { - List location = [Location()]; - String name = ""; - - Local(this.location, this.name); -} - -List locations = [ - Local(africa, "Africa"), - Local(america, "America"), - Local(antarctica, "Antarctica"), - Local(arctic, "Arctic"), - Local(asia, "Asia"), - Local(atlantic, "Atlantic"), - Local(australia, "Australia"), - Local(brazil, "Brazil"), - Local(canada, "Canada"), - Local(chile, "Chile"), - Local(europe, "Europe"), - Local(indian, "Indian"), - Local(mexico, "Mexico"), - Local(pacific, "Pacific"), - Local(us, "US"), -]; diff --git a/lib/classes/installPrefs.dart b/lib/classes/install_prefs.dart similarity index 95% rename from lib/classes/installPrefs.dart rename to lib/classes/install_prefs.dart index f1a3b82..029bbf4 100644 --- a/lib/classes/installPrefs.dart +++ b/lib/classes/install_prefs.dart @@ -1,8 +1,7 @@ -import 'package:jade_gui/Locales/locales.dart'; import 'package:jade_gui/classes/desktop.dart'; import 'package:jade_gui/classes/location.dart'; -class installPrefs { +class InstallPrefs { final Location locale; final String keymap; final String layout; @@ -19,7 +18,7 @@ class installPrefs { final bool ipv6; final bool enableTimeshift; - installPrefs({ + InstallPrefs({ this.locale = const Location(), this.keymap = "", this.layout = "", diff --git a/lib/functions/desktop.dart b/lib/functions/desktop.dart index 824c622..8211633 100644 --- a/lib/functions/desktop.dart +++ b/lib/functions/desktop.dart @@ -20,11 +20,11 @@ Widget desktopTemplate(desktop, setDesktop, currDesktop) { style: TextButton.styleFrom( primary: Colors.white, backgroundColor: currDesktop.name == desktop.name - ? Color.fromARGB(100, 170, 40, 255) - : Color.fromARGB(0, 170, 0, 255), + ? const Color.fromARGB(100, 170, 40, 255) + : const Color.fromARGB(0, 170, 0, 255), shadowColor: currDesktop.name == desktop.name - ? Color.fromARGB(100, 170, 0, 255) - : Color.fromARGB(0, 170, 0, 255), + ? const Color.fromARGB(100, 170, 0, 255) + : const Color.fromARGB(0, 170, 0, 255), padding: const EdgeInsets.all(10), ), child: Text( diff --git a/lib/functions/install.dart b/lib/functions/install.dart index 594c9a7..d7181f3 100644 --- a/lib/functions/install.dart +++ b/lib/functions/install.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:jade_gui/classes/installPrefs.dart'; +import 'package:jade_gui/classes/install_prefs.dart'; import 'package:jade_gui/classes/desktop.dart'; import 'package:jade_gui/classes/location.dart'; import 'dart:convert'; @@ -8,7 +8,7 @@ import 'dart:io'; test(setOutput, running, setRunning, config) async { if (!running) { const filename = "/tmp/jade.json"; - var file = await File(filename).writeAsString(config); + await File(filename).writeAsString(config); var process = await Process.start('pkexec', ['jade', 'config', '/tmp/jade.json']); process.stdout.transform(utf8.decoder).forEach(setOutput); @@ -36,7 +36,7 @@ Widget install( running, setRunning, ) { - installPrefs prefs = installPrefs( + InstallPrefs prefs = InstallPrefs( locale: locale, keymap: keymap, layout: layout, @@ -78,7 +78,7 @@ Widget install( decoration: BoxDecoration( borderRadius: BorderRadius.circular(10), border: Border.all(color: Colors.black), - color: Color.fromARGB(255, 15, 15, 15), + color: const Color.fromARGB(255, 15, 15, 15), //color: Colors.black, /*boxShadow: const [ BoxShadow( diff --git a/lib/functions/locale.dart b/lib/functions/locale.dart index 4c01aba..4dc7824 100644 --- a/lib/functions/locale.dart +++ b/lib/functions/locale.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:jade_gui/functions/location/region.dart'; import 'package:jade_gui/functions/location/location.dart'; -import 'package:jade_gui/Locales/locales.dart'; +import 'package:jade_gui/locales/locales.dart'; Widget locale(next, nextPage, selectlocation, isnextpage) { Widget widget; diff --git a/lib/functions/location/location.dart b/lib/functions/location/location.dart index 53b9acc..94c6edb 100644 --- a/lib/functions/location/location.dart +++ b/lib/functions/location/location.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:jade_gui/Locales/locales.dart'; +import 'package:jade_gui/locales/locales.dart'; import 'package:jade_gui/classes/location.dart'; -Location choosenLocPack = Location(); +Location choosenLocPack = const Location(); Widget locationTemplate(location, nextSlide) { return Container( padding: const EdgeInsets.all(8), diff --git a/lib/Locales/africa.dart b/lib/locales/africa.dart similarity index 99% rename from lib/Locales/africa.dart rename to lib/locales/africa.dart index 8ec7cb0..4f352c7 100644 --- a/lib/Locales/africa.dart +++ b/lib/locales/africa.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List africa = [ +List africa = const [ Location( region: "Africa", location: "Abidjan", diff --git a/lib/Locales/america.dart b/lib/locales/america.dart similarity index 99% rename from lib/Locales/america.dart rename to lib/locales/america.dart index 4295d60..342244c 100644 --- a/lib/Locales/america.dart +++ b/lib/locales/america.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List america = [ +List america = const [ Location( region: "America", location: "Adak", diff --git a/lib/Locales/antarctica.dart b/lib/locales/antarctica.dart similarity index 97% rename from lib/Locales/antarctica.dart rename to lib/locales/antarctica.dart index 8d76013..288272c 100644 --- a/lib/Locales/antarctica.dart +++ b/lib/locales/antarctica.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List antarctica = [ +List antarctica = const [ Location( region: "Antarctica", location: "Casey", diff --git a/lib/Locales/arctic.dart b/lib/locales/arctic.dart similarity index 82% rename from lib/Locales/arctic.dart rename to lib/locales/arctic.dart index 79a8dce..f088f28 100644 --- a/lib/Locales/arctic.dart +++ b/lib/locales/arctic.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List arctic = [ +List arctic = const [ Location( region: "Arctic", location: "Longyearbyen", diff --git a/lib/Locales/asia.dart b/lib/locales/asia.dart similarity index 99% rename from lib/Locales/asia.dart rename to lib/locales/asia.dart index 732da73..9117368 100644 --- a/lib/Locales/asia.dart +++ b/lib/locales/asia.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List asia = [ +List asia = const [ Location( region: "Asia", location: "Aden", diff --git a/lib/Locales/atlantic.dart b/lib/locales/atlantic.dart similarity index 97% rename from lib/Locales/atlantic.dart rename to lib/locales/atlantic.dart index fbce600..373f54e 100644 --- a/lib/Locales/atlantic.dart +++ b/lib/locales/atlantic.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List atlantic = [ +List atlantic = const [ Location( region: "atlantic", location: "Azores", diff --git a/lib/Locales/australia.dart b/lib/locales/australia.dart similarity index 98% rename from lib/Locales/australia.dart rename to lib/locales/australia.dart index eee0787..f1e53b4 100644 --- a/lib/Locales/australia.dart +++ b/lib/locales/australia.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List australia = [ +List australia = const [ Location( region: "Australia", location: "Adelaide", diff --git a/lib/Locales/brazil.dart b/lib/locales/brazil.dart similarity index 88% rename from lib/Locales/brazil.dart rename to lib/locales/brazil.dart index 1fdf952..0c834e0 100644 --- a/lib/Locales/brazil.dart +++ b/lib/locales/brazil.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List brazil = [ +List brazil = const [ Location( region: "Brazil", location: "Acre", diff --git a/lib/Locales/canada.dart b/lib/locales/canada.dart similarity index 95% rename from lib/Locales/canada.dart rename to lib/locales/canada.dart index da5bf98..73a206d 100644 --- a/lib/Locales/canada.dart +++ b/lib/locales/canada.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List canada = [ +List canada = const [ Location( region: "canada", location: "Atlantic", diff --git a/lib/Locales/chile.dart b/lib/locales/chile.dart similarity index 89% rename from lib/Locales/chile.dart rename to lib/locales/chile.dart index 709e7f4..fd5fe3c 100644 --- a/lib/Locales/chile.dart +++ b/lib/locales/chile.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List chile = [ +List chile = const [ Location( region: "Chile", location: "Continental", diff --git a/lib/Locales/europe.dart b/lib/locales/europe.dart similarity index 99% rename from lib/Locales/europe.dart rename to lib/locales/europe.dart index d47b207..d7ed0b6 100644 --- a/lib/Locales/europe.dart +++ b/lib/locales/europe.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List europe = [ +List europe = const [ Location( region: "Europe", location: "Amsterdam", diff --git a/lib/Locales/indian.dart b/lib/locales/indian.dart similarity index 97% rename from lib/Locales/indian.dart rename to lib/locales/indian.dart index 62d5a9c..1a9afbe 100644 --- a/lib/Locales/indian.dart +++ b/lib/locales/indian.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List indian = [ +List indian = const [ Location( region: "Indian", location: "Antananarivo", diff --git a/lib/locales/locales.dart b/lib/locales/locales.dart new file mode 100644 index 0000000..fc5115b --- /dev/null +++ b/lib/locales/locales.dart @@ -0,0 +1,41 @@ +import 'package:jade_gui/locales/arctic.dart'; +import 'package:jade_gui/locales/africa.dart'; +import 'package:jade_gui/locales/america.dart'; +import 'package:jade_gui/locales/antarctica.dart'; +import 'package:jade_gui/locales/asia.dart'; +import 'package:jade_gui/locales/atlantic.dart'; +import 'package:jade_gui/locales/australia.dart'; +import 'package:jade_gui/locales/brazil.dart'; +import 'package:jade_gui/locales/canada.dart'; +import 'package:jade_gui/locales/chile.dart'; +import 'package:jade_gui/locales/europe.dart'; +import 'package:jade_gui/locales/indian.dart'; +import 'package:jade_gui/locales/mexico.dart'; +import 'package:jade_gui/locales/pacific.dart'; +import 'package:jade_gui/locales/us.dart'; +import 'package:jade_gui/classes/location.dart'; + +class Local { + List location = const [Location()]; + String name = ""; + + Local(this.location, this.name); +} + +List locations = [ + Local(africa, "Africa"), + Local(america, "America"), + Local(antarctica, "Antarctica"), + Local(arctic, "Arctic"), + Local(asia, "Asia"), + Local(atlantic, "Atlantic"), + Local(australia, "Australia"), + Local(brazil, "Brazil"), + Local(canada, "Canada"), + Local(chile, "Chile"), + Local(europe, "Europe"), + Local(indian, "Indian"), + Local(mexico, "Mexico"), + Local(pacific, "Pacific"), + Local(us, "US"), +]; diff --git a/lib/Locales/mexico.dart b/lib/locales/mexico.dart similarity index 91% rename from lib/Locales/mexico.dart rename to lib/locales/mexico.dart index 8af5f77..3fd4286 100644 --- a/lib/Locales/mexico.dart +++ b/lib/locales/mexico.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List mexico = [ +List mexico = const [ Location( region: "Mexico", location: "BajaNorte", diff --git a/lib/Locales/pacific.dart b/lib/locales/pacific.dart similarity index 99% rename from lib/Locales/pacific.dart rename to lib/locales/pacific.dart index b255a12..10a293b 100644 --- a/lib/Locales/pacific.dart +++ b/lib/locales/pacific.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List pacific = [ +List pacific = const [ Location( region: "Pacific", location: "Apia", diff --git a/lib/Locales/us.dart b/lib/locales/us.dart similarity index 97% rename from lib/Locales/us.dart rename to lib/locales/us.dart index 662caf1..593423c 100644 --- a/lib/Locales/us.dart +++ b/lib/locales/us.dart @@ -1,6 +1,6 @@ import 'package:jade_gui/classes/location.dart'; -List us = [ +List us = const [ Location( region: "US", location: "Alaska",