Skip to content

Fix dark mode styling regressions #6354

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

Draft
SeniorZhai wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix dark mode styling regressions #6354

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/one/mixin/android/ui/address/component/DestinationMenu.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ fun DestinationMenu(
modifier = Modifier.padding(8.dp),
painter = painterResource(icon),
contentDescription = null,
tint = MixinAppTheme.colors.icon
tint = MixinAppTheme.colors.iconGray
)
Spacer(modifier = Modifier.width(16.dp))
Column {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/one/mixin/android/ui/sticker/AlbumAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.room.Relation
import one.mixin.android.R
import one.mixin.android.databinding.ItemAlbumBinding
import one.mixin.android.databinding.ItemStickerBinding
import one.mixin.android.extension.colorFromAttribute
import one.mixin.android.extension.dp
import one.mixin.android.extension.loadSticker
import one.mixin.android.extension.textColor
Expand Down Expand Up @@ -145,7 +146,7 @@ fun TextView.updateAlbumAdd(
) {
if (added) {
text = ctx.getString(R.string.Added)
textColor = ctx.getColor(R.color.colorAccent)
textColor = ctx.colorFromAttribute(R.attr.color_accent)
setBackgroundResource(R.drawable.bg_round_gray_btn)
isEnabled = false
setOnClickListener(null)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/bg_circle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="50dp" android:height="50dp" android:viewportWidth="50" android:viewportHeight="50">
<path android:pathData="M25 50c13.807 0 25-11.193 25-25S38.807 0 25 0 0 11.193 0 25s11.193 25 25 25z" android:fillColor="#F5F7FA"/>
<path android:pathData="M25 50c13.807 0 25-11.193 25-25S38.807 0 25 0 0 11.193 0 25s11.193 25 25 25z" android:fillColor="?attr/bg_gray_light"/>
<path android:fillAlpha="0.01" android:fillColor="#D8D8D8" android:pathData="M13 13h24v24H13z"/>
</vector>
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/bg_round_gray_btn.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<selector>
<item android:state_enabled="true">
<shape android:shape="rectangle">
<solid android:color="@color/bg_button_gray" />
<solid android:color="?attr/bg_gray_light" />
<corners android:radius="30dp" />
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="#E3E4E5" />
<solid android:color="?attr/bg_menu_border" />
<corners android:radius="30dp" />
</shape>
</item>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/ic_group_select_close.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="20" android:viewportHeight="20">
<path android:pathData="M1 10a9 9 0 1 1 18 0 9 9 0 1 1-18 0" android:strokeWidth="2" android:fillColor="#BBBEC3" android:strokeColor="?attr/bg_white" android:fillType="evenOdd"/>
<path android:pathData="M6.465 6.493c0.39-0.39 1.023-0.39 1.414 0l2.12 2.12 2.122-2.12c0.39-0.39 1.024-0.39 1.415 0 0.39 0.39 0.39 1.024 0 1.414l-2.122 2.121 2.122 2.122c0.36 0.36 0.388 0.928 0.083 1.32l-0.083 0.094c-0.391 0.39-1.024 0.39-1.415 0L10 11.442l-2.121 2.122c-0.39 0.39-1.024 0.39-1.414 0-0.391-0.39-0.391-1.024 0-1.414l2.12-2.122-2.12-2.12c-0.361-0.362-0.39-0.93-0.085-1.321z" android:strokeWidth="1" android:fillColor="?attr/bg_white" android:fillType="evenOdd"/>
<path android:pathData="M1 10a9 9 0 1 1 18 0 9 9 0 1 1-18 0" android:strokeWidth="2" android:fillColor="?attr/icon_gray" android:strokeColor="?attr/bg_white" android:fillType="evenOdd"/>
<path android:pathData="M6.465 6.493c0.39-0.39 1.023-0.39 1.414 0l2.12 2.12 2.122-2.12c0.39-0.39 1.024-0.39 1.415 0 0.39 0.39 0.39 1.024 0 1.414l-2.122 2.121 2.122 2.122c0.36 0.36 0.388 0.928 0.083 1.32l-0.083 0.094c-0.391 0.39-1.024 0.39-1.415 0L10 11.442l-2.121 2.122c-0.39 0.39-1.024 0.39-1.414 0-0.391-0.39-0.391-1.024 0-1.414l2.12-2.122-2.12-2.12c-0.361-0.362-0.39-0.93-0.085-1.321z" android:strokeWidth="1" android:fillColor="@color/white" android:fillType="evenOdd"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_not_selected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
<path android:pathData="M0 8a8 8 0 1 1 16 0A8 8 0 1 1 0 8" android:strokeWidth="1" android:fillColor="#E5E8EE" android:fillType="evenOdd"/>
<path android:pathData="M0 8a8 8 0 1 1 16 0A8 8 0 1 1 0 8" android:strokeWidth="1" android:fillColor="?attr/bg_menu_border" android:fillType="evenOdd"/>
<path android:pathData="M11.364 6l-4.243 4.243-2.12-2.122" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeColor="#FFFFFF" android:fillType="evenOdd" android:strokeLineCap="round"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_selected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
<path android:pathData="M1.5 8a6.5 6.5 0 1 1 13 0 6.5 6.5 0 1 1-13 0" android:strokeWidth="3" android:fillColor="#4B7CDD" android:strokeColor="#4B7CDD" android:fillType="evenOdd"/>
<path android:pathData="M1.5 8a6.5 6.5 0 1 1 13 0 6.5 6.5 0 1 1-13 0" android:strokeWidth="3" android:fillColor="?attr/color_accent" android:strokeColor="?attr/color_accent" android:fillType="evenOdd"/>
<path android:pathData="M11.364 6.207L7.121 10.45l-2.12-2.122" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeColor="#FFFFFF" android:fillType="evenOdd" android:strokeLineCap="round"/>
</vector>
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/selector_radio.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<stroke android:color="@color/color_gray" android:width="1dp" />
<stroke android:color="?attr/bg_menu_border" android:width="1dp" />
<padding android:left="12dp" android:right="12dp" android:top="9dp" android:bottom="9dp" />
</shape>
</item>
Expand All @@ -16,11 +16,11 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<stroke android:color="@color/colorAccent" android:width="1dp" />
<stroke android:color="?attr/color_accent" android:width="1dp" />
<solid android:color="?attr/bg_clip" />
<padding android:left="12dp" android:right="12dp" android:top="9dp" android:bottom="9dp" />
</shape>
</item>
</ripple>
</item>
</selector>
</selector>
6 changes: 3 additions & 3 deletions app/src/main/res/drawable/selector_radio_badge.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<item android:state_enabled="true">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<stroke android:width="1dp" android:color="@color/color_gray" />
<stroke android:width="1dp" android:color="?attr/bg_menu_border" />
<padding android:bottom="9dp" android:left="12dp" android:right="12dp" android:top="9dp" />
</shape>
</item>
Expand All @@ -23,7 +23,7 @@
<item android:state_enabled="true">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<stroke android:width="1dp" android:color="@color/colorAccent" />
<stroke android:width="1dp" android:color="?attr/color_accent" />
<solid android:color="?attr/bg_clip" />
<padding android:bottom="9dp" android:left="12dp" android:right="12dp" android:top="9dp" />
</shape>
Expand All @@ -37,4 +37,4 @@
</item>
</layer-list>
</item>
</selector>
</selector>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/view_swap_alert.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
android:layout_width="2dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:background="#0D000000" />
android:background="?attr/bg_divider" />

<ViewAnimator
android:id="@+id/alert_va"
Expand All @@ -47,4 +47,4 @@
android:layout_gravity="center" />
</ViewAnimator>

</merge>
</merge>
Loading