diff --git a/assets/icons/open_close_door.svg b/assets/icons/open_close_door.svg
new file mode 100644
index 00000000..d5aacdef
--- /dev/null
+++ b/assets/icons/open_close_door.svg
@@ -0,0 +1,24 @@
+
diff --git a/assets/icons/open_close_records.svg b/assets/icons/open_close_records.svg
new file mode 100644
index 00000000..9c5c585c
--- /dev/null
+++ b/assets/icons/open_close_records.svg
@@ -0,0 +1,19 @@
+
diff --git a/lib/pages/device_managment/ac/view/batch_control_list/batch_current_temp.dart b/lib/pages/device_managment/ac/view/batch_control_list/batch_current_temp.dart
index e6d9378f..ba5ea639 100644
--- a/lib/pages/device_managment/ac/view/batch_control_list/batch_current_temp.dart
+++ b/lib/pages/device_managment/ac/view/batch_control_list/batch_current_temp.dart
@@ -118,7 +118,7 @@ class _CurrentTempState extends State {
onIncrement: () {
if (_adjustedValue < 30) {
setState(() {
- _adjustedValue++;
+ _adjustedValue = _adjustedValue + 0.5;
});
_onValueChanged(_adjustedValue);
}
@@ -126,7 +126,7 @@ class _CurrentTempState extends State {
onDecrement: () {
if (_adjustedValue > 20) {
setState(() {
- _adjustedValue--;
+ _adjustedValue = _adjustedValue - 0.5;
});
_onValueChanged(_adjustedValue);
}
diff --git a/lib/pages/device_managment/ac/view/control_list/current_temp.dart b/lib/pages/device_managment/ac/view/control_list/current_temp.dart
index 5ff6fea6..0327e357 100644
--- a/lib/pages/device_managment/ac/view/control_list/current_temp.dart
+++ b/lib/pages/device_managment/ac/view/control_list/current_temp.dart
@@ -118,7 +118,7 @@ class _CurrentTempState extends State {
onIncrement: () {
if (_adjustedValue < 30) {
setState(() {
- _adjustedValue++;
+ _adjustedValue = _adjustedValue + 0.5;
});
_onValueChanged(_adjustedValue);
}
@@ -126,7 +126,7 @@ class _CurrentTempState extends State {
onDecrement: () {
if (_adjustedValue > 20) {
setState(() {
- _adjustedValue--;
+ _adjustedValue = _adjustedValue - 0.5;
});
_onValueChanged(_adjustedValue);
}
diff --git a/lib/pages/device_managment/main_door_sensor/view/main_door_control_view.dart b/lib/pages/device_managment/main_door_sensor/view/main_door_control_view.dart
index 2168be5a..44b2fec3 100644
--- a/lib/pages/device_managment/main_door_sensor/view/main_door_control_view.dart
+++ b/lib/pages/device_managment/main_door_sensor/view/main_door_control_view.dart
@@ -75,16 +75,18 @@ class MainDoorSensorControlView extends StatelessWidget
),
children: [
IconNameStatusContainer(
+ isFullIcon: true,
name: status.doorContactState ? 'Open' : 'Close',
- icon: Assets.mainDoor,
+ icon: Assets.openCloseDoor,
onTap: () {},
status: status.doorContactState,
textColor: ColorsManager.red,
paddingAmount: 8,
),
IconNameStatusContainer(
+ isFullIcon: true,
name: 'Open/Close\nRecord',
- icon: Assets.mainDoorReports,
+ icon: Assets.openCloseRecords,
onTap: () {
final from = DateTime.now()
.subtract(const Duration(days: 30))
@@ -103,6 +105,7 @@ class MainDoorSensorControlView extends StatelessWidget
textColor: ColorsManager.blackColor,
),
IconNameStatusContainer(
+ isFullIcon: false,
name: 'Notifications\nSettings',
icon: Assets.mainDoorNotifi,
onTap: () {
@@ -113,6 +116,7 @@ class MainDoorSensorControlView extends StatelessWidget
},
status: false,
textColor: ColorsManager.blackColor,
+ paddingAmount: 14,
),
],
);
@@ -128,6 +132,7 @@ class IconNameStatusContainer extends StatelessWidget {
required this.status,
required this.textColor,
this.paddingAmount = 12,
+ required this.isFullIcon,
});
final String name;
@@ -136,6 +141,7 @@ class IconNameStatusContainer extends StatelessWidget {
final bool status;
final Color textColor;
final double? paddingAmount;
+ final bool isFullIcon;
@override
Widget build(BuildContext context) {
@@ -145,22 +151,30 @@ class IconNameStatusContainer extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Container(
- width: 60,
- height: 60,
- decoration: const BoxDecoration(
- shape: BoxShape.circle,
- color: ColorsManager.whiteColors,
- ),
- margin: const EdgeInsets.symmetric(horizontal: 4),
- padding: EdgeInsets.all(paddingAmount ?? 12),
- child: ClipOval(
+ if (isFullIcon)
+ ClipOval(
child: SvgPicture.asset(
icon,
- fit: BoxFit.fill,
+ fit: BoxFit.contain,
+ ),
+ )
+ else
+ Container(
+ width: 60,
+ height: 60,
+ decoration: const BoxDecoration(
+ shape: BoxShape.circle,
+ color: ColorsManager.whiteColors,
+ ),
+ //margin: const EdgeInsets.symmetric(horizontal: 4),
+ padding: EdgeInsets.all(paddingAmount ?? 12),
+ child: ClipOval(
+ child: SvgPicture.asset(
+ icon,
+ fit: BoxFit.contain,
+ ),
),
),
- ),
const Spacer(),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 6),
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index c334d2d1..719cc21c 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -157,4 +157,10 @@ class Assets {
//assets/icons/empty_records.svg
static const String emptyRecords = 'assets/icons/empty_records.svg';
+
+ //assets/icons/open_close_door.svg
+ static const String openCloseDoor = 'assets/icons/open_close_door.svg';
+
+ //assets/icons/open_close_records.svg
+ static const String openCloseRecords = 'assets/icons/open_close_records.svg';
}