mirror of
https://github.com/oliexdev/openScale.git
synced 2025-08-26 09:44:31 +02:00
show details if someone click on the pie chart
This commit is contained in:
@@ -25,6 +25,7 @@ import android.view.LayoutInflater;
|
|||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
import com.health.openscale.R;
|
import com.health.openscale.R;
|
||||||
import com.health.openscale.core.OpenScale;
|
import com.health.openscale.core.OpenScale;
|
||||||
@@ -50,7 +51,9 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
|
|||||||
private TextView txtAvgFat;
|
private TextView txtAvgFat;
|
||||||
private TextView txtAvgWater;
|
private TextView txtAvgWater;
|
||||||
private TextView txtAvgMuscle;
|
private TextView txtAvgMuscle;
|
||||||
|
|
||||||
|
private ScaleData lastScaleData;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
|
||||||
{
|
{
|
||||||
@@ -62,7 +65,10 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
|
|||||||
txtAvgFat = (TextView) overviewView.findViewById(R.id.txtAvgFat);
|
txtAvgFat = (TextView) overviewView.findViewById(R.id.txtAvgFat);
|
||||||
txtAvgWater = (TextView) overviewView.findViewById(R.id.txtAvgWater);
|
txtAvgWater = (TextView) overviewView.findViewById(R.id.txtAvgWater);
|
||||||
txtAvgMuscle = (TextView) overviewView.findViewById(R.id.txtAvgMuscle);
|
txtAvgMuscle = (TextView) overviewView.findViewById(R.id.txtAvgMuscle);
|
||||||
|
|
||||||
|
pieChart.setOnValueTouchListener(new PieChartTouchListener());
|
||||||
|
pieChart.setChartRotationEnabled(false);
|
||||||
|
|
||||||
overviewView.findViewById(R.id.btnInsertData).setOnClickListener(new View.OnClickListener() {
|
overviewView.findViewById(R.id.btnInsertData).setOnClickListener(new View.OnClickListener() {
|
||||||
public void onClick(View view) {
|
public void onClick(View view) {
|
||||||
btnOnClickInsertData();
|
btnOnClickInsertData();
|
||||||
@@ -82,12 +88,13 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
|
|||||||
txtOverviewTitle.setText(getResources().getString(R.string.label_overview_title_start) + " " + scaleUser.user_name + " " + getResources().getString(R.string.label_overview_title_end));
|
txtOverviewTitle.setText(getResources().getString(R.string.label_overview_title_start) + " " + scaleUser.user_name + " " + getResources().getString(R.string.label_overview_title_end));
|
||||||
|
|
||||||
List<ArcValue> arcValues = new ArrayList<ArcValue>();
|
List<ArcValue> arcValues = new ArrayList<ArcValue>();
|
||||||
|
|
||||||
if (scaleDataList.isEmpty()) {
|
if (scaleDataList.isEmpty()) {
|
||||||
return;
|
lastScaleData = null;
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
ScaleData lastScaleData = scaleDataList.get(0);
|
|
||||||
|
lastScaleData = scaleDataList.get(0);
|
||||||
|
|
||||||
arcValues.add(new ArcValue(lastScaleData.fat, Utils.COLOR_ORANGE));
|
arcValues.add(new ArcValue(lastScaleData.fat, Utils.COLOR_ORANGE));
|
||||||
arcValues.add(new ArcValue(lastScaleData.water, Utils.COLOR_BLUE));
|
arcValues.add(new ArcValue(lastScaleData.water, Utils.COLOR_BLUE));
|
||||||
@@ -143,6 +150,38 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
|
|||||||
startActivityForResult(intent, 1);
|
startActivityForResult(intent, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private class PieChartTouchListener implements PieChartView.PieChartOnValueTouchListener
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void onValueTouched(int i, ArcValue arcValue)
|
||||||
|
{
|
||||||
|
if (lastScaleData == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
String date_time = new SimpleDateFormat("dd. MMM yyyy (EE) HH:mm").format(lastScaleData.date_time);
|
||||||
|
|
||||||
|
switch (i) {
|
||||||
|
case 0:
|
||||||
|
Toast.makeText(getActivity(), getResources().getString(R.string.info_your_fat) + " " + lastScaleData.fat + "% " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
Toast.makeText(getActivity(), getResources().getString(R.string.info_your_water) + " " + lastScaleData.water + "% " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
Toast.makeText(getActivity(), getResources().getString(R.string.info_your_muscle) + " " + lastScaleData.muscle + "% " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onNothingTouched()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onActivityResult(int requestCode, int resultCode, Intent data)
|
public void onActivityResult(int requestCode, int resultCode, Intent data)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user