diff --git a/app/src/generic/java/org/tasks/injection/LocationModule.kt b/app/src/generic/java/org/tasks/injection/LocationModule.kt index ec2186688..a199ec0a0 100644 --- a/app/src/generic/java/org/tasks/injection/LocationModule.kt +++ b/app/src/generic/java/org/tasks/injection/LocationModule.kt @@ -11,13 +11,13 @@ import org.tasks.location.PlaceSearchProvider @Module class LocationModule { @Provides - @ActivityScope + @ActivityScoped fun getPlaceSearchProvider(@ApplicationContext context: Context): PlaceSearchProvider { return MapboxSearchProvider(context) } @Provides - @ActivityScope + @ActivityScoped fun getMapFragment(@ApplicationContext context: Context): MapFragment { return MapboxMapFragment(context) } diff --git a/app/src/googleplay/java/org/tasks/injection/LocationModule.kt b/app/src/googleplay/java/org/tasks/injection/LocationModule.kt index 1b178077c..8fcb39cf6 100644 --- a/app/src/googleplay/java/org/tasks/injection/LocationModule.kt +++ b/app/src/googleplay/java/org/tasks/injection/LocationModule.kt @@ -11,7 +11,7 @@ import org.tasks.preferences.Preferences @Module internal class LocationModule { @Provides - @ActivityScope + @ActivityScoped fun getPlaceSearchProvider( @ApplicationContext context: Context, preferences: Preferences, @@ -27,7 +27,7 @@ internal class LocationModule { } @Provides - @ActivityScope + @ActivityScoped fun getMapFragment(@ApplicationContext context: Context, preferences: Preferences): MapFragment { return if (preferences.useGoogleMaps()) { GoogleMapFragment(context) diff --git a/app/src/main/java/org/tasks/injection/ActivityComponent.kt b/app/src/main/java/org/tasks/injection/ActivityComponent.kt index 81e0661c3..5c6aa60a4 100644 --- a/app/src/main/java/org/tasks/injection/ActivityComponent.kt +++ b/app/src/main/java/org/tasks/injection/ActivityComponent.kt @@ -32,7 +32,7 @@ import org.tasks.widget.ShortcutConfigActivity import org.tasks.widget.WidgetClickActivity import org.tasks.widget.WidgetConfigActivity -@ActivityScope +@ActivityScoped @Subcomponent(modules = [ActivityModule::class, LocationModule::class]) interface ActivityComponent { operator fun plus(module: FragmentModule): FragmentComponent diff --git a/app/src/main/java/org/tasks/injection/ActivityModule.kt b/app/src/main/java/org/tasks/injection/ActivityModule.kt index bead7a18a..4627fe057 100644 --- a/app/src/main/java/org/tasks/injection/ActivityModule.kt +++ b/app/src/main/java/org/tasks/injection/ActivityModule.kt @@ -21,17 +21,17 @@ class ActivityModule(@get:Provides val activity: Activity) { get() = activity @Provides - @ActivityScope + @ActivityScoped fun getThemeBase(preferences: Preferences, inventory: Inventory): ThemeBase = ThemeBase.getThemeBase(preferences, inventory, activity.intent) @Provides - @ActivityScope + @ActivityScoped fun getThemeColor(colorProvider: ColorProvider, preferences: Preferences): ThemeColor = colorProvider.getThemeColor(preferences.defaultThemeColor, true) @Provides - @ActivityScope + @ActivityScoped fun getThemeAccent(colorProvider: ColorProvider, preferences: Preferences): ThemeAccent = colorProvider.getThemeAccent(preferences.getInt(R.string.p_theme_accent, 1)) } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/injection/ActivityScope.kt b/app/src/main/java/org/tasks/injection/ActivityScoped.kt similarity index 72% rename from app/src/main/java/org/tasks/injection/ActivityScope.kt rename to app/src/main/java/org/tasks/injection/ActivityScoped.kt index b2062240d..4066541e5 100644 --- a/app/src/main/java/org/tasks/injection/ActivityScope.kt +++ b/app/src/main/java/org/tasks/injection/ActivityScoped.kt @@ -4,4 +4,4 @@ import javax.inject.Scope @Scope @Retention(AnnotationRetention.RUNTIME) -internal annotation class ActivityScope \ No newline at end of file +internal annotation class ActivityScoped \ No newline at end of file