Fix importing from Massive sets export - 1.0.63 🚀

brandonp2412 · Apr 25, 2024 · 9b0ded1 · 9b0ded1
1 parent cc7e99f
commit 9b0ded1
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 14 deletions.
diff --git a/fastlane/metadata/android/en-US/changelogs/70.txt b/fastlane/metadata/android/en-US/changelogs/70.txt
@@ -0,0 +1,2 @@
+- Fix importing from Massive sets export
+- Fix line graph crash for empty relative strengths
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/8_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/8_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8_en-US.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/5_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/5_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/6_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/6_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/8_en-US.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/8_en-US.png
diff --git a/lib/import_data.dart b/lib/import_data.dart
@@ -4,6 +4,7 @@ import 'package:flexify/database.dart';
 import 'package:flexify/main.dart';
 import 'package:flexify/utils.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 class ImportData extends StatelessWidget {
   final BuildContext pageContext;
@@ -32,19 +33,40 @@ class ImportData extends StatelessWidget {
                           const CsvToListConverter(eol: "\n").convert(csv);
                       if (rows.isEmpty) return;
 
-                      final gymSets = rows.map(
-                        (row) => GymSetsCompanion(
-                          name: Value(row[1]),
-                          reps: Value(row[2]),
-                          weight: Value(row[3]),
-                          created: Value(parseDate(row[4])),
-                          unit: Value(row[5]),
-                          bodyWeight: Value(row.elementAtOrNull(6) ?? 0),
-                        ),
-                      );
-                      await db.batch(
-                        (batch) => batch.insertAll(db.gymSets, gymSets),
-                      );
+                      try {
+                        final gymSets = rows.map(
+                          (row) => GymSetsCompanion(
+                            name: Value(row[1]),
+                            reps: Value(row[2] is String
+                                ? double.parse(row[2])
+                                : row[2]),
+                            weight: Value(row[3] is String
+                                ? double.parse(row[3])
+                                : row[3]),
+                            created: Value(parseDate(row[4])),
+                            unit: Value(row[5]),
+                            bodyWeight: Value(row.elementAtOrNull(6) is String
+                                ? double.parse(row[6])
+                                : row.elementAtOrNull(6) ?? 0),
+                          ),
+                        );
+                        await db.gymSets.deleteAll();
+                        await db.gymSets.insertAll(gymSets);
+                      } catch (error) {
+                        if (!pageContext.mounted) return;
+                        ScaffoldMessenger.of(pageContext).showSnackBar(
+                          SnackBar(
+                            content: const Text('Failed to import data'),
+                            action: SnackBarAction(
+                                label: "Copy",
+                                onPressed: () {
+                                  Clipboard.setData(
+                                      ClipboardData(text: error.toString()));
+                                }),
+                          ),
+                        );
+                        return;
+                      }
 
                       final weightSet = await getBodyWeight();
                       if (weightSet != null)

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flexify
 description: Track gym progress, visualize graphs, enjoy offline support & timers
 publish_to: none
-version: 1.0.62+69
+version: 1.0.63+70
 environment:
   sdk: '>=3.2.6 <4.0.0'
 dependencies:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Fix importing from Massive sets export
		- Fix line graph crash for empty relative strengths