diff --git a/app/src/main/java/com/nauk/coinfolio/Activities/CurrencyDetailsActivity.java b/app/src/main/java/com/nauk/coinfolio/Activities/CurrencyDetailsActivity.java
index 80a78d3..6dede6a 100644
--- a/app/src/main/java/com/nauk/coinfolio/Activities/CurrencyDetailsActivity.java
+++ b/app/src/main/java/com/nauk/coinfolio/Activities/CurrencyDetailsActivity.java
@@ -243,7 +243,7 @@ public class CurrencyDetailsActivity extends AppCompatActivity {
});
break;
case "1M":
- currency.updateHistoryDays(this, new Currency.CurrencyCallBack() {
+ currency.updateHistoryHours(this, new Currency.CurrencyCallBack() {
@Override
public void onSuccess(Currency currency) {
runOnUiThread(new Runnable() {
@@ -398,6 +398,7 @@ public class CurrencyDetailsActivity extends AppCompatActivity {
{
case 1:
dataChartList = currency.getHistoryHours();
+ Log.d("coinfolio", "1 month");
offset = 124;
pointFormat = MONTH;
break;
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 50efe0c..905b34a 100644
--- a/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
+++ b/app/src/main/java/com/nauk/coinfolio/Activities/HomeActivity.java
@@ -140,7 +140,8 @@ public class HomeActivity extends AppCompatActivity {
//Setup main interface
requestWindowFeature(Window.FEATURE_NO_TITLE);
- this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
+ //this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_currency_summary);
setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
@@ -185,8 +186,6 @@ public class HomeActivity extends AppCompatActivity {
ImageButton detailsButton = findViewById(R.id.switch_button);
ImageButton settingsButton = findViewById(R.id.settings_button);
- toolbarLayout.setExpandedTitleGravity(Gravity.CENTER);
- toolbarLayout.setCollapsedTitleGravity(Gravity.CENTER);
toolbarLayout.setForegroundGravity(Gravity.CENTER);
toolbarLayout.setTitle("US$0.00");
diff --git a/app/src/main/java/com/nauk/coinfolio/LayoutManagers/HomeLayoutGenerator.java b/app/src/main/java/com/nauk/coinfolio/LayoutManagers/HomeLayoutGenerator.java
index 6196e3f..ac2cb2a 100644
--- a/app/src/main/java/com/nauk/coinfolio/LayoutManagers/HomeLayoutGenerator.java
+++ b/app/src/main/java/com/nauk/coinfolio/LayoutManagers/HomeLayoutGenerator.java
@@ -154,13 +154,12 @@ public class HomeLayoutGenerator {
if(currency.getHistoryMinutes() != null)
{
view.findViewById(R.id.LineChartView).setVisibility(View.VISIBLE);
- ((LineChart) view.findViewById(R.id.LineChartView)).invalidate();
+ view.findViewById(R.id.LineChartView).invalidate();
view.findViewById(R.id.errorTextView).setVisibility(View.GONE);
}
else
{
view.findViewById(R.id.LineChartView).setVisibility(View.GONE);
-
view.findViewById(R.id.errorTextView).setVisibility(View.VISIBLE);
}
diff --git a/app/src/main/res/layout/activity_currency_summary.xml b/app/src/main/res/layout/activity_currency_summary.xml
index daf65a1..89d700b 100644
--- a/app/src/main/res/layout/activity_currency_summary.xml
+++ b/app/src/main/res/layout/activity_currency_summary.xml
@@ -29,7 +29,10 @@
android:fitsSystemWindows="true"
app:contentScrim="@drawable/gradient_background"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
- app:toolbarId="@+id/toolbar">
+ app:toolbarId="@+id/toolbar"
+ app:collapsedTitleGravity="center"
+ app:expandedTitleGravity="center"
+ app:titleEnabled="true">
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ android:layout_marginStart="-30dp">
-
-
-
-
-
+ android:visibility="visible"
+ android:layout_gravity="start"/>
+ android:visibility="visible"
+ android:layout_gravity="end"/>
-
+
diff --git a/app/src/main/res/layout/content_currency_summary.xml b/app/src/main/res/layout/content_currency_summary.xml
index eb66f56..207ae88 100644
--- a/app/src/main/res/layout/content_currency_summary.xml
+++ b/app/src/main/res/layout/content_currency_summary.xml
@@ -82,7 +82,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:gravity="center_vertical">
Total Market Capitalization :\nUS$%1$s
24h volume :\nUS$%1$s
+ ScrollingActivity
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c0e13d4..610e24d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,18 +1,25 @@
-
@@ -24,4 +31,11 @@
- @anim/zoom_in
+