rainloreley/shlink-manager
1
0
Fork 0
mirror of https://github.com/rainloreley/shlink-manager.git synced 2024-09-07 22:42:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

added global theme

This commit is contained in:
Adrian Baumgart 2024-07-26 19:32:25 +02:00
parent e1c9bc4d80
commit 4f8cc9e4b6
Signed by: rainloreley
SSH Key Fingerprint: SHA256:DrGrohIPualL1UkyUym0K4C+uC5njuzPFBdXgtVZntM
10 changed files with 130 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lib/global_theme.dart Normal file
View File

@ -0,0 +1,69 @@
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flutter/material.dart';
class GlobalTheme {
static final Color _lightFocusColor = Colors.black.withOpacity(0.12);
static final Color _darkFocusColor = Colors.white.withOpacity(0.12);
static ThemeData lightThemeData(ColorScheme? dynamicColorScheme) {
return themeData(lightColorScheme, dynamicColorScheme, _lightFocusColor);
}
static ThemeData darkThemeData(ColorScheme? dynamicColorScheme) {
return themeData(darkColorScheme, dynamicColorScheme, _darkFocusColor);
}
static ThemeData themeData(ColorScheme colorScheme, ColorScheme? dynamic,
Color focusColor) {
return ThemeData(
colorScheme: colorScheme,
canvasColor: colorScheme.surface,
scaffoldBackgroundColor: colorScheme.surface,
highlightColor: Colors.transparent,
dividerColor: colorScheme.outline,
focusColor: focusColor,
useMaterial3: true,
appBarTheme: AppBarTheme(
backgroundColor: colorScheme.surface,
foregroundColor: colorScheme.onSurface,
elevation: 0
)
);
}
static ColorScheme get lightColorScheme {
return ColorScheme(
primary: Color(0xff747ab5),
onPrimary: Colors.white,
secondary: Color(0x445d63a6),// Color(0xFFDDE0E0),
onSecondary: Color(0xFF322942),
tertiary: Colors.grey[300],
onTertiary: Colors.grey[700],
surfaceContainer: (Colors.grey[100])!,
outline: (Colors.grey[400])!,
error: (Colors.red[400])!,
onError: Colors.white,
surface: Color(0xFFFAFBFB),
onSurface: Color(0xFF241E30),
brightness: Brightness.light,
).harmonized();
}
static ColorScheme get darkColorScheme {
return ColorScheme(
primary: Color(0xff5d63a6),
secondary: Colors.blue.shade500,
secondaryContainer: Color(0xff1c1c1c),
surface: Colors.black,
surfaceContainer: Color(0xff0f0f0f),
onSurfaceVariant: Colors.grey[400],
tertiary: Colors.grey[900],
onTertiary: Colors.grey,
outline: (Colors.grey[800])!,
error: (Colors.red[400])!,
onError: Colors.white,
onPrimary: Colors.white,
onSecondary: (Colors.grey[400])!,
onSurface: Colors.white,
brightness: Brightness.dark,
);
}
}

7
lib/main.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:shlink_app/global_theme.dart';
import 'package:shlink_app/views/login_view.dart';
import 'package:shlink_app/views/navigationbar_view.dart';
import 'globals.dart' as globals;
@ -26,7 +27,9 @@ class MyApp extends StatelessWidget {
return MaterialApp(
title: 'Shlink',
debugShowCheckedModeBanner: false,
theme: ThemeData(
theme: GlobalTheme.lightThemeData(lightColorScheme),
darkTheme: GlobalTheme.darkThemeData(darkColorScheme),
/*theme: ThemeData(
appBarTheme: const AppBarTheme(
backgroundColor: Color(0xfffafafa),
),
@ -41,7 +44,7 @@ class MyApp extends StatelessWidget {
colorScheme: darkColorScheme?.copyWith(surface: Colors.black) ??
_defaultDarkColorScheme,
useMaterial3: true,
),
),*/
home: const InitialPage());
});
}

22
lib/views/home_view.dart
View File

@ -76,8 +76,8 @@ class _HomeViewState extends State<HomeView> {
}
final snackBar = SnackBar(
content: Text(text),
backgroundColor: Colors.red[400],
content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar);
});
@ -99,8 +99,8 @@ class _HomeViewState extends State<HomeView> {
}
final snackBar = SnackBar(
content: Text(text),
backgroundColor: Colors.red[400],
content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar);
});
@ -139,7 +139,7 @@ class _HomeViewState extends State<HomeView> {
},
child: Text(globals.serverManager.getServerUrl(),
style: TextStyle(
fontSize: 16, color: Colors.grey[600])),
fontSize: 16, color: Theme.of(context).colorScheme.onTertiary)),
)
],
)),
@ -189,7 +189,7 @@ class _HomeViewState extends State<HomeView> {
'Create one by tapping the "+" button below',
style: TextStyle(
fontSize: 16,
color: Colors.grey[600]),
color: Theme.of(context).colorScheme.onSecondary),
),
)
],
@ -251,18 +251,12 @@ class _HomeViewState extends State<HomeView> {
eyeStyle: QrEyeStyle(
eyeShape: QrEyeShape.square,
color:
MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.white
: Colors.black,
Theme.of(context).colorScheme.onPrimary
),
dataModuleStyle: QrDataModuleStyle(
dataModuleShape: QrDataModuleShape.square,
color:
MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.white
: Colors.black,
Theme.of(context).colorScheme.onPrimary
),
))),
),

2
lib/views/login_view.dart
View File

@ -135,7 +135,7 @@ class _LoginViewState extends State<LoginView> {
children: [
Flexible(
child: Text(_errorMessage,
style: const TextStyle(color: Colors.red),
style: TextStyle(color: Theme.of(context).colorScheme.onError),
textAlign: TextAlign.center))
],
),

14
lib/views/opensource_licenses_view.dart
View File

@ -40,9 +40,7 @@ class _OpenSourceLicensesViewState extends State<OpenSourceLicensesView> {
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light
? Colors.grey[100]
: Colors.grey[900],
color: Theme.of(context).colorScheme.surfaceContainer,
),
child: Padding(
padding: const EdgeInsets.only(
@ -54,13 +52,13 @@ class _OpenSourceLicensesViewState extends State<OpenSourceLicensesView> {
style: const TextStyle(
fontWeight: FontWeight.bold, fontSize: 18)),
Text("Version: ${currentLicense.version ?? "N/A"}",
style: const TextStyle(color: Colors.grey)),
style: TextStyle(color: Theme.of(context).colorScheme.onTertiary)),
const SizedBox(height: 8),
const Divider(),
Divider(color: Theme.of(context).dividerColor),
const SizedBox(height: 8),
Text(currentLicense.license,
textAlign: TextAlign.justify,
style: const TextStyle(color: Colors.grey)),
style: TextStyle(color: Theme.of(context).colorScheme.onTertiary)),
],
),
),
@ -69,12 +67,12 @@ class _OpenSourceLicensesViewState extends State<OpenSourceLicensesView> {
);
}, childCount: LicenseUtil.getLicenses().length),
),
const SliverToBoxAdapter(
SliverToBoxAdapter(
child: Padding(
padding: EdgeInsets.only(top: 8, bottom: 20),
child: Text(
"Thank you to all maintainers of these repositories 💝",
style: TextStyle(color: Colors.grey),
style: TextStyle(color: Theme.of(context).colorScheme.onTertiary),
textAlign: TextAlign.center,
),
))

30
lib/views/redirect_rules_detail_view.dart
View File

@ -49,8 +49,8 @@ class _RedirectRulesDetailViewState extends State<RedirectRulesDetailView> {
}
final snackBar = SnackBar(
content: Text(text),
backgroundColor: Colors.red[400],
content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar);
return false;
@ -71,8 +71,8 @@ class _RedirectRulesDetailViewState extends State<RedirectRulesDetailView> {
}
final snackBar = SnackBar(
content: Text(text),
backgroundColor: Colors.red[400],
content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar);
return false;
@ -141,7 +141,7 @@ class _RedirectRulesDetailViewState extends State<RedirectRulesDetailView> {
child: Text(
'Adding redirect rules will be supported soon!',
style: TextStyle(
fontSize: 16, color: Colors.grey[600]),
fontSize: 16, color: Theme.of(context).colorScheme.onSecondary),
),
)
],
@ -221,10 +221,7 @@ class _ListCellState extends State<_ListCell> {
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.grey[800]!
: Colors.grey[300]!)),
color: Theme.of(context).dividerColor)),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -252,10 +249,7 @@ class _ListCellState extends State<_ListCell> {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4),
color:
MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.grey[900]
: Colors.grey[300],
Theme.of(context).colorScheme.tertiary,
),
child: Text(_conditionToTagString(condition)),
),
@ -269,19 +263,13 @@ class _ListCellState extends State<_ListCell> {
children: [
IconButton(
disabledColor:
MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.grey[700]
: Colors.grey[400],
Theme.of(context).disabledColor,
onPressed: widget.moveUp,
icon: const Icon(Icons.arrow_upward),
),
IconButton(
disabledColor:
MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.grey[700]
: Colors.grey[400],
Theme.of(context).disabledColor,
onPressed: widget.moveDown,
icon: const Icon(Icons.arrow_downward),
),

48
lib/views/settings_view.dart
View File

@ -52,8 +52,8 @@ class _SettingsViewState extends State<SettingsView> {
}
final snackBar = SnackBar(
content: Text(text),
backgroundColor: Colors.red[400],
content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar);
});
@ -87,9 +87,7 @@ class _SettingsViewState extends State<SettingsView> {
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light
? Colors.grey[100]
: Colors.grey[900],
color: Theme.of(context).colorScheme.surfaceContainer
),
child: Padding(
padding: const EdgeInsets.all(12.0),
@ -110,29 +108,29 @@ class _SettingsViewState extends State<SettingsView> {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text("Connected to",
style: TextStyle(color: Colors.grey)),
Text("Connected to",
style: TextStyle(color: Theme.of(context).colorScheme.onTertiary)),
Text(globals.serverManager.getServerUrl(),
style: const TextStyle(
fontWeight: FontWeight.bold,
fontSize: 16)),
Row(
children: [
const Text("API Version: ",
Text("API Version: ",
style: TextStyle(
color: Colors.grey,
color: Theme.of(context).colorScheme.onTertiary,
fontWeight: FontWeight.w600)),
Text(globals.serverManager.getApiVersion(),
style: const TextStyle(
color: Colors.grey)),
const SizedBox(width: 16),
const Text("Server Version: ",
style: TextStyle(
color: Colors.grey,
color: Theme.of(context).colorScheme.onTertiary)),
const SizedBox(width: 16),
Text("Server Version: ",
style: TextStyle(
color: Theme.of(context).colorScheme.onTertiary,
fontWeight: FontWeight.w600)),
Text(_serverVersion,
style:
const TextStyle(color: Colors.grey))
TextStyle(color: Theme.of(context).colorScheme.onTertiary))
],
),
],
@ -143,7 +141,7 @@ class _SettingsViewState extends State<SettingsView> {
),
),
const SizedBox(height: 8),
const Divider(),
Divider(color: Theme.of(context).dividerColor),
const SizedBox(height: 8),
GestureDetector(
onTap: () {
@ -154,9 +152,7 @@ class _SettingsViewState extends State<SettingsView> {
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light
? Colors.grey[100]
: Colors.grey[900],
color: Theme.of(context).colorScheme.surfaceContainer
),
child: const Padding(
padding: EdgeInsets.only(
@ -190,9 +186,7 @@ class _SettingsViewState extends State<SettingsView> {
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light
? Colors.grey[100]
: Colors.grey[900],
color: Theme.of(context).colorScheme.surfaceContainer
),
child: const Padding(
padding: EdgeInsets.only(
@ -226,9 +220,7 @@ class _SettingsViewState extends State<SettingsView> {
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light
? Colors.grey[100]
: Colors.grey[900],
color: Theme.of(context).colorScheme.surfaceContainer
),
child: const Padding(
padding: EdgeInsets.only(
@ -261,13 +253,11 @@ class _SettingsViewState extends State<SettingsView> {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color:
Theme.of(context).brightness == Brightness.light
? Colors.grey[100]
: Colors.grey[900],
Theme.of(context).colorScheme.surfaceContainer
),
child: Text(
"${packageInfo.appName}, v${packageInfo.version} (${packageInfo.buildNumber})",
style: const TextStyle(color: Colors.grey),
style: TextStyle(color: Theme.of(context).colorScheme.onSecondary),
),
)
],

11
lib/views/short_url_edit_view.dart
View File

@ -131,8 +131,8 @@ class _ShortURLEditViewState extends State<ShortURLEditView>
}
final snackBar = SnackBar(
content: Text(text),
backgroundColor: Colors.red[400],
content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar);
return false;
@ -175,11 +175,8 @@ class _ShortURLEditViewState extends State<ShortURLEditView>
controller: customSlugController,
style: TextStyle(
color: randomSlug
? Colors.grey
: Theme.of(context).brightness ==
Brightness.light
? Colors.black
: Colors.white),
? Theme.of(context).colorScheme.onTertiary
: Theme.of(context).colorScheme.onPrimary),
onChanged: (_) {
if (randomSlug) {
setState(() {

14
lib/views/url_detail_view.dart
View File

@ -75,8 +75,8 @@ class _URLDetailViewState extends State<URLDetailView> {
}
final snackBar = SnackBar(
content: Text(text),
backgroundColor: Colors.red[400],
content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar);
return false;
@ -207,10 +207,7 @@ class _ListCellState extends State<_ListCell> {
decoration: BoxDecoration(
border: Border(
top: BorderSide(
color: MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.grey[800]!
: Colors.grey[300]!)),
color: Theme.of(context).dividerColor)),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -226,10 +223,7 @@ class _ListCellState extends State<_ListCell> {
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness ==
Brightness.dark
? Colors.grey[700]
: Colors.grey[300],
color: Theme.of(context).colorScheme.outline,
),
),
),

20
lib/views/url_list_view.dart
View File

@ -99,7 +99,7 @@ class _URLListViewState extends State<URLListView> {
'Create one by tapping the "+" button below',
style: TextStyle(
fontSize: 16,
color: Colors.grey[600]),
color: Theme.of(context).colorScheme.onSecondary),
),
)
],
@ -151,18 +151,11 @@ class _URLListViewState extends State<URLListView> {
eyeStyle: QrEyeStyle(
eyeShape: QrEyeShape.square,
color:
MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.white
: Colors.black,
Theme.of(context).colorScheme.onPrimary,
),
dataModuleStyle: QrDataModuleStyle(
dataModuleShape: QrDataModuleShape.square,
color:
MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.white
: Colors.black,
color: Theme.of(context).colorScheme.onPrimary,
),
))),
),
@ -209,10 +202,7 @@ class _ShortURLCellState extends State<ShortURLCell> {
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: MediaQuery.of(context).platformBrightness ==
Brightness.dark
? Colors.grey[800]!
: Colors.grey[300]!)),
color: Theme.of(context).dividerColor)),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -231,7 +221,7 @@ class _ShortURLCellState extends State<ShortURLCell> {
maxLines: 1,
overflow: TextOverflow.ellipsis,
textScaleFactor: 0.9,
style: TextStyle(color: Colors.grey[600]),
style: TextStyle(color: Theme.of(context).colorScheme.onTertiary),
),
// List tags in a row
UrlTagsListWidget(tags: widget.shortURL.tags)