File tree Expand file tree Collapse file tree 8 files changed +13
-12
lines changed
java/io/github/sds100/keymapper/base
sysbridge/src/main/java/io/github/sds100/keymapper/sysbridge Expand file tree Collapse file tree 8 files changed +13
-12
lines changed Original file line number Diff line number Diff line change @@ -324,7 +324,7 @@ private fun AssistantCheckBoxRow(
324324 stringResource(R .string.expert_mode_setup_wizard_use_assistant_description)
325325 } else {
326326 stringResource(
327- R .string.expert_mode_setup_wizard_use_assistant_enable_accessibility_service ,
327+ R .string.expert_mode_setup_wizard_use_assistant_enable_service ,
328328 )
329329 }
330330
Original file line number Diff line number Diff line change @@ -248,7 +248,7 @@ class SystemBridgeAutoStarter @Inject constructor(
248248 Timber .i(" Auto starting system bridge with Shizuku" )
249249 showAutoStartNotification(
250250 getString(
251- R .string.expert_mode_setup_notification_auto_start_system_bridge_shizuku_text ,
251+ R .string.expert_mode_setup_notification_auto_start_system_bridge_shizuku ,
252252 ),
253253 )
254254 connectionManager.startWithShizuku()
Original file line number Diff line number Diff line change @@ -49,7 +49,8 @@ class OnboardingTipDelegateImpl @Inject constructor(
4949 private const val PARALLEL_TRIGGER_TIP_ID = " parallel_trigger_tip"
5050 private const val SEQUENCE_TRIGGER_TIP_ID = " sequence_trigger_tip"
5151 private const val TRIGGER_CONSTRAINTS_TIP_ID = " trigger_constraints_tip"
52- const val CAPS_LOCK_PRO_MODE_COMPATIBILITY_TIP_ID = " caps_lock_expert_mode_compatibility_tip"
52+ const val CAPS_LOCK_PRO_MODE_COMPATIBILITY_TIP_ID =
53+ " caps_lock_expert_mode_compatibility_tip"
5354 const val VOLUME_BUTTONS_PRO_MODE_TIP_ID = " volume_buttons_expert_mode_tip"
5455 const val SCREEN_PINNING_TIP_ID = " screen_pinning_tip"
5556 const val IME_DETECTION_TIP_ID = " ime_detection_tip"
Original file line number Diff line number Diff line change @@ -1308,7 +1308,7 @@ Deixe em branco se alguma rede Wi-Fi precisar ser correspondida.</string>
13081308 <string name =" expert_mode_setup_wizard_step_n" >Etapa %d de %d</string >
13091309 <string name =" expert_mode_setup_wizard_use_assistant" >Use o assistente de configuração interativo</string >
13101310 <string name =" expert_mode_setup_wizard_use_assistant_description" >Interagir automaticamente com as configurações</string >
1311- <string name =" expert_mode_setup_wizard_use_assistant_enable_accessibility_service " >Habilitar primeiro o serviço de acessibilidade</string >
1311+ <string name =" expert_mode_setup_wizard_use_assistant_enable_service " >Habilitar primeiro o serviço de acessibilidade</string >
13121312 <string name =" expert_mode_setup_wizard_watch_tutorial_button" >Assista ao tutorial</string >
13131313 <string name =" expert_mode_setup_wizard_enable_accessibility_service_button" >Iniciar serviço</string >
13141314 <string name =" expert_mode_setup_wizard_go_to_settings_button" >Vá para as configurações</string >
@@ -1342,7 +1342,7 @@ Deixe em branco se alguma rede Wi-Fi precisar ser correspondida.</string>
13421342 <string name =" expert_mode_setup_notification_start_system_bridge_failed_text" >Toque para configurar novamente. Tente o pareamento ADB e reinicie o telefone se o problema persistir.</string >
13431343 <string name =" expert_mode_setup_notification_auto_start_system_bridge_title" >Modo PRO de inicialização automática</string >
13441344 <string name =" expert_mode_setup_notification_auto_start_system_bridge_root_text" >Usando root</string >
1345- <string name =" expert_mode_setup_notification_auto_start_system_bridge_shizuku_text " >Usando shizuku</string >
1345+ <string name =" expert_mode_setup_notification_auto_start_system_bridge_shizuku " >Usando shizuku</string >
13461346 <string name =" expert_mode_setup_notification_auto_start_system_bridge_adb_text" >Usando ADB via WiFi</string >
13471347 <string name =" expert_mode_setup_notification_system_bridge_started_title" >Modo PRO iniciado</string >
13481348 <string name =" expert_mode_setup_notification_system_bridge_started_text" >Divirta-se remapeando! ❤️</string >
Original file line number Diff line number Diff line change @@ -1416,7 +1416,7 @@ Kaydedilmiş ses dosyalarını ayarlardan silebilirsiniz.</string>
14161416 <string name =" expert_mode_setup_wizard_step_n" >Adım %d / %d</string >
14171417 <string name =" expert_mode_setup_wizard_use_assistant" >Etkileşimli kurulum asistanını kullan</string >
14181418 <string name =" expert_mode_setup_wizard_use_assistant_description" >Ayarlarla otomatik olarak etkileşime gir</string >
1419- <string name =" expert_mode_setup_wizard_use_assistant_enable_accessibility_service " >Önce erişilebilirlik servisini etkinleştir</string >
1419+ <string name =" expert_mode_setup_wizard_use_assistant_enable_service " >Önce erişilebilirlik servisini etkinleştir</string >
14201420 <string name =" expert_mode_setup_wizard_watch_tutorial_button" >Eğitimi izle</string >
14211421 <string name =" expert_mode_setup_wizard_enable_accessibility_service_button" >Servisi başlat</string >
14221422 <string name =" expert_mode_setup_wizard_go_to_settings_button" >Ayarlara git</string >
@@ -1452,7 +1452,7 @@ Kaydedilmiş ses dosyalarını ayarlardan silebilirsiniz.</string>
14521452 <string name =" expert_mode_setup_notification_start_system_bridge_failed_text" >Tekrar kurmak için dokunun. Tekrar tekrar başarısız olursa ADB eşleştirmeyi ve telefonunuzu yeniden başlatmayı deneyin.</string >
14531453 <string name =" expert_mode_setup_notification_auto_start_system_bridge_title" >PRO modu otomatik başlatılıyor</string >
14541454 <string name =" expert_mode_setup_notification_auto_start_system_bridge_root_text" >Root kullanılıyor</string >
1455- <string name =" expert_mode_setup_notification_auto_start_system_bridge_shizuku_text " >Shizuku kullanılıyor</string >
1455+ <string name =" expert_mode_setup_notification_auto_start_system_bridge_shizuku " >Shizuku kullanılıyor</string >
14561456 <string name =" expert_mode_setup_notification_auto_start_system_bridge_adb_text" >WiFi üzerinden ADB kullanılıyor</string >
14571457 <string name =" expert_mode_setup_notification_system_bridge_started_title" >PRO modu başlatıldı</string >
14581458 <string name =" expert_mode_setup_notification_system_bridge_started_text" >Yeniden eşlemede iyi eğlenceler! ❤️</string >
Original file line number Diff line number Diff line change 16911691 <string name =" expert_mode_setup_wizard_step_n" >Step %d of %d</string >
16921692 <string name =" expert_mode_setup_wizard_use_assistant" >Use interactive setup assistant</string >
16931693 <string name =" expert_mode_setup_wizard_use_assistant_description" >Automatically interact with settings</string >
1694- <string name =" expert_mode_setup_wizard_use_assistant_enable_accessibility_service " >Enable accessibility service first</string >
1694+ <string name =" expert_mode_setup_wizard_use_assistant_enable_service " >Enable accessibility service first</string >
16951695 <string name =" expert_mode_setup_wizard_watch_tutorial_button" >Watch tutorial</string >
16961696 <string name =" expert_mode_setup_wizard_enable_accessibility_service_button" >Start service</string >
16971697 <string name =" expert_mode_setup_wizard_go_to_settings_button" >Go to settings</string >
17431743
17441744 <string name =" expert_mode_setup_notification_auto_start_system_bridge_title" >Auto starting Expert mode</string >
17451745 <string name =" expert_mode_setup_notification_auto_start_system_bridge_root_text" >Using root</string >
1746- <string name =" expert_mode_setup_notification_auto_start_system_bridge_shizuku_text " >Using shizuku</string >
1746+ <string name =" expert_mode_setup_notification_auto_start_system_bridge_shizuku " >Using shizuku</string >
17471747 <string name =" expert_mode_setup_notification_auto_start_system_bridge_adb_text" >Using ADB over WiFi</string >
17481748
17491749 <string name =" expert_mode_setup_notification_system_bridge_started_title" >Expert mode started</string >
Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ class SystemBridgeConnectionManagerImpl @Inject constructor(
6666 time = SystemClock .elapsedRealtime(),
6767 // Get whether the user previously stopped the system bridge.
6868 isStoppedByUser =
69- preferences.get(Keys .isSystemBridgeStoppedByUser).firstBlocking() ? : false ,
69+ preferences.get(Keys .isSystemBridgeStoppedByUser).firstBlocking() ? : false ,
7070 ),
7171 )
7272 private var isExpectedDeath: Boolean = false
Original file line number Diff line number Diff line change @@ -25,6 +25,8 @@ import io.github.sds100.keymapper.sysbridge.adb.AdbManager
2525import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionManager
2626import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionState
2727import io.github.sds100.keymapper.sysbridge.manager.awaitConnected
28+ import javax.inject.Inject
29+ import javax.inject.Singleton
2830import kotlinx.coroutines.CoroutineScope
2931import kotlinx.coroutines.Job
3032import kotlinx.coroutines.TimeoutCancellationException
@@ -41,8 +43,6 @@ import kotlinx.coroutines.launch
4143import kotlinx.coroutines.withTimeout
4244import kotlinx.coroutines.withTimeoutOrNull
4345import timber.log.Timber
44- import javax.inject.Inject
45- import javax.inject.Singleton
4646
4747@Singleton
4848class SystemBridgeSetupControllerImpl @Inject constructor(
You can’t perform that action at this time.
0 commit comments