diff --git a/app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoActivity.kt index 2ac362536..6106b0a61 100644 --- a/app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoActivity.kt @@ -205,6 +205,13 @@ class ConversationInfoActivity : binding.avatarCamera.setOnClickListener { pickImage.takePicture() } binding.avatarDelete.setOnClickListener { deleteAvatar() } binding.avatarImage.let { ViewCompat.setTransitionName(it, "userAvatar.transitionTag") } + + binding.let { + viewThemeUtils.material.themeFAB(it.avatarUpload) + viewThemeUtils.material.themeFAB(it.avatarChoose) + viewThemeUtils.material.themeFAB(it.avatarCamera) + viewThemeUtils.material.themeFAB(it.avatarDelete) + } } private fun setupActionBar() { diff --git a/app/src/main/res/layout/activity_conversation_info.xml b/app/src/main/res/layout/activity_conversation_info.xml index 159d9668a..5045889b7 100644 --- a/app/src/main/res/layout/activity_conversation_info.xml +++ b/app/src/main/res/layout/activity_conversation_info.xml @@ -61,7 +61,8 @@ android:layout_marginRight="@dimen/activity_horizontal_margin" android:indeterminate="true" android:indeterminateTint="@color/textColorMaxContrast" - android:indeterminateTintMode="src_in" /> + android:indeterminateTintMode="src_in" + tools:visibility="gone"/> <ScrollView android:layout_width="match_parent" @@ -100,7 +101,7 @@ android:layout_width="@dimen/avatar_size_big" android:layout_height="@dimen/avatar_size_big" android:layout_centerHorizontal="true" - tools:background="@color/hwSecurityRed" + tools:src="@drawable/account_circle_48dp" android:contentDescription="@string/avatar" /> </RelativeLayout> @@ -111,6 +112,7 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="horizontal" + android:layout_marginTop="@dimen/standard_margin" android:visibility="invisible" tools:visibility="visible">