Add version info to home

duddu · Oct 22, 2023 · be47b8e · be47b8e
1 parent 536927c
commit be47b8e
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 38 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.9.7
+1.9.8
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -3,7 +3,7 @@
 <head>
     <title>Download Sourdoc release asset</title>
     <script>
-        const version = '1.9.7';
+        const version = '1.9.8';
         const build = new URLSearchParams(window.location.search).get('build');
         window.location.href = 'https://github.com/duddu/sourdoc/releases/download/v' + version + '/' + build + '-sourdoc-v' + version + '.tgz';
     </script>

diff --git a/web/index.html b/web/index.html
@@ -27,7 +27,7 @@
   <script async src="https://www.googletagmanager.com/gtag/js?id=G-ZS2J7KXZ0Q"></script>
   <script defer src="gtm-gtag.js"></script>
   <script>
-    const serviceWorkerVersion = '1.9.7';
+    const serviceWorkerVersion = '1.9.8';
   </script>
   <script defer src="flutter.js"></script>
 </head>