Skip to content
Snippets Groups Projects
Commit 59c0be81 authored by Taras's avatar Taras
Browse files

Simplify invites loading

parent b4a77690
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 80 additions and 92 deletions
core/src/main/java/org/futo/circles/core/feature/room/invites/list/InvitesViewHolder.kt
+ 45
− 5
View file @ 59c0be81
......@@ -49,7 +49,7 @@ class InvitedGroupViewHolder(
if (data !is RoomInviteListItem) return
with(binding) {
lLoading.setIsVisible(data.isLoading)
setLoading(data.isLoading)
ivGroup.loadRoomProfileIcon(
data.info.avatarUrl,
data.info.title,
......@@ -64,6 +64,14 @@ class InvitedGroupViewHolder(
)
}
}
private fun setLoading(isLoading: Boolean) {
with(binding) {
vLoading.setIsVisible(isLoading)
btnAccept.setIsVisible(!isLoading)
btnDecline.setIsVisible(!isLoading)
}
}
}
class InvitedCircleViewHolder(
......@@ -86,7 +94,7 @@ class InvitedCircleViewHolder(
if (data !is RoomInviteListItem) return
with(binding) {
lLoading.setIsVisible(data.isLoading)
setLoading(data.isLoading)
tvShowProfileImage.setIsVisible(data.shouldBlurIcon)
ivCircle.loadRoomProfileIcon(
data.info.avatarUrl,
......@@ -101,6 +109,14 @@ class InvitedCircleViewHolder(
)
}
}
private fun setLoading(isLoading: Boolean) {
with(binding) {
vLoading.setIsVisible(isLoading)
btnAccept.setIsVisible(!isLoading)
btnDecline.setIsVisible(!isLoading)
}
}
}
class InvitedGalleryViewHolder(
......@@ -123,7 +139,7 @@ class InvitedGalleryViewHolder(
if (data !is RoomInviteListItem) return
with(binding) {
lLoading.setIsVisible(data.isLoading)
setLoading(data.isLoading)
tvGalleryTitle.text = data.info.title
ivGallery.loadRoomProfileIcon(
data.info.avatarUrl,
......@@ -134,6 +150,14 @@ class InvitedGalleryViewHolder(
tvInviterName.text = context.getString(R.string.invited_by_format, data.inviterName)
}
}
private fun setLoading(isLoading: Boolean) {
with(binding) {
vLoading.setIsVisible(isLoading)
btnAccept.setIsVisible(!isLoading)
btnDecline.setIsVisible(!isLoading)
}
}
}
class FollowRequestViewHolder(
......@@ -153,7 +177,7 @@ class FollowRequestViewHolder(
override fun bind(data: InviteListItem) {
if (data !is FollowRequestListItem) return
binding.lLoading.setIsVisible(data.isLoading)
setLoading(data.isLoading)
bindUser(data.user)
binding.tvReasonMessage.apply {
setIsVisible(data.reasonMessage != null)
......@@ -167,6 +191,14 @@ class FollowRequestViewHolder(
ivUserImage.loadUserProfileIcon(user.avatarUrl, user.id)
}
}
private fun setLoading(isLoading: Boolean) {
with(binding) {
vLoading.setIsVisible(isLoading)
btnAccept.setIsVisible(!isLoading)
btnDecline.setIsVisible(!isLoading)
}
}
}
class ConnectionInviteViewHolder(
......@@ -186,7 +218,7 @@ class ConnectionInviteViewHolder(
override fun bind(data: InviteListItem) {
if (data !is ConnectionInviteListItem) return
binding.lLoading.setIsVisible(data.isLoading)
setLoading(data.isLoading)
bindUser(data.user)
}
......@@ -196,6 +228,14 @@ class ConnectionInviteViewHolder(
ivUserImage.loadUserProfileIcon(user.avatarUrl, user.id)
}
}
private fun setLoading(isLoading: Boolean) {
with(binding) {
vLoading.setIsVisible(isLoading)
btnAccept.setIsVisible(!isLoading)
btnDecline.setIsVisible(!isLoading)
}
}
}
class InviteHeaderViewHolder(
......
core/src/main/res/layout/list_item_connection_invite.xml
+ 7
− 18
View file @ 59c0be81
......@@ -78,27 +78,16 @@
app:layout_constraintStart_toEndOf="@id/btnAccept"
app:layout_constraintTop_toTopOf="@id/btnAccept" />
<FrameLayout
android:id="@+id/lLoading"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?android:colorBackground"
android:clickable="true"
android:focusable="true"
android:outlineProvider="none"
android:translationZ="100dp"
<ProgressBar
android:id="@+id/vLoading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/ivUserImage"
app:layout_constraintTop_toBottomOf="@+id/tvInvitesToConnect">
<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>
app:layout_constraintTop_toBottomOf="@+id/tvInvitesToConnect" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
core/src/main/res/layout/list_item_invited_circle.xml
+ 7
− 17
View file @ 59c0be81
......@@ -97,27 +97,17 @@
app:layout_constraintStart_toEndOf="@id/btnAccept"
app:layout_constraintTop_toBottomOf="@+id/tvInvitedBy" />
<FrameLayout
android:id="@+id/lLoading"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?android:colorBackground"
android:clickable="true"
android:focusable="true"
android:outlineProvider="none"
android:translationZ="100dp"
<ProgressBar
android:id="@+id/vLoading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/ivCircle"
app:layout_constraintTop_toBottomOf="@+id/tvInvitedBy">
app:layout_constraintTop_toBottomOf="@+id/tvInvitedBy" />
<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>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
core/src/main/res/layout/list_item_invited_gallery.xml
+ 7
− 18
View file @ 59c0be81
......@@ -90,27 +90,16 @@
app:layout_constraintStart_toEndOf="@id/btnAccept"
app:layout_constraintTop_toBottomOf="@+id/tvInviterName" />
<FrameLayout
android:id="@+id/lLoading"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?android:colorBackground"
android:clickable="true"
android:focusable="true"
android:outlineProvider="none"
android:translationZ="100dp"
<ProgressBar
android:id="@+id/vLoading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/ivGallery"
app:layout_constraintTop_toBottomOf="@+id/tvInviterName">
<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>
app:layout_constraintTop_toBottomOf="@+id/tvInviterName" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
core/src/main/res/layout/list_item_invited_group.xml
+ 7
− 17
View file @ 59c0be81
......@@ -101,27 +101,17 @@
app:layout_constraintStart_toEndOf="@id/btnAccept"
app:layout_constraintTop_toBottomOf="@+id/tvInviterName" />
<FrameLayout
android:id="@+id/lLoading"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?android:colorBackground"
android:clickable="true"
android:focusable="true"
android:outlineProvider="none"
android:translationZ="100dp"
<ProgressBar
android:id="@+id/vLoading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/ivGroup"
app:layout_constraintTop_toBottomOf="@+id/tvInviterName">
app:layout_constraintTop_toBottomOf="@+id/tvInviterName" />
<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>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
core/src/main/res/layout/list_item_people_request.xml
+ 7
− 17
View file @ 59c0be81
......@@ -93,27 +93,17 @@
app:layout_constraintStart_toEndOf="@id/btnAccept"
app:layout_constraintTop_toTopOf="@id/btnAccept" />
<FrameLayout
android:id="@+id/lLoading"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?android:colorBackground"
android:clickable="true"
android:focusable="true"
android:outlineProvider="none"
android:translationZ="100dp"
<ProgressBar
android:id="@+id/vLoading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/ivUserImage"
app:layout_constraintTop_toBottomOf="@+id/tvReasonMessage">
app:layout_constraintTop_toBottomOf="@+id/tvReasonMessage" />
<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>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment