Skip to content

Commit

Permalink
Merge branch 'main' into fix/create_cookbook_transaction_returns_cook…
Browse files Browse the repository at this point in the history
…book
  • Loading branch information
kjawadDeveloper2 committed Sep 14, 2022
2 parents 8d6d010 + a225d84 commit d88098c
Show file tree
Hide file tree
Showing 71 changed files with 2,184 additions and 668 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/flutter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ jobs:
cd transaction_signing_gateway
flutter pub get
cd ..
cd pdf_viewer-master
flutter pub get
cd ..
cd ..
flutter pub get
flutter analyze
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import 'dart:convert';
import 'package:pylons_sdk/src/core/constants/strings.dart';
import 'package:pylons_sdk/src/features/ipc/base/ipc_handler.dart';
import 'package:pylons_sdk/src/features/models/sdk_ipc_response.dart';
import '../../../../pylons_sdk.dart';
import 'package:pylons_sdk/src/generated/pylons/cookbook.pb.dart';

import '../responseCompleters.dart';

class GetCookbooksHandler implements IPCHandler {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import 'package:pylons_sdk/src/core/constants/strings.dart';
import 'package:pylons_sdk/src/features/ipc/base/ipc_handler.dart';
import 'package:pylons_sdk/src/features/ipc/responseCompleters.dart';
import 'package:pylons_sdk/src/features/models/sdk_ipc_response.dart';
import 'package:pylons_sdk/src/generated/pylons/item.pb.dart';


import '../../../../pylons_sdk.dart';

class GetItemByIdHandler implements IPCHandler {
@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import 'dart:convert';
import 'package:pylons_sdk/src/core/constants/strings.dart';
import 'package:pylons_sdk/src/features/ipc/base/ipc_handler.dart';
import 'package:pylons_sdk/src/features/models/sdk_ipc_response.dart';
import '../../../../pylons_sdk.dart';
import 'package:pylons_sdk/src/generated/pylons/item.pb.dart';

import '../responseCompleters.dart';

class GetListItemsByOwnerHandler implements IPCHandler {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import 'package:pylons_sdk/src/core/constants/strings.dart';
import 'package:pylons_sdk/src/features/ipc/base/ipc_handler.dart';
import 'package:pylons_sdk/src/features/ipc/responseCompleters.dart';
import 'package:pylons_sdk/src/features/models/sdk_ipc_response.dart';
import 'package:pylons_sdk/src/generated/pylons/recipe.pb.dart';


import '../../../../pylons_sdk.dart';

class GetRecipeHandler implements IPCHandler {
@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import 'package:pylons_sdk/src/core/constants/strings.dart';
import 'package:pylons_sdk/src/features/ipc/base/ipc_handler.dart';
import 'package:pylons_sdk/src/features/ipc/responseCompleters.dart';
import 'package:pylons_sdk/src/features/models/sdk_ipc_response.dart';
import 'package:pylons_sdk/src/generated/pylons/recipe.pb.dart';


import '../../../../pylons_sdk.dart';

class GetRecipesHandler implements IPCHandler {
@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import 'package:pylons_sdk/src/core/constants/strings.dart';
import 'package:pylons_sdk/src/features/ipc/base/ipc_handler.dart';
import 'package:pylons_sdk/src/features/ipc/responseCompleters.dart';
import 'package:pylons_sdk/src/features/models/sdk_ipc_response.dart';
import 'package:pylons_sdk/src/generated/pylons/trade.pb.dart';


import '../../../../pylons_sdk.dart';

class GetTradesHandler implements IPCHandler {
@override
Expand Down
4 changes: 3 additions & 1 deletion dart_sdk/lib/src/features/validations/validate_recipe.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import 'dart:convert';

import 'package:pylons_sdk/src/core/constants/strings.dart';
import 'package:pylons_sdk/src/core/error/exceptions.dart';
import 'package:pylons_sdk/src/generated/pylons/recipe.pb.dart';


import '../../../pylons_sdk.dart';

class ValidateRecipe {
/// Verifies that all of a recipe's outputs are accessible, and that it
Expand Down
8 changes: 7 additions & 1 deletion dart_sdk/lib/src/pylons_wallet.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
import 'dart:async';

import 'package:dartz/dartz.dart';
import 'package:pylons_sdk/src/core/error/exceptions.dart';
import 'package:pylons_sdk/src/features/data/models/profile.dart';
import 'package:pylons_sdk/src/generated/pylons/cookbook.pb.dart';
import 'package:pylons_sdk/src/generated/pylons/execution.pb.dart';
import '../pylons_sdk.dart';
import 'package:pylons_sdk/src/generated/pylons/item.pb.dart';
import 'package:pylons_sdk/src/generated/pylons/recipe.pb.dart';
import 'package:pylons_sdk/src/generated/pylons/trade.pb.dart';

import 'features/models/execution_list_by_recipe_response.dart';
import 'features/models/sdk_ipc_message.dart';
import 'generated/pylons/payment_info.pb.dart';
Expand Down
10 changes: 9 additions & 1 deletion dart_sdk/lib/src/pylons_wallet/pylons_wallet_impl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,27 @@ import 'dart:developer';
import 'dart:io';

import 'package:fixnum/fixnum.dart' as fixnum;
import 'package:pylons_sdk/src/core/error/exceptions.dart';
import 'package:pylons_sdk/src/features/data/models/profile.dart';
import 'package:pylons_sdk/src/features/ipc/ipc_constants.dart';
import 'package:pylons_sdk/src/features/models/execution_list_by_recipe_response.dart';
import 'package:pylons_sdk/src/features/validations/validate_recipe.dart';
import 'package:pylons_sdk/src/generated/pylons/cookbook.pb.dart';
import 'package:pylons_sdk/src/generated/pylons/execution.pb.dart';
import 'package:pylons_sdk/src/generated/pylons/item.pb.dart';
import 'package:pylons_sdk/src/generated/pylons/payment_info.pb.dart';
import 'package:pylons_sdk/src/features/ipc/ipc_handler_factory.dart';
import 'package:pylons_sdk/src/features/ipc/responseCompleters.dart';
import 'package:pylons_sdk/src/features/models/sdk_ipc_message.dart';
import 'package:pylons_sdk/src/features/models/sdk_ipc_response.dart';
import 'package:pylons_sdk/src/generated/pylons/recipe.pb.dart';
import 'package:pylons_sdk/src/generated/pylons/trade.pb.dart';
import 'package:pylons_sdk/src/generated/pylons/tx.pb.dart';
import 'package:pylons_sdk/src/pylons_wallet.dart';
import 'package:url_launcher/url_launcher_string.dart';
import 'package:uni_links_platform_interface/uni_links_platform_interface.dart';

import '../../pylons_sdk.dart';

import '../core/constants/strings.dart';

/// The Pylons class is the main endpoint developers use for structured,
Expand Down
47 changes: 45 additions & 2 deletions easel/i18n/de-DE.json → easel/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"upload_to_ipfs": "Auf IPFS hochladen",
"content_id": "Inhalts-ID",
"tx_receipt": "TX-Empfang",
"close": "Fenster schließen",
"close": "Schließen",
"is_this_free": "Ist das ein Free Drop?",
"yes": "Ja",
"no": "Nein",
Expand Down Expand Up @@ -102,5 +102,48 @@
"no_for_sale_nft": "Es stehen keine NFTs zum Verkauf",
"success": "Erfolg",
"in_progress": "Im Gange",
"failed": "Gescheitert"
"failed": "Gescheitert",
"give_nft_a_name" : "Geben Sie Ihrem NFT einen Namen",
"enter_artist_name" : "Künstlernamen eingeben",
"size" : "Größe",
"duration" : "Dauer",
"recipe_created": "Recipe созданный",
"enter_nft_name": "Geben Sie den NFT-Namen ein",
"character_limit" : "Zeichenbegrenzung",
"royalties" : "Lizenzgebühren",
"video_player_error" : "Beim Abspielen des Videos ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.",
"kindly_upload_thumbnail" : "Bitte Vorschaubild hochladen",
"cancel" : "Absagen",
"upload_error_occurred" : "Fehler beim Hochladen aufgetreten",
"err_pick_file" : "Beim Hochladen der Datei ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut",
"pylons_already_installed" : "Pylons bereits installiert.",
"pylons_app_desc_1" : "Ihre Pylons-App ist Ihr Tor zum Pylons-Ökosystem",
"discover_new_apps_adventures": "Entdecken Sie neue NFTs, Apps und Abenteuer",
"characters" : "figuren",
"maximum_is" : "Maximal ist",
"err_pic_file" : "Wählen Sie eine Datei aus",
"un_supported_format" : "Nicht unterstütztes Format",
"get_started" : "Loslegen",
"describe_your_nft" : "Beschreiben Sie Ihre NFT",
"your_name_as_the_artist": "Ihr Name als Künstler",
"enter_royalty_in_percentage": "Geben Sie die Lizenzgebühr in Prozent ein",
"royalty_note": "Prozentsatz aller Sekundärmarktverkäufe, die automatisch an den NFT-Ersteller verteilt werden",
"allowed_royalty_is_between" : "Zulässige Lizenzgebühren liegen zwischen",
"enter_more_than" : "Geben Sie mehr als ein",
"app_desc_2" : "Es macht die Verwaltung Ihrer Krypto einfach",
"cookbook_not_found" : "Cookbook nicht gefunden",
"no_internet" : "Kein Internet",
"app_needed_desc_two": "Kein Schnickschnack. Keine Komplexitäten. Eine Wallet-Adresse für all Ihre Kryptos",
"maximum": "maximal",
"minimum_is" : "Minimum ist",
"enter_number_editions": "Geben Sie die Anzahl der Ausgaben ein",
"enter_price" : "Preis eingeben",
"enter_nft_description": "Geben Sie die NFT-Beschreibung ein",
"nft_preview_header" : "Die Auflösung und Ausrichtung Ihres NFT bleiben unverändert, wie im Raster zu sehen.",
"nft_remaining_characters": "Der NFT-Name sollte mindestens {} Zeichen lang sein",
"app_needed_desc_three": "Sie können es jederzeit löschen, wenn Sie möchten",
"why_app_needed_summary_three" : "Keine Abonnements. Wir verkaufen Ihre Informationen nicht. Wir berechnen nur eine Gebühr, wenn Sie ein NFT kaufen",
"upload_hint_three" : "• Eine Datei pro upload"


}
43 changes: 42 additions & 1 deletion easel/i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,46 @@
"no_for_sale_nft":"There are no For Sale NFTs",
"success": "Success",
"in_progress": "In Progress",
"failed": "Failed"
"failed": "Failed",
"give_nft_a_name" : "Give your NFT a name",
"enter_artist_name" : "Enter artist name",
"size" : "Size",
"duration" : "Duration",
"recipe_created": "Recipe created",
"enter_nft_name": "Enter NFT name",
"character_limit" : "character limit",
"royalties" : "Royalties",
"video_player_error" : "Some Error Occurred while playing the video. Please try again later.",
"kindly_upload_thumbnail" : "Kindly upload thumbnail",
"cancel" : "Cancel",
"upload_error_occurred" : "Upload error occurred",
"err_pick_file" : "Error occurred while uploading the file, please try again",
"pylons_already_installed" : "Pylons already installed.",
"pylons_app_desc_1" : "Your Pylons app is your gateway to the Pylons ecosystem",
"discover_new_apps_adventures": "Discover new NFTs, apps & adventures",
"characters" : "characters",
"maximum_is" : "Maximum is",
"err_pic_file" : "Pick a file",
"un_supported_format" : "Unsupported format",
"get_started" : "Get Started",
"describe_your_nft" : "Describe your NFT",
"your_name_as_the_artist": "Your name as the artist",
"enter_royalty_in_percentage": "Enter royalty in percentage",
"royalty_note": "Percentage of all secondary market sales automatically distributed to the NFT creator",
"allowed_royalty_is_between" : "Allowed royalty is between",
"enter_more_than" : "Enter more than",
"app_desc_2" : "It makes managing your crypto easy",
"cookbook_not_found" : "Cookbook not found",
"no_internet" : "No internet",
"app_needed_desc_two": "No frills. No complexities. One wallet address for all your crypto",
"maximum": "maximum",
"minimum_is" : "Minimum is",
"enter_number_editions": "Enter number of editions",
"enter_price" : "Enter price",
"enter_nft_description": "Enter NFT description",
"nft_preview_header" : "The resolution & orientation of your NFT will remain fixed as seen in the grid.",
"nft_remaining_characters": "NFT name should have {} characters or more",
"app_needed_desc_three": "You can always delete it if you’d like",
"why_app_needed_summary_three" : "No subscriptions. We don’t sell your information. We only charge a fee when you purchase a NFT",
"upload_hint_three" : "• One file per upload"
}
50 changes: 48 additions & 2 deletions easel/i18n/es-ES.json → easel/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"published": "Publicado",
"publish_total": "Publicado({})",
"draft_total": "Plan Preliminar({})",
"draft": "Plan Preliminar",
"draft": "Reclutar",
"publish": "Publicar",
"delete": "Borrar",
"view": "Ver en IPFS",
Expand Down Expand Up @@ -102,5 +102,51 @@
"no_for_sale_nft": "No hay NFT a la venta",
"success": "Éxito",
"in_progress": "En progreso",
"failed": "Ha fallado"
"failed": "Ha fallado",
"give_nft_a_name" : "Dale un nombre a tu NFT",
"enter_artist_name" : "Ingrese el nombre del artista",
"size" : "Tamaño",
"duration" : "Duración",
"recipe_created": "Recipe creada",
"enter_nft_name": "Ingrese el nombre NFT",
"character_limit" : "límite de caracteres",
"royalties" : "Regalías",
"video_player_error" : "Se produjo algún error al reproducir el video. Por favor, inténtelo de nuevo más tarde.",
"kindly_upload_thumbnail" : "Sube la miniatura por favor",
"cancel" : "Cancelar",
"upload_error_occurred" : "Ocurrió un error de carga",
"err_pick_file" : "Ocurrió un error al cargar el archivo, intente nuevamente",
"pylons_already_installed" : "Pylons ya instalados.",
"pylons_app_desc_1" : "Su aplicación Pylons es su puerta de entrada al ecosistema Pylons",
"discover_new_apps_adventures": "Descubre nuevos NFT, aplicaciones y aventuras",
"characters" : "caracteres",
"maximum_is" : "Máximo es",
"err_pic_file" : "Elige un archivo",
"un_supported_format" : "Formato no compatible",
"get_started" : "Empezar",
"describe_your_nft" : "Describa su NFT",
"your_name_as_the_artist": "Tu nombre como la artista",
"enter_royalty_in_percentage": "Ingrese la regalía en porcentaje",
"royalty_note": "Porcentaje de todas las ventas del mercado secundario distribuidas automáticamente al creador de NFT",
"allowed_royalty_is_between" : "La regalía permitida es entre",
"enter_more_than" : "Introduce más de",
"app_desc_2" : "Hace que administrar su criptografía sea fácil",
"cookbook_not_found" : "Cookbook extraviado",
"no_internet" : "Sin internet",
"app_needed_desc_two": "Sin lujos. Sin complejidades. Una dirección de billetera para todas sus criptomonedas",
"maximum": "máximo",
"minimum_is" : "Mínimo es",
"enter_number_editions": "Ingrese el número de ediciones",
"enter_price" : "Introduce el precio",
"enter_nft_description": "Introduzca la descripción de NFT",
"nft_preview_header" : "La resolución y la orientación de su NFT permanecerán fijas como se ve en la cuadrícula.",
"nft_remaining_characters": "El nombre de NFT debe tener {} caracteres o más",
"app_needed_desc_three": "Siempre puedes borrarlo si quieres",
"why_app_needed_summary_three" : "Sin suscripciones. No vendemos su información. Solo cobramos una tarifa cuando compra un NFT",
"upload_hint_three" : "• Un archivo por carga"





}
43 changes: 42 additions & 1 deletion easel/i18n/ru-RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,46 @@
"no_for_sale_nft":"Нет NFT для продажи",
"success": "Успех",
"in_progress": "В ходе выполнения",
"failed": "Не удалось"
"failed": "Не удалось",
"give_nft_a_name" : "Dale un nombre a tu NFT",
"enter_artist_name" : "Введите имя исполнителя",
"size" : "Размер",
"duration" : "Длительность",
"recipe_created": "Recipe созданный",
"enter_nft_name": "Введите имя NFT",
"character_limit" : "лимит символов",
"royalties" : "Роялти",
"video_player_error" : "Произошла ошибка при воспроизведении видео. Пожалуйста, попробуйте позже.",
"kindly_upload_thumbnail" : "Пожалуйста, загрузите миниатюру",
"cancel" : "Отмена",
"upload_error_occurred" : "Ошибка загрузки",
"err_pick_file" : "При загрузке файла произошла ошибка, попробуйте еще раз",
"pylons_already_installed" : "Pylons уже установлены.",
"pylons_app_desc_1" : "Ваше приложение Pylons — это ваш вход в экосистему Pylons.",
"discover_new_apps_adventures": "Откройте для себя новые NFT, приложения и приключения",
"characters" : "персонажи",
"maximum_is" : "Максимум",
"err_pic_file" : "Выберите файл",
"un_supported_format" : "Неподдерживаемый формат",
"get_started" : "Начать",
"describe_your_nft" : "Опишите свой NFT",
"your_name_as_the_artist": "Ваше имя как художника",
"enter_royalty_in_percentage": "Введите роялти в процентах",
"royalty_note": "Процент всех продаж на вторичном рынке, автоматически распределяемый создателю NFT.",
"allowed_royalty_is_between" : "Разрешенный роялти составляет от",
"enter_more_than" : "Введите более",
"app_desc_2" : "Это упрощает управление вашей криптовалютой",
"cookbook_not_found" : "Cookbook не найден",
"no_internet" : "Без интернета",
"app_needed_desc_two": "Никакие оборки. Никаких сложностей. Один адрес кошелька для всей вашей криптовалюты",
"maximum": "максимум",
"minimum_is" : "Минимум",
"enter_number_editions": "Введите количество выпусков",
"enter_price" : "Введите цену",
"enter_nft_description": "Введите описание NFT",
"nft_preview_header" : "Разрешение и ориентация вашего NFT останутся фиксированными, как показано в сетке.",
"nft_remaining_characters": "Имя NFT должно содержать {} символов или более",
"app_needed_desc_three": "Вы всегда можете удалить его, если хотите",
"why_app_needed_summary_three" : "Никаких подписок. Мы не продаем вашу информацию. Мы взимаем комиссию только при покупке NFT",
"upload_hint_three" : "• Один файл на загрузку"
}
6 changes: 3 additions & 3 deletions easel/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
Expand Down Expand Up @@ -490,7 +490,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
Expand All @@ -515,7 +515,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
Expand Down
Loading

0 comments on commit d88098c

Please sign in to comment.