ammar/syncrow-app
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/syncrow-app.git synced 2025-08-26 09:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into energy_usage_charts

Browse Source
This commit is contained in:
Ammar Qaffaf
2024-02-29 05:04:35 -05:00
committed by GitHub
parent 1ed9c22e15 f67bd856ec
commit 3bc7ad6eaf
53 changed files with 651 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/features/app_layout/view/app_layout.dart
View File

@ -23,7 +23,7 @@ class AppLayout extends StatelessWidget {
child: Scaffold(
backgroundColor: ColorsManager.backgroundColor,
extendBodyBehindAppBar: true,
extendBody: true,
// extendBody: true,
appBar: DefaultAppBar(),
body: AppBody(),
bottomNavigationBar: DefaultNavBar(),

3
lib/features/app_layout/view/widgets/app_body.dart
View File

@ -26,8 +26,7 @@ class AppBody extends StatelessWidget {
),
),
child: Padding(
padding: const EdgeInsets.only(
top: 60, right: 15, left: 15, bottom: 100),
padding: const EdgeInsets.only(top: 60, right: 15, left: 15),
child: NavCubit.of(context).currentPage,
),
);

8
lib/features/app_layout/view/widgets/default_nav_bar.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_app/features/app_layout/bloc/nav_cubit.dart';
import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
class DefaultNavBar extends StatelessWidget {
@ -17,7 +18,12 @@ class DefaultNavBar extends StatelessWidget {
padding: const EdgeInsets.only(bottom: 27),
child: BottomNavigationBar(
backgroundColor: Colors.transparent,
onTap: (int index) => cubit.updatePageIndex(index, context),
onTap: (int index) {
cubit.updatePageIndex(index, context);
if (DevicesCubit.get(context).chosenCategoryView != null) {
Navigator.pop(context);
}
},
currentIndex: cubit.getPageIndex,
selectedItemColor: ColorsManager.primaryColor,
selectedLabelStyle: const TextStyle(

29
lib/features/devices/bloc/ac_cubit.dart
View File

@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:meta/meta.dart';
import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
@ -13,6 +14,20 @@ class AcCubit extends Cubit<AcState> {
static AcCubit get(context) => BlocProvider.of(context);
void selectAC(ACModel model) {
model.isSelected = !model.isSelected;
emit(ACSelected());
}
ACModel? getSelectedAC() {
for (var ac in DevicesCubit.categories[0].devices) {
if (ac.isSelected) {
return ac;
}
}
return null;
}
void turnACOn(ACModel model) {
if (!model.status) {
model.status = true;
@ -47,6 +62,7 @@ class AcCubit extends Cubit<AcState> {
for (var ac in DevicesCubit.categories[0].devices) {
ac.status = false;
}
updateACsStatus();
emit(SwitchACsOff());
}
@ -54,6 +70,7 @@ class AcCubit extends Cubit<AcState> {
for (var ac in DevicesCubit.categories[0].devices) {
ac.status = true;
}
updateACsStatus();
emit(SwitchACsOn());
}
@ -65,12 +82,6 @@ class AcCubit extends Cubit<AcState> {
emit(ACsTempChanged(temperature));
}
// void setACTemp(int index, double temperature) {
// DevicesCubit.categories[0].devices[index].temperature = temperature;
// averageTempForAll();
// emit(ACsTempChanged(temperature));
// }
void increaseACTemp(int index) {
DevicesCubit.categories[0].devices[index].temperature += .5;
averageTempForAll();
@ -83,6 +94,12 @@ class AcCubit extends Cubit<AcState> {
emit(ACsTempChanged(DevicesCubit.categories[0].devices[index].temperature));
}
void setACTemp(ACModel model, double temp) {
model.temperature = temp;
averageTempForAll();
emit(ACsTempChanged(temp));
}
double getTemp(int index) {
return DevicesCubit.categories[0].devices[index].temperature;
}

2
lib/features/devices/bloc/ac_state.dart
View File

@ -26,3 +26,5 @@ class ACsTempModeChanged extends AcState {}
class ACTurnedOn extends AcState {}
class ACTurnedOff extends AcState {}
class ACSelected extends AcState {}

8
lib/features/devices/bloc/devices_cubit.dart
View File

@ -8,7 +8,7 @@ import 'package:syncrow_app/features/devices/view/widgets/smart_door/door_view.d
import 'package:syncrow_app/generated/assets.dart';
import '../model/device_category_model.dart';
import '../view/widgets/ACs/ac_view.dart';
import '../view/widgets/ACs/acs_view.dart';
import '../view/widgets/lights/lights_view.dart';
part 'devices_state.dart';
@ -24,7 +24,6 @@ class DevicesCubit extends Cubit<DevicesState> {
device.status = category.devicesStatus;
}
emit(CategorySwitchChanged());
print('${category.name} switch value: ${category.devicesStatus} ');
}
static DevicesCubit get(context) => BlocProvider.of(context);
@ -52,7 +51,7 @@ class DevicesCubit extends Cubit<DevicesState> {
icon: Assets.iconsAC,
name: 'ACs',
type: DeviceType.AC,
page: const ACView(),
page: const ACsView(),
),
DevicesCategoryModel(
devices: [],
@ -124,6 +123,9 @@ class DevicesCubit extends Cubit<DevicesState> {
static void clearCategoriesSelection() {
for (var category in categories) {
category.isSelected = false;
for (var device in category.devices) {
device.isSelected = false;
}
}
}
}

2
lib/features/devices/model/ac_model.dart
View File

@ -8,6 +8,8 @@ class ACModel {
late int tempMode;
bool isSelected = false;
ACModel({
required this.name,
required this.id,

41
lib/features/devices/view/widgets/ACs/ac_interface.dart Normal file
View File

@ -0,0 +1,41 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:gap/gap.dart';
import 'package:syncrow_app/features/devices/model/ac_model.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_interface_controls.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_interface_temp_unit.dart';
class AcInterface extends StatelessWidget {
const AcInterface({super.key, required this.acModel});
final ACModel acModel;
@override
Widget build(BuildContext context) {
return SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Gap(20),
ConstrainedBox(
constraints: const BoxConstraints(
maxHeight: 400,
),
child: AcInterfaceTempUnit(
acModel: acModel,
),
),
ConstrainedBox(
constraints: const BoxConstraints(
maxHeight: 130,
),
child: AcInterfaceControls(
acModel: acModel,
),
),
],
),
);
}
}

58
lib/features/devices/view/widgets/ACs/ac_interface_controls.dart Normal file
View File

@ -0,0 +1,58 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:gap/gap.dart';
import 'package:syncrow_app/features/devices/model/ac_model.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_mode_control_unit.dart';
import 'package:syncrow_app/features/shared_widgets/default_container.dart';
import '../../../../../generated/assets.dart';
class AcInterfaceControls extends StatelessWidget {
const AcInterfaceControls({
super.key,
required this.acModel,
});
final ACModel acModel;
@override
Widget build(BuildContext context) {
return Expanded(
flex: 3,
child: Column(
children: [
const Gap(10),
ACModeControlUnit(model: acModel),
Gap(10),
Row(
children: [
Expanded(
child: InkWell(
onTap: () {},
child: DefaultContainer(
height: 55,
child: Center(
child: SvgPicture.asset(Assets.iconsAutomatedClock),
),
),
),
),
const Gap(10),
Expanded(
child: InkWell(
onTap: () {},
child: DefaultContainer(
height: 55,
child: Center(
child: SvgPicture.asset(Assets.iconsLock),
),
),
),
),
],
)
],
),
);
}
}

148
lib/features/devices/view/widgets/ACs/ac_interface_temp_unit.dart Normal file
View File

@ -0,0 +1,148 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:sleek_circular_slider/sleek_circular_slider.dart';
import 'package:syncrow_app/features/devices/bloc/ac_cubit.dart';
import 'package:syncrow_app/features/shared_widgets/default_container.dart';
import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
import 'package:syncrow_app/generated/assets.dart';
import 'package:syncrow_app/utils/context_extension.dart';
import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
import '../../../model/ac_model.dart';
class AcInterfaceTempUnit extends StatelessWidget {
const AcInterfaceTempUnit({
super.key,
required this.acModel,
});
final ACModel acModel;
@override
Widget build(BuildContext context) {
double coolTo = acModel.temperature;
return BlocBuilder<AcCubit, AcState>(
builder: (context, state) {
return DefaultContainer(
child: Column(
children: [
Expanded(
flex: 8,
child: SizedBox(
width: 300,
child: SleekCircularSlider(
appearance: CircularSliderAppearance(
customWidths: CustomSliderWidths(
progressBarWidth: 15,
trackWidth: 15,
shadowWidth: 0,
),
customColors: CustomSliderColors(
progressBarColor:
ColorsManager.primaryColor.withOpacity(.6),
trackColor: ColorsManager.greyColor,
dotColor: Colors.transparent,
),
infoProperties: InfoProperties(
bottomLabelText: 'CURRENT TEMP',
bottomLabelStyle: context.bodyLarge.copyWith(
color: Colors.grey,
fontWeight: FontsManager.regular,
),
modifier: (double value) {
return '${acModel.temperature.toStringAsFixed(1)}°C';
},
mainLabelStyle: context.titleLarge.copyWith(
height: 0,
letterSpacing: -3,
color: Colors.black,
fontSize: 60,
shadows: [
Shadow(
color: Colors.black.withOpacity(0.5),
offset: const Offset(0, 3),
blurRadius: 6,
),
],
),
),
),
min: 20,
max: 30,
initialValue: 20,
onChange: (value) {
String valueAsString = value.toStringAsFixed(1);
if (valueAsString.endsWith(".0") ||
valueAsString.endsWith(".5")) {
value = double.parse(valueAsString);
if (value != acModel.temperature) {
AcCubit.get(context).setTempToAll(value);
}
}
},
),
),
),
Expanded(
flex: 2,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
SizedBox.square(
dimension: 24,
child: InkWell(
onTap: () {
// AcCubit.get(context).setACTemp(acModel, coolTo - .5);
AcCubit.get(context).setACTemp(acModel, coolTo);
coolTo = coolTo - .5;
},
child: SvgPicture.asset(
Assets.iconsMinus,
),
),
),
Column(
children: [
BodyLarge(
text: "$coolTo° C",
style: context.bodyLarge.copyWith(
color:
ColorsManager.primaryColor.withOpacity(0.6),
fontWeight: FontsManager.bold,
fontSize: 30,
height: 0),
),
const BodyMedium(
text: 'COOL TO',
fontSize: 18,
)
],
),
SizedBox.square(
dimension: 24,
child: InkWell(
onTap: () {
// AcCubit.get(context).setACTemp(acModel, coolTo + .5);
AcCubit.get(context).setACTemp(acModel, coolTo);
coolTo = coolTo + .5;
},
child: SvgPicture.asset(
Assets.iconsPlus,
height: 24,
width: 24,
),
),
),
],
),
)
],
),
);
},
);
}
}

9
lib/features/devices/view/widgets/ACs/a_c_control_unit.dart → lib/features/devices/view/widgets/ACs/ac_mode_control_unit.dart
View File

@ -6,8 +6,8 @@ import 'package:syncrow_app/features/shared_widgets/default_container.dart';
import '../../../../../generated/assets.dart';
class ACControlUnit extends StatefulWidget {
const ACControlUnit({
class ACModeControlUnit extends StatefulWidget {
const ACModeControlUnit({
super.key,
required this.model,
});
@ -15,10 +15,10 @@ class ACControlUnit extends StatefulWidget {
final ACModel model;
@override
State<ACControlUnit> createState() => _ACControlUnitState();
State<ACModeControlUnit> createState() => _ACModeControlUnitState();
}
class _ACControlUnitState extends State<ACControlUnit> {
class _ACModeControlUnitState extends State<ACModeControlUnit> {
var fanSpeeds = [
Assets.iconsFan0,
Assets.iconsFan1,
@ -34,6 +34,7 @@ class _ACControlUnitState extends State<ACControlUnit> {
@override
Widget build(BuildContext context) {
//TODO Move the fanSpeeds and tempModes to the Cubit
return Row(
children: [
Expanded(

66
lib/features/devices/view/widgets/ACs/ac_temp_widget.dart Normal file
View File

@ -0,0 +1,66 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:syncrow_app/features/devices/bloc/ac_cubit.dart';
import 'package:syncrow_app/features/shared_widgets/default_container.dart';
import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
import 'package:syncrow_app/utils/context_extension.dart';
import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
import '../../../../../generated/assets.dart';
class ACTempWidget extends StatelessWidget {
const ACTempWidget(
this.index, {
super.key,
});
final int index;
@override
Widget build(BuildContext context) {
return BlocBuilder<AcCubit, AcState>(
builder: (context, state) {
return DefaultContainer(
height: 60,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
SizedBox.square(
dimension: 24,
child: InkWell(
onTap: () {
AcCubit.get(context).decreaseACTemp(index);
},
child: SvgPicture.asset(
Assets.iconsMinus,
),
),
),
BodyLarge(
text: "${AcCubit.get(context).getTemp(index)}° C",
style: context.bodyLarge.copyWith(
color: ColorsManager.primaryColor.withOpacity(0.6),
fontSize: 23,
),
),
SizedBox.square(
dimension: 24,
child: InkWell(
onTap: () {
AcCubit.get(context).increaseACTemp(index);
},
child: SvgPicture.asset(
Assets.iconsPlus,
height: 24,
width: 24,
),
),
),
],
),
);
},
);
}
}

72
lib/features/devices/view/widgets/ACs/ac_view.dart
View File

@ -1,72 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:gap/gap.dart';
import 'package:syncrow_app/features/devices/bloc/ac_cubit.dart';
import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/a_c_control_unit.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/universal_a_c_switch.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/universal_a_c_temp.dart';
import 'package:syncrow_app/features/devices/view/widgets/devices_temp_widget.dart';
import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart';
import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
class ACView extends StatelessWidget {
const ACView({super.key});
@override
Widget build(BuildContext context) {
return BlocProvider(
create: (context) => AcCubit(),
child: BlocBuilder<AcCubit, AcState>(
builder: (context, state) {
return SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// universal AC controller
const Gap(10),
const BodySmall(text: "All ACs"),
const Gap(5),
const UniversalACSwitch(),
const Gap(10),
const UniversalACTemp(),
const Gap(10),
// other ACs controller
ListView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.all(0),
itemCount: DevicesCubit.categories[0].devices.length,
itemBuilder: (context, index) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
BodySmall(
text:
DevicesCubit.categories[0].devices[index].name),
const Gap(5),
DevicesDefaultSwitch(
model: DevicesCubit.categories[0].devices[index],
),
const Gap(10),
DevicesTempWidget(
index,
),
const Gap(10),
ACControlUnit(
model: DevicesCubit.categories[0].devices[index],
),
const Gap(10),
],
);
},
),
],
),
);
},
),
);
}
}

87
lib/features/devices/view/widgets/ACs/acs_list.dart Normal file
View File

@ -0,0 +1,87 @@
import 'package:flutter/material.dart';
import 'package:gap/gap.dart';
import 'package:syncrow_app/features/devices/bloc/ac_cubit.dart';
import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_mode_control_unit.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_temp_widget.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/universal_ac_switch.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/universal_ac_temp.dart';
import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart';
import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
class ACsList extends StatelessWidget {
const ACsList({
super.key,
});
@override
Widget build(BuildContext context) {
return SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// universal AC controller
const Gap(10),
const BodySmall(text: "All ACs"),
const Gap(5),
const UniversalACSwitch(),
const Gap(10),
const UniversalACTemp(),
const Gap(10),
// other ACs controls
ListView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.all(0),
itemCount: DevicesCubit.categories[0].devices.length,
itemBuilder: (context, index) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
BodySmall(
text: DevicesCubit.categories[0].devices[index].name),
IconButton(
onPressed: () {
AcCubit.get(context).selectAC(
DevicesCubit.categories[0].devices[index]);
},
icon: const Icon(
Icons.arrow_forward_ios,
),
style: ButtonStyle(
padding: MaterialStateProperty.all(
const EdgeInsets.all(0),
),
iconSize: MaterialStateProperty.all(15),
alignment: Alignment.bottomRight,
),
),
],
),
const Gap(5),
DevicesDefaultSwitch(
model: DevicesCubit.categories[0].devices[index],
),
const Gap(10),
ACTempWidget(
index,
),
const Gap(10),
ACModeControlUnit(
model: DevicesCubit.categories[0].devices[index],
),
const Gap(10),
],
);
},
),
],
),
);
}
}

65
lib/features/devices/view/widgets/ACs/acs_view.dart Normal file
View File

@ -0,0 +1,65 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_app/features/app_layout/view/widgets/default_app_bar.dart';
import 'package:syncrow_app/features/app_layout/view/widgets/default_nav_bar.dart';
import 'package:syncrow_app/features/devices/bloc/ac_cubit.dart';
import 'package:syncrow_app/features/devices/model/ac_model.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_interface.dart';
import 'package:syncrow_app/features/devices/view/widgets/ACs/acs_list.dart';
import '../../../../../generated/assets.dart';
import '../../../../../utils/resource_manager/color_manager.dart';
class ACsView extends StatelessWidget {
const ACsView({super.key});
@override
Widget build(BuildContext context) {
return BlocProvider(
create: (context) => AcCubit(),
child: BlocBuilder<AcCubit, AcState>(
builder: (context, state) {
ACModel? selectedAC = AcCubit.get(context).getSelectedAC();
return AnnotatedRegion(
value: SystemUiOverlayStyle(
statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
statusBarIconBrightness: Brightness.light,
),
child: SafeArea(
child: Scaffold(
backgroundColor: ColorsManager.backgroundColor,
extendBodyBehindAppBar: true,
extendBody: true,
appBar: const DefaultAppBar(),
body: Container(
width: MediaQuery.sizeOf(context).width,
height: MediaQuery.sizeOf(context).height,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(
Assets.imagesBackground,
),
fit: BoxFit.cover,
opacity: 0.4,
),
),
child: Padding(
padding: const EdgeInsets.only(
top: 60, right: 15, left: 15, bottom: 80),
child: SizedBox.expand(
child: selectedAC != null
? AcInterface(acModel: selectedAC)
: const ACsList(),
),
),
),
bottomNavigationBar: const DefaultNavBar(),
),
),
);
},
),
);
}
}

0
lib/features/devices/view/widgets/ACs/universal_a_c_switch.dart → lib/features/devices/view/widgets/ACs/universal_ac_switch.dart
View File

0
lib/features/devices/view/widgets/ACs/universal_a_c_temp.dart → lib/features/devices/view/widgets/ACs/universal_ac_temp.dart
View File

62
lib/features/devices/view/widgets/devices_temp_widget.dart
View File

@ -1,62 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:syncrow_app/features/devices/bloc/ac_cubit.dart';
import 'package:syncrow_app/features/shared_widgets/default_container.dart';
import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
import 'package:syncrow_app/utils/context_extension.dart';
import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
import '../../../../generated/assets.dart';
class DevicesTempWidget extends StatelessWidget {
const DevicesTempWidget(
this.index, {
super.key,
});
final int index;
// double temp = widget.model.temperature;
@override
Widget build(BuildContext context) {
return DefaultContainer(
height: 60,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
SizedBox.square(
dimension: 24,
child: InkWell(
onTap: () {
AcCubit.get(context).decreaseACTemp(index);
},
child: SvgPicture.asset(
Assets.iconsMinus,
),
),
),
BodyLarge(
text: "${AcCubit.get(context).getTemp(index)}° C",
style: context.bodyLarge.copyWith(
color: ColorsManager.primaryColor.withOpacity(0.6),
fontSize: 23,
),
),
SizedBox.square(
dimension: 24,
child: InkWell(
onTap: () {
AcCubit.get(context).increaseACTemp(index);
},
child: SvgPicture.asset(
Assets.iconsPlus,
height: 24,
width: 24,
),
),
),
],
),
);
}
}

3
lib/features/devices/view/widgets/devices_view_body.dart
View File

@ -17,8 +17,7 @@ class DevicesViewBody extends StatelessWidget {
builder: (context, state) {
return state is DevicesLoading
? const Center(child: CircularProgressIndicator())
: DevicesCubit.get(context).chosenCategoryView ??
const CategoriesView();
: const CategoriesView();
},
),
);

7
lib/features/devices/view/widgets/switches.dart
View File

@ -30,7 +30,12 @@ class Switches extends StatelessWidget {
itemCount: DevicesCubit.categories.length,
itemBuilder: (_, index) {
return InkWell(
onTap: () => DevicesCubit.get(context).selectCategory(index),
onTap: () {
DevicesCubit.get(context).selectCategory(index);
Navigator.push(context, MaterialPageRoute(builder: (context) {
return DevicesCubit.get(context).chosenCategoryView!;
}));
},
child: DefaultContainer(
child: Padding(
padding: const EdgeInsets.only(top: 10, right: 10, left: 10),

1
lib/generated/assets.dart
View File

@ -26,6 +26,7 @@ class Assets {
static const String iconsLayoutFill = 'assets/icons/Layout-fill.svg';
static const String iconsLight = 'assets/icons/Light.svg';
static const String iconsLock = 'assets/icons/lock.svg';
static const String iconsLogo = 'assets/icons/logo.png';
static const String iconsMenu = 'assets/icons/Menu.svg';
static const String iconsMenuFill = 'assets/icons/Menu-fill.svg';
static const String iconsMinus = 'assets/icons/minus.svg';

6
lib/my_app.dart
View File

@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_app/features/auth/bloc/auth_cubit.dart';
import 'package:syncrow_app/features/app_layout/bloc/nav_cubit.dart';
import 'package:syncrow_app/features/auth/bloc/auth_cubit.dart';
import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
import 'package:syncrow_app/utils/resource_manager/theme_manager.dart';
import 'features/devices/bloc/devices_cubit.dart';
import 'navigation/router.dart' as router;
import 'navigation/routing_constants.dart';
@ -23,6 +24,9 @@ class MyApp extends StatelessWidget {
BlocProvider(
create: (context) => NavCubit(),
),
BlocProvider(
create: (context) => DevicesCubit(),
),
],
child: MaterialApp(
debugShowCheckedModeBanner: false,

2
lib/utils/resource_manager/color_manager.dart
View File

@ -8,6 +8,6 @@ abstract class ColorsManager {
static const Color onSecondaryColor = Color(0xFF023DFE);
static const Color primaryTextColor = Colors.black;
static const Color greyColor = Color(0xFFd9d9d9);
static const Color greyColor = Color(0xFFd5d5d5);
static const Color backgroundColor = Color(0xFFececec);
}