Skip to content

Issue:225 Feature: Integrating World Clock in UAC #777

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.

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 2 commits into
base: main
Choose a base branch
from
Open
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
55 changes: 25 additions & 30 deletions lib/app/modules/alarmRing/views/alarm_ring_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class AlarmControlView extends GetView<AlarmControlController> {

ThemeController themeController = Get.find<ThemeController>();

Obx getAddSnoozeButtons(
BuildContext context, int snoozeMinutes, String title) {
Obx getAddSnoozeButtons(BuildContext context, int snoozeMinutes, String title){
return Obx(
() => TextButton(
style: ButtonStyle(
Expand Down Expand Up @@ -48,7 +47,6 @@ class AlarmControlView extends GetView<AlarmControlController> {
if (didPop) {
return;
}

Get.snackbar(
'Note'.tr,
"You can't go back while the alarm is ringing".tr,
Expand Down Expand Up @@ -82,10 +80,7 @@ class AlarmControlView extends GetView<AlarmControlController> {
: (controller.is24HourFormat.value)
? '${controller.timeNow24Hr}'
: '${controller.timeNow[0]} ${controller.timeNow[1]}',
style: Theme.of(context)
.textTheme
.displayLarge!
.copyWith(fontSize: 50),
style: Theme.of(context).textTheme.displayLarge!.copyWith(fontSize: 50),
),
const SizedBox(
height: 20,
Expand Down Expand Up @@ -224,29 +219,29 @@ class AlarmControlView extends GetView<AlarmControlController> {
),
),
),
Positioned(
bottom: 0,
left: 0,
right: 0,
child: Container(
width: double.infinity,
height: 60,
color: Colors.red,
child: TextButton(
onPressed: () {
Utils.hapticFeedback();
Get.offNamed('/bottom-navigation-bar');
},
child: Text(
'Exit Preview'.tr,
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
color: Colors.white,
fontWeight: FontWeight.bold,
),
),
),
),
),
// Positioned(
// bottom: 0,
// left: 0,
// right: 0,
// child: Container(
// width: double.infinity,
// height: 60,
// color: Colors.red,
// child: TextButton(
// onPressed: () {
// Utils.hapticFeedback();
// Get.offNamed('/bottom-navigation-bar');
// },
// child: Text(
// 'Exit Preview'.tr,
// style: Theme.of(context).textTheme.bodyLarge!.copyWith(
// color: Colors.white,
// fontWeight: FontWeight.bold,
// ),
// ),
// ),
// ),
// ),
],
),
),
Expand Down
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/worldClockPage/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 Expand Up @@ -46,6 +48,5 @@ class BottomNavigationBarController extends GetxController
void changeTab(int index) {
activeTabIndex.value = index;
_saveState();

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ class BottomNavigationBarView extends GetView<BottomNavigationBarController> {
controller.changeTab(index);
},
);
} else {
}
else {
return const Center(
child: CircularProgressIndicator.adaptive(
backgroundColor: Colors.transparent,
Expand All @@ -45,29 +46,31 @@ class BottomNavigationBarView extends GetView<BottomNavigationBarController> {
useLegacyColorScheme: false,
items: [
BottomNavigationBarItem(
icon: const Icon(Icons.alarm),
icon: const Icon(Icons.alarm, size: 20),
label: 'Alarm'.tr,
),
BottomNavigationBarItem(
icon: const Icon(Icons.timer_outlined),
icon: const Icon(Icons.timer_outlined, size: 20),
label: 'StopWatch'.tr,
),
BottomNavigationBarItem(
icon: const Icon(Icons.timelapse_outlined),
icon: const Icon(Icons.timelapse_outlined, size: 20),
label: 'Timer'.tr,
),
BottomNavigationBarItem(
icon: const Icon(Icons.more_time_outlined, size: 20),
label: 'WorldClock'.tr,
),
],
onTap: (index) {
Utils.hapticFeedback();
controller.changeTab(index);
pageController.jumpToPage(
index,
);
pageController.jumpToPage(index);
},
currentIndex: controller.activeTabIndex.value,
selectedLabelStyle: TextStyle(
color: kprimaryColor,
fontSize: 14,
fontSize: 12,
decorationColor:
themeController.primaryBackgroundColor.value,
decorationThickness: 0.8,
Expand Down
17 changes: 17 additions & 0 deletions lib/app/modules/citySelection/bindings/city_selection_binding.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
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/citySelection/controllers/city_selection_controller.dart';

class HomeBinding extends Bindings {
@override
void dependencies() {
Get.put<CitySelectionController>(
CitySelectionController(),
);


Get.lazyPut<BottomNavigationBarController>(
() => BottomNavigationBarController(),
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import 'package:get/get.dart';
import 'package:flutter/material.dart';
import 'package:ultimate_alarm_clock/app/utils/utils_world_gmt_data.dart';
import 'package:ultimate_alarm_clock/app/utils/selected_cities.dart';

class CitySelectionController extends GetxController {
ScrollController scrollController = ScrollController();
RxMap<String, int> letterIndexMap = <String, int>{}.obs;
RxString selectedLetter = "".obs;

final List<String> alphabet = [
"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
"N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"
];

void scrollToLetter(String letter) {
if (letterIndexMap.containsKey(letter)) {
int index = letterIndexMap[letter]!;
scrollController.animateTo(
index * 60.0,
duration: Duration(milliseconds: 300),
curve: Curves.easeInOut,
);
}
}

void onCityTap(Map<String, String> city) {
selectedCities.add(city);
Get.back(result: city);
}

@override
void onInit() {
super.onInit();
for (int i = 0; i < cities.length; i++) {
String letter = cities[i]['city']![0];
letterIndexMap[letter] = letterIndexMap[letter] ?? i;
}
}

@override
void onClose() {
scrollController.dispose();
super.onClose();
}
}
42 changes: 42 additions & 0 deletions lib/app/modules/citySelection/controllers/search_controller.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import 'package:get/get.dart';
import 'package:flutter/material.dart';
import 'package:ultimate_alarm_clock/app/utils/utils_world_gmt_data.dart';
import 'package:ultimate_alarm_clock/app/utils/selected_cities.dart';

class SearchController extends GetxController {
RxBool showCancelIcon = false.obs;
RxList<Map<String, String>> filteredCities = <Map<String, String>>[].obs;
TextEditingController searchController = TextEditingController();

void searchKeyword(String query) {
query = query.toLowerCase();
filteredCities.value = cities.where((city) {
return city['city']!.toLowerCase().contains(query) ||
city['timezone']!.toLowerCase().contains(query) ||
city['country']!.toLowerCase().contains(query);
}).toList();
}

void clearSearch() {
searchController.clear();
filteredCities.clear(); // Clear the filtered cities list
}


void onCityTap(Map<String, String> city) {
if (!selectedCities.contains(city)) {
selectedCities.add(city);
}
Get.back(result: city);
}

void checkQueryEmptyOrNot(String text) {
showCancelIcon.value = text.isNotEmpty;
}

@override
void onInit() {
super.onInit();
filteredCities.value = [];
}
}
88 changes: 88 additions & 0 deletions lib/app/modules/citySelection/views/city_selection_view.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ultimate_alarm_clock/app/modules/citySelection/controllers/city_selection_controller.dart';
import 'package:ultimate_alarm_clock/app/modules/citySelection/views/search_view.dart';
import 'package:ultimate_alarm_clock/app/modules/settings/controllers/theme_controller.dart';
import 'package:ultimate_alarm_clock/app/utils/utils_world_gmt_data.dart';

class CitySelectionView extends StatelessWidget {
final CitySelectionController controller = Get.put(CitySelectionController());

@override
Widget build(BuildContext context) {
ThemeController themeController = Get.find<ThemeController>();
return Scaffold(
backgroundColor: Color(0xFF16171C),
appBar: AppBar(
backgroundColor: const Color(0xFF16171C),
iconTheme: const IconThemeData(
color: Color(0xffAFFC41),
),
shadowColor: Colors.transparent,
),
body: Padding(
padding: const EdgeInsets.all(10.0),
child: Column(
children: [
const Text('Select City',
style: TextStyle(
color: Colors.white,
fontSize: 30,
fontWeight: FontWeight.bold,
),
),
const Text('Time zones',
style: TextStyle(
color: Colors.white,
fontSize: 20,
),
),

const SizedBox(height: 20,),

Container(
height: 60,
width: double.infinity,
child: TextField(
readOnly: true,
onTap: () => Get.to(() => SearchView()),
decoration: InputDecoration(
hintText: 'Search for country or city',
hintStyle: const TextStyle(
color: Colors.black38,
fontSize: 18,
),
prefixIcon: const Icon(Icons.search, size: 30, color: Colors.black,),
filled: true,
fillColor: Colors.white,
border: OutlineInputBorder(
borderSide: BorderSide.none,
borderRadius: BorderRadius.circular(50.0),
),
),
),
),

const SizedBox(height: 20,),

Expanded(
child: ListView.builder(
controller: controller.scrollController,
itemCount: cities.length,
itemBuilder: (context, index) => ListTile(
onTap: () => controller.onCityTap(cities[index]),
title: Text(cities[index]['city']!,
style: const TextStyle(
color: Color(0xffAFFC41),
),
),
subtitle: Text(cities[index]['timezone']!),
),
),
),
],
),
),
);
}
}
Loading