Skip to content

add presence indicator online #5513

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

Merged
merged 4 commits into from
Mar 15, 2022
Merged

add presence indicator online #5513

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
3ef2f82
add presence indicator online
Mar 11, 2022
04aaed7
Change log line
chagai95 Mar 11, 2022
f68d3f2
Merge branch 'vector-im:develop' into add-presence-indicator-online
chagai95 Mar 11, 2022
f8ca2fe
Update changelog.d/5513.misc
chagai95 Mar 15, 2022
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
1 change: 1 addition & 0 deletions changelog.d/5513.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added online presence indicator attribute online to match offline styling
4 changes: 4 additions & 0 deletions library/ui-styles/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@
<color name="vctr_presence_indicator_offline_light">@color/palette_gray_100</color>
<color name="vctr_presence_indicator_offline_dark">@color/palette_gray_450</color>

<attr name="vctr_presence_indicator_online" format="color" />
<color name="vctr_presence_indicator_online_light">@color/presence_online</color>
<color name="vctr_presence_indicator_online_dark">@color/presence_online</color>

<!-- Location sharing colors -->
<attr name="vctr_live_location" format="color" />
<color name="vctr_live_location_light">@color/palette_prune</color>
Expand Down
3 changes: 3 additions & 0 deletions library/ui-styles/src/main/res/values/palette_mobile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,7 @@
<color name="element_room_02">@color/palette_azure</color>
<color name="element_room_03">@color/palette_grape</color>

<!-- For presence -->
<color name="presence_online">@color/palette_element_green</color>

</resources>
1 change: 1 addition & 0 deletions library/ui-styles/src/main/res/values/theme_dark.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

<!-- Presence Indicator colors -->
<item name="vctr_presence_indicator_offline">@color/vctr_presence_indicator_offline_dark</item>
<item name="vctr_presence_indicator_online">@color/vctr_presence_indicator_online_dark</item>

<!-- Some aliases -->
<item name="vctr_header_background">?vctr_system</item>
Expand Down
1 change: 1 addition & 0 deletions library/ui-styles/src/main/res/values/theme_light.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

<!-- Presence Indicator colors -->
<item name="vctr_presence_indicator_offline">@color/vctr_presence_indicator_offline_light</item>
<item name="vctr_presence_indicator_online">@color/vctr_presence_indicator_online_light</item>

<!-- Some aliases -->
<item name="vctr_header_background">?vctr_system</item>
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/res/drawable/ic_presence_online.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<path
android:pathData="M0 0V12H11.8857V0"
android:fillColor="#0DBD8B"
android:fillColor="?vctr_presence_indicator_online"
/>

</group>
Expand Down