Skip to content

Commit 844d847

Browse files
committed
refactor: provide InputBroadcaster via InputComponent
1 parent ad10afc commit 844d847

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

app/src/main/java/com/osfans/trime/ime/broadcast/InputBroadcaster.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ package com.osfans.trime.ime.broadcast
22

33
import com.osfans.trime.core.RimeNotification.OptionNotification
44
import com.osfans.trime.ime.dependency.InputScope
5+
import me.tatarka.inject.annotations.Inject
56
import java.util.concurrent.ConcurrentLinkedQueue
67

78
@InputScope
9+
@Inject
810
class InputBroadcaster : InputBroadcastReceiver {
911
private val receivers = ConcurrentLinkedQueue<InputBroadcastReceiver>()
1012

app/src/main/java/com/osfans/trime/ime/core/InputView.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import com.osfans.trime.core.RimeNotification
2121
import com.osfans.trime.data.theme.ColorManager
2222
import com.osfans.trime.data.theme.ThemeManager
2323
import com.osfans.trime.ime.bar.QuickBar
24-
import com.osfans.trime.ime.broadcast.InputBroadcaster
2524
import com.osfans.trime.ime.dependency.InputComponent
2625
import com.osfans.trime.ime.dependency.create
2726
import com.osfans.trime.ime.keyboard.KeyboardWindow
@@ -87,8 +86,8 @@ class InputView(
8786
private val notificationHandlerJob: Job
8887

8988
private val themedContext = context.withTheme(android.R.style.Theme_DeviceDefault_Settings)
90-
private val broadcaster = InputBroadcaster()
91-
private val inputComponent = InputComponent::class.create(themedContext, theme, service, broadcaster)
89+
private val inputComponent = InputComponent::class.create(themedContext, theme, service)
90+
private val broadcaster = inputComponent.broadcaster
9291
private val windowManager = inputComponent.windowManager
9392
val quickBar: QuickBar = inputComponent.quickBar
9493
val keyboardWindow: KeyboardWindow = inputComponent.keyboardWindow

app/src/main/java/com/osfans/trime/ime/dependency/InputComponent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ abstract class InputComponent(
1717
@get:InputScope @get:Provides val themedContext: Context,
1818
@get:InputScope @get:Provides val theme: Theme,
1919
@get:InputScope @get:Provides val service: TrimeInputMethodService,
20-
@get:InputScope @get:Provides val broadcaster: InputBroadcaster,
2120
) {
21+
abstract val broadcaster: InputBroadcaster
2222
abstract val quickBar: QuickBar
2323
abstract val windowManager: BoardWindowManager
2424
abstract val keyboardWindow: KeyboardWindow

0 commit comments

Comments
 (0)