Skip to content

Commit 07a3d9f

Browse files
committed
fix: set gray color for all disabled checkmarks
1 parent 0fe079d commit 07a3d9f

9 files changed

Lines changed: 22 additions & 26 deletions

File tree

app/src/main/java/to/bitkit/appwidget/config/BlocksConfigContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ private fun BlockToggleRow(
198198
Icon(
199199
painter = painterResource(R.drawable.ic_checkmark),
200200
contentDescription = null,
201-
tint = if (isEnabled) Colors.Brand else Colors.White50,
201+
tint = if (isEnabled) Colors.Brand else Colors.Gray3,
202202
modifier = Modifier.size(32.dp)
203203
)
204204
}

app/src/main/java/to/bitkit/appwidget/config/HeadlinesConfigContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private fun ToggleRow(
154154
Icon(
155155
painter = painterResource(R.drawable.ic_checkmark),
156156
contentDescription = null,
157-
tint = if (isEnabled) Colors.Brand else Colors.White50,
157+
tint = if (isEnabled) Colors.Brand else Colors.Gray3,
158158
modifier = Modifier.size(32.dp)
159159
)
160160
}

app/src/main/java/to/bitkit/appwidget/config/PriceConfigContent.kt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,12 @@ private fun SelectableRow(
136136
color = if (isSelected) Colors.White else Colors.White64,
137137
modifier = Modifier.weight(1f)
138138
)
139-
if (isSelected) {
140-
Icon(
141-
painter = painterResource(R.drawable.ic_checkmark),
142-
contentDescription = null,
143-
tint = Colors.Brand,
144-
modifier = Modifier.size(32.dp)
145-
)
146-
}
139+
Icon(
140+
painter = painterResource(R.drawable.ic_checkmark),
141+
contentDescription = null,
142+
tint = if (isSelected) Colors.Brand else Colors.Gray3,
143+
modifier = Modifier.size(32.dp)
144+
)
147145
}
148146
HorizontalDivider()
149147
}

app/src/main/java/to/bitkit/appwidget/config/WeatherConfigContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private fun WeatherOptionRow(
147147
Icon(
148148
painter = painterResource(R.drawable.ic_checkmark),
149149
contentDescription = null,
150-
tint = if (isSelected) Colors.Brand else Colors.White50,
150+
tint = if (isSelected) Colors.Brand else Colors.Gray3,
151151
modifier = Modifier.size(32.dp)
152152
)
153153
}

app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private fun BlockEditOptionRow(
258258
Icon(
259259
painter = painterResource(R.drawable.ic_checkmark),
260260
contentDescription = null,
261-
tint = if (isEnabled) Colors.Brand else Colors.White50,
261+
tint = if (isEnabled) Colors.Brand else Colors.Gray3,
262262
modifier = Modifier
263263
.size(32.dp)
264264
.testTag("${testTagPrefix}_toggle_icon")

app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesEditScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ fun HeadlinesEditContent(
157157
Icon(
158158
painter = painterResource(R.drawable.ic_checkmark),
159159
contentDescription = null,
160-
tint = if (headlinePreferences.showSource) Colors.Brand else Colors.White50,
160+
tint = if (headlinePreferences.showSource) Colors.Brand else Colors.Gray3,
161161
modifier = Modifier
162162
.size(32.dp)
163163
.testTag("source_toggle_icon")
@@ -192,7 +192,7 @@ fun HeadlinesEditContent(
192192
Icon(
193193
painter = painterResource(R.drawable.ic_checkmark),
194194
contentDescription = null,
195-
tint = if (headlinePreferences.showTime) Colors.Brand else Colors.White50,
195+
tint = if (headlinePreferences.showTime) Colors.Brand else Colors.Gray3,
196196
modifier = Modifier
197197
.size(32.dp)
198198
.testTag("time_toggle_icon")

app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceEditScreen.kt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -199,16 +199,14 @@ private fun SelectableRow(
199199
.weight(1f)
200200
.testTag("${testTagPrefix}_label")
201201
)
202-
if (isSelected) {
203-
Icon(
204-
painter = painterResource(R.drawable.ic_checkmark),
205-
contentDescription = null,
206-
tint = Colors.Brand,
207-
modifier = Modifier
208-
.size(32.dp)
209-
.testTag("${testTagPrefix}_toggle_icon")
210-
)
211-
}
202+
Icon(
203+
painter = painterResource(R.drawable.ic_checkmark),
204+
contentDescription = null,
205+
tint = if (isSelected) Colors.Brand else Colors.Gray3,
206+
modifier = Modifier
207+
.size(32.dp)
208+
.testTag("${testTagPrefix}_toggle_icon")
209+
)
212210
}
213211

214212
HorizontalDivider(

app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherEditScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ private fun WeatherEditOptionRow(
212212
Icon(
213213
painter = painterResource(R.drawable.ic_checkmark),
214214
contentDescription = null,
215-
tint = if (isSelected) Colors.Brand else Colors.White50,
215+
tint = if (isSelected) Colors.Brand else Colors.Gray3,
216216
modifier = Modifier
217217
.size(32.dp)
218218
.testTag("${testTagPrefix}_toggle_icon")

changelog.d/next/935.fixed.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Fix an intermittent crash that could occur when removing or cancelling a Bitcoin home screen widget.
1+
Fix several OS widget issues including an intermittent crash when removing or cancelling a home screen widget, ordering of widget options, and the color of disabled checkboxes in widget configuration screens.

0 commit comments

Comments
 (0)