Skip to content

Offline gym log for Android. No account, no ads, no internet.

Use the sync package in the app and server

InlitX3011e7d1dbf7
diff --git a/lib/services/auto_backup.dart b/lib/services/auto_backup.dart
index 312bf2e..bd67c4e 100644
--- a/lib/services/auto_backup.dart
+++ b/lib/services/auto_backup.dart
@@ -6,7 +6,7 @@ import 'dart:math' as math;
import 'package:archive/archive.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
-import 'package:gymmane_merge/gymmane_merge.dart';
+import 'package:sync/sync.dart';
import 'package:path_provider/path_provider.dart';
import '../state/fit_state.dart';
diff --git a/lib/services/backup_zip.dart b/lib/services/backup_zip.dart
index 407e459..46e26ab 100644
--- a/lib/services/backup_zip.dart
+++ b/lib/services/backup_zip.dart
@@ -3,7 +3,7 @@ import 'dart:io';
import 'dart:typed_data';
import 'package:archive/archive.dart';
-import 'package:gymmane_merge/gymmane_merge.dart';
+import 'package:sync/sync.dart';
import '../models/exercise.dart';
import '../models/nutrition.dart';
diff --git a/pubspec.lock b/pubspec.lock
index 527361f..a47ff8f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -349,13 +349,6 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
- gymmane_merge:
- dependency: "direct main"
- description:
- path: "packages/gymmane_merge"
- relative: true
- source: path
- version: "1.0.0"
home_widget:
dependency: "direct main"
description:
@@ -833,6 +826,13 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.4.1"
+ sync:
+ dependency: "direct main"
+ description:
+ path: "packages/sync"
+ relative: true
+ source: path
+ version: "1.0.0"
synchronized:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index b26b3b9..8968e02 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,8 +27,8 @@ dependencies:
url_launcher: ^6.3.2
video_player: ^2.9.2
archive: ^4.0.9
- gymmane_merge:
- path: packages/gymmane_merge
+ sync:
+ path: packages/sync
barcode: ^2.2.9
zxing2: ^0.2.4
app_settings: ^8.0.3
diff --git a/server/lib/src/phone_sync.dart b/server/lib/src/phone_sync.dart
index d1bdfbc..bf6cf62 100644
--- a/server/lib/src/phone_sync.dart
+++ b/server/lib/src/phone_sync.dart
@@ -4,7 +4,7 @@ import 'dart:io';
import 'dart:typed_data';
import 'package:archive/archive.dart';
-import 'package:gymmane_merge/gymmane_merge.dart';
+import 'package:sync/sync.dart';
import 'media_store.dart';
import 'state_store.dart';
diff --git a/server/pubspec.lock b/server/pubspec.lock
index 31a1283..73b089d 100644
--- a/server/pubspec.lock
+++ b/server/pubspec.lock
@@ -129,13 +129,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.2.0"
- gymmane_merge:
- dependency: "direct main"
- description:
- path: "../packages/gymmane_merge"
- relative: true
- source: path
- version: "1.0.0"
http_multi_server:
dependency: transitive
description:
@@ -328,6 +321,13 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.4.1"
+ sync:
+ dependency: "direct main"
+ description:
+ path: "../packages/sync"
+ relative: true
+ source: path
+ version: "1.0.0"
term_glyph:
dependency: transitive
description:
diff --git a/server/pubspec.yaml b/server/pubspec.yaml
index ea4a456..1731a69 100644
--- a/server/pubspec.yaml
+++ b/server/pubspec.yaml
@@ -8,8 +8,8 @@ environment:
dependencies:
archive: ^4.0.9
- gymmane_merge:
- path: ../packages/gymmane_merge
+ sync:
+ path: ../packages/sync
dev_dependencies:
lints: ^6.0.0