Merge pull request #77 from 3Dpass/dev

feat: Expandable objects & putObject update. Version 2.17.2
3Dpass · Nov 6, 2024 · 2e954f0 · 2e954f0
2 parents 7f219d7 + fed6b45
commit 2e954f0
Show file tree

Hide file tree

Showing 110 changed files with 1,586 additions and 1,728 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -103,7 +103,11 @@ android {
 
     applicationVariants.configureEach { variant ->
         variant.outputs.configureEach { output ->
-            outputFileName = "threedpass" + "-" + versionName + "-" + output.getFilter(com.android.build.OutputFile.ABI) + ".apk"
+            def abiFilter = output.getFilter(com.android.build.OutputFile.ABI)
+            def abiVariant = abiFilter != null ? abiFilter : "universal"
+//            def abiFilter = output.variantOutputConfiguration.filters.find { it.filterType == FilterConfiguration.FilterType.ABI }
+//            def abiVariant = abiFilter != null ? abiFilter.identifier : "universal"
+            outputFileName = "threedpass" + "-" + versionName + "-" + abiVariant + ".apk"
         }
     }
 }
@@ -113,5 +117,5 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -334,7 +334,7 @@
     "from_address_dropdown_hint": "Choose account",
     "poscan_putobject_choose_napprovals": "nApprovals",
     "poscan_putobject_choose_hashes": "Hashes",
-    "poscan_putobject_fees_warning": "This transaction takes 100+ P3D",
+    "poscan_putobject_fees_warning": "This transaction takes fees",
     "poscan_putobject_choose_properties": "Properties (optional)",
     "PROPERTIES_number_plural": {
         "zero": "0 properties chosen",
@@ -540,5 +540,9 @@
         "other":  "assets"
     },
     "linked_snapshots_helper": "+ {} found",
-    "view_object": "View object"
+    "view_object": "View object",
+
+    "@2.17.2": {},
+    "create_atomic_swap_choose_account_label": "Choose account",
+    "put_object_is_private_flag": "Is private"
 }
diff --git a/lib/core/architecture/get_data_usecase.dart b/lib/core/architecture/get_data_usecase.dart
diff --git a/lib/core/architecture/local_repository_interface.dart b/lib/core/architecture/local_repository_interface.dart
diff --git a/lib/core/architecture/remote_repository_interface.dart b/lib/core/architecture/remote_repository_interface.dart
diff --git a/lib/core/errors/storage_error.dart b/lib/core/errors/storage_error.dart
diff --git a/lib/core/errors/storage_error.freezed.dart b/lib/core/errors/storage_error.freezed.dart
diff --git a/packages/super_core/lib/failure.dart → lib/core/errors/wrong_type_fauilure.dart b/packages/super_core/lib/failure.dart → lib/core/errors/wrong_type_fauilure.dart
diff --git a/lib/core/persistence/hive_universal_store.dart b/lib/core/persistence/hive_universal_store.dart
@@ -1,5 +1,4 @@
 import 'package:hive_flutter/hive_flutter.dart';
-import 'package:threedpass/core/errors/storage_error.dart';
 import 'package:threedpass/core/utils/logger.dart';
 
 class HiveUniversalStore<T> {
@@ -20,17 +19,19 @@ class HiveUniversalStore<T> {
   }
 
   /// Delete object by unknown key
-  Future<StorageError?> removeObject(final T value) async {
+  Future<void> removeObject(final T value) async {
     final map = _box.toMap();
     final dynamic key = map.keys
         .firstWhere((final dynamic k) => map[k] == value, orElse: () => null);
 
     if (key != null) {
       await _box.delete(key);
       await _box.flush();
-      return null;
+      return;
+    } else {
+      logger.e("Couldn't find object $value to remove");
+      throw Exception("Couldn't find object $value to remove");
     }
-    return const StorageError.impossibleOperation();
   }
 
   // Future<void> removeAll() async {