From ad8e8be2fec8070d475b0bd53607fe3f3d2987a8 Mon Sep 17 00:00:00 2001 From: MakisChristou Date: Sun, 26 Mar 2023 19:54:48 +0300 Subject: [PATCH] Don't show empty charts --- .../verifit/ui/AddExerciseActivity.java | 4 +- .../example/verifit/ui/ChartsActivity.java | 10 + .../com/example/verifit/ui/MainActivity.java | 2 +- .../src/main/res/layout/activity_charts.xml | 439 +++++++++--------- 4 files changed, 228 insertions(+), 227 deletions(-) diff --git a/verifit/src/main/java/com/example/verifit/ui/AddExerciseActivity.java b/verifit/src/main/java/com/example/verifit/ui/AddExerciseActivity.java index 5db62ab..284902c 100755 --- a/verifit/src/main/java/com/example/verifit/ui/AddExerciseActivity.java +++ b/verifit/src/main/java/com/example/verifit/ui/AddExerciseActivity.java @@ -377,7 +377,7 @@ public void updateSet(Integer finalI, Integer finalJ, Double reps, Double weight // Let the user know I guess runOnUiThread(() -> { - showSnackbarMessage("Set Updated!"); + showSnackbarMessage("Set Updated"); updateTodaysExercises(); }); @@ -406,7 +406,7 @@ public void updateViewAndShowMessage() { runOnUiThread(()->{ updateTodaysExercises(); - showSnackbarMessage("Set Added!"); + showSnackbarMessage("Set Added"); }); } diff --git a/verifit/src/main/java/com/example/verifit/ui/ChartsActivity.java b/verifit/src/main/java/com/example/verifit/ui/ChartsActivity.java index af62038..de1d969 100755 --- a/verifit/src/main/java/com/example/verifit/ui/ChartsActivity.java +++ b/verifit/src/main/java/com/example/verifit/ui/ChartsActivity.java @@ -10,6 +10,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.widget.ScrollView; import com.example.verifit.R; import com.github.mikephil.charting.animation.Easing; @@ -64,6 +65,15 @@ public void onCreateStuff() bottomNavigationView.setSelectedItemId(R.id.charts); bottomNavigationView.setOnNavigationItemSelectedListener(this); + ScrollView scrollView = findViewById(R.id.scrollView); + if(MainActivity.dataStorage.getWorkoutDays().size() == 0){ + + scrollView.setVisibility(View.GONE); + } + else + { + scrollView.setVisibility(View.VISIBLE); + } barChartVolumes(); diff --git a/verifit/src/main/java/com/example/verifit/ui/MainActivity.java b/verifit/src/main/java/com/example/verifit/ui/MainActivity.java index 3f2e2ab..ec875a5 100755 --- a/verifit/src/main/java/com/example/verifit/ui/MainActivity.java +++ b/verifit/src/main/java/com/example/verifit/ui/MainActivity.java @@ -306,7 +306,7 @@ else if(response.message().equals("Bad Gateway")) if(message.equals("verifit_rs_login")) { SnackBarWithMessage snackBarWithMessage = new SnackBarWithMessage(MainActivity.this); - snackBarWithMessage.showSnackbar("Welcome back!"); + snackBarWithMessage.showSnackbar("Welcome back"); } else if(message.equals("verifit_rs_logout")) { diff --git a/verifit/src/main/res/layout/activity_charts.xml b/verifit/src/main/res/layout/activity_charts.xml index 9bc5bcf..0bc0c72 100755 --- a/verifit/src/main/res/layout/activity_charts.xml +++ b/verifit/src/main/res/layout/activity_charts.xml @@ -9,16 +9,18 @@ tools:context=".ui.ChartsActivity"> + android:layout_height="match_parent" + android:visibility="visible"> - + @@ -108,193 +110,186 @@ - - - - + android:layout_height="wrap_content" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:layout_marginBottom="15dp" + android:backgroundTint="@color/custom_row" + app:cardCornerRadius="5dp"> - - - + android:layout_height="wrap_content"> - - - - - + + - + - + + + - - + + - + android:layout_height="wrap_content" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:layout_marginBottom="15dp" + android:backgroundTint="@color/custom_row" + app:cardCornerRadius="5dp"> - + android:layout_height="wrap_content"> - + - - - - - + - + + - + + + + + - + - - - - - + android:layout_height="wrap_content" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:layout_marginBottom="15dp" + android:backgroundTint="@color/custom_row" + android:visibility="invisible" + app:cardCornerRadius="5dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/cardview_viewpager"> - + android:layout_height="40dp"> - + - - - - - + - + + + + - - + + + - +