Add 'always force 24 hour' setting (#862)

robertodoering · Dec 20, 2022 · a1ab328 · a1ab328
1 parent db3c184
commit a1ab328
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/lib/components/settings/general/general_settings_page.dart b/lib/components/settings/general/general_settings_page.dart
@@ -88,6 +88,16 @@ class _GeneralSettingsList extends ConsumerWidget {
  ),
  ),
  VerticalSpacer.normal,
+ Card(
+ child: RbySwitchTile(
+ leading: const Icon(Icons.access_time),
+ title: const Text('always use 24-hour time format'),
+ value: general.alwaysUse24HourFormat,
+ borderRadius: theme.shape.borderRadius,
+ onChanged: generalNotifier.setAlwaysUse24HourFormat,
+ ),
+ ),
+ VerticalSpacer.normal,
  Card(
  child: RbySwitchTile(
  leading: const Icon(FeatherIcons.feather),

diff --git a/lib/components/settings/general/preferences/general_preferences.dart b/lib/components/settings/general/preferences/general_preferences.dart
@@ -41,6 +41,10 @@ class GeneralPreferencesNotifier extends StateNotifier<GeneralPreferences> {
  preferences.getBool('timelineRefreshBehavior', false),
  hideHomeAppBar: preferences.getBool('hideHomeTabBar', true),
  bottomAppBar: preferences.getBool('bottomAppBar', false),
+ alwaysUse24HourFormat: preferences.getBool(
+ 'alwaysUse24HourFormat',
+ false,
+ ),
  ),
  );
 
@@ -56,6 +60,7 @@ class GeneralPreferencesNotifier extends StateNotifier<GeneralPreferences> {
  setFloatingComposeButton(false);
  setHideHomeAppbar(true);
  setBottomAppBar(false);
+ setAlwaysUse24HourFormat(false);
  }
 
  void setShowChangelogDialog(bool value) {
@@ -98,6 +103,11 @@ class GeneralPreferencesNotifier extends StateNotifier<GeneralPreferences> {
  _preferences.setBool('bottomAppBar', value);
  }
 
+ void setAlwaysUse24HourFormat(bool value) {
+ state = state.copyWith(alwaysUse24HourFormat: value);
+ _preferences.setBool('alwaysUse24HourFormat', value);
+ }
+
  void updateLastShownVersion() {
  final version = _deviceInfo.packageInfo?.buildNumber;
 
@@ -155,6 +165,7 @@ class GeneralPreferences with _$GeneralPreferences {
  /// Whether the app bar should be built at the bottom of the home screen
  /// instead of the top.
  required bool bottomAppBar,
+ required bool alwaysUse24HourFormat,
  }) = _GeneralPreferences;
 
  GeneralPreferences._();

diff --git a/lib/components/tweet/widgets/card_content/tweet_card_details.dart b/lib/components/tweet/widgets/card_content/tweet_card_details.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:harpy/api/api.dart';
 import 'package:harpy/components/components.dart';
 import 'package:rby/rby.dart';
 
-class TweetCardDetails extends StatelessWidget {
+class TweetCardDetails extends ConsumerWidget {
  const TweetCardDetails({
  required this.tweet,
  required this.style,
@@ -13,16 +14,18 @@ class TweetCardDetails extends StatelessWidget {
  final TweetCardElementStyle style;
 
  @override
- Widget build(BuildContext context) {
+ Widget build(BuildContext context, WidgetRef ref) {
  final theme = Theme.of(context);
  final l10n = Localizations.of<MaterialLocalizations>(
  context,
  MaterialLocalizations,
  )!;
+ final general = ref.watch(generalPreferencesProvider);
 
  final date = l10n.formatFullDate(tweet.createdAt.toLocal());
  final time = l10n.formatTimeOfDay(
  TimeOfDay.fromDateTime(tweet.createdAt.toLocal()),
+ alwaysUse24HourFormat: general.alwaysUse24HourFormat,
  );
 
  final textStyle = theme.textTheme.bodyText2!.apply(

diff --git a/lib/components/tweet/widgets/card_content/tweet_card_handle.dart b/lib/components/tweet/widgets/card_content/tweet_card_handle.dart
@@ -126,7 +126,7 @@ class _CreatedAtRelativeTimeState extends State<_CreatedAtRelativeTime> {
  }
 }
 
-class _CreatedAtAbsoluteTime extends StatelessWidget {
+class _CreatedAtAbsoluteTime extends ConsumerWidget {
  const _CreatedAtAbsoluteTime({
  required this.localCreatedAt,
  this.sizeDelta = 0,
@@ -136,15 +136,19 @@ class _CreatedAtAbsoluteTime extends StatelessWidget {
  final double sizeDelta;
 
  @override
- Widget build(BuildContext context) {
+ Widget build(BuildContext context, WidgetRef ref) {
  final theme = Theme.of(context);
  final l10n = Localizations.of<MaterialLocalizations>(
  context,
  MaterialLocalizations,
  )!;
+ final general = ref.watch(generalPreferencesProvider);
 
  final date = l10n.formatCompactDate(localCreatedAt);
- final time = l10n.formatTimeOfDay(TimeOfDay.fromDateTime(localCreatedAt));
+ final time = l10n.formatTimeOfDay(
+ TimeOfDay.fromDateTime(localCreatedAt),
+ alwaysUse24HourFormat: general.alwaysUse24HourFormat,
+ );
 
  return FittedBox(
  child: Text(

diff --git a/lib/components/tweet/widgets/tweet_actions_bottom_sheet.dart b/lib/components/tweet/widgets/tweet_actions_bottom_sheet.dart
@@ -20,10 +20,12 @@ void showTweetActionsBottomSheet(
  ref.context,
  MaterialLocalizations,
  )!;
+ final general = ref.watch(generalPreferencesProvider);
 
  final date = l10n.formatFullDate(tweet.createdAt.toLocal());
  final time = l10n.formatTimeOfDay(
  TimeOfDay.fromDateTime(tweet.createdAt.toLocal()),
+ alwaysUse24HourFormat: general.alwaysUse24HourFormat,
  );
 
  showRbyBottomSheet<void>(