ammar/syncrow-app
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/syncrow-app.git synced 2025-07-10 15:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the initial value on start date and fix logic that prevent user from select old date (befor now)

Browse Source
This commit is contained in:
Rafeek-Khoudare
2025-07-01 14:09:14 +03:00
parent 6c91af6f90
commit d9b68a11e5
3 changed files with 222 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/features/devices/bloc/smart_door_bloc/smart_door_bloc.dart
View File

@ -354,6 +354,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
Future<void> selectTimeOnlinePassword( Future<void> selectTimeOnlinePassword(
SelectTimeOnlinePasswordEvent event, Emitter<SmartDoorState> emit) async { SelectTimeOnlinePasswordEvent event, Emitter<SmartDoorState> emit) async {
effectiveTimeTimeStamp ??= DateTime.now().millisecondsSinceEpoch ~/ 1000;
emit(ChangeTimeState()); emit(ChangeTimeState());
final DateTime? picked = await showDatePicker( final DateTime? picked = await showDatePicker(
context: event.context, context: event.context,
@ -398,7 +399,13 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
selectedDateTime.minute, selectedDateTime.minute,
).millisecondsSinceEpoch ~/ ).millisecondsSinceEpoch ~/
1000; // Divide by 1000 to remove milliseconds 1000; // Divide by 1000 to remove milliseconds
final currentTimestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
if (event.isEffective) { if (event.isEffective) {
if (selectedTimestamp < currentTimestamp) {
CustomSnackBar.displaySnackBar(
'Effective Time cannot be later than Expiration Time.');
return;
}
if (expirationTimeTimeStamp != null && if (expirationTimeTimeStamp != null &&
selectedTimestamp > expirationTimeTimeStamp!) { selectedTimestamp > expirationTimeTimeStamp!) {
CustomSnackBar.displaySnackBar( CustomSnackBar.displaySnackBar(

29
lib/features/devices/view/widgets/name_time_widget.dart
View File

@ -11,6 +11,9 @@ class NameTimeWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
DateTime now = DateTime.now();
DateTime cleaned =
DateTime(now.year, now.month, now.day, now.hour, now.minute);
return DefaultContainer( return DefaultContainer(
padding: const EdgeInsets.all(20), padding: const EdgeInsets.all(20),
child: Column( child: Column(
@ -59,19 +62,22 @@ class NameTimeWidget extends StatelessWidget {
width: MediaQuery.of(context).size.width / 3.5, width: MediaQuery.of(context).size.width / 3.5,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
BlocProvider.of<SmartDoorBloc>(context).add(
BlocProvider.of<SmartDoorBloc>(context).add(SelectTimeOnlinePasswordEvent(context: context, isEffective: true)); SelectTimeOnlinePasswordEvent(
context: context, isEffective: true));
}, },
child: Text( child: Text(
BlocProvider.of<SmartDoorBloc>(context).effectiveTime, BlocProvider.of<SmartDoorBloc>(context)
style: TextStyle(fontSize: 14, .effectiveTime ==
color: BlocProvider.of<SmartDoorBloc>(context).effectiveTime ==
'Select Time' 'Select Time'
? ColorsManager.textGray ? cleaned.toString()
: null), : BlocProvider.of<SmartDoorBloc>(context)
.effectiveTime,
style: TextStyle(fontSize: 14),
), ),
)), )),
],), ],
),
), ),
const Divider( const Divider(
color: ColorsManager.graysColor, color: ColorsManager.graysColor,
@ -96,10 +102,13 @@ class NameTimeWidget extends StatelessWidget {
context: context, isEffective: false)); context: context, isEffective: false));
}, },
child: Text( child: Text(
BlocProvider.of<SmartDoorBloc>(context).expirationTime, BlocProvider.of<SmartDoorBloc>(context)
.expirationTime,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: BlocProvider.of<SmartDoorBloc>(context).expirationTime == 'Select Time' color: BlocProvider.of<SmartDoorBloc>(context)
.expirationTime ==
'Select Time'
? ColorsManager.textGray ? ColorsManager.textGray
: null), : null),
), ),

324
lib/features/devices/view/widgets/smart_door/offline_timeLimit_password_page.dart
View File

@ -18,7 +18,8 @@ import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
class CreateOfflineTimeLimitPasswordPage extends StatelessWidget { class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
final String? deviceId; final String? deviceId;
final String? type; final String? type;
const CreateOfflineTimeLimitPasswordPage({super.key, this.deviceId, this.type}); const CreateOfflineTimeLimitPasswordPage(
{super.key, this.deviceId, this.type});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
bool isRepeat = false; bool isRepeat = false;
@ -28,9 +29,7 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
child: BlocConsumer<SmartDoorBloc, SmartDoorState>( child: BlocConsumer<SmartDoorBloc, SmartDoorState>(
listener: (context, state) { listener: (context, state) {
if (state is FailedState) { if (state is FailedState) {
CustomSnackBar.displaySnackBar( CustomSnackBar.displaySnackBar(state.errorMessage);
state.errorMessage
);
} }
if (state is IsRepeatState) { if (state is IsRepeatState) {
isRepeat = state.repeat; isRepeat = state.repeat;
@ -39,6 +38,10 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
generated = state.generated; generated = state.generated;
} }
}, builder: (context, state) { }, builder: (context, state) {
DateTime now = DateTime.now();
DateTime cleaned =
DateTime(now.year, now.month, now.day, now.hour, now.minute);
final smartDoorBloc = BlocProvider.of<SmartDoorBloc>(context); final smartDoorBloc = BlocProvider.of<SmartDoorBloc>(context);
return DefaultScaffold( return DefaultScaffold(
appBar: AppBar( appBar: AppBar(
@ -85,46 +88,56 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
Flexible( Flexible(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: smartDoorBloc.passwordController.text.isEmpty ? children: smartDoorBloc
List.generate(10, (index) { .passwordController.text.isEmpty
return const Padding( ? List.generate(10, (index) {
padding: EdgeInsets.symmetric( return const Padding(
horizontal: 4.0, padding: EdgeInsets.symmetric(
vertical: 15), horizontal: 4.0,
child: Icon( vertical: 15),
Icons.circle, child: Icon(
size: 20.0, Icons.circle,
color: Colors.black, size: 20.0,
), color: Colors.black,
); ),
}) : [ );
Expanded( })
child: Row( : [
children: [
Expanded( Expanded(
child: BodyLarge( child: Row(
style: const TextStyle( children: [
color: ColorsManager.primaryColor, Expanded(
fontWeight: FontWeight.bold, child: BodyLarge(
letterSpacing: 8.0, style: const TextStyle(
fontSize: 25, color: ColorsManager
wordSpacing: 2), .primaryColor,
textAlign: TextAlign.center, fontWeight:
text: smartDoorBloc.passwordController.text, FontWeight.bold,
fontSize: 25, letterSpacing: 8.0,
fontSize: 25,
wordSpacing: 2),
textAlign:
TextAlign.center,
text: smartDoorBloc
.passwordController
.text,
fontSize: 25,
),
),
IconButton(
onPressed: () async {
await Clipboard.setData(
ClipboardData(
text: smartDoorBloc
.passwordController
.text));
},
icon: const Icon(
Icons.copy)),
],
), ),
), ),
IconButton(
onPressed: () async {
await Clipboard.setData(
ClipboardData(text: smartDoorBloc.passwordController.text)
);
},
icon: const Icon(Icons.copy)),
], ],
),
),
],
)), )),
const SizedBox( const SizedBox(
width: 10, width: 10,
@ -135,91 +148,142 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
padding: const EdgeInsets.all(20), padding: const EdgeInsets.all(20),
child: Column( child: Column(
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment:
children: [ MainAxisAlignment.spaceBetween,
Expanded( children: [
child: Container( Expanded(
padding: const EdgeInsets.all(10.0), child: Container(
child: const BodyMedium( padding:
text: 'Password Name', const EdgeInsets.all(10.0),
fontWeight: FontWeight.normal, child: const BodyMedium(
), text: 'Password Name',
), fontWeight: FontWeight.normal,
), ),
SizedBox( ),
width: MediaQuery.of(context).size.width / 2.6,
child: TextFormField(
controller: BlocProvider.of<SmartDoorBloc>(context).passwordNameController,
decoration:
const InputDecoration(
hintText: 'Enter The Name',
hintStyle: TextStyle(
fontSize: 14,
color: ColorsManager.textGray)
),
)),
],
),
Column(
children: [
const Divider(color: ColorsManager.graysColor,),
Padding(
padding: const EdgeInsets.all(10.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Expanded(
child: BodyMedium(
text: 'Effective Time',
fontWeight: FontWeight.normal,
), ),
), SizedBox(
SizedBox( width: MediaQuery.of(context)
width: MediaQuery.of(context).size.width / 3.5, .size
child: InkWell( .width /
onTap: () { 2.6,
BlocProvider.of<SmartDoorBloc>(context).add(SelectTimeEvent(context: context, isEffective: true)); child: TextFormField(
}, controller: BlocProvider.of<
child: Text( SmartDoorBloc>(context)
BlocProvider.of<SmartDoorBloc>(context).effectiveTime, .passwordNameController,
style: TextStyle( decoration:
fontSize: 14, const InputDecoration(
color: BlocProvider.of<SmartDoorBloc>(context).effectiveTime == hintText:
'Select Time' ? ColorsManager.textGray : null), 'Enter The Name',
), hintStyle: TextStyle(
)),], fontSize: 14,
), color: ColorsManager
), .textGray)),
const Divider( )),
color: ColorsManager.graysColor, ],
), ),
Padding( Column(
padding: const EdgeInsets.all(10.0), children: [
child: Row(mainAxisAlignment: const Divider(
MainAxisAlignment.spaceBetween, color: ColorsManager.graysColor,
children: [ ),
const Expanded( Padding(
child: BodyMedium( padding: const EdgeInsets.all(10.0),
text: 'Expiration Time', child: Row(
fontWeight: FontWeight.normal, mainAxisAlignment:
), MainAxisAlignment
), .spaceBetween,
SizedBox( children: [
width: MediaQuery.of(context).size.width / 3.5, const Expanded(
child: InkWell( child: BodyMedium(
onTap: () { text: 'Effective Time',
BlocProvider.of<SmartDoorBloc>(context).add(SelectTimeEvent( fontWeight:
context: context, FontWeight.normal,
isEffective: false)); ),
}, ),
child: Text( SizedBox(
BlocProvider.of<SmartDoorBloc>(context).expirationTime, width:
style: TextStyle( MediaQuery.of(context)
fontSize: 14, .size
color: BlocProvider.of<SmartDoorBloc>(context) .width /
.expirationTime == 'Select Time' ? ColorsManager 3.5,
.textGray : null), child: InkWell(
onTap: () {
BlocProvider.of<
SmartDoorBloc>(
context)
.add(
SelectTimeEvent(
context:
context,
isEffective:
true));
},
child: Text(
BlocProvider.of<SmartDoorBloc>(
context)
.effectiveTime ==
'Select Time'
? cleaned.toString()
: BlocProvider.of<
SmartDoorBloc>(
context)
.effectiveTime,
style: TextStyle(
fontSize: 14,
),
),
)),
],
),
),
const Divider(
color: ColorsManager.graysColor,
),
Padding(
padding: const EdgeInsets.all(10.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
children: [
const Expanded(
child: BodyMedium(
text: 'Expiration Time',
fontWeight:
FontWeight.normal,
),
),
SizedBox(
width: MediaQuery.of(context)
.size
.width /
3.5,
child: InkWell(
onTap: () {
BlocProvider.of<
SmartDoorBloc>(
context)
.add(SelectTimeEvent(
context: context,
isEffective:
false));
},
child: Text(
BlocProvider.of<
SmartDoorBloc>(
context)
.expirationTime,
style: TextStyle(
fontSize: 14,
color: BlocProvider.of<
SmartDoorBloc>(
context)
.expirationTime ==
'Select Time'
? ColorsManager
.textGray
: null),
), ),
), ),
), ),
@ -238,7 +302,8 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
), ),
const BodyMedium( const BodyMedium(
textAlign: TextAlign.center, textAlign: TextAlign.center,
text: 'Use the time-limited password at least once within 24 hours after the password takes effect. Otherwise, the password becomes invalid.', text:
'Use the time-limited password at least once within 24 hours after the password takes effect. Otherwise, the password becomes invalid.',
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontColor: ColorsManager.grayColor, fontColor: ColorsManager.grayColor,
), ),
@ -256,10 +321,13 @@ class CreateOfflineTimeLimitPasswordPage extends StatelessWidget {
backgroundColor: ColorsManager.primaryColor, backgroundColor: ColorsManager.primaryColor,
onPressed: () async { onPressed: () async {
if (generated == false) { if (generated == false) {
smartDoorBloc.add(GenerateAndSavePasswordTimeLimitEvent(context: context)); smartDoorBloc.add(
GenerateAndSavePasswordTimeLimitEvent(
context: context));
} else { } else {
if(smartDoorBloc.passwordNameController.text.isNotEmpty){ if (smartDoorBloc
smartDoorBloc.add(RenamePasswordEvent()); .passwordNameController.text.isNotEmpty) {
smartDoorBloc.add(RenamePasswordEvent());
} }
Navigator.of(context).pop(true); Navigator.of(context).pop(true);
} }