From fdb7e548271932be533e232ba41abdca64a8f86d Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sat, 10 Apr 2021 00:52:10 +0200
Subject: [PATCH] unify remaining preference elements

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../layout/controller_conversation_info.xml   | 19 ++++++++++++-------
 .../res/layout/notification_settings_item.xml |  1 -
 app/src/main/res/layout/webinar_info_item.xml | 12 ++++++++----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/controller_conversation_info.xml b/app/src/main/res/layout/controller_conversation_info.xml
index 741797cb2..297dd9ef4 100644
--- a/app/src/main/res/layout/controller_conversation_info.xml
+++ b/app/src/main/res/layout/controller_conversation_info.xml
@@ -23,7 +23,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:apc="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:card_view="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -56,7 +55,8 @@
                 android:animateLayoutChanges="true"
                 android:visibility="gone"
                 apc:cardBackgroundColor="@color/bg_default"
-                apc:cardElevation="0dp">
+                apc:cardElevation="0dp"
+                tools:visibility="visible">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -68,7 +68,8 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/avatar_image"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/margin_between_elements" />
+                        android:layout_marginTop="@dimen/margin_between_elements"
+                        tools:text="Jane Doe" />
 
                     <com.facebook.drawee.view.SimpleDraweeView
                         android:id="@+id/avatar_image"
@@ -87,7 +88,8 @@
                 android:layout_below="@id/conversation_info_name"
                 android:visibility="gone"
                 apc:cardBackgroundColor="@color/bg_default"
-                apc:cardElevation="0dp">
+                apc:cardElevation="0dp"
+                tools:visibility="visible">
 
                 <com.yarolegovich.mp.MaterialStandardPreference
                     android:id="@+id/favoriteConversationAction"
@@ -129,7 +131,8 @@
                 android:layout_below="@id/participants_list_category"
                 android:visibility="gone"
                 apc:cardBackgroundColor="@color/bg_default"
-                apc:cardElevation="0dp">
+                apc:cardElevation="0dp"
+                tools:visibility="visible">
 
                 <com.yarolegovich.mp.MaterialStandardPreference
                     android:id="@+id/leaveConversationAction"
@@ -154,14 +157,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/otherRoomOptions"
-                android:visibility="gone" />
+                android:visibility="gone"
+                tools:visibility="visible" />
 
             <include
                 layout="@layout/webinar_info_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/notification_settings"
-                android:visibility="gone" />
+                android:visibility="gone"
+                tools:visibility="visible" />
         </RelativeLayout>
     </ScrollView>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/notification_settings_item.xml b/app/src/main/res/layout/notification_settings_item.xml
index d43c5719a..85e4a7c3f 100644
--- a/app/src/main/res/layout/notification_settings_item.xml
+++ b/app/src/main/res/layout/notification_settings_item.xml
@@ -22,7 +22,6 @@
 
 <com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:apc="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/tools"
     android:id="@+id/notification_settings"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/webinar_info_item.xml b/app/src/main/res/layout/webinar_info_item.xml
index 6d1826988..f0ff2bdf8 100644
--- a/app/src/main/res/layout/webinar_info_item.xml
+++ b/app/src/main/res/layout/webinar_info_item.xml
@@ -2,6 +2,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -20,18 +22,19 @@
 
 <com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:apc="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/webinar_settings"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-
     <com.yarolegovich.mp.MaterialPreferenceCategory
         android:id="@+id/conversation_info_webinar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
-        apc:mpc_title="@string/nc_webinar"
-        apc:mpc_title_color="@color/colorPrimary">
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp"
+        apc:mpc_title="@string/nc_webinar">
 
         <com.yarolegovich.mp.MaterialSwitchPreference
             android:id="@+id/conversation_info_lobby"
@@ -51,7 +54,8 @@
             apc:mp_icon="@drawable/ic_timer_black_24dp"
             apc:mp_icon_tint="@color/grey_600"
             apc:mp_summary="@string/nc_manual"
-            apc:mp_title="@string/nc_start_time" />
+            apc:mp_title="@string/nc_start_time"
+            tools:visibility="visible" />
 
     </com.yarolegovich.mp.MaterialPreferenceCategory>