From c7ac8a30742ec4720d82f49f67691f61e66a54b1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 13 May 2022 12:42:44 +0200 Subject: [PATCH] make bottom_sheets initial state collapsed for the rounded top corners Resolves #2035 Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/ui/dialog/AttachmentDialog.kt | 2 +- .../com/nextcloud/talk/ui/dialog/AudioOutputDialog.kt | 2 +- .../nextcloud/talk/ui/dialog/ContactsBottomDialog.kt | 4 ++-- .../talk/ui/dialog/ConversationsListBottomDialog.kt | 4 ++-- .../nextcloud/talk/ui/dialog/MessageActionsDialog.kt | 4 ++-- .../java/com/nextcloud/talk/ui/dialog/ScopeDialog.kt | 5 ++--- .../nextcloud/talk/ui/dialog/ShowReactionsDialog.kt | 9 +++++++++ app/src/main/res/values/styles.xml | 11 +++++++---- 8 files changed, 26 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt index 7e07dac79..77c5acbfb 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt @@ -90,6 +90,6 @@ class AttachmentDialog(val activity: Activity, var chatController: ChatControlle super.onStart() val bottomSheet = findViewById(R.id.design_bottom_sheet) val behavior = BottomSheetBehavior.from(bottomSheet as View) - behavior.state = BottomSheetBehavior.STATE_EXPANDED + behavior.state = BottomSheetBehavior.STATE_COLLAPSED } } diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/AudioOutputDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/AudioOutputDialog.kt index be3976b9c..2876745eb 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/AudioOutputDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/AudioOutputDialog.kt @@ -158,7 +158,7 @@ class AudioOutputDialog(val callActivity: CallActivity) : BottomSheetDialog(call super.onStart() val bottomSheet = findViewById(R.id.design_bottom_sheet) val behavior = BottomSheetBehavior.from(bottomSheet as View) - behavior.state = BottomSheetBehavior.STATE_EXPANDED + behavior.state = BottomSheetBehavior.STATE_COLLAPSED } companion object { diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ContactsBottomDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ContactsBottomDialog.kt index 7ceb934e6..d1decfc0d 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ContactsBottomDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ContactsBottomDialog.kt @@ -40,7 +40,7 @@ import com.nextcloud.talk.databinding.DialogBottomContactsBinding class ContactsBottomDialog( val activity: Activity, val bundle: Bundle -) : BottomSheetDialog(activity, R.style.BottomSheetDialogThemeNoFloating) { +) : BottomSheetDialog(activity) { private var dialogRouter: Router? = null @@ -73,7 +73,7 @@ class ContactsBottomDialog( super.onStart() val bottomSheet = findViewById(R.id.design_bottom_sheet) val behavior = BottomSheetBehavior.from(bottomSheet as View) - behavior.state = BottomSheetBehavior.STATE_EXPANDED + behavior.state = BottomSheetBehavior.STATE_COLLAPSED } companion object { diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt index a07937228..5dc5a04d3 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt @@ -72,7 +72,7 @@ class ConversationsListBottomDialog( val controller: ConversationsListController, val currentUser: UserEntity, val conversation: Conversation -) : BottomSheetDialog(activity, R.style.BottomSheetDialogThemeNoFloating) { +) : BottomSheetDialog(activity) { private var dialogRouter: Router? = null @@ -309,7 +309,7 @@ class ConversationsListBottomDialog( super.onStart() val bottomSheet = findViewById(R.id.design_bottom_sheet) val behavior = BottomSheetBehavior.from(bottomSheet as View) - behavior.state = BottomSheetBehavior.STATE_EXPANDED + behavior.state = BottomSheetBehavior.STATE_COLLAPSED } companion object { diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt index 9df44ccb8..31bdacf75 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt @@ -60,7 +60,7 @@ class MessageActionsDialog( private val showMessageDeletionButton: Boolean, private val hasChatPermission: Boolean, private val ncApi: NcApi -) : BottomSheetDialog(chatController.activity!!, R.style.BottomSheetDialogThemeNoFloating) { +) : BottomSheetDialog(chatController.activity!!) { private lateinit var dialogMessageActionsBinding: DialogMessageActionsBinding @@ -97,7 +97,7 @@ class MessageActionsDialog( super.onStart() val bottomSheet = findViewById(R.id.design_bottom_sheet) val behavior = BottomSheetBehavior.from(bottomSheet as View) - behavior.state = BottomSheetBehavior.STATE_EXPANDED + behavior.state = BottomSheetBehavior.STATE_COLLAPSED } private fun hasUserId(user: UserEntity?): Boolean { diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ScopeDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ScopeDialog.kt index ffebc49d3..4a18828df 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ScopeDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ScopeDialog.kt @@ -38,8 +38,7 @@ class ScopeDialog( private val userInfoAdapter: ProfileController.UserInfoAdapter, private val field: ProfileController.Field, private val position: Int -) : - BottomSheetDialog(con) { +) : BottomSheetDialog(con) { private lateinit var dialogScopeBinding: DialogScopeBinding @@ -79,6 +78,6 @@ class ScopeDialog( super.onStart() val bottomSheet = findViewById(R.id.design_bottom_sheet) val behavior = BottomSheetBehavior.from(bottomSheet as View) - behavior.state = BottomSheetBehavior.STATE_EXPANDED + behavior.state = BottomSheetBehavior.STATE_COLLAPSED } } diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt index d28fb9220..50c443dd3 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt @@ -29,10 +29,12 @@ package com.nextcloud.talk.ui.dialog import android.app.Activity import android.os.Bundle import android.util.Log +import android.view.View import android.view.ViewGroup import androidx.annotation.NonNull import androidx.recyclerview.widget.LinearLayoutManager import autodagger.AutoInjector +import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout.OnTabSelectedListener @@ -84,6 +86,13 @@ class ShowReactionsDialog( initEmojiReactions() } + override fun onStart() { + super.onStart() + val bottomSheet = findViewById(R.id.design_bottom_sheet) + val behavior = BottomSheetBehavior.from(bottomSheet as View) + behavior.state = BottomSheetBehavior.STATE_COLLAPSED + } + private fun initEmojiReactions() { adapter?.list?.clear() if (chatMessage.reactions != null && chatMessage.reactions.isNotEmpty()) { diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 547896de6..bf492330e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -62,6 +62,7 @@ - -