Refactor view models to use property accessors for controller and state

Author: andremion

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/channel/ChannelAttachmentsViewModel.kt

@@ -35,7 +35,7 @@ import kotlinx.coroutines.flow.StateFlow
 public class ChannelAttachmentsViewModel(
     private val cid: String,
     private val attachmentTypes: List<String>,
-    controllerProvider: ViewModel.() -> ChannelAttachmentsViewController = {
+    private val controllerProvider: ViewModel.() -> ChannelAttachmentsViewController = {
         ChannelAttachmentsViewController(
             cid = cid,
             attachmentTypes = attachmentTypes,
@@ -44,17 +44,17 @@ public class ChannelAttachmentsViewModel(
     },
 ) : ViewModel() {
 
-    private val controller: ChannelAttachmentsViewController by lazy { controllerProvider() }
+    private val controller: ChannelAttachmentsViewController get() = controllerProvider()
 
     /**
      * @see [ChannelAttachmentsViewController.state]
      */
-    public val state: StateFlow<ChannelAttachmentsViewState> by lazy { controller.state }
+    public val state: StateFlow<ChannelAttachmentsViewState> get() = controller.state
 
     /**
      * @see [ChannelAttachmentsViewController.events]
      */
-    public val events: SharedFlow<ChannelAttachmentsViewEvent> by lazy { controller.events }
+    public val events: SharedFlow<ChannelAttachmentsViewEvent> get() = controller.events
 
     /**
      * @see [ChannelAttachmentsViewController.onViewAction]

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/channel/ChannelHeaderViewModel.kt

@@ -30,15 +30,15 @@ import kotlinx.coroutines.flow.StateFlow
  */
 public class ChannelHeaderViewModel(
     private val cid: String,
-    controllerProvider: ViewModel.() -> ChannelHeaderViewController = {
+    private val controllerProvider: ViewModel.() -> ChannelHeaderViewController = {
         ChannelHeaderViewController(cid = cid, scope = viewModelScope)
     },
 ) : ViewModel() {
 
-    private val controller: ChannelHeaderViewController by lazy { controllerProvider() }
+    private val controller: ChannelHeaderViewController get() = controllerProvider()
 
     /**
      * @see [ChannelHeaderViewController.state]
      */
-    public val state: StateFlow<ChannelHeaderViewState> by lazy { controller.state }
+    public val state: StateFlow<ChannelHeaderViewState> get() = controller.state
 }

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/channel/ChannelInfoMemberViewModel.kt

@@ -38,7 +38,7 @@ import kotlinx.coroutines.flow.StateFlow
 public class ChannelInfoMemberViewModel(
     private val cid: String,
     private val memberId: String,
-    controllerProvider: ViewModel.() -> ChannelInfoMemberViewController = {
+    private val controllerProvider: ViewModel.() -> ChannelInfoMemberViewController = {
         ChannelInfoMemberViewController(
             cid = cid,
             memberId = memberId,
@@ -47,17 +47,17 @@ public class ChannelInfoMemberViewModel(
     },
 ) : ViewModel() {
 
-    private val controller: ChannelInfoMemberViewController by lazy { controllerProvider() }
+    private val controller: ChannelInfoMemberViewController get() = controllerProvider()
 
     /**
      * @see [ChannelInfoMemberViewController.state]
      */
-    public val state: StateFlow<ChannelInfoMemberViewState> by lazy { controller.state }
+    public val state: StateFlow<ChannelInfoMemberViewState> get() = controller.state
 
     /**
      * @see [ChannelInfoMemberViewController.events]
      */
-    public val events: SharedFlow<ChannelInfoMemberViewEvent> by lazy { controller.events }
+    public val events: SharedFlow<ChannelInfoMemberViewEvent> get() = controller.events
 
     /**
      * @see [ChannelInfoMemberViewController.onViewAction]

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/channel/ChannelInfoViewModel.kt

@@ -43,7 +43,7 @@ public class ChannelInfoViewModel(
     private val cid: String,
     private val copyToClipboardHandler: CopyToClipboardHandler,
     private val optionFilter: (option: ChannelInfoViewState.Content.Option) -> Boolean = { true },
-    controllerProvider: ViewModel.() -> ChannelInfoViewController = {
+    private val controllerProvider: ViewModel.() -> ChannelInfoViewController = {
         ChannelInfoViewController(
             cid = cid,
             scope = viewModelScope,
@@ -53,17 +53,17 @@ public class ChannelInfoViewModel(
     },
 ) : ViewModel() {
 
-    private val controller: ChannelInfoViewController by lazy { controllerProvider() }
+    private val controller: ChannelInfoViewController get() = controllerProvider()
 
     /**
      * @see [ChannelInfoViewController.state]
      */
-    public val state: StateFlow<ChannelInfoViewState> by lazy { controller.state }
+    public val state: StateFlow<ChannelInfoViewState> get() = controller.state
 
     /**
      * @see [ChannelInfoViewController.events]
      */
-    public val events: SharedFlow<ChannelInfoViewEvent> by lazy { controller.events }
+    public val events: SharedFlow<ChannelInfoViewEvent> get() = controller.events
 
     /**
      * @see [ChannelInfoViewController.onViewAction]

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/mentions/MentionListViewModel.kt

@@ -35,19 +35,21 @@ import kotlinx.coroutines.flow.StateFlow
  */
 public class MentionListViewModel(
     sort: QuerySorter<Message>? = null,
-    controllerProvider: ViewModel.() -> MentionListController = { MentionListController(viewModelScope, sort) },
+    private val controllerProvider: ViewModel.() -> MentionListController = {
+        MentionListController(viewModelScope, sort)
+    },
 ) : ViewModel() {
-    private val controller: MentionListController by lazy { controllerProvider() }
+    private val controller: MentionListController get() = controllerProvider()
 
     /**
      * The current mention list state.
      */
-    public val state: StateFlow<MentionListState> by lazy { controller.state }
+    public val state: StateFlow<MentionListState> get() = controller.state
 
     /**
      * One shot events.
      */
-    public val events: SharedFlow<MentionListEvent> by lazy { controller.events }
+    public val events: SharedFlow<MentionListEvent> get() = controller.events
 
     /**
      * Loads more messages if there are more messages to load.

stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/helper/CopyToClipboardHandler.kt

@@ -46,7 +46,7 @@ internal class CopyToClipboardHandlerImpl(
     },
 ) : CopyToClipboardHandler {
 
-    private val clipboardManager: ClipboardManager by lazy { clipboardManagerProvider() }
+    private val clipboardManager: ClipboardManager get() = clipboardManagerProvider()
 
     override fun copy(text: String) {
         clipboardManager.setPrimaryClip(ClipData.newPlainText(PLAIN_TEXT_LABEL, text))