Merge pull request #6047 from chagai95/add-presence-indicator-busy-an…

…d-away add presence indicator busy and away
element-hq · May 16, 2022 · 90035de · 90035de
2 parents 7051385 + c27958d
commit 90035de
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 3 deletions.
diff --git a/changelog.d/6047.feature b/changelog.d/6047.feature
@@ -0,0 +1 @@
+Add presence indicator busy and away.
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
@@ -126,6 +126,14 @@
     <color name="vctr_presence_indicator_online_light">@color/palette_element_green</color>
     <color name="vctr_presence_indicator_online_dark">@color/palette_element_green</color>
 
+    <attr name="vctr_presence_indicator_busy" format="color" />
+    <color name="vctr_presence_indicator_busy_light">@color/element_alert_light</color>
+    <color name="vctr_presence_indicator_busy_dark">@color/element_alert_dark</color>
+
+    <attr name="vctr_presence_indicator_away" format="color" />
+    <color name="vctr_presence_indicator_away_light">@color/palette_element_orange</color>
+    <color name="vctr_presence_indicator_away_dark">@color/palette_element_orange</color>
+
     <!-- Location sharing colors -->
     <attr name="vctr_live_location" format="color" />
     <color name="vctr_live_location_light">@color/palette_prune</color>

diff --git a/library/ui-styles/src/main/res/values/palette.xml b/library/ui-styles/src/main/res/values/palette.xml
@@ -17,6 +17,7 @@
     <color name="palette_melon">#FF812D</color>
 
     <color name="palette_element_green">#0DBD8B</color>
+    <color name="palette_element_orange">#D9B072</color>
     <color name="palette_white">#FFFFFF</color>
     <color name="palette_vermilion">#FF5B55</color>
     <!-- (unused) -->

diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -44,6 +44,8 @@
         <!-- 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>
+        <item name="vctr_presence_indicator_busy">@color/vctr_presence_indicator_busy_dark</item>
+        <item name="vctr_presence_indicator_away">@color/vctr_presence_indicator_away_dark</item>
 
         <!-- Some aliases -->
         <item name="vctr_header_background">?vctr_system</item>

diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -44,6 +44,8 @@
         <!-- 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>
+        <item name="vctr_presence_indicator_busy">@color/vctr_presence_indicator_busy_light</item>
+        <item name="vctr_presence_indicator_away">@color/vctr_presence_indicator_away_light</item>
 
         <!-- Some aliases -->
         <item name="vctr_header_background">?vctr_system</item>

diff --git a/...k-android/src/main/java/org/matrix/android/sdk/api/session/presence/model/PresenceEnum.kt b/...k-android/src/main/java/org/matrix/android/sdk/api/session/presence/model/PresenceEnum.kt
@@ -28,7 +28,10 @@ enum class PresenceEnum(val value: String) {
     OFFLINE("offline"),
 
     @Json(name = "unavailable")
-    UNAVAILABLE("unavailable");
+    UNAVAILABLE("unavailable"),
+
+    @Json(name = "org.matrix.msc3026.busy")
+    BUSY("busy");
 
     companion object {
         fun from(s: String): PresenceEnum? = values().find { it.value == s }

diff --git a/...ix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt b/...ix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt
@@ -29,13 +29,15 @@ import org.matrix.android.sdk.api.session.presence.model.PresenceEnum
 internal enum class SyncPresence(val value: String) {
     Offline("offline"),
     Online("online"),
+    Busy("busy"),
     Unavailable("unavailable");
 
     companion object {
         fun from(presenceEnum: PresenceEnum): SyncPresence {
             return when (presenceEnum) {
                 PresenceEnum.ONLINE      -> Online
                 PresenceEnum.OFFLINE     -> Offline
+                PresenceEnum.BUSY        -> Busy
                 PresenceEnum.UNAVAILABLE -> Unavailable
             }
         }

diff --git a/vector/src/main/java/im/vector/app/core/ui/views/PresenceStateImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/PresenceStateImageView.kt
@@ -42,13 +42,17 @@ class PresenceStateImageView @JvmOverloads constructor(
                 contentDescription = context.getString(R.string.a11y_presence_online)
             }
             PresenceEnum.UNAVAILABLE -> {
-                setImageResource(R.drawable.ic_presence_offline)
+                setImageResource(R.drawable.ic_presence_away)
                 contentDescription = context.getString(R.string.a11y_presence_unavailable)
             }
             PresenceEnum.OFFLINE     -> {
                 setImageResource(R.drawable.ic_presence_offline)
                 contentDescription = context.getString(R.string.a11y_presence_offline)
             }
+            PresenceEnum.BUSY     -> {
+                setImageResource(R.drawable.ic_presence_busy)
+                contentDescription = context.getString(R.string.a11y_presence_busy)
+            }
             null                     -> Unit
         }
     }

diff --git a/vector/src/main/res/drawable/ic_presence_away.xml b/vector/src/main/res/drawable/ic_presence_away.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="11.89dp"
+    android:height="12dp"
+    android:viewportWidth="11.89"
+    android:viewportHeight="12"
+    >
+
+    <group>
+
+        <clip-path
+            android:pathData="M11.8857 6C11.8857 9.31371 9.225 12 5.94286 12C2.66071 12 0 9.31371 0 6C0 2.68629 2.66071 0 5.94286 0C9.225 0 11.8857 2.68629 11.8857 6Z"
+            />
+
+        <path
+            android:pathData="M0 0V12H11.8857V0"
+            android:fillColor="?vctr_presence_indicator_away"
+            />
+
+    </group>
+
+</vector>
diff --git a/vector/src/main/res/drawable/ic_presence_busy.xml b/vector/src/main/res/drawable/ic_presence_busy.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="11.89dp"
+    android:height="12dp"
+    android:viewportWidth="11.89"
+    android:viewportHeight="12"
+    >
+
+    <group>
+
+        <clip-path
+            android:pathData="M11.8857 6C11.8857 9.31371 9.225 12 5.94286 12C2.66071 12 0 9.31371 0 6C0 2.68629 2.66071 0 5.94286 0C9.225 0 11.8857 2.68629 11.8857 6Z"
+            />
+
+        <path
+            android:pathData="M0 0V12H11.8857V0"
+            android:fillColor="?vctr_presence_indicator_busy"
+            />
+
+    </group>
+
+</vector>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
@@ -2730,7 +2730,8 @@
     <string name="a11y_public_room">Public room</string>
     <string name="a11y_presence_online">Online</string>
     <string name="a11y_presence_offline">Offline</string>
-    <string name="a11y_presence_unavailable">Unavailable</string>
+    <string name="a11y_presence_busy">Busy</string>
+    <string name="a11y_presence_unavailable">Away</string>
 
     <string name="dev_tools_menu_name">Dev Tools</string>
     <string name="dev_tools_explore_room_state">Explore Room State</string>