fix color issues with new app colors
This commit is contained in:
@@ -6,6 +6,7 @@ class AppColors extends ThemeExtension<AppColors> {
|
|||||||
this.seedColor = const Color(0xFF167C80),
|
this.seedColor = const Color(0xFF167C80),
|
||||||
this.privateTabPurple = const Color(0xFF8000D7),
|
this.privateTabPurple = const Color(0xFF8000D7),
|
||||||
this.privateTabBackground = const Color(0xFF25003E),
|
this.privateTabBackground = const Color(0xFF25003E),
|
||||||
|
this.privateTabForeground = const Color(0xFFFFFFFF),
|
||||||
this.privateSelectionOverlay = const Color(0x648000D7),
|
this.privateSelectionOverlay = const Color(0x648000D7),
|
||||||
this.torPurple = const Color(0xFF7D4698),
|
this.torPurple = const Color(0xFF7D4698),
|
||||||
this.torActiveGreen = const Color(0xFF68B030),
|
this.torActiveGreen = const Color(0xFF68B030),
|
||||||
@@ -15,6 +16,7 @@ class AppColors extends ThemeExtension<AppColors> {
|
|||||||
final Color seedColor;
|
final Color seedColor;
|
||||||
final Color privateTabPurple;
|
final Color privateTabPurple;
|
||||||
final Color privateTabBackground;
|
final Color privateTabBackground;
|
||||||
|
final Color privateTabForeground;
|
||||||
final Color privateSelectionOverlay;
|
final Color privateSelectionOverlay;
|
||||||
final Color torPurple;
|
final Color torPurple;
|
||||||
final Color torActiveGreen;
|
final Color torActiveGreen;
|
||||||
@@ -28,6 +30,7 @@ class AppColors extends ThemeExtension<AppColors> {
|
|||||||
Color? seedColor,
|
Color? seedColor,
|
||||||
Color? privateTabPurple,
|
Color? privateTabPurple,
|
||||||
Color? privateTabBackground,
|
Color? privateTabBackground,
|
||||||
|
Color? privateTabForeground,
|
||||||
Color? privateSelectionOverlay,
|
Color? privateSelectionOverlay,
|
||||||
Color? torPurple,
|
Color? torPurple,
|
||||||
Color? torActiveGreen,
|
Color? torActiveGreen,
|
||||||
@@ -37,6 +40,7 @@ class AppColors extends ThemeExtension<AppColors> {
|
|||||||
seedColor: seedColor ?? this.seedColor,
|
seedColor: seedColor ?? this.seedColor,
|
||||||
privateTabPurple: privateTabPurple ?? this.privateTabPurple,
|
privateTabPurple: privateTabPurple ?? this.privateTabPurple,
|
||||||
privateTabBackground: privateTabBackground ?? this.privateTabBackground,
|
privateTabBackground: privateTabBackground ?? this.privateTabBackground,
|
||||||
|
privateTabForeground: privateTabForeground ?? this.privateTabForeground,
|
||||||
privateSelectionOverlay:
|
privateSelectionOverlay:
|
||||||
privateSelectionOverlay ?? this.privateSelectionOverlay,
|
privateSelectionOverlay ?? this.privateSelectionOverlay,
|
||||||
torPurple: torPurple ?? this.torPurple,
|
torPurple: torPurple ?? this.torPurple,
|
||||||
@@ -63,6 +67,11 @@ class AppColors extends ThemeExtension<AppColors> {
|
|||||||
other.privateTabBackground,
|
other.privateTabBackground,
|
||||||
t,
|
t,
|
||||||
)!,
|
)!,
|
||||||
|
privateTabForeground: Color.lerp(
|
||||||
|
privateTabForeground,
|
||||||
|
other.privateTabForeground,
|
||||||
|
t,
|
||||||
|
)!,
|
||||||
privateSelectionOverlay: Color.lerp(
|
privateSelectionOverlay: Color.lerp(
|
||||||
privateSelectionOverlay,
|
privateSelectionOverlay,
|
||||||
other.privateSelectionOverlay,
|
other.privateSelectionOverlay,
|
||||||
|
|||||||
@@ -580,7 +580,7 @@ class _SheetContainer extends HookConsumerWidget {
|
|||||||
ref.read(bottomSheetControllerProvider.notifier).requestDismiss();
|
ref.read(bottomSheetControllerProvider.notifier).requestDismiss();
|
||||||
},
|
},
|
||||||
child: ColoredBox(
|
child: ColoredBox(
|
||||||
color: colorScheme.scrim,
|
color: colorScheme.scrim.withValues(alpha: 0.5),
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
onTap: () {}, // Prevent tap from propagating to parent
|
onTap: () {}, // Prevent tap from propagating to parent
|
||||||
child: Align(
|
child: Align(
|
||||||
|
|||||||
+7
-6
@@ -26,7 +26,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|||||||
import 'package:nullability/nullability.dart';
|
import 'package:nullability/nullability.dart';
|
||||||
import 'package:weblibre/core/design/app_colors.dart';
|
import 'package:weblibre/core/design/app_colors.dart';
|
||||||
import 'package:weblibre/features/geckoview/domain/entities/states/tab.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/providers/tab_state.dart';
|
||||||
import 'package:weblibre/features/geckoview/domain/repositories/tab.dart';
|
import 'package:weblibre/features/geckoview/domain/repositories/tab.dart';
|
||||||
import 'package:weblibre/features/geckoview/features/browser/presentation/widgets/tab_icon.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/find_in_page/presentation/controllers/find_in_page.dart';
|
||||||
import 'package:weblibre/features/geckoview/features/tabs/domain/repositories/tab.dart';
|
import 'package:weblibre/features/geckoview/features/tabs/domain/repositories/tab.dart';
|
||||||
import 'package:weblibre/presentation/hooks/menu_controller.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/presentation/widgets/uri_breadcrumb.dart';
|
||||||
import 'package:weblibre/utils/ui_helper.dart' as ui_helper;
|
import 'package:weblibre/utils/ui_helper.dart' as ui_helper;
|
||||||
|
|
||||||
@@ -99,7 +99,6 @@ class GridTabPreview extends HookConsumerWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
final colorScheme = Theme.of(context).colorScheme;
|
|
||||||
final appColors = AppColors.of(context);
|
final appColors = AppColors.of(context);
|
||||||
|
|
||||||
final tabState =
|
final tabState =
|
||||||
@@ -132,7 +131,7 @@ class GridTabPreview extends HookConsumerWidget {
|
|||||||
tabState.titleOrAuthority,
|
tabState.titleOrAuthority,
|
||||||
maxLines: 2,
|
maxLines: 2,
|
||||||
style: tabState.isPrivate
|
style: tabState.isPrivate
|
||||||
? TextStyle(color: colorScheme.onSurface)
|
? TextStyle(color: appColors.privateTabForeground)
|
||||||
: null,
|
: null,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -185,7 +184,9 @@ class GridTabPreview extends HookConsumerWidget {
|
|||||||
child: Text(
|
child: Text(
|
||||||
tabState.url.authority,
|
tabState.url.authority,
|
||||||
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
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,
|
tabState.titleOrAuthority,
|
||||||
maxLines: 2,
|
maxLines: 2,
|
||||||
style: tabState.isPrivate
|
style: tabState.isPrivate
|
||||||
? TextStyle(color: colorScheme.onSurface)
|
? TextStyle(color: appColors.privateTabForeground)
|
||||||
: null,
|
: null,
|
||||||
),
|
),
|
||||||
subtitle: Row(
|
subtitle: Row(
|
||||||
@@ -323,7 +324,7 @@ class ListTabPreview extends HookConsumerWidget {
|
|||||||
uri: tabState.url,
|
uri: tabState.url,
|
||||||
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||||
color: tabState.isPrivate
|
color: tabState.isPrivate
|
||||||
? colorScheme.onSurface
|
? appColors.privateTabForeground
|
||||||
: null,
|
: null,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user