ReVanced-Mirror/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager synced 2024-05-14 13:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(style): use the correct m3 theming (partially) (#680)

Browse Source
This commit is contained in:
EvadeMaster 2023-02-07 19:46:29 +07:00 committed by GitHub
parent 5d63d5c2d3
commit 318cd87a9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/ui/theme/dynamic_theme_builder.dart
View File

@ -23,46 +23,46 @@ class DynamicThemeBuilder extends StatelessWidget {
builder: (lightColorScheme, darkColorScheme) { builder: (lightColorScheme, darkColorScheme) {
final ThemeData lightDynamicTheme = ThemeData( final ThemeData lightDynamicTheme = ThemeData(
useMaterial3: true, useMaterial3: true,
canvasColor: lightColorScheme?.background, canvasColor: lightColorScheme?.surface,
navigationBarTheme: NavigationBarThemeData( navigationBarTheme: NavigationBarThemeData(
backgroundColor: lightColorScheme?.background, backgroundColor: lightColorScheme?.surface,
indicatorColor: lightColorScheme?.primary.withAlpha(150), indicatorColor: lightColorScheme?.secondaryContainer,
labelTextStyle: MaterialStateProperty.all( labelTextStyle: MaterialStateProperty.all(
GoogleFonts.roboto( GoogleFonts.roboto(
color: lightColorScheme?.secondary, color: lightColorScheme?.onSurface,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
iconTheme: MaterialStateProperty.all( iconTheme: MaterialStateProperty.all(
IconThemeData( IconThemeData(
color: lightColorScheme?.secondary, color: lightColorScheme?.onSecondaryContainer,
), ),
), ),
), ),
scaffoldBackgroundColor: lightColorScheme?.background, scaffoldBackgroundColor: lightColorScheme?.surface,
colorScheme: lightColorScheme?.harmonized(), colorScheme: lightColorScheme?.harmonized(),
toggleableActiveColor: lightColorScheme?.primary, toggleableActiveColor: lightColorScheme?.primary,
textTheme: GoogleFonts.robotoTextTheme(ThemeData.light().textTheme), textTheme: GoogleFonts.robotoTextTheme(ThemeData.light().textTheme),
); );
final ThemeData darkDynamicTheme = ThemeData( final ThemeData darkDynamicTheme = ThemeData(
useMaterial3: true, useMaterial3: true,
canvasColor: darkColorScheme?.background, canvasColor: darkColorScheme?.surface,
navigationBarTheme: NavigationBarThemeData( navigationBarTheme: NavigationBarThemeData(
backgroundColor: darkColorScheme?.background, backgroundColor: darkColorScheme?.surface,
indicatorColor: darkColorScheme?.primary.withOpacity(0.4), indicatorColor: darkColorScheme?.secondaryContainer,
labelTextStyle: MaterialStateProperty.all( labelTextStyle: MaterialStateProperty.all(
GoogleFonts.roboto( GoogleFonts.roboto(
color: darkColorScheme?.secondary, color: darkColorScheme?.onSurface,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
), ),
iconTheme: MaterialStateProperty.all( iconTheme: MaterialStateProperty.all(
IconThemeData( IconThemeData(
color: darkColorScheme?.secondary, color: darkColorScheme?.onSecondaryContainer,
), ),
), ),
), ),
scaffoldBackgroundColor: darkColorScheme?.background, scaffoldBackgroundColor: darkColorScheme?.surface,
colorScheme: darkColorScheme?.harmonized(), colorScheme: darkColorScheme?.harmonized(),
toggleableActiveColor: darkColorScheme?.primary, toggleableActiveColor: darkColorScheme?.primary,
textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme), textTheme: GoogleFonts.robotoTextTheme(ThemeData.dark().textTheme),
@ -90,4 +90,4 @@ class DynamicThemeBuilder extends StatelessWidget {
}, },
); );
} }
} }

2
lib/ui/widgets/settingsView/custom_switch.dart
View File

@ -44,7 +44,7 @@ class CustomSwitch extends StatelessWidget {
shape: BoxShape.circle, shape: BoxShape.circle,
color: value color: value
? Theme.of(context).colorScheme.primaryContainer ? Theme.of(context).colorScheme.primaryContainer
: Colors.white, : Theme.of(context).colorScheme.surface,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black12.withOpacity(0.1), color: Colors.black12.withOpacity(0.1),