diff --git a/app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt b/app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt index 99085e3b677b6ea35ed5f750c8c4735f6742cbbc..f60fc8c28889fe61085539c56a44563ae5b7de7f 100644 --- a/app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt +++ b/app/src/main/java/com/futo/circles/extensions/LiveDataExtensions.kt @@ -2,7 +2,6 @@ package com.futo.circles.extensions import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData -import androidx.lifecycle.Observer import org.matrix.android.sdk.api.failure.Failure fun <T> LiveData<Response<T>>.observeResponse( @@ -24,9 +23,9 @@ fun <T> LiveData<Response<T>>.observeResponse( fun <T> LiveData<T>.observeData(fragment: Fragment, observer: (T) -> Unit) { val owner = fragment.viewLifecycleOwner - observe(owner, Observer { + observe(owner) { if (it != null) observer(it) - }) + } } suspend fun <T> createResult(block: suspend () -> T): Response<T> { diff --git a/app/src/main/res/drawable/ic_invite.xml b/app/src/main/res/drawable/ic_invite.xml new file mode 100644 index 0000000000000000000000000000000000000000..60faed9d65143766063938604928d717c6f5862a --- /dev/null +++ b/app/src/main/res/drawable/ic_invite.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="@color/inactive_menu_icon_color" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" /> +</vector> diff --git a/app/src/main/res/menu/group_timeline_menu.xml b/app/src/main/res/menu/group_timeline_menu.xml new file mode 100644 index 0000000000000000000000000000000000000000..ba2ee7bfec9d0c7be50a5e028903e750504975ab --- /dev/null +++ b/app/src/main/res/menu/group_timeline_menu.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/inviteMembers" + android:icon="@drawable/ic_invite" + android:title="@string/invite_members" /> + + +</menu> \ No newline at end of file