chore: formating

This commit is contained in:
Yannick Mauray 2024-06-27 19:27:04 +02:00
parent 703094c825
commit bb793040bc
5 changed files with 14 additions and 17 deletions

View File

@ -1,20 +1,20 @@
import 'dart:io';
import 'dart:convert'; import 'dart:convert';
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
import 'package:window_size/window_size.dart'; import 'package:window_size/window_size.dart';
import 'package:flutter/services.dart';
import 'src/app.dart'; import 'src/app.dart';
import 'src/mixins/app_version.dart'; import 'src/mixins/app_version.dart';
import 'src/model/app_settings.dart'; import 'src/model/app_settings.dart';
import 'src/model/operating_system.dart'; import 'src/model/operating_system.dart';
import 'src/model/option.dart'; import 'src/model/option.dart';
import 'src/model/version.dart';
import 'src/model/osicons.dart'; import 'src/model/osicons.dart';
import 'src/model/version.dart';
Future<List<OperatingSystem>> loadOperatingSystems(bool showUbuntus) async { Future<List<OperatingSystem>> loadOperatingSystems(bool showUbuntus) async {
var process = await Process.run('quickget', ['--list-csv']); var process = await Process.run('quickget', ['--list-csv']);
@ -65,9 +65,7 @@ Future<void> getIcons() async {
.where((String key) => key.contains('.svg')) .where((String key) => key.contains('.svg'))
.toList(); .toList();
for (final imagePath in imagePaths) { for (final imagePath in imagePaths) {
String filename = imagePath String filename = imagePath.split('/').last;
.split('/')
.last;
String id = filename.substring(0, filename.lastIndexOf('.')); String id = filename.substring(0, filename.lastIndexOf('.'));
osIcons[id] = imagePath; osIcons[id] = imagePath;
} }

View File

@ -61,11 +61,10 @@ class _AppState extends State<App> with PreferencesMixin {
builder: (context, appSettings, _) => MaterialApp( builder: (context, appSettings, _) => MaterialApp(
theme: ThemeData( theme: ThemeData(
useMaterial3: true, useMaterial3: true,
colorScheme: ColorScheme.fromSwatch( colorScheme: ColorScheme.fromSwatch(
primarySwatch: Colors.pink, primarySwatch: Colors.pink,
backgroundColor: Colors.white, backgroundColor: Colors.white,
) )),
),
darkTheme: ThemeData( darkTheme: ThemeData(
useMaterial3: true, useMaterial3: true,
colorScheme: ColorScheme.fromSwatch( colorScheme: ColorScheme.fromSwatch(

View File

@ -64,7 +64,7 @@ class _DownloaderMenuState extends State<DownloaderMenu> with PreferencesMixin {
} }
}, },
child: Text(Directory.current.path), child: Text(Directory.current.path),
), ),
], ],
), ),
), ),

View File

@ -13,7 +13,7 @@ import '../../pages/version_selection.dart';
import 'downloader_page_button.dart'; import 'downloader_page_button.dart';
class HomePageButtonGroup extends StatefulWidget { class HomePageButtonGroup extends StatefulWidget {
const HomePageButtonGroup({Key? key}) : super(key: key); const HomePageButtonGroup({super.key});
@override @override
State<HomePageButtonGroup> createState() => _HomePageButtonGroupState(); State<HomePageButtonGroup> createState() => _HomePageButtonGroupState();
@ -26,10 +26,10 @@ class _HomePageButtonGroupState extends State<HomePageButtonGroup> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var _versionButtonLabel = var versionButtonLabel =
_selectedVersion?.version ?? context.t('Select...'); _selectedVersion?.version ?? context.t('Select...');
if (_selectedOption?.option.isNotEmpty ?? false) { if (_selectedOption?.option.isNotEmpty ?? false) {
_versionButtonLabel = "$_versionButtonLabel (${_selectedOption!.option})"; versionButtonLabel = "$versionButtonLabel (${_selectedOption!.option})";
} }
return Row( return Row(
children: [ children: [
@ -60,7 +60,7 @@ class _HomePageButtonGroupState extends State<HomePageButtonGroup> {
), ),
DownloaderPageButton( DownloaderPageButton(
label: context.t('Version'), label: context.t('Version'),
text: _versionButtonLabel, //_selectedVersion?.version ?? 'Select...', text: versionButtonLabel, //_selectedVersion?.version ?? 'Select...',
onPressed: (_selectedOperatingSystem != null) onPressed: (_selectedOperatingSystem != null)
? () { ? () {
Navigator.of(context) Navigator.of(context)

View File

@ -38,14 +38,14 @@ class _LeftMenuState extends State<LeftMenu> with PreferencesMixin {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var _version = AppVersion.packageInfo!.version; var version = AppVersion.packageInfo!.version;
return Consumer<AppSettings>( return Consumer<AppSettings>(
builder: (context, appSettings, _) { builder: (context, appSettings, _) {
return Drawer( return Drawer(
child: ListView( child: ListView(
children: [ children: [
ListTile( ListTile(
title: Text("Quickgui $_version", title: Text("Quickgui $version",
style: Theme.of(context).textTheme.titleLarge), style: Theme.of(context).textTheme.titleLarge),
), ),
/* /*
@ -86,7 +86,7 @@ class _LeftMenuState extends State<LeftMenu> with PreferencesMixin {
value: currentLocale, value: currentLocale,
items: supportedLocales items: supportedLocales
.map( .map(
(e) => DropdownMenuItem(child: Text(e), value: e)) (e) => DropdownMenuItem(value: e, child: Text(e)))
.toList(), .toList(),
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {