diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 539eba9..083b9b6 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ 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... 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 @@ Supprimer la liste suivie actuelle Supprimer les clefs API actuelles Choose an exchange + Comptes synchronisés + Nom du compte + Clé publique + Clé API + Clé secrète + Informations + Choisir une monnaie + Échange + Paire + Valeur totale + Notes + Sélectionner un échange + Paire \ 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 @@ Wipe current entries Wipe current watchlist Wipe current API keys - ExchangeList + Synced accounts Choose an exchange Account label Public key