ammar/syncrow-app
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/syncrow-app.git synced 2026-10-25 22:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

modified UI padding handling approach

Browse Source 
added auth API endpoints
initialized curtains view for further development
This commit is contained in:
Mohammad Salameh
2024-03-05 11:18:08 +03:00
parent 4087f9c71c
commit a9fdb2fc76
24 changed files with 380 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/devices/bloc/ac/ac_cubit.dart
+5 -1
View File
@@ -23,7 +23,11 @@ class AcCubit extends Cubit<AcState> {
void setTempToAll(double temperature) {
for (DeviceModel ac in DevicesCubit.categories[0].devices) {
if (ac is ACModel) {
setACTemp(ac, temperature);
if (ac.temperature != temperature &&
ac.bounds.min <= temperature &&
temperature <= ac.bounds.max) {
setACTemp(ac, temperature);
}
}
}
universalACTemp = temperature;
lib/features/devices/view/devices_view.dart
+1 -5
View File
@@ -11,11 +11,7 @@ class CategoriesView extends StatelessWidget {
return BlocProvider(
create: (context) => DevicesCubit(),
child: BlocBuilder<DevicesCubit, DevicesState>(
builder: (context, state) => Container(
padding: const EdgeInsets.all(8),
width: MediaQuery.sizeOf(context).width,
height: MediaQuery.sizeOf(context).height,
child: const DevicesViewBody()),
builder: (context, state) => const DevicesViewBody(),
),
);
}
lib/features/devices/view/widgets/ACs/ac_interface.dart
+5 -3
View File
@@ -16,18 +16,20 @@ class AcInterface extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 20),
ConstrainedBox(
constraints: const BoxConstraints(
maxHeight: 400,
maxHeight: 380,
),
child: AcInterfaceTempUnit(
acModel: acModel,
),
),
const SizedBox(
height: 10,
),
ConstrainedBox(
constraints: const BoxConstraints(
maxHeight: 130,
maxHeight: 120,
),
child: AcInterfaceControls(
acModel: acModel,
lib/features/devices/view/widgets/ACs/ac_interface_controls.dart
+2 -3
View File
@@ -18,12 +18,11 @@ class AcInterfaceControls extends StatelessWidget {
Widget build(BuildContext context) {
return Column(
children: [
const SizedBox(height: 10),
ACModeControlUnit(model: acModel),
const SizedBox(height: 10),
Row(
children: [
Expanded(
Flexible(
child: InkWell(
onTap: () {},
child: DefaultContainer(
@@ -35,7 +34,7 @@ class AcInterfaceControls extends StatelessWidget {
),
),
const SizedBox(width: 10),
Expanded(
Flexible(
child: InkWell(
onTap: () {},
child: DefaultContainer(
lib/features/devices/view/widgets/ACs/ac_interface_temp_unit.dart
+12 -15
View File
@@ -23,8 +23,6 @@ class AcInterfaceTempUnit extends StatelessWidget {
@override
Widget build(BuildContext context) {
//TODO: use the coolTo value from the model
double coolTo = acModel.temperature;
return BlocBuilder<AcCubit, AcState>(
builder: (context, state) {
return DefaultContainer(
@@ -48,6 +46,7 @@ class AcInterfaceTempUnit extends StatelessWidget {
dotColor: Colors.transparent,
),
infoProperties: InfoProperties(
//TODO: move to strings manager
bottomLabelText: 'CURRENT TEMP',
bottomLabelStyle: context.bodyLarge.copyWith(
color: Colors.grey,
@@ -71,17 +70,15 @@ class AcInterfaceTempUnit extends StatelessWidget {
),
),
),
min: 20,
max: 30,
initialValue: 20,
min: acModel.bounds.min,
max: acModel.bounds.max,
initialValue: acModel.temperature,
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);
}
AcCubit.get(context).setTempToAll(value);
}
},
),
@@ -96,9 +93,9 @@ class AcInterfaceTempUnit extends StatelessWidget {
dimension: 24,
child: InkWell(
onTap: () {
// AcCubit.get(context).setACTemp(acModel, coolTo - .5);
AcCubit.get(context).setACTemp(acModel, coolTo);
coolTo = coolTo - .5;
AcCubit.get(context)
.setACTemp(acModel, acModel.coolTo);
acModel.coolTo -= .5;
},
child: SvgPicture.asset(
Assets.iconsMinus,
@@ -108,7 +105,7 @@ class AcInterfaceTempUnit extends StatelessWidget {
Column(
children: [
BodyLarge(
text: "$coolTo° C",
text: "${acModel.coolTo}° C",
style: context.bodyLarge.copyWith(
color:
ColorsManager.primaryColor.withOpacity(0.6),
@@ -126,9 +123,9 @@ class AcInterfaceTempUnit extends StatelessWidget {
dimension: 24,
child: InkWell(
onTap: () {
// AcCubit.get(context).setACTemp(acModel, coolTo + .5);
AcCubit.get(context).setACTemp(acModel, coolTo);
coolTo = coolTo + .5;
AcCubit.get(context)
.setACTemp(acModel, acModel.coolTo);
acModel.coolTo += .5;
},
child: SvgPicture.asset(
Assets.iconsPlus,
lib/features/devices/view/widgets/ACs/ac_mode_control_unit.dart
+2 -2
View File
@@ -36,7 +36,7 @@ class _ACModeControlUnitState extends State<ACModeControlUnit> {
//TODO Move the fanSpeeds and tempModes to the Cubit
return Row(
children: [
Expanded(
Flexible(
child: InkWell(
onTap: () {
setState(() {
@@ -53,7 +53,7 @@ class _ACModeControlUnitState extends State<ACModeControlUnit> {
),
),
const SizedBox(width: 10),
Expanded(
Flexible(
child: InkWell(
onTap: () {
setState(() {
lib/features/devices/view/widgets/ACs/acs_view.dart
+7 -5
View File
@@ -2,12 +2,12 @@ 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/ac_cubit.dart';
import 'package:syncrow_app/features/devices/bloc/devices_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 'package:syncrow_app/utils/resource_manager/constants.dart';
import '../../../../../generated/assets.dart';
import '../../../../../utils/resource_manager/color_manager.dart';
@@ -38,7 +38,7 @@ class ACsView extends StatelessWidget {
backgroundColor: ColorsManager.backgroundColor,
extendBodyBehindAppBar: true,
extendBody: true,
appBar: const DefaultAppBar(),
appBar: DefaultAppBar(context),
body: Container(
width: MediaQuery.sizeOf(context).width,
height: MediaQuery.sizeOf(context).height,
@@ -52,8 +52,11 @@ class ACsView extends StatelessWidget {
),
),
child: Padding(
padding: const EdgeInsets.only(
top: 60, right: 15, left: 15, bottom: 80),
padding: EdgeInsets.only(
top: Constants.appBarHeight,
left: Constants.defaultPadding,
right: Constants.defaultPadding,
),
child: SizedBox.expand(
child: selectedAC != null
? AcInterface(acModel: selectedAC)
@@ -61,7 +64,6 @@ class ACsView extends StatelessWidget {
),
),
),
bottomNavigationBar: const DefaultNavBar(),
),
),
);
lib/features/devices/view/widgets/devices_categories_view.dart
+31 -27
View File
@@ -4,6 +4,7 @@ import 'package:flutter/widgets.dart';
import 'package:syncrow_app/features/devices/view/widgets/devices_mode_tab.dart';
import 'package:syncrow_app/features/devices/view/widgets/switches.dart';
import 'package:syncrow_app/features/shared_widgets/text_widgets/title_medium.dart';
import 'package:syncrow_app/utils/resource_manager/constants.dart';
import 'package:syncrow_app/utils/resource_manager/strings_manager.dart';
class DevicesCategoriesView extends StatelessWidget {
@@ -13,43 +14,46 @@ class DevicesCategoriesView extends StatelessWidget {
@override
Widget build(BuildContext context) {
return const Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
flex: 3,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TitleMedium(
text: StringsManager.devices,
style: TextStyle(
fontSize: 32,
fontWeight: FontWeight.bold,
),
),
DevicesModeTab(),
],
),
),
Expanded(
flex: 11,
child: SingleChildScrollView(
return const Padding(
padding: EdgeInsets.symmetric(horizontal: Constants.defaultPadding),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
flex: 3,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TitleMedium(
text: StringsManager.wizard,
text: StringsManager.devices,
style: TextStyle(
fontSize: 28,
fontSize: 32,
fontWeight: FontWeight.bold,
),
),
Switches(),
DevicesModeTab(),
],
),
),
)
],
Expanded(
flex: 11,
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TitleMedium(
text: StringsManager.wizard,
style: TextStyle(
fontSize: 28,
),
),
Switches(),
],
),
),
)
],
),
);
}
}
lib/features/devices/view/widgets/devices_view_body.dart
+112 -91
View File
@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:smooth_page_indicator/smooth_page_indicator.dart';
import 'package:syncrow_app/features/devices/view/widgets/devices_categories_view.dart';
import 'package:syncrow_app/features/shared_widgets/text_widgets/title_medium.dart';
import 'package:syncrow_app/utils/resource_manager/constants.dart';
import '../../../../utils/resource_manager/strings_manager.dart';
import '../../bloc/devices_cubit.dart';
@@ -23,106 +24,126 @@ class DevicesViewBody extends StatelessWidget {
PageController pageController = PageController();
return state is DevicesLoading
? const Center(child: CircularProgressIndicator())
: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: PageView(
controller: pageController,
children: const [
DevicesCategoriesView(),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TitleMedium(
text: "Home",
style: TextStyle(
fontSize: 32,
fontWeight: FontWeight.bold,
: Padding(
padding: EdgeInsets.only(
top: Constants.appBarHeight,
bottom: Constants.bottomNavBarHeight),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: PageView(
controller: pageController,
children: const [
DevicesCategoriesView(),
Padding(
padding: EdgeInsets.symmetric(
horizontal: Constants.defaultPadding),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
TitleMedium(
text: "Home",
style: TextStyle(
fontSize: 32,
fontWeight: FontWeight.bold,
),
),
],
),
),
Expanded(
flex: 3,
child: SingleChildScrollView(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
TitleMedium(
text: StringsManager.wizard,
style: TextStyle(
fontSize: 28,
),
),
Switches(),
],
),
),
],
),
)
],
),
Expanded(
flex: 3,
child: SingleChildScrollView(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
TitleMedium(
text: StringsManager.wizard,
style: TextStyle(
fontSize: 28,
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: Constants.defaultPadding),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
TitleMedium(
text: "Office",
style: TextStyle(
fontSize: 32,
fontWeight: FontWeight.bold,
),
),
),
Switches(),
],
],
),
),
),
)
],
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TitleMedium(
text: "Office",
style: TextStyle(
fontSize: 32,
fontWeight: FontWeight.bold,
Expanded(
flex: 3,
child: SingleChildScrollView(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
TitleMedium(
text: StringsManager.wizard,
style: TextStyle(
fontSize: 28,
),
),
Switches(),
],
),
),
],
),
)
],
),
Expanded(
flex: 3,
child: SingleChildScrollView(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
TitleMedium(
text: StringsManager.wizard,
style: TextStyle(
fontSize: 28,
),
),
Switches(),
],
),
),
)
],
),
],
),
),
SmoothPageIndicator(
controller: pageController,
count: 3,
effect: const WormEffect(
dotHeight: 8,
dotWidth: 8,
),
],
),
onDotClicked: (index) {
pageController.animateToPage(
index,
duration: const Duration(milliseconds: 300),
curve: Curves.ease,
);
}),
],
),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 7,
),
child: SmoothPageIndicator(
controller: pageController,
count: 3,
effect: const WormEffect(
dotHeight: 8,
dotWidth: 8,
),
onDotClicked: (index) {
pageController.animateToPage(
index,
duration: const Duration(milliseconds: 300),
curve: Curves.ease,
);
}),
),
],
),
);
},
),
lib/features/devices/view/widgets/lights/lights_view.dart
+1 -3
View File
@@ -6,7 +6,6 @@ import 'package:syncrow_app/features/devices/view/widgets/lights/lights_view_lis
import '../../../../../generated/assets.dart';
import '../../../../../utils/resource_manager/color_manager.dart';
import '../../../../app_layout/view/widgets/default_app_bar.dart';
import '../../../../app_layout/view/widgets/default_nav_bar.dart';
import '../../../bloc/devices_cubit.dart';
import '../../../bloc/lights/lights_cubit.dart';
import '../../../model/light_model.dart';
@@ -44,7 +43,7 @@ class LightsView extends StatelessWidget {
backgroundColor: ColorsManager.backgroundColor,
extendBodyBehindAppBar: true,
extendBody: true,
appBar: const DefaultAppBar(),
appBar: DefaultAppBar(context),
body: Container(
width: MediaQuery.sizeOf(context).width,
height: MediaQuery.sizeOf(context).height,
@@ -61,7 +60,6 @@ class LightsView extends StatelessWidget {
? LightInterface(light: selectedLight)
: LightsViewList(lights: lights),
),
bottomNavigationBar: const DefaultNavBar(),
),
),
);
lib/features/devices/view/widgets/lights/lights_view_list.dart
+6 -1
View File
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:syncrow_app/features/devices/view/widgets/lights/lights_list.dart';
import 'package:syncrow_app/utils/resource_manager/constants.dart';
import '../../../../shared_widgets/text_widgets/body_small.dart';
import '../../../bloc/devices_cubit.dart';
@@ -17,7 +18,11 @@ class LightsViewList extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.only(top: 70, right: 15, left: 15, bottom: 80),
padding: EdgeInsets.only(
top: Constants.appBarHeight,
right: Constants.defaultPadding,
left: Constants.defaultPadding,
),
child: SizedBox.expand(
child: SingleChildScrollView(
child: Column(
lib/features/devices/view/widgets/switches.dart
+1
View File
@@ -68,6 +68,7 @@ class Switches extends StatelessWidget {
fontWeight: FontWeight.bold,
height: 0,
fontSize: 24,
color: Colors.grey,
),
),
),