From 984956e5352e3a02084494b41867d0631cbb579c Mon Sep 17 00:00:00 2001
From: Tanguy Herbron <tanguy.herbron@outlook.com>
Date: Fri, 18 May 2018 12:24:10 +0200
Subject: [PATCH] Update graddle | Display marketcap details | Fix marketcap
 piechart click crash

---
 .idea/caches/build_file_checksums.ser         | Bin 545 -> 540 bytes
 .idea/gradle.xml                              |   4 +-
 .../MarketCapitalization.java                 |  26 ++++++++-
 .../moodl/DataManagers/MarketCapManager.java  |   2 +
 .../moodl/LayoutManagers/CustomPieChart.java  |  28 +++++++++
 .../fragment_marketcap_homeactivity.xml       |  53 +++++++++++++++++-
 6 files changed, 107 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/nauk/moodl/LayoutManagers/CustomPieChart.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3fe4c64b35e7bcb0291ac274a2c299fd0414959d..b240c88d94a050facddae6e9562f123477778557 100644
GIT binary patch
delta 96
zcmV-m0H6P%1e^qrm;`bG!;F!fcM#PA&Q>BJe+0~3@pT~Njx3WS0WK0NLpoelb7gXK
zTt{_jbZ>QTWs|-EHj_~SL>bi*DpKSrn?@VKdB986x)F2$5odB?WNc-VfB_Yg5CReV
CV<Vja

delta 102
zcmV-s0Ga=s1fc|wm;_tO1?`cXcMzFV;Xnw~U;$hv-&Jbdtf7-50WOo70YoxT@+lfV
z7DGAkxt08;g<#Tj05C&3Tvc;ra&ufkWNm3~X>)XPVRUbDTrOvFVPtG&T$Att8<U3t
I5|i%%Eq??lVE_OC

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cbbf71c..032843e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/MarketCapitalization.java b/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/MarketCapitalization.java
index 2b5ab5e..2280755 100644
--- a/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/MarketCapitalization.java
+++ b/app/src/main/java/com/nauk/moodl/Activities/HomeActivityFragments/MarketCapitalization.java
@@ -14,6 +14,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.github.mikephil.charting.charts.PieChart;
 import com.github.mikephil.charting.data.Entry;
@@ -27,6 +28,7 @@ import com.nauk.moodl.Activities.SettingsActivity;
 import com.nauk.moodl.DataManagers.CurrencyData.Currency;
 import com.nauk.moodl.DataManagers.MarketCapManager;
 import com.nauk.moodl.DataManagers.PreferencesManager;
+import com.nauk.moodl.LayoutManagers.CustomPieChart;
 import com.nauk.moodl.LayoutManagers.CustomViewPager;
 import com.nauk.moodl.PlaceholderManager;
 import com.nauk.moodl.R;
@@ -246,7 +248,7 @@ public class MarketCapitalization extends Fragment {
 
     private void setupPieChart(PieData data)
     {
-        PieChart pieChart = view.findViewById(R.id.marketCapPieChart);
+        CustomPieChart pieChart = view.findViewById(R.id.marketCapPieChart);
 
         pieChart.setData(data);
         pieChart.setDrawSlicesUnderHole(false);
@@ -270,6 +272,9 @@ public class MarketCapitalization extends Fragment {
                         ((CustomViewPager) view.getParent().getParent().getParent().getParent().getParent()).setPagingEnabled(true);
                         break;
                 }
+
+                view.performClick();
+
                 return false;
             }
         });
@@ -277,8 +282,23 @@ public class MarketCapitalization extends Fragment {
         pieChart.setOnChartValueSelectedListener(new OnChartValueSelectedListener() {
             @Override
             public void onValueSelected(Entry e, Highlight h) {
-                Currency currency = marketCapManager.getCurrencyFromSymbol((String) e.getData());
-                Log.d("moodl", "> " + currency.getSymbol() + " " + currency.getMarketCapitalization() + " " + currency.getVolume24h());
+                getActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if(e.getData() != null)
+                        {
+                            Currency currency = marketCapManager.getCurrencyFromSymbol((String) e.getData());
+                            //view.findViewById(R.id.layoutMarketDetails).setVisibility();
+                            ((TextView) view.findViewById(R.id.textViewMarketCap))
+                                    .setText(PlaceholderManager.getValueString(String.valueOf(currency.getMarketCapitalization()), getContext()));
+                            ((TextView) view.findViewById(R.id.textViewVolume))
+                                    .setText(PlaceholderManager.getValueString(String.valueOf(currency.getVolume24h()), getContext()));
+                            ((TextView) view.findViewById(R.id.textViewSymbol))
+                                    .setText(currency.getName());
+
+                        }
+                    }
+                });
             }
 
             @Override
diff --git a/app/src/main/java/com/nauk/moodl/DataManagers/MarketCapManager.java b/app/src/main/java/com/nauk/moodl/DataManagers/MarketCapManager.java
index 649a916..2809607 100644
--- a/app/src/main/java/com/nauk/moodl/DataManagers/MarketCapManager.java
+++ b/app/src/main/java/com/nauk/moodl/DataManagers/MarketCapManager.java
@@ -155,6 +155,8 @@ public class MarketCapManager {
             {
                 returnedCurrency = topCurrencies.get(index);
             }
+
+            index++;
         } while(index < topCurrencies.size() && returnedCurrency == null);
 
 
diff --git a/app/src/main/java/com/nauk/moodl/LayoutManagers/CustomPieChart.java b/app/src/main/java/com/nauk/moodl/LayoutManagers/CustomPieChart.java
new file mode 100644
index 0000000..fed6df1
--- /dev/null
+++ b/app/src/main/java/com/nauk/moodl/LayoutManagers/CustomPieChart.java
@@ -0,0 +1,28 @@
+package com.nauk.moodl.LayoutManagers;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import com.github.mikephil.charting.charts.PieChart;
+
+public class CustomPieChart extends PieChart {
+
+    public CustomPieChart(Context context) {
+        super(context);
+    }
+
+    public CustomPieChart(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomPieChart(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public boolean performClick() {
+        super.performClick();
+
+        return true;
+    }
+}
diff --git a/app/src/main/res/layout/fragment_marketcap_homeactivity.xml b/app/src/main/res/layout/fragment_marketcap_homeactivity.xml
index 9519758..76084b3 100644
--- a/app/src/main/res/layout/fragment_marketcap_homeactivity.xml
+++ b/app/src/main/res/layout/fragment_marketcap_homeactivity.xml
@@ -101,11 +101,62 @@
                     android:textSize="18dp"
                     android:gravity="center_horizontal"/>
 
-                <com.github.mikephil.charting.charts.PieChart
+                <com.nauk.moodl.LayoutManagers.CustomPieChart
                     android:id="@+id/marketCapPieChart"
                     android:layout_width="match_parent"
                     android:layout_height="350dp"/>
 
+                <LinearLayout
+                    android:id="@+id/layoutMarketDetails"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.5"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/textViewSymbol"/>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Market capitalization"
+                            android:textStyle="bold"/>
+
+                        <TextView
+                            android:id="@+id/textViewMarketCap"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.5"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="24h volume"
+                            android:textStyle="bold"/>
+
+                        <TextView
+                            android:id="@+id/textViewVolume"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
             </LinearLayout>
 
         </LinearLayout>