From 2654b044b25bee031b55fa4279083b6e408933fd Mon Sep 17 00:00:00 2001
From: Tanguy Herbron <tanguy.herbron@outlook.com>
Date: Fri, 24 Aug 2018 04:05:05 +0200
Subject: [PATCH] Minor fixs

- Icon size fix
- Fix details activity crash
---
 .../DetailsActivityFragments/InformationFragment.java       | 6 ++++--
 .../moodl/Activities/HomeActivityFragments/Summary.java     | 2 +-
 app/src/main/res/layout-v21/cardview_currency.xml           | 4 ++--
 app/src/main/res/layout-v21/cardview_watchlist.xml          | 4 ++--
 app/src/main/res/layout/cardview_currency.xml               | 4 ++--
 app/src/main/res/layout/cardview_watchlist.xml              | 4 ++--
 app/src/main/res/layout/detailsactivity_fragment_charts.xml | 3 ++-
 app/src/main/res/values/dimens.xml                          | 2 ++
 8 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/InformationFragment.java b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/InformationFragment.java
index f29c6f1..595c241 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/InformationFragment.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/DetailsActivityFragments/InformationFragment.java
@@ -9,6 +9,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -74,14 +75,15 @@ public class InformationFragment extends Fragment {
     {
         if(isTickerUpdated && isSnapshotUpdated)
         {
-            if(getActivity() != null)
-            {
+            try {
                 getActivity().runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
                         refreshInfoTab();
                     }
                 });
+            } catch (NullPointerException e) {
+                Log.d("moodl", "Information tab do not needs to be updated anymore");
             }
         }
     }
diff --git a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Summary.java b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Summary.java
index 22806f2..487f503 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Summary.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/HomeActivityFragments/Summary.java
@@ -553,7 +553,7 @@ public class Summary extends Fragment implements BalanceSwitchManagerInterface,
     public void onBalanceDataUpdated() {
         final List<Currency> balance = balanceManager.getTotalBalance();
 
-        if(balance.size() > 0)
+        if(balance != null && balance.size() > 0)
         {
             for(int i = 0; i < balance.size(); i++)
             {
diff --git a/app/src/main/res/layout-v21/cardview_currency.xml b/app/src/main/res/layout-v21/cardview_currency.xml
index eba4726..f7ccc19 100644
--- a/app/src/main/res/layout-v21/cardview_currency.xml
+++ b/app/src/main/res/layout-v21/cardview_currency.xml
@@ -29,8 +29,8 @@
 
             <ImageView
                 android:id="@+id/currencyIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/currency_icon_cardview_size"
+                android:layout_height="@dimen/currency_icon_cardview_size"
                 android:layout_margin="1dp" />
 
             <TextView
diff --git a/app/src/main/res/layout-v21/cardview_watchlist.xml b/app/src/main/res/layout-v21/cardview_watchlist.xml
index fc35486..99d5398 100644
--- a/app/src/main/res/layout-v21/cardview_watchlist.xml
+++ b/app/src/main/res/layout-v21/cardview_watchlist.xml
@@ -49,8 +49,8 @@
 
                 <ImageView
                     android:id="@+id/currencyIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/currency_icon_cardview_size"
+                    android:layout_height="@dimen/currency_icon_cardview_size"
                     android:layout_margin="1dp" />
 
                 <TextView
diff --git a/app/src/main/res/layout/cardview_currency.xml b/app/src/main/res/layout/cardview_currency.xml
index 2192da1..5fe3276 100644
--- a/app/src/main/res/layout/cardview_currency.xml
+++ b/app/src/main/res/layout/cardview_currency.xml
@@ -30,8 +30,8 @@
 
             <ImageView
                 android:id="@+id/currencyIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/currency_icon_cardview_size"
+                android:layout_height="@dimen/currency_icon_cardview_size"
                 android:layout_margin="1dp" />
 
             <TextView
diff --git a/app/src/main/res/layout/cardview_watchlist.xml b/app/src/main/res/layout/cardview_watchlist.xml
index 636d54d..7143b39 100644
--- a/app/src/main/res/layout/cardview_watchlist.xml
+++ b/app/src/main/res/layout/cardview_watchlist.xml
@@ -51,8 +51,8 @@
 
                 <ImageView
                     android:id="@+id/currencyIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/currency_icon_cardview_size"
+                    android:layout_height="@dimen/currency_icon_cardview_size"
                     android:layout_margin="1dp" />
 
                 <TextView
diff --git a/app/src/main/res/layout/detailsactivity_fragment_charts.xml b/app/src/main/res/layout/detailsactivity_fragment_charts.xml
index 7b83b9e..0e9f682 100644
--- a/app/src/main/res/layout/detailsactivity_fragment_charts.xml
+++ b/app/src/main/res/layout/detailsactivity_fragment_charts.xml
@@ -6,6 +6,7 @@
     android:orientation="vertical">
 
     <LinearLayout
+        android:id="@+id/mainMenuLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -128,7 +129,7 @@
         android:paddingEnd="4dp"
         android:baselineAligned="false"
         android:gravity="bottom"
-        android:layout_alignParentBottom="true">
+        android:layout_below="@id/mainMenuLayout">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bdf479c..89e8474 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -21,4 +21,6 @@
     <dimen name="double_toolbarSpinner_size">180dp</dimen>
 
     <dimen name="spinner_toolbar_height">50dp</dimen>
+
+    <dimen name="currency_icon_cardview_size">17dp</dimen>
 </resources>