Skip to content

Commit 8cdc72d

Browse files
sds100sds100
committed
style: fix more style issues manually
1 parent 52abd17 commit 8cdc72d

34 files changed

Lines changed: 203 additions & 130 deletions

‎base/src/main/java/io/github/sds100/keymapper/base/about/AboutFragment.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ class AboutFragment : Fragment() {
4646
ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
4747
val insets =
4848
insets.getInsets(
49-
WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() or
49+
WindowInsetsCompat.Type.systemBars() or
50+
WindowInsetsCompat.Type.displayCutout() or
5051
WindowInsetsCompat.Type.ime(),
5152
)
5253
v.updatePadding(insets.left, insets.top, insets.right, insets.bottom)

‎base/src/main/java/io/github/sds100/keymapper/base/actions/ActionData.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,8 @@ sealed class ActionData : Comparable<ActionData> {
4141
}
4242

4343
@Serializable
44-
data class InputKeyEvent(
45-
val keyCode: Int,
46-
val metaState: Int = 0,
47-
val device: Device? = null,
48-
) : ActionData() {
44+
data class InputKeyEvent(val keyCode: Int, val metaState: Int = 0, val device: Device? = null) :
45+
ActionData() {
4946

5047
override val id: ActionId = ActionId.KEY_EVENT
5148

@@ -916,7 +913,10 @@ sealed class ActionData : Comparable<ActionData> {
916913

917914
override fun toString(): String {
918915
// Do not leak sensitive command info to logs.
919-
return "ShellCommand(description=$description, executionMode=$executionMode, timeoutMs=$timeoutMillis)"
916+
return """
917+
ShellCommand(description=$description, executionMode=$executionMode,
918+
timeoutMs=$timeoutMillis)
919+
""".trimIndent()
920920
}
921921
}
922922

‎base/src/main/java/io/github/sds100/keymapper/base/actions/ActionOptionsBottomSheet.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ fun ActionOptionsBottomSheet(
6969
val helpUrl = stringResource(R.string.url_keymap_action_options_guide)
7070
val scope = rememberCoroutineScope()
7171

72+
@Suppress("ktlint:standard:max-line-length")
7273
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
7374
Spacer(modifier = Modifier.height(12.dp))
7475
Box(modifier = Modifier.fillMaxWidth()) {

‎base/src/main/java/io/github/sds100/keymapper/base/actions/ActionUiHelper.kt‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -207,32 +207,52 @@ class ActionUiHelper(
207207
getAppName(action.packageName).handle(
208208
onSuccess = { appName ->
209209
val resId = when (action) {
210-
is ActionData.ControlMediaForApp.Play -> R.string.action_play_media_package_formatted
211-
is ActionData.ControlMediaForApp.FastForward -> R.string.action_fast_forward_package_formatted
212-
is ActionData.ControlMediaForApp.NextTrack -> R.string.action_next_track_package_formatted
213-
is ActionData.ControlMediaForApp.Pause -> R.string.action_pause_media_package_formatted
214-
is ActionData.ControlMediaForApp.PlayPause -> R.string.action_play_pause_media_package_formatted
215-
is ActionData.ControlMediaForApp.PreviousTrack -> R.string.action_previous_track_package_formatted
216-
is ActionData.ControlMediaForApp.Rewind -> R.string.action_rewind_package_formatted
217-
is ActionData.ControlMediaForApp.Stop -> R.string.action_stop_media_package_formatted
218-
is ActionData.ControlMediaForApp.StepForward -> R.string.action_step_forward_media_package_formatted
219-
is ActionData.ControlMediaForApp.StepBackward -> R.string.action_step_backward_media_package_formatted
210+
is ActionData.ControlMediaForApp.Play ->
211+
R.string.action_play_media_package_formatted
212+
is ActionData.ControlMediaForApp.FastForward ->
213+
R.string.action_fast_forward_package_formatted
214+
is ActionData.ControlMediaForApp.NextTrack ->
215+
R.string.action_next_track_package_formatted
216+
is ActionData.ControlMediaForApp.Pause ->
217+
R.string.action_pause_media_package_formatted
218+
is ActionData.ControlMediaForApp.PlayPause ->
219+
R.string.action_play_pause_media_package_formatted
220+
is ActionData.ControlMediaForApp.PreviousTrack ->
221+
R.string.action_previous_track_package_formatted
222+
is ActionData.ControlMediaForApp.Rewind ->
223+
R.string.action_rewind_package_formatted
224+
is ActionData.ControlMediaForApp.Stop ->
225+
R.string.action_stop_media_package_formatted
226+
is ActionData.ControlMediaForApp.StepForward ->
227+
R.string.action_step_forward_media_package_formatted
228+
is ActionData.ControlMediaForApp.StepBackward ->
229+
R.string.action_step_backward_media_package_formatted
220230
}
221231

222232
getString(resId, appName)
223233
},
224234
onError = {
225235
val resId = when (action) {
226-
is ActionData.ControlMediaForApp.Play -> R.string.action_play_media_package
227-
is ActionData.ControlMediaForApp.FastForward -> R.string.action_fast_forward_package
228-
is ActionData.ControlMediaForApp.NextTrack -> R.string.action_next_track_package
229-
is ActionData.ControlMediaForApp.Pause -> R.string.action_pause_media_package
230-
is ActionData.ControlMediaForApp.PlayPause -> R.string.action_play_pause_media_package
231-
is ActionData.ControlMediaForApp.PreviousTrack -> R.string.action_previous_track_package
232-
is ActionData.ControlMediaForApp.Rewind -> R.string.action_rewind_package
233-
is ActionData.ControlMediaForApp.Stop -> R.string.action_stop_media_package
234-
is ActionData.ControlMediaForApp.StepForward -> R.string.action_step_forward_media_package
235-
is ActionData.ControlMediaForApp.StepBackward -> R.string.action_step_backward_media_package
236+
is ActionData.ControlMediaForApp.Play ->
237+
R.string.action_play_media_package
238+
is ActionData.ControlMediaForApp.FastForward ->
239+
R.string.action_fast_forward_package
240+
is ActionData.ControlMediaForApp.NextTrack ->
241+
R.string.action_next_track_package
242+
is ActionData.ControlMediaForApp.Pause ->
243+
R.string.action_pause_media_package
244+
is ActionData.ControlMediaForApp.PlayPause ->
245+
R.string.action_play_pause_media_package
246+
is ActionData.ControlMediaForApp.PreviousTrack ->
247+
R.string.action_previous_track_package
248+
is ActionData.ControlMediaForApp.Rewind ->
249+
R.string.action_rewind_package
250+
is ActionData.ControlMediaForApp.Stop ->
251+
R.string.action_stop_media_package
252+
is ActionData.ControlMediaForApp.StepForward ->
253+
R.string.action_step_forward_media_package
254+
is ActionData.ControlMediaForApp.StepBackward ->
255+
R.string.action_step_backward_media_package
236256
}
237257

238258
getString(resId)

‎base/src/main/java/io/github/sds100/keymapper/base/actions/ConfigActionsUseCase.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ class ConfigActionsUseCaseImpl @Inject constructor(
137137
}
138138
}
139139

140-
override fun setActionHoldDownEnabled(uid: String, holdDown: Boolean) =
141-
setActionOption(uid) { it.copy(holdDown = holdDown) }
140+
override fun setActionHoldDownEnabled(uid: String, holdDown: Boolean) = setActionOption(uid) {
141+
it.copy(holdDown = holdDown)
142+
}
142143

143144
override fun setActionHoldDownDuration(uid: String, holdDownDuration: Int) {
144145
setActionOption(uid) { action ->

‎base/src/main/java/io/github/sds100/keymapper/base/actions/ConfigActionsViewModel.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,8 @@ class ConfigActionsViewModel @Inject constructor(
261261
)
262262

263263
RepeatMode.LIMIT_REACHED -> config.setActionStopRepeatingWhenLimitReached(uid)
264-
RepeatMode.TRIGGER_PRESSED_AGAIN -> config.setActionStopRepeatingWhenTriggerPressedAgain(
265-
uid,
266-
)
264+
RepeatMode.TRIGGER_PRESSED_AGAIN ->
265+
config.setActionStopRepeatingWhenTriggerPressedAgain(uid)
267266
}
268267
}
269268
}

‎base/src/main/java/io/github/sds100/keymapper/base/actions/PerformActionsUseCase.kt‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import io.github.sds100.keymapper.data.Keys
4141
import io.github.sds100.keymapper.data.PreferenceDefaults
4242
import io.github.sds100.keymapper.data.repositories.PreferenceRepository
4343
import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionManager
44-
import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionState
44+
import io.github.sds100.keymapper.sysbridge.manager.isConnected
4545
import io.github.sds100.keymapper.system.airplanemode.AirplaneModeAdapter
4646
import io.github.sds100.keymapper.system.apps.AppShortcutAdapter
4747
import io.github.sds100.keymapper.system.apps.PackageManagerAdapter
@@ -698,16 +698,23 @@ class PerformActionsUseCaseImpl @AssistedInject constructor(
698698
is ActionData.MoveCursor -> {
699699
result = service.performActionOnNode({ it.isFocused }) {
700700
val actionType = when (action.direction) {
701-
ActionData.MoveCursor.Direction.START -> AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY
702-
ActionData.MoveCursor.Direction.END -> AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY
701+
ActionData.MoveCursor.Direction.START ->
702+
AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY
703+
ActionData.MoveCursor.Direction.END ->
704+
AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY
703705
}
704706

705707
val granularity = when (action.moveType) {
706-
ActionData.MoveCursor.Type.CHAR -> AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER
707-
ActionData.MoveCursor.Type.WORD -> AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD
708-
ActionData.MoveCursor.Type.LINE -> AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE
709-
ActionData.MoveCursor.Type.PARAGRAPH -> AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PARAGRAPH
710-
ActionData.MoveCursor.Type.PAGE -> AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PAGE
708+
ActionData.MoveCursor.Type.CHAR ->
709+
AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER
710+
ActionData.MoveCursor.Type.WORD ->
711+
AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD
712+
ActionData.MoveCursor.Type.LINE ->
713+
AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE
714+
ActionData.MoveCursor.Type.PARAGRAPH ->
715+
AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PARAGRAPH
716+
ActionData.MoveCursor.Type.PAGE ->
717+
AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PAGE
711718
}
712719

713720
AccessibilityNodeAction(
@@ -861,7 +868,7 @@ class PerformActionsUseCaseImpl @AssistedInject constructor(
861868

862869
is ActionData.ScreenOnOff -> {
863870
if (Build.VERSION.SDK_INT >= Constants.SYSTEM_BRIDGE_MIN_API &&
864-
systemBridgeConnectionManager.connectionState.value is SystemBridgeConnectionState.Connected
871+
systemBridgeConnectionManager.isConnected()
865872
) {
866873
val model = InjectKeyEventModel(
867874
keyCode = KeyEvent.KEYCODE_POWER,
@@ -932,6 +939,7 @@ class PerformActionsUseCaseImpl @AssistedInject constructor(
932939
}
933940

934941
ActionData.DeviceControls -> {
942+
@Suppress("ktlint:standard:max-line-length")
935943
result = intentAdapter.send(
936944
IntentTarget.ACTIVITY,
937945
uri = "#Intent;action=android.intent.action.MAIN;package=com.android.systemui;component=com.android.systemui/.controls.ui.ControlsActivity;end",

‎base/src/main/java/io/github/sds100/keymapper/base/actions/keyevent/ConfigKeyEventActionFragment.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ class ConfigKeyEventActionFragment : Fragment() {
8383
ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
8484
val insets =
8585
insets.getInsets(
86-
WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() or
86+
WindowInsetsCompat.Type.systemBars() or
87+
WindowInsetsCompat.Type.displayCutout() or
8788
WindowInsetsCompat.Type.ime(),
8889
)
8990
v.updatePadding(insets.left, insets.top, insets.right, insets.bottom)

‎base/src/main/java/io/github/sds100/keymapper/base/actions/pinchscreen/PinchPickDisplayCoordinateFragment.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ class PinchPickDisplayCoordinateFragment : Fragment() {
9999
ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
100100
val insets =
101101
insets.getInsets(
102-
WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() or
102+
WindowInsetsCompat.Type.systemBars() or
103+
WindowInsetsCompat.Type.displayCutout() or
103104
WindowInsetsCompat.Type.ime(),
104105
)
105106
v.updatePadding(insets.left, insets.top, insets.right, insets.bottom)

‎base/src/main/java/io/github/sds100/keymapper/base/actions/sound/ChooseSoundFileFragment.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ class ChooseSoundFileFragment : Fragment() {
8787
ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
8888
val insets =
8989
insets.getInsets(
90-
WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() or
90+
WindowInsetsCompat.Type.systemBars() or
91+
WindowInsetsCompat.Type.displayCutout() or
9192
WindowInsetsCompat.Type.ime(),
9293
)
9394
v.updatePadding(insets.left, insets.top, insets.right, insets.bottom)

0 commit comments

Comments
 (0)