diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java index 6fb32c044d..79489c46ab 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java @@ -1,6 +1,7 @@ package info.nightscout.androidaps.plugins.Treatments; import android.content.Context; +import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v7.widget.CardView; @@ -9,6 +10,7 @@ import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.TextView; import com.j256.ormlite.dao.Dao; @@ -34,8 +36,9 @@ import info.nightscout.androidaps.db.Treatment; import info.nightscout.androidaps.events.EventNewBG; import info.nightscout.androidaps.events.EventNewBasalProfile; import info.nightscout.androidaps.events.EventTreatmentChange; +import info.nightscout.client.broadcasts.Intents; -public class TreatmentsFragment extends Fragment { +public class TreatmentsFragment extends Fragment implements View.OnClickListener { private static Logger log = LoggerFactory.getLogger(TreatmentsFragment.class); RecyclerView recyclerView; @@ -43,6 +46,7 @@ public class TreatmentsFragment extends Fragment { TextView iobTotal; TextView activityTotal; + Button refreshFromNS; private static DecimalFormat formatNumber0decimalplaces = new DecimalFormat("0"); private static DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00"); @@ -171,17 +175,24 @@ public class TreatmentsFragment extends Fragment { iobTotal = (TextView) view.findViewById(R.id.treatments_iobtotal); activityTotal = (TextView) view.findViewById(R.id.treatments_iobactivitytotal); + refreshFromNS = (Button) view.findViewById(R.id.treatments_reshreshfromnightscout); + + refreshFromNS.setOnClickListener(this); return view; } - /* - // TODO: Rename method, update argument and hook method into UI event - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } + @Override + public void onClick(View view) { + switch (view.getId()) { + case R.id.treatments_reshreshfromnightscout: + MainApp.getDbHelper().resetTreatments(); + initializeData(); + Intent restartNSClient = new Intent(Intents.ACTION_RESTART); + MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient); + break; } - */ + } + @Override public void onAttach(Context context) { super.onAttach(context); diff --git a/app/src/main/java/info/nightscout/client/broadcasts/Intents.java b/app/src/main/java/info/nightscout/client/broadcasts/Intents.java index f667b048ed..8d921d879a 100644 --- a/app/src/main/java/info/nightscout/client/broadcasts/Intents.java +++ b/app/src/main/java/info/nightscout/client/broadcasts/Intents.java @@ -12,4 +12,5 @@ public interface Intents { // App -> NSClient String ACTION_DATABASE = "info.nightscout.client.DBACCESS"; + String ACTION_RESTART = "info.nightscout.client.RESTART"; } diff --git a/app/src/main/res/layout/treatments_fragment.xml b/app/src/main/res/layout/treatments_fragment.xml index 578e1b3900..1085adbc36 100644 --- a/app/src/main/res/layout/treatments_fragment.xml +++ b/app/src/main/res/layout/treatments_fragment.xml @@ -47,6 +47,13 @@ android:paddingLeft="10dp" /> +