Used a more concise syntax for observing a repository.

syrop · Apr 29, 2019 · 0343b11 · 0343b11
1 parent 649b090
commit 0343b11
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/events/src/main/kotlin/pl/org/seva/events/comm/CommDetailsFragment.kt b/events/src/main/kotlin/pl/org/seva/events/comm/CommDetailsFragment.kt
@@ -58,6 +58,6 @@ class CommDetailsFragment : Fragment(R.layout.fr_comm_details) {
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.comm_details, menu)
-        (vm.isAdmin + this) { menu.findItem(R.id.action_add_admin).isVisible = it }
+        (vm.isAdmin + this) { menu.findItem(R.id.action_add_admin)?.isVisible = it }
     }
 }
diff --git a/events/src/main/kotlin/pl/org/seva/events/comm/CommViewModel.kt b/events/src/main/kotlin/pl/org/seva/events/comm/CommViewModel.kt
@@ -21,12 +21,10 @@ package pl.org.seva.events.comm
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.launch
 
 class CommViewModel : ViewModel() {
 
-    init { viewModelScope.launch { comms { comm = comms[comm.name] } } }
+    init { (comms vm this) { comm = comms[comm.name] } }
 
     var comm = Comm.DUMMY
     set(value) {

diff --git a/events/src/main/kotlin/pl/org/seva/events/main/model/LiveRepository.kt b/events/src/main/kotlin/pl/org/seva/events/main/model/LiveRepository.kt
@@ -24,11 +24,14 @@ package pl.org.seva.events.main.model
 import android.os.Looper
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import pl.org.seva.events.main.model.livedata.DefaultHotData
 import pl.org.seva.events.main.model.livedata.HotData
 import kotlinx.coroutines.channels.BroadcastChannel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.sendBlocking
+import kotlinx.coroutines.launch
 
 abstract class LiveRepository {
 
@@ -42,6 +45,10 @@ abstract class LiveRepository {
         channel.sendBlocking(Unit)
     }
 
+    infix fun vm(vm: ViewModel) = { block: () -> Unit ->
+        vm.viewModelScope.launch { this@LiveRepository(block) }
+    }
+
     operator fun plus(owner: LifecycleOwner): HotData<Unit> = DefaultHotData(liveData, owner)
 
     suspend operator fun invoke(block: () -> Unit) {

diff --git a/events/src/main/res/values/strings.xml b/events/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
 
     <!-- Events fragment. -->
     <string name="events_activity_dismiss_event">Do you want to dismiss event data?</string>
-    <string name="events_action_login">Login</string>
+    <string name="events_action_login">Log in</string>
     <string name="events_action_log_out">Log out</string>
     <string name="events_action_comms">Communities</string>
     <string name="events_action_add_comm">Add a community</string>