Don't show empty charts

MakisChristou · Mar 26, 2023 · ad8e8be · ad8e8be
1 parent 9983cdb
commit ad8e8be
Show file tree

Hide file tree

Showing 4 changed files with 228 additions and 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
@@ -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
@@ -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
@@ -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"))
  {