fix color issues with new app colors

This commit is contained in:
Fabian Freund
2026-01-13 19:07:42 +01:00
parent 93c6fbfbcb
commit d561dec5e0
3 changed files with 17 additions and 7 deletions
+9
View File
@@ -6,6 +6,7 @@ class AppColors extends ThemeExtension<AppColors> {
this.seedColor = const Color(0xFF167C80),
this.privateTabPurple = const Color(0xFF8000D7),
this.privateTabBackground = const Color(0xFF25003E),
this.privateTabForeground = const Color(0xFFFFFFFF),
this.privateSelectionOverlay = const Color(0x648000D7),
this.torPurple = const Color(0xFF7D4698),
this.torActiveGreen = const Color(0xFF68B030),
@@ -15,6 +16,7 @@ class AppColors extends ThemeExtension<AppColors> {
final Color seedColor;
final Color privateTabPurple;
final Color privateTabBackground;
final Color privateTabForeground;
final Color privateSelectionOverlay;
final Color torPurple;
final Color torActiveGreen;
@@ -28,6 +30,7 @@ class AppColors extends ThemeExtension<AppColors> {
Color? seedColor,
Color? privateTabPurple,
Color? privateTabBackground,
Color? privateTabForeground,
Color? privateSelectionOverlay,
Color? torPurple,
Color? torActiveGreen,
@@ -37,6 +40,7 @@ class AppColors extends ThemeExtension<AppColors> {
seedColor: seedColor ?? this.seedColor,
privateTabPurple: privateTabPurple ?? this.privateTabPurple,
privateTabBackground: privateTabBackground ?? this.privateTabBackground,
privateTabForeground: privateTabForeground ?? this.privateTabForeground,
privateSelectionOverlay:
privateSelectionOverlay ?? this.privateSelectionOverlay,
torPurple: torPurple ?? this.torPurple,
@@ -63,6 +67,11 @@ class AppColors extends ThemeExtension<AppColors> {
other.privateTabBackground,
t,
)!,
privateTabForeground: Color.lerp(
privateTabForeground,
other.privateTabForeground,
t,
)!,
privateSelectionOverlay: Color.lerp(
privateSelectionOverlay,
other.privateSelectionOverlay,
@@ -580,7 +580,7 @@ class _SheetContainer extends HookConsumerWidget {
ref.read(bottomSheetControllerProvider.notifier).requestDismiss();
},
child: ColoredBox(
color: colorScheme.scrim,
color: colorScheme.scrim.withValues(alpha: 0.5),
child: GestureDetector(
onTap: () {}, // Prevent tap from propagating to parent
child: Align(
@@ -26,7 +26,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:nullability/nullability.dart';
import 'package:weblibre/core/design/app_colors.dart';
import 'package:weblibre/features/geckoview/domain/entities/states/tab.dart';
import 'package:weblibre/presentation/widgets/non_focusable.dart';
import 'package:weblibre/features/geckoview/domain/providers/tab_state.dart';
import 'package:weblibre/features/geckoview/domain/repositories/tab.dart';
import 'package:weblibre/features/geckoview/features/browser/presentation/widgets/tab_icon.dart';
@@ -34,6 +33,7 @@ import 'package:weblibre/features/geckoview/features/find_in_page/domain/entitie
import 'package:weblibre/features/geckoview/features/find_in_page/presentation/controllers/find_in_page.dart';
import 'package:weblibre/features/geckoview/features/tabs/domain/repositories/tab.dart';
import 'package:weblibre/presentation/hooks/menu_controller.dart';
import 'package:weblibre/presentation/widgets/non_focusable.dart';
import 'package:weblibre/presentation/widgets/uri_breadcrumb.dart';
import 'package:weblibre/utils/ui_helper.dart' as ui_helper;
@@ -99,7 +99,6 @@ class GridTabPreview extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final colorScheme = Theme.of(context).colorScheme;
final appColors = AppColors.of(context);
final tabState =
@@ -132,7 +131,7 @@ class GridTabPreview extends HookConsumerWidget {
tabState.titleOrAuthority,
maxLines: 2,
style: tabState.isPrivate
? TextStyle(color: colorScheme.onSurface)
? TextStyle(color: appColors.privateTabForeground)
: null,
),
),
@@ -185,7 +184,9 @@ class GridTabPreview extends HookConsumerWidget {
child: Text(
tabState.url.authority,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: tabState.isPrivate ? colorScheme.onSurface : null,
color: tabState.isPrivate
? appColors.privateTabForeground
: null,
),
),
),
@@ -305,7 +306,7 @@ class ListTabPreview extends HookConsumerWidget {
tabState.titleOrAuthority,
maxLines: 2,
style: tabState.isPrivate
? TextStyle(color: colorScheme.onSurface)
? TextStyle(color: appColors.privateTabForeground)
: null,
),
subtitle: Row(
@@ -323,7 +324,7 @@ class ListTabPreview extends HookConsumerWidget {
uri: tabState.url,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: tabState.isPrivate
? colorScheme.onSurface
? appColors.privateTabForeground
: null,
),
),