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
104 lines
4 KiB
Kotlin
104 lines
4 KiB
Kotlin
/* Copyright 2018 charlag
|
|
*
|
|
* This file is a part of Tusky.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
|
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
|
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
|
* Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with Tusky; if not,
|
|
* see <http://www.gnu.org/licenses>. */
|
|
|
|
package com.keylesspalace.tusky.di
|
|
|
|
import com.keylesspalace.tusky.*
|
|
import com.keylesspalace.tusky.components.compose.ComposeActivity
|
|
import com.keylesspalace.tusky.components.instancemute.InstanceListActivity
|
|
import com.keylesspalace.tusky.components.report.ReportActivity
|
|
import com.keylesspalace.tusky.components.search.SearchActivity
|
|
import dagger.Module
|
|
import dagger.android.ContributesAndroidInjector
|
|
|
|
/**
|
|
* Created by charlag on 3/24/18.
|
|
*/
|
|
|
|
@Module
|
|
abstract class ActivitiesModule {
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesBaseActivity(): BaseActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesMainActivity(): MainActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesAccountActivity(): AccountActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesListsActivity(): ListsActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesComposeActivity(): ComposeActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesEditProfileActivity(): EditProfileActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesAccountListActivity(): AccountListActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesModalTimelineActivity(): ModalTimelineActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesViewTagActivity(): ViewTagActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesViewThreadActivity(): ViewThreadActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesStatusListActivity(): StatusListActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesSearchAvtivity(): SearchActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesAboutActivity(): AboutActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesLoginActivity(): LoginActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesSplashActivity(): SplashActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesSavedTootActivity(): SavedTootActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesPreferencesActivity(): PreferencesActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesViewMediaActivity(): ViewMediaActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesLicenseActivity(): LicenseActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesTabPreferenceActivity(): TabPreferenceActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesFiltersActivity(): FiltersActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesReportActivity(): ReportActivity
|
|
|
|
@ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
|
|
abstract fun contributesInstanceListActivity(): InstanceListActivity
|
|
|
|
@ContributesAndroidInjector
|
|
abstract fun contributesScheduledTootActivity(): ScheduledTootActivity
|
|
}
|