Skip to content

Commit 5a6f842

Browse files
authored
chore(Android): run :spotlessApply (#3614)
For some reason `yarn lint-android` returns success locally, while the CI fails. Running `./gradlew :spotlessApply` fixes the issue.
1 parent 8f80ca3 commit 5a6f842

2 files changed

Lines changed: 37 additions & 14 deletions

File tree

android/src/main/java/com/swmansion/rnscreens/gamma/stack/host/FragmentOperationExecutor.kt

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ internal class FragmentOperationExecutor {
88
internal fun executeOperations(
99
fragmentManager: FragmentManager,
1010
ops: List<FragmentOperation>,
11-
flushSync: Boolean = false
11+
flushSync: Boolean = false,
1212
) {
1313
ops.forEach { it.execute(fragmentManager, this) }
1414

@@ -17,7 +17,10 @@ internal class FragmentOperationExecutor {
1717
}
1818
}
1919

20-
internal fun executeAddOp(fragmentManager: FragmentManager, op: AddOp) {
20+
internal fun executeAddOp(
21+
fragmentManager: FragmentManager,
22+
op: AddOp,
23+
) {
2124
fragmentManager.createTransactionWithReordering().let { tx ->
2225
tx.add(op.containerViewId, op.fragment)
2326
if (op.addToBackStack) {
@@ -27,25 +30,37 @@ internal class FragmentOperationExecutor {
2730
}
2831
}
2932

30-
internal fun executePopBackStackOp(fragmentManager: FragmentManager, op: PopBackStackOp) {
33+
internal fun executePopBackStackOp(
34+
fragmentManager: FragmentManager,
35+
op: PopBackStackOp,
36+
) {
3137
fragmentManager.popBackStack(
3238
op.fragment.stackScreen.screenKey,
33-
FragmentManager.POP_BACK_STACK_INCLUSIVE
39+
FragmentManager.POP_BACK_STACK_INCLUSIVE,
3440
)
3541
}
3642

37-
internal fun executeRemoveOp(fragmentManager: FragmentManager, op: RemoveOp) {
43+
internal fun executeRemoveOp(
44+
fragmentManager: FragmentManager,
45+
op: RemoveOp,
46+
) {
3847
fragmentManager.createTransactionWithReordering().let { tx ->
3948
tx.remove(op.fragment)
4049
commitTransaction(tx, op.allowStateLoss, op.flushSync)
4150
}
4251
}
4352

44-
internal fun executeFlushOp(fragmentManager: FragmentManager, op: FlushNowOp) {
53+
internal fun executeFlushOp(
54+
fragmentManager: FragmentManager,
55+
op: FlushNowOp,
56+
) {
4557
fragmentManager.executePendingTransactions()
4658
}
4759

48-
internal fun executeSetPrimaryNavFragmentOp(fragmentManager: FragmentManager, op: SetPrimaryNavFragmentOp) {
60+
internal fun executeSetPrimaryNavFragmentOp(
61+
fragmentManager: FragmentManager,
62+
op: SetPrimaryNavFragmentOp,
63+
) {
4964
fragmentManager.createTransactionWithReordering().let { tx ->
5065
tx.setPrimaryNavigationFragment(op.fragment)
5166
commitTransaction(tx, allowStateLoss = true, flushSync = false)
@@ -55,7 +70,7 @@ internal class FragmentOperationExecutor {
5570
private fun commitTransaction(
5671
tx: FragmentTransaction,
5772
allowStateLoss: Boolean,
58-
flushSync: Boolean = false
73+
flushSync: Boolean = false,
5974
) {
6075
if (flushSync) {
6176
commitSync(tx, allowStateLoss)
@@ -64,15 +79,21 @@ internal class FragmentOperationExecutor {
6479
}
6580
}
6681

67-
private fun commitAsync(tx: FragmentTransaction, allowStateLoss: Boolean) {
82+
private fun commitAsync(
83+
tx: FragmentTransaction,
84+
allowStateLoss: Boolean,
85+
) {
6886
if (allowStateLoss) {
6987
tx.commitAllowingStateLoss()
7088
} else {
7189
tx.commit()
7290
}
7391
}
7492

75-
private fun commitSync(tx: FragmentTransaction, allowStateLoss: Boolean) {
93+
private fun commitSync(
94+
tx: FragmentTransaction,
95+
allowStateLoss: Boolean,
96+
) {
7697
if (allowStateLoss) {
7798
tx.commitNowAllowingStateLoss()
7899
} else {

android/src/main/java/com/swmansion/rnscreens/gamma/stack/screen/StackScreen.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import kotlin.properties.Delegates
1414
@SuppressLint("ViewConstructor") // should never be restored
1515
class StackScreen(
1616
private val reactContext: ThemedReactContext,
17-
) : ViewGroup(reactContext), FragmentProviding {
17+
) : ViewGroup(reactContext),
18+
FragmentProviding {
1819
enum class ActivityMode {
1920
DETACHED,
2021
ATTACHED,
@@ -69,7 +70,8 @@ class StackScreen(
6970
b: Int,
7071
) = Unit
7172

72-
override fun getAssociatedFragment(): Fragment? = this.findFragmentOrNull()?.also {
73-
check(it is StackScreenFragment) { "[RNScreens] Unexpected fragment type: ${it.javaClass.simpleName}"}
74-
}
73+
override fun getAssociatedFragment(): Fragment? =
74+
this.findFragmentOrNull()?.also {
75+
check(it is StackScreenFragment) { "[RNScreens] Unexpected fragment type: ${it.javaClass.simpleName}" }
76+
}
7577
}

0 commit comments

Comments
 (0)