Move map visuals into theme tokens

2026-06-12 14:41:11 +07:00
parent 2853cc2581
commit 479dc25847
4 changed files with 134 additions and 48 deletions
@@ -557,8 +557,8 @@ class _TraitBar extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final controller = context.read<PlaceCubit>();
    final tokens = context.mapflowTokens;
+    final controller = context.read<PlaceCubit>();

    return SizedBox(
      height: 54,
@@ -801,6 +801,7 @@ class _AddExperienceFlowState extends State<AddExperienceFlow> {

  @override
  Widget build(BuildContext context) {
+    final tokens = context.mapflowTokens;
    final controller = context.read<PlaceCubit>();
    final informationProgress = (_informationUnits / _minimumInformationUnits)
        .clamp(0.0, 1.0);
@@ -854,7 +855,7 @@ class _AddExperienceFlowState extends State<AddExperienceFlow> {
    };

    return Scaffold(
-      backgroundColor: const Color(0xFF05030B),
+      backgroundColor: tokens.darkSurface,
      body: SafeArea(
        child: Padding(
          padding: EdgeInsets.fromLTRB(
@@ -893,6 +894,8 @@ class _IntroStep extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final tokens = context.mapflowTokens;
+
    return _StepLayout(
      body: Column(
        mainAxisAlignment: MainAxisAlignment.center,
@@ -902,17 +905,17 @@ class _IntroStep extends StatelessWidget {
            width: 70,
            height: 70,
            decoration: BoxDecoration(
-              color: const Color(0xFFE11D48),
-              borderRadius: BorderRadius.circular(8),
+              color: tokens.danger,
+              borderRadius: BorderRadius.circular(tokens.panelRadius),
            ),
-            child: const Icon(Icons.graphic_eq, color: Colors.white, size: 38),
+            child: Icon(Icons.graphic_eq, color: tokens.onDark, size: 38),
          ),
          const SizedBox(height: 22),
          Text(
            'Поделись ощущением от места голосом. Нужно быть в заведении или не дальше 50 м. Аудио обработаем и удалим.',
            textAlign: TextAlign.left,
            style: Theme.of(context).textTheme.titleLarge?.copyWith(
-              color: Colors.white,
+              color: tokens.onDark,
              fontWeight: FontWeight.w800,
              height: 1.18,
              letterSpacing: 0,
@@ -940,6 +943,8 @@ class _PlaceStep extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final tokens = context.mapflowTokens;
+
    return _StepLayout(
      body: Column(
        children: [
@@ -958,15 +963,15 @@ class _PlaceStep extends StatelessWidget {
              future: placesFuture,
              builder: (context, snapshot) {
                if (snapshot.connectionState != ConnectionState.done) {
-                  return const Center(
-                    child: CircularProgressIndicator(color: Color(0xFFFF2D75)),
+                  return Center(
+                    child: CircularProgressIndicator(color: tokens.voiceAccent),
                  );
                }
                if (snapshot.hasError) {
-                  return const Center(
+                  return Center(
                    child: Icon(
                      Icons.error_outline,
-                      color: Colors.white,
+                      color: tokens.onDark,
                      size: 42,
                    ),
                  );
@@ -978,15 +983,15 @@ class _PlaceStep extends StatelessWidget {
                    child: Column(
                      mainAxisSize: MainAxisSize.min,
                      children: [
-                        const Icon(
+                        Icon(
                          Icons.location_off_outlined,
-                          color: Colors.white,
+                          color: tokens.onDark,
                          size: 42,
                        ),
                        const SizedBox(height: 10),
                        Text(
                          'Нет мест в $radiusMetersм',
-                          style: const TextStyle(color: Colors.white),
+                          style: TextStyle(color: tokens.onDark),
                        ),
                      ],
                    ),
@@ -1028,13 +1033,14 @@ class _NearbyPlaceCard extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final primaryType = _formatType(place.googlePrimaryType);
+    final tokens = context.mapflowTokens;

    return Material(
-      color: const Color(0xFF15111D),
-      borderRadius: BorderRadius.circular(8),
+      color: tokens.darkSurfaceAlt,
+      borderRadius: BorderRadius.circular(tokens.panelRadius),
      child: InkWell(
        onTap: disabled ? null : onTap,
-        borderRadius: BorderRadius.circular(8),
+        borderRadius: BorderRadius.circular(tokens.panelRadius),
        child: Padding(
          padding: const EdgeInsets.all(14),
          child: Column(
@@ -1043,15 +1049,18 @@ class _NearbyPlaceCard extends StatelessWidget {
              Row(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
-                  const Icon(Icons.place_outlined, color: Colors.white70),
+                  Icon(
+                    Icons.place_outlined,
+                    color: tokens.onDark.withValues(alpha: 0.70),
+                  ),
                  const SizedBox(width: 10),
                  Expanded(
                    child: Text(
                      place.name,
                      maxLines: 2,
                      overflow: TextOverflow.ellipsis,
-                      style: const TextStyle(
-                        color: Colors.white,
+                      style: TextStyle(
+                        color: tokens.onDark,
                        fontWeight: FontWeight.w900,
                        height: 1.1,
                      ),
@@ -1090,19 +1099,23 @@ class _PlaceTypeChip extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final tokens = context.mapflowTokens;
+
    return DecoratedBox(
      decoration: BoxDecoration(
        color: primary
-            ? const Color(0xFFFF2D75)
-            : Colors.white.withValues(alpha: 0.12),
-        borderRadius: BorderRadius.circular(8),
+            ? tokens.voiceAccent
+            : tokens.onDark.withValues(alpha: 0.12),
+        borderRadius: BorderRadius.circular(tokens.panelRadius),
      ),
      child: Padding(
        padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 5),
        child: Text(
          label,
          style: TextStyle(
-            color: primary ? Colors.white : const Color(0xFFECE7F0),
+            color: primary
+                ? tokens.onDark
+                : tokens.onDark.withValues(alpha: 0.92),
            fontSize: 12,
            fontWeight: FontWeight.w700,
            height: 1,
@@ -1140,6 +1153,7 @@ class _VoiceStep extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final tokens = context.mapflowTokens;
    final canFinish = canContinue;

    return Column(
@@ -1158,11 +1172,11 @@ class _VoiceStep extends StatelessWidget {
        ],
        Expanded(child: _VoiceProgressGrid(progress: informationProgress)),
        if (!micAllowed)
-          const Padding(
-            padding: EdgeInsets.only(bottom: 10),
+          Padding(
+            padding: const EdgeInsets.only(bottom: 10),
            child: Icon(
              Icons.mic_off_outlined,
-              color: Color(0xFFFF7A90),
+              color: tokens.voiceAccentSoft,
              size: 22,
            ),
          ),
@@ -1249,6 +1263,8 @@ class _VoiceProgressCell extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final tokens = context.mapflowTokens;
+
    return AnimatedContainer(
      duration: const Duration(milliseconds: 180),
      curve: Curves.easeOutCubic,
@@ -1256,13 +1272,13 @@ class _VoiceProgressCell extends StatelessWidget {
      height: size,
      decoration: BoxDecoration(
        color: filled
-            ? const Color(0xFFFF2D75)
-            : Colors.white.withValues(alpha: 0.11),
+            ? tokens.voiceAccent
+            : tokens.onDark.withValues(alpha: 0.11),
        borderRadius: BorderRadius.circular(3),
        boxShadow: filled
            ? [
                BoxShadow(
-                  color: const Color(0xFFFF2D75).withValues(alpha: 0.34),
+                  color: tokens.voiceAccent.withValues(alpha: 0.34),
                  blurRadius: 12,
                  spreadRadius: 1,
                ),
@@ -1332,6 +1348,8 @@ class _VoiceRecordButtonState extends State<_VoiceRecordButton>

  @override
  Widget build(BuildContext context) {
+    final tokens = context.mapflowTokens;
+
    return SizedBox(
      width: 280,
      height: 280,
@@ -1355,7 +1373,7 @@ class _VoiceRecordButtonState extends State<_VoiceRecordButton>
                    decoration: BoxDecoration(
                      shape: BoxShape.circle,
                      border: Border.all(
-                        color: const Color(0xFFFF2D75).withValues(
+                        color: tokens.voiceAccent.withValues(
                          alpha: widget.isRecording
                              ? ((0.06 + level * 0.26) *
                                    (1 - ((pulse + offset) % 1)))
@@ -1373,8 +1391,8 @@ class _VoiceRecordButtonState extends State<_VoiceRecordButton>
                  value: widget.progress,
                  strokeWidth: 8,
                  strokeCap: StrokeCap.round,
-                  color: const Color(0xFFFF2D75),
-                  backgroundColor: Colors.white.withValues(alpha: 0.12),
+                  color: tokens.voiceAccent,
+                  backgroundColor: tokens.onDark.withValues(alpha: 0.12),
                ),
              ),
              child!,
@@ -1387,10 +1405,10 @@ class _VoiceRecordButtonState extends State<_VoiceRecordButton>
          child: FilledButton(
            onPressed: widget.enabled ? widget.onPressed : null,
            style: FilledButton.styleFrom(
-              backgroundColor: Colors.white,
-              foregroundColor: const Color(0xFF090613),
-              disabledBackgroundColor: Colors.white.withValues(alpha: 0.28),
-              disabledForegroundColor: Colors.white.withValues(alpha: 0.52),
+              backgroundColor: tokens.onDark,
+              foregroundColor: tokens.onVoiceControl,
+              disabledBackgroundColor: tokens.onDark.withValues(alpha: 0.28),
+              disabledForegroundColor: tokens.onDark.withValues(alpha: 0.52),
              shape: const CircleBorder(),
              padding: EdgeInsets.zero,
              elevation: 0,
@@ -1442,6 +1460,8 @@ class _StoryProgress extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final tokens = context.mapflowTokens;
+
    return Row(
      children: [
        Expanded(
@@ -1455,11 +1475,11 @@ class _StoryProgress extends StatelessWidget {
                    decoration: BoxDecoration(
                      color: index <= step
                          ? (dark
-                                ? const Color(0xFFFF2D75)
+                                ? tokens.voiceAccent
                                : Theme.of(context).colorScheme.primary)
                          : (dark
-                                ? Colors.white.withValues(alpha: 0.16)
-                                : const Color(0xFFE0D8CA)),
+                                ? tokens.onDark.withValues(alpha: 0.16)
+                                : tokens.mapPanelBorder),
                      borderRadius: BorderRadius.circular(99),
                    ),
                  ),