Several fixes

- CurrencySelectionActivity renamed to CurrencyListActivity
- Allow refresh from the Update snackbar button in Summary after an error
- Code cleaning
- Typo

.gitignore

@@ -1,10 +1,69 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
-/build
+
-/captures
+# Built application files
-.externalNativeBuild
 *.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md

app/src/main/AndroidManifest.xml

@@ -34,7 +34,7 @@
             android:label="@string/title_activity_settings"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".Activities.CurrencySelectionActivity"
+            android:name=".Activities.CurrencyListActivity"
             android:screenOrientation="portrait">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

app/src/main/java/com/herbron/moodl/Activities/CurrencyListActivity.java

@@ -1,11 +1,11 @@
 package com.herbron.moodl.Activities;
 
-import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Looper;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.CardView;
+import android.util.Log;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -16,6 +16,8 @@ import android.widget.ListView;
 import android.widget.SearchView;
 import android.widget.Toast;
 
+import com.herbron.moodl.DataManagers.InfoAPIManagers.CoinmarketCapAPIManager;
+import com.herbron.moodl.DataNotifiers.CoinmarketcapNotifierInterface;
 import com.herbron.moodl.DataNotifiers.CryptocompareNotifierInterface;
 import com.herbron.moodl.DataManagers.CurrencyData.Currency;
 import com.herbron.moodl.DataManagers.InfoAPIManagers.CryptocompareApiManager;
@@ -25,15 +27,22 @@ import com.herbron.moodl.CustomAdapters.CoinWatchlistAdapter;
 import com.herbron.moodl.R;
 
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 
-public class CurrencySelectionActivity extends AppCompatActivity implements SearchView.OnQueryTextListener, CryptocompareNotifierInterface {
+public class CurrencyListActivity extends AppCompatActivity implements SearchView.OnQueryTextListener, CryptocompareNotifierInterface, CoinmarketcapNotifierInterface {
 
     private CoinWatchlistAdapter adapter;
     private ListView listView;
     private android.widget.Filter filter;
     private CryptocompareApiManager cryptocompareApiManager;
-    private boolean isWatchList;
+    private CoinmarketCapAPIManager coinmarketCapAPIManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -42,15 +51,15 @@ public class CurrencySelectionActivity extends AppCompatActivity implements Sear
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
-        setContentView(R.layout.activity_add_currency);
+        setContentView(R.layout.activity_currency_list);
 
         cryptocompareApiManager = CryptocompareApiManager.getInstance(this);
         cryptocompareApiManager.addListener(this);
 
-        setTitle(getString(R.string.select_coin));
+        coinmarketCapAPIManager = CoinmarketCapAPIManager.getInstance(this);
+        coinmarketCapAPIManager.addListener(this);
 
-        Intent intent = getIntent();
+        setTitle(getString(R.string.select_coin));
-        isWatchList = intent.getBooleanExtra("isWatchList", false);
 
         ListLoader listLoader = new ListLoader();
         listLoader.execute();
@@ -68,17 +77,7 @@ public class CurrencySelectionActivity extends AppCompatActivity implements Sear
 
     private void setupAdapter()
     {
-        List<String> currencyNames = cryptocompareApiManager.getCurrenciesName();
+        adapter = new CoinWatchlistAdapter(this, new ArrayList<>(coinmarketCapAPIManager.getTotalListing()));
-        List<String> currencySymbols = cryptocompareApiManager.getCurrenciesSymbol();
-
-        ArrayList<Currency> currencyArrayList = new ArrayList<>();
-
-        for(int i = 0; i < currencyNames.size(); i++)
-        {
-            currencyArrayList.add(new Currency(currencyNames.get(i), currencySymbols.get(i)));
-        }
-
-        adapter = new CoinWatchlistAdapter(this, currencyArrayList);
     }
 
     private void setupList()
@@ -93,26 +92,16 @@ public class CurrencySelectionActivity extends AppCompatActivity implements Sear
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 Currency selectedCurrency = (Currency) adapterView.getItemAtPosition(i);
 
-                if(isWatchList)
+                PreferencesManager preferencesManager = new PreferencesManager(getApplicationContext());
-                {
+                DatabaseManager databaseManager = new DatabaseManager(getApplicationContext());
-                    PreferencesManager preferencesManager = new PreferencesManager(getApplicationContext());
-                    DatabaseManager databaseManager = new DatabaseManager(getApplicationContext());
 
-                    if(databaseManager.addCurrencyToWatchlist(selectedCurrency))
+                if(databaseManager.addCurrencyToWatchlist(selectedCurrency))
-                    {
+                {
-                        preferencesManager.setMustUpdateWatchlist(true);
+                    preferencesManager.setMustUpdateWatchlist(true);
-                    }
-                    else
-                    {
-                        Toast.makeText(getApplicationContext(), getString(R.string.already_watchlisr), Toast.LENGTH_SHORT).show();
-                    }
                 }
                 else
                 {
-                    Intent intent = new Intent(CurrencySelectionActivity.this, RecordTransactionActivity.class);
+                    Toast.makeText(getApplicationContext(), getString(R.string.already_watchlist), Toast.LENGTH_SHORT).show();
-                    intent.putExtra("coin", selectedCurrency.getName());
-                    intent.putExtra("symbol", selectedCurrency.getSymbol());
-                    startActivity(intent);
                 }
 
                 finish();
@@ -166,17 +155,20 @@ public class CurrencySelectionActivity extends AppCompatActivity implements Sear
 
     private void detailsEvent()
     {
-        runOnUiThread(new Runnable() {
+        if(coinmarketCapAPIManager.isUpToDate() && cryptocompareApiManager.isDetailsUpToDate())
-            @Override
+        {
-            public void run() {
+            runOnUiThread(new Runnable() {
-                setupAdapter();
+                @Override
-                setupList();
+                public void run() {
-                setupSearchView();
+                    setupAdapter();
+                    setupList();
+                    setupSearchView();
 
-                expand(findViewById(R.id.listContainerLayout));
+                    expand(findViewById(R.id.listContainerLayout));
-                findViewById(R.id.currencyListProgressBar).setVisibility(View.GONE);
+                    findViewById(R.id.currencyListProgressBar).setVisibility(View.GONE);
-            }
+                }
-        });
+            });
+        }
     }
 
     @Override
@@ -189,6 +181,26 @@ public class CurrencySelectionActivity extends AppCompatActivity implements Sear
 
     }
 
+    @Override
+    public void onCurrenciesRetrieved(List<Currency> currencyList) {
+
+    }
+
+    @Override
+    public void onTopCurrenciesUpdated() {
+
+    }
+
+    @Override
+    public void onMarketCapUpdated() {
+
+    }
+
+    @Override
+    public void onListingUpdated() {
+        detailsEvent();
+    }
+
     private class ListLoader extends AsyncTask<Void, Integer, Void>
     {
         @Override
@@ -211,9 +223,17 @@ public class CurrencySelectionActivity extends AppCompatActivity implements Sear
                 Looper.prepare();
             }
 
-            if(!cryptocompareApiManager.isDetailsUpToDate())
+            if(!cryptocompareApiManager.isDetailsUpToDate() || !coinmarketCapAPIManager.isUpToDate())
             {
-                cryptocompareApiManager.updateDetails();
+                if(!cryptocompareApiManager.isDetailsUpToDate())
+                {
+                    cryptocompareApiManager.updateDetails();
+                }
+
+                if(!coinmarketCapAPIManager.isUpToDate())
+                {
+                    coinmarketCapAPIManager.updateListing();
+                }
             }
             else
             {

app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Summary.java

@@ -72,13 +72,14 @@ import static java.lang.Math.abs;
 
 public class Summary extends Fragment implements BalanceSwitchManagerInterface, BalanceUpdateNotifierInterface, CryptocompareNotifierInterface, CoinmarketcapNotifierInterface {
 
+
+
     private LinearLayout currencyLayout;
     private PreferencesManager preferencesManager;
     private BalanceManager balanceManager;
     private SwipeRefreshLayout refreshLayout;
     private Dialog loadingDialog;
     private String defaultCurrency;
-    private CoinmarketCapAPIManager coinmarketCapAPIManager;
 
     private TextView toolbarSubtitle;
     private CollapsingToolbarLayout toolbarLayout;
@@ -87,7 +88,6 @@ public class Summary extends Fragment implements BalanceSwitchManagerInterface,
     private Runnable updateRunnable;
 
     private int coinCounter;
-    private int iconCounter;
     private float totalValue;
     private boolean detailsChecker;
     private boolean tickersChecker;
@@ -95,6 +95,7 @@ public class Summary extends Fragment implements BalanceSwitchManagerInterface,
     private long lastTimestamp;
 
     private BalanceUpdateInterface balanceUpdateInterface;
+    private CoinmarketCapAPIManager coinmarketCapAPIManager;
     private CryptocompareApiManager cryptocompareApiManager;
 
     @NonNull
@@ -318,7 +319,7 @@ public class Summary extends Fragment implements BalanceSwitchManagerInterface,
                 .setAction(getString(R.string.update), new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-
+                        updateAll(true);
                     }
                 })
                 .show();
@@ -327,7 +328,6 @@ public class Summary extends Fragment implements BalanceSwitchManagerInterface,
     private void resetCounters()
     {
         coinCounter = 0;
-        iconCounter = 0;
     }
 
     private void adaptView(float totalValue, float totalFluctuation)
@@ -753,6 +753,7 @@ public class Summary extends Fragment implements BalanceSwitchManagerInterface,
 
     private class DataUpdater extends AsyncTask<Void, Integer, Void>
     {
+
         @Override
         protected Void doInBackground(Void... params)
         {

app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Watchlist.java

@@ -12,14 +12,14 @@ import android.os.Bundle;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.graphics.Palette;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageButton;
 
-import com.herbron.moodl.Activities.CurrencySelectionActivity;
+import com.herbron.moodl.Activities.CurrencyListActivity;
 import com.herbron.moodl.DataNotifiers.CoinmarketcapNotifierInterface;
 import com.herbron.moodl.DataNotifiers.CryptocompareNotifierInterface;
 import com.herbron.moodl.CurrencyInfoUpdateNotifierInterface;
@@ -42,7 +42,6 @@ import java.util.List;
 
 import static com.herbron.moodl.MoodlBox.collapseW;
 import static com.herbron.moodl.MoodlBox.expandW;
-import static com.herbron.moodl.MoodlBox.getColor;
 import static com.herbron.moodl.MoodlBox.getIconDominantColor;
 
 /**
@@ -250,7 +249,7 @@ public class Watchlist extends Fragment implements CryptocompareNotifierInterfac
                     disableEdition();
                 }
 
-                Intent selectionIntent = new Intent(getActivity(), CurrencySelectionActivity.class);
+                Intent selectionIntent = new Intent(getActivity(), CurrencyListActivity.class);
                 selectionIntent.putExtra("isWatchList", true);
                 startActivity(selectionIntent);
             }
@@ -355,6 +354,7 @@ public class Watchlist extends Fragment implements CryptocompareNotifierInterfac
             public void run() {
                 dragLinearLayout.removeAllViews();
                 view.findViewById(R.id.progressBarWatchlist).setVisibility(View.GONE);
+                view.findViewById(R.id.buttonAddWatchlist).setVisibility(View.VISIBLE);
 
                 for(Currency currency : watchlistManager.getWatchlist())
                 {
@@ -390,6 +390,9 @@ public class Watchlist extends Fragment implements CryptocompareNotifierInterfac
             id = jsonObject.getInt("Id");
         } catch (JSONException e) {
             e.printStackTrace();
+        } catch (NullPointerException e) {
+            Log.d("moodl", "ID not found");
+            e.printStackTrace();
         }
 
         return id;
@@ -435,27 +438,14 @@ public class Watchlist extends Fragment implements CryptocompareNotifierInterfac
                     public void onPriceUpdated(Currency successCurrency) {
                         String iconUrl = MoodlBox.getIconUrl(currency.getSymbol(), cryptocompareApiManager);
 
-                        if(iconUrl != null)
+                        MoodlBox.getBitmapFromURL(iconUrl, currency.getSymbol(), getResources(), getActivity().getBaseContext(), new MoodlboxNotifierInterface() {
-                        {
+                            @Override
-                            MoodlBox.getBitmapFromURL(iconUrl, currency.getSymbol(), getResources(), getActivity().getBaseContext(), new MoodlboxNotifierInterface() {
+                            public void onBitmapDownloaded(Bitmap bitmapIcon) {
-                                @Override
+                                currency.setIcon(bitmapIcon);
-                                public void onBitmapDownloaded(Bitmap bitmapIcon) {
+                                currency.setChartColor(getIconDominantColor(getContext(), bitmapIcon));
-                                    currency.setIcon(bitmapIcon);
+                                countWatchlist();
-                                    currency.setChartColor(getIconDominantColor(getContext(), bitmapIcon));
+                            }
-                                    countWatchlist();
+                        });
-
-                                }
-                            });
-                        }
-                        else
-                        {
-                            Bitmap icon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher_moodl);
-                            icon = Bitmap.createScaledBitmap(icon, 50, 50, false);
-
-                            currency.setIcon(icon);
-                            currency.setChartColor(getIconDominantColor(getContext(), icon));
-                            countWatchlist();
-                        }
                     }
                 });
             }

app/src/main/java/com/herbron/moodl/DataManagers/InfoAPIManagers/CoinmarketCapAPIManager.java

@@ -203,6 +203,11 @@ public class CoinmarketCapAPIManager {
         }
     }
 
+    public List<Currency> getTotalListing()
+    {
+        return currencyTickerList;
+    }
+
     public void updateTopCurrencies(final String toSymbol)
     {
         String requestString = topCurrenciesUrl + toSymbol;

app/src/main/java/com/herbron/moodl/MoodlBox.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.v7.graphics.Palette;
@@ -209,36 +210,51 @@ public class MoodlBox {
 
     public static void getBitmapFromURL(String src, String symbol, Resources resources, Context context, MoodlboxNotifierInterface callBack)
     {
-        String size = src.substring(src.lastIndexOf("=") + 1, src.length());
-        String filepath = context.getCacheDir() + "/" + symbol + "x" + size + ".png";
         Bitmap result;
 
-        BitmapFactory.Options options = new BitmapFactory.Options();
+        if(src != null)
-        options.inPreferredConfig = Bitmap.Config.ARGB_8888;
-
-        result = BitmapFactory.decodeFile(filepath, options);
-
-        if(result == null)
         {
-            try {
+            String size = src.substring(src.lastIndexOf("=") + 1, src.length());
-                java.net.URL url = new java.net.URL(src);
+            String filepath = context.getCacheDir() + "/" + symbol + "x" + size + ".png";
-                HttpURLConnection connection = (HttpURLConnection) url
-                        .openConnection();
-                connection.setDoInput(true);
-                connection.connect();
-                InputStream input = connection.getInputStream();
-                result = BitmapFactory.decodeStream(input);
 
-                FileOutputStream out = new FileOutputStream(filepath);
+            BitmapFactory.Options options = new BitmapFactory.Options();
-                result.compress(Bitmap.CompressFormat.PNG, 100, out);
+            options.inPreferredConfig = Bitmap.Config.ARGB_8888;
 
-            } catch (IOException e) {
+            result = BitmapFactory.decodeFile(filepath, options);
-                Log.d("moodl", "Error while downloading " + symbol + " icon > " + e.getMessage());
+
-                result = BitmapFactory.decodeResource(resources,
+            if(result == null)
-                        R.mipmap.ic_launcher_moodl);
+            {
-                result = Bitmap.createScaledBitmap(result, Integer.valueOf(size), Integer.valueOf(size), false);
+                try {
+                    java.net.URL url = new java.net.URL(src);
+                    HttpURLConnection connection = (HttpURLConnection) url
+                            .openConnection();
+                    connection.setDoInput(true);
+                    connection.connect();
+                    InputStream input = connection.getInputStream();
+                    result = BitmapFactory.decodeStream(input);
+
+                    FileOutputStream out = new FileOutputStream(filepath);
+                    result.compress(Bitmap.CompressFormat.PNG, 100, out);
+
+                } catch (IOException e) {
+                    Log.d("moodl", "Error while downloading " + symbol + " icon > " + e.getMessage());
+                    Drawable defautlDrawable = resources.getDrawable(R.drawable.ic_panorama_fish_eye_24dp);
+                    result = Bitmap.createBitmap(defautlDrawable.getIntrinsicWidth(), defautlDrawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+                    Canvas canvas = new Canvas(result);
+                    defautlDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+                    defautlDrawable.draw(canvas);
+                }
             }
         }
+        else
+        {
+            Log.d("moodl", "No URL for " + symbol);
+            Drawable defautlDrawable = resources.getDrawable(R.drawable.ic_panorama_fish_eye_24dp);
+            result = Bitmap.createBitmap(defautlDrawable.getIntrinsicWidth(), defautlDrawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+            Canvas canvas = new Canvas(result);
+            defautlDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+            defautlDrawable.draw(canvas);
+        }
 
         callBack.onBitmapDownloaded(result);
     }

app/src/main/res/layout-v21/homeactivity_fragment_watchlist.xml

@@ -94,7 +94,8 @@
                     android:background="@drawable/button_dashed_background"
                     android:layout_margin="10dp"
                     android:textColor="@color/separationColor"
-                    style="@style/Widget.AppCompat.Button.Borderless"/>
+                    android:visibility="gone"
+                    style="@style/Widget.AppCompat.Button.Borderless" />
 
             </LinearLayout>
 

app/src/main/res/layout/activity_currency_list.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.herbron.moodl.Activities.CurrencySelectionActivity">
+    tools:context="com.herbron.moodl.Activities.CurrencyListActivity">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/values-fr/strings.xml

@@ -149,7 +149,7 @@
     <string name="cannot_resole_host">Impossible de résoudre l\'hôte</string>
     <string name="unexpected">Erreur inconnue</string>
     <string name="select_coin">Selectionner une monnaie</string>
-    <string name="already_watchlisr">Monnaie déjà présente dans la liste suivie</string>
+    <string name="already_watchlist">Monnaie déjà présente dans la liste suivie</string>
     <string name="create_backup">Créer une sauvegarde</string>
     <string name="wrong_password">Mauvais mot de passe</string>
     <string name="error">Erreur</string>

app/src/main/res/values/strings.xml

@@ -261,7 +261,7 @@
     <string name="cannot_resole_host">Can\'t resolve host</string>
     <string name="unexpected">Unexpected error</string>
     <string name="select_coin">Select a coin</string>
-    <string name="already_watchlisr">Currency already in watchlist</string>
+    <string name="already_watchlist">Currency already in watchlist</string>
     <string name="create_backup">Create backup</string>
     <string name="wrong_password">Wrong password</string>
     <string name="error">Error</string>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jun 17 03:10:32 CEST 2018
+#Tue Oct 02 22:45:37 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip