gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

unify remaining preference elements

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-04-10 00:52:10 +02:00
parent 7d14494115
commit fdb7e54827
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/res/layout/controller_conversation_info.xml
View File

@ -23,7 +23,6 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:apc="http://schemas.android.com/apk/res-auto" xmlns:apc="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:card_view="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
@ -56,7 +55,8 @@
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:visibility="gone" android:visibility="gone"
apc:cardBackgroundColor="@color/bg_default" apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp"> apc:cardElevation="0dp"
tools:visibility="visible">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -68,7 +68,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/avatar_image" android:layout_below="@id/avatar_image"
android:layout_centerHorizontal="true" 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 <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/avatar_image" android:id="@+id/avatar_image"
@ -87,7 +88,8 @@
android:layout_below="@id/conversation_info_name" android:layout_below="@id/conversation_info_name"
android:visibility="gone" android:visibility="gone"
apc:cardBackgroundColor="@color/bg_default" apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp"> apc:cardElevation="0dp"
tools:visibility="visible">
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/favoriteConversationAction" android:id="@+id/favoriteConversationAction"
@ -129,7 +131,8 @@
android:layout_below="@id/participants_list_category" android:layout_below="@id/participants_list_category"
android:visibility="gone" android:visibility="gone"
apc:cardBackgroundColor="@color/bg_default" apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp"> apc:cardElevation="0dp"
tools:visibility="visible">
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/leaveConversationAction" android:id="@+id/leaveConversationAction"
@ -154,14 +157,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/otherRoomOptions" android:layout_below="@id/otherRoomOptions"
android:visibility="gone" /> android:visibility="gone"
tools:visibility="visible" />
<include <include
layout="@layout/webinar_info_item" layout="@layout/webinar_info_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/notification_settings" android:layout_below="@id/notification_settings"
android:visibility="gone" /> android:visibility="gone"
tools:visibility="visible" />
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/layout/notification_settings_item.xml
View File

@ -22,7 +22,6 @@
<com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:apc="http://schemas.android.com/apk/res-auto" xmlns:apc="http://schemas.android.com/apk/res-auto"
xmlns:card_view="http://schemas.android.com/tools"
android:id="@+id/notification_settings" android:id="@+id/notification_settings"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">

12
app/src/main/res/layout/webinar_info_item.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ 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" <com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:apc="http://schemas.android.com/apk/res-auto" xmlns:apc="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/webinar_settings" android:id="@+id/webinar_settings"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<com.yarolegovich.mp.MaterialPreferenceCategory <com.yarolegovich.mp.MaterialPreferenceCategory
android:id="@+id/conversation_info_webinar" android:id="@+id/conversation_info_webinar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_webinar" apc:cardBackgroundColor="@color/bg_default"
apc:mpc_title_color="@color/colorPrimary"> apc:cardElevation="0dp"
apc:mpc_title="@string/nc_webinar">
<com.yarolegovich.mp.MaterialSwitchPreference <com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/conversation_info_lobby" android:id="@+id/conversation_info_lobby"
@ -51,7 +54,8 @@
apc:mp_icon="@drawable/ic_timer_black_24dp" apc:mp_icon="@drawable/ic_timer_black_24dp"
apc:mp_icon_tint="@color/grey_600" apc:mp_icon_tint="@color/grey_600"
apc:mp_summary="@string/nc_manual" 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> </com.yarolegovich.mp.MaterialPreferenceCategory>