remove absorption rate from everywhere

app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java

@@ -48,7 +48,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
     EditText diaView;
     RadioButton mgdlView;
     RadioButton mmolView;
-    EditText carView;
     EditText targetlowView;
     EditText targethighView;
     EditText percentageView;
@@ -74,7 +73,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
         diaView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_dia);
         mgdlView = (RadioButton) layout.findViewById(R.id.circadianpercentageprofile_mgdl);
         mmolView = (RadioButton) layout.findViewById(R.id.circadianpercentageprofile_mmol);
-        carView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_car);
         targetlowView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_targetlow);
         targethighView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_targethigh);
         percentageView = (EditText) layout.findViewById(R.id.circadianpercentageprofile_percentage);
@@ -101,7 +99,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
         mgdlView.setChecked(circadianPercentageProfilePlugin.mgdl);
         mmolView.setChecked(circadianPercentageProfilePlugin.mmol);
         diaView.setText(circadianPercentageProfilePlugin.dia.toString());
-        carView.setText(circadianPercentageProfilePlugin.car.toString());
         targetlowView.setText(circadianPercentageProfilePlugin.targetLow.toString());
         targethighView.setText(circadianPercentageProfilePlugin.targetHigh.toString());
         percentageView.setText("" + circadianPercentageProfilePlugin.percentage);
@@ -226,7 +223,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
                     circadianPercentageProfilePlugin.percentage = SafeParse.stringToInt(percentageView.getText().toString());
                 }
                 circadianPercentageProfilePlugin.dia = SafeParse.stringToDouble(diaView.getText().toString());
-                circadianPercentageProfilePlugin.car = SafeParse.stringToDouble(carView.getText().toString());
                 circadianPercentageProfilePlugin.targetLow = SafeParse.stringToDouble(targetlowView.getText().toString());
                 circadianPercentageProfilePlugin.targetHigh = SafeParse.stringToDouble(targethighView.getText().toString());
                 circadianPercentageProfilePlugin.timeshift = SafeParse.stringToInt(timeshiftView.getText().toString());
@@ -236,7 +232,6 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
         };
 
         diaView.addTextChangedListener(textWatch);
-        carView.addTextChangedListener(textWatch);
         targetlowView.addTextChangedListener(textWatch);
         targethighView.addTextChangedListener(textWatch);
         percentageView.addTextChangedListener(textWatch);

app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfilePlugin.java

@@ -36,7 +36,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
     boolean mgdl;
     boolean mmol;
     Double dia;
-    Double car;
     Double targetLow;
     Double targetHigh;
     public int percentage;
@@ -108,7 +107,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
         editor.putBoolean(SETTINGS_PREFIX + "mmol", mmol);
         editor.putBoolean(SETTINGS_PREFIX + "mgdl", mgdl);
         editor.putString(SETTINGS_PREFIX + "dia", dia.toString());
-        editor.putString(SETTINGS_PREFIX + "car", car.toString());
         editor.putString(SETTINGS_PREFIX + "targetlow", targetLow.toString());
         editor.putString(SETTINGS_PREFIX + "targethigh", targetHigh.toString());
         editor.putString(SETTINGS_PREFIX + "timeshift", timeshift + "");
@@ -150,13 +148,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
                 log.debug(e.getMessage());
             }
         else dia = 3d;
-        if (settings.contains(SETTINGS_PREFIX + "car"))
-            try {
-                car = SafeParse.stringToDouble(settings.getString(SETTINGS_PREFIX + "car", "20"));
-            } catch (Exception e) {
-                log.debug(e.getMessage());
-            }
-        else car = 20d;
         if (settings.contains(SETTINGS_PREFIX + "targetlow"))
             try {
                 targetLow = SafeParse.stringToDouble(settings.getString(SETTINGS_PREFIX + "targetlow", "80"));
@@ -236,8 +227,6 @@ public class CircadianPercentageProfilePlugin implements PluginBase, ProfileInte
             }
             profile.put("carbratio", icArray);
 
-            profile.put("carbs_hr", car);
-
              JSONArray isfArray = new JSONArray();
             for (int i = 0; i < 24; i++) {
                 isfArray.put(new JSONObject().put("timeAsSeconds", i * 60 * 60).put("value", baseisf[(offset + i) % 24] * 100d / percentage));

app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRPump.java

@@ -124,7 +124,6 @@ public class DanaRPump {
 
         SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
         double dia = SafeParse.stringToDouble(SP.getString("danarprofile_dia", "3"));
-        double car = SafeParse.stringToDouble(SP.getString("danarprofile_car", "20"));
 
         try {
             json.put("defaultProfile", PROFILE_PREFIX + (activeProfile + 1));
@@ -139,8 +138,6 @@ public class DanaRPump {
             carbratios.put(new JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR));
             profile.put("carbratio", carbratios);
 
-            profile.put("carbs_hr", car);
-
             JSONArray sens = new JSONArray();
             sens.put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCF));
             sens.put(new JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCF));

app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanPump.java

@@ -117,7 +117,6 @@ public class DanaRKoreanPump {
 
         SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
         double dia = SafeParse.stringToDouble(SP.getString("danarprofile_dia", "3"));
-        double car = SafeParse.stringToDouble(SP.getString("danarprofile_car", "20"));
 
         try {
             json.put("defaultProfile", PROFILE_PREFIX + (activeProfile + 1));
@@ -132,8 +131,6 @@ public class DanaRKoreanPump {
             carbratios.put(new JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR));
             profile.put("carbratio", carbratios);
 
-            profile.put("carbs_hr", car);
-
             JSONArray sens = new JSONArray();
             sens.put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCF));
             sens.put(new JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCF));

app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfileFragment.java

@@ -45,7 +45,6 @@ public class LocalProfileFragment extends Fragment implements FragmentBase {
     RadioButton mmolView;
     TimeListEdit icView;
     TimeListEdit isfView;
-    EditText carView;
     TimeListEdit basalView;
     TimeListEdit targetView;
     Button profileswitchButton;
@@ -66,7 +65,6 @@ public class LocalProfileFragment extends Fragment implements FragmentBase {
         mmolView = (RadioButton) layout.findViewById(R.id.localprofile_mmol);
         icView = new TimeListEdit(getContext(), layout, R.id.localprofile_ic, MainApp.sResources.getString(R.string.nsprofileview_ic_label), getPlugin().ic, null, new DecimalFormat("0.0"), save);
         isfView = new TimeListEdit(getContext(), layout, R.id.localprofile_isf, MainApp.sResources.getString(R.string.nsprofileview_isf_label), getPlugin().isf, null, new DecimalFormat("0.0"), save);
-        carView = (EditText) layout.findViewById(R.id.localprofile_car);
         basalView = new TimeListEdit(getContext(), layout, R.id.localprofile_basal, MainApp.sResources.getString(R.string.nsprofileview_basal_label), getPlugin().basal, null, new DecimalFormat("0.00"), save);
         targetView = new TimeListEdit(getContext(), layout, R.id.localprofile_target, MainApp.sResources.getString(R.string.nsprofileview_target_label), getPlugin().targetLow, getPlugin().targetHigh, new DecimalFormat("0.0"), save);
         profileswitchButton = (Button) layout.findViewById(R.id.localprofile_profileswitch);
@@ -81,7 +79,6 @@ public class LocalProfileFragment extends Fragment implements FragmentBase {
         mgdlView.setChecked(localProfilePlugin.mgdl);
         mmolView.setChecked(localProfilePlugin.mmol);
         diaView.setText(localProfilePlugin.dia.toString());
-        carView.setText(localProfilePlugin.car.toString());
 
         mgdlView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -128,13 +125,11 @@ public class LocalProfileFragment extends Fragment implements FragmentBase {
             public void onTextChanged(CharSequence s, int start,
                                       int before, int count) {
                 localProfilePlugin.dia = SafeParse.stringToDouble(diaView.getText().toString());
-                localProfilePlugin.car = SafeParse.stringToDouble(carView.getText().toString());
                 localProfilePlugin.storeSettings();
             }
         };
 
         diaView.addTextChangedListener(textWatch);
-        carView.addTextChangedListener(textWatch);
 
         onStatusEvent(null);
 

app/src/main/java/info/nightscout/androidaps/plugins/LocalProfile/LocalProfilePlugin.java

@@ -37,7 +37,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
     Double dia;
     JSONArray ic;
     JSONArray isf;
-    Double car;
     JSONArray basal;
     JSONArray targetLow;
     JSONArray targetHigh;
@@ -107,7 +106,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
         editor.putString("LocalProfile" + "dia", dia.toString());
         editor.putString("LocalProfile" + "ic", ic.toString());
         editor.putString("LocalProfile" + "isf", isf.toString());
-        editor.putString("LocalProfile" + "car", car.toString());
         editor.putString("LocalProfile" + "basal", basal.toString());
         editor.putString("LocalProfile" + "targetlow", targetLow.toString());
         editor.putString("LocalProfile" + "targethigh", targetHigh.toString());
@@ -178,13 +176,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
                 e.printStackTrace();
             }
         }
-        if (settings.contains("LocalProfile" + "car"))
-            try {
-                car = SafeParse.stringToDouble(settings.getString("LocalProfile" + "car", "20"));
-            } catch (Exception e) {
-                log.debug(e.getMessage());
-            }
-        else car = 20d;
         if (settings.contains("LocalProfile" + "basal"))
             try {
                 basal = new JSONArray(settings.getString("LocalProfile" + "basal", DEFAULTARRAY));
@@ -290,7 +281,6 @@ public class LocalProfilePlugin implements PluginBase, ProfileInterface {
             json.put("store", store);
             profile.put("dia", dia);
             profile.put("carbratio", ic);
-            profile.put("carbs_hr", car);
             profile.put("sens", isf);
             profile.put("basal", basal);
             profile.put("target_low", targetLow);

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java

@@ -204,7 +204,6 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
         maxIob = verifyHardLimits(maxIob, "maxIob", 0, 7);
         maxBasal = verifyHardLimits(maxBasal, "max_basal", 0.1, 10);
 
-        if (!checkOnlyHardLimits(profile.getCarbAbsorbtionRate(), "carbs_hr", 4, 100)) return;
         if (!checkOnlyHardLimits(profile.getDia(), "dia", 2, 7)) return;
         if (!checkOnlyHardLimits(profile.getIc(profile.secondsFromMidnight()), "carbratio", 2, 100)) return;
         if (!checkOnlyHardLimits(NSProfile.toMgdl(profile.getIsf(NSProfile.secondsFromMidnight()).doubleValue(), units), "sens", 2, 900)) return;

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java

@@ -63,7 +63,6 @@ public class DetermineBasalAdapterMAJS {
         // Profile
         mProfile = new V8Object(mV8rt);
         mProfile.add("max_iob", 0);
-        mProfile.add("carbs_hr", 0);
         mProfile.add("dia", 0);
         mProfile.add("type", "current");
         mProfile.add("max_daily_basal", 0);
@@ -230,7 +229,6 @@ public class DetermineBasalAdapterMAJS {
         String units = profile.getUnits();
 
         mProfile.add("max_iob", maxIob);
-        mProfile.add("carbs_hr", profile.getCarbAbsorbtionRate());
         mProfile.add("dia", profile.getDia());
         mProfile.add("type", "current");
         mProfile.add("max_daily_basal", profile.getMaxDailyBasal());

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java

@@ -209,7 +209,6 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
         maxIob = verifyHardLimits(maxIob, "maxIob", 0, 7);
         maxBasal = verifyHardLimits(maxBasal, "max_basal", 0.1, 10);
 
-        if (!checkOnlyHardLimits(profile.getCarbAbsorbtionRate(), "carbs_hr", 4, 100)) return;
         if (!checkOnlyHardLimits(profile.getDia(), "dia", 2, 7)) return;
         if (!checkOnlyHardLimits(profile.getIc(profile.secondsFromMidnight()), "carbratio", 2, 100)) return;
         if (!checkOnlyHardLimits(NSProfile.toMgdl(profile.getIsf(NSProfile.secondsFromMidnight()).doubleValue(), units), "sens", 2, 900)) return;

app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfileFragment.java

@@ -48,7 +48,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase {
     RadioButton mmolView;
     EditText icView;
     EditText isfView;
-    EditText carView;
     EditText basalView;
     EditText targetlowView;
     EditText targethighView;
@@ -63,7 +62,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase {
         mmolView = (RadioButton) layout.findViewById(R.id.simpleprofile_mmol);
         icView = (EditText) layout.findViewById(R.id.simpleprofile_ic);
         isfView = (EditText) layout.findViewById(R.id.simpleprofile_isf);
-        carView = (EditText) layout.findViewById(R.id.simpleprofile_car);
         basalView = (EditText) layout.findViewById(R.id.simpleprofile_basalrate);
         targetlowView = (EditText) layout.findViewById(R.id.simpleprofile_targetlow);
         targethighView = (EditText) layout.findViewById(R.id.simpleprofile_targethigh);
@@ -82,7 +80,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase {
         diaView.setText(simpleProfilePlugin.dia.toString());
         icView.setText(simpleProfilePlugin.ic.toString());
         isfView.setText(simpleProfilePlugin.isf.toString());
-        carView.setText(simpleProfilePlugin.car.toString());
         basalView.setText(simpleProfilePlugin.basal.toString());
         targetlowView.setText(simpleProfilePlugin.targetLow.toString());
         targethighView.setText(simpleProfilePlugin.targetHigh.toString());
@@ -134,7 +131,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase {
                 simpleProfilePlugin.dia = SafeParse.stringToDouble(diaView.getText().toString());
                 simpleProfilePlugin.ic = SafeParse.stringToDouble(icView.getText().toString());
                 simpleProfilePlugin.isf = SafeParse.stringToDouble(isfView.getText().toString());
-                simpleProfilePlugin.car = SafeParse.stringToDouble(carView.getText().toString());
                 simpleProfilePlugin.basal = SafeParse.stringToDouble(basalView.getText().toString());
                 simpleProfilePlugin.targetLow = SafeParse.stringToDouble(targetlowView.getText().toString());
                 simpleProfilePlugin.targetHigh = SafeParse.stringToDouble(targethighView.getText().toString());
@@ -145,7 +141,6 @@ public class SimpleProfileFragment extends Fragment implements FragmentBase {
         diaView.addTextChangedListener(textWatch);
         icView.addTextChangedListener(textWatch);
         isfView.addTextChangedListener(textWatch);
-        carView.addTextChangedListener(textWatch);
         basalView.addTextChangedListener(textWatch);
         targetlowView.addTextChangedListener(textWatch);
         targethighView.addTextChangedListener(textWatch);

app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfilePlugin.java

@@ -34,7 +34,6 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
     Double dia;
     Double ic;
     Double isf;
-    Double car;
     Double basal;
     Double targetLow;
     Double targetHigh;
@@ -104,7 +103,6 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
         editor.putString("SimpleProfile" + "dia", dia.toString());
         editor.putString("SimpleProfile" + "ic", ic.toString());
         editor.putString("SimpleProfile" + "isf", isf.toString());
-        editor.putString("SimpleProfile" + "car", car.toString());
         editor.putString("SimpleProfile" + "basal", basal.toString());
         editor.putString("SimpleProfile" + "targetlow", targetLow.toString());
         editor.putString("SimpleProfile" + "targethigh", targetHigh.toString());
@@ -153,13 +151,6 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
                 log.debug(e.getMessage());
             }
         else isf = 200d;
-        if (settings.contains("SimpleProfile" + "car"))
-            try {
-                car = SafeParse.stringToDouble(settings.getString("SimpleProfile" + "car", "20"));
-            } catch (Exception e) {
-                log.debug(e.getMessage());
-            }
-        else car = 20d;
         if (settings.contains("SimpleProfile" + "basal"))
             try {
                 basal = SafeParse.stringToDouble(settings.getString("SimpleProfile" + "basal", "1"));
@@ -232,7 +223,6 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
             json.put("store", store);
             profile.put("dia", dia);
             profile.put("carbratio", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", ic)));
-            profile.put("carbs_hr", car);
             profile.put("sens", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", isf)));
             profile.put("basal", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", basal)));
             profile.put("target_low", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", targetLow)));

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

@@ -120,7 +120,7 @@ public class NSProfile {
         }
         return 3D;
     }
-
+/*
     public Double getCarbAbsorbtionRate() {
         return getCarbAbsorbtionRate(getDefaultProfile());
     }
@@ -137,7 +137,7 @@ public class NSProfile {
         }
         return 0D;
     }
-
+*/
     // mmol or mg/dl
     public String getUnits() {
         return getUnits(getDefaultProfile());

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

@@ -239,24 +239,6 @@
                         android:inputType="numberDecimal" />
                 </TableRow>
 
-                <TableRow
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/absorption_rate"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <EditText
-                        android:id="@+id/circadianpercentageprofile_car"
-                        android:layout_width="100dp"
-                        android:layout_height="wrap_content"
-                        android:layout_column="2"
-                        android:inputType="numberDecimal" />
-                </TableRow>
-
                 <TableRow
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">

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

@@ -16,9 +16,9 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/linearBlockBackground"
                 android:text="@string/units"
-                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
-                android:background="@color/linearBlockBackground" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -42,56 +42,41 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/linearBlockBackground"
                 android:text="@string/dia"
-                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
-                android:background="@color/linearBlockBackground"  />
 
             <EditText
                 android:id="@+id/localprofile_dia"
+                android:layout_width="70dp"
                 android:layout_height="wrap_content"
-                android:inputType="numberDecimal"
-                android:textAlignment="center"
                 android:layout_gravity="center_horizontal"
-                android:layout_width="70dp" />
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/localprofile_ic"></LinearLayout>
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/localprofile_isf"></LinearLayout>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/absorption_rate"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:background="@color/linearBlockBackground"  />
-
-            <EditText
-                android:id="@+id/localprofile_car"
-                android:layout_height="wrap_content"
                 android:inputType="numberDecimal"
-                android:textAlignment="center"
+                android:textAlignment="center" />
-                android:layout_gravity="center_horizontal"
-                android:layout_width="70dp" />
 
             <LinearLayout
-                android:orientation="vertical"
+                android:id="@+id/localprofile_ic"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:id="@+id/localprofile_basal"></LinearLayout>
+                android:orientation="vertical" />
 
             <LinearLayout
+                android:id="@+id/localprofile_isf"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
+                android:orientation="vertical" />
-                android:id="@+id/localprofile_target">
+
+            <LinearLayout
+                android:id="@+id/localprofile_basal"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical" />
+
+            <LinearLayout
+                android:id="@+id/localprofile_target"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
             </LinearLayout>
 

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

@@ -75,27 +75,15 @@
                 android:inputType="numberDecimal" />
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/absorption_rate"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <EditText
-                android:id="@+id/simpleprofile_car"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="numberDecimal" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:id="@+id/simpleprofile_basalrate_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:text="@string/basal_rate"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
             <EditText
                 android:id="@+id/simpleprofile_basalrate"
-                android:layout_width="100dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="numberDecimal" />
 

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

@@ -230,7 +230,6 @@
     <string name="danar_valuenotsetproperly">Неправилно зададени стойности</string>
     <string name="danar_viewprofile">Виж профила</string>
     <string name="danarprofile">DanaR профил</string>
-    <string name="danarprofile_car">Усвояване на въглехидрати гр./ч.</string>
     <string name="danarprofile_dia">DIA (Време на действие на инсулина) ч.:</string>
     <string name="danar_lastbolus">Последен болус:</string>
     <string name="danar_invalidinput">Неправилни входни данни</string>
@@ -348,7 +347,6 @@
     <string name="ns_upload_only">NS upload only (изключва синхронизацията)</string>
     <string name="ns_upload_only_enabled">Моля изключете "NS upload only" за да използвате това.</string>
     <string name="ns_upload_only_summary">NS upload only. Not effective on SGV unless a local source like xDrip is selected. Not effective on Profiles while NS-Profiles is used.</string>
-    <string name="absorption_rate">Усвояване на ВХ (ч):</string>
     <string name="alert_dialog_storage_permission_text">Моля рестартирайте телефона или AndroidAPS, в противен случай информацията за грешки няма да се запише(важно за да се потвърди, че алгоритъмът работи правилно)</string>
     <string name="androidaps_tempbasalendnote">Край на временен базал</string>
     <string name="androidaps_tempbasalstartnote">Старт на временен базал</string>

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

@@ -240,8 +240,7 @@
     <string name="manual">Jiný</string>
     <string name="glucosetype_sensor">Senzor</string>
     <string name="danarprofile">DanaR profil</string>
-    <string name="danarprofile_car">Rychlost absorbce sacharidů</string>
+    <string name="danarprofile_dia">Celková doba aktivity inzulínu[h]</string>
-    <string name="danarprofile_dia">Rychlost inzulínu[h]</string>
     <string name="failedupdatebasalprofile">Chyba při nastavení dočasného bazálu</string>
     <string name="danar_alarm">alarm</string>
     <string name="danar_basalhour">hodinový bazál</string>
@@ -323,7 +322,6 @@
     <string name="androidaps_start">AndroidAPS restartován</string>
     <string name="androidaps_tempbasalendnote">Dočasný bazál konec</string>
     <string name="androidaps_tempbasalstartnote">Dočasný bazál začátek</string>
-    <string name="absorption_rate">Rychlost absorbce sacharidů:</string>
     <string name="alert_dialog_storage_permission_text">Prosím restartujte Váš telefon nebo restartujte AndroidAPS z nastavení systému jinak nebudou zaznamenány ladící informace (důležité pro sledování a kontrolu, zda algoritmus pracuje správně)</string>
     <string name="base_profile_label">Bazální profil:</string>
     <string name="batterydischarged">Baterie v pumpě vybitá</string>

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

@@ -221,7 +221,6 @@
     <string name="danar_viewprofile">Profil anzeigen</string>
     <string name="danarprofile">DanaR Profil Einstellungen</string>
     <string name="danarprofile_dia">DIA [h]</string>
-    <string name="danarprofile_car">Kohlehydrahte Absorptionsrate</string>
     <string name="manual">Manuell</string>
     <string name="danar_dailyunits">Einheiten (Tag)</string>
     <string name="danar_invalidinput">ungültige Eingabe</string>
@@ -309,7 +308,6 @@
     <string name="button1">Knopf 1</string>
     <string name="button2">Knopf 2</string>
     <string name="button3">Knopf 3</string>
-    <string name="absorption_rate">Absorptionsrate:</string>
     <string name="configbuilder">Config Builder</string>
     <string name="minago">vor %d min</string>
     <string name="actions_shortname">"AKT"</string>

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

@@ -250,7 +250,6 @@
     <string name="careportal_temporarytargetcancel">Cancelar Objetivo temporal</string>
     <string name="danarprofile">Configuración perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
-    <string name="danarprofile_car">Tasa de absorción de carbohidratos</string>
     <string name="failedupdatebasalprofile">No se pudo actualizar el perfil basal</string>
     <string name="danar_history">Historial</string>
     <string name="danar_historyreload">Recargar</string>

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

@@ -253,7 +253,6 @@
     <string name="careportal_temporarytargetcancel">Temporary Target Cancel</string>
     <string name="danarprofile">DanaR 프로파일 설정</string>
     <string name="danarprofile_dia">인슐린활동시간(DIA) [h]</string>
-    <string name="danarprofile_car">탄수화물 흡수속도 [g/hour]</string>
     <string name="failedupdatebasalprofile">기초주입 프로파일 갱신 실패</string>
     <string name="danar_history">History</string>
     <string name="danar_historyreload">Reload</string>
@@ -350,7 +349,6 @@
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
     <string name="dia">DIA:</string>
-    <string name="absorption_rate">Absorption rate:</string>
     <string name="target_range">Target range:</string>
     <string name="edit_base_basal">Edit Base-Basal:</string>
     <string name="edit_base_isf">Edit Base-ISF:</string>

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

@@ -263,7 +263,6 @@
     <string name="careportal_temporarytargetcancel">Temporary Target Cancel</string>
     <string name="danarprofile">DanaR profile settings</string>
     <string name="danarprofile_dia">DIA [h]</string>
-    <string name="danarprofile_car">Carbs absorption rate</string>
      <string name="failedupdatebasalprofile">Failed to update basal profile</string>
     <string name="danar_history">History</string>
     <string name="danar_historyreload">Reload</string>
@@ -362,7 +361,6 @@
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
     <string name="dia">DIA:</string>
-    <string name="absorption_rate">Absorption rate:</string>
     <string name="target_range">Target range:</string>
     <string name="edit_base_basal">Edit Base-Basal:</string>
     <string name="edit_base_isf">Edit Base-ISF:</string>

app/src/main/res/xml/pref_danarprofile.xml

@@ -8,11 +8,6 @@
             android:key="danarprofile_dia"
             android:numeric="decimal"
             android:title="@string/danarprofile_dia" />
-        <EditTextPreference
-            android:defaultValue=""
-            android:key="danarprofile_car"
-            android:numeric="decimal"
-            android:title="@string/danarprofile_car" />
 
     </PreferenceCategory>