From 7b5fd6e78629fe88db606ae0722b4a21f94f8089 Mon Sep 17 00:00:00 2001
From: Tanguy Herbron <tanguy.herbron@outlook.com>
Date: Sat, 4 Aug 2018 05:05:12 +0200
Subject: [PATCH] Update french translation

---
 .idea/caches/build_file_checksums.ser           | Bin 545 -> 545 bytes
 app/build.gradle                                |   1 +
 .../HomeActivityFragments/Overview.java         |   6 +++++-
 .../Activities/RecordTransactionActivity.java   |   2 +-
 .../ExchangeManager/BinanceManager.java         |   2 +-
 app/src/main/res/values-fr/strings.xml          |  13 +++++++++++++
 app/src/main/res/values/strings.xml             |   2 +-
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 539eba9aa6c4cbe8acd7ecfc1518315e44fe0832..083b9b606dd7bd77bba8a5a769b32d9350239cee 100644
GIT binary patch
delta 36
ucmV+<0Neke1fc|wmjz`4%D#4yoOclPM~<~KxuakfcU4fK+K;T0BLV&-?hu*)

delta 36
ucmV+<0Neke1fc|wmjz_^S+~oPoOclIY;2KJm7`(I<6#7Ko#<qfBLV(FKoQCS

diff --git a/app/build.gradle b/app/build.gradle
index 7c77ea4..75960e0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,6 +25,7 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             lintOptions {
+                checkReleaseBuilds false
                 //disable 'MissingTranslation'
             }
         }
diff --git a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Overview.java b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Overview.java
index b0ff3ca..f5d659c 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Overview.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Overview.java
@@ -10,6 +10,7 @@ import android.support.annotation.NonNull;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.graphics.Palette;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -186,6 +187,8 @@ public class Overview extends Fragment implements CoinmarketcapNotifierInterface
         @Override
         protected Void doInBackground(List<Currency>... currencies) {
 
+            iconCounter = 0;
+
             for(Currency currency : currencies[0])
             {
                 String iconUrl = MoodlBox.getIconUrl(currency.getSymbol(), cryptocompareApiManager);
@@ -231,9 +234,10 @@ public class Overview extends Fragment implements CoinmarketcapNotifierInterface
                 getActivity().runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
+
                         if(overviewListAdapter == null)
                         {
-                            overviewListAdapter = new OverviewListAdapter(getActivity().getBaseContext(), currencyList, getActivity());
+                            overviewListAdapter = new OverviewListAdapter(Overview.this.getContext(), currencyList, getActivity());
 
                             listLayout.setAdapter(overviewListAdapter);
                             listLayout.setTextFilterEnabled(false);
diff --git a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java
index 3557384..3e423b4 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/RecordTransactionActivity.java
@@ -225,7 +225,7 @@ public class RecordTransactionActivity extends AppCompatActivity implements Curr
         CustomTabLayout tabLayout = findViewById(R.id.transactionsTabLayout);
         tabLayout.addTab(0, "Buy");
         tabLayout.addTab(1, "Sell");
-        tabLayout.addTab(2, "Transfer");
+        //tabLayout.addTab(2, "Transfer");
         tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
 
         final ViewPager viewPager = findViewById(R.id.transactionsViewPager);
diff --git a/app/src/main/java/com/herbron/moodl/DataManagers/ExchangeManager/BinanceManager.java b/app/src/main/java/com/herbron/moodl/DataManagers/ExchangeManager/BinanceManager.java
index f33d9bb..5ecd3a6 100644
--- a/app/src/main/java/com/herbron/moodl/DataManagers/ExchangeManager/BinanceManager.java
+++ b/app/src/main/java/com/herbron/moodl/DataManagers/ExchangeManager/BinanceManager.java
@@ -68,7 +68,7 @@ public class BinanceManager extends Exchange {
                 if(Double.parseDouble(assets.get(i).getFree()) > 0 || Double.parseDouble(assets.get(i).getLocked()) > 0)
                 {
                     //balance.add(new Currency(assets.get(i).getAsset(), Double.parseDouble(assets.get(i).getFree()) + Double.parseDouble(assets.get(i).getLocked())));
-                    if(!assets.get(i).getAsset().equals("VEN"))
+                    if(!assets.get(i).getAsset().equals("VET"))
                     {
                         balance.add(new Currency(assets.get(i).getAsset(), Double.parseDouble(assets.get(i).getFree()) + Double.parseDouble(assets.get(i).getLocked())));
                     }
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 09c6215..0bf9c38 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -140,4 +140,17 @@
     <string name="wipe_watchlist">Supprimer la liste suivie actuelle</string>
     <string name="wipe_api_keys">Supprimer les clefs API actuelles</string>
     <string name="title_add_exchange">Choose an exchange</string>
+    <string name="title_activity_exchange_list">Comptes synchronisés</string>
+    <string name="account_label">Nom du compte</string>
+    <string name="publicKey">Clé publique</string>
+    <string name="apiKey">Clé API</string>
+    <string name="secretKey">Clé secrète</string>
+    <string name="informations">Informations</string>
+    <string name="title_choose_coin">Choisir une monnaie</string>
+    <string name="exchange">Échange</string>
+    <string name="pair">Paire</string>
+    <string name="total_value">Valeur totale</string>
+    <string name="notes">Notes</string>
+    <string name="select_exchange">Sélectionner un échange</string>
+    <string name="select_pair">Paire</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7c1557b..64266be 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -252,7 +252,7 @@
     <string name="wipe_manual_entries">Wipe current entries</string>
     <string name="wipe_watchlist">Wipe current watchlist</string>
     <string name="wipe_api_keys">Wipe current API keys</string>
-    <string name="title_activity_exchange_list">ExchangeList</string>
+    <string name="title_activity_exchange_list">Synced accounts</string>
     <string name="title_add_exchange">Choose an exchange</string>
     <string name="account_label">Account label</string>
     <string name="publicKey">Public key</string>