modify StatusDrawable and use it for conversationList

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

5 files changed, 24 insertions, 20 deletions

diff --git a/app/src/main/res/drawable/online_status.xml b/app/src/main/res/drawable/online_status.xml
index fb042c2d3..694071933 100644
--- a/app/src/main/res/drawable/online_status.xml
+++ b/app/src/main/res/drawable/online_status.xml
@@ -17,7 +17,16 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#00ff00" />
-</shape>
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="VectorRaster">
+    <path
+        android:fillColor="#00ff00"
+        android:pathData="m12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10 10,-4.48 10,-10 -4.48,-10 -10,-10z" />
+</vector>
+
diff --git a/app/src/main/res/layout/current_account_item.xml b/app/src/main/res/layout/current_account_item.xml
index 5e6ab4d57..680fb3a36 100644
--- a/app/src/main/res/layout/current_account_item.xml
+++ b/app/src/main/res/layout/current_account_item.xml
@@ -107,6 +107,7 @@
                 android:maxLines="1"
                 android:textColor="?android:attr/textColorSecondary"
                 android:visibility="gone"
+                tools:visibility="visible"
                 tools:text="☁️ My custom status" />
 
             <TextView
diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index 4f16aef4d..72da05b5d 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -55,24 +55,12 @@
             app:tint="@color/favorite_icon_tint"
             app:tintMode="src_in" />
 
-        <com.vanniktech.emoji.EmojiEditText
-            android:id="@+id/userStatusEmoji"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:background="@color/transparent"
-            android:cursorVisible="false"
-            android:gravity="center"
-            android:text="@string/default_emoji"
-            android:textSize="16sp" />
-
         <ImageView
-            android:id="@+id/userStatusOnlineState"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
+            android:id="@+id/user_status_image"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:layout_gravity="bottom|end"
-            android:contentDescription="@null"
-            android:src="@drawable/online_status"/>
+            android:contentDescription="@string/nc_account_chooser_active_user" />
     </FrameLayout>
 
     <RelativeLayout
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 6d8a27370..2e630736f 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -68,4 +68,6 @@
 
     <color name="list_divider_background">#222222</color>
     <color name="grey_200">#818181</color>
+
+    <color name="dialog_background">#353535</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6e29db17a..0289c8679 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -100,4 +100,8 @@
     <color name="list_divider_background">#eeeeee</color>
     <color name="grey_200">#EEEEEE</color>
 
+    <!-- this is just a helper for status icon background because getting the background color of a dialog is not
+    possible?! don't use this to set the background of dialogs -->
+    <color name="dialog_background">#FFFFFF</color>
+
 </resources>