Skip to content

#745- First PR for testing purpose #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#745- First PR for testing purpose #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/app/modules/timer/views/timer_animation.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,15 @@ class _TimerAnimatedCardState extends State<TimerAnimatedCard>
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.symmetric(
horizontal: 10.0,
horizontal: 16.0,
vertical: 8.0,
),
child: Container(
height: context.height / 3.0,
width: context.width,
child: Obx(
() => Card(
margin: const EdgeInsets.all(5),
margin: const EdgeInsets.all(0),
color: widget.timer.timeElapsed < widget.timer.timerValue
? themeController.secondaryBackgroundColor.value
: themeController.secondaryColor.value,
Expand All @@ -114,7 +115,7 @@ class _TimerAnimatedCardState extends State<TimerAnimatedCard>
),
Center(
child: Padding(
padding: const EdgeInsets.all(10.0),
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
Expand Down Expand Up @@ -179,7 +180,7 @@ class _TimerAnimatedCardState extends State<TimerAnimatedCard>
),
Spacer(),
Padding(
padding: const EdgeInsets.symmetric(vertical: 10),
padding: const EdgeInsets.symmetric(vertical: 16),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expand Down
213 changes: 103 additions & 110 deletions lib/app/modules/timer/views/timer_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,16 @@ class TimerView extends GetView<TimerController> {
() => Visibility(
visible:
controller.isbottom.value && controller.timerList.length >= 3,
child: Container(
height: 85,
child: FittedBox(
child: FloatingActionButton(
onPressed: () {
Utils.hapticFeedback();
timerSelector(context, width, height);
},
backgroundColor: kprimaryColor,
child: const Icon(
Icons.add_alarm,
color: ksecondaryBackgroundColor,
size: 26,
),
),
child: FloatingActionButton(
onPressed: () {
Utils.hapticFeedback();
timerSelector(context, width, height);
},
backgroundColor: kprimaryColor,
child: const Icon(
Icons.add_alarm,
color: ksecondaryBackgroundColor,
size: 28,
),
),
),
Expand Down Expand Up @@ -158,15 +153,18 @@ class TimerView extends GetView<TimerController> {
addATimerSpace(context, width, height),
Visibility(
visible: controller.timerList.length <= 2,
child: Wrap(
spacing: 10,
runSpacing: 10,
children: [
presetButton(context, '+1:00', const Duration(minutes: 1)),
presetButton(context, '+5:00', const Duration(minutes: 5)),
presetButton(context, '+10:00', const Duration(minutes: 10)),
presetButton(context, '+15:00', const Duration(minutes: 15)),
],
child: Padding(
padding: const EdgeInsets.only(top: 16.0),
child: Wrap(
spacing: 12,
runSpacing: 12,
children: [
presetButton(context, '+1:00', const Duration(minutes: 1)),
presetButton(context, '+5:00', const Duration(minutes: 5)),
presetButton(context, '+10:00', const Duration(minutes: 10)),
presetButton(context, '+15:00', const Duration(minutes: 15)),
],
),
),
),
],
Expand All @@ -186,22 +184,25 @@ class TimerView extends GetView<TimerController> {
children: [
Center(
child: Padding(
padding: const EdgeInsets.all(8.0),
padding: const EdgeInsets.all(16.0),
child: Icon(
Icons.add_alarm_outlined,
color: themeController.primaryTextColor.value.withOpacity(
0.75,
),
size: 30,
size: 32,
),
),
),
Text(
'Tap here to add a timer',
style: Theme.of(context).textTheme.displaySmall!.copyWith(
fontWeight: FontWeight.bold,
color: themeController.primaryDisabledTextColor.value,
),
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Text(
'Tap here to add a timer',
style: Theme.of(context).textTheme.displaySmall!.copyWith(
fontWeight: FontWeight.bold,
color: themeController.primaryDisabledTextColor.value,
),
),
),
],
),
Expand Down Expand Up @@ -229,12 +230,7 @@ class TimerView extends GetView<TimerController> {
margin: const EdgeInsets.only(
top: 5,
),
padding: const EdgeInsets.fromLTRB(
10,
10,
10,
5,
),
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
Expand Down Expand Up @@ -273,7 +269,7 @@ class TimerView extends GetView<TimerController> {
),
],
),
const SizedBox(height: 20),
const SizedBox(height: 24),
InkWell(
onTap: () {
Utils.hapticFeedback();
Expand Down Expand Up @@ -358,7 +354,7 @@ class TimerView extends GetView<TimerController> {
// Minutes Picker
Padding(
padding: EdgeInsets.symmetric(
horizontal: width * 0.02,
horizontal: width * 0.03,
),
child: Text(
':',
Expand Down Expand Up @@ -442,7 +438,7 @@ class TimerView extends GetView<TimerController> {
// Seconds Picker
Padding(
padding: EdgeInsets.symmetric(
horizontal: width * 0.02,
horizontal: width * 0.03,
),
child: Text(
':',
Expand Down Expand Up @@ -580,10 +576,8 @@ class TimerView extends GetView<TimerController> {
],
),
Padding(
padding: EdgeInsets.only(
left: width * 0.02,
right: width * 0.02,
top: height * 0.035,
padding: EdgeInsets.symmetric(
horizontal: width * 0.03,
),
child: Text(
':',
Expand Down Expand Up @@ -649,10 +643,8 @@ class TimerView extends GetView<TimerController> {
],
),
Padding(
padding: EdgeInsets.only(
left: width * 0.02,
right: width * 0.02,
top: height * 0.035,
padding: EdgeInsets.symmetric(
horizontal: width * 0.03,
),
child: Text(
':',
Expand Down Expand Up @@ -723,73 +715,74 @@ class TimerView extends GetView<TimerController> {
),
),
Padding(
padding: const EdgeInsets.fromLTRB(0, 20.00, 20.00, 0),
padding: const EdgeInsets.only(top: 24.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Padding(
padding: const EdgeInsets.fromLTRB(0, 0, 20, 0),
child: InkWell(
borderRadius: BorderRadius.circular(18),
onTap: () {
Get.back();
},
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Obx(
() => Text(
'Cancel',
style: Theme.of(context)
.textTheme
.displayMedium!
.copyWith(
color: themeController
.primaryTextColor.value
.withOpacity(0.5),
fontSize: 15,
),
),
InkWell(
borderRadius: BorderRadius.circular(18),
onTap: () {
Get.back();
},
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16.0,
vertical: 8.0,
),
child: Obx(
() => Text(
'Cancel',
style: Theme.of(context)
.textTheme
.displayMedium!
.copyWith(
color: themeController
.primaryTextColor.value
.withOpacity(0.5),
fontSize: 15,
),
),
),
),
),
Padding(
padding: const EdgeInsets.fromLTRB(20, 0, 0, 0),
child: InkWell(
borderRadius: BorderRadius.circular(18),
onTap: () {
controller.remainingTime.value = Duration(
hours: controller.hours.value,
minutes: controller.minutes.value,
seconds: controller.seconds.value,
);
if (controller.hours.value != 0 ||
controller.minutes.value != 0 ||
controller.seconds.value != 0) {
controller.createTimer();
}
controller.hours.value = 0;
controller.minutes.value = 1;
controller.seconds.value = 0;
controller.setTextFieldTimerTime();
const SizedBox(width: 16),
InkWell(
borderRadius: BorderRadius.circular(18),
onTap: () {
controller.remainingTime.value = Duration(
hours: controller.hours.value,
minutes: controller.minutes.value,
seconds: controller.seconds.value,
);
if (controller.hours.value != 0 ||
controller.minutes.value != 0 ||
controller.seconds.value != 0) {
controller.createTimer();
}
controller.hours.value = 0;
controller.minutes.value = 1;
controller.seconds.value = 0;
controller.setTextFieldTimerTime();

Get.back();
},
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Obx(
() => Text(
'OK',
style: Theme.of(context)
.textTheme
.displayMedium!
.copyWith(
color: themeController
.primaryTextColor.value
.withOpacity(0.5),
fontSize: 15,
),
),
Get.back();
},
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16.0,
vertical: 8.0,
),
child: Obx(
() => Text(
'OK',
style: Theme.of(context)
.textTheme
.displayMedium!
.copyWith(
color: themeController
.primaryTextColor.value
.withOpacity(0.5),
fontSize: 15,
),
),
),
),
Expand Down Expand Up @@ -817,8 +810,8 @@ class TimerView extends GetView<TimerController> {
vertical: 10.0,
),
child: Wrap(
spacing: 10,
runSpacing: 10,
spacing: 12,
runSpacing: 12,
children: [
hoverPresetButton(
context,
Expand Down