Merge branch 'dev' of github.com:MilosKozak/AndroidAPS into carbs-required

app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt

@@ -58,7 +58,7 @@ class FoodFragment : DaggerFragment() {
             filterData()
         }
         food_category.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 fillSubcategories()
                 filterData()
             }
@@ -69,7 +69,7 @@ class FoodFragment : DaggerFragment() {
             }
         }
         food_subcategory.setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 filterData()
             }
 
@@ -210,4 +210,4 @@ class FoodFragment : DaggerFragment() {
             }
         }
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt

@@ -679,7 +679,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
         overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) }
             ?: resourceHelper.gc(R.color.defaulttextcolor))
-        overview_basebasal_icon.setImageResource(if (activeTemp != null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end)
+
+        if (activeTemp != null)
+            overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low)
+        else
+            overview_basebasal_icon.setImageResource( R.drawable.icon_cp_basal_no_tbr )
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())

core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java

@@ -340,13 +340,13 @@ public class DateUtil {
                 t = t / 60;
                 if (t != 1) unit = resourceHelper.gs(R.string.unit_hours);
                 if (t > 24) {
-                    unit = resourceHelper.gs(R.string.unit_day) + "\"";
+                    unit = resourceHelper.gs(R.string.unit_day);
                     t = t / 24;
-                    if (t != 1) unit = resourceHelper.gs(R.string.unit_days) + "\"";
+                    if (t != 1) unit = resourceHelper.gs(R.string.unit_days);
                     if (t > 28) {
-                        unit = resourceHelper.gs(R.string.unit_week) + "\"";
+                        unit = resourceHelper.gs(R.string.unit_week);
                         t = t / 7;
-                        if (t != 1) unit = resourceHelper.gs(R.string.unit_weeks) + "\"";
+                        if (t != 1) unit = resourceHelper.gs(R.string.unit_weeks);
                     }
                 }
             }