diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 240a396d92..595be6943f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -179,7 +179,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - if (smallWidth) overview_arrow?.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 35f) overview_pumpstatus?.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder)) overview_notifications?.setHasFixedSize(false) @@ -567,8 +566,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList overview_bg?.text = lastBG.valueToUnitsToString(units) overview_bg?.setTextColor(color) - overview_arrow?.text = lastBG.directionToSymbol(databaseHelper) - overview_arrow?.setTextColor(color) + overview_arrow?.setImageResource(lastBG.directionToIcon(databaseHelper)) + overview_arrow?.setColorFilter(color) val glucoseStatus = GlucoseStatus(injector).glucoseStatusData if (glucoseStatus != null) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt index b01ba8d470..2b0d38fab8 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -86,7 +87,7 @@ class BGSourceFragment : DaggerFragment() { holder.invalid.visibility = if (!bgReading.isValid) View.VISIBLE else View.GONE holder.date.text = dateUtil.dateAndTimeString(bgReading.date) holder.value.text = bgReading.valueToUnitsToString(profileFunction.getUnits()) - holder.direction.text = bgReading.directionToSymbol(databaseHelper) + holder.direction.setImageResource(bgReading.directionToIcon(databaseHelper)) holder.remove.tag = bgReading } @@ -97,7 +98,7 @@ class BGSourceFragment : DaggerFragment() { inner class BgReadingsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { var date: TextView = itemView.findViewById(R.id.bgsource_date) var value: TextView = itemView.findViewById(R.id.bgsource_value) - var direction: TextView = itemView.findViewById(R.id.bgsource_direction) + var direction: ImageView = itemView.findViewById(R.id.bgsource_direction) var invalid: TextView = itemView.findViewById(R.id.invalid_sign) var ns: TextView = itemView.findViewById(R.id.ns_sign) var remove: TextView = itemView.findViewById(R.id.bgsource_remove) diff --git a/app/src/main/res/layout/bgsource_item.xml b/app/src/main/res/layout/bgsource_item.xml index 5d1842b8c6..ff84837cba 100644 --- a/app/src/main/res/layout/bgsource_item.xml +++ b/app/src/main/res/layout/bgsource_item.xml @@ -35,13 +35,12 @@ android:text="Name" android:textStyle="bold" /> - + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:src="@drawable/ic_flat" /> - - + app:layout_constraintTop_toTopOf="@+id/overview_bg" + android:paddingTop="18dp" + android:src="@drawable/ic_flat" /> + + + diff --git a/core/src/main/res/drawable/ic_doubleup.xml b/core/src/main/res/drawable/ic_doubleup.xml new file mode 100644 index 0000000000..9c56d4cf85 --- /dev/null +++ b/core/src/main/res/drawable/ic_doubleup.xml @@ -0,0 +1,12 @@ + + + + diff --git a/core/src/main/res/drawable/ic_flat.xml b/core/src/main/res/drawable/ic_flat.xml new file mode 100644 index 0000000000..487a647f10 --- /dev/null +++ b/core/src/main/res/drawable/ic_flat.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/src/main/res/drawable/ic_fortyfivedown.xml b/core/src/main/res/drawable/ic_fortyfivedown.xml new file mode 100644 index 0000000000..673a965fe4 --- /dev/null +++ b/core/src/main/res/drawable/ic_fortyfivedown.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/src/main/res/drawable/ic_fortyfiveup.xml b/core/src/main/res/drawable/ic_fortyfiveup.xml new file mode 100644 index 0000000000..930857ec66 --- /dev/null +++ b/core/src/main/res/drawable/ic_fortyfiveup.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/src/main/res/drawable/ic_invalid.xml b/core/src/main/res/drawable/ic_invalid.xml new file mode 100644 index 0000000000..bdda131e7d --- /dev/null +++ b/core/src/main/res/drawable/ic_invalid.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/core/src/main/res/drawable/ic_singledown.xml b/core/src/main/res/drawable/ic_singledown.xml new file mode 100644 index 0000000000..bc3a0e7501 --- /dev/null +++ b/core/src/main/res/drawable/ic_singledown.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/src/main/res/drawable/ic_singleup.xml b/core/src/main/res/drawable/ic_singleup.xml new file mode 100644 index 0000000000..6dda71fc74 --- /dev/null +++ b/core/src/main/res/drawable/ic_singleup.xml @@ -0,0 +1,9 @@ + + + diff --git a/icons/ic_DoubleDown.svg b/icons/ic_DoubleDown.svg new file mode 100644 index 0000000000..59a49688fd --- /dev/null +++ b/icons/ic_DoubleDown.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/icons/ic_DoubleUp.svg b/icons/ic_DoubleUp.svg new file mode 100644 index 0000000000..ffe05f5740 --- /dev/null +++ b/icons/ic_DoubleUp.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/icons/ic_Flat.svg b/icons/ic_Flat.svg new file mode 100644 index 0000000000..1ec4fa8e6c --- /dev/null +++ b/icons/ic_Flat.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/icons/ic_FortyFiveDown.svg b/icons/ic_FortyFiveDown.svg new file mode 100644 index 0000000000..5ea545a3a4 --- /dev/null +++ b/icons/ic_FortyFiveDown.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/icons/ic_FortyFiveUp.svg b/icons/ic_FortyFiveUp.svg new file mode 100644 index 0000000000..91d223b371 --- /dev/null +++ b/icons/ic_FortyFiveUp.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/icons/ic_Invalid.svg b/icons/ic_Invalid.svg new file mode 100644 index 0000000000..79de4c9ad7 --- /dev/null +++ b/icons/ic_Invalid.svg @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/icons/ic_SingleDown.svg b/icons/ic_SingleDown.svg new file mode 100644 index 0000000000..ca673aee12 --- /dev/null +++ b/icons/ic_SingleDown.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/icons/ic_SingleUp.svg b/icons/ic_SingleUp.svg new file mode 100644 index 0000000000..b508a6fc93 --- /dev/null +++ b/icons/ic_SingleUp.svg @@ -0,0 +1,9 @@ + + + + + +