alihan/ollama-android-ui-Maid
1
0
Fork 0
mirror of https://github.com/MaidFoundation/maid.git synced 2023-12-01 22:17:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Work on themes

Browse Source
This commit is contained in:
dane madsen
2023-11-26 19:52:15 +10:00
parent da80aace9b
commit 7a3bd6c904
3 changed files with 211 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/main.dart
View File

@@ -26,22 +26,6 @@ class MaidApp extends StatefulWidget {
}
class MaidAppState extends State<MaidApp> {
@override
void initState() {
super.initState();
MaidTheme.registerCallback(refreshApp);
_loadTheme();
}
_loadTheme() async {
await MaidTheme.loadThemePreference();
setState(() {});
}
void refreshApp() {
setState(() {});
}
@override
Widget build(BuildContext context) {
final screenSize = MediaQuery.of(context).size;
@@ -57,7 +41,9 @@ class MaidAppState extends State<MaidApp> {
return MaterialApp(
debugShowCheckedModeBanner: false,
title: 'Maid',
theme: MaidTheme.theme,
theme: lightTheme,
darkTheme: darkTheme,
themeMode: ThemeMode.dark,
home: homePage,
);
}

432
lib/static/theme.dart
View File

@@ -1,21 +1,183 @@
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
enum ThemeType { dark, light }
ThemeData lightTheme = ThemeData(
iconTheme: const IconThemeData(color: Colors.black),
textTheme: const TextTheme(
titleLarge: TextStyle(
color: Colors.black,
fontSize: 30.0,
fontWeight: FontWeight.bold,
),
titleMedium: TextStyle(
color: Colors.black,
fontSize: 15.0,
),
titleSmall: TextStyle(
color: Colors.black,
fontSize: 20.0,
),
bodyMedium: TextStyle(
color: Colors.black,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
labelLarge: TextStyle(
color: Colors.black,
fontWeight: FontWeight.bold,
),
),
appBarTheme: AppBarTheme(
backgroundColor: Colors.grey.shade200,
foregroundColor: Colors.black,
titleTextStyle: const TextStyle(
color: Colors.black,
fontSize: 20.0,
fontWeight: FontWeight.bold,
),
iconTheme: const IconThemeData(color: Colors.black),
),
drawerTheme: const DrawerThemeData(
shape:RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topRight: Radius.circular(20),
bottomRight: Radius.circular(20)),
),
backgroundColor: Colors.white),
dropdownMenuTheme: DropdownMenuThemeData(
textStyle: const TextStyle(
color: Colors.black,
fontSize: 20.0,
),
inputDecorationTheme: InputDecorationTheme(
contentPadding: const EdgeInsets.symmetric(
horizontal: 20.0, vertical: 15.0), // Padding inside the TextField
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(30.0),
borderSide: BorderSide.none,
),
labelStyle: const TextStyle(
fontWeight: FontWeight.normal, color: Colors.black, fontSize: 15.0),
hintStyle: const TextStyle(
fontWeight: FontWeight.normal, color: Colors.grey, fontSize: 15.0),
fillColor: Colors.grey.shade300,
filled: true,
floatingLabelBehavior: FloatingLabelBehavior.never,
),
),
scaffoldBackgroundColor: Colors.white,
textSelectionTheme: TextSelectionThemeData(
selectionHandleColor: Colors.blue,
selectionColor: Colors.blue.shade800,
),
inputDecorationTheme: InputDecorationTheme(
contentPadding: const EdgeInsets.symmetric(
horizontal: 20.0, vertical: 15.0), // Padding inside the TextField
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(30.0),
borderSide: BorderSide.none,
),
labelStyle: const TextStyle(
fontWeight: FontWeight.normal, color: Colors.black, fontSize: 15.0),
hintStyle: const TextStyle(
fontWeight: FontWeight.normal, color: Colors.grey, fontSize: 15.0),
fillColor: Colors.grey.shade300,
filled: true,
floatingLabelBehavior: FloatingLabelBehavior.never,
),
dialogTheme: DialogTheme(
backgroundColor: Colors.grey.shade300,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(20.0))),
titleTextStyle: const TextStyle(
color: Colors.black,
fontSize: 20.0,
),
),
sliderTheme: SliderThemeData(
activeTrackColor: Colors.blue.shade800,
inactiveTrackColor: Colors.white,
thumbColor: Colors.blue,
overlayColor: Colors.blue.shade800,
),
colorScheme: ColorScheme.light(
background: Colors.white,
primary: Colors.grey.shade300,
onPrimary: Colors.black,
secondary: Colors.blue,
tertiary: Colors.blue.shade900,
inversePrimary: const Color.fromARGB(255, 100, 20, 20),
)
);
class MaidTheme {
static void Function()? _callback;
static ThemeData _theme = _darkTheme;
static ThemeData get theme => _theme;
static ThemeData get darkTheme => _darkTheme;
static ThemeData get lightTheme => _lightTheme;
static void registerCallback(void Function() refresh) {
_callback = refresh;
}
static final InputDecorationTheme darkInputDecorationTheme =
InputDecorationTheme(
ThemeData darkTheme = ThemeData(
iconTheme: const IconThemeData(color: Colors.white),
textTheme: const TextTheme(
titleLarge: TextStyle(
color: Colors.white,
fontSize: 30.0,
fontWeight: FontWeight.bold,
),
titleMedium: TextStyle(
color: Colors.white,
fontSize: 15.0,
),
titleSmall: TextStyle(
color: Colors.white,
fontSize: 20.0,
),
bodyMedium: TextStyle(
color: Colors.white,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
labelLarge: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
),
),
appBarTheme: AppBarTheme(
backgroundColor: Colors.grey.shade900,
foregroundColor: Colors.white,
titleTextStyle: const TextStyle(
color: Colors.white,
fontSize: 20.0,
fontWeight: FontWeight.bold,
),
iconTheme: const IconThemeData(color: Colors.white),
),
drawerTheme: DrawerThemeData(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topRight: Radius.circular(20), bottomRight: Radius.circular(20)),
),
backgroundColor: Colors.grey.shade900),
dropdownMenuTheme: DropdownMenuThemeData(
textStyle: const TextStyle(
color: Colors.white,
fontSize: 20.0,
),
inputDecorationTheme: InputDecorationTheme(
contentPadding: const EdgeInsets.symmetric(
horizontal: 20.0, vertical: 15.0), // Padding inside the TextField
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(30.0),
borderSide: BorderSide.none,
),
labelStyle: const TextStyle(
fontWeight: FontWeight.normal, color: Colors.grey, fontSize: 15.0),
hintStyle: const TextStyle(
fontWeight: FontWeight.normal, color: Colors.white, fontSize: 15.0),
fillColor: Colors.grey.shade800,
filled: true,
floatingLabelBehavior: FloatingLabelBehavior.never,
),
),
scaffoldBackgroundColor: Colors.grey.shade900,
textSelectionTheme: TextSelectionThemeData(
selectionHandleColor: Colors.blue,
selectionColor: Colors.blue.shade800,
),
inputDecorationTheme: InputDecorationTheme(
contentPadding: const EdgeInsets.symmetric(
horizontal: 20.0, vertical: 15.0), // Padding inside the TextField
border: OutlineInputBorder(
@@ -29,220 +191,28 @@ class MaidTheme {
fillColor: Colors.grey.shade800,
filled: true,
floatingLabelBehavior: FloatingLabelBehavior.never,
);
static final InputDecorationTheme lightInputDecorationTheme =
InputDecorationTheme(
contentPadding: const EdgeInsets.symmetric(
horizontal: 20.0, vertical: 15.0), // Padding inside the TextField
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(30.0),
borderSide: BorderSide.none,
),
dialogTheme: DialogTheme(
backgroundColor: Colors.grey.shade900,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(20.0))),
titleTextStyle: const TextStyle(
color: Colors.white,
fontSize: 20.0,
),
labelStyle: const TextStyle(
fontWeight: FontWeight.normal, color: Colors.black, fontSize: 15.0),
hintStyle: const TextStyle(
fontWeight: FontWeight.normal, color: Colors.grey, fontSize: 15.0),
fillColor: Colors.grey.shade300,
filled: true,
floatingLabelBehavior: FloatingLabelBehavior.never,
);
static Future<void> loadThemePreference() async {
SharedPreferences prefs = await SharedPreferences.getInstance();
String? themePref = prefs.getString('theme');
// Switch case for theme preference
switch (themePref) {
case 'dark':
_theme = _darkTheme;
break;
case 'light':
_theme = _lightTheme;
break;
default:
_theme = _darkTheme;
break;
}
}
static Future<void> setTheme(ThemeType type) async {
SharedPreferences prefs = await SharedPreferences.getInstance();
switch (type) {
case ThemeType.dark:
_theme = _darkTheme;
await prefs.setString('theme', 'dark');
break;
case ThemeType.light:
_theme = _lightTheme;
await prefs.setString('theme', 'light');
break;
default:
_theme = _darkTheme;
await prefs.setString('theme', 'dark');
break;
}
_callback?.call();
}
static final ThemeData _darkTheme = ThemeData(
iconTheme: const IconThemeData(color: Colors.white),
textTheme: const TextTheme(
titleLarge: TextStyle(
color: Colors.white,
fontSize: 30.0,
fontWeight: FontWeight.bold,
),
titleMedium: TextStyle(
color: Colors.white,
fontSize: 15.0,
),
titleSmall: TextStyle(
color: Colors.white,
fontSize: 20.0,
),
bodyMedium: TextStyle(
color: Colors.white,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
labelLarge: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
),
),
appBarTheme: AppBarTheme(
backgroundColor: Colors.grey.shade900,
foregroundColor: Colors.white,
titleTextStyle: const TextStyle(
color: Colors.white,
fontSize: 20.0,
fontWeight: FontWeight.bold,
),
iconTheme: const IconThemeData(color: Colors.white),
),
drawerTheme: DrawerThemeData(
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topRight: Radius.circular(20), bottomRight: Radius.circular(20)),
),
backgroundColor: Colors.grey.shade900),
dropdownMenuTheme: DropdownMenuThemeData(
textStyle: const TextStyle(
color: Colors.white,
fontSize: 20.0,
),
inputDecorationTheme: darkInputDecorationTheme,
),
scaffoldBackgroundColor: Colors.grey.shade900,
textSelectionTheme: TextSelectionThemeData(
selectionHandleColor: Colors.blue,
selectionColor: Colors.blue.shade800,
),
inputDecorationTheme: darkInputDecorationTheme,
dialogTheme: DialogTheme(
backgroundColor: Colors.grey.shade900,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(20.0))),
titleTextStyle: const TextStyle(
color: Colors.white,
fontSize: 20.0,
),
),
sliderTheme: SliderThemeData(
activeTrackColor: Colors.blue.shade800,
inactiveTrackColor: Colors.grey.shade800,
thumbColor: Colors.blue,
overlayColor: Colors.blue.shade800,
),
colorScheme: ColorScheme.dark(
background: Colors.grey.shade900,
primary: Colors.grey.shade800,
onPrimary: Colors.white,
secondary: Colors.blue,
tertiary: Colors.blue.shade900,
inversePrimary: const Color.fromARGB(255, 100, 20, 20),
),
);
static final ThemeData _lightTheme = ThemeData(
iconTheme: const IconThemeData(color: Colors.black),
textTheme: const TextTheme(
titleLarge: TextStyle(
color: Colors.black,
fontSize: 30.0,
fontWeight: FontWeight.bold,
),
titleMedium: TextStyle(
color: Colors.black,
fontSize: 15.0,
),
titleSmall: TextStyle(
color: Colors.black,
fontSize: 20.0,
),
bodyMedium: TextStyle(
color: Colors.black,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
labelLarge: TextStyle(
color: Colors.black,
fontWeight: FontWeight.bold,
),
),
appBarTheme: AppBarTheme(
backgroundColor: Colors.grey.shade200,
foregroundColor: Colors.black,
titleTextStyle: const TextStyle(
color: Colors.black,
fontSize: 20.0,
fontWeight: FontWeight.bold,
),
iconTheme: const IconThemeData(color: Colors.black),
),
drawerTheme: const DrawerThemeData(
shape:RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topRight: Radius.circular(20),
bottomRight: Radius.circular(20)),
),
backgroundColor: Colors.white),
dropdownMenuTheme: DropdownMenuThemeData(
textStyle: const TextStyle(
color: Colors.black,
fontSize: 20.0,
),
inputDecorationTheme: lightInputDecorationTheme,
),
scaffoldBackgroundColor: Colors.white,
textSelectionTheme: TextSelectionThemeData(
selectionHandleColor: Colors.blue,
selectionColor: Colors.blue.shade800,
),
inputDecorationTheme: lightInputDecorationTheme,
dialogTheme: DialogTheme(
backgroundColor: Colors.grey.shade300,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(20.0))),
titleTextStyle: const TextStyle(
color: Colors.black,
fontSize: 20.0,
),
),
sliderTheme: SliderThemeData(
activeTrackColor: Colors.blue.shade800,
inactiveTrackColor: Colors.white,
thumbColor: Colors.blue,
overlayColor: Colors.blue.shade800,
),
colorScheme: ColorScheme.light(
background: Colors.white,
primary: Colors.grey.shade300,
onPrimary: Colors.black,
secondary: Colors.blue,
tertiary: Colors.blue.shade900,
inversePrimary: const Color.fromARGB(255, 100, 20, 20),
));
}
),
sliderTheme: SliderThemeData(
activeTrackColor: Colors.blue.shade800,
inactiveTrackColor: Colors.grey.shade800,
thumbColor: Colors.blue,
overlayColor: Colors.blue.shade800,
),
colorScheme: ColorScheme.dark(
background: Colors.grey.shade900,
primary: Colors.grey.shade800,
onPrimary: Colors.white,
secondary: Colors.blue,
tertiary: Colors.blue.shade900,
inversePrimary: const Color.fromARGB(255, 100, 20, 20),
),
);

18
lib/widgets/page_bodies/settings_body.dart
View File

@@ -17,17 +17,13 @@ class _SettingsBodyState extends State<SettingsBody> {
return SingleChildScrollView(
child: Column(
children: [
SwitchListTile(
title: const Text('Theme (Light/Dark)'),
value: (MaidTheme.theme == MaidTheme.darkTheme) ? true : false,
onChanged: (value) {
if (value) {
MaidTheme.setTheme(ThemeType.dark);
} else {
MaidTheme.setTheme(ThemeType.light);
}
},
),
//SwitchListTile(
// title: const Text('Theme (Light/Dark)'),
// value: (true) ? true : false,
// onChanged: (value) {
// // TODO: Fix toggle
// },
//),
FilledButton(
onPressed: () async {
var prefs = await SharedPreferences.getInstance();