From 87ed25bd5b6df6ab88650d7f7ecd37ba0c3337c2 Mon Sep 17 00:00:00 2001 From: julian Date: Mon, 3 Jul 2023 18:25:18 -0600 Subject: [PATCH] use relative path for theme assets --- lib/main.dart | 6 +- lib/models/isar/stack_theme.dart | 470 +++++++------- lib/models/isar/stack_theme.g.dart | 583 +++++++++--------- .../sub_widgets/stack_theme_card.dart | 2 +- lib/themes/theme_service.dart | 7 +- lib/utilities/stack_file_system.dart | 11 +- .../notifications/notification_card_test.dart | 1 - test/pages/send_view/send_view_test.dart | 4 - test/widget_tests/address_book_card_test.dart | 2 - test/widget_tests/animated_text_test.dart | 1 - .../app_bar_icon_button_test.dart | 1 - .../draggable_switch_button_test.dart | 3 - .../custom_buttons/favorite_toggle_test.dart | 2 - .../custom_loading_overlay_test.dart | 2 - test/widget_tests/custom_pin_put_test.dart | 13 +- .../desktop/custom_text_button_test.dart | 1 - .../desktop/desktop_app_bar_test.dart | 1 - .../desktop_dialog_close_button_test.dart | 1 - .../desktop/desktop_dialog_test.dart | 1 - .../desktop/desktop_scaffold_test.dart | 6 - .../widget_tests/emoji_select_sheet_test.dart | 2 - .../icon_widgets/addressbook_icon_test.dart | 1 - test/widget_tests/managed_favorite_test.dart | 6 - test/widget_tests/node_card_test.dart | 3 - .../widget_tests/node_options_sheet_test.dart | 3 - test/widget_tests/progress_bar_test.dart | 1 - test/widget_tests/shake/shake_test.dart | 22 +- test/widget_tests/stack_dialog_test.dart | 3 - .../table_view/table_view_cell_test.dart | 1 - .../table_view/table_view_row_test.dart | 2 - .../table_view/table_view_test.dart | 1 - .../textfield_icon_button_test.dart | 1 - test/widget_tests/trade_card_test.dart | 2 - test/widget_tests/transaction_card_test.dart | 8 - test/widget_tests/wallet_card_test.dart | 2 - .../wallet_info_row_balance_future_test.dart | 1 - .../wallet_info_row/wallet_info_row_test.dart | 2 - 37 files changed, 576 insertions(+), 603 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index b39f9db64..94c70c8b1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -167,6 +167,8 @@ void main() async { await Hive.openBox(DB.boxNamePrefs); await Prefs.instance.init(); + await StackFileSystem.initThemesDir(); + // Desktop migrate handled elsewhere (currently desktop_login_view.dart) if (!Util.isDesktop) { int dbVersion = DB.instance.get( @@ -312,7 +314,7 @@ class _MaterialAppWithThemeState extends ConsumerState } ref.read(applicationThemesDirectoryPathProvider.notifier).state = - (await StackFileSystem.applicationThemesDirectory()).path; + StackFileSystem.themesDir!.path; _notificationsService = ref.read(notificationsProvider); _nodeService = ref.read(nodeServiceChangeNotifierProvider); @@ -407,7 +409,7 @@ class _MaterialAppWithThemeState extends ConsumerState WidgetsBinding.instance.addPostFrameCallback((_) async { //Add themes path to provider ref.read(applicationThemesDirectoryPathProvider.notifier).state = - (await StackFileSystem.applicationThemesDirectory()).path; + StackFileSystem.themesDir!.path; ref.read(themeProvider.state).state = ref.read(pThemeService).getTheme( themeId: themeId, diff --git a/lib/models/isar/stack_theme.dart b/lib/models/isar/stack_theme.dart index b005c40ea..c11f8144b 100644 --- a/lib/models/isar/stack_theme.dart +++ b/lib/models/isar/stack_theme.dart @@ -17,6 +17,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/extensions/impl/box_shadow.dart'; import 'package:stackwallet/utilities/extensions/impl/gradient.dart'; import 'package:stackwallet/utilities/extensions/impl/string.dart'; +import 'package:stackwallet/utilities/stack_file_system.dart'; part 'stack_theme.g.dart'; @@ -1508,7 +1509,6 @@ class StackTheme { factory StackTheme.fromJson({ required Map json, - required String applicationThemesDirectoryPath, }) { final version = json["version"] as int? ?? 1; @@ -1517,21 +1517,18 @@ class StackTheme { ..assetsV1 = version == 1 ? ThemeAssets.fromJson( json: Map.from(json["assets"] as Map), - applicationThemesDirectoryPath: applicationThemesDirectoryPath, themeId: json["id"] as String, ) : null ..assetsV2 = version == 2 ? ThemeAssetsV2.fromJson( json: Map.from(json["assets"] as Map), - applicationThemesDirectoryPath: applicationThemesDirectoryPath, themeId: json["id"] as String, ) : null ..assetsV3 = version >= 3 ? ThemeAssetsV3.fromJson( json: Map.from(json["assets"] as Map), - applicationThemesDirectoryPath: applicationThemesDirectoryPath, themeId: json["id"] as String, ) : null @@ -1954,117 +1951,81 @@ class ThemeAssets implements IThemeAssets { factory ThemeAssets.fromJson({ required Map json, - required String applicationThemesDirectoryPath, required String themeId, }) { return ThemeAssets() - ..bellNew = - "$applicationThemesDirectoryPath/$themeId/assets/${json["bell_new"] as String}" - ..buy = - "$applicationThemesDirectoryPath/$themeId/assets/${json["buy"] as String}" - ..exchange = - "$applicationThemesDirectoryPath/$themeId/assets/${json["exchange"] as String}" + ..bellNew = "$themeId/assets/${json["bell_new"] as String}" + ..buy = "$themeId/assets/${json["buy"] as String}" + ..exchange = "$themeId/assets/${json["exchange"] as String}" ..personaIncognito = - "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_incognito"] as String}" - ..personaEasy = - "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_easy"] as String}" - ..stack = - "$applicationThemesDirectoryPath/$themeId/assets/${json["stack"] as String}" - ..stackIcon = - "$applicationThemesDirectoryPath/$themeId/assets/${json["stack_icon"] as String}" - ..receive = - "$applicationThemesDirectoryPath/$themeId/assets/${json["receive"] as String}" - ..receivePending = - "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_pending"] as String}" + "$themeId/assets/${json["persona_incognito"] as String}" + ..personaEasy = "$themeId/assets/${json["persona_easy"] as String}" + ..stack = "$themeId/assets/${json["stack"] as String}" + ..stackIcon = "$themeId/assets/${json["stack_icon"] as String}" + ..receive = "$themeId/assets/${json["receive"] as String}" + ..receivePending = "$themeId/assets/${json["receive_pending"] as String}" ..receiveCancelled = - "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_cancelled"] as String}" - ..send = - "$applicationThemesDirectoryPath/$themeId/assets/${json["send"] as String}" - ..sendPending = - "$applicationThemesDirectoryPath/$themeId/assets/${json["send_pending"] as String}" - ..sendCancelled = - "$applicationThemesDirectoryPath/$themeId/assets/${json["send_cancelled"] as String}" - ..themeSelector = - "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_selector"] as String}" - ..themePreview = - "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_preview"] as String}" - ..txExchange = - "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange"] as String}" + "$themeId/assets/${json["receive_cancelled"] as String}" + ..send = "$themeId/assets/${json["send"] as String}" + ..sendPending = "$themeId/assets/${json["send_pending"] as String}" + ..sendCancelled = "$themeId/assets/${json["send_cancelled"] as String}" + ..themeSelector = "$themeId/assets/${json["theme_selector"] as String}" + ..themePreview = "$themeId/assets/${json["theme_preview"] as String}" + ..txExchange = "$themeId/assets/${json["tx_exchange"] as String}" ..txExchangePending = - "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_pending"] as String}" + "$themeId/assets/${json["tx_exchange_pending"] as String}" ..txExchangeFailed = - "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_failed"] as String}" - ..bitcoin = - "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoin"] as String}" - ..litecoin = - "$applicationThemesDirectoryPath/$themeId/assets/${json["litecoin"] as String}" - ..bitcoincash = - "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoincash"] as String}" - ..dogecoin = - "$applicationThemesDirectoryPath/$themeId/assets/${json["dogecoin"] as String}" - ..epicCash = - "$applicationThemesDirectoryPath/$themeId/assets/${json["epicCash"] as String}" - ..ethereum = - "$applicationThemesDirectoryPath/$themeId/assets/${json["ethereum"] as String}" - ..firo = - "$applicationThemesDirectoryPath/$themeId/assets/${json["firo"] as String}" - ..monero = - "$applicationThemesDirectoryPath/$themeId/assets/${json["monero"] as String}" - ..wownero = - "$applicationThemesDirectoryPath/$themeId/assets/${json["wownero"] as String}" - ..namecoin = - "$applicationThemesDirectoryPath/$themeId/assets/${json["namecoin"] as String}" - ..particl = - "$applicationThemesDirectoryPath/$themeId/assets/${json["particl"] as String}" - ..bitcoinImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoin_image"] as String}" + "$themeId/assets/${json["tx_exchange_failed"] as String}" + ..bitcoin = "$themeId/assets/${json["bitcoin"] as String}" + ..litecoin = "$themeId/assets/${json["litecoin"] as String}" + ..bitcoincash = "$themeId/assets/${json["bitcoincash"] as String}" + ..dogecoin = "$themeId/assets/${json["dogecoin"] as String}" + ..epicCash = "$themeId/assets/${json["epicCash"] as String}" + ..ethereum = "$themeId/assets/${json["ethereum"] as String}" + ..firo = "$themeId/assets/${json["firo"] as String}" + ..monero = "$themeId/assets/${json["monero"] as String}" + ..wownero = "$themeId/assets/${json["wownero"] as String}" + ..namecoin = "$themeId/assets/${json["namecoin"] as String}" + ..particl = "$themeId/assets/${json["particl"] as String}" + ..bitcoinImage = "$themeId/assets/${json["bitcoin_image"] as String}" ..bitcoincashImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoincash_image"] as String}" - ..dogecoinImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["dogecoin_image"] as String}" - ..epicCashImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["epicCash_image"] as String}" - ..ethereumImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["ethereum_image"] as String}" - ..firoImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["firo_image"] as String}" - ..litecoinImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["litecoin_image"] as String}" - ..moneroImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["monero_image"] as String}" - ..wowneroImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["wownero_image"] as String}" - ..namecoinImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["namecoin_image"] as String}" - ..particlImage = - "$applicationThemesDirectoryPath/$themeId/assets/${json["particl_image"] as String}" + "$themeId/assets/${json["bitcoincash_image"] as String}" + ..dogecoinImage = "$themeId/assets/${json["dogecoin_image"] as String}" + ..epicCashImage = "$themeId/assets/${json["epicCash_image"] as String}" + ..ethereumImage = "$themeId/assets/${json["ethereum_image"] as String}" + ..firoImage = "$themeId/assets/${json["firo_image"] as String}" + ..litecoinImage = "$themeId/assets/${json["litecoin_image"] as String}" + ..moneroImage = "$themeId/assets/${json["monero_image"] as String}" + ..wowneroImage = "$themeId/assets/${json["wownero_image"] as String}" + ..namecoinImage = "$themeId/assets/${json["namecoin_image"] as String}" + ..particlImage = "$themeId/assets/${json["particl_image"] as String}" ..bitcoinImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoin_image_secondary"] as String}" + "$themeId/assets/${json["bitcoin_image_secondary"] as String}" ..bitcoincashImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoincash_image_secondary"] as String}" + "$themeId/assets/${json["bitcoincash_image_secondary"] as String}" ..dogecoinImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["dogecoin_image_secondary"] as String}" + "$themeId/assets/${json["dogecoin_image_secondary"] as String}" ..epicCashImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["epicCash_image_secondary"] as String}" + "$themeId/assets/${json["epicCash_image_secondary"] as String}" ..ethereumImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["ethereum_image_secondary"] as String}" + "$themeId/assets/${json["ethereum_image_secondary"] as String}" ..firoImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["firo_image_secondary"] as String}" + "$themeId/assets/${json["firo_image_secondary"] as String}" ..litecoinImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["litecoin_image_secondary"] as String}" + "$themeId/assets/${json["litecoin_image_secondary"] as String}" ..moneroImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["monero_image_secondary"] as String}" + "$themeId/assets/${json["monero_image_secondary"] as String}" ..wowneroImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["wownero_image_secondary"] as String}" + "$themeId/assets/${json["wownero_image_secondary"] as String}" ..namecoinImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["namecoin_image_secondary"] as String}" + "$themeId/assets/${json["namecoin_image_secondary"] as String}" ..particlImageSecondary = - "$applicationThemesDirectoryPath/$themeId/assets/${json["particl_image_secondary"] as String}" + "$themeId/assets/${json["particl_image_secondary"] as String}" ..loadingGif = json["loading_gif"] is String - ? "$applicationThemesDirectoryPath/$themeId/assets/${json["loading_gif"] as String}" + ? "$themeId/assets/${json["loading_gif"] as String}" : null ..background = json["background"] is String - ? "$applicationThemesDirectoryPath/$themeId/assets/${json["background"] as String}" + ? "$themeId/assets/${json["background"] as String}" : null; } } @@ -2146,65 +2107,50 @@ class ThemeAssetsV2 implements IThemeAssets { factory ThemeAssetsV2.fromJson({ required Map json, - required String applicationThemesDirectoryPath, required String themeId, }) { return ThemeAssetsV2() - ..bellNew = - "$applicationThemesDirectoryPath/$themeId/assets/${json["bell_new"] as String}" - ..buy = - "$applicationThemesDirectoryPath/$themeId/assets/${json["buy"] as String}" - ..exchange = - "$applicationThemesDirectoryPath/$themeId/assets/${json["exchange"] as String}" + ..bellNew = "$themeId/assets/${json["bell_new"] as String}" + ..buy = "$themeId/assets/${json["buy"] as String}" + ..exchange = "$themeId/assets/${json["exchange"] as String}" ..personaIncognito = - "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_incognito"] as String}" - ..personaEasy = - "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_easy"] as String}" - ..stack = - "$applicationThemesDirectoryPath/$themeId/assets/${json["stack"] as String}" - ..stackIcon = - "$applicationThemesDirectoryPath/$themeId/assets/${json["stack_icon"] as String}" - ..receive = - "$applicationThemesDirectoryPath/$themeId/assets/${json["receive"] as String}" - ..receivePending = - "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_pending"] as String}" + "$themeId/assets/${json["persona_incognito"] as String}" + ..personaEasy = "$themeId/assets/${json["persona_easy"] as String}" + ..stack = "$themeId/assets/${json["stack"] as String}" + ..stackIcon = "$themeId/assets/${json["stack_icon"] as String}" + ..receive = "$themeId/assets/${json["receive"] as String}" + ..receivePending = "$themeId/assets/${json["receive_pending"] as String}" ..receiveCancelled = - "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_cancelled"] as String}" - ..send = - "$applicationThemesDirectoryPath/$themeId/assets/${json["send"] as String}" - ..sendPending = - "$applicationThemesDirectoryPath/$themeId/assets/${json["send_pending"] as String}" - ..sendCancelled = - "$applicationThemesDirectoryPath/$themeId/assets/${json["send_cancelled"] as String}" - ..themeSelector = - "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_selector"] as String}" - ..themePreview = - "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_preview"] as String}" - ..txExchange = - "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange"] as String}" + "$themeId/assets/${json["receive_cancelled"] as String}" + ..send = "$themeId/assets/${json["send"] as String}" + ..sendPending = "$themeId/assets/${json["send_pending"] as String}" + ..sendCancelled = "$themeId/assets/${json["send_cancelled"] as String}" + ..themeSelector = "$themeId/assets/${json["theme_selector"] as String}" + ..themePreview = "$themeId/assets/${json["theme_preview"] as String}" + ..txExchange = "$themeId/assets/${json["tx_exchange"] as String}" ..txExchangePending = - "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_pending"] as String}" + "$themeId/assets/${json["tx_exchange_pending"] as String}" ..txExchangeFailed = - "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_failed"] as String}" + "$themeId/assets/${json["tx_exchange_failed"] as String}" ..coinPlaceholder = - "$applicationThemesDirectoryPath/$themeId/assets/${json["coin_placeholder"] as String}" + "$themeId/assets/${json["coin_placeholder"] as String}" ..coinIconsString = createCoinAssetsString( - "$applicationThemesDirectoryPath/$themeId/assets", + "$themeId/assets", Map.from(json["coins"]["icons"] as Map), ) ..coinImagesString = createCoinAssetsString( - "$applicationThemesDirectoryPath/$themeId/assets", + "$themeId/assets", Map.from(json["coins"]["images"] as Map), ) ..coinSecondaryImagesString = createCoinAssetsString( - "$applicationThemesDirectoryPath/$themeId/assets", + "$themeId/assets", Map.from(json["coins"]["secondaries"] as Map), ) ..loadingGif = json["loading_gif"] is String - ? "$applicationThemesDirectoryPath/$themeId/assets/${json["loading_gif"] as String}" + ? "$themeId/assets/${json["loading_gif"] as String}" : null ..background = json["background"] is String - ? "$applicationThemesDirectoryPath/$themeId/assets/${json["background"] as String}" + ? "$themeId/assets/${json["background"] as String}" : null; } @@ -2265,48 +2211,132 @@ class ThemeAssetsV2 implements IThemeAssets { @Embedded(inheritance: false) class ThemeAssetsV3 implements IThemeAssets { + @Name("bellNew") + late final String bellNewRelative; @override - late final String bellNew; - @override - late final String buy; - @override - late final String exchange; - @override - late final String personaIncognito; - @override - late final String personaEasy; - @override - late final String stack; - @override - late final String stackIcon; - @override - late final String receive; - @override - late final String receivePending; - @override - late final String receiveCancelled; - @override - late final String send; - @override - late final String sendPending; - @override - late final String sendCancelled; - @override - late final String themeSelector; - @override - late final String themePreview; - @override - late final String txExchange; - @override - late final String txExchangePending; - @override - late final String txExchangeFailed; - @override - late final String? loadingGif; - @override - late final String? background; + @ignore + String get bellNew => prependIfNeeded(bellNewRelative); - late final String coinPlaceholder; + @Name("buy") + late final String buyRelative; + @override + @ignore + String get buy => prependIfNeeded(buyRelative); + + @Name("exchange") + late final String exchangeRelative; + @override + @ignore + String get exchange => prependIfNeeded(exchangeRelative); + + @Name("personaIncognito") + late final String personaIncognitoRelative; + @override + @ignore + String get personaIncognito => prependIfNeeded(personaIncognitoRelative); + + @Name("personaEasy") + late final String personaEasyRelative; + @override + @ignore + String get personaEasy => prependIfNeeded(personaEasyRelative); + + @Name("stack") + late final String stackRelative; + @override + @ignore + String get stack => prependIfNeeded(stackRelative); + + @Name("stackIcon") + late final String stackIconRelative; + @override + @ignore + String get stackIcon => prependIfNeeded(stackIconRelative); + + @Name("receive") + late final String receiveRelative; + @override + @ignore + String get receive => prependIfNeeded(receiveRelative); + + @Name("receivePending") + late final String receivePendingRelative; + @override + @ignore + String get receivePending => prependIfNeeded(receivePendingRelative); + + @Name("receiveCancelled") + late final String receiveCancelledRelative; + @override + @ignore + String get receiveCancelled => prependIfNeeded(receiveCancelledRelative); + + @Name("send") + late final String sendRelative; + @override + @ignore + String get send => prependIfNeeded(sendRelative); + + @Name("sendPending") + late final String sendPendingRelative; + @override + @ignore + String get sendPending => prependIfNeeded(sendPendingRelative); + + @Name("sendCancelled") + late final String sendCancelledRelative; + @override + @ignore + String get sendCancelled => prependIfNeeded(sendCancelledRelative); + + @Name("themeSelector") + late final String themeSelectorRelative; + @override + @ignore + String get themeSelector => prependIfNeeded(themeSelectorRelative); + + @Name("themePreview") + late final String themePreviewRelative; + @override + @ignore + String get themePreview => prependIfNeeded(themePreviewRelative); + + @Name("txExchange") + late final String txExchangeRelative; + @override + @ignore + String get txExchange => prependIfNeeded(txExchangeRelative); + + @Name("txExchangePending") + late final String txExchangePendingRelative; + @override + @ignore + String get txExchangePending => prependIfNeeded(txExchangePendingRelative); + + @Name("txExchangeFailed") + late final String txExchangeFailedRelative; + @override + @ignore + String get txExchangeFailed => prependIfNeeded(txExchangeFailedRelative); + + @Name("loadingGif") + late final String? loadingGifRelative; + @override + @ignore + String? get loadingGif => + loadingGifRelative != null ? prependIfNeeded(loadingGifRelative!) : null; + + @Name("background") + late final String? backgroundRelative; + @override + @ignore + String? get background => + backgroundRelative != null ? prependIfNeeded(backgroundRelative!) : null; + + @Name("coinPlaceholder") + late final String coinPlaceholderRelative; + @ignore + String get coinPlaceholder => prependIfNeeded(coinPlaceholderRelative); // Added some future proof params in case we want to add anything else // This should provide some buffer in stead of creating assetsV4 etc @@ -2361,77 +2391,77 @@ class ThemeAssetsV3 implements IThemeAssets { factory ThemeAssetsV3.fromJson({ required Map json, - required String applicationThemesDirectoryPath, required String themeId, }) { return ThemeAssetsV3() - ..bellNew = - "$applicationThemesDirectoryPath/$themeId/assets/${json["bell_new"] as String}" - ..buy = - "$applicationThemesDirectoryPath/$themeId/assets/${json["buy"] as String}" - ..exchange = - "$applicationThemesDirectoryPath/$themeId/assets/${json["exchange"] as String}" - ..personaIncognito = - "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_incognito"] as String}" - ..personaEasy = - "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_easy"] as String}" - ..stack = - "$applicationThemesDirectoryPath/$themeId/assets/${json["stack"] as String}" - ..stackIcon = - "$applicationThemesDirectoryPath/$themeId/assets/${json["stack_icon"] as String}" - ..receive = - "$applicationThemesDirectoryPath/$themeId/assets/${json["receive"] as String}" - ..receivePending = - "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_pending"] as String}" - ..receiveCancelled = - "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_cancelled"] as String}" - ..send = - "$applicationThemesDirectoryPath/$themeId/assets/${json["send"] as String}" - ..sendPending = - "$applicationThemesDirectoryPath/$themeId/assets/${json["send_pending"] as String}" - ..sendCancelled = - "$applicationThemesDirectoryPath/$themeId/assets/${json["send_cancelled"] as String}" - ..themeSelector = - "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_selector"] as String}" - ..themePreview = - "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_preview"] as String}" - ..txExchange = - "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange"] as String}" - ..txExchangePending = - "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_pending"] as String}" - ..txExchangeFailed = - "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_failed"] as String}" - ..coinPlaceholder = - "$applicationThemesDirectoryPath/$themeId/assets/${json["coin_placeholder"] as String}" + ..bellNewRelative = "$themeId/assets/${json["bell_new"] as String}" + ..buyRelative = "$themeId/assets/${json["buy"] as String}" + ..exchangeRelative = "$themeId/assets/${json["exchange"] as String}" + ..personaIncognitoRelative = + "$themeId/assets/${json["persona_incognito"] as String}" + ..personaEasyRelative = + "$themeId/assets/${json["persona_easy"] as String}" + ..stackRelative = "$themeId/assets/${json["stack"] as String}" + ..stackIconRelative = "$themeId/assets/${json["stack_icon"] as String}" + ..receiveRelative = "$themeId/assets/${json["receive"] as String}" + ..receivePendingRelative = + "$themeId/assets/${json["receive_pending"] as String}" + ..receiveCancelledRelative = + "$themeId/assets/${json["receive_cancelled"] as String}" + ..sendRelative = "$themeId/assets/${json["send"] as String}" + ..sendPendingRelative = + "$themeId/assets/${json["send_pending"] as String}" + ..sendCancelledRelative = + "$themeId/assets/${json["send_cancelled"] as String}" + ..themeSelectorRelative = + "$themeId/assets/${json["theme_selector"] as String}" + ..themePreviewRelative = + "$themeId/assets/${json["theme_preview"] as String}" + ..txExchangeRelative = "$themeId/assets/${json["tx_exchange"] as String}" + ..txExchangePendingRelative = + "$themeId/assets/${json["tx_exchange_pending"] as String}" + ..txExchangeFailedRelative = + "$themeId/assets/${json["tx_exchange_failed"] as String}" + ..coinPlaceholderRelative = + "$themeId/assets/${json["coin_placeholder"] as String}" ..coinIconsString = createCoinAssetsString( - "$applicationThemesDirectoryPath/$themeId/assets", + "$themeId/assets", Map.from(json["coins"]["icons"] as Map), ) ..coinImagesString = createCoinAssetsString( - "$applicationThemesDirectoryPath/$themeId/assets", + "$themeId/assets", Map.from(json["coins"]["images"] as Map), ) ..coinSecondaryImagesString = createCoinAssetsString( - "$applicationThemesDirectoryPath/$themeId/assets", + "$themeId/assets", Map.from(json["coins"]["secondaries"] as Map), ) ..coinCardImagesString = json["coins"]["cards"] is Map ? createCoinAssetsString( - "$applicationThemesDirectoryPath/$themeId/assets", + "$themeId/assets", Map.from(json["coins"]["cards"] as Map), ) : null - ..loadingGif = json["loading_gif"] is String - ? "$applicationThemesDirectoryPath/$themeId/assets/${json["loading_gif"] as String}" + ..loadingGifRelative = json["loading_gif"] is String + ? "$themeId/assets/${json["loading_gif"] as String}" : null - ..background = json["background"] is String - ? "$applicationThemesDirectoryPath/$themeId/assets/${json["background"] as String}" + ..backgroundRelative = json["background"] is String + ? "$themeId/assets/${json["background"] as String}" : null ..dummy1 = null ..dummy2 = null ..dummy3 = null; } + static String prependIfNeeded(String relativePath) { + final path = StackFileSystem.themesDir!.path; + if (relativePath.startsWith(path)) { + return relativePath; + } else { + return "$path/$relativePath"; + } + } + static String createCoinAssetsString(String path, Map json) { final Map map = {}; for (final entry in json.entries) { @@ -2451,6 +2481,8 @@ class ThemeAssetsV3 implements IThemeAssets { for (final coin in Coin.values) { result[coin] = map[coin.name] as String? ?? placeHolder; + + result[coin] = prependIfNeeded(result[coin]!); } return result; diff --git a/lib/models/isar/stack_theme.g.dart b/lib/models/isar/stack_theme.g.dart index e1bb0a549..bf38c461d 100644 --- a/lib/models/isar/stack_theme.g.dart +++ b/lib/models/isar/stack_theme.g.dart @@ -29601,13 +29601,13 @@ int _themeAssetsV3EstimateSize( ) { var bytesCount = offsets.last; { - final value = object.background; + final value = object.backgroundRelative; if (value != null) { bytesCount += 3 + value.length * 3; } } - bytesCount += 3 + object.bellNew.length * 3; - bytesCount += 3 + object.buy.length * 3; + bytesCount += 3 + object.bellNewRelative.length * 3; + bytesCount += 3 + object.buyRelative.length * 3; { final value = object.coinCardImagesString; if (value != null) { @@ -29616,11 +29616,11 @@ int _themeAssetsV3EstimateSize( } bytesCount += 3 + object.coinIconsString.length * 3; bytesCount += 3 + object.coinImagesString.length * 3; - bytesCount += 3 + object.coinPlaceholder.length * 3; + bytesCount += 3 + object.coinPlaceholderRelative.length * 3; bytesCount += 3 + object.coinSecondaryImagesString.length * 3; - bytesCount += 3 + object.exchange.length * 3; + bytesCount += 3 + object.exchangeRelative.length * 3; { - final value = object.loadingGif; + final value = object.loadingGifRelative; if (value != null) { bytesCount += 3 + value.length * 3; } @@ -29643,21 +29643,21 @@ int _themeAssetsV3EstimateSize( bytesCount += 3 + value.length * 3; } } - bytesCount += 3 + object.personaEasy.length * 3; - bytesCount += 3 + object.personaIncognito.length * 3; - bytesCount += 3 + object.receive.length * 3; - bytesCount += 3 + object.receiveCancelled.length * 3; - bytesCount += 3 + object.receivePending.length * 3; - bytesCount += 3 + object.send.length * 3; - bytesCount += 3 + object.sendCancelled.length * 3; - bytesCount += 3 + object.sendPending.length * 3; - bytesCount += 3 + object.stack.length * 3; - bytesCount += 3 + object.stackIcon.length * 3; - bytesCount += 3 + object.themePreview.length * 3; - bytesCount += 3 + object.themeSelector.length * 3; - bytesCount += 3 + object.txExchange.length * 3; - bytesCount += 3 + object.txExchangeFailed.length * 3; - bytesCount += 3 + object.txExchangePending.length * 3; + bytesCount += 3 + object.personaEasyRelative.length * 3; + bytesCount += 3 + object.personaIncognitoRelative.length * 3; + bytesCount += 3 + object.receiveRelative.length * 3; + bytesCount += 3 + object.receiveCancelledRelative.length * 3; + bytesCount += 3 + object.receivePendingRelative.length * 3; + bytesCount += 3 + object.sendRelative.length * 3; + bytesCount += 3 + object.sendCancelledRelative.length * 3; + bytesCount += 3 + object.sendPendingRelative.length * 3; + bytesCount += 3 + object.stackRelative.length * 3; + bytesCount += 3 + object.stackIconRelative.length * 3; + bytesCount += 3 + object.themePreviewRelative.length * 3; + bytesCount += 3 + object.themeSelectorRelative.length * 3; + bytesCount += 3 + object.txExchangeRelative.length * 3; + bytesCount += 3 + object.txExchangeFailedRelative.length * 3; + bytesCount += 3 + object.txExchangePendingRelative.length * 3; return bytesCount; } @@ -29667,34 +29667,34 @@ void _themeAssetsV3Serialize( List offsets, Map> allOffsets, ) { - writer.writeString(offsets[0], object.background); - writer.writeString(offsets[1], object.bellNew); - writer.writeString(offsets[2], object.buy); + writer.writeString(offsets[0], object.backgroundRelative); + writer.writeString(offsets[1], object.bellNewRelative); + writer.writeString(offsets[2], object.buyRelative); writer.writeString(offsets[3], object.coinCardImagesString); writer.writeString(offsets[4], object.coinIconsString); writer.writeString(offsets[5], object.coinImagesString); - writer.writeString(offsets[6], object.coinPlaceholder); + writer.writeString(offsets[6], object.coinPlaceholderRelative); writer.writeString(offsets[7], object.coinSecondaryImagesString); - writer.writeString(offsets[8], object.exchange); - writer.writeString(offsets[9], object.loadingGif); + writer.writeString(offsets[8], object.exchangeRelative); + writer.writeString(offsets[9], object.loadingGifRelative); writer.writeString(offsets[10], object.dummy1); writer.writeString(offsets[11], object.dummy2); writer.writeString(offsets[12], object.dummy3); - writer.writeString(offsets[13], object.personaEasy); - writer.writeString(offsets[14], object.personaIncognito); - writer.writeString(offsets[15], object.receive); - writer.writeString(offsets[16], object.receiveCancelled); - writer.writeString(offsets[17], object.receivePending); - writer.writeString(offsets[18], object.send); - writer.writeString(offsets[19], object.sendCancelled); - writer.writeString(offsets[20], object.sendPending); - writer.writeString(offsets[21], object.stack); - writer.writeString(offsets[22], object.stackIcon); - writer.writeString(offsets[23], object.themePreview); - writer.writeString(offsets[24], object.themeSelector); - writer.writeString(offsets[25], object.txExchange); - writer.writeString(offsets[26], object.txExchangeFailed); - writer.writeString(offsets[27], object.txExchangePending); + writer.writeString(offsets[13], object.personaEasyRelative); + writer.writeString(offsets[14], object.personaIncognitoRelative); + writer.writeString(offsets[15], object.receiveRelative); + writer.writeString(offsets[16], object.receiveCancelledRelative); + writer.writeString(offsets[17], object.receivePendingRelative); + writer.writeString(offsets[18], object.sendRelative); + writer.writeString(offsets[19], object.sendCancelledRelative); + writer.writeString(offsets[20], object.sendPendingRelative); + writer.writeString(offsets[21], object.stackRelative); + writer.writeString(offsets[22], object.stackIconRelative); + writer.writeString(offsets[23], object.themePreviewRelative); + writer.writeString(offsets[24], object.themeSelectorRelative); + writer.writeString(offsets[25], object.txExchangeRelative); + writer.writeString(offsets[26], object.txExchangeFailedRelative); + writer.writeString(offsets[27], object.txExchangePendingRelative); } ThemeAssetsV3 _themeAssetsV3Deserialize( @@ -29704,34 +29704,34 @@ ThemeAssetsV3 _themeAssetsV3Deserialize( Map> allOffsets, ) { final object = ThemeAssetsV3(); - object.background = reader.readStringOrNull(offsets[0]); - object.bellNew = reader.readString(offsets[1]); - object.buy = reader.readString(offsets[2]); + object.backgroundRelative = reader.readStringOrNull(offsets[0]); + object.bellNewRelative = reader.readString(offsets[1]); + object.buyRelative = reader.readString(offsets[2]); object.coinCardImagesString = reader.readStringOrNull(offsets[3]); object.coinIconsString = reader.readString(offsets[4]); object.coinImagesString = reader.readString(offsets[5]); - object.coinPlaceholder = reader.readString(offsets[6]); + object.coinPlaceholderRelative = reader.readString(offsets[6]); object.coinSecondaryImagesString = reader.readString(offsets[7]); - object.exchange = reader.readString(offsets[8]); - object.loadingGif = reader.readStringOrNull(offsets[9]); + object.exchangeRelative = reader.readString(offsets[8]); + object.loadingGifRelative = reader.readStringOrNull(offsets[9]); object.dummy1 = reader.readStringOrNull(offsets[10]); object.dummy2 = reader.readStringOrNull(offsets[11]); object.dummy3 = reader.readStringOrNull(offsets[12]); - object.personaEasy = reader.readString(offsets[13]); - object.personaIncognito = reader.readString(offsets[14]); - object.receive = reader.readString(offsets[15]); - object.receiveCancelled = reader.readString(offsets[16]); - object.receivePending = reader.readString(offsets[17]); - object.send = reader.readString(offsets[18]); - object.sendCancelled = reader.readString(offsets[19]); - object.sendPending = reader.readString(offsets[20]); - object.stack = reader.readString(offsets[21]); - object.stackIcon = reader.readString(offsets[22]); - object.themePreview = reader.readString(offsets[23]); - object.themeSelector = reader.readString(offsets[24]); - object.txExchange = reader.readString(offsets[25]); - object.txExchangeFailed = reader.readString(offsets[26]); - object.txExchangePending = reader.readString(offsets[27]); + object.personaEasyRelative = reader.readString(offsets[13]); + object.personaIncognitoRelative = reader.readString(offsets[14]); + object.receiveRelative = reader.readString(offsets[15]); + object.receiveCancelledRelative = reader.readString(offsets[16]); + object.receivePendingRelative = reader.readString(offsets[17]); + object.sendRelative = reader.readString(offsets[18]); + object.sendCancelledRelative = reader.readString(offsets[19]); + object.sendPendingRelative = reader.readString(offsets[20]); + object.stackRelative = reader.readString(offsets[21]); + object.stackIconRelative = reader.readString(offsets[22]); + object.themePreviewRelative = reader.readString(offsets[23]); + object.themeSelectorRelative = reader.readString(offsets[24]); + object.txExchangeRelative = reader.readString(offsets[25]); + object.txExchangeFailedRelative = reader.readString(offsets[26]); + object.txExchangePendingRelative = reader.readString(offsets[27]); return object; } @@ -29806,7 +29806,7 @@ P _themeAssetsV3DeserializeProp

( extension ThemeAssetsV3QueryFilter on QueryBuilder { QueryBuilder - backgroundIsNull() { + backgroundRelativeIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const FilterCondition.isNull( property: r'background', @@ -29815,7 +29815,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundIsNotNull() { + backgroundRelativeIsNotNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const FilterCondition.isNotNull( property: r'background', @@ -29824,7 +29824,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundEqualTo( + backgroundRelativeEqualTo( String? value, { bool caseSensitive = true, }) { @@ -29838,7 +29838,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundGreaterThan( + backgroundRelativeGreaterThan( String? value, { bool include = false, bool caseSensitive = true, @@ -29854,7 +29854,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundLessThan( + backgroundRelativeLessThan( String? value, { bool include = false, bool caseSensitive = true, @@ -29870,7 +29870,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundBetween( + backgroundRelativeBetween( String? lower, String? upper, { bool includeLower = true, @@ -29890,7 +29890,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundStartsWith( + backgroundRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -29904,7 +29904,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundEndsWith( + backgroundRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -29918,7 +29918,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundContains(String value, {bool caseSensitive = true}) { + backgroundRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'background', @@ -29929,7 +29929,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundMatches(String pattern, {bool caseSensitive = true}) { + backgroundRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'background', @@ -29940,7 +29940,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundIsEmpty() { + backgroundRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'background', @@ -29950,7 +29950,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - backgroundIsNotEmpty() { + backgroundRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'background', @@ -29960,7 +29960,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewEqualTo( + bellNewRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -29974,7 +29974,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewGreaterThan( + bellNewRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -29990,7 +29990,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewLessThan( + bellNewRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -30006,7 +30006,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewBetween( + bellNewRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -30026,7 +30026,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewStartsWith( + bellNewRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -30040,7 +30040,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewEndsWith( + bellNewRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -30054,7 +30054,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewContains(String value, {bool caseSensitive = true}) { + bellNewRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'bellNew', @@ -30065,7 +30065,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewMatches(String pattern, {bool caseSensitive = true}) { + bellNewRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'bellNew', @@ -30076,7 +30076,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewIsEmpty() { + bellNewRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'bellNew', @@ -30086,7 +30086,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - bellNewIsNotEmpty() { + bellNewRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'bellNew', @@ -30095,7 +30095,8 @@ extension ThemeAssetsV3QueryFilter }); } - QueryBuilder buyEqualTo( + QueryBuilder + buyRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -30109,7 +30110,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - buyGreaterThan( + buyRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -30124,7 +30125,8 @@ extension ThemeAssetsV3QueryFilter }); } - QueryBuilder buyLessThan( + QueryBuilder + buyRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -30139,7 +30141,8 @@ extension ThemeAssetsV3QueryFilter }); } - QueryBuilder buyBetween( + QueryBuilder + buyRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -30159,7 +30162,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - buyStartsWith( + buyRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -30172,7 +30175,8 @@ extension ThemeAssetsV3QueryFilter }); } - QueryBuilder buyEndsWith( + QueryBuilder + buyRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -30185,9 +30189,8 @@ extension ThemeAssetsV3QueryFilter }); } - QueryBuilder buyContains( - String value, - {bool caseSensitive = true}) { + QueryBuilder + buyRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'buy', @@ -30197,9 +30200,8 @@ extension ThemeAssetsV3QueryFilter }); } - QueryBuilder buyMatches( - String pattern, - {bool caseSensitive = true}) { + QueryBuilder + buyRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'buy', @@ -30210,7 +30212,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - buyIsEmpty() { + buyRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'buy', @@ -30220,7 +30222,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - buyIsNotEmpty() { + buyRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'buy', @@ -30656,7 +30658,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderEqualTo( + coinPlaceholderRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -30670,7 +30672,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderGreaterThan( + coinPlaceholderRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -30686,7 +30688,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderLessThan( + coinPlaceholderRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -30702,7 +30704,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderBetween( + coinPlaceholderRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -30722,7 +30724,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderStartsWith( + coinPlaceholderRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -30736,7 +30738,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderEndsWith( + coinPlaceholderRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -30750,7 +30752,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderContains(String value, {bool caseSensitive = true}) { + coinPlaceholderRelativeContains(String value, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'coinPlaceholder', @@ -30761,7 +30764,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderMatches(String pattern, {bool caseSensitive = true}) { + coinPlaceholderRelativeMatches(String pattern, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'coinPlaceholder', @@ -30772,7 +30776,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderIsEmpty() { + coinPlaceholderRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'coinPlaceholder', @@ -30782,7 +30786,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - coinPlaceholderIsNotEmpty() { + coinPlaceholderRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'coinPlaceholder', @@ -30930,7 +30934,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeEqualTo( + exchangeRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -30944,7 +30948,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeGreaterThan( + exchangeRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -30960,7 +30964,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeLessThan( + exchangeRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -30976,7 +30980,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeBetween( + exchangeRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -30996,7 +31000,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeStartsWith( + exchangeRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -31010,7 +31014,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeEndsWith( + exchangeRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -31024,7 +31028,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeContains(String value, {bool caseSensitive = true}) { + exchangeRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'exchange', @@ -31035,7 +31039,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeMatches(String pattern, {bool caseSensitive = true}) { + exchangeRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'exchange', @@ -31046,7 +31050,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeIsEmpty() { + exchangeRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'exchange', @@ -31056,7 +31060,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - exchangeIsNotEmpty() { + exchangeRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'exchange', @@ -31066,7 +31070,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifIsNull() { + loadingGifRelativeIsNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const FilterCondition.isNull( property: r'loadingGif', @@ -31075,7 +31079,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifIsNotNull() { + loadingGifRelativeIsNotNull() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(const FilterCondition.isNotNull( property: r'loadingGif', @@ -31084,7 +31088,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifEqualTo( + loadingGifRelativeEqualTo( String? value, { bool caseSensitive = true, }) { @@ -31098,7 +31102,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifGreaterThan( + loadingGifRelativeGreaterThan( String? value, { bool include = false, bool caseSensitive = true, @@ -31114,7 +31118,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifLessThan( + loadingGifRelativeLessThan( String? value, { bool include = false, bool caseSensitive = true, @@ -31130,7 +31134,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifBetween( + loadingGifRelativeBetween( String? lower, String? upper, { bool includeLower = true, @@ -31150,7 +31154,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifStartsWith( + loadingGifRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -31164,7 +31168,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifEndsWith( + loadingGifRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -31178,7 +31182,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifContains(String value, {bool caseSensitive = true}) { + loadingGifRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'loadingGif', @@ -31189,7 +31193,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifMatches(String pattern, {bool caseSensitive = true}) { + loadingGifRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'loadingGif', @@ -31200,7 +31204,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifIsEmpty() { + loadingGifRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'loadingGif', @@ -31210,7 +31214,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - loadingGifIsNotEmpty() { + loadingGifRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'loadingGif', @@ -31682,7 +31686,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyEqualTo( + personaEasyRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -31696,7 +31700,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyGreaterThan( + personaEasyRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -31712,7 +31716,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyLessThan( + personaEasyRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -31728,7 +31732,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyBetween( + personaEasyRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -31748,7 +31752,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyStartsWith( + personaEasyRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -31762,7 +31766,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyEndsWith( + personaEasyRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -31776,7 +31780,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyContains(String value, {bool caseSensitive = true}) { + personaEasyRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'personaEasy', @@ -31787,7 +31791,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyMatches(String pattern, {bool caseSensitive = true}) { + personaEasyRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'personaEasy', @@ -31798,7 +31802,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyIsEmpty() { + personaEasyRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'personaEasy', @@ -31808,7 +31812,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaEasyIsNotEmpty() { + personaEasyRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'personaEasy', @@ -31818,7 +31822,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoEqualTo( + personaIncognitoRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -31832,7 +31836,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoGreaterThan( + personaIncognitoRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -31848,7 +31852,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoLessThan( + personaIncognitoRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -31864,7 +31868,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoBetween( + personaIncognitoRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -31884,7 +31888,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoStartsWith( + personaIncognitoRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -31898,7 +31902,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoEndsWith( + personaIncognitoRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -31912,7 +31916,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoContains(String value, {bool caseSensitive = true}) { + personaIncognitoRelativeContains(String value, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'personaIncognito', @@ -31923,7 +31928,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoMatches(String pattern, {bool caseSensitive = true}) { + personaIncognitoRelativeMatches(String pattern, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'personaIncognito', @@ -31934,7 +31940,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoIsEmpty() { + personaIncognitoRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'personaIncognito', @@ -31944,7 +31950,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - personaIncognitoIsNotEmpty() { + personaIncognitoRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'personaIncognito', @@ -31954,7 +31960,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveEqualTo( + receiveRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -31968,7 +31974,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveGreaterThan( + receiveRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -31984,7 +31990,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveLessThan( + receiveRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -32000,7 +32006,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveBetween( + receiveRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -32020,7 +32026,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveStartsWith( + receiveRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -32034,7 +32040,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveEndsWith( + receiveRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -32048,7 +32054,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveContains(String value, {bool caseSensitive = true}) { + receiveRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'receive', @@ -32059,7 +32065,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveMatches(String pattern, {bool caseSensitive = true}) { + receiveRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'receive', @@ -32070,7 +32076,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveIsEmpty() { + receiveRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'receive', @@ -32080,7 +32086,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveIsNotEmpty() { + receiveRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'receive', @@ -32090,7 +32096,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledEqualTo( + receiveCancelledRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -32104,7 +32110,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledGreaterThan( + receiveCancelledRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -32120,7 +32126,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledLessThan( + receiveCancelledRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -32136,7 +32142,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledBetween( + receiveCancelledRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -32156,7 +32162,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledStartsWith( + receiveCancelledRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -32170,7 +32176,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledEndsWith( + receiveCancelledRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -32184,7 +32190,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledContains(String value, {bool caseSensitive = true}) { + receiveCancelledRelativeContains(String value, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'receiveCancelled', @@ -32195,7 +32202,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledMatches(String pattern, {bool caseSensitive = true}) { + receiveCancelledRelativeMatches(String pattern, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'receiveCancelled', @@ -32206,7 +32214,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledIsEmpty() { + receiveCancelledRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'receiveCancelled', @@ -32216,7 +32224,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receiveCancelledIsNotEmpty() { + receiveCancelledRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'receiveCancelled', @@ -32226,7 +32234,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingEqualTo( + receivePendingRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -32240,7 +32248,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingGreaterThan( + receivePendingRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -32256,7 +32264,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingLessThan( + receivePendingRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -32272,7 +32280,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingBetween( + receivePendingRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -32292,7 +32300,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingStartsWith( + receivePendingRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -32306,7 +32314,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingEndsWith( + receivePendingRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -32320,7 +32328,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingContains(String value, {bool caseSensitive = true}) { + receivePendingRelativeContains(String value, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'receivePending', @@ -32331,7 +32340,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingMatches(String pattern, {bool caseSensitive = true}) { + receivePendingRelativeMatches(String pattern, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'receivePending', @@ -32342,7 +32352,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingIsEmpty() { + receivePendingRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'receivePending', @@ -32352,7 +32362,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - receivePendingIsNotEmpty() { + receivePendingRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'receivePending', @@ -32361,7 +32371,8 @@ extension ThemeAssetsV3QueryFilter }); } - QueryBuilder sendEqualTo( + QueryBuilder + sendRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -32375,7 +32386,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendGreaterThan( + sendRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -32391,7 +32402,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendLessThan( + sendRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -32406,7 +32417,8 @@ extension ThemeAssetsV3QueryFilter }); } - QueryBuilder sendBetween( + QueryBuilder + sendRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -32426,7 +32438,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendStartsWith( + sendRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -32440,7 +32452,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendEndsWith( + sendRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -32454,7 +32466,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendContains(String value, {bool caseSensitive = true}) { + sendRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'send', @@ -32464,9 +32476,8 @@ extension ThemeAssetsV3QueryFilter }); } - QueryBuilder sendMatches( - String pattern, - {bool caseSensitive = true}) { + QueryBuilder + sendRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'send', @@ -32477,7 +32488,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendIsEmpty() { + sendRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'send', @@ -32487,7 +32498,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendIsNotEmpty() { + sendRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'send', @@ -32497,7 +32508,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledEqualTo( + sendCancelledRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -32511,7 +32522,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledGreaterThan( + sendCancelledRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -32527,7 +32538,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledLessThan( + sendCancelledRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -32543,7 +32554,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledBetween( + sendCancelledRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -32563,7 +32574,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledStartsWith( + sendCancelledRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -32577,7 +32588,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledEndsWith( + sendCancelledRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -32591,7 +32602,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledContains(String value, {bool caseSensitive = true}) { + sendCancelledRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'sendCancelled', @@ -32602,7 +32613,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledMatches(String pattern, {bool caseSensitive = true}) { + sendCancelledRelativeMatches(String pattern, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'sendCancelled', @@ -32613,7 +32625,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledIsEmpty() { + sendCancelledRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'sendCancelled', @@ -32623,7 +32635,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendCancelledIsNotEmpty() { + sendCancelledRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'sendCancelled', @@ -32633,7 +32645,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingEqualTo( + sendPendingRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -32647,7 +32659,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingGreaterThan( + sendPendingRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -32663,7 +32675,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingLessThan( + sendPendingRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -32679,7 +32691,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingBetween( + sendPendingRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -32699,7 +32711,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingStartsWith( + sendPendingRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -32713,7 +32725,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingEndsWith( + sendPendingRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -32727,7 +32739,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingContains(String value, {bool caseSensitive = true}) { + sendPendingRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'sendPending', @@ -32738,7 +32750,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingMatches(String pattern, {bool caseSensitive = true}) { + sendPendingRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'sendPending', @@ -32749,7 +32761,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingIsEmpty() { + sendPendingRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'sendPending', @@ -32759,7 +32771,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - sendPendingIsNotEmpty() { + sendPendingRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'sendPending', @@ -32769,7 +32781,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackEqualTo( + stackRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -32783,7 +32795,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackGreaterThan( + stackRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -32799,7 +32811,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackLessThan( + stackRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -32815,7 +32827,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackBetween( + stackRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -32835,7 +32847,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackStartsWith( + stackRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -32849,7 +32861,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackEndsWith( + stackRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -32863,7 +32875,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackContains(String value, {bool caseSensitive = true}) { + stackRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'stack', @@ -32874,7 +32886,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackMatches(String pattern, {bool caseSensitive = true}) { + stackRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'stack', @@ -32885,7 +32897,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIsEmpty() { + stackRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'stack', @@ -32895,7 +32907,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIsNotEmpty() { + stackRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'stack', @@ -32905,7 +32917,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconEqualTo( + stackIconRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -32919,7 +32931,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconGreaterThan( + stackIconRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -32935,7 +32947,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconLessThan( + stackIconRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -32951,7 +32963,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconBetween( + stackIconRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -32971,7 +32983,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconStartsWith( + stackIconRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -32985,7 +32997,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconEndsWith( + stackIconRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -32999,7 +33011,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconContains(String value, {bool caseSensitive = true}) { + stackIconRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'stackIcon', @@ -33010,7 +33022,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconMatches(String pattern, {bool caseSensitive = true}) { + stackIconRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'stackIcon', @@ -33021,7 +33033,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconIsEmpty() { + stackIconRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'stackIcon', @@ -33031,7 +33043,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - stackIconIsNotEmpty() { + stackIconRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'stackIcon', @@ -33041,7 +33053,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewEqualTo( + themePreviewRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -33055,7 +33067,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewGreaterThan( + themePreviewRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -33071,7 +33083,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewLessThan( + themePreviewRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -33087,7 +33099,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewBetween( + themePreviewRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -33107,7 +33119,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewStartsWith( + themePreviewRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -33121,7 +33133,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewEndsWith( + themePreviewRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -33135,7 +33147,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewContains(String value, {bool caseSensitive = true}) { + themePreviewRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'themePreview', @@ -33146,7 +33158,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewMatches(String pattern, {bool caseSensitive = true}) { + themePreviewRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'themePreview', @@ -33157,7 +33169,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewIsEmpty() { + themePreviewRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'themePreview', @@ -33167,7 +33179,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themePreviewIsNotEmpty() { + themePreviewRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'themePreview', @@ -33177,7 +33189,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorEqualTo( + themeSelectorRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -33191,7 +33203,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorGreaterThan( + themeSelectorRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -33207,7 +33219,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorLessThan( + themeSelectorRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -33223,7 +33235,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorBetween( + themeSelectorRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -33243,7 +33255,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorStartsWith( + themeSelectorRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -33257,7 +33269,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorEndsWith( + themeSelectorRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -33271,7 +33283,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorContains(String value, {bool caseSensitive = true}) { + themeSelectorRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'themeSelector', @@ -33282,7 +33294,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorMatches(String pattern, {bool caseSensitive = true}) { + themeSelectorRelativeMatches(String pattern, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'themeSelector', @@ -33293,7 +33306,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorIsEmpty() { + themeSelectorRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'themeSelector', @@ -33303,7 +33316,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - themeSelectorIsNotEmpty() { + themeSelectorRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'themeSelector', @@ -33313,7 +33326,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeEqualTo( + txExchangeRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -33327,7 +33340,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeGreaterThan( + txExchangeRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -33343,7 +33356,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeLessThan( + txExchangeRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -33359,7 +33372,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeBetween( + txExchangeRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -33379,7 +33392,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeStartsWith( + txExchangeRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -33393,7 +33406,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeEndsWith( + txExchangeRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -33407,7 +33420,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeContains(String value, {bool caseSensitive = true}) { + txExchangeRelativeContains(String value, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'txExchange', @@ -33418,7 +33431,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeMatches(String pattern, {bool caseSensitive = true}) { + txExchangeRelativeMatches(String pattern, {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'txExchange', @@ -33429,7 +33442,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeIsEmpty() { + txExchangeRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'txExchange', @@ -33439,7 +33452,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeIsNotEmpty() { + txExchangeRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'txExchange', @@ -33449,7 +33462,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedEqualTo( + txExchangeFailedRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -33463,7 +33476,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedGreaterThan( + txExchangeFailedRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -33479,7 +33492,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedLessThan( + txExchangeFailedRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -33495,7 +33508,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedBetween( + txExchangeFailedRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -33515,7 +33528,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedStartsWith( + txExchangeFailedRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -33529,7 +33542,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedEndsWith( + txExchangeFailedRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -33543,7 +33556,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedContains(String value, {bool caseSensitive = true}) { + txExchangeFailedRelativeContains(String value, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'txExchangeFailed', @@ -33554,7 +33568,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedMatches(String pattern, {bool caseSensitive = true}) { + txExchangeFailedRelativeMatches(String pattern, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'txExchangeFailed', @@ -33565,7 +33580,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedIsEmpty() { + txExchangeFailedRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'txExchangeFailed', @@ -33575,7 +33590,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangeFailedIsNotEmpty() { + txExchangeFailedRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'txExchangeFailed', @@ -33585,7 +33600,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingEqualTo( + txExchangePendingRelativeEqualTo( String value, { bool caseSensitive = true, }) { @@ -33599,7 +33614,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingGreaterThan( + txExchangePendingRelativeGreaterThan( String value, { bool include = false, bool caseSensitive = true, @@ -33615,7 +33630,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingLessThan( + txExchangePendingRelativeLessThan( String value, { bool include = false, bool caseSensitive = true, @@ -33631,7 +33646,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingBetween( + txExchangePendingRelativeBetween( String lower, String upper, { bool includeLower = true, @@ -33651,7 +33666,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingStartsWith( + txExchangePendingRelativeStartsWith( String value, { bool caseSensitive = true, }) { @@ -33665,7 +33680,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingEndsWith( + txExchangePendingRelativeEndsWith( String value, { bool caseSensitive = true, }) { @@ -33679,7 +33694,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingContains(String value, {bool caseSensitive = true}) { + txExchangePendingRelativeContains(String value, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.contains( property: r'txExchangePending', @@ -33690,7 +33706,8 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingMatches(String pattern, {bool caseSensitive = true}) { + txExchangePendingRelativeMatches(String pattern, + {bool caseSensitive = true}) { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.matches( property: r'txExchangePending', @@ -33701,7 +33718,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingIsEmpty() { + txExchangePendingRelativeIsEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.equalTo( property: r'txExchangePending', @@ -33711,7 +33728,7 @@ extension ThemeAssetsV3QueryFilter } QueryBuilder - txExchangePendingIsNotEmpty() { + txExchangePendingRelativeIsNotEmpty() { return QueryBuilder.apply(this, (query) { return query.addFilterCondition(FilterCondition.greaterThan( property: r'txExchangePending', diff --git a/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart b/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart index af83e4db0..0c45a68f7 100644 --- a/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart +++ b/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart @@ -126,7 +126,7 @@ class _StackThemeCardState extends ConsumerState { } Future getThemeDirectorySize() async { - final themesDir = await StackFileSystem.applicationThemesDirectory(); + final themesDir = StackFileSystem.themesDir!; final themeDir = Directory("${themesDir.path}/${widget.data.id}"); int bytes = 0; if (await themeDir.exists()) { diff --git a/lib/themes/theme_service.dart b/lib/themes/theme_service.dart index fef185c5b..c9a8bd978 100644 --- a/lib/themes/theme_service.dart +++ b/lib/themes/theme_service.dart @@ -40,7 +40,7 @@ class ThemeService { void init(MainDB db) => _db ??= db; Future install({required Uint8List themeArchiveData}) async { - final themesDir = await StackFileSystem.applicationThemesDirectory(); + final themesDir = StackFileSystem.themesDir!; final archive = ZipDecoder().decodeBytes(themeArchiveData); @@ -55,7 +55,6 @@ class ThemeService { final theme = StackTheme.fromJson( json: Map.from(json), - applicationThemesDirectoryPath: themesDir.path, ); try { @@ -88,7 +87,7 @@ class ThemeService { } Future remove({required String themeId}) async { - final themesDir = await StackFileSystem.applicationThemesDirectory(); + final themesDir = StackFileSystem.themesDir!; final isarId = await db.isar.stackThemes .where() .themeIdEqualTo(themeId) @@ -187,7 +186,7 @@ class ThemeService { return false; } - final themesDir = await StackFileSystem.applicationThemesDirectory(); + final themesDir = StackFileSystem.themesDir!; final jsonFileExists = await File("${themesDir.path}/$themeId/theme.json").exists(); final assetsDirExists = diff --git a/lib/utilities/stack_file_system.dart b/lib/utilities/stack_file_system.dart index 2bb7b5d80..843bb1b71 100644 --- a/lib/utilities/stack_file_system.dart +++ b/lib/utilities/stack_file_system.dart @@ -73,16 +73,15 @@ abstract class StackFileSystem { } } - static Future applicationThemesDirectory() async { + static Future initThemesDir() async { final root = await applicationRootDirectory(); - // if (Util.isDesktop) { + final dir = Directory("${root.path}/themes"); if (!dir.existsSync()) { await dir.create(); } - return dir; - // } else { - // return root; - // } + themesDir = dir; } + + static Directory? themesDir; } diff --git a/test/notifications/notification_card_test.dart b/test/notifications/notification_card_test.dart index 24c23b35a..55a9dcae5 100644 --- a/test/notifications/notification_card_test.dart +++ b/test/notifications/notification_card_test.dart @@ -23,7 +23,6 @@ void main() { final mockThemeService = MockThemeService(); final theme = StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ); when(mockThemeService.getTheme(themeId: "light")).thenAnswer( diff --git a/test/pages/send_view/send_view_test.dart b/test/pages/send_view/send_view_test.dart index 1747ddc17..975554c8d 100644 --- a/test/pages/send_view/send_view_test.dart +++ b/test/pages/send_view/send_view_test.dart @@ -59,7 +59,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); when(mockPrefs.currency).thenAnswer((_) => "USD"); @@ -89,7 +88,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -143,7 +141,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); @@ -169,7 +166,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/address_book_card_test.dart b/test/widget_tests/address_book_card_test.dart index faf78be2f..1d38e6c95 100644 --- a/test/widget_tests/address_book_card_test.dart +++ b/test/widget_tests/address_book_card_test.dart @@ -56,8 +56,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: - applicationThemesDirectoryPath, ), ), ], diff --git a/test/widget_tests/animated_text_test.dart b/test/widget_tests/animated_text_test.dart index 6401b5822..ff358dfb0 100644 --- a/test/widget_tests/animated_text_test.dart +++ b/test/widget_tests/animated_text_test.dart @@ -28,7 +28,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/custom_buttons/app_bar_icon_button_test.dart b/test/widget_tests/custom_buttons/app_bar_icon_button_test.dart index 0e1902fb5..cdc2ccbef 100644 --- a/test/widget_tests/custom_buttons/app_bar_icon_button_test.dart +++ b/test/widget_tests/custom_buttons/app_bar_icon_button_test.dart @@ -28,7 +28,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/custom_buttons/draggable_switch_button_test.dart b/test/widget_tests/custom_buttons/draggable_switch_button_test.dart index 1c67e2883..2919e05ff 100644 --- a/test/widget_tests/custom_buttons/draggable_switch_button_test.dart +++ b/test/widget_tests/custom_buttons/draggable_switch_button_test.dart @@ -24,7 +24,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -56,7 +55,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -93,7 +91,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/custom_buttons/favorite_toggle_test.dart b/test/widget_tests/custom_buttons/favorite_toggle_test.dart index a7fdc5492..90dbc5546 100644 --- a/test/widget_tests/custom_buttons/favorite_toggle_test.dart +++ b/test/widget_tests/custom_buttons/favorite_toggle_test.dart @@ -22,7 +22,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); @@ -37,7 +36,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/custom_loading_overlay_test.dart b/test/widget_tests/custom_loading_overlay_test.dart index df976eb91..6d0eddb75 100644 --- a/test/widget_tests/custom_loading_overlay_test.dart +++ b/test/widget_tests/custom_loading_overlay_test.dart @@ -22,7 +22,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); @@ -37,7 +36,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/custom_pin_put_test.dart b/test/widget_tests/custom_pin_put_test.dart index 13b2bc892..1b3c1eee3 100644 --- a/test/widget_tests/custom_pin_put_test.dart +++ b/test/widget_tests/custom_pin_put_test.dart @@ -67,7 +67,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -99,7 +98,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -151,7 +149,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -187,7 +184,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -223,7 +219,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -264,7 +259,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -301,7 +295,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -333,7 +326,7 @@ void main() { // StackColors.fromStackColorTheme( // StackTheme.fromJson( // json: lightThemeJsonMap, - // applicationThemesDirectoryPath: "test", + // // ), // ), // ], @@ -385,7 +378,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -427,7 +419,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -469,7 +460,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -510,7 +500,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/desktop/custom_text_button_test.dart b/test/widget_tests/desktop/custom_text_button_test.dart index ab10e2e2d..b1e4054c9 100644 --- a/test/widget_tests/desktop/custom_text_button_test.dart +++ b/test/widget_tests/desktop/custom_text_button_test.dart @@ -17,7 +17,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/desktop/desktop_app_bar_test.dart b/test/widget_tests/desktop/desktop_app_bar_test.dart index eb5ccb7ec..8ddc453ab 100644 --- a/test/widget_tests/desktop/desktop_app_bar_test.dart +++ b/test/widget_tests/desktop/desktop_app_bar_test.dart @@ -19,7 +19,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/desktop/desktop_dialog_close_button_test.dart b/test/widget_tests/desktop/desktop_dialog_close_button_test.dart index 86de83567..ec8b4ce39 100644 --- a/test/widget_tests/desktop/desktop_dialog_close_button_test.dart +++ b/test/widget_tests/desktop/desktop_dialog_close_button_test.dart @@ -24,7 +24,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/desktop/desktop_dialog_test.dart b/test/widget_tests/desktop/desktop_dialog_test.dart index 6ea148e09..5eafb6f8c 100644 --- a/test/widget_tests/desktop/desktop_dialog_test.dart +++ b/test/widget_tests/desktop/desktop_dialog_test.dart @@ -18,7 +18,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/desktop/desktop_scaffold_test.dart b/test/widget_tests/desktop/desktop_scaffold_test.dart index efb41c9a2..8abb4cf5a 100644 --- a/test/widget_tests/desktop/desktop_scaffold_test.dart +++ b/test/widget_tests/desktop/desktop_scaffold_test.dart @@ -21,7 +21,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); await widgetTester.pumpWidget( @@ -35,7 +34,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -57,7 +55,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); @@ -72,7 +69,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -97,7 +93,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); @@ -112,7 +107,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/emoji_select_sheet_test.dart b/test/widget_tests/emoji_select_sheet_test.dart index 4bb6b9046..15be7b153 100644 --- a/test/widget_tests/emoji_select_sheet_test.dart +++ b/test/widget_tests/emoji_select_sheet_test.dart @@ -20,7 +20,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -49,7 +48,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/icon_widgets/addressbook_icon_test.dart b/test/widget_tests/icon_widgets/addressbook_icon_test.dart index 48b7925d4..ad8470898 100644 --- a/test/widget_tests/icon_widgets/addressbook_icon_test.dart +++ b/test/widget_tests/icon_widgets/addressbook_icon_test.dart @@ -21,7 +21,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/managed_favorite_test.dart b/test/widget_tests/managed_favorite_test.dart index e0cb0dfc7..3d8bb66fa 100644 --- a/test/widget_tests/managed_favorite_test.dart +++ b/test/widget_tests/managed_favorite_test.dart @@ -55,7 +55,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); when(wallet.coin).thenAnswer((_) => Coin.bitcoin); @@ -97,7 +96,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -126,7 +124,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); when(wallet.coin).thenAnswer((_) => Coin.bitcoin); @@ -186,7 +183,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -214,7 +210,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); when(wallet.coin).thenAnswer((_) => Coin.bitcoin); @@ -274,7 +269,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/node_card_test.dart b/test/widget_tests/node_card_test.dart index cf7be76af..b8e126696 100644 --- a/test/widget_tests/node_card_test.dart +++ b/test/widget_tests/node_card_test.dart @@ -57,7 +57,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -118,7 +117,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -180,7 +178,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/node_options_sheet_test.dart b/test/widget_tests/node_options_sheet_test.dart index c1aacbb51..b80e4682d 100644 --- a/test/widget_tests/node_options_sheet_test.dart +++ b/test/widget_tests/node_options_sheet_test.dart @@ -63,7 +63,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -136,7 +135,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -203,7 +201,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/progress_bar_test.dart b/test/widget_tests/progress_bar_test.dart index f375e7392..681a5ac0c 100644 --- a/test/widget_tests/progress_bar_test.dart +++ b/test/widget_tests/progress_bar_test.dart @@ -10,7 +10,6 @@ void main() { testWidgets("Widget build", (widgetTester) async { final theme = StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ); await widgetTester.pumpWidget( MaterialApp( diff --git a/test/widget_tests/shake/shake_test.dart b/test/widget_tests/shake/shake_test.dart index e699a2fca..ab9a80fed 100644 --- a/test/widget_tests/shake/shake_test.dart +++ b/test/widget_tests/shake/shake_test.dart @@ -15,23 +15,23 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], ), home: Material( child: Shake( - animationRange: 10, - controller: ShakeController(), - animationDuration: const Duration(milliseconds: 200), - child: Column( - children: const [ - Center( - child: Text("Enter Pin"), - ) - ], - )), + animationRange: 10, + controller: ShakeController(), + animationDuration: const Duration(milliseconds: 200), + child: const Column( + children: [ + Center( + child: Text("Enter Pin"), + ) + ], + ), + ), ), ), ); diff --git a/test/widget_tests/stack_dialog_test.dart b/test/widget_tests/stack_dialog_test.dart index 3397e3c9e..0f42ab80a 100644 --- a/test/widget_tests/stack_dialog_test.dart +++ b/test/widget_tests/stack_dialog_test.dart @@ -17,7 +17,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -39,7 +38,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -75,7 +73,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/table_view/table_view_cell_test.dart b/test/widget_tests/table_view/table_view_cell_test.dart index 228a7c2e9..14e66eb5e 100644 --- a/test/widget_tests/table_view/table_view_cell_test.dart +++ b/test/widget_tests/table_view/table_view_cell_test.dart @@ -16,7 +16,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/table_view/table_view_row_test.dart b/test/widget_tests/table_view/table_view_row_test.dart index 676d18f3b..4a84f0e64 100644 --- a/test/widget_tests/table_view/table_view_row_test.dart +++ b/test/widget_tests/table_view/table_view_row_test.dart @@ -42,7 +42,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); @@ -80,7 +79,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/table_view/table_view_test.dart b/test/widget_tests/table_view/table_view_test.dart index a52986985..67813ec5f 100644 --- a/test/widget_tests/table_view/table_view_test.dart +++ b/test/widget_tests/table_view/table_view_test.dart @@ -17,7 +17,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/textfield_icon_button_test.dart b/test/widget_tests/textfield_icon_button_test.dart index 43be6ce11..8ce9400cd 100644 --- a/test/widget_tests/textfield_icon_button_test.dart +++ b/test/widget_tests/textfield_icon_button_test.dart @@ -16,7 +16,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/trade_card_test.dart b/test/widget_tests/trade_card_test.dart index 6e5a81288..d42c00b85 100644 --- a/test/widget_tests/trade_card_test.dart +++ b/test/widget_tests/trade_card_test.dart @@ -21,7 +21,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); final trade = Trade( @@ -59,7 +58,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test/sample_data", ), ), ], diff --git a/test/widget_tests/transaction_card_test.dart b/test/widget_tests/transaction_card_test.dart index 3a9765720..c4b89fb4a 100644 --- a/test/widget_tests/transaction_card_test.dart +++ b/test/widget_tests/transaction_card_test.dart @@ -93,7 +93,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); when(wallet.coin.ticker).thenAnswer((_) => "FIRO"); @@ -138,7 +137,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -224,7 +222,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); when(wallet.coin.ticker).thenAnswer((_) => "FIRO"); @@ -268,7 +265,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -352,7 +348,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); when(wallet.coin.ticker).thenAnswer((_) => "FIRO"); @@ -397,7 +392,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], @@ -474,7 +468,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); when(wallet.coin.ticker).thenAnswer((_) => "FIRO"); @@ -524,7 +517,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/wallet_card_test.dart b/test/widget_tests/wallet_card_test.dart index 8598b382e..c2e77d012 100644 --- a/test/widget_tests/wallet_card_test.dart +++ b/test/widget_tests/wallet_card_test.dart @@ -42,7 +42,6 @@ void main() { mockito.when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); mockito.when(wallet.walletId).thenAnswer((realInvocation) => "wallet id"); @@ -81,7 +80,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart b/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart index 1368e8277..fee5ab6d5 100644 --- a/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart +++ b/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart @@ -64,7 +64,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ], diff --git a/test/widget_tests/wallet_info_row/wallet_info_row_test.dart b/test/widget_tests/wallet_info_row/wallet_info_row_test.dart index ba669e8c0..c3fb2eef5 100644 --- a/test/widget_tests/wallet_info_row/wallet_info_row_test.dart +++ b/test/widget_tests/wallet_info_row/wallet_info_row_test.dart @@ -41,7 +41,6 @@ void main() { when(mockThemeService.getTheme(themeId: "light")).thenAnswer( (_) => StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ); when(wallet.coin).thenAnswer((_) => Coin.bitcoin); @@ -73,7 +72,6 @@ void main() { StackColors.fromStackColorTheme( StackTheme.fromJson( json: lightThemeJsonMap, - applicationThemesDirectoryPath: "test", ), ), ],