mirror of
https://github.com/rzuasti/oott.git
synced 2026-07-08 19:21:54 +02:00
Polish frontend: design tokens, theming, AppBar titles, empty/loading states
Frontend usability and aesthetics pass across web and mobile: - Add shared layout tokens (theme/dimens.dart: Insets + Breakpoints) and replace magic-number spacing and per-file breakpoint consts. - Route both themes through buildAppTheme (theme/theme_builder.dart): explicit useMaterial3 and a shared branded textTheme (Barlow Condensed for display/headline/title styles); logo now reads its style from the theme. - Move screen titles into the shared AppBar (route-derived) and drop the redundant in-body headers; upgrade Settings buttons to M3 FilledButton. - Add reusable EmptyState and skeleton loaders; Devices empty state links to scanner status, notifications get filter-aware messages. - Add a first-run welcome intro and Save-disabled helper text in Settings. - Make device Filter/Sort adaptive: bottom sheet on phones, dialog on wide. - Collapse the device-list filter chips and Sort/Filter buttons into one row; rename the home Scanners card title and align its style. Tests: add EmptyState/skeleton widget tests and Settings first-run cases; update tests for the FilledButton swap and relocated titles. 89 passing, dart analyze clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
5f6f5ad679
commit
9367c359d7
@@ -1,30 +1,31 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'app_colors.dart';
|
||||
import 'theme_builder.dart';
|
||||
|
||||
abstract final class GruvboxColors {
|
||||
static const Color bgHard = Color(0xFF1d2021);
|
||||
static const Color bg = Color(0xFF282828);
|
||||
static const Color bgSoft = Color(0xFF32302f);
|
||||
static const Color bg1 = Color(0xFF3c3836);
|
||||
static const Color bg2 = Color(0xFF504945);
|
||||
static const Color bg3 = Color(0xFF665c54);
|
||||
static const Color bg4 = Color(0xFF7c6f64);
|
||||
static const Color fg = Color(0xFFebdbb2);
|
||||
static const Color fg2 = Color(0xFFd5c4a1);
|
||||
static const Color gray = Color(0xFF928374);
|
||||
static const Color red = Color(0xFFcc241d);
|
||||
static const Color brightRed = Color(0xFFfb4934);
|
||||
static const Color green = Color(0xFF98971a);
|
||||
static const Color brightGreen = Color(0xFFb8bb26);
|
||||
static const Color yellow = Color(0xFFd79921);
|
||||
static const Color bgHard = Color(0xFF1d2021);
|
||||
static const Color bg = Color(0xFF282828);
|
||||
static const Color bgSoft = Color(0xFF32302f);
|
||||
static const Color bg1 = Color(0xFF3c3836);
|
||||
static const Color bg2 = Color(0xFF504945);
|
||||
static const Color bg3 = Color(0xFF665c54);
|
||||
static const Color bg4 = Color(0xFF7c6f64);
|
||||
static const Color fg = Color(0xFFebdbb2);
|
||||
static const Color fg2 = Color(0xFFd5c4a1);
|
||||
static const Color gray = Color(0xFF928374);
|
||||
static const Color red = Color(0xFFcc241d);
|
||||
static const Color brightRed = Color(0xFFfb4934);
|
||||
static const Color green = Color(0xFF98971a);
|
||||
static const Color brightGreen = Color(0xFFb8bb26);
|
||||
static const Color yellow = Color(0xFFd79921);
|
||||
static const Color brightYellow = Color(0xFFfabd2f);
|
||||
static const Color blue = Color(0xFF458588);
|
||||
static const Color brightBlue = Color(0xFF83a598);
|
||||
static const Color purple = Color(0xFFb16286);
|
||||
static const Color blue = Color(0xFF458588);
|
||||
static const Color brightBlue = Color(0xFF83a598);
|
||||
static const Color purple = Color(0xFFb16286);
|
||||
static const Color brightPurple = Color(0xFFd3869b);
|
||||
static const Color aqua = Color(0xFF689d6a);
|
||||
static const Color brightAqua = Color(0xFF8ec07c);
|
||||
static const Color orange = Color(0xFFd65d0e);
|
||||
static const Color aqua = Color(0xFF689d6a);
|
||||
static const Color brightAqua = Color(0xFF8ec07c);
|
||||
static const Color orange = Color(0xFFd65d0e);
|
||||
static const Color brightOrange = Color(0xFFfe8019);
|
||||
}
|
||||
|
||||
@@ -32,59 +33,57 @@ const ColorScheme _gruvboxColorScheme = ColorScheme(
|
||||
brightness: Brightness.dark,
|
||||
|
||||
// Surfaces — AppBar (darkest) → NavRail → body (lightest)
|
||||
surface: GruvboxColors.bgSoft,
|
||||
surfaceContainerLowest: GruvboxColors.bgHard,
|
||||
surfaceContainerLow: GruvboxColors.bg,
|
||||
surfaceContainer: GruvboxColors.bg1,
|
||||
surfaceContainerHigh: GruvboxColors.bg1,
|
||||
surface: GruvboxColors.bgSoft,
|
||||
surfaceContainerLowest: GruvboxColors.bgHard,
|
||||
surfaceContainerLow: GruvboxColors.bg,
|
||||
surfaceContainer: GruvboxColors.bg1,
|
||||
surfaceContainerHigh: GruvboxColors.bg1,
|
||||
surfaceContainerHighest: GruvboxColors.bg2,
|
||||
onSurface: GruvboxColors.fg,
|
||||
onSurfaceVariant: GruvboxColors.fg2,
|
||||
outline: GruvboxColors.gray,
|
||||
outlineVariant: GruvboxColors.bg4,
|
||||
onSurface: GruvboxColors.fg,
|
||||
onSurfaceVariant: GruvboxColors.fg2,
|
||||
outline: GruvboxColors.gray,
|
||||
outlineVariant: GruvboxColors.bg4,
|
||||
|
||||
// Primary — Save button, selected nav indicators
|
||||
primary: GruvboxColors.brightOrange,
|
||||
onPrimary: GruvboxColors.bgHard,
|
||||
primaryContainer: GruvboxColors.bg1,
|
||||
primary: GruvboxColors.brightOrange,
|
||||
onPrimary: GruvboxColors.bgHard,
|
||||
primaryContainer: GruvboxColors.bg1,
|
||||
onPrimaryContainer: GruvboxColors.fg,
|
||||
|
||||
// Secondary — Test button (not-passing state)
|
||||
secondary: GruvboxColors.blue,
|
||||
onSecondary: GruvboxColors.fg,
|
||||
secondaryContainer: GruvboxColors.bg2,
|
||||
secondary: GruvboxColors.blue,
|
||||
onSecondary: GruvboxColors.fg,
|
||||
secondaryContainer: GruvboxColors.bg2,
|
||||
onSecondaryContainer: GruvboxColors.fg,
|
||||
|
||||
// Tertiary — swipe-to-unread background
|
||||
tertiary: GruvboxColors.aqua,
|
||||
onTertiary: GruvboxColors.bgHard,
|
||||
tertiaryContainer: GruvboxColors.bg1,
|
||||
tertiary: GruvboxColors.aqua,
|
||||
onTertiary: GruvboxColors.bgHard,
|
||||
tertiaryContainer: GruvboxColors.bg1,
|
||||
onTertiaryContainer: GruvboxColors.fg,
|
||||
|
||||
// Error
|
||||
error: GruvboxColors.brightRed,
|
||||
onError: GruvboxColors.bgHard,
|
||||
errorContainer: GruvboxColors.red,
|
||||
error: GruvboxColors.brightRed,
|
||||
onError: GruvboxColors.bgHard,
|
||||
errorContainer: GruvboxColors.red,
|
||||
onErrorContainer: GruvboxColors.fg,
|
||||
|
||||
// Inverse / scrim
|
||||
inverseSurface: GruvboxColors.fg,
|
||||
inverseSurface: GruvboxColors.fg,
|
||||
onInverseSurface: GruvboxColors.bgHard,
|
||||
inversePrimary: GruvboxColors.orange,
|
||||
scrim: GruvboxColors.bgHard,
|
||||
shadow: GruvboxColors.bgHard,
|
||||
inversePrimary: GruvboxColors.orange,
|
||||
scrim: GruvboxColors.bgHard,
|
||||
shadow: GruvboxColors.bgHard,
|
||||
);
|
||||
|
||||
final ThemeData gruvboxDarkTheme = ThemeData(
|
||||
final ThemeData gruvboxDarkTheme = buildAppTheme(
|
||||
colorScheme: _gruvboxColorScheme,
|
||||
extensions: [
|
||||
const AppColorExtension(
|
||||
success: GruvboxColors.brightGreen,
|
||||
onSuccess: GruvboxColors.bgHard,
|
||||
warning: GruvboxColors.brightYellow,
|
||||
onWarning: GruvboxColors.bgHard,
|
||||
info: GruvboxColors.brightBlue,
|
||||
onInfo: GruvboxColors.bgHard,
|
||||
),
|
||||
],
|
||||
appColors: const AppColorExtension(
|
||||
success: GruvboxColors.brightGreen,
|
||||
onSuccess: GruvboxColors.bgHard,
|
||||
warning: GruvboxColors.brightYellow,
|
||||
onWarning: GruvboxColors.bgHard,
|
||||
info: GruvboxColors.brightBlue,
|
||||
onInfo: GruvboxColors.bgHard,
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user