Fixed version number in settings menu, added theme switcher.

This commit is contained in:
Yannick Mauray 2021-11-09 22:32:08 +01:00
parent 3e588d67aa
commit f72e025817
No known key found for this signature in database
GPG Key ID: 67C4AAC5E99CB909
7 changed files with 63 additions and 20 deletions

View File

@ -1,6 +1,10 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:provider/provider.dart';
import 'package:quickgui/src/app.dart';
import 'package:quickgui/src/mixins/app_version.dart';
import 'package:quickgui/src/model/app_theme.dart';
import 'package:quickgui/src/model/operating_system.dart';
import 'package:quickgui/src/model/option.dart';
import 'package:quickgui/src/model/version.dart';
@ -47,6 +51,11 @@ void main() async {
setWindowMinSize(const Size(692, 580));
setWindowMaxSize(const Size(692, 580));
gOperatingSystems = await loadOperatingSystems(false);
runApp(const App());
AppVersion.packageInfo = await PackageInfo.fromPlatform();
runApp(MultiProvider(
providers: [
ChangeNotifierProvider(create: (_) => AppTheme()),
],
builder: (context, _) => const App(),
));
}

View File

@ -1,4 +1,6 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:quickgui/src/model/app_theme.dart';
import 'package:quickgui/src/pages/main_page.dart';
class App extends StatefulWidget {
@ -11,10 +13,13 @@ class App extends StatefulWidget {
class _AppState extends State<App> {
@override
Widget build(BuildContext context) {
return MaterialApp(
theme: ThemeData(primarySwatch: Colors.pink),
darkTheme: ThemeData.dark(),
home: const MainPage(title: 'Quickgui - A Flutter frontend for Quickget and Quickemu'),
return Consumer<AppTheme>(
builder: (context, appTheme, _) => MaterialApp(
theme: ThemeData(primarySwatch: Colors.pink),
darkTheme: ThemeData.dark(),
themeMode: appTheme.themeMode,
home: const MainPage(title: 'Quickgui - A Flutter frontend for Quickget and Quickemu'),
),
);
}
}

View File

@ -1,6 +1,6 @@
import 'package:package_info_plus/package_info_plus.dart';
mixin VersionMixin {
class AppVersion {
static PackageInfo? packageInfo;
String get appName => packageInfo?.appName ?? '';

View File

@ -0,0 +1,11 @@
import 'package:flutter/material.dart';
class AppTheme extends ChangeNotifier {
ThemeMode? _themeMode;
ThemeMode get themeMode => _themeMode ?? ThemeMode.system;
set useDarkMode(bool useDarkMode) {
_themeMode = useDarkMode ? ThemeMode.dark : ThemeMode.light;
notifyListeners();
}
}

View File

@ -1,5 +1,3 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:quickgui/src/widgets/home_page/logo.dart';
import 'package:quickgui/src/widgets/home_page/main_menu.dart';

View File

@ -1,20 +1,39 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:quickgui/src/mixins/version_mixin.dart';
import 'package:provider/provider.dart';
import 'package:quickgui/src/mixins/app_version.dart';
import 'package:quickgui/src/model/app_theme.dart';
class LeftMenu extends StatelessWidget with VersionMixin {
class LeftMenu extends StatelessWidget {
const LeftMenu({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
var _version = version + ' (' + buildNumber + ')';
return Drawer(
child: ListView(
children: [
ListTile(
title: Text("quickgui $_version", style: Theme.of(context).textTheme.headline6),
),
const Divider(),
],
var _version = AppVersion.packageInfo!.version;
return Consumer<AppTheme>(
builder: (context, appTheme, _) => Drawer(
child: ListView(
children: [
ListTile(
title: Text("quickgui $_version", style: Theme.of(context).textTheme.headline6),
),
const Divider(),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Row(
children: [
const Text('Use dark mode'),
Switch(
value: Theme.of(context).brightness == Brightness.dark,
onChanged: (value) {
appTheme.useDarkMode = value;
},
),
],
),
)
],
),
),
);
}

View File

@ -44,6 +44,7 @@ dependencies:
file_picker: ^4.1.6
shared_preferences: ^2.0.8
package_info_plus: ^1.3.0
provider: ^6.0.1
dev_dependencies:
flutter_test: