and so on
This commit is contained in:
@@ -18,6 +18,7 @@ import 'package:maibu_satabot_v2/features/v2/report/presentation/pages/report_pa
|
||||
import 'package:maibu_satabot_v2/features/v2/device_list/presentation/float_bar/view/float_bar_widget.dart';
|
||||
import 'package:maibu_satabot_v2/features/v2/device_list/presentation/float_bar/cubit/float_bar_setting_cubit.dart';
|
||||
import 'package:maibu_satabot_v2/core/di/injection.dart';
|
||||
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
|
||||
|
||||
class MainWrapper extends StatefulWidget {
|
||||
const MainWrapper({super.key});
|
||||
@@ -205,7 +206,9 @@ class _MainWrapperState extends State<MainWrapper> {
|
||||
],
|
||||
),
|
||||
bottomNavigationBar: Container(
|
||||
decoration: const BoxDecoration(color: Colors.white),
|
||||
decoration: BoxDecoration(
|
||||
color: context.appColors.cardBackground,
|
||||
),
|
||||
child: SafeArea(
|
||||
top: false,
|
||||
child: LayoutBuilder(
|
||||
@@ -217,15 +220,15 @@ class _MainWrapperState extends State<MainWrapper> {
|
||||
),
|
||||
padding: const EdgeInsets.symmetric(vertical: 2),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white,
|
||||
color: context.appColors.cardBackground,
|
||||
borderRadius: BorderRadius.circular(25),
|
||||
border: Border.all(
|
||||
color: const Color(0xFFE5E6EB),
|
||||
color: context.appColors.divider,
|
||||
width: 1,
|
||||
),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.05),
|
||||
color: context.appColors.cardShadow,
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
@@ -244,10 +247,10 @@ class _MainWrapperState extends State<MainWrapper> {
|
||||
width: 44,
|
||||
height: 44,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFF2F3F5),
|
||||
color: context.appColors.divider,
|
||||
shape: BoxShape.circle,
|
||||
border: Border.all(
|
||||
color: const Color(0xFFE5E6EB),
|
||||
color: context.appColors.divider,
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
@@ -274,8 +277,8 @@ class _MainWrapperState extends State<MainWrapper> {
|
||||
_getIconData(item.icon),
|
||||
size: 24,
|
||||
color: isSelected
|
||||
? const Color(0xFF1D2129)
|
||||
: const Color(0xFF86909C),
|
||||
? context.appColors.textPrimary
|
||||
: context.appColors.textTertiary,
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
@@ -283,8 +286,8 @@ class _MainWrapperState extends State<MainWrapper> {
|
||||
style: TextStyle(
|
||||
fontSize: 11,
|
||||
color: isSelected
|
||||
? const Color(0xFF1D2129)
|
||||
: const Color(0xFF86909C),
|
||||
? context.appColors.textPrimary
|
||||
: context.appColors.textTertiary,
|
||||
fontWeight: isSelected
|
||||
? FontWeight.w600
|
||||
: FontWeight.w400,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:maibu_satabot_v2/core/theme/AppTheme.dart';
|
||||
import 'package:maibu_satabot_v2/features/main_container/presentation/cubit/tab_config_cubit.dart';
|
||||
|
||||
class CustomBottomNavBar extends StatefulWidget {
|
||||
@@ -92,11 +93,11 @@ class _CustomBottomNavBarState extends State<CustomBottomNavBar>
|
||||
|
||||
return Container(
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white,
|
||||
color: context.appColors.cardBackground,
|
||||
borderRadius: const BorderRadius.vertical(top: Radius.circular(16)),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.05),
|
||||
color: context.appColors.cardShadow,
|
||||
blurRadius: 10,
|
||||
offset: const Offset(0, -2),
|
||||
),
|
||||
@@ -135,11 +136,11 @@ class _CustomBottomNavBarState extends State<CustomBottomNavBar>
|
||||
width: circleDiameter,
|
||||
height: circleDiameter,
|
||||
decoration: BoxDecoration(
|
||||
color: const Color(0xFFF5F5F5),
|
||||
color: context.appColors.divider,
|
||||
shape: BoxShape.circle,
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black.withOpacity(0.12),
|
||||
color: context.appColors.cardShadow,
|
||||
blurRadius: 8,
|
||||
spreadRadius: 1,
|
||||
offset: Offset.zero,
|
||||
@@ -174,7 +175,9 @@ class _CustomBottomNavBarState extends State<CustomBottomNavBar>
|
||||
children: [
|
||||
Icon(
|
||||
icon,
|
||||
color: isSelected ? Colors.black : const Color(0xFF666666),
|
||||
color: isSelected
|
||||
? context.appColors.textPrimary
|
||||
: context.appColors.textSecondary,
|
||||
size: 24,
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
@@ -182,7 +185,9 @@ class _CustomBottomNavBarState extends State<CustomBottomNavBar>
|
||||
label,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: isSelected ? Colors.black : const Color(0xFF666666),
|
||||
color: isSelected
|
||||
? context.appColors.textPrimary
|
||||
: context.appColors.textSecondary,
|
||||
fontWeight: isSelected ? FontWeight.w500 : FontWeight.w400,
|
||||
),
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user