Cleanup dagger setup (#2300)

* cleanup dagger setup

* fix tests

* fix ktlint

* cleanup FragmentBuildersModule

app/src/main/java/com/keylesspalace/tusky/di/AppComponent.kt

@@ -34,8 +34,7 @@ import javax.inject.Singleton
         ActivitiesModule::class,
         ServicesModule::class,
         BroadcastReceiverModule::class,
-        ViewModelModule::class,
-        MediaUploaderModule::class
+        ViewModelModule::class
     ]
 )
 interface AppComponent {

app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt

@@ -18,19 +18,11 @@ package com.keylesspalace.tusky.di
 import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.preference.PreferenceManager
 import androidx.room.Room
 import com.keylesspalace.tusky.TuskyApplication
-import com.keylesspalace.tusky.appstore.EventHub
-import com.keylesspalace.tusky.appstore.EventHubImpl
-import com.keylesspalace.tusky.components.notifications.Notifier
-import com.keylesspalace.tusky.components.notifications.SystemNotifier
 import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.db.Converters
-import com.keylesspalace.tusky.network.MastodonApi
-import com.keylesspalace.tusky.network.TimelineCases
-import com.keylesspalace.tusky.network.TimelineCasesImpl
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
@@ -53,23 +45,6 @@ class AppModule {
         return PreferenceManager.getDefaultSharedPreferences(app)
     }
 
-    @Provides
-    fun providesBroadcastManager(app: Application): LocalBroadcastManager {
-        return LocalBroadcastManager.getInstance(app)
-    }
-
-    @Provides
-    fun providesTimelineUseCases(
-        api: MastodonApi,
-        eventHub: EventHub
-    ): TimelineCases {
-        return TimelineCasesImpl(api, eventHub)
-    }
-
-    @Provides
-    @Singleton
-    fun providesEventHub(): EventHub = EventHubImpl
-
     @Provides
     @Singleton
     fun providesDatabase(appContext: Context, converters: Converters): AppDatabase {
@@ -90,8 +65,4 @@ class AppModule {
             )
             .build()
     }
-
-    @Provides
-    @Singleton
-    fun notifier(context: Context): Notifier = SystemNotifier(context)
 }

app/src/main/java/com/keylesspalace/tusky/di/FragmentBuildersModule.kt

@@ -56,9 +56,6 @@ abstract class FragmentBuildersModule {
     @ContributesAndroidInjector
     abstract fun notificationsFragment(): NotificationsFragment
 
-    @ContributesAndroidInjector
-    abstract fun searchFragment(): SearchStatusesFragment
-
     @ContributesAndroidInjector
     abstract fun notificationPreferencesFragment(): NotificationPreferencesFragment
 
@@ -66,7 +63,7 @@ abstract class FragmentBuildersModule {
     abstract fun accountPreferencesFragment(): AccountPreferencesFragment
 
     @ContributesAndroidInjector
-    abstract fun directMessagesPreferencesFragment(): ConversationsFragment
+    abstract fun conversationsFragment(): ConversationsFragment
 
     @ContributesAndroidInjector
     abstract fun accountInListsFragment(): AccountsInListFragment
@@ -83,6 +80,9 @@ abstract class FragmentBuildersModule {
     @ContributesAndroidInjector
     abstract fun instanceListFragment(): InstanceListFragment
 
+    @ContributesAndroidInjector
+    abstract fun searchStatusesFragment(): SearchStatusesFragment
+
     @ContributesAndroidInjector
     abstract fun searchAccountFragment(): SearchAccountsFragment
 

app/src/main/java/com/keylesspalace/tusky/di/MediaUploaderModule.kt

@@ -1,30 +0,0 @@
-/* Copyright 2019 Tusky Contributors
- *
- * 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 android.content.Context
-import com.keylesspalace.tusky.components.compose.MediaUploader
-import com.keylesspalace.tusky.components.compose.MediaUploaderImpl
-import com.keylesspalace.tusky.network.MastodonApi
-import dagger.Module
-import dagger.Provides
-
-@Module
-class MediaUploaderModule {
-    @Provides
-    fun providesMediaUploder(context: Context, mastodonApi: MastodonApi): MediaUploader =
-        MediaUploaderImpl(context, mastodonApi)
-}

app/src/main/java/com/keylesspalace/tusky/di/ServicesModule.kt

@@ -15,25 +15,12 @@
 
 package com.keylesspalace.tusky.di
 
-import android.content.Context
 import com.keylesspalace.tusky.service.SendTootService
-import com.keylesspalace.tusky.service.ServiceClient
-import com.keylesspalace.tusky.service.ServiceClientImpl
 import dagger.Module
-import dagger.Provides
 import dagger.android.ContributesAndroidInjector
 
 @Module
 abstract class ServicesModule {
     @ContributesAndroidInjector
     abstract fun contributesSendTootService(): SendTootService
-
-    @Module
-    companion object {
-        @Provides
-        @JvmStatic
-        fun providesServiceClient(context: Context): ServiceClient {
-            return ServiceClientImpl(context)
-        }
-    }
 }