gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

quick conversation info bug fix

Browse Source 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
This commit is contained in:
Julius Linus 2023-06-29 08:33:28 -05:00 committed by Marcel Hibbe
parent fa5e0fb01d
commit bfbf46df77
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
View File

@ -173,7 +173,7 @@ class ConversationInfoActivity :
if (CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "rich-object-list-media")) { if (CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "rich-object-list-media")) {
binding.sharedItemsButton.setOnClickListener { showSharedItems() } binding.sharedItemsButton.setOnClickListener { showSharedItems() }
} else { } else {
binding.categorySharedItems.visibility = GONE binding.sharedItems.visibility = GONE
} }
fetchRoomInfo() fetchRoomInfo()
@ -257,8 +257,8 @@ class ConversationInfoActivity :
binding.notificationSettingsView.notificationSettingsCategory, binding.notificationSettingsView.notificationSettingsCategory,
binding.webinarInfoView.webinarSettingsCategory, binding.webinarInfoView.webinarSettingsCategory,
binding.guestAccessView.guestAccessSettingsCategory, binding.guestAccessView.guestAccessSettingsCategory,
binding.categorySharedItems, binding.sharedItemsTitle,
binding.conversationSettings, binding.conversationSettingsTitle,
binding.participantsListCategory binding.participantsListCategory
) )
}.forEach(viewThemeUtils.platform::colorTextView) }.forEach(viewThemeUtils.platform::colorTextView)

7
app/src/main/res/layout/activity_conversation_info.xml
View File

@ -25,7 +25,6 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:apc="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/parent_container" android:id="@+id/parent_container"
@ -188,6 +187,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/shared_items"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_quarter_margin" android:layout_marginTop="@dimen/standard_quarter_margin"
@ -195,7 +195,7 @@
> >
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/category_shared_items" android:id="@+id/shared_items_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/nc_shared_items" android:text="@string/nc_shared_items"
@ -231,6 +231,7 @@
<LinearLayout <LinearLayout
android:id="@+id/conversation_settings"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_quarter_margin" android:layout_marginTop="@dimen/standard_quarter_margin"
@ -238,7 +239,7 @@
> >
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/conversation_settings" android:id="@+id/conversation_settings_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/nc_conversation_settings" android:text="@string/nc_conversation_settings"