diff --git a/core/src/main/java/org/futo/circles/core/feature/user/UserDialogFragment.kt b/core/src/main/java/org/futo/circles/core/feature/user/UserDialogFragment.kt index 59ed5252535c7e96948c44c7c2e16d8af83b2d00..fd0a71b048aa60a612708fbefa73c4ab88664560 100644 --- a/core/src/main/java/org/futo/circles/core/feature/user/UserDialogFragment.kt +++ b/core/src/main/java/org/futo/circles/core/feature/user/UserDialogFragment.kt @@ -22,6 +22,7 @@ import org.futo.circles.core.extensions.setEnabledChildren import org.futo.circles.core.extensions.setIsVisible import org.futo.circles.core.extensions.showNoInternetConnection import org.futo.circles.core.extensions.showSuccess +import org.futo.circles.core.extensions.visible import org.futo.circles.core.extensions.withConfirmation import org.futo.circles.core.feature.user.list.UsersCirclesAdapter import org.futo.circles.core.model.IgnoreUser @@ -71,7 +72,10 @@ class UserDialogFragment : BaseFullscreenDialogFragment(DialogFragmentUserBindin } binding.btnInviteToConnect.apply { setIsVisible(!viewModel.isUserMyFollower()) - setOnClickListener { viewModel.inviteToMySharedCircle() } + setOnClickListener { + binding.lInviteToConnectLoading.visible() + viewModel.inviteToMySharedCircle() + } } } @@ -118,10 +122,12 @@ class UserDialogFragment : BaseFullscreenDialogFragment(DialogFragmentUserBindin } viewModel.requestFollowLiveData.observeResponse(this, success = { showSuccess(getString(R.string.request_sent)) }) + viewModel.inviteToConnectLiveData.observeResponse(this, success = { showSuccess(getString(R.string.request_sent)) binding.btnInviteToConnect.gone() + binding.lInviteToConnectLoading.gone() }) viewModel.ignoreUserLiveData.observeResponse(this, success = { diff --git a/core/src/main/res/layout/dialog_fragment_user.xml b/core/src/main/res/layout/dialog_fragment_user.xml index f0e8b2bdd3326b0b462a46bafd315e3db3e367a1..cd9a1cc920fd4d30db799a6157645095f5fd00d2 100644 --- a/core/src/main/res/layout/dialog_fragment_user.xml +++ b/core/src/main/res/layout/dialog_fragment_user.xml @@ -85,6 +85,29 @@ app:layout_constraintTop_toBottomOf="@id/tvUserId" tools:visibility="visible" /> + <FrameLayout + android:id="@+id/lInviteToConnectLoading" + android:layout_width="0dp" + android:layout_height="0dp" + android:background="?android:colorBackground" + android:clickable="true" + android:focusable="true" + android:outlineProvider="none" + android:translationZ="100dp" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@id/btnInviteToConnect" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/btnInviteToConnect"> + + <ProgressBar + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + </FrameLayout> + <View android:id="@+id/divider" diff --git a/core/src/main/res/layout/list_item_connection_invite.xml b/core/src/main/res/layout/list_item_connection_invite.xml index 893f0199f20bd0651a76642782659e60fd42d09a..0f99fb3556d6d718f5f8e27f6616b4e687777a6a 100644 --- a/core/src/main/res/layout/list_item_connection_invite.xml +++ b/core/src/main/res/layout/list_item_connection_invite.xml @@ -86,7 +86,7 @@ android:clickable="true" android:focusable="true" android:outlineProvider="none" - android:translationZ="2dp" + android:translationZ="100dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/core/src/main/res/layout/list_item_invited_circle.xml b/core/src/main/res/layout/list_item_invited_circle.xml index ba08bb8ffa6d85165834a27b0ce32ef70e93c0db..a6894755130e415a09b9dcb11297a362795c2695 100644 --- a/core/src/main/res/layout/list_item_invited_circle.xml +++ b/core/src/main/res/layout/list_item_invited_circle.xml @@ -105,7 +105,7 @@ android:clickable="true" android:focusable="true" android:outlineProvider="none" - android:translationZ="2dp" + android:translationZ="100dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/core/src/main/res/layout/list_item_invited_gallery.xml b/core/src/main/res/layout/list_item_invited_gallery.xml index e3491a4af0a1c431b952ffbe3e8b7f165480bf03..0e2e5683ffd3e76860b2657b6722dc75aac3ec41 100644 --- a/core/src/main/res/layout/list_item_invited_gallery.xml +++ b/core/src/main/res/layout/list_item_invited_gallery.xml @@ -98,7 +98,7 @@ android:clickable="true" android:focusable="true" android:outlineProvider="none" - android:translationZ="2dp" + android:translationZ="100dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/core/src/main/res/layout/list_item_invited_group.xml b/core/src/main/res/layout/list_item_invited_group.xml index 8b3e3f6124d7cd2bb59b7155a47b82a70104106d..84e736abaa7f7d13207febb61d2afe5ddf964d5d 100644 --- a/core/src/main/res/layout/list_item_invited_group.xml +++ b/core/src/main/res/layout/list_item_invited_group.xml @@ -109,7 +109,7 @@ android:clickable="true" android:focusable="true" android:outlineProvider="none" - android:translationZ="2dp" + android:translationZ="100dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/core/src/main/res/layout/list_item_people_request.xml b/core/src/main/res/layout/list_item_people_request.xml index a709711904d32e64aa5475240cc310aa9b7f9cdd..3ff510fc25d81a5903a0840b496d56967499efa1 100644 --- a/core/src/main/res/layout/list_item_people_request.xml +++ b/core/src/main/res/layout/list_item_people_request.xml @@ -101,7 +101,7 @@ android:clickable="true" android:focusable="true" android:outlineProvider="none" - android:translationZ="2dp" + android:translationZ="100dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"