Skip to content

Commit 9554c63

Browse files
committed
refactor: remove unnecessary XML elements and auxiliary method for observing view model flows
1 parent 3a873d5 commit 9554c63

File tree

3 files changed

+13
-28
lines changed

3 files changed

+13
-28
lines changed

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,17 @@ class SpaceMembersFragment : Fragment() {
6464
adapter = spaceMembersAdapter
6565
}
6666

67-
subscribeToViewModels()
67+
collectLatestLifecycleFlow(spaceMembersViewModel.spaceMembers) { event ->
68+
event?.let {
69+
when (val uiResult = event.peekContent()) {
70+
is UIResult.Success -> {
71+
uiResult.data?.let { spaceMembersAdapter.setSpaceMembers(it) }
72+
}
73+
is UIResult.Loading -> { }
74+
is UIResult.Error -> { }
75+
}
76+
}
77+
}
6878

6979
val currentSpace = requireArguments().getParcelable<OCSpace>(ARG_CURRENT_SPACE) ?: return
7080
binding.apply {
@@ -83,21 +93,6 @@ class SpaceMembersFragment : Fragment() {
8393
}
8494
}
8595
}
86-
87-
}
88-
89-
private fun subscribeToViewModels() {
90-
collectLatestLifecycleFlow(spaceMembersViewModel.spaceMembers) { event ->
91-
event?.let {
92-
when (val uiResult = event.peekContent()) {
93-
is UIResult.Success -> {
94-
uiResult.data?.let { spaceMembersAdapter.setSpaceMembers(it) }
95-
}
96-
is UIResult.Loading -> { }
97-
is UIResult.Error -> { }
98-
}
99-
}
100-
}
10196
}
10297

10398
companion object {

owncloudApp/src/main/res/layout/members_fragment.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,6 @@
109109
android:visibility="visible"
110110
tools:visibility="visible"/>
111111

112-
<TextView
113-
android:id="@+id/members_list_empty"
114-
android:layout_width="match_parent"
115-
android:layout_height="wrap_content"
116-
android:paddingBottom="@dimen/standard_padding"
117-
android:paddingStart="@dimen/standard_half_padding"
118-
android:paddingTop="@dimen/standard_padding"
119-
android:text="@string/share_no_users"
120-
android:textSize="15sp"
121-
android:visibility="gone"/>
122-
123112
</LinearLayout>
124113

125114
</LinearLayout>

owncloudData/src/main/java/com/owncloud/android/data/spaces/datasources/implementation/OCRemoteSpacesDataSource.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ class OCRemoteSpacesDataSource(
6767

6868
override fun getSpacePermissions(accountName: String, spaceId: String): List<String> {
6969
val spacePermissionsResponse = executeRemoteOperation {
70-
clientManager.getSpacesService(accountName).getSpacePermissions(spaceId) }
70+
clientManager.getSpacesService(accountName).getSpacePermissions(spaceId)
71+
}
7172
return spacePermissionsResponse.actions
7273
}
7374

0 commit comments

Comments
 (0)