diff --git a/lib/screens/add_entry.dart b/lib/screens/add_entry.dart index 16ef176..57381fb 100644 --- a/lib/screens/add_entry.dart +++ b/lib/screens/add_entry.dart @@ -101,7 +101,7 @@ class _AddEntryScreen extends State { return Scaffold( appBar: AppBar( backgroundColor: Theme.of(context).colorScheme.inversePrimary, - title: const Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†"), + title: Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†", style: logoStyle(context)), ), body: Center( child: Container( diff --git a/lib/screens/add_meal.dart b/lib/screens/add_meal.dart index 2852cae..755cc54 100644 --- a/lib/screens/add_meal.dart +++ b/lib/screens/add_meal.dart @@ -58,7 +58,7 @@ class _AddMealScreen extends State { return Scaffold( appBar: AppBar( backgroundColor: Theme.of(context).colorScheme.inversePrimary, - title: const Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†"), + title: Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†", style: logoStyle(context)), ), body: Center( child: Container( diff --git a/lib/screens/add_product.dart b/lib/screens/add_product.dart index 3924de5..b650d41 100644 --- a/lib/screens/add_product.dart +++ b/lib/screens/add_product.dart @@ -111,7 +111,7 @@ class _AddProductScreen extends State { return Scaffold( appBar: AppBar( backgroundColor: Theme.of(context).colorScheme.inversePrimary, - title: const Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†"), + title: Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†", style: logoStyle(context)), ), body: Center( child: Container( diff --git a/lib/screens/based.dart b/lib/screens/based.dart index 2b34266..5c776c2 100644 --- a/lib/screens/based.dart +++ b/lib/screens/based.dart @@ -1,8 +1,15 @@ import 'package:flutter/material.dart'; import 'package:fooder/client.dart'; +TextStyle logoStyle(context) { + return Theme.of(context).textTheme.labelLarge!.copyWith( + color: Theme.of(context).colorScheme.secondary, + ); +} + abstract class BasedScreen extends StatefulWidget { final ApiClient apiClient; const BasedScreen({super.key, required this.apiClient}); + } diff --git a/lib/screens/edit_entry.dart b/lib/screens/edit_entry.dart index 3141b09..986c37a 100644 --- a/lib/screens/edit_entry.dart +++ b/lib/screens/edit_entry.dart @@ -100,7 +100,7 @@ class _EditEntryScreen extends State { return Scaffold( appBar: AppBar( backgroundColor: Theme.of(context).colorScheme.inversePrimary, - title: const Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†"), + title: Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†", style: logoStyle(context)), ), body: Center( child: Container( diff --git a/lib/screens/login.dart b/lib/screens/login.dart index 1fde44c..470dbe2 100644 --- a/lib/screens/login.dart +++ b/lib/screens/login.dart @@ -96,7 +96,7 @@ class _LoginScreen extends State { return Scaffold( appBar: AppBar( backgroundColor: Theme.of(context).colorScheme.inversePrimary, - title: const Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†"), + title: Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†", style: logoStyle(context)), ), body: Center( child: Container( diff --git a/lib/screens/main.dart b/lib/screens/main.dart index fd4f557..11ae15d 100644 --- a/lib/screens/main.dart +++ b/lib/screens/main.dart @@ -64,7 +64,6 @@ class _MainScreen extends State { Widget build(BuildContext context) { Widget content; Widget title; - var textStyle = Theme.of(context).textTheme.labelLarge!; if (diary != null) { content = Container( @@ -79,10 +78,10 @@ class _MainScreen extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ TextButton( - child: Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†", - style: textStyle.copyWith( - color: Theme.of(context).colorScheme.secondary)), - // style: TextStyle(fontSize: 18, color: Colors.white)), + child: Text( + "πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†", + style: logoStyle(context), + ), onPressed: () { Navigator.pushReplacement( context, @@ -110,7 +109,7 @@ class _MainScreen extends State { ); } else { content = const CircularProgressIndicator(); - title = const Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†"); + title = Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†", style: logoStyle(context)); } return Scaffold( diff --git a/lib/screens/register.dart b/lib/screens/register.dart index 9b80b53..ece6a1a 100644 --- a/lib/screens/register.dart +++ b/lib/screens/register.dart @@ -81,7 +81,7 @@ class _RegisterScreen extends State { return Scaffold( appBar: AppBar( backgroundColor: Theme.of(context).colorScheme.inversePrimary, - title: const Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†"), + title: Text("πŸ…΅πŸ…ΎπŸ…ΎπŸ…³πŸ…΄πŸ†", style: logoStyle(context)), ), body: Center( child: Container( diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 4fc0204..005697a 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -227,7 +227,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 3b46a8c..6b55566 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@