fixed warnings after update

2024-06-19 22:34:56 +02:00
parent ce02dda46c
commit 8860a0269c
46 changed files with 177 additions and 132 deletions
--- a/refilc_mobile_ui/lib/common/bottom_card.dart
+++ b/refilc_mobile_ui/lib/common/bottom_card.dart
@@ -14,7 +14,7 @@ class BottomCard extends StatelessWidget {
        child: Container(
          decoration: BoxDecoration(
            borderRadius: BorderRadius.circular(14.0),
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
          ),
          child: Column(
            mainAxisSize: MainAxisSize.min,
--- a/refilc_mobile_ui/lib/common/bottom_sheet_menu/rounded_bottom_sheet.dart
+++ b/refilc_mobile_ui/lib/common/bottom_sheet_menu/rounded_bottom_sheet.dart
@@ -22,7 +22,7 @@ class RoundedBottomSheet extends StatelessWidget {
    return AnimatedContainer(
      duration: const Duration(milliseconds: 500),
      decoration: BoxDecoration(
-        color: backgroundColor ?? Theme.of(context).colorScheme.background,
+        color: backgroundColor ?? Theme.of(context).colorScheme.surface,
        borderRadius: BorderRadius.only(
          topLeft: Radius.circular(borderRadius),
          topRight: Radius.circular(borderRadius),
--- a/refilc_mobile_ui/lib/common/filter_bar.dart
+++ b/refilc_mobile_ui/lib/common/filter_bar.dart
@@ -64,7 +64,7 @@ class _FilterBarState extends State<FilterBar> {
        color: Theme.of(context).colorScheme.tertiary.withOpacity(.2),
        borderRadius: BorderRadius.circular(45.0),
      ),
-      overlayColor: MaterialStateProperty.all(const Color(0x00000000)),
+      overlayColor: WidgetStateProperty.all(const Color(0x00000000)),
      // Tabs
      padding: EdgeInsets.zero,
      tabs: widget.censored
--- a/refilc_mobile_ui/lib/common/outlined_round_button.dart
+++ b/refilc_mobile_ui/lib/common/outlined_round_button.dart
@@ -22,7 +22,7 @@ class OutlinedRoundButton extends StatelessWidget {
        width: size,
        height: size,
        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.background,
+          color: Theme.of(context).colorScheme.surface,
          border: Border.all(
            color: Theme.of(context).colorScheme.secondary.withOpacity(0.1),
            width: 1.1,
--- a/refilc_mobile_ui/lib/common/panel/panel.dart
+++ b/refilc_mobile_ui/lib/common/panel/panel.dart
@@ -35,7 +35,7 @@ class Panel extends StatelessWidget {
              borderRadius: BorderRadius.circular(16.0),
              color: isTransparent
                  ? Colors.transparent
-                  : Theme.of(context).colorScheme.background,
+                  : Theme.of(context).colorScheme.surface,
              boxShadow: [
                if ((hasShadow && !isTransparent) &&
                    Provider.of<SettingsProvider>(context, listen: false)
@@ -87,7 +87,7 @@ class PanelHeader extends StatelessWidget {
      decoration: BoxDecoration(
        borderRadius: const BorderRadius.only(
            topLeft: Radius.circular(16.0), topRight: Radius.circular(16.0)),
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
        boxShadow: [
          if (Provider.of<SettingsProvider>(context, listen: false)
              .shadowEffect)
@@ -113,7 +113,7 @@ class PanelBody extends StatelessWidget {
    return Container(
      width: double.infinity,
      decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
        boxShadow: [
          if (Provider.of<SettingsProvider>(context, listen: false)
              .shadowEffect)
@@ -144,7 +144,7 @@ class PanelFooter extends StatelessWidget {
        borderRadius: const BorderRadius.only(
            bottomLeft: Radius.circular(16.0),
            bottomRight: Radius.circular(16.0)),
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
        boxShadow: [
          if (Provider.of<SettingsProvider>(context, listen: false)
              .shadowEffect)
--- a/refilc_mobile_ui/lib/common/sliding_bottom_sheet.dart
+++ b/refilc_mobile_ui/lib/common/sliding_bottom_sheet.dart
@@ -9,7 +9,7 @@ void showSlidingBottomSheet(
              cornerRadius: 16,
              cornerRadiusOnFullscreen: 0,
              avoidStatusBar: true,
-              color: Theme.of(context).colorScheme.background,
+              color: Theme.of(context).colorScheme.surface,
              duration: const Duration(milliseconds: 400),
              snapSpec: const ss.SnapSpec(
                snap: true,
@@ -18,7 +18,7 @@ void showSlidingBottomSheet(
              ),
              headerBuilder: (context, state) {
                return Material(
-                  color: Theme.of(context).colorScheme.background,
+                  color: Theme.of(context).colorScheme.surface,
                  child: Column(
                    mainAxisSize: MainAxisSize.min,
                    children: [
@@ -37,7 +37,7 @@ void showSlidingBottomSheet(
              },
              builder: (context, state) {
                return Material(
-                  color: Theme.of(context).colorScheme.background,
+                  color: Theme.of(context).colorScheme.surface,
                  child: Padding(
                      padding: const EdgeInsets.fromLTRB(12.0, 0, 12.0, 8.0),
                      child: child),
--- a/refilc_mobile_ui/lib/common/splitted_panel/splitted_panel.dart
+++ b/refilc_mobile_ui/lib/common/splitted_panel/splitted_panel.dart
@@ -46,7 +46,7 @@ class SplittedPanel extends StatelessWidget {
          decoration: BoxDecoration(
            color: isTransparent
                ? Colors.transparent
-                : Theme.of(context).colorScheme.background,
+                : Theme.of(context).colorScheme.surface,
            borderRadius: BorderRadius.vertical(
              top: Radius.circular(i == 0 ? 16.0 : 8.0),
              bottom: Radius.circular(children!.length == i + 1 ? 16.0 : 8.0),
--- a/refilc_mobile_ui/lib/common/viewable.dart
+++ b/refilc_mobile_ui/lib/common/viewable.dart
@@ -10,7 +10,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';

-double valueFromPercentageInRange({required final double min, max, percentage}) {
+double valueFromPercentageInRange(
+    {required final double min, max, percentage}) {
  return percentage * (max - min) + min;
 }

@@ -44,7 +45,8 @@ typedef _ViewablePreviewBuilderChildless = Widget Function(

 Rect _getRect(GlobalKey globalKey) {
  assert(globalKey.currentContext != null);
-  final RenderBox renderBoxContainer = globalKey.currentContext!.findRenderObject()! as RenderBox;
+  final RenderBox renderBoxContainer =
+      globalKey.currentContext!.findRenderObject()! as RenderBox;
  final Offset containerOffset = renderBoxContainer.localToGlobal(
    renderBoxContainer.paintBounds.topLeft,
  );
@@ -101,7 +103,8 @@ class _ViewableState extends State<Viewable> with TickerProviderStateMixin {
    final double screenWidth = MediaQuery.of(context).size.width;

    final double center = screenWidth / 2;
-    final bool centerDividesChild = childRect.left < center && childRect.right > center;
+    final bool centerDividesChild =
+        childRect.left < center && childRect.right > center;
    final double distanceFromCenter = (center - childRect.center.dx).abs();
    if (centerDividesChild && distanceFromCenter <= childRect.width / 4) {
      return _ViewableLocation.center;
@@ -132,7 +135,7 @@ class _ViewableState extends State<Viewable> with TickerProviderStateMixin {
        return ClipRRect(
          borderRadius: BorderRadius.circular(16.0),
          child: Material(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
            borderRadius: BorderRadius.circular(16.0),
            child: Stack(
              children: [
@@ -270,7 +273,8 @@ class _DecoyChild extends StatefulWidget {
  _DecoyChildState createState() => _DecoyChildState();
 }

-class _DecoyChildState extends State<_DecoyChild> with TickerProviderStateMixin {
+class _DecoyChildState extends State<_DecoyChild>
+    with TickerProviderStateMixin {
  static const Color _lightModeMaskColor = Color(0xFF888888);
  static const Color _masklessColor = Color(0xFFFFFFFF);

@@ -327,7 +331,9 @@ class _DecoyChildState extends State<_DecoyChild> with TickerProviderStateMixin
  }

  Widget _buildAnimation(BuildContext context, Widget? child) {
-    final Color color = widget.controller.status == AnimationStatus.reverse ? _masklessColor : _mask.value;
+    final Color color = widget.controller.status == AnimationStatus.reverse
+        ? _masklessColor
+        : _mask.value;
    return Positioned.fromRect(
      rect: _rect.value!,
      child: ShaderMask(
@@ -373,7 +379,8 @@ class _ViewableRoute<T> extends PopupRoute<T> {

  static const Color _kModalBarrierColor = Color(0x6604040F);

-  static const Duration _kModalPopupTransitionDuration = Duration(milliseconds: 335);
+  static const Duration _kModalPopupTransitionDuration =
+      Duration(milliseconds: 335);

  final List<Widget> _actions;
  final _ViewablePreviewBuilderChildless? _builder;
@@ -396,7 +403,8 @@ class _ViewableRoute<T> extends PopupRoute<T> {
  static final RectTween _rectTween = RectTween();
  static final Animatable<Rect?> _rectAnimatable = _rectTween.chain(_curve);
  static final RectTween _rectTweenReverse = RectTween();
-  static final Animatable<Rect?> _rectAnimatableReverse = _rectTweenReverse.chain(
+  static final Animatable<Rect?> _rectAnimatableReverse =
+      _rectTweenReverse.chain(
    _curveReverse,
  );
  static final RectTween _sheetRectTween = RectTween();
@@ -407,10 +415,12 @@ class _ViewableRoute<T> extends PopupRoute<T> {
    _curveReverse,
  );
  static final Tween<double> _sheetScaleTween = Tween<double>();
-  static final Animatable<double> _sheetScaleAnimatable = _sheetScaleTween.chain(
+  static final Animatable<double> _sheetScaleAnimatable =
+      _sheetScaleTween.chain(
    _curve,
  );
-  static final Animatable<double> _sheetScaleAnimatableReverse = _sheetScaleTween.chain(
+  static final Animatable<double> _sheetScaleAnimatableReverse =
+      _sheetScaleTween.chain(
    _curveReverse,
  );
  final Tween<double> _opacityTween = Tween<double>(begin: 0.0, end: 1.0);
@@ -441,7 +451,8 @@ class _ViewableRoute<T> extends PopupRoute<T> {
    return offsetScaled & sizeScaled;
  }

-  static AlignmentDirectional getSheetAlignment(_ViewableLocation contextMenuLocation) {
+  static AlignmentDirectional getSheetAlignment(
+      _ViewableLocation contextMenuLocation) {
    switch (contextMenuLocation) {
      case _ViewableLocation.center:
        return AlignmentDirectional.topCenter;
@@ -452,17 +463,24 @@ class _ViewableRoute<T> extends PopupRoute<T> {
    }
  }

-  static Rect _getSheetRectBegin(Orientation? orientation, _ViewableLocation contextMenuLocation, Rect childRect, Rect sheetRect) {
+  static Rect _getSheetRectBegin(Orientation? orientation,
+      _ViewableLocation contextMenuLocation, Rect childRect, Rect sheetRect) {
    switch (contextMenuLocation) {
      case _ViewableLocation.center:
-        final Offset target = orientation == Orientation.portrait ? childRect.bottomCenter : childRect.topCenter;
+        final Offset target = orientation == Orientation.portrait
+            ? childRect.bottomCenter
+            : childRect.topCenter;
        final Offset centered = target - Offset(sheetRect.width / 2, 0.0);
        return centered & sheetRect.size;
      case _ViewableLocation.right:
-        final Offset target = orientation == Orientation.portrait ? childRect.bottomRight : childRect.topRight;
+        final Offset target = orientation == Orientation.portrait
+            ? childRect.bottomRight
+            : childRect.topRight;
        return (target - Offset(sheetRect.width, 0.0)) & sheetRect.size;
      case _ViewableLocation.left:
-        final Offset target = orientation == Orientation.portrait ? childRect.bottomLeft : childRect.topLeft;
+        final Offset target = orientation == Orientation.portrait
+            ? childRect.bottomLeft
+            : childRect.topLeft;
        return target & sheetRect.size;
    }
  }
@@ -478,7 +496,9 @@ class _ViewableRoute<T> extends PopupRoute<T> {
  }

  void _updateTweenRects() {
-    final Rect childRect = _scale == null ? _getRect(_childGlobalKey) : _getScaledRect(_childGlobalKey, _scale!);
+    final Rect childRect = _scale == null
+        ? _getRect(_childGlobalKey)
+        : _getScaledRect(_childGlobalKey, _scale!);
    _rectTween.begin = _previousChildRect;
    _rectTween.end = childRect;

@@ -546,21 +566,29 @@ class _ViewableRoute<T> extends PopupRoute<T> {
  }

  @override
-  Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) {
+  Widget buildPage(BuildContext context, Animation<double> animation,
+      Animation<double> secondaryAnimation) {
    return Container();
  }

  @override
-  Widget buildTransitions(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) {
+  Widget buildTransitions(BuildContext context, Animation<double> animation,
+      Animation<double> secondaryAnimation, Widget child) {
    return OrientationBuilder(
      builder: (BuildContext context, Orientation orientation) {
        _lastOrientation = orientation;

        if (!animation.isCompleted) {
          final bool reverse = animation.status == AnimationStatus.reverse;
-          final Rect rect = reverse ? _rectAnimatableReverse.evaluate(animation)! : _rectAnimatable.evaluate(animation)!;
-          final Rect sheetRect = reverse ? _sheetRectAnimatableReverse.evaluate(animation)! : _sheetRectAnimatable.evaluate(animation)!;
-          final double sheetScale = reverse ? _sheetScaleAnimatableReverse.evaluate(animation) : _sheetScaleAnimatable.evaluate(animation);
+          final Rect rect = reverse
+              ? _rectAnimatableReverse.evaluate(animation)!
+              : _rectAnimatable.evaluate(animation)!;
+          final Rect sheetRect = reverse
+              ? _sheetRectAnimatableReverse.evaluate(animation)!
+              : _sheetRectAnimatable.evaluate(animation)!;
+          final double sheetScale = reverse
+              ? _sheetScaleAnimatableReverse.evaluate(animation)
+              : _sheetScaleAnimatable.evaluate(animation);
          return Stack(
            children: <Widget>[
              Positioned.fromRect(
@@ -623,7 +651,8 @@ class _ContextMenuRouteStatic extends StatefulWidget {
  _ContextMenuRouteStaticState createState() => _ContextMenuRouteStaticState();
 }

-class _ContextMenuRouteStaticState extends State<_ContextMenuRouteStatic> with TickerProviderStateMixin {
+class _ContextMenuRouteStaticState extends State<_ContextMenuRouteStatic>
+    with TickerProviderStateMixin {
  static const double _kMinScale = 0.8;

  static const double _kSheetScaleThreshold = 0.9;
@@ -639,7 +668,8 @@ class _ContextMenuRouteStaticState extends State<_ContextMenuRouteStatic> with T
  late Animation<double> _sheetScaleAnimation;
  late Animation<double> _sheetOpacityAnimation;

-  static double _getScale(Orientation orientation, double maxDragDistance, double dy) {
+  static double _getScale(
+      Orientation orientation, double maxDragDistance, double dy) {
    final double dyDirectional = dy <= 0.0 ? dy : -dy;
    return math.max(
      _kMinScale,
@@ -659,11 +689,13 @@ class _ContextMenuRouteStaticState extends State<_ContextMenuRouteStatic> with T
  void _onPanEnd(DragEndDetails details) {
    if (details.velocity.pixelsPerSecond.dy.abs() >= kMinFlingVelocity) {
      final bool flingIsAway = details.velocity.pixelsPerSecond.dy > 0;
-      final double finalPosition = flingIsAway ? _moveAnimation.value.dy + 100.0 : 0.0;
+      final double finalPosition =
+          flingIsAway ? _moveAnimation.value.dy + 100.0 : 0.0;

      if (flingIsAway && _sheetController.status != AnimationStatus.forward) {
        _sheetController.forward();
-      } else if (!flingIsAway && _sheetController.status != AnimationStatus.reverse) {
+      } else if (!flingIsAway &&
+          _sheetController.status != AnimationStatus.reverse) {
        _sheetController.reverse();
      }

@@ -713,20 +745,29 @@ class _ContextMenuRouteStaticState extends State<_ContextMenuRouteStatic> with T
    widget.onDismiss!(context, _lastScale, _sheetOpacityAnimation.value);
  }

-  Alignment _getChildAlignment(Orientation orientation, _ViewableLocation contextMenuLocation) {
+  Alignment _getChildAlignment(
+      Orientation orientation, _ViewableLocation contextMenuLocation) {
    switch (contextMenuLocation) {
      case _ViewableLocation.center:
-        return orientation == Orientation.portrait ? Alignment.bottomCenter : Alignment.topRight;
+        return orientation == Orientation.portrait
+            ? Alignment.bottomCenter
+            : Alignment.topRight;
      case _ViewableLocation.right:
-        return orientation == Orientation.portrait ? Alignment.bottomCenter : Alignment.topLeft;
+        return orientation == Orientation.portrait
+            ? Alignment.bottomCenter
+            : Alignment.topLeft;
      case _ViewableLocation.left:
-        return orientation == Orientation.portrait ? Alignment.bottomCenter : Alignment.topRight;
+        return orientation == Orientation.portrait
+            ? Alignment.bottomCenter
+            : Alignment.topRight;
    }
  }

  void _setDragOffset(Offset dragOffset) {
    final double endX = _kPadding * dragOffset.dx / _kDamping;
-    final double endY = dragOffset.dy >= 0.0 ? dragOffset.dy : _kPadding * dragOffset.dy / _kDamping;
+    final double endY = dragOffset.dy >= 0.0
+        ? dragOffset.dy
+        : _kPadding * dragOffset.dy / _kDamping;
    setState(() {
      _dragOffset = dragOffset;
      _moveAnimation = Tween<Offset>(
@@ -742,15 +783,20 @@ class _ContextMenuRouteStaticState extends State<_ContextMenuRouteStatic> with T
        ),
      );

-      if (_lastScale <= _kSheetScaleThreshold && _sheetController.status != AnimationStatus.forward && _sheetScaleAnimation.value != 0.0) {
+      if (_lastScale <= _kSheetScaleThreshold &&
+          _sheetController.status != AnimationStatus.forward &&
+          _sheetScaleAnimation.value != 0.0) {
        _sheetController.forward();
-      } else if (_lastScale > _kSheetScaleThreshold && _sheetController.status != AnimationStatus.reverse && _sheetScaleAnimation.value != 1.0) {
+      } else if (_lastScale > _kSheetScaleThreshold &&
+          _sheetController.status != AnimationStatus.reverse &&
+          _sheetScaleAnimation.value != 1.0) {
        _sheetController.reverse();
      }
    });
  }

-  List<Widget> _getChildren(Orientation orientation, _ViewableLocation contextMenuLocation) {
+  List<Widget> _getChildren(
+      Orientation orientation, _ViewableLocation contextMenuLocation) {
    final Expanded child = Expanded(
      child: Align(
        alignment: _getChildAlignment(
@@ -781,7 +827,9 @@ class _ContextMenuRouteStaticState extends State<_ContextMenuRouteStatic> with T
      case _ViewableLocation.center:
        return <Widget>[child, spacer, sheet];
      case _ViewableLocation.right:
-        return orientation == Orientation.portrait ? <Widget>[child, spacer, sheet] : <Widget>[sheet, spacer, child];
+        return orientation == Orientation.portrait
+            ? <Widget>[child, spacer, sheet]
+            : <Widget>[sheet, spacer, child];
      case _ViewableLocation.left:
        return <Widget>[child, spacer, sheet];
    }
@@ -915,7 +963,8 @@ class _ViewableSheet extends StatelessWidget {
                  decoration: BoxDecoration(
                    border: Border(
                        top: BorderSide(
-                      color: CupertinoDynamicColor.resolve(_borderColor, context),
+                      color:
+                          CupertinoDynamicColor.resolve(_borderColor, context),
                      width: 0.5,
                    )),
                  ),
--- a/refilc_mobile_ui/lib/common/widgets/cretification/certification_tile.dart
+++ b/refilc_mobile_ui/lib/common/widgets/cretification/certification_tile.dart
@@ -59,7 +59,7 @@ class CertificationTile extends StatelessWidget {
    }

    return Material(
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
      borderRadius: BorderRadius.circular(8.0),
      child: Padding(
        padding: padding ?? const EdgeInsets.symmetric(horizontal: 8.0),
--- a/refilc_mobile_ui/lib/common/widgets/custom_segmented_control.dart
+++ b/refilc_mobile_ui/lib/common/widgets/custom_segmented_control.dart
@@ -38,7 +38,7 @@ class CustomSegmentedControl extends StatelessWidget {
        borderRadius: BorderRadius.circular(12.0),
      ),
      thumbDecoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
        borderRadius: BorderRadius.circular(10.0),
        // boxShadow: [
        //   BoxShadow(
--- a/refilc_mobile_ui/lib/common/widgets/event/event_tile.dart
+++ b/refilc_mobile_ui/lib/common/widgets/event/event_tile.dart
@@ -13,7 +13,7 @@ class EventTile extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Material(
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
      borderRadius: BorderRadius.circular(14.0),
      child: Padding(
        padding: padding ?? const EdgeInsets.symmetric(horizontal: 8.0),
--- a/refilc_mobile_ui/lib/common/widgets/exam/exam_viewable.dart
+++ b/refilc_mobile_ui/lib/common/widgets/exam/exam_viewable.dart
@@ -208,7 +208,7 @@ class ExamPopup extends StatelessWidget {
                  Container(
                    width: double.infinity,
                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.background,
+                      color: Theme.of(context).colorScheme.surface,
                      borderRadius: const BorderRadius.vertical(
                          top: Radius.circular(12.0),
                          bottom: Radius.circular(6.0)),
@@ -266,7 +266,7 @@ class ExamPopup extends StatelessWidget {
                    Container(
                      width: double.infinity,
                      decoration: BoxDecoration(
-                        color: Theme.of(context).colorScheme.background,
+                        color: Theme.of(context).colorScheme.surface,
                        borderRadius: const BorderRadius.vertical(
                            top: Radius.circular(6.0),
                            bottom: Radius.circular(12.0)),
@@ -348,7 +348,7 @@ class ExamPopup extends StatelessWidget {
                  //   child: Container(
                  //     width: double.infinity,
                  //     decoration: BoxDecoration(
-                  //       color: Theme.of(context).colorScheme.background,
+                  //       color: Theme.of(context).colorScheme.surface,
                  //       borderRadius: BorderRadius.circular(12.0),
                  //     ),
                  //     padding: const EdgeInsets.all(16.0),
--- a/refilc_mobile_ui/lib/common/widgets/lesson/changed_lesson_tile.dart
+++ b/refilc_mobile_ui/lib/common/widgets/lesson/changed_lesson_tile.dart
@@ -34,7 +34,7 @@ class ChangedLessonTile extends StatelessWidget {
    }

    return Material(
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
      borderRadius: BorderRadius.circular(14.0),
      child: Padding(
        padding: padding ?? const EdgeInsets.symmetric(horizontal: 8.0),
--- a/refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart
+++ b/refilc_mobile_ui/lib/common/widgets/lesson/lesson_viewable.dart
@@ -417,7 +417,7 @@ class TimetableLessonPopup extends StatelessWidget {
                  Container(
                    width: double.infinity,
                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.background,
+                      color: Theme.of(context).colorScheme.surface,
                      borderRadius: const BorderRadius.vertical(
                        top: Radius.circular(12.0),
                        bottom: Radius.circular(6.0),
@@ -521,7 +521,7 @@ class TimetableLessonPopup extends StatelessWidget {
                    Container(
                      width: double.infinity,
                      decoration: BoxDecoration(
-                        color: Theme.of(context).colorScheme.background,
+                        color: Theme.of(context).colorScheme.surface,
                        borderRadius: const BorderRadius.vertical(
                          top: Radius.circular(6.0),
                          bottom: Radius.circular(6.0),
@@ -549,7 +549,7 @@ class TimetableLessonPopup extends StatelessWidget {
                  Container(
                    width: double.infinity,
                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.background,
+                      color: Theme.of(context).colorScheme.surface,
                      borderRadius: BorderRadius.vertical(
                        top: const Radius.circular(6.0),
                        bottom: lesson.exam != ''
@@ -580,7 +580,7 @@ class TimetableLessonPopup extends StatelessWidget {
                    Container(
                      width: double.infinity,
                      decoration: BoxDecoration(
-                        color: Theme.of(context).colorScheme.background,
+                        color: Theme.of(context).colorScheme.surface,
                        borderRadius: const BorderRadius.vertical(
                            top: Radius.circular(6.0),
                            bottom: Radius.circular(12.0)),
@@ -654,7 +654,7 @@ class TimetableLessonPopup extends StatelessWidget {
                  //   child: Container(
                  //     width: double.infinity,
                  //     decoration: BoxDecoration(
-                  //       color: Theme.of(context).colorScheme.background,
+                  //       color: Theme.of(context).colorScheme.surface,
                  //       borderRadius: BorderRadius.circular(12.0),
                  //     ),
                  //     padding: const EdgeInsets.all(16.0),
--- a/refilc_mobile_ui/lib/common/widgets/message/message_viewable.dart
+++ b/refilc_mobile_ui/lib/common/widgets/message/message_viewable.dart
@@ -23,9 +23,9 @@ class MessageViewable extends StatelessWidget {
          RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
      closedShape:
          RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
-      middleColor: Theme.of(context).colorScheme.background,
+      middleColor: Theme.of(context).colorScheme.surface,
      openColor: Theme.of(context).scaffoldBackgroundColor,
-      closedColor: Theme.of(context).colorScheme.background,
+      closedColor: Theme.of(context).colorScheme.surface,
      transitionType: ContainerTransitionType.fadeThrough,
      transitionDuration: const Duration(milliseconds: 400),
      useRootNavigator: true,
--- a/refilc_mobile_ui/lib/common/widgets/statistics_tile.dart
+++ b/refilc_mobile_ui/lib/common/widgets/statistics_tile.dart
@@ -48,7 +48,7 @@ class StatisticsTile extends StatelessWidget {
      padding: const EdgeInsets.all(18.0),
      decoration: BoxDecoration(
        borderRadius: BorderRadius.circular(12.0),
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
        boxShadow: [
          if (Provider.of<SettingsProvider>(context, listen: false)
              .shadowEffect)