Skip to content

#61 Time zone converter added #425

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
mareksagan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#61 Time zone converter added #425

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
2 changes: 2 additions & 0 deletions assets/property_icons/timezone.svg
View file
Open in desktop

@ferraridamiano ferraridamiano May 9, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Image

I suggest you to use an icon similar to this. Otherwise it's not clear

@TryTryAgain TryTryAgain May 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, the proposed looks like a basketball to me, this would be much clearer visually.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions assets/property_icons/timezone_filled.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions lib/data/default_order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:converterpro/models/time_zone_property.dart';
import 'package:converterpro/utils/utils.dart';
import 'package:units_converter/units_converter.dart';

Expand All @@ -7,6 +8,7 @@ const defaultPropertiesOrder = [
PROPERTYX.volume,
PROPERTYX.currencies,
PROPERTYX.time,
PROPERTYX.timezone,
PROPERTYX.temperature,
PROPERTYX.speed,
PROPERTYX.mass,
Expand Down Expand Up @@ -313,4 +315,44 @@ const Map<PROPERTYX, List<dynamic>> defaultUnitsOrder = {
TORQUE.poundForceInch,
TORQUE.poundalMeter,
],
PROPERTYX.timezone: [
TIMEZONE.utcMinus12,
TIMEZONE.utcMinus11,
TIMEZONE.utcMinus10,
TIMEZONE.utcMinus9_30,
TIMEZONE.utcMinus9,
TIMEZONE.utcMinus8,
TIMEZONE.utcMinus7,
TIMEZONE.utcMinus6,
TIMEZONE.utcMinus5,
TIMEZONE.utcMinus4,
TIMEZONE.utcMinus3_30,
TIMEZONE.utcMinus3,
TIMEZONE.utcMinus2,
TIMEZONE.utcMinus1,
TIMEZONE.utc0,
TIMEZONE.utcPlus1,
TIMEZONE.utcPlus2,
TIMEZONE.utcPlus3,
TIMEZONE.utcPlus3_30,
TIMEZONE.utcPlus4,
TIMEZONE.utcPlus4_30,
TIMEZONE.utcPlus5,
TIMEZONE.utcPlus5_30,
TIMEZONE.utcPlus5_45,
TIMEZONE.utcPlus6,
TIMEZONE.utcPlus6_30,
TIMEZONE.utcPlus7,
TIMEZONE.utcPlus8,
TIMEZONE.utcPlus8_45,
TIMEZONE.utcPlus9,
TIMEZONE.utcPlus9_30,
TIMEZONE.utcPlus10,
TIMEZONE.utcPlus10_30,
TIMEZONE.utcPlus11,
TIMEZONE.utcPlus12,
TIMEZONE.utcPlus12_45,
TIMEZONE.utcPlus13,
TIMEZONE.utcPlus14,
],
};
42 changes: 42 additions & 0 deletions lib/data/property_unit_maps.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:converterpro/models/time_zone_property.dart';
import 'package:flutter/cupertino.dart';
import 'package:translations/app_localizations.dart';
import 'package:units_converter/units_converter.dart';
Expand All @@ -16,6 +17,7 @@ Map<PROPERTYX, PropertyUi> getPropertyUiMap(BuildContext context) {
PROPERTYX.volume: l10n.volume,
PROPERTYX.currencies: l10n.currencies,
PROPERTYX.time: l10n.time,
PROPERTYX.timezone: l10n.timezone,
PROPERTYX.temperature: l10n.temperature,
PROPERTYX.speed: l10n.speed,
PROPERTYX.mass: l10n.mass,
Expand Down Expand Up @@ -337,5 +339,45 @@ Map<PROPERTYX, Map<dynamic, String>> getUnitUiMap(BuildContext context) {
TORQUE.poundForceInch: l10n.poundForceInch,
TORQUE.poundalMeter: l10n.poundalMeter,
},
PROPERTYX.timezone: {
TIMEZONE.utcMinus12: l10n.utcMinus12,
TIMEZONE.utcMinus11: l10n.utcMinus11,
TIMEZONE.utcMinus10: l10n.utcMinus10,
TIMEZONE.utcMinus9_30: l10n.utcMinus9_30,
TIMEZONE.utcMinus9: l10n.utcMinus9,
TIMEZONE.utcMinus8: l10n.utcMinus8,
TIMEZONE.utcMinus7: l10n.utcMinus7,
TIMEZONE.utcMinus6: l10n.utcMinus6,
TIMEZONE.utcMinus5: l10n.utcMinus5,
TIMEZONE.utcMinus4: l10n.utcMinus4,
TIMEZONE.utcMinus3_30: l10n.utcMinus3_30,
TIMEZONE.utcMinus3: l10n.utcMinus3,
TIMEZONE.utcMinus2: l10n.utcMinus2,
TIMEZONE.utcMinus1: l10n.utcMinus1,
TIMEZONE.utc0: l10n.utc0,
TIMEZONE.utcPlus1: l10n.utcPlus1,
TIMEZONE.utcPlus2: l10n.utcPlus2,
TIMEZONE.utcPlus3: l10n.utcPlus3,
TIMEZONE.utcPlus3_30: l10n.utcPlus3_30,
TIMEZONE.utcPlus4: l10n.utcPlus4,
TIMEZONE.utcPlus4_30: l10n.utcPlus4_30,
TIMEZONE.utcPlus5: l10n.utcPlus5,
TIMEZONE.utcPlus5_30: l10n.utcPlus5_30,
TIMEZONE.utcPlus5_45: l10n.utcPlus5_45,
TIMEZONE.utcPlus6: l10n.utcPlus6,
TIMEZONE.utcPlus6_30: l10n.utcPlus6_30,
TIMEZONE.utcPlus7: l10n.utcPlus7,
TIMEZONE.utcPlus8: l10n.utcPlus8,
TIMEZONE.utcPlus8_45: l10n.utcPlus8_45,
TIMEZONE.utcPlus9: l10n.utcPlus9,
TIMEZONE.utcPlus9_30: l10n.utcPlus9_30,
TIMEZONE.utcPlus10: l10n.utcPlus10,
TIMEZONE.utcPlus10_30: l10n.utcPlus10_30,
TIMEZONE.utcPlus11: l10n.utcPlus11,
TIMEZONE.utcPlus12: l10n.utcPlus12,
TIMEZONE.utcPlus12_45: l10n.utcPlus12_45,
TIMEZONE.utcPlus13: l10n.utcPlus13,
TIMEZONE.utcPlus14: l10n.utcPlus14,
},
};
}
20 changes: 14 additions & 6 deletions lib/models/conversions.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:converterpro/models/order.dart';
import 'package:converterpro/models/properties_list.dart';
import 'package:converterpro/models/time_zone_property.dart';
import 'package:converterpro/utils/utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
Expand Down Expand Up @@ -46,10 +47,13 @@ class ConversionsNotifier
signed: false,
),
NUMERAL_SYSTEMS.hexadecimal => TextInputType.text,
_ => const TextInputType.numberWithOptions(
decimal: true,
signed: false,
),
_ => switch (propertyx) {
PROPERTYX.timezone => TextInputType.datetime,
Comment on lines +50 to +51

@ferraridamiano ferraridamiano May 9, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid this switch?

_ => const TextInputType.numberWithOptions(
decimal: true,
signed: false,
),
},
},
validator: switch (e) {
TEMPERATURE.celsius ||
Expand All @@ -61,7 +65,10 @@ class ConversionsNotifier
NUMERAL_SYSTEMS.octal => VALIDATOR.octal,
NUMERAL_SYSTEMS.decimal => VALIDATOR.decimal,
NUMERAL_SYSTEMS.hexadecimal => VALIDATOR.hexadecimal,
_ => VALIDATOR.rationalNonNegative,
_ => switch (propertyx) {
PROPERTYX.timezone => VALIDATOR.time,
_ => VALIDATOR.rationalNonNegative,
},
},
),
)
Expand Down Expand Up @@ -116,7 +123,8 @@ class ConversionsNotifier
///Clears the values of the current page
Future<void> clearAllValues(PROPERTYX property) async {
List<UnitData> currentUnitDataList = state.value![property]!;
if (currentUnitDataList[0].property == PROPERTYX.numeralSystems) {
if (currentUnitDataList[0].property == PROPERTYX.numeralSystems ||
currentUnitDataList[0].property == PROPERTYX.timezone) {
_savedUnitDataList = [
...currentUnitDataList.map((unitData) => unitData.unit.stringValue),
];
Expand Down
11 changes: 5 additions & 6 deletions lib/models/order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class UnitsOrderNotifier extends AsyncNotifier<Map<PROPERTYX, List>> {
if (storedList == null) {
newState[property] = defaultOrder;
} else {
final storedOrder = storedList
var storedOrder = storedList
.map(
(storedString) => defaultOrder.firstWhereOrNull(
(unit) => storedString == unit.toString(),
Expand All @@ -110,11 +110,10 @@ class UnitsOrderNotifier extends AsyncNotifier<Map<PROPERTYX, List>> {
.nonNulls
.cast()
.toList();
// Add missing units
if (storedOrder.length != defaultOrder.length) {
storedOrder.addAll(
defaultOrder.toSet().difference(storedOrder.toSet()),
);
// Reset to default order when units are missing or out of order
if (storedOrder.length != defaultOrder.length ||
!listEquals(storedOrder, defaultOrder)) {
storedOrder = defaultOrder.toList();
Comment on lines +113 to +116

@ferraridamiano ferraridamiano May 9, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the changes here?

(await ref.read(
sharedPref.future,
)).setStringList(storeKey(property), _toStorableString(storedOrder));
Expand Down
4 changes: 4 additions & 0 deletions lib/models/properties_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:converterpro/models/currencies.dart';
import 'package:converterpro/models/settings.dart';
import 'package:converterpro/models/time_zone_property.dart';
import 'package:converterpro/utils/utils.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:units_converter/units_converter.dart';
Expand Down Expand Up @@ -151,5 +152,8 @@ final propertiesMapProvider = FutureProvider<Map<PROPERTYX, Property>>((
removeTrailingZeros: removeTrailingZeros,
name: PROPERTYX.torque,
),
PROPERTYX.timezone: TimeZoneProperty(
name: PROPERTYX.timezone,
),
};
});
Loading