Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-28 15:38:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

rebase fix

Browse Source
This commit is contained in:
Valere 2021-02-10 16:36:05 +01:00
parent 186024b271
commit a8d7c25244
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
View File

@ -26,7 +26,9 @@ import androidx.core.graphics.drawable.toBitmap
import com.amulyakhare.textdrawable.TextDrawable import com.amulyakhare.textdrawable.TextDrawable
import com.bumptech.glide.load.MultiTransformation import com.bumptech.glide.load.MultiTransformation
import com.bumptech.glide.load.Transformation import com.bumptech.glide.load.Transformation
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.CircleCrop import com.bumptech.glide.load.resource.bitmap.CircleCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.RequestOptions
import com.bumptech.glide.request.target.DrawableImageViewTarget import com.bumptech.glide.request.target.DrawableImageViewTarget
import com.bumptech.glide.request.target.Target import com.bumptech.glide.request.target.Target

1
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
View File

@ -25,7 +25,6 @@ import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.Observer
import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.activityViewModel
import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.fragmentViewModel
import com.airbnb.mvrx.withState import com.airbnb.mvrx.withState

7
vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
View File

@ -23,8 +23,9 @@ import com.airbnb.mvrx.MvRxState
import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.MvRxViewModelFactory
import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.Uninitialized
import com.airbnb.mvrx.ViewModelContext import com.airbnb.mvrx.ViewModelContext
import com.squareup.inject.assisted.Assisted import dagger.assisted.Assisted
import com.squareup.inject.assisted.AssistedInject import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import im.vector.app.R import im.vector.app.R
import im.vector.app.core.platform.VectorViewEvents import im.vector.app.core.platform.VectorViewEvents
import im.vector.app.core.platform.VectorViewModel import im.vector.app.core.platform.VectorViewModel
@ -66,7 +67,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
private val stringProvider: StringProvider private val stringProvider: StringProvider
) : VectorViewModel<SpaceListViewState, SpaceListAction, SpaceListViewEvents>(initialState) { ) : VectorViewModel<SpaceListViewState, SpaceListAction, SpaceListViewEvents>(initialState) {
@AssistedInject.Factory @AssistedFactory
interface Factory { interface Factory {
fun create(initialState: SpaceListViewState): SpacesListViewModel fun create(initialState: SpaceListViewState): SpacesListViewModel
} }

7
vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
View File

@ -24,8 +24,9 @@ import com.airbnb.mvrx.MvRxState
import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.MvRxViewModelFactory
import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.Uninitialized
import com.airbnb.mvrx.ViewModelContext import com.airbnb.mvrx.ViewModelContext
import com.squareup.inject.assisted.Assisted import dagger.assisted.Assisted
import com.squareup.inject.assisted.AssistedInject import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import im.vector.app.core.platform.VectorViewEvents import im.vector.app.core.platform.VectorViewEvents
import im.vector.app.core.platform.VectorViewModel import im.vector.app.core.platform.VectorViewModel
import im.vector.app.core.platform.VectorViewModelAction import im.vector.app.core.platform.VectorViewModelAction
@ -62,7 +63,7 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
private val session: Session private val session: Session
) : VectorViewModel<SpaceDirectoryState, VectorViewModelAction, SpaceDirectoryViewEvents>(initialState) { ) : VectorViewModel<SpaceDirectoryState, VectorViewModelAction, SpaceDirectoryViewEvents>(initialState) {
@AssistedInject.Factory @AssistedFactory
interface Factory { interface Factory {
fun create(initialState: SpaceDirectoryState): SpaceDirectoryViewModel fun create(initialState: SpaceDirectoryState): SpaceDirectoryViewModel
} }

7
vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
View File

@ -25,8 +25,9 @@ import com.airbnb.mvrx.MvRxViewModelFactory
import com.airbnb.mvrx.Success import com.airbnb.mvrx.Success
import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.Uninitialized
import com.airbnb.mvrx.ViewModelContext import com.airbnb.mvrx.ViewModelContext
import com.squareup.inject.assisted.Assisted import dagger.assisted.Assisted
import com.squareup.inject.assisted.AssistedInject import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import im.vector.app.core.platform.VectorViewModel import im.vector.app.core.platform.VectorViewModel
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -54,7 +55,7 @@ class SpacePreviewViewModel @AssistedInject constructor(
} }
} }
@AssistedInject.Factory @AssistedFactory
interface Factory { interface Factory {
fun create(initialState: SpacePreviewState): SpacePreviewViewModel fun create(initialState: SpacePreviewState): SpacePreviewViewModel
} }