Merge pull request #1 from MilosKozak/master

Treatments fragment

app/src/main/AndroidManifest.xml

@@ -20,7 +20,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:process=":mainProcess"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
             <intent-filter>
@@ -30,12 +29,11 @@
             </intent-filter>
         </activity>
 
-        <!--         Receiver from NSClient -->
+        <!--   Receiver from NSClient -->
         <receiver
             android:name="info.nightscout.client.receivers.NSClientDataReceiver"
             android:enabled="true"
-            android:exported="true"
+            android:exported="true">
-            android:process=":mainProcess">
 
             <intent-filter>
                 <action android:name="info.nightscout.client.NEW_TREATMENT" />

app/src/main/java/info/nightscout/androidaps/MainActivity.java

@@ -15,12 +15,15 @@ import org.slf4j.LoggerFactory;
 import java.util.List;
 
 import info.nightscout.androidaps.plugins.ProfileViewer.ProfileViewerFragment;
+import info.nightscout.androidaps.plugins.Treatments.TreatmentsFragment;
 import info.nightscout.androidaps.tabs.*;
 import info.nightscout.androidaps.plugins.Objectives.ObjectivesFragment;
 import info.nightscout.androidaps.plugins.Test.TestFragment;
 import info.nightscout.client.broadcasts.Intents;
 
-public class MainActivity extends AppCompatActivity implements ObjectivesFragment.OnFragmentInteractionListener {
+public class MainActivity extends AppCompatActivity
+        implements ObjectivesFragment.OnFragmentInteractionListener,
+                   TreatmentsFragment.OnFragmentInteractionListener {
     private static Logger log = LoggerFactory.getLogger(MainActivity.class);
 
     private Toolbar toolbar;
@@ -36,6 +39,7 @@ public class MainActivity extends AppCompatActivity implements ObjectivesFragmen
         // Register all tabs in app here
         mAdapter = new TabPageAdapter(getSupportFragmentManager());
         mAdapter.registerNewFragment("Test", TestFragment.newInstance());
+        mAdapter.registerNewFragment("Treatments", TreatmentsFragment.newInstance());
         mAdapter.registerNewFragment("Profile", ProfileViewerFragment.newInstance());
         mAdapter.registerNewFragment("Objectives", ObjectivesFragment.newInstance());
 

app/src/main/java/info/nightscout/androidaps/data/Iob.java

@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.data;
+
+/**
+ * Created by mike on 05.06.2016.
+ */
+public class Iob {
+    public double iobContrib = 0d;
+    public double activityContrib = 0d;
+
+    public Iob plus(Iob iob) {
+        iobContrib += iob.iobContrib;
+        activityContrib += iob.activityContrib;
+        return this;
+    }
+}

app/src/main/java/info/nightscout/androidaps/db/Treatment.java

@@ -16,8 +16,10 @@ import org.slf4j.LoggerFactory;
 import java.util.Date;
 import java.util.List;
 
+import info.nightscout.androidaps.data.Iob;
 import info.nightscout.client.broadcasts.Intents;
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.client.data.NSProfile;
 import info.nightscout.utils.DateUtil;
 
 @DatabaseTable(tableName = "Treatments")
@@ -53,40 +55,43 @@ public class Treatment {
         this.insulin = t.insulin;
         this.carbs = t.carbs;
     }
-/*
-    public Iob iobCalc(Date time, Double dia) {
-        Double diaratio = 3.0 / dia;
-        Double peak = 75d;
-        Double end = 180d;
-        //var sens = profile_data.sens;
 
-        Iob results = new Iob();
+    public Iob iobCalc(Date time) {
 
-        if (insulin != 0) {
+        Iob result = new Iob();
-            long bolusTime = created_at.getTime();
+        NSProfile profile = MainApp.getNSProfile();
-            Double minAgo = diaratio * (time.getTime() - bolusTime) / 1000 / 60;
-            Double iobContrib = 0d;
-            Double activityContrib = 0d;
 
-            if (minAgo < peak) {
+        if (profile == null) {
-                Double x = (minAgo/5 + 1);
+            return result;
-                iobContrib = insulin * (1 - 0.001852 * x * x + 0.001852 * x);
-                //activityContrib=sens*treatment.insulin*(2/dia/60/peak)*minAgo;
-                activityContrib = insulin * (2 / dia / 60 / peak) * minAgo;
-            } else if (minAgo < end) {
-                Double y = (minAgo-peak)/5;
-                iobContrib = insulin * (0.001323 * y * y - .054233 * y + .55556);
-                //activityContrib=sens*treatment.insulin*(2/dia/60-(minAgo-peak)*2/dia/60/(60*dia-peak));
-                activityContrib = insulin * (2 / dia / 60 - (minAgo - peak) * 2 / dia / 60 / (60 * dia - peak));
-            }
-
-            results.iobContrib = iobContrib;
-            results.activityContrib = activityContrib;
         }
 
-        return results;
+        Double dia = profile.getDia();
+        Double sens = profile.getIsf(profile.secondsFromMidnight(time));
+
+        Double scaleFactor = 3.0 / dia;
+        Double peak = 75d;
+        Double end = 180d;
+
+        if (this.insulin != 0d) {
+            Long bolusTime = this.created_at.getTime();
+            Double minAgo = scaleFactor * (time.getTime() - bolusTime) / 1000d / 60d;
+
+            if (minAgo < peak) {
+                Double x1 = minAgo / 5 + 1;
+                result.iobContrib = this.insulin * (1 - 0.001852 * x1 * x1 + 0.001852 * x1);
+                // units: BG (mg/dL)  = (BG/U) *    U insulin     * scalar
+                result.activityContrib = sens * this.insulin * (2 / dia / 60 / peak) * minAgo;
+
+            } else if (minAgo < end) {
+                Double x2 = (minAgo - 75) / 5;
+                result.iobContrib = this.insulin * (0.001323 * x2 * x2 - 0.054233 * x2 + 0.55556);
+                result.activityContrib = sens * this.insulin * (2 / dia / 60 - (minAgo - peak) * 2 / dia / 60 / (60 * dia - peak));
+            }
+        }
+        return result;
     }
 
+/*
     public Iob calcIobOpenAPS() {
         IobCalc calc = new IobCalc(created_at,insulin,new Date());
         calc.setBolusDiaTimesTwo();

app/src/main/java/info/nightscout/androidaps/events/EventNewBG.java

@@ -0,0 +1,7 @@
+package info.nightscout.androidaps.events;
+
+/**
+ * Created by mike on 05.06.2016.
+ */
+public class EventNewBG {
+}

app/src/main/java/info/nightscout/androidaps/plugins/ProfileViewer/ProfileViewerFragment.java

@@ -91,6 +91,4 @@ public class ProfileViewerFragment extends Fragment {
     public void onStatusEvent(final EventNewBasalProfile ev) {
         setContent();
     }
-
-
 }

app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java

@@ -0,0 +1,237 @@
+package info.nightscout.androidaps.plugins.Treatments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.stmt.PreparedQuery;
+import com.j256.ormlite.stmt.QueryBuilder;
+import com.squareup.otto.Subscribe;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.SQLException;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Iob;
+import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.events.EventNewBG;
+import info.nightscout.androidaps.events.EventNewBasalProfile;
+import info.nightscout.androidaps.events.EventTreatmentChange;
+
+public class TreatmentsFragment extends Fragment {
+    private static Logger log = LoggerFactory.getLogger(TreatmentsFragment.class);
+
+    RecyclerView recyclerView;
+    LinearLayoutManager llm;
+
+    TextView iobTotal;
+    TextView activityTotal;
+
+    private static DecimalFormat formatNumber0decimalplaces = new DecimalFormat("0");
+    private static DecimalFormat formatNumber2decimalplaces = new DecimalFormat("0.00");
+    private static DecimalFormat formatNumber3decimalplaces = new DecimalFormat("0.000");
+
+    private OnFragmentInteractionListener mListener;
+
+    private List<Treatment> treatments;
+
+    private void initializeData() {
+        try {
+            Dao<Treatment, Long> dao = MainApp.getDbHelper().getDaoTreatments();
+            QueryBuilder<Treatment, Long> queryBuilder = dao.queryBuilder();
+            queryBuilder.orderBy("timeIndex", false);
+            queryBuilder.limit(30l);
+            PreparedQuery<Treatment> preparedQuery = queryBuilder.prepare();
+            treatments = dao.query(preparedQuery);
+        } catch (SQLException e) {
+            log.debug(e.getMessage(), e);
+            treatments = new ArrayList<Treatment>();
+        }
+        if (recyclerView != null) {
+            recyclerView.swapAdapter(new RecyclerViewAdapter(treatments), false);
+            //recyclerView.getAdapter().notifyDataSetChanged();
+        }
+        updateTotalIOB();
+    }
+
+    private void updateTotalIOB() {
+        Iob total = new Iob();
+        for (Integer pos = 0; pos < treatments.size(); pos++ ) {
+            Treatment t = treatments.get(pos);
+            total.plus(t.iobCalc(new Date()));
+        }
+        if (iobTotal != null)
+            iobTotal.setText(formatNumber2decimalplaces.format(total.iobContrib));
+        if (activityTotal != null)
+            activityTotal.setText(formatNumber3decimalplaces.format(total.activityContrib));
+    }
+
+    public static class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.TreatmentsViewHolder> {
+
+        List<Treatment> treatments;
+
+        RecyclerViewAdapter(List<Treatment> treatments) {
+            this.treatments = treatments;
+        }
+
+        @Override
+        public TreatmentsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
+            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.treatments_item, viewGroup, false);
+            TreatmentsViewHolder treatmentsViewHolder = new TreatmentsViewHolder(v);
+            return treatmentsViewHolder;
+        }
+
+        @Override
+        public void onBindViewHolder(TreatmentsViewHolder holder, int position) {
+            // TODO: implement locales
+            DateFormat df = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, new Locale("cs", "CZ"));
+            holder.date.setText(df.format(treatments.get(position).created_at));
+            holder.insulin.setText(formatNumber2decimalplaces.format(treatments.get(position).insulin) + " U");
+            holder.carbs.setText(formatNumber0decimalplaces.format(treatments.get(position).carbs) + " g");
+            Iob iob = treatments.get(position).iobCalc(new Date());
+            holder.iob.setText(formatNumber2decimalplaces.format(iob.iobContrib) + " U");
+            holder.activity.setText(formatNumber3decimalplaces.format(iob.activityContrib) + " U");
+        }
+
+        @Override
+        public int getItemCount() {
+            return treatments.size();
+        }
+
+        @Override
+        public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+            super.onAttachedToRecyclerView(recyclerView);
+        }
+
+        public static class TreatmentsViewHolder extends RecyclerView.ViewHolder {
+            CardView cv;
+            TextView date;
+            TextView insulin;
+            TextView carbs;
+            TextView iob;
+            TextView activity;
+
+            TreatmentsViewHolder(View itemView) {
+                super(itemView);
+                cv = (CardView) itemView.findViewById(R.id.treatments_cardview);
+                date = (TextView) itemView.findViewById(R.id.treatments_date);
+                insulin = (TextView) itemView.findViewById(R.id.treatments_insulin);
+                carbs = (TextView) itemView.findViewById(R.id.treatments_carbs);
+                iob = (TextView) itemView.findViewById(R.id.treatments_iob);
+                activity = (TextView) itemView.findViewById(R.id.treatments_activity);
+            }
+        }
+    }
+
+    public TreatmentsFragment() {
+        super();
+        initializeData();
+    }
+
+    public static TreatmentsFragment newInstance() {
+        TreatmentsFragment fragment = new TreatmentsFragment();
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        registerBus();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.treatments_fragment, container, false);
+
+        recyclerView = (RecyclerView) view.findViewById(R.id.treatments_recyclerview);
+        recyclerView.setHasFixedSize(true);
+        llm = new LinearLayoutManager(view.getContext());
+        recyclerView.setLayoutManager(llm);
+
+        RecyclerViewAdapter adapter = new RecyclerViewAdapter(treatments);
+        recyclerView.setAdapter(adapter);
+
+        iobTotal = (TextView) view.findViewById(R.id.treatments_iobtotal);
+        activityTotal = (TextView) view.findViewById(R.id.treatments_iobactivitytotal);
+
+        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 onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnFragmentInteractionListener) {
+            mListener = (OnFragmentInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnFragmentInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    private void registerBus() {
+        try {
+            MainApp.bus().unregister(this);
+        } catch (RuntimeException x) {
+            // Ignore
+        }
+        MainApp.bus().register(this);
+    }
+
+    @Subscribe
+    public void onStatusEvent(final EventTreatmentChange ev) {
+        initializeData();
+    }
+
+    @Subscribe
+    public void onStatusEvent(final EventNewBG ev) {
+        updateTotalIOB();
+        recyclerView.getAdapter().notifyDataSetChanged();
+    }
+
+    /**
+     * This interface must be implemented by activities that contain this
+     * fragment to allow an interaction in this fragment to be communicated
+     * to the activity and potentially other fragments contained in that
+     * activity.
+     * <p/>
+     * See the Android Training lesson <a href=
+     * "http://developer.android.com/training/basics/fragments/communicating.html"
+     * >Communicating with Other Fragments</a> for more information.
+     */
+    public interface OnFragmentInteractionListener {
+        // TODO: Update argument type and name
+        void onFragmentInteraction(String param);
+    }
+}

app/src/main/java/info/nightscout/client/data/NSProfile.java

@@ -6,6 +6,7 @@ import org.json.JSONObject;
 
 import java.text.DecimalFormat;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.TimeZone;
 
 public class NSProfile {
@@ -279,4 +280,16 @@ public class NSProfile {
         long passed = now - c.getTimeInMillis();
         return (int) (passed / 1000);
     }
+
+    public static int secondsFromMidnight(Date date) {
+        Calendar c = Calendar.getInstance();
+        long now = date.getTime();
+        c.setTime(date);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        c.set(Calendar.MILLISECOND, 0);
+        long passed = now - c.getTimeInMillis();
+        return (int) (passed / 1000);
+    }
 }

app/src/main/java/info/nightscout/client/receivers/NSClientDataReceiver.java

@@ -21,6 +21,7 @@ import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
 
+import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventNewBasalProfile;
 import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.client.broadcasts.Intents;
@@ -182,6 +183,7 @@ public class NSClientDataReceiver extends BroadcastReceiver {
                         removeTreatmentFromDb(_id);
                     }
                 }
+                MainApp.bus().post(new EventTreatmentChange());
 
             } catch (JSONException e) {
                 e.printStackTrace();
@@ -189,6 +191,10 @@ public class NSClientDataReceiver extends BroadcastReceiver {
                 e1.printStackTrace();
             }
         }
+
+        if (intent.getAction().equals(Intents.ACTION_NEW_SGV)) {
+            MainApp.bus().post(new EventNewBG());
+        }
     }
 
     public void storeNSProfile() {

app/src/main/res/layout/treatments_fragment.xml

@@ -0,0 +1,58 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".plugins.Treatments.TreatmentsFragment">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="10dp"
+            android:paddingTop="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/treatments_iobtotal_label_string"
+                android:id="@+id/treatments_iobtotal_label"
+                android:paddingLeft="10dp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/treatments_iobtotal"
+                android:paddingLeft="10dp" />
+
+            <TextView
+                android:id="@+id/treatments_iobactivitytotal_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="10dp"
+                android:text="@string/treatments_iobactivitytotal_label_string"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/treatments_iobactivitytotal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="10dp" />
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/treatments_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        </android.support.v7.widget.RecyclerView>
+    </LinearLayout>
+
+</FrameLayout>

app/src/main/res/layout/treatments_item.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/treatments_cardview"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    card_view:cardBackgroundColor="@color/cardColorBackground"
+    card_view:cardCornerRadius="6dp"
+    card_view:cardUseCompatPadding="true"
+    card_view:contentPadding="6dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:baselineAligned="true"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/treatments_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="10dp"
+                android:text="1.1.2000 18:00"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/cardObjectiveText" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/treatments_insulin_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/treatments_insulin_label_string"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/treatments_insulin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="30dp"
+                android:text="1.1 U" />
+
+            <TextView
+                android:id="@+id/treatments_carbs_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/treatments_carbs_label_string"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/treatments_carbs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="30dp"
+                android:text="48 g" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/treatments_iob_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/treatments_iob_label_string"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/treatments_iob"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="30dp"
+                android:text="0.12 U" />
+
+            <TextView
+                android:id="@+id/treatments_activity_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/treatments_activity_string"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/treatments_activity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginRight="30dp"
+                android:text="0.002 U" />
+
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>

app/src/main/res/values/strings.xml

@@ -34,5 +34,11 @@
     <string name="profileview_basal_label">Basal:</string>
     <string name="profileview_target_label">Target:</string>
     <string name="profileview_noprofile_text">NO PROFILE SET</string>
+    <string name="treatments_insulin_label_string">Insulin:</string>
+    <string name="treatments_carbs_label_string">Carbs:</string>
+    <string name="treatments_iob_label_string">IOB:</string>
+    <string name="treatments_activity_string">Activity:</string>
+    <string name="treatments_iobtotal_label_string">Toal IOB:</string>
+    <string name="treatments_iobactivitytotal_label_string">Total IOB activity:</string>
 
 </resources>