From e7378c278b37f3a554565299ca78ebe1a8e400ef Mon Sep 17 00:00:00 2001
From: Tanguy Herbron <tanguy.herbron@outlook.com>
Date: Wed, 4 Apr 2018 16:14:56 +0200
Subject: [PATCH] HomeActivity placeholders

---
 .../coinfolio/Activities/CurrencySelectionActivity.java  | 6 +++---
 .../java/com/nauk/coinfolio/Activities/HomeActivity.java | 9 +++++----
 app/src/main/res/values/strings.xml                      | 1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/nauk/coinfolio/Activities/CurrencySelectionActivity.java b/app/src/main/java/com/nauk/coinfolio/Activities/CurrencySelectionActivity.java
index 17d2753..5d431a5 100644
--- a/app/src/main/java/com/nauk/coinfolio/Activities/CurrencySelectionActivity.java
+++ b/app/src/main/java/com/nauk/coinfolio/Activities/CurrencySelectionActivity.java
@@ -61,11 +61,11 @@ public class CurrencySelectionActivity extends AppCompatActivity implements Sear
 
     private void setupAdapter()
     {
-        String[] currencyFullname = new String[currencyNames.length];
+        String[] currencyFullName = new String[currencyNames.length];
 
-        for(int i = 0; i < currencyFullname.length; i++)
+        for(int i = 0; i < currencyFullName.length; i++)
         {
-            currencyFullname[i] = currencyNames[i] + " " + currencySymbols[i];
+            currencyFullName[i] = currencyNames[i] + " " + currencySymbols[i];
         }
 
         ArrayList<Currency> currencyArrayList = new ArrayList<>();
diff --git a/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java b/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
index 3274f46..98a247d 100644
--- a/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
+++ b/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
@@ -177,9 +177,9 @@ public class HomeActivity extends AppCompatActivity {
         ImageButton settingsButton = findViewById(R.id.settings_button);
 
         toolbarLayout.setForegroundGravity(Gravity.CENTER);
-        toolbarLayout.setTitle("US$0.00");
+        toolbarLayout.setTitle(getResources().getString(R.string.currencyDollarPlaceholder, "0.00"));
 
-        toolbarSubtitle.setText("US$0.00");
+        toolbarSubtitle.setText(getResources().getString(R.string.currencyDollarPlaceholder, "0.00"));
 
         //Events setup
         detailsButton.setOnClickListener(new View.OnClickListener() {
@@ -551,9 +551,9 @@ public class HomeActivity extends AppCompatActivity {
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                toolbarLayout.setTitle("US$0.00");
+                toolbarLayout.setTitle(getResources().getString(R.string.currencyDollarPlaceholder, "0.00"));
 
-                toolbarSubtitle.setText("US$0.00");
+                toolbarSubtitle.setText(getResources().getString(R.string.currencyDollarPlaceholder, "0.00"));
 
                 toolbarSubtitle.setTextColor(-1275068417);
             }
@@ -896,6 +896,7 @@ public class HomeActivity extends AppCompatActivity {
 
                     totalFluctuationPercentage = totalFluctuation / (totalValue - totalFluctuation) *100;
 
+                    //toolbarSubtitle.setText(String.format(getResources().getString(R.string.fluctuationDollarPercentagePlaceholder), totalFluctuation));
                     toolbarSubtitle.setText("US$" + String.format("%.2f", totalFluctuation) + " (" + String.format("%.2f", totalFluctuationPercentage) + "%)");
 
                     if(loadingDialog.isShowing())
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a51ea37..a8bb5c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -146,6 +146,7 @@
     <string name="currencyDollarParenthesisPlaceholder">(US$%1$s)</string>
     <string name="currencyDollarPlaceholder">US$%1$s</string>
     <string name="currencyPercentagePlaceholder">%1$s%%</string>
+    <string name="fluctuationDollarPercentagePlaceholder">US$%1$s (%2$s%)</string>
 
     <!--DetailsActivity placeholders-->
     <string name="volumePlaceholder">Volume\nUS$%1$s</string>