8770fbe986
* Convert ComposeActivity to Kotlin * More ComposeActivity cleanups * Move ComposeActivity to it's own package * Remove ComposeActivity.IntentBuilder * Re-do part of the media downsizing/uploading * Add sending of status to ViewModel, draft media descriptions * Allow uploading video, update description after uploading * Enable camera, enable upload cancelling * Cleanup of ComposeActivity * Extract CaptionDialog, extract ComposeActivity methods * Fix handling of redrafted media * Add initial state and media uploading out of Activity * Change ComposeOptions.mentionedUsernames to be Set rather than List We probably don't want repeated usernames when we are writing a post and Set provides such guarantee for free plus it tells it to the callers. The only disadvantage is lack of order but it shouldn't be a problem. * Add combineOptionalLiveData. Add docs. It it useful for nullable LiveData's. I think we cannot differentiate between value not being set and value being null so I just added the variant without null check. * Add poll support to Compose. * cleanup code * move more classes into compose package * cleanup code * fix button behavior * add error handling for media upload * add caching for instance data again * merge develop * fix scheduled toots * delete unused string * cleanup ComposeActivity * fix restoring media from drafts * make media upload code a little bit clearer * cleanup autocomplete search code * avoid duplicate object creation in SavedTootActivity * perf: avoid unnecessary work when initializing ComposeActivity * add license header to new files * use small toot button on bigger displays * fix ComposeActivityTest * fix bad merge * use Singles.zip instead of Single.zip
83 lines
2.9 KiB
Kotlin
83 lines
2.9 KiB
Kotlin
// from https://proandroiddev.com/viewmodel-with-dagger2-architecture-components-2e06f06c9455
|
|
|
|
package com.keylesspalace.tusky.di
|
|
|
|
import androidx.lifecycle.ViewModel
|
|
import androidx.lifecycle.ViewModelProvider
|
|
import com.keylesspalace.tusky.components.compose.ComposeViewModel
|
|
import com.keylesspalace.tusky.components.conversation.ConversationsViewModel
|
|
import com.keylesspalace.tusky.components.report.ReportViewModel
|
|
import com.keylesspalace.tusky.components.search.SearchViewModel
|
|
import com.keylesspalace.tusky.viewmodel.AccountViewModel
|
|
import com.keylesspalace.tusky.viewmodel.AccountsInListViewModel
|
|
import com.keylesspalace.tusky.viewmodel.EditProfileViewModel
|
|
import com.keylesspalace.tusky.viewmodel.ListsViewModel
|
|
import dagger.Binds
|
|
import dagger.MapKey
|
|
import dagger.Module
|
|
import dagger.multibindings.IntoMap
|
|
import javax.inject.Inject
|
|
import javax.inject.Provider
|
|
import javax.inject.Singleton
|
|
import kotlin.reflect.KClass
|
|
|
|
@Singleton
|
|
class ViewModelFactory @Inject constructor(private val viewModels: MutableMap<Class<out ViewModel>, Provider<ViewModel>>) : ViewModelProvider.Factory {
|
|
@Suppress("UNCHECKED_CAST")
|
|
override fun <T : ViewModel> create(modelClass: Class<T>): T = viewModels[modelClass]?.get() as T
|
|
}
|
|
|
|
@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
|
|
@kotlin.annotation.Retention(AnnotationRetention.RUNTIME)
|
|
@MapKey
|
|
internal annotation class ViewModelKey(val value: KClass<out ViewModel>)
|
|
|
|
@Module
|
|
abstract class ViewModelModule {
|
|
|
|
@Binds
|
|
internal abstract fun bindViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory
|
|
|
|
@Binds
|
|
@IntoMap
|
|
@ViewModelKey(AccountViewModel::class)
|
|
internal abstract fun accountViewModel(viewModel: AccountViewModel): ViewModel
|
|
|
|
@Binds
|
|
@IntoMap
|
|
@ViewModelKey(EditProfileViewModel::class)
|
|
internal abstract fun editProfileViewModel(viewModel: EditProfileViewModel): ViewModel
|
|
|
|
@Binds
|
|
@IntoMap
|
|
@ViewModelKey(ConversationsViewModel::class)
|
|
internal abstract fun conversationsViewModel(viewModel: ConversationsViewModel): ViewModel
|
|
|
|
@Binds
|
|
@IntoMap
|
|
@ViewModelKey(ListsViewModel::class)
|
|
internal abstract fun listsViewModel(viewModel: ListsViewModel): ViewModel
|
|
|
|
|
|
@Binds
|
|
@IntoMap
|
|
@ViewModelKey(AccountsInListViewModel::class)
|
|
internal abstract fun accountsInListViewModel(viewModel: AccountsInListViewModel): ViewModel
|
|
|
|
@Binds
|
|
@IntoMap
|
|
@ViewModelKey(ReportViewModel::class)
|
|
internal abstract fun reportViewModel(viewModel: ReportViewModel): ViewModel
|
|
|
|
@Binds
|
|
@IntoMap
|
|
@ViewModelKey(SearchViewModel::class)
|
|
internal abstract fun searchViewModel(viewModel: SearchViewModel): ViewModel
|
|
|
|
@Binds
|
|
@IntoMap
|
|
@ViewModelKey(ComposeViewModel::class)
|
|
internal abstract fun composeViewModel(viewModel: ComposeViewModel): ViewModel
|
|
|
|
//Add more ViewModels here
|
|
} |