Skip to content

Commit 59f3369

Browse files
committed
#1984 do not show "use expert mode" button for tips if expert mode already enabled
1 parent b0f86bf commit 59f3369

File tree

1 file changed

+24
-3
lines changed

1 file changed

+24
-3
lines changed

base/src/main/java/io/github/sds100/keymapper/base/onboarding/OnboardingTipDelegate.kt

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import io.github.sds100.keymapper.common.utils.dataOrNull
2121
import io.github.sds100.keymapper.data.Keys
2222
import io.github.sds100.keymapper.data.repositories.PreferenceRepository
2323
import io.github.sds100.keymapper.data.utils.PrefDelegate
24+
import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionManager
25+
import io.github.sds100.keymapper.sysbridge.manager.isConnected
2426
import io.github.sds100.keymapper.system.inputevents.KeyEventUtils
2527
import javax.inject.Inject
2628
import javax.inject.Named
@@ -37,6 +39,7 @@ class OnboardingTipDelegateImpl @Inject constructor(
3739
private val preferenceRepository: PreferenceRepository,
3840
private val configTriggerUseCase: ConfigTriggerUseCase,
3941
private val configActionsUseCase: ConfigActionsUseCase,
42+
private val systemBridgeConnectionManager: SystemBridgeConnectionManager,
4043
resourceProvider: ResourceProvider,
4144
navigationProvider: NavigationProvider,
4245
) : OnboardingTipDelegate,
@@ -225,7 +228,13 @@ class OnboardingTipDelegateImpl @Inject constructor(
225228
title = getString(R.string.tip_volume_buttons_expert_mode_title),
226229
message = getString(R.string.tip_volume_buttons_expert_mode_text),
227230
isDismissable = true,
228-
buttonText = getString(R.string.tip_volume_buttons_expert_mode_button),
231+
buttonText = if (systemBridgeConnectionManager.isConnected()) {
232+
null
233+
} else {
234+
getString(
235+
R.string.tip_volume_buttons_expert_mode_button,
236+
)
237+
},
229238
)
230239
triggerTip.value = tip
231240
}
@@ -236,7 +245,13 @@ class OnboardingTipDelegateImpl @Inject constructor(
236245
title = getString(R.string.tip_caps_lock_expert_mode_title),
237246
message = getString(R.string.tip_caps_lock_expert_mode_text),
238247
isDismissable = true,
239-
buttonText = getString(R.string.tip_caps_lock_expert_mode_button),
248+
buttonText = if (systemBridgeConnectionManager.isConnected()) {
249+
null
250+
} else {
251+
getString(
252+
R.string.tip_caps_lock_expert_mode_button,
253+
)
254+
},
240255
)
241256
triggerTip.value = tip
242257
}
@@ -334,7 +349,13 @@ class OnboardingTipDelegateImpl @Inject constructor(
334349
title = getString(R.string.tip_ringer_mode_title),
335350
message = getString(R.string.tip_ringer_mode_text),
336351
isDismissable = true,
337-
buttonText = getString(R.string.tip_ringer_mode_button),
352+
buttonText = if (systemBridgeConnectionManager.isConnected()) {
353+
null
354+
} else {
355+
getString(
356+
R.string.tip_ringer_mode_button,
357+
)
358+
},
338359
)
339360
actionsTip.value = tip
340361
}

0 commit comments

Comments
 (0)