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

FE-717 Update some colors #88

Merged
merged 1 commit into from
Mar 27, 2024
Merged

FE-717 Update some colors #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/weatherxm/ui/components/DailyRewardsCardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ open class DailyRewardsCardView : LinearLayout, KoinComponent {
backgroundColor = R.color.warningTint
}
SeverityLevel.INFO -> {
strokeColor = R.color.light_lightest_blue
strokeColor = R.color.infoStrokeColor
backgroundColor = R.color.blueTint
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/weatherxm/ui/rewarddetails/RewardDetailsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ class RewardDetailsActivity : BaseActivity(), RewardBoostListener {
val backgroundColor: Int
when (issue.severityLevel) {
SeverityLevel.INFO -> {
strokeColor = R.color.light_lightest_blue
strokeColor = R.color.infoStrokeColor
backgroundColor = R.color.blueTint
}
SeverityLevel.WARNING -> {
Expand All @@ -318,7 +318,7 @@ class RewardDetailsActivity : BaseActivity(), RewardBoostListener {
backgroundColor = R.color.errorTint
}
else -> {
strokeColor = R.color.light_lightest_blue
strokeColor = R.color.infoStrokeColor
backgroundColor = R.color.blueTint
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/weatherxm/ui/rewardissues/RewardIssuesAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class RewardIssuesAdapter(
when (item.severityLevel) {
SeverityLevel.INFO -> {
setBackground(R.color.blueTint)
setStrokeColor(R.color.light_lightest_blue)
setStrokeColor(R.color.infoStrokeColor)
}
SeverityLevel.WARNING -> {
setBackground(R.color.warningTint)
Expand All @@ -52,7 +52,7 @@ class RewardIssuesAdapter(
}
else -> {
setBackground(R.color.blueTint)
setStrokeColor(R.color.light_lightest_blue)
setStrokeColor(R.color.infoStrokeColor)
}
}
title(item.title)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
app:message_icon="@drawable/ic_survey"
app:message_icon_color="@color/colorPrimaryVariant"
app:message_includes_close_button="true"
app:message_stroke_color="@color/colorPrimaryVariant"
app:message_stroke_color="@color/infoStrokeColor"
app:message_title="@string/short_app_survey"
tools:visibility="visible" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/view_ble_action_flow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
app:message_icon="@drawable/ic_info"
app:message_icon_color="@color/colorPrimaryVariant"
app:message_includes_close_button="false"
app:message_stroke_color="@color/colorPrimaryVariant"
app:message_stroke_color="@color/infoStrokeColor"
tools:visibility="visible" />

<!-- Buttons -->
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-night/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<color name="fadeTop">@color/fade_dark_top</color>
<color name="messageDialogBackground">@color/dark_top</color>
<color name="messageDialogButton">@color/dark_layer1</color>
<color name="infoStrokeColor">@color/dark_primary</color>

<!-- System and Launcher -->
<color name="ic_launcher_background">#1B75BA</color>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<color name="fadeTop">@color/fade_light_top</color>
<color name="messageDialogBackground">@color/layer1</color>
<color name="messageDialogButton">@color/light_translucent</color>
<color name="infoStrokeColor">@color/light_lightest_blue</color>

<!-- System and Launcher -->
<color name="ic_launcher_background">@color/colorPrimary</color>
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/values/palette.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<color name="dark_layer2">#23252F</color>
<color name="dark_background">#1B1C22</color>
<color name="dark_darkest_blue">#DCE1FF</color>
<color name="dark_primary">#B5C4FF</color>
<color name="dark_primary">#B8C6FF</color>
<color name="dark_lightest_blue">#00297B</color>
<color name="dark_blue_tint">#1E2438</color>
<color name="dark_accent">#CD9EFC</color>
Expand All @@ -45,11 +45,11 @@
<color name="light_success_tint">#D8F8EA</color>
<color name="dark_success_tint">#17392C</color>
<color name="error">#FF1744</color>
<color name="light_error_tint">#FED9E3</color>
<color name="dark_error_tint">#3D1A25</color>
<color name="light_error_tint">#FADCE3</color>
<color name="dark_error_tint">#4B2F36</color>
<color name="warning">#FFAB49</color>
<color name="light_warning_tint">#FEEFE4</color>
<color name="dark_warning_tint">#3D3125</color>
<color name="light_warning_tint">#FBDEBC</color>
<color name="dark_warning_tint">#46381B</color>

<!-- Fade -->
<color name="fade_light_top">#00FEFBFF</color>
Expand Down
Loading