Commit c3c90b5

@@ -62,7 +62,7 @@ class MeasurementList extends StatelessWidget {
             Divider(
               height: 0,
               thickness: 2,
-              color: Theme.of(context).primaryColor,
+              color: Theme.of(context).colorScheme.primaryContainer,
             )
           ]);
         }),

@@ -398,8 +398,7 @@ class SettingsSection extends StatelessWidget {
           child: Align(
             alignment: const Alignment(-0.93, 0),
             child: DefaultTextStyle(
-                style: (Theme.of(context).textTheme.bodyMedium ?? const TextStyle())
-                    .copyWith(color: Theme.of(context).primaryColor, fontWeight: FontWeight.bold),
+                style: Theme.of(context).textTheme.titleMedium!,
                 child: title),
           ),
         ),

@@ -25,7 +25,7 @@ class _EnterTimeFormatScreenState extends State<EnterTimeFormatScreen> {
           key: _formKey,
           child: SingleChildScrollView(
             child: Container(
-              padding: const EdgeInsets.all(90.0),
+              padding: const EdgeInsets.all(60.0),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -40,7 +40,7 @@ class _EnterTimeFormatScreenState extends State<EnterTimeFormatScreen> {
                                   const TimeFormattingHelp()));
                     },
                     child: SizedBox(
-                      height: 48,
+                      height: 65,
                       child: Center(
                         child: Text(
                           AppLocalizations.of(context)!.enterTimeFormatTxt2,
@@ -79,16 +79,16 @@ class _EnterTimeFormatScreenState extends State<EnterTimeFormatScreen> {
                   ),
                   Row(
                     children: [
-                      ElevatedButton(
+                      TextButton(
                           onPressed: () {
                             Navigator.of(context).pop();
                           },
-                          style: ElevatedButton.styleFrom(
-                              backgroundColor:
-                                  Theme.of(context).unselectedWidgetColor),
                           child: Text(AppLocalizations.of(context)!.btnCancel)),
                       const Spacer(),
-                      ElevatedButton(
+                      FilledButton.icon(
+                          key: const Key('btnSave'),
+                          icon: const Icon(Icons.save),
+                          label: Text(AppLocalizations.of(context)!.btnSave),
                           onPressed: () {
                             if (_formKey.currentState!.validate()) {
                               Provider.of<Settings>(context, listen: false)
@@ -96,9 +96,7 @@ class _EnterTimeFormatScreenState extends State<EnterTimeFormatScreen> {
                               Navigator.of(context).pop();
                             }
                           },
-                          style: ElevatedButton.styleFrom(
-                              backgroundColor: Theme.of(context).primaryColor),
-                          child: Text(AppLocalizations.of(context)!.btnSave))
+                      ),
                     ],
                   )
                 ],

@@ -177,6 +177,8 @@ class _AddMeasurementPageState extends State<AddMeasurementPage> {
                           const Spacer(),
                           FilledButton.icon(
                             key: const Key('btnSave'),
+                            icon: const Icon(Icons.save),
+                            label: Text(AppLocalizations.of(context)!.btnSave),
                             onPressed: () async {
                               if ((_formKey.currentState?.validate() ?? false) ||
                                   (_systolic == null && _diastolic == null && _pulse == null && _note != null)){
@@ -192,8 +194,6 @@ class _AddMeasurementPageState extends State<AddMeasurementPage> {
                                 navigator.pop();
                               }
                             },
-                            icon: Icon(Icons.save),
-                            label: Text(AppLocalizations.of(context)!.btnSave),
                           )
                         ],
                       )

@@ -198,7 +198,7 @@ class Statistic extends StatelessWidget {
             child: Align(
               alignment: Alignment.center,
               child: DefaultTextStyle(
-                style: TextStyle(color: Theme.of(context).primaryColor, fontWeight: FontWeight.bold, fontSize: 40),
+                style: Theme.of(context).textTheme.displaySmall!,
                 child: FittedBox(
                   fit: BoxFit.fitHeight,
                   child: child