Improve typography in DateTime modal

matthiasn · Jun 16, 2023 · 0588984 · 0588984
1 parent eb8000b
commit 0588984
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed:
+- Typography in DateTime modal
+
+## [0.8.380] - 2023-06-16
 ### Fixed:
 - Border in search widget
 

diff --git a/lib/themes/theme.dart b/lib/themes/theme.dart
@@ -248,5 +248,15 @@ ThemeData withOverrides(ThemeData themeData) {
       ),
       floatingLabelBehavior: FloatingLabelBehavior.always,
     ),
+    textButtonTheme: TextButtonThemeData(
+      style: ButtonStyle(
+        textStyle: MaterialStateProperty.resolveWith((states) {
+          return const TextStyle(
+            fontSize: fontSizeMediumLarge,
+            fontFamily: mainFont,
+          );
+        }),
+      ),
+    ),
   );
 }
diff --git a/lib/widgets/date_time/datetime_bottom_sheet.dart b/lib/widgets/date_time/datetime_bottom_sheet.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -71,6 +73,8 @@ class _DateTimeBottomSheetState extends State<DateTimeBottomSheet> {
                     Colors.grey,
                 fontSize: fontSizeLarge,
                 fontWeight: FontWeight.w300,
+                fontFamily: mainFont,
+                fontFeatures: const [FontFeature.tabularFigures()],
               ),
             ),
           ),

diff --git a/lib/widgets/journal/entry_details/entry_datetime_modal.dart b/lib/widgets/journal/entry_details/entry_datetime_modal.dart
@@ -4,7 +4,6 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:lotti/blocs/journal/entry_cubit.dart';
 import 'package:lotti/blocs/journal/entry_state.dart';
 import 'package:lotti/classes/journal_entities.dart';
-import 'package:lotti/themes/theme.dart';
 import 'package:lotti/widgets/date_time/datetime_field.dart';
 import 'package:lotti/widgets/journal/entry_tools.dart';
 
@@ -103,9 +102,6 @@ class _EntryDateTimeModalState extends State<EntryDateTimeModal> {
                     padding: const EdgeInsets.only(left: 8),
                     child: Text(
                       formatDuration(dateFrom.difference(dateTo).abs()),
-                      style: monospaceTextStyle.copyWith(
-                        fontWeight: FontWeight.w100,
-                      ),
                     ),
                   ),
                 ],

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: lotti
 description: Achieve your goals and keep your data private with Lotti.
 publish_to: 'none'
-version: 0.9.380+2252
+version: 0.9.381+2253
 
 msix_config:
   display_name: LottiApp