Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign free drop button #1520

Merged
merged 11 commits into from
Dec 14, 2022
17 changes: 17 additions & 0 deletions wallet/assets/images/icons/eye_bold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wallet/assets/images/icons/like_bold.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 0 additions & 13 deletions wallet/assets/images/svg/curved_corner_red_bg.svg

This file was deleted.

5 changes: 4 additions & 1 deletion wallet/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -369,5 +369,8 @@
"ea": "ea",
"maintenance_mode_message": "We ondervinden technische problemen en hebben tijdelijk de onderhoudsmodus gestart voor het oplossen van problemen. Maak je geen zorgen, je collectie is veilig. U kunt echter geen on-chain-transacties starten totdat we het probleem hebben opgelost en de normale functionaliteit hebben hersteld.",
"maintenance_mode_header": "onderhoudsstand",
"invalid_mnemonic" : "Ungültige mnemonic"
"invalid_mnemonic": "Ungültige mnemonic",
"claim_now": "Beanspruche jetzt",
"remaining_and_total_editions": "{remaining} Von {total}",
"remaining": "verblieben"
}
5 changes: 4 additions & 1 deletion wallet/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -371,5 +371,8 @@
"ea": "ea",
"maintenance_mode_message": "We are experiencing technical issues and have temporarily initiated maintenance mode for troubleshooting. Don't worry, your collection is safe. However, you cannot initiate on-chain transactions until we've resolved the problem and restored normal functionality.",
"maintenance_mode_header": "Maintenance Mode",
"invalid_mnemonic" : "Invalid mnemonic"
"invalid_mnemonic": "Invalid mnemonic",
"claim_now": "Claim Now",
"remaining_and_total_editions": "{remaining} of {total}",
"remaining":"remaining"
}
5 changes: 4 additions & 1 deletion wallet/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -369,5 +369,8 @@
"ea": "cada uno",
"maintenance_mode_message": "Estamos experimentando problemas técnicos y hemos iniciado temporalmente el modo de mantenimiento para solucionar problemas. No te preocupes, tu colección está segura. Sin embargo, no puede iniciar transacciones en cadena hasta que hayamos resuelto el problema y restablecido la funcionalidad normal.",
"maintenance_mode_header": "Modo de mantenimiento",
"invalid_mnemonic" : "Mnemonic inválido"
"invalid_mnemonic": "Mnemonic inválido",
"claim_now": "Reclama ahora",
"remaining_and_total_editions": "{remaining} De {total}",
"remaining": "restante"
}
5 changes: 4 additions & 1 deletion wallet/i18n/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -369,5 +369,8 @@
"ea": "ea",
"maintenance_mode_message": "Kami mengalami masalah teknis dan untuk sementara memulai mode pemeliharaan untuk pemecahan masalah. Jangan khawatir, koleksi Anda aman. Namun, Anda tidak dapat memulai transaksi on-chain sampai kami menyelesaikan masalah dan memulihkan fungsionalitas normal.",
"maintenance_mode_header": "Mode Pemeliharaan",
"invalid_mnemonic" : "Mnemonic tidak valid"
"invalid_mnemonic": "Mnemonic tidak valid",
"claim_now": "Klaim Sekarang",
"remaining_and_total_editions": "{remaining} Dari {total}",
"remaining": "tersisa"
}
7 changes: 5 additions & 2 deletions wallet/i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"recommended": "おすすめされた",
"following": "続く",
"select_a_date": "日付を選択",
"network_error_description":"トランザクションの処理中にネットワーク エラーが発生しました。アカウントの更新をもう一度お試しください。再試行しても 2 回請求されることはありません。",
"network_error_description": "トランザクションの処理中にネットワーク エラーが発生しました。アカウントの更新をもう一度お試しください。再試行しても 2 回請求されることはありません。",
"what_is_new": "新着情報",
"trending": "トレンド",
"price": "価格",
Expand Down Expand Up @@ -369,5 +369,8 @@
"ea": "えー",
"maintenance_mode_message": "技術的な問題が発生しており、トラブルシューティングのために一時的にメンテナンス モードを開始しました。心配はいりません。あなたのコレクションは安全です。ただし、問題が解決され、通常の機能が回復するまで、オンチェーン トランザクションを開始することはできません。",
"maintenance_mode_header": "メンテナンスモード",
"invalid_mnemonic" : "無効 mnemonic"
"invalid_mnemonic": "無効 mnemonic",
"claim_now": "今すぐ請求",
"remaining_and_total_editions": "{remaining} の {total}",
"remaining": "残り"
}
5 changes: 4 additions & 1 deletion wallet/i18n/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -368,5 +368,8 @@
"ea": "에아",
"maintenance_mode_message": "기술적인 문제가 발생했으며 문제 해결을 위해 일시적으로 유지 관리 모드를 시작했습니다. 걱정하지 마세요. 컬렉션은 안전합니다. 그러나 문제를 해결하고 정상적인 기능을 복원할 때까지 온체인 트랜잭션을 시작할 수 없습니다.",
"maintenance_mode_header": "유지 관리 모드",
"invalid_mnemonic" : "유효하지 않은 mnemonic"
"invalid_mnemonic": "유효하지 않은 mnemonic",
"claim_now": "지금 청구하세요",
"remaining_and_total_editions": "{remaining} 의 {total}",
"remaining": "남은"
}
5 changes: 4 additions & 1 deletion wallet/i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -369,5 +369,8 @@
"ea": "шт.",
"maintenance_mode_message": "У нас возникли технические проблемы, и мы временно запустили режим обслуживания для устранения неполадок. Не волнуйтесь, ваша коллекция в безопасности. Однако вы не можете инициировать транзакции в сети, пока мы не решим проблему и не восстановим нормальную работу.",
"maintenance_mode_header": "Режим технического обслуживания",
"invalid_mnemonic" : "Инвалид mnemonic"
"invalid_mnemonic": "Инвалид mnemonic",
"claim_now": "Заявить сейчас",
"remaining_and_total_editions": "{remaining} Из {total}",
"remaining": "осталось"
}
5 changes: 4 additions & 1 deletion wallet/i18n/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -369,5 +369,8 @@
"ea": "ea",
"maintenance_mode_message": "Chúng tôi đang gặp sự cố kỹ thuật và đã tạm thời bắt đầu chế độ bảo trì để khắc phục sự cố. Đừng lo lắng, bộ sưu tập của bạn vẫn an toàn. Tuy nhiên, bạn không thể bắt đầu các giao dịch trên chuỗi cho đến khi chúng tôi giải quyết xong sự cố và khôi phục chức năng bình thường.",
"maintenance_mode_header": "Chế độ bảo trì",
"invalid_mnemonic" : "Không hợp lệ menmonic"
"invalid_mnemonic": "Không hợp lệ menmonic",
"claim_now": "yêu cầu ngay bây giờ",
"remaining_and_total_editions": "{remaining} Của {total}",
"remaining": "còn lại"
}
3 changes: 3 additions & 0 deletions wallet/lib/generated/locale_keys.g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -373,5 +373,8 @@ abstract class LocaleKeys {
static const maintenance_mode_message = 'maintenance_mode_message';
static const maintenance_mode_header = 'maintenance_mode_header';
static const invalid_mnemonic = 'invalid_mnemonic';
static const claim_now = 'claim_now';
static const remaining_and_total_editions = 'remaining_and_total_editions';
static const remaining = 'remaining';

}
56 changes: 42 additions & 14 deletions wallet/lib/pages/detailed_asset_view/widgets/tab_fields.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,21 @@ class _TabFieldState extends State<TabField> {
case NftType.TYPE_RECIPE:
return {
LocaleKeys.recipe_id.tr(): widget.nft.recipeID,
LocaleKeys.resolution.tr(): "${widget.nft.width}x${widget.nft.height} ${widget.nft.fileExtension.toUpperCase()}",
LocaleKeys.ipfs_cid.tr(): widget.nft.cid
LocaleKeys.resolution.tr(): "${widget.nft.width}x${widget.nft.height}",
LocaleKeys.ipfs_cid.tr(): widget.nft.cid,
};
case NftType.TYPE_ITEM:
return {LocaleKeys.recipe_id.tr(): widget.nft.recipeID};
return {
LocaleKeys.recipe_id.tr(): widget.nft.recipeID,
};
case NftType.TYPE_TRADE:
break;
}

return {
LocaleKeys.recipe_id.tr(): widget.nft.recipeID,
LocaleKeys.resolution.tr(): "${widget.nft.width}x${widget.nft.height} ${widget.nft.fileExtension}",
LocaleKeys.ipfs_cid.tr(): widget.nft.cid
LocaleKeys.ipfs_cid.tr(): widget.nft.cid,
};
}

Expand All @@ -85,14 +87,27 @@ class _TabFieldState extends State<TabField> {

final nftDetail = getNFTDetailsMap();

final listOwnership = ownership.entries.map((element) => _tabDetails(field: element.key, value: element.value, customColor: element.key == LocaleKeys.owner.tr() ? Colors.red : null)).toList();
final listOwnership = ownership.entries
.map(
(element) => _tabDetails(
field: element.key,
value: element.value,
customColor: element.key == LocaleKeys.owner.tr() ? AppColors.kRed : null,
),
)
.toList();

final listDetails = nftDetail.entries
.map(
(element) => _tabDetails(
field: element.key,
value: element.value,
customWidget: (element.key == LocaleKeys.recipe_id.tr() || element.key == LocaleKeys.ipfs_cid.tr()) && element.value.isNotEmpty ? _tabDetailsWithIcon(value: element.value) : null),
field: element.key,
value: element.value,
customWidget: (element.key == LocaleKeys.recipe_id.tr() || element.key == LocaleKeys.ipfs_cid.tr()) && element.value.isNotEmpty
? _tabDetailsWithIcon(
value: element.value,
)
: null,
),
)
.toList();

Expand All @@ -111,7 +126,10 @@ class _TabFieldState extends State<TabField> {
child: AutoSizeText(
widget.name,
maxLines: 1,
style: const TextStyle(color: Colors.white),
style: TextStyle(
color: AppColors.kWhite,
fontWeight: FontWeight.bold,
),
),
),
SizedBox(
Expand Down Expand Up @@ -156,10 +174,20 @@ class _TabFieldState extends State<TabField> {
children: [
Container(
width: 100.w,
height: 10.h,
decoration: const BoxDecoration(border: Border(bottom: BorderSide(color: Colors.white, width: 2))),
height: 6.h,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: AppColors.kWhite,
width: 2,
),
),
),
),
CustomPaint(
size: Size(6.w, 6.h),
painter: DiagonalLinePainter(),
),
CustomPaint(size: Size(10.w, 10.h), painter: DiagonalLinePainter()),
],
),
SizedBox(
Expand Down Expand Up @@ -278,9 +306,9 @@ class DiagonalLinePainter extends CustomPainter {
@override
void paint(Canvas canvas, Size size) {
final point1 = Offset(-0.5, size.height - 1);
final point2 = Offset(size.width, 0);
final point2 = Offset(size.width, -3);
final paint = Paint()
..color = Colors.white
..color = AppColors.kWhite
..strokeWidth = 2;
canvas.drawLine(point1, point2, paint);
}
Expand Down
Loading