rainloreley/shlink-manager
1
0
Fork 0
mirror of https://github.com/rainloreley/shlink-manager.git synced 2024-11-23 10:13:03 +01: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
No known key found for this signature in database
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:flutter/material.dart';
import 'package:shlink_app/global_theme.dart';
import 'package:shlink_app/views/login_view.dart'; import 'package:shlink_app/views/login_view.dart';
import 'package:shlink_app/views/navigationbar_view.dart'; import 'package:shlink_app/views/navigationbar_view.dart';
import 'globals.dart' as globals; import 'globals.dart' as globals;
@ -26,7 +27,9 @@ class MyApp extends StatelessWidget {
return MaterialApp( return MaterialApp(
title: 'Shlink', title: 'Shlink',
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: ThemeData( theme: GlobalTheme.lightThemeData(lightColorScheme),
darkTheme: GlobalTheme.darkThemeData(darkColorScheme),
/*theme: ThemeData(
appBarTheme: const AppBarTheme( appBarTheme: const AppBarTheme(
backgroundColor: Color(0xfffafafa), backgroundColor: Color(0xfffafafa),
), ),
@ -41,7 +44,7 @@ class MyApp extends StatelessWidget {
colorScheme: darkColorScheme?.copyWith(surface: Colors.black) ?? colorScheme: darkColorScheme?.copyWith(surface: Colors.black) ??
_defaultDarkColorScheme, _defaultDarkColorScheme,
useMaterial3: true, useMaterial3: true,
), ),*/
home: const InitialPage()); home: const InitialPage());
}); });
} }

22
lib/views/home_view.dart
View File

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

2
lib/views/login_view.dart
View File

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

14
lib/views/opensource_licenses_view.dart
View File

@ -40,9 +40,7 @@ class _OpenSourceLicensesViewState extends State<OpenSourceLicensesView> {
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light color: Theme.of(context).colorScheme.surfaceContainer,
? Colors.grey[100]
: Colors.grey[900],
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
@ -54,13 +52,13 @@ class _OpenSourceLicensesViewState extends State<OpenSourceLicensesView> {
style: const TextStyle( style: const TextStyle(
fontWeight: FontWeight.bold, fontSize: 18)), fontWeight: FontWeight.bold, fontSize: 18)),
Text("Version: ${currentLicense.version ?? "N/A"}", 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 SizedBox(height: 8),
const Divider(), Divider(color: Theme.of(context).dividerColor),
const SizedBox(height: 8), const SizedBox(height: 8),
Text(currentLicense.license, Text(currentLicense.license,
textAlign: TextAlign.justify, 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), }, childCount: LicenseUtil.getLicenses().length),
), ),
const SliverToBoxAdapter( SliverToBoxAdapter(
child: Padding( child: Padding(
padding: EdgeInsets.only(top: 8, bottom: 20), padding: EdgeInsets.only(top: 8, bottom: 20),
child: Text( child: Text(
"Thank you to all maintainers of these repositories 💝", "Thank you to all maintainers of these repositories 💝",
style: TextStyle(color: Colors.grey), style: TextStyle(color: Theme.of(context).colorScheme.onTertiary),
textAlign: TextAlign.center, 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( final snackBar = SnackBar(
content: Text(text), content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Colors.red[400], backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating); behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar); ScaffoldMessenger.of(context).showSnackBar(snackBar);
return false; return false;
@ -71,8 +71,8 @@ class _RedirectRulesDetailViewState extends State<RedirectRulesDetailView> {
} }
final snackBar = SnackBar( final snackBar = SnackBar(
content: Text(text), content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Colors.red[400], backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating); behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar); ScaffoldMessenger.of(context).showSnackBar(snackBar);
return false; return false;
@ -141,7 +141,7 @@ class _RedirectRulesDetailViewState extends State<RedirectRulesDetailView> {
child: Text( child: Text(
'Adding redirect rules will be supported soon!', 'Adding redirect rules will be supported soon!',
style: TextStyle( 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( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
color: MediaQuery.of(context).platformBrightness == color: Theme.of(context).dividerColor)),
Brightness.dark
? Colors.grey[800]!
: Colors.grey[300]!)),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -252,10 +249,7 @@ class _ListCellState extends State<_ListCell> {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4), borderRadius: BorderRadius.circular(4),
color: color:
MediaQuery.of(context).platformBrightness == Theme.of(context).colorScheme.tertiary,
Brightness.dark
? Colors.grey[900]
: Colors.grey[300],
), ),
child: Text(_conditionToTagString(condition)), child: Text(_conditionToTagString(condition)),
), ),
@ -269,19 +263,13 @@ class _ListCellState extends State<_ListCell> {
children: [ children: [
IconButton( IconButton(
disabledColor: disabledColor:
MediaQuery.of(context).platformBrightness == Theme.of(context).disabledColor,
Brightness.dark
? Colors.grey[700]
: Colors.grey[400],
onPressed: widget.moveUp, onPressed: widget.moveUp,
icon: const Icon(Icons.arrow_upward), icon: const Icon(Icons.arrow_upward),
), ),
IconButton( IconButton(
disabledColor: disabledColor:
MediaQuery.of(context).platformBrightness == Theme.of(context).disabledColor,
Brightness.dark
? Colors.grey[700]
: Colors.grey[400],
onPressed: widget.moveDown, onPressed: widget.moveDown,
icon: const Icon(Icons.arrow_downward), 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( final snackBar = SnackBar(
content: Text(text), content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Colors.red[400], backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating); behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar); ScaffoldMessenger.of(context).showSnackBar(snackBar);
}); });
@ -87,9 +87,7 @@ class _SettingsViewState extends State<SettingsView> {
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light color: Theme.of(context).colorScheme.surfaceContainer
? Colors.grey[100]
: Colors.grey[900],
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
@ -110,29 +108,29 @@ class _SettingsViewState extends State<SettingsView> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const Text("Connected to", Text("Connected to",
style: TextStyle(color: Colors.grey)), style: TextStyle(color: Theme.of(context).colorScheme.onTertiary)),
Text(globals.serverManager.getServerUrl(), Text(globals.serverManager.getServerUrl(),
style: const TextStyle( style: const TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 16)), fontSize: 16)),
Row( Row(
children: [ children: [
const Text("API Version: ", Text("API Version: ",
style: TextStyle( style: TextStyle(
color: Colors.grey, color: Theme.of(context).colorScheme.onTertiary,
fontWeight: FontWeight.w600)), fontWeight: FontWeight.w600)),
Text(globals.serverManager.getApiVersion(), Text(globals.serverManager.getApiVersion(),
style: const TextStyle(
color: Colors.grey)),
const SizedBox(width: 16),
const Text("Server Version: ",
style: TextStyle( 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)), fontWeight: FontWeight.w600)),
Text(_serverVersion, Text(_serverVersion,
style: 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 SizedBox(height: 8),
const Divider(), Divider(color: Theme.of(context).dividerColor),
const SizedBox(height: 8), const SizedBox(height: 8),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
@ -154,9 +152,7 @@ class _SettingsViewState extends State<SettingsView> {
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light color: Theme.of(context).colorScheme.surfaceContainer
? Colors.grey[100]
: Colors.grey[900],
), ),
child: const Padding( child: const Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
@ -190,9 +186,7 @@ class _SettingsViewState extends State<SettingsView> {
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light color: Theme.of(context).colorScheme.surfaceContainer
? Colors.grey[100]
: Colors.grey[900],
), ),
child: const Padding( child: const Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
@ -226,9 +220,7 @@ class _SettingsViewState extends State<SettingsView> {
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
color: Theme.of(context).brightness == Brightness.light color: Theme.of(context).colorScheme.surfaceContainer
? Colors.grey[100]
: Colors.grey[900],
), ),
child: const Padding( child: const Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
@ -261,13 +253,11 @@ class _SettingsViewState extends State<SettingsView> {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
color: color:
Theme.of(context).brightness == Brightness.light Theme.of(context).colorScheme.surfaceContainer
? Colors.grey[100]
: Colors.grey[900],
), ),
child: Text( child: Text(
"${packageInfo.appName}, v${packageInfo.version} (${packageInfo.buildNumber})", "${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( final snackBar = SnackBar(
content: Text(text), content: Text(text, style: TextStyle(color: Theme.of(context).colorScheme.onError)),
backgroundColor: Colors.red[400], backgroundColor: Theme.of(context).colorScheme.error,
behavior: SnackBarBehavior.floating); behavior: SnackBarBehavior.floating);
ScaffoldMessenger.of(context).showSnackBar(snackBar); ScaffoldMessenger.of(context).showSnackBar(snackBar);
return false; return false;
@ -175,11 +175,8 @@ class _ShortURLEditViewState extends State<ShortURLEditView>
controller: customSlugController, controller: customSlugController,
style: TextStyle( style: TextStyle(
color: randomSlug color: randomSlug
? Colors.grey ? Theme.of(context).colorScheme.onTertiary
: Theme.of(context).brightness == : Theme.of(context).colorScheme.onPrimary),
Brightness.light
? Colors.black
: Colors.white),
onChanged: (_) { onChanged: (_) {
if (randomSlug) { if (randomSlug) {
setState(() { setState(() {

14
lib/views/url_detail_view.dart
View File

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

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