Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix light theme in pump drivers #3258

Merged
merged 4 commits into from
Mar 10, 2024
Merged

Fix light theme in pump drivers #3258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fb59a6
Medtrum: Text colors to follow theme
Mar 8, 2024
424128d
Combo: Text colors to follow theme
Mar 8, 2024
d69293d
EOPatch: Text colors to follow theme
Mar 8, 2024
2b993aa
Equil: Text colors to follow theme
Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package info.nightscout.pump.combov2

import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
Expand Down Expand Up @@ -116,9 +115,9 @@ class ComboV2Fragment : DaggerFragment() {

binding.combov2DriverState.setTextColor(
when (connectionState) {
ComboV2Plugin.DriverState.Error -> Color.RED
ComboV2Plugin.DriverState.Suspended -> Color.YELLOW
else -> Color.WHITE
ComboV2Plugin.DriverState.Error -> rh.gac(app.aaps.core.ui.R.attr.warningColor)
ComboV2Plugin.DriverState.Suspended -> rh.gac(app.aaps.core.ui.R.attr.urgentColor)
else -> rh.gac(app.aaps.core.ui.R.attr.defaultTextColor)
}
)
}
Expand Down Expand Up @@ -150,17 +149,17 @@ class ComboV2Fragment : DaggerFragment() {

BatteryState.NO_BATTERY -> {
binding.combov2Battery.text = rh.gs(R.string.combov2_battery_empty_indicator)
binding.combov2Battery.setTextColor(Color.RED)
binding.combov2Battery.setTextColor(rh.gac(app.aaps.core.ui.R.attr.warningColor))
}

BatteryState.LOW_BATTERY -> {
binding.combov2Battery.text = rh.gs(R.string.combov2_battery_low_indicator)
binding.combov2Battery.setTextColor(Color.YELLOW)
binding.combov2Battery.setTextColor(rh.gac(app.aaps.core.ui.R.attr.urgentColor))
}

BatteryState.FULL_BATTERY -> {
binding.combov2Battery.text = rh.gs(R.string.combov2_battery_full_indicator)
binding.combov2Battery.setTextColor(Color.WHITE)
binding.combov2Battery.setTextColor(rh.gac(app.aaps.core.ui.R.attr.defaultTextColor))
}
}
}
Expand All @@ -175,10 +174,10 @@ class ComboV2Fragment : DaggerFragment() {

binding.combov2Reservoir.setTextColor(
when (reservoirLevel?.state) {
null -> Color.WHITE
ReservoirState.EMPTY -> Color.RED
ReservoirState.LOW -> Color.YELLOW
ReservoirState.FULL -> Color.WHITE
null -> rh.gac(app.aaps.core.ui.R.attr.defaultTextColor)
ReservoirState.EMPTY -> rh.gac(app.aaps.core.ui.R.attr.warningColor)
ReservoirState.LOW -> rh.gac(app.aaps.core.ui.R.attr.urgentColor)
ReservoirState.FULL -> rh.gac(app.aaps.core.ui.R.attr.defaultTextColor)
}
)
}
Expand Down Expand Up @@ -249,17 +248,17 @@ class ComboV2Fragment : DaggerFragment() {

in 0..60 -> {
binding.combov2LastConnection.text = rh.gs(R.string.combov2_less_than_one_minute_ago)
binding.combov2LastConnection.setTextColor(Color.WHITE)
binding.combov2LastConnection.setTextColor(rh.gac(app.aaps.core.ui.R.attr.defaultTextColor))
}

in 60..(30 * 60) -> {
binding.combov2LastConnection.text = rh.gs(app.aaps.core.interfaces.R.string.minago, secondsPassed / 60)
binding.combov2LastConnection.setTextColor(Color.WHITE)
binding.combov2LastConnection.setTextColor(rh.gac(app.aaps.core.ui.R.attr.defaultTextColor))
}

else -> {
binding.combov2LastConnection.text = rh.gs(R.string.combov2_no_connection_for_n_mins, secondsPassed / 60)
binding.combov2LastConnection.setTextColor(Color.RED)
binding.combov2LastConnection.setTextColor(rh.gac(app.aaps.core.ui.R.attr.warningColor))
}
}
}
Expand Down
10 changes: 0 additions & 10 deletions pump/combov2/src/main/res/layout/combov2_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>

Expand Down Expand Up @@ -109,7 +108,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>

Expand Down Expand Up @@ -144,7 +142,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>

Expand Down Expand Up @@ -187,7 +184,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:text=""
android:textSize="14sp" />
</LinearLayout>
Expand Down Expand Up @@ -222,7 +218,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>

Expand Down Expand Up @@ -256,7 +251,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>

Expand Down Expand Up @@ -290,7 +284,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>

Expand Down Expand Up @@ -324,7 +317,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>

Expand Down Expand Up @@ -358,7 +350,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>

Expand Down Expand Up @@ -392,7 +383,6 @@
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>

Expand Down
10 changes: 0 additions & 10 deletions pump/eopatch/src/main/res/layout/fragment_eopatch_overview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.bleStatus}"
android:textColor="@android:color/white"
android:textSize="16sp" />

</LinearLayout>
Expand Down Expand Up @@ -134,7 +133,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchConfig.patchSerialNumber}"
android:textColor="@android:color/white"
android:textSize="16sp" />
</LinearLayout>

Expand Down Expand Up @@ -173,7 +171,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchConfig.patchLotNumber}"
android:textColor="@android:color/white"
android:textSize="16sp" />
</LinearLayout>

Expand Down Expand Up @@ -212,7 +209,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{CommonUtils.dateString(viewmodel.patchConfig.patchWakeupTimestamp)}"
android:textColor="@android:color/white"
android:textSize="16sp" />

</LinearLayout>
Expand Down Expand Up @@ -252,7 +248,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{CommonUtils.dateString(viewmodel.patchConfig.expireTimestamp)}"
android:textColor="@android:color/white"
android:textSize="16sp" />

</LinearLayout>
Expand Down Expand Up @@ -292,7 +287,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.status}"
android:textColor="@android:color/white"
android:textSize="16sp" />

</LinearLayout>
Expand Down Expand Up @@ -340,7 +334,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.normalBasal}"
android:textColor="@android:color/white"
android:textSize="16sp" />

</LinearLayout>
Expand Down Expand Up @@ -388,7 +381,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.tempBasal}"
android:textColor="@android:color/white"
android:textSize="16sp" />

</LinearLayout>
Expand Down Expand Up @@ -436,7 +428,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchRemainingInsulin}"
android:textColor="@android:color/white"
android:textSize="16sp" />

</LinearLayout>
Expand Down Expand Up @@ -484,7 +475,6 @@
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@{viewmodel.patchConfig.insulinInjectionAmountStr}"
android:textColor="@android:color/white"
android:textSize="16sp" />

</LinearLayout>
Expand Down
5 changes: 0 additions & 5 deletions pump/eopatch/src/main/res/values/colors.xml
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions pump/equil/src/main/java/app/aaps/pump/equil/EquilFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package app.aaps.pump.equil

import android.annotation.SuppressLint
import android.content.Intent
import android.graphics.Color
import android.os.Bundle
import android.os.Handler
import android.os.HandlerThread
Expand Down Expand Up @@ -143,7 +142,7 @@ class EquilFragment : DaggerFragment() {

binding.timeDevice.text = dateUtil.dateAndTimeAndSecondsString(equilManager.lastDataTime)
val runMode = equilManager.runMode
binding.mode.setTextColor(Color.WHITE)
binding.mode.setTextColor(rh.gac(app.aaps.core.ui.R.attr.defaultTextColor))
if (equilManager.isActivationCompleted) {
when (runMode) {
RunMode.RUN -> {
Expand Down Expand Up @@ -174,7 +173,7 @@ class EquilFragment : DaggerFragment() {
binding.btnResumeDelivery.visibility = View.GONE
binding.btnSuspendDelivery.visibility = View.GONE
binding.mode.text = rh.gs(R.string.equil_init_insulin_error)
binding.mode.setTextColor(Color.RED)
binding.mode.setTextColor(rh.gac(app.aaps.core.ui.R.attr.warningColor))
}

binding.serialNumber.text = devName
Expand Down
10 changes: 0 additions & 10 deletions pump/equil/src/main/res/layout/equil_fra.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />

<ProgressBar
Expand Down Expand Up @@ -75,7 +74,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />
</TableRow>

Expand All @@ -102,7 +100,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />

<FrameLayout
Expand Down Expand Up @@ -146,7 +143,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />

<FrameLayout
Expand Down Expand Up @@ -193,7 +189,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />
</TableRow>

Expand All @@ -216,7 +211,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />
</TableRow>

Expand All @@ -239,7 +233,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />
</TableRow>

Expand All @@ -263,7 +256,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />
</TableRow>

Expand All @@ -286,7 +278,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />
</TableRow>

Expand All @@ -309,7 +300,6 @@
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="14sp" />
</TableRow>

Expand Down
Loading