Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,7 @@ app.*.map.json
/.fvm
/.tmp
/caches
/.fvmrc
/.fvmrc

# FVM Version Cache
.fvm/
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"cmake.sourceDirectory": "E:/ultimate_alarm_clock/linux"
"cmake.sourceDirectory": "E:/ultimate_alarm_clock/linux",
"dart.flutterSdkPath": ".fvm/versions/3.22.2"
}
16 changes: 16 additions & 0 deletions lib/app/data/models/world_clock_model.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
class WorldClockModel {
final String ianaTimezone;
final String cityName;

WorldClockModel({required this.ianaTimezone, required this.cityName});

Map<String, dynamic> toJson() => {
'ianaTimezone': ianaTimezone,
'cityName': cityName,
};

factory WorldClockModel.fromJson(Map<String, dynamic> json) => WorldClockModel(
ianaTimezone: json['ianaTimezone'] as String,
cityName: json['cityName'] as String,
);
}
13 changes: 13 additions & 0 deletions lib/app/data/providers/get_storage_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'dart:ui';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:ultimate_alarm_clock/app/data/models/world_clock_model.dart';

class GetStorageProvider {
late final GetStorage _getStorage;
Expand Down Expand Up @@ -52,4 +53,16 @@ class GetStorageProvider {
String profile = await _getStorage.read('profile') ?? 'Default';
return profile;
}

List<WorldClockModel> readWorldClocks() {
final List<dynamic>? raw = _getStorage.read<List>('worldClocks');
if (raw == null) return [];
return raw
.map((e) => WorldClockModel.fromJson(Map<String, dynamic>.from(e)))
.toList();
}

void writeWorldClocks(List<WorldClockModel> clocks) {
_getStorage.write('worldClocks', clocks.map((e) => e.toJson()).toList());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:get/get.dart';
import 'package:ultimate_alarm_clock/app/modules/bottomNavigationBar/controllers/bottom_navigation_bar_controller.dart';
import 'package:ultimate_alarm_clock/app/modules/settings/controllers/settings_controller.dart';
import 'package:ultimate_alarm_clock/app/modules/stopwatch/controllers/stopwatch_controller.dart';
import 'package:ultimate_alarm_clock/app/modules/worldClock/controllers/world_clock_controller.dart';

class BottomNavigationBarBinding extends Bindings {
@override
Expand All @@ -14,5 +15,6 @@ class BottomNavigationBarBinding extends Bindings {
() => StopwatchController(),
);
Get.lazyPut<SettingsController>(() => SettingsController(), fenix: true);
Get.lazyPut<WorldClockController>(() => WorldClockController());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:ultimate_alarm_clock/app/data/providers/secure_storage_provider.
import 'package:ultimate_alarm_clock/app/modules/home/views/home_view.dart';
import 'package:ultimate_alarm_clock/app/modules/stopwatch/views/stopwatch_view.dart';
import 'package:ultimate_alarm_clock/app/modules/timer/views/timer_view.dart';
import 'package:ultimate_alarm_clock/app/modules/worldClock/views/world_clock_view.dart';

class BottomNavigationBarController extends GetxController
with WidgetsBindingObserver {
Expand All @@ -16,6 +17,7 @@ class BottomNavigationBarController extends GetxController
HomeView(),
StopwatchView(),
TimerView(),
WorldClockView(),
];

@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ class BottomNavigationBarView extends GetView<BottomNavigationBarController> {
icon: const Icon(Icons.timelapse_outlined),
label: 'Timer'.tr,
),
BottomNavigationBarItem(
icon: const Icon(Icons.public_outlined),
label: 'World Clock'.tr,
),
],
onTap: (index) {
Utils.hapticFeedback();
Expand Down
9 changes: 9 additions & 0 deletions lib/app/modules/worldClock/bindings/world_clock_binding.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import 'package:get/get.dart';
import 'package:ultimate_alarm_clock/app/modules/worldClock/controllers/world_clock_controller.dart';

class WorldClockBinding extends Bindings {
@override
void dependencies() {
Get.lazyPut<WorldClockController>(() => WorldClockController());
}
}
87 changes: 87 additions & 0 deletions lib/app/modules/worldClock/controllers/world_clock_controller.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
import 'dart:async';

import 'package:get/get.dart';
import 'package:intl/intl.dart';
import 'package:timezone/timezone.dart' as tz;
import 'package:ultimate_alarm_clock/app/data/models/world_clock_model.dart';
import 'package:ultimate_alarm_clock/app/data/providers/get_storage_provider.dart';

class WorldClockController extends GetxController {
final RxList<WorldClockModel> clocks = <WorldClockModel>[].obs;
final RxInt tick = 0.obs;
late final Timer _timer;

final GetStorageProvider _storage = Get.find<GetStorageProvider>();

@override
void onInit() {
super.onInit();
clocks.assignAll(_storage.readWorldClocks());
_timer = Timer.periodic(
const Duration(seconds: 1),
(_) => tick.value++,
);
}

@override
void onClose() {
_timer.cancel();
super.onClose();
}

void addClock(WorldClockModel clock) {
clocks.add(clock);
_storage.writeWorldClocks(clocks.toList());
}

void removeClock(int index) {
clocks.removeAt(index);
_storage.writeWorldClocks(clocks.toList());
}

String getCityTime(WorldClockModel clock, bool is24Hour) {
final location = tz.getLocation(clock.ianaTimezone);
final now = tz.TZDateTime.now(location);
return is24Hour
? DateFormat('HH:mm').format(now)
: DateFormat('h:mm').format(now);
}

String getCityTimePeriod(WorldClockModel clock) {
final location = tz.getLocation(clock.ianaTimezone);
final now = tz.TZDateTime.now(location);
return DateFormat('a').format(now);
}

String getCityDate(WorldClockModel clock) {
final location = tz.getLocation(clock.ianaTimezone);
final now = tz.TZDateTime.now(location);
return DateFormat('EEE, MMM d').format(now);
}

String getUtcOffset(WorldClockModel clock) {
final location = tz.getLocation(clock.ianaTimezone);
final now = tz.TZDateTime.now(location);
final offset = now.timeZoneOffset;
final sign = offset.isNegative ? '-' : '+';
final hours = offset.inHours.abs();
final minutes = offset.inMinutes.abs() % 60;
return minutes == 0
? 'UTC$sign$hours'
: 'UTC$sign$hours:${minutes.toString().padLeft(2, '0')}';
}

String getTimeDiff(WorldClockModel clock) {
final location = tz.getLocation(clock.ianaTimezone);
final now = tz.TZDateTime.now(location);
final localOffset = DateTime.now().timeZoneOffset;
final diff = now.timeZoneOffset - localOffset;
if (diff == Duration.zero) return 'Local time';
final sign = diff.isNegative ? '-' : '+';
final h = diff.inHours.abs();
final m = diff.inMinutes.abs() % 60;
return m == 0
? '${sign}${h}h from you'
: '${sign}${h}h ${m}m from you';
}
}
Loading