diff --git a/VERSION b/VERSION index 0b9006e..f5f0aa6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9.7 \ No newline at end of file +1.9.8 \ No newline at end of file diff --git a/lib/constants/locale.dart b/lib/constants/locale.dart index b8d62d6..634d526 100644 --- a/lib/constants/locale.dart +++ b/lib/constants/locale.dart @@ -2,8 +2,6 @@ const String title = 'Sourdoc'; const String appBarHomeActionButtonTooltip = 'Open Help page'; const String formIntro = 'Change these settings, and the ingredients and fermentation values will automatically update.'; -const String formIntroLarge = - 'Change the following settings, and the ingredients and fermentation values below will automatically update.'; const String headerIngredients = 'Ingredients'; const String headerFermentation = 'Fermentation'; const String headerBakerFormulaDifference = diff --git a/lib/constants/style.dart b/lib/constants/style.dart index cd15771..0d4c967 100644 --- a/lib/constants/style.dart +++ b/lib/constants/style.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; const double contentLateralPadding = 25; -const double contentMaxWidth = 565; +const double contentMaxWidth = 590; const double mobileMaxScreenWidth = 480; bool isMobileScreenWidth(BuildContext context) { diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart index 238603c..9aefa88 100644 --- a/lib/widgets/home_page.dart +++ b/lib/widgets/home_page.dart @@ -11,6 +11,7 @@ import 'package:sourdoc/widgets/calculator_form.dart'; import 'package:sourdoc/widgets/centered_container.dart'; import 'package:sourdoc/widgets/variable_with_label.dart'; import 'package:sourdoc/widgets/header.dart'; +import 'package:sourdoc/widgets/version_info.dart'; class HomePage extends StatelessWidget { const HomePage({super.key}); @@ -56,37 +57,44 @@ class HomePageListView extends StatelessWidget { @override Widget build(BuildContext context) { - return ListView( - primary: true, - padding: const EdgeInsets.only(bottom: 25), - children: [ - CenteredContainer( - decoration: BoxDecoration( - color: Theme.of(context) - .colorScheme - .inversePrimary - .withAlpha(170)), - padding: const EdgeInsets.symmetric(vertical: 10), - child: Text( - style.isMobileScreenWidth(context) - ? locale.formIntro - : locale.formIntroLarge, - textAlign: TextAlign.start, - style: Theme.of(context).textTheme.bodyMedium, - )), - Card( - margin: EdgeInsets.zero, - semanticContainer: false, - shape: const RoundedRectangleBorder(), - child: CenteredContainer( - padding: const EdgeInsets.symmetric(vertical: 12), - child: ChangeNotifierProvider( - create: (context) => TemperatureUnitModel(), - child: const CalculatorForm()))), - const CenteredContainer(child: IngredientsValues()), - const CenteredContainer(child: FermentationValues()), - ], - ); + return Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: ListView( + primary: true, + padding: const EdgeInsets.only(bottom: 25), + children: [ + CenteredContainer( + decoration: BoxDecoration( + color: Theme.of(context) + .colorScheme + .inversePrimary + .withAlpha(170)), + padding: const EdgeInsets.symmetric(vertical: 10), + child: Text( + locale.formIntro, + textAlign: TextAlign.start, + style: Theme.of(context).textTheme.bodyMedium, + )), + Card( + margin: EdgeInsets.zero, + semanticContainer: false, + shape: const RoundedRectangleBorder(), + child: CenteredContainer( + padding: const EdgeInsets.symmetric(vertical: 12), + child: ChangeNotifierProvider( + create: (context) => TemperatureUnitModel(), + child: const CalculatorForm()))), + const CenteredContainer(child: IngredientsValues()), + const CenteredContainer(child: FermentationValues()), + ], + )), + if (MediaQuery.of(context).size.height > + (style.isMobileScreenWidth(context) ? 880 : 770)) + getVersionInfoContainer(context) + ]); } } diff --git a/lib/widgets/version_info.dart b/lib/widgets/version_info.dart index 76f2c85..93ee1c2 100644 --- a/lib/widgets/version_info.dart +++ b/lib/widgets/version_info.dart @@ -90,5 +90,5 @@ CenteredContainer getVersionInfoContainer(BuildContext context) => Border(top: BorderSide(width: 1, color: Colors.grey.shade300)), ), padding: EdgeInsets.fromLTRB(0, 18, 0, - Theme.of(context).platform == TargetPlatform.iOS ? 25 : 18), + Theme.of(context).platform == TargetPlatform.iOS ? 26 : 18), child: const VersionInfo()); diff --git a/web/download-release-asset.html b/web/download-release-asset.html index 4c026a7..4e383f9 100644 --- a/web/download-release-asset.html +++ b/web/download-release-asset.html @@ -3,7 +3,7 @@ Download Sourdoc release asset diff --git a/web/index.html b/web/index.html index 67479de..7a9d554 100644 --- a/web/index.html +++ b/web/index.html @@ -27,7 +27,7 @@