Merge pull request #17 from bcgov/task/update-code-fix-result-expand-…

…collapse Make suggested code updates, update gradle, fix isExpanded bug
bcgov · Oct 3, 2023 · 534c8ad · 534c8ad
2 parents bacd1c7 + cf34cda
commit 534c8ad
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -37,7 +37,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdk flutter.compileSdkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.0'
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/lib/fbp_results.dart b/lib/fbp_results.dart
@@ -248,7 +248,7 @@ class ResultsState extends State<ResultsStateWidget> {
                 expandedHeaderPadding: const EdgeInsets.all(0),
                 expansionCallback: (int index, bool isExpanded) {
                   setState(() {
-                    _groups[index].isExpanded = !isExpanded;
+                    _groups[index].isExpanded = isExpanded;
                   });
                   if (!isExpanded) {
                     // this doesn't seem perfect - we're waiting delaying

diff --git a/lib/main.dart b/lib/main.dart
@@ -102,18 +102,18 @@ class HomePageState extends State<HomePage> {
     const double edgeInset = 3;
     switch (section) {
       case (Section.about):
-        return SingleChildScrollView(
-            padding: const EdgeInsets.only(left: edgeInset, right: edgeInset),
+        return const SingleChildScrollView(
+            padding: EdgeInsets.only(left: edgeInset, right: edgeInset),
             child: Column(
-              children: const [AboutPage()],
+              children: [AboutPage()],
             ));
       case (Section.advanced):
-        return Center(
+        return const Center(
             child: SingleChildScrollView(
                 padding:
-                    const EdgeInsets.only(left: edgeInset, right: edgeInset),
+                    EdgeInsets.only(left: edgeInset, right: edgeInset),
                 child: Column(
-                  children: const [AdvancedFireBehaviourPredictionForm()],
+                  children: [AdvancedFireBehaviourPredictionForm()],
                 )));
       case (Section.fwi):
         return Container(
@@ -166,7 +166,6 @@ class HomePageState extends State<HomePage> {
 
   void _changeSection(Section section) {
     setState(() {
-      print('changing section...');
       _selectedSection = section;
     });
     Navigator.pop(context);

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.9+12
+version: 1.0.9+13
 
 environment:
   sdk: ">=2.17.1 <3.0.0"