diff --git a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java index 2718d27..b27e6ff 100644 --- a/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java +++ b/app/src/main/java/com/example/dcav2gui/ui/home/HomeFragment.java @@ -36,6 +36,7 @@ public class HomeFragment extends Fragment { private Handler handler = new Handler(); private Runnable updateRunnable; + //Tickers private TextView pricePair1; private TextView pricePair124hPercentage ; private TextView pricePair17dPercentage; @@ -132,25 +133,6 @@ public class HomeFragment extends Fragment { TextView log4Content = root.findViewById(R.id.log4CardContent); - // Set initial display values (Maybe not necessary? Since they are set in the xml file) - // Tickers - pricePair1.setText(R.string.default_price_ticker_1); - pricePair124hPercentage.setText(R.string.percentage_example); - pricePair17dPercentage.setText(R.string.percentage_example); - pricePair130dPercentage.setText(R.string.percentage_example); - - pricePair2.setText(R.string.default_price_ticker_2); - pricePair224hPercentage.setText(R.string.percentage_example); - pricePair27dPercentage.setText(R.string.percentage_example); - pricePair230dPercentage.setText(R.string.percentage_example); - - pricePair3.setText(R.string.default_price_ticker_3); - pricePair324hPercentage.setText(R.string.percentage_example); - pricePair37dPercentage.setText(R.string.percentage_example); - pricePair330dPercentage.setText(R.string.percentage_example); - - - // Profits today and this month profitsToday.setText(R.string.profits_today_example); profitsThisMonth.setText(R.string.profits_this_month_example); @@ -296,16 +278,25 @@ public class HomeFragment extends Fragment { TickerTracker.PriceChangeData priceData3 = future3.get();; pricePair1.setText(String.format(Locale.ROOT,"%.2f", priceData.getCurrentPrice())); + pricePair124hPercentage.setText(formatPercentage(priceData.getPriceChangePercent24h())); + pricePair17dPercentage.setText(formatPercentage(priceData.getPriceChangePercent7d())); + pricePair130dPercentage.setText(formatPercentage(priceData.getPriceChangePercent30d())); setPercentageColor(pricePair124hPercentage,priceData.getPriceChangePercent24h()); setPercentageColor(pricePair17dPercentage,priceData.getPriceChangePercent7d()); setPercentageColor(pricePair130dPercentage,priceData.getPriceChangePercent30d()); pricePair2.setText(String.format(Locale.ROOT,"%.2f", priceData2.getCurrentPrice())); + pricePair224hPercentage.setText(formatPercentage(priceData2.getPriceChangePercent24h())); + pricePair27dPercentage.setText(formatPercentage(priceData2.getPriceChangePercent7d())); + pricePair230dPercentage.setText(formatPercentage(priceData2.getPriceChangePercent30d())); setPercentageColor(pricePair224hPercentage,priceData2.getPriceChangePercent24h()); setPercentageColor(pricePair27dPercentage,priceData2.getPriceChangePercent7d()); setPercentageColor(pricePair230dPercentage,priceData2.getPriceChangePercent30d()); pricePair3.setText(String.format(Locale.ROOT,"%.2f", priceData3.getCurrentPrice())); + pricePair324hPercentage.setText(formatPercentage(priceData3.getPriceChangePercent24h())); + pricePair37dPercentage.setText(formatPercentage(priceData3.getPriceChangePercent7d())); + pricePair330dPercentage.setText(formatPercentage(priceData3.getPriceChangePercent30d())); setPercentageColor(pricePair324hPercentage,priceData3.getPriceChangePercent24h()); setPercentageColor(pricePair37dPercentage,priceData3.getPriceChangePercent7d()); setPercentageColor(pricePair330dPercentage,priceData3.getPriceChangePercent30d());