From de4ebe288836d91b49c2985900298f216f28bd07 Mon Sep 17 00:00:00 2001 From: Constantin Gabriel Date: Sun, 18 Aug 2019 12:06:51 +0300 Subject: [PATCH] Updated Health UI and added a dedicated class for water intake stats --- app/src/main/AndroidManifest.xml | 1 + .../com/example/workouttracker/Health.java | 78 ++------------ .../example/workouttracker/Health_water.java | 100 +++++++++++++++++ app/src/main/res/layout/health.xml | 101 +++++++----------- app/src/main/res/layout/health_water.xml | 95 ++++++++++++++++ 5 files changed, 239 insertions(+), 136 deletions(-) create mode 100644 app/src/main/java/com/example/workouttracker/Health_water.java create mode 100644 app/src/main/res/layout/health_water.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e40cf06..073c60d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,6 +28,7 @@ + \ No newline at end of file diff --git a/app/src/main/java/com/example/workouttracker/Health.java b/app/src/main/java/com/example/workouttracker/Health.java index 1ca2c6e..77f81d7 100644 --- a/app/src/main/java/com/example/workouttracker/Health.java +++ b/app/src/main/java/com/example/workouttracker/Health.java @@ -16,85 +16,19 @@ import java.util.Date; public class Health extends AppCompatActivity { - SharedPreferences preferences ; //Save key-value data - SharedPreferences.Editor editor; //Edit key-value data - int day=1; - float total_quantity=0; @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState); setContentView(R.layout.health); - preferences = getSharedPreferences("my_pref", MODE_PRIVATE); - editor = preferences.edit(); - total_quantity=preferences.getFloat("water per day",0); - TextView mqt=(TextView) findViewById(R.id.water_month); - float water_month=preferences.getFloat("water month",0); - mqt.setText("water consumed this month:"+water_month); - TextView pqt = (TextView) findViewById(R.id.water_today); - float water_today=preferences.getFloat("water today",0); - pqt.setText("Water consumed today:"+water_today); - TextView tqt=(TextView) findViewById(R.id.water_per_day); - tqt.setText("Water consumed/day:"+total_quantity/day); } public void onBackPressed(View view) { Intent intent = new Intent(this, MainActivity.class); startActivity(intent); finish(); } - public void onDone(View view) { - Date c = Calendar.getInstance().getTime(); - System.out.println("Current time => " + c); - - SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy"); - String formattedDate = df.format(c); - String myDate = null; - Log.d("CurrentDate",formattedDate); - try { - myDate = preferences.getString("myDate", "16-Aug-2019"); - Log.d("SavedDate",myDate); - } catch (Exception ex) { - ex.printStackTrace(); - } - EditText qt = (EditText) findViewById(R.id.input_water); - try { - Float quantity = Float.valueOf(qt.getText().toString()); - total_quantity+=quantity; - Log.d("water",String.valueOf(quantity)); - TextView pqt = (TextView) findViewById(R.id.water_today); - float water_today=preferences.getFloat("water today",0); - //pqt.setText(String.valueOf(water)); - if (formattedDate.equals(myDate)||myDate.equals("16-Aug-2019")) { - //Float water_today=Float.valueOf(pqt.getText().toString()); - Log.d("water",String.valueOf(water_today)); - water_today=quantity+water_today; - editor.putFloat("water today",water_today); - pqt.setText("Water consumed today:"+String.valueOf(water_today)); - //increment water intake per day and active time - } else { - if (Calendar.getInstance().get(Calendar.DAY_OF_MONTH) == 1) { - editor.putFloat("water month", quantity); - editor.commit(); - } - editor.putString("myDate", formattedDate); - editor.commit(); - pqt.setText("Water consumed today:"+String.valueOf(quantity)); - editor.putFloat("water today",quantity); - editor.commit(); - day++; - //save this values to another category like weekly water intake - } - TextView mqt=(TextView) findViewById(R.id.water_month); - float water_month=preferences.getFloat("water month",0); - Log.d("month",String.valueOf(water_month)); - Float total=water_month+quantity; - mqt.setText("Water consumed this month:"+String.valueOf(total)); - editor.putFloat("water month",total); - editor.commit(); - TextView tqt=(TextView) findViewById(R.id.water_per_day); - editor.putFloat("water per day",total_quantity); - tqt.setText("Water consumed/day:"+String.valueOf(total_quantity/day)); - qt.setText(null); - }catch (Exception ex){ - } - } - } + public void onWater(View view){ + Intent intent = new Intent(this, Health_water.class); + startActivity(intent); + finish(); + } +} diff --git a/app/src/main/java/com/example/workouttracker/Health_water.java b/app/src/main/java/com/example/workouttracker/Health_water.java new file mode 100644 index 0000000..c0a1d50 --- /dev/null +++ b/app/src/main/java/com/example/workouttracker/Health_water.java @@ -0,0 +1,100 @@ +package com.example.workouttracker; + +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +public class Health_water extends AppCompatActivity { + SharedPreferences preferences ; //Save key-value data + SharedPreferences.Editor editor; //Edit key-value data + int day=1; + float total_quantity=0; + @Override + public void onCreate(Bundle savedInstanceState){ + super.onCreate(savedInstanceState); + setContentView(R.layout.health_water); + preferences = getSharedPreferences("my_pref", MODE_PRIVATE); + editor = preferences.edit(); + total_quantity=preferences.getFloat("water per day",0); + TextView mqt=(TextView) findViewById(R.id.water_month); + float water_month=preferences.getFloat("water month",0); + mqt.setText("water consumed this month:"+water_month); + TextView pqt = (TextView) findViewById(R.id.water_today); + float water_today=preferences.getFloat("water today",0); + pqt.setText("Water consumed today:"+water_today); + TextView tqt=(TextView) findViewById(R.id.water_per_day); + tqt.setText("Water consumed/day:"+total_quantity/day); + } + public void onBackPressed(View view) { + Intent intent = new Intent(this, Health.class); + startActivity(intent); + finish(); + } + public void onDone(View view) { + Date c = Calendar.getInstance().getTime(); + System.out.println("Current time => " + c); + + SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy"); + String formattedDate = df.format(c); + String myDate = null; + Log.d("CurrentDate",formattedDate); + try { + myDate = preferences.getString("myDate", "16-Aug-2019"); + Log.d("SavedDate",myDate); + } catch (Exception ex) { + ex.printStackTrace(); + } + EditText qt = (EditText) findViewById(R.id.input_water); + try { + Float quantity = Float.valueOf(qt.getText().toString()); + total_quantity+=quantity; + Log.d("water",String.valueOf(quantity)); + TextView pqt = (TextView) findViewById(R.id.water_today); + float water_today=preferences.getFloat("water today",0); + //pqt.setText(String.valueOf(water)); + if (formattedDate.equals(myDate)||myDate.equals("16-Aug-2019")) { + //Float water_today=Float.valueOf(pqt.getText().toString()); + Log.d("water",String.valueOf(water_today)); + water_today=quantity+water_today; + editor.putFloat("water today",water_today); + pqt.setText("Water consumed today:"+String.valueOf(water_today)); + //increment water intake per day and active time + } else { + if (Calendar.getInstance().get(Calendar.DAY_OF_MONTH) == 1) { + editor.putFloat("water month", quantity); + editor.commit(); + } + editor.putString("myDate", formattedDate); + editor.commit(); + pqt.setText("Water consumed today:"+String.valueOf(quantity)); + editor.putFloat("water today",quantity); + editor.commit(); + day++; + //save this values to another category like weekly water intake + } + TextView mqt=(TextView) findViewById(R.id.water_month); + float water_month=preferences.getFloat("water month",0); + Log.d("month",String.valueOf(water_month)); + Float total=water_month+quantity; + mqt.setText("Water consumed this month:"+String.valueOf(total)); + editor.putFloat("water month",total); + editor.commit(); + TextView tqt=(TextView) findViewById(R.id.water_per_day); + editor.putFloat("water per day",total_quantity); + tqt.setText("Water consumed/day:"+String.valueOf(total_quantity/day)); + qt.setText(null); + }catch (Exception ex){ + } + } +} diff --git a/app/src/main/res/layout/health.xml b/app/src/main/res/layout/health.xml index 667266d..42c2b95 100644 --- a/app/src/main/res/layout/health.xml +++ b/app/src/main/res/layout/health.xml @@ -8,18 +8,6 @@ tools:context=".Health" android:background="@drawable/mainbackground"> - - - - - - - + app:layout_constraintTop_toBottomOf="@+id/water" />