Merge pull request #141 from peercoin/0.8.5

0.8.5
peercoin · Feb 18, 2022 · 316e907 · 316e907
2 parents b701363 + 73c64a9
commit 316e907
Show file tree

Hide file tree

Showing 16 changed files with 898 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### **0.8.5** (2022-02-18)
+* Add language: Arabic
+* Add language: Japanese
+* Add language: Thai 
+* Add currencies: THB, JPY
+* Fix for Norwegian
+* Fix for importing paper wallets
+
 ### **0.8.4** (2022-02-13)
 * Add language: Bangla 
 * Add language: Farsi

diff --git a/assets/translations/ar.json b/assets/translations/ar.json
diff --git a/assets/translations/el.json b/assets/translations/el.json
@@ -0,0 +1 @@
+{}
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -111,6 +111,7 @@
     "currency_IDR": "Indonesian Rupiah",
     "currency_INR": "Indian Rupee",
     "currency_IRR": "Iranian Rial",
+    "currency_JPY": "Japanese Yen",
     "currency_KES": "Kenyan Shilling",
     "currency_KRW": "South Korean Won",
     "currency_NOK": "Norwegian Krone",
@@ -119,6 +120,7 @@
     "currency_RON": "Romanian Leu",
     "currency_RUB": "Russian Ruble",
     "currency_USD": "US Dollar",
+    "currency_THB": "Thai Baht",
     "currency_TRY": "Turkish Lira",
     "currency_TZS": "Tanzanian Shilling",
     "currency_UAH": "Ukrainian Hryvnia",

diff --git a/assets/translations/fil.json b/assets/translations/fil.json
@@ -1,3 +1,8 @@
 {
-    "about_illustrations_button": "designs.AI"
+    "about_illustrations_button": "designs.AI",
+    "about": "Tungkol sa",
+    "about_developers": "© $year Ang Developer ng peercoin_flutter",
+    "about_free": "Ang software na ito ay open source, libre at walang anumang garantiya o kung anuman.\nGamitin ng may pag-iingat.",
+    "about_license": "Lisensyado sa ilalim ng AGPL-3.0",
+    "about_view_source": "Tingnan ang Source Code"
 }
diff --git a/assets/translations/ja.json b/assets/translations/ja.json
diff --git a/assets/translations/nb_NO.json b/assets/translations/nb_NO.json
@@ -50,7 +50,7 @@
     "app_settings_notifications_hint_sync_1": "Angir intervallet der appen ser etter nye transaksjoner i bakgrunnen.\nAktivt intervall: $minutes minutter.",
     "app_settings_revealAuthButton": "Vis alternativer for autentisering",
     "app_settings_seed": "Gjenopprettingsfrase",
-    "app_settings_theme": "App-tema",
+    "app_settings_theme": "Apptema",
     "app_settings_theme_light": "Lys",
     "app_settings_theme_dark": "Mørk",
     "app_settings_theme_system": "System Standard",
@@ -131,7 +131,7 @@
     "send_confirm_send": "Bekreft & Send",
     "send_confirm_transaction": "Vennligst bekreft transaksjonen",
     "send_dust": "Lommerusk: -$amount $letter_code",
-    "send_empty": "Tom lommebok",
+    "send_empty": "Tøm lommebok",
     "send_enter_amount": "Vennligst skriv inn et beløp",
     "send_errors_solve": "Vennligst løs feil…",
     "send_fee": "Gebyr: -$amount $letter_code",
@@ -267,5 +267,11 @@
     "currency_IDR": "Indonesisk rupiah",
     "currency_IRR": "Iransk rial",
     "currency_KRW": "Sørkoreansk won",
-    "currency_TRY": "Tyrkisk lira"
+    "currency_TRY": "Tyrkisk lira",
+    "currency_TZS": "Tanzaniansk shilling",
+    "currency_UAH": "Ukrainsk hryvnja",
+    "currency_UGX": "Ugandisk shilling",
+    "currency_VND": "Vietnamesisk dong",
+    "currency_PKR": "Pakistansk rupi",
+    "currency_KES": "Kenyansk shilling"
 }
diff --git a/assets/translations/th.json b/assets/translations/th.json
diff --git a/lib/screens/setup/setup_create_wallet.dart b/lib/screens/setup/setup_create_wallet.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:peercoin/providers/unencryptedOptions.dart';
@@ -149,10 +150,14 @@ class _SetupCreateWalletScreenState extends State<SetupCreateWalletScreen> {
                         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                         children: [
                           PeerButtonSetupBack(),
-                          Text(
+                          AutoSizeText(
                             AppLocalizations.instance
                                 .translate('setup_save_title'),
-                            style: TextStyle(color: Colors.white, fontSize: 28),
+                            maxFontSize: 28,
+                            minFontSize: 27,
+                            style: TextStyle(
+                              color: Colors.white,
+                            ),
                           ),
                           SizedBox(
                             width: 40,

diff --git a/lib/screens/setup/setup_data_feeds.dart b/lib/screens/setup/setup_data_feeds.dart
@@ -1,3 +1,4 @@
+import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:peercoin/providers/appsettings.dart';
 import 'package:peercoin/providers/unencryptedOptions.dart';
@@ -92,13 +93,17 @@ class _SetupDataFeedsScreenState extends State<SetupDataFeedsScreen> {
                       height: MediaQuery.of(context).size.height / 15,
                     ),
                     Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                      mainAxisAlignment: MainAxisAlignment.center,
                       children: [
                         PeerButtonSetupBack(),
-                        Text(
+                        AutoSizeText(
                           AppLocalizations.instance
                               .translate('setup_price_feed_title'),
-                          style: TextStyle(color: Colors.white, fontSize: 28),
+                          minFontSize: 24,
+                          maxFontSize: 28,
+                          style: TextStyle(
+                            color: Colors.white,
+                          ),
                         ),
                         SizedBox(
                           width: 40,
@@ -119,7 +124,9 @@ class _SetupDataFeedsScreenState extends State<SetupDataFeedsScreen> {
                                 title: Text(
                                   AppLocalizations.instance
                                       .translate('setup_price_feed_allow'),
-                                  style: TextStyle(color: Colors.white),
+                                  style: TextStyle(
+                                    color: Colors.white,
+                                  ),
                                 ),
                                 value: _dataFeedAllowed,
                                 activeColor: Colors.white,
@@ -131,6 +138,7 @@ class _SetupDataFeedsScreenState extends State<SetupDataFeedsScreen> {
                             PeerExplanationText(
                               AppLocalizations.instance
                                   .translate('setup_price_feed_description'),
+                              2,
                             ),
                           ],
                         ),
@@ -188,7 +196,7 @@ class _SetupDataFeedsScreenState extends State<SetupDataFeedsScreen> {
                 },
               ),
               SizedBox(
-                height: 32,
+                height: 25,
               ),
             ],
           ),

diff --git a/lib/screens/setup/setup_import_seed.dart b/lib/screens/setup/setup_import_seed.dart
@@ -1,3 +1,4 @@
+import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_logs/flutter_logs.dart';
@@ -100,11 +101,15 @@ class _SetupImportSeedState extends State<SetupImportSeedScreen> {
                         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                         children: [
                           PeerButtonSetupBack(),
-                          Text(
+                          AutoSizeText(
                             AppLocalizations.instance.translate(
                               'setup_import_title',
                             ),
-                            style: TextStyle(color: Colors.white, fontSize: 28),
+                            maxFontSize: 28,
+                            minFontSize: 25,
+                            style: TextStyle(
+                              color: Colors.white,
+                            ),
                           ),
                           SizedBox(
                             width: 40,

diff --git a/lib/screens/wallet/import_paper_wallet.dart b/lib/screens/wallet/import_paper_wallet.dart
@@ -251,8 +251,14 @@ class _ImportPaperWalletScreenState extends State<ImportPaperWalletScreen> {
   }
 
   Future<void> buildImportTx([int fee = 0, bool dryRun = true]) async {
+    FlutterLogs.logInfo(
+      'ImportPaperWallet',
+      'buildImportTx',
+      'fee $fee - dryRun $dryRun',
+    );
+
     final tx = TransactionBuilder(network: _activeCoin.networkType);
-    tx.setVersion(1);
+    tx.setVersion(3);
     //send everything minus fees to unusedaddr
     tx.addOutput(_activeWallets.getUnusedAddress, _balanceInt - fee);
     //add inputs
@@ -273,6 +279,12 @@ class _ImportPaperWalletScreenState extends State<ImportPaperWalletScreen> {
     var asDouble = double.parse(number) * 1000000;
     var requiredFeeInSatoshis = asDouble.toInt();
 
+    FlutterLogs.logInfo(
+      'ImportPaperWallet',
+      'buildImportTx',
+      'size ${intermediate.txSize}',
+    );
+
     if (dryRun == false) {
       _transactionHex = intermediate.toHex();
     }
@@ -369,6 +381,7 @@ class _ImportPaperWalletScreenState extends State<ImportPaperWalletScreen> {
                                 .translate('paperwallet_step_4'),
                             style: Theme.of(context).textTheme.headline6),
                         PeerButton(
+                          small: true,
                           action: () => handlePress(4),
                           text: AppLocalizations.instance
                               .translate('paperwallet_step_4_text'),

diff --git a/lib/tools/app_localizations.dart b/lib/tools/app_localizations.dart
@@ -19,6 +19,7 @@ class AppLocalizations {
   }
 
   static const Map<String, String> availableLocales = {
+    'ar': '(al arabiya) العربية',
     'en': 'English',
     'bn': 'বাংলা (baɛṅlā)',
     'id': 'Bahasa Indonesia',
@@ -30,14 +31,16 @@ class AppLocalizations {
     'hi': 'हिन्दी (hindī)',
     'hr': 'Hrvatski',
     'it': 'Italiano',
+    'ja': '日本語 (nihongo)',
     'sw': 'Kiswahili',
     'ko': '한국어 [韓國語] (han-guk-eo)',
     'nl': 'Nederlands',
-    'no': 'Norsk Bokmål',
+    'nb': 'Norsk Bokmål',
     'pl': 'Polski',
     'pt': 'Português',
     'ro': 'Română',
     'ru': 'Русский',
+    'th': 'ภาษาไทย (paasaa-tai)',
     'tr': 'Türkçe',
     'uk': 'Українська (Ukrajins’ka)',
     'ur': '(urdū) اردو',
@@ -65,7 +68,7 @@ class AppLocalizations {
     switch (localeToBeLoaded.languageCode) {
       case 'bn':
         return 'assets/translations/bn_BD.json';
-      case 'no':
+      case 'nb':
         return 'assets/translations/nb_NO.json';
       default:
         return 'assets/translations/${localeToBeLoaded.languageCode}.json';

diff --git a/lib/tools/price_ticker.dart b/lib/tools/price_ticker.dart
@@ -37,6 +37,7 @@ class PriceTicker {
     'IDR': 'Rp',
     'INR': '₹',
     'IRR': '﷼',
+    'JPY': '¥',
     'KES': 'KSh',
     'KRW': '₩',
     'NOK': 'kr',
@@ -45,6 +46,7 @@ class PriceTicker {
     'USD': '\$',
     'RON': 'L',
     'RUB': '₽',
+    'THB': '฿',
     'TRY': '₺',
     'TZS': 'TSh',
     'UAH': '₴',

diff --git a/lib/widgets/buttons.dart b/lib/widgets/buttons.dart
@@ -31,6 +31,7 @@ class PeerButton extends StatelessWidget {
         text,
         minFontSize: 10,
         maxFontSize: 16,
+        textAlign: TextAlign.center,
         style: TextStyle(
           letterSpacing: 1.4,
           color: active ? LightColors.white : LightColors.grey,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: peercoin
 description: A new Peercoin wallet.
 
-version: 0.8.4+81
+version: 0.8.5+82
 
 environment:
   sdk: '>=2.12.0 <3.0.0'