Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve dark theme surface colour blending #1595

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Improve dark theme surface colour blending #1595

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1be254a
fix: increase surface colors in dark mode to better match previous ve…
hjiangsu Nov 8, 2024
5dc1e2b
fix: add primary colour blending for material you theme
hjiangsu Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import 'package:thunder/account/bloc/account_bloc.dart';
import 'package:thunder/community/bloc/anonymous_subscriptions_bloc.dart';
import 'package:thunder/community/bloc/community_bloc.dart';
import 'package:thunder/core/auth/bloc/auth_bloc.dart';
import 'package:thunder/core/database/connection/connection.dart';
import 'package:thunder/core/database/database.dart';
import 'package:thunder/core/database/migrations.dart';
import 'package:thunder/core/enums/local_settings.dart';
Expand Down Expand Up @@ -198,20 +197,31 @@ class _ThunderAppState extends State<ThunderApp> {

return DynamicColorBuilder(
builder: (lightColorScheme, darkColorScheme) {
ThemeData theme = FlexThemeData.light(useMaterial3: true, scheme: FlexScheme.values.byName(state.selectedTheme.name));
ThemeData darkTheme = FlexThemeData.dark(useMaterial3: true, scheme: FlexScheme.values.byName(state.selectedTheme.name), darkIsTrueBlack: state.themeType == ThemeType.pureBlack);
FlexScheme scheme = FlexScheme.values.byName(state.selectedTheme.name);

Color? darkThemeSurfaceColor = state.themeType == ThemeType.pureBlack ? null : Colors.black.lighten(8);

ThemeData theme = FlexThemeData.light(scheme: scheme);
ThemeData darkTheme = FlexThemeData.dark(
scheme: scheme,
darkIsTrueBlack: state.themeType == ThemeType.pureBlack,
surface: darkThemeSurfaceColor,
scaffoldBackground: darkThemeSurfaceColor,
appBarBackground: darkThemeSurfaceColor,
);

// Enable Material You theme
if (state.useMaterialYouTheme == true) {
theme = ThemeData(
colorScheme: lightColorScheme,
useMaterial3: true,
);

darkTheme = FlexThemeData.dark(
useMaterial3: true,
colorScheme: darkColorScheme,
darkIsTrueBlack: state.themeType == ThemeType.pureBlack,
surface: darkThemeSurfaceColor?.blend(darkColorScheme!.primary, 4),
scaffoldBackground: darkThemeSurfaceColor?.blend(darkColorScheme!.primary, 4),
appBarBackground: darkThemeSurfaceColor?.blend(darkColorScheme!.primary, 4),
);
}

Expand All @@ -221,12 +231,8 @@ class _ThunderAppState extends State<ThunderApp> {
TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
});

theme = theme.copyWith(
pageTransitionsTheme: pageTransitionsTheme,
);
darkTheme = darkTheme.copyWith(
pageTransitionsTheme: pageTransitionsTheme,
);
theme = theme.copyWith(pageTransitionsTheme: pageTransitionsTheme);
darkTheme = darkTheme.copyWith(pageTransitionsTheme: pageTransitionsTheme);

// Set navigation bar color on Android to be transparent
SystemChrome.setSystemUIOverlayStyle(
Expand Down
Loading