diff --git a/lib/main.dart b/lib/main.dart index fd6dad2..35ed604 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,20 +1,20 @@ -import 'dart:io'; import 'dart:convert'; +import 'dart:io'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; import 'package:window_size/window_size.dart'; -import 'package:flutter/services.dart'; import 'src/app.dart'; import 'src/mixins/app_version.dart'; import 'src/model/app_settings.dart'; import 'src/model/operating_system.dart'; import 'src/model/option.dart'; -import 'src/model/version.dart'; import 'src/model/osicons.dart'; +import 'src/model/version.dart'; Future> loadOperatingSystems(bool showUbuntus) async { var process = await Process.run('quickget', ['--list-csv']); @@ -65,9 +65,7 @@ Future getIcons() async { .where((String key) => key.contains('.svg')) .toList(); for (final imagePath in imagePaths) { - String filename = imagePath - .split('/') - .last; + String filename = imagePath.split('/').last; String id = filename.substring(0, filename.lastIndexOf('.')); osIcons[id] = imagePath; } diff --git a/lib/src/app.dart b/lib/src/app.dart index 1734635..64b1a7a 100644 --- a/lib/src/app.dart +++ b/lib/src/app.dart @@ -61,11 +61,10 @@ class _AppState extends State with PreferencesMixin { builder: (context, appSettings, _) => MaterialApp( theme: ThemeData( useMaterial3: true, - colorScheme: ColorScheme.fromSwatch( + colorScheme: ColorScheme.fromSwatch( primarySwatch: Colors.pink, backgroundColor: Colors.white, - ) - ), + )), darkTheme: ThemeData( useMaterial3: true, colorScheme: ColorScheme.fromSwatch( diff --git a/lib/src/widgets/home_page/downloader_menu.dart b/lib/src/widgets/home_page/downloader_menu.dart index 7a1bce9..422652e 100644 --- a/lib/src/widgets/home_page/downloader_menu.dart +++ b/lib/src/widgets/home_page/downloader_menu.dart @@ -64,7 +64,7 @@ class _DownloaderMenuState extends State with PreferencesMixin { } }, child: Text(Directory.current.path), - ), + ), ], ), ), diff --git a/lib/src/widgets/home_page/home_page_button_group.dart b/lib/src/widgets/home_page/home_page_button_group.dart index 58b2d18..b86acca 100644 --- a/lib/src/widgets/home_page/home_page_button_group.dart +++ b/lib/src/widgets/home_page/home_page_button_group.dart @@ -13,7 +13,7 @@ import '../../pages/version_selection.dart'; import 'downloader_page_button.dart'; class HomePageButtonGroup extends StatefulWidget { - const HomePageButtonGroup({Key? key}) : super(key: key); + const HomePageButtonGroup({super.key}); @override State createState() => _HomePageButtonGroupState(); @@ -26,10 +26,10 @@ class _HomePageButtonGroupState extends State { @override Widget build(BuildContext context) { - var _versionButtonLabel = + var versionButtonLabel = _selectedVersion?.version ?? context.t('Select...'); if (_selectedOption?.option.isNotEmpty ?? false) { - _versionButtonLabel = "$_versionButtonLabel (${_selectedOption!.option})"; + versionButtonLabel = "$versionButtonLabel (${_selectedOption!.option})"; } return Row( children: [ @@ -60,7 +60,7 @@ class _HomePageButtonGroupState extends State { ), DownloaderPageButton( label: context.t('Version'), - text: _versionButtonLabel, //_selectedVersion?.version ?? 'Select...', + text: versionButtonLabel, //_selectedVersion?.version ?? 'Select...', onPressed: (_selectedOperatingSystem != null) ? () { Navigator.of(context) diff --git a/lib/src/widgets/left_menu.dart b/lib/src/widgets/left_menu.dart index 567a15f..4b4bcac 100644 --- a/lib/src/widgets/left_menu.dart +++ b/lib/src/widgets/left_menu.dart @@ -38,14 +38,14 @@ class _LeftMenuState extends State with PreferencesMixin { @override Widget build(BuildContext context) { - var _version = AppVersion.packageInfo!.version; + var version = AppVersion.packageInfo!.version; return Consumer( builder: (context, appSettings, _) { return Drawer( child: ListView( children: [ ListTile( - title: Text("Quickgui $_version", + title: Text("Quickgui $version", style: Theme.of(context).textTheme.titleLarge), ), /* @@ -86,7 +86,7 @@ class _LeftMenuState extends State with PreferencesMixin { value: currentLocale, items: supportedLocales .map( - (e) => DropdownMenuItem(child: Text(e), value: e)) + (e) => DropdownMenuItem(value: e, child: Text(e))) .toList(), onChanged: (value) { setState(() {