Skip to content

Commit c61dc2a

Browse files
authored
Format all kotlin according to ktlint (#143390)
Entire pr generated with [ktlint](https://github.com/pinterest/ktlint) --format. First step before enabling linting as part of presubmit for kotlin changes.
1 parent dc1f9f1 commit c61dc2a

File tree

16 files changed

+272
-228
lines changed

16 files changed

+272
-228
lines changed

dev/a11y_assessments/android/app/src/main/kotlin/com/example/a11y_assessments/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package com.example.a11y_assessments
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity : FlutterActivity()

dev/benchmarks/multiple_flutters/android/app/src/main/java/dev/flutter/multipleflutters/MainActivity.kt

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@
44

55
package dev.flutter.multipleflutters
66

7-
import android.content.Intent
8-
import androidx.appcompat.app.AppCompatActivity
97
import android.os.Bundle
10-
import android.view.View
118
import android.widget.FrameLayout
129
import android.widget.LinearLayout
13-
import android.widget.TextView
1410
import androidx.fragment.app.FragmentActivity
1511
import androidx.fragment.app.FragmentManager
1612
import io.flutter.FlutterInjector
1713
import io.flutter.embedding.android.FlutterFragment
18-
import io.flutter.embedding.engine.FlutterEngine
1914
import io.flutter.embedding.engine.FlutterEngineCache
2015
import io.flutter.embedding.engine.dart.DartExecutor
2116

@@ -25,10 +20,11 @@ class MainActivity : FragmentActivity() {
2520
override fun onCreate(savedInstanceState: Bundle?) {
2621
super.onCreate(savedInstanceState)
2722
val root = LinearLayout(this)
28-
root.layoutParams = LinearLayout.LayoutParams(
29-
LinearLayout.LayoutParams.MATCH_PARENT,
30-
LinearLayout.LayoutParams.MATCH_PARENT
31-
)
23+
root.layoutParams =
24+
LinearLayout.LayoutParams(
25+
LinearLayout.LayoutParams.MATCH_PARENT,
26+
LinearLayout.LayoutParams.MATCH_PARENT,
27+
)
3228
root.orientation = LinearLayout.VERTICAL
3329
root.weightSum = numberOfFlutters.toFloat()
3430

@@ -39,21 +35,24 @@ class MainActivity : FragmentActivity() {
3935
val app = applicationContext as App
4036
val dartEntrypoint =
4137
DartExecutor.DartEntrypoint(
42-
FlutterInjector.instance().flutterLoader().findAppBundlePath(), "main"
38+
FlutterInjector.instance().flutterLoader().findAppBundlePath(),
39+
"main",
4340
)
44-
val engines = generateSequence(0) { it + 1 }
45-
.take(numberOfFlutters)
46-
.map { app.engines.createAndRunEngine(this, dartEntrypoint) }
47-
.toList()
41+
val engines =
42+
generateSequence(0) { it + 1 }
43+
.take(numberOfFlutters)
44+
.map { app.engines.createAndRunEngine(this, dartEntrypoint) }
45+
.toList()
4846
for (i in 0 until numberOfFlutters) {
4947
val flutterContainer = FrameLayout(this)
5048
root.addView(flutterContainer)
5149
flutterContainer.id = 12345 + i
52-
flutterContainer.layoutParams = LinearLayout.LayoutParams(
53-
FrameLayout.LayoutParams.MATCH_PARENT,
54-
FrameLayout.LayoutParams.MATCH_PARENT,
55-
1.0f
56-
)
50+
flutterContainer.layoutParams =
51+
LinearLayout.LayoutParams(
52+
FrameLayout.LayoutParams.MATCH_PARENT,
53+
FrameLayout.LayoutParams.MATCH_PARENT,
54+
1.0f,
55+
)
5756
val engine = engines[i]
5857
FlutterEngineCache.getInstance().put(i.toString(), engine)
5958
val flutterFragment =
@@ -62,7 +61,7 @@ class MainActivity : FragmentActivity() {
6261
.beginTransaction()
6362
.add(
6463
12345 + i,
65-
flutterFragment
64+
flutterFragment,
6665
)
6766
.commit()
6867
}

dev/benchmarks/platform_channels_benchmarks/android/app/src/main/kotlin/com/example/platform_channels_benchmarks/MainActivity.kt

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,40 @@ import io.flutter.plugin.common.BinaryCodec
1111
import io.flutter.plugin.common.StandardMessageCodec
1212
import java.nio.ByteBuffer
1313

14-
class MainActivity: FlutterActivity() {
14+
class MainActivity : FlutterActivity() {
1515
// We allow for the caching of a response in the binary channel case since
1616
// the reply requires a direct buffer, but the input is not a direct buffer.
1717
// We can't directly send the input back to the reply currently.
18-
private var byteBufferCache : ByteBuffer? = null
18+
private var byteBufferCache: ByteBuffer? = null
19+
1920
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
2021
val reset = BasicMessageChannel(flutterEngine.dartExecutor, "dev.flutter.echo.reset", StandardMessageCodec.INSTANCE)
21-
reset.setMessageHandler { message, reply -> run {
22-
byteBufferCache = null
23-
} }
24-
val basicStandard = BasicMessageChannel(flutterEngine.dartExecutor, "dev.flutter.echo.basic.standard", StandardMessageCodec.INSTANCE)
22+
reset.setMessageHandler { message, reply ->
23+
run {
24+
byteBufferCache = null
25+
}
26+
}
27+
val basicStandard =
28+
BasicMessageChannel(flutterEngine.dartExecutor, "dev.flutter.echo.basic.standard", StandardMessageCodec.INSTANCE)
2529
basicStandard.setMessageHandler { message, reply -> reply.reply(message) }
2630
val basicBinary = BasicMessageChannel(flutterEngine.dartExecutor, "dev.flutter.echo.basic.binary", BinaryCodec.INSTANCE_DIRECT)
27-
basicBinary.setMessageHandler { message, reply -> run {
28-
if (byteBufferCache == null) {
29-
byteBufferCache = ByteBuffer.allocateDirect(message!!.capacity())
30-
byteBufferCache!!.put(message)
31+
basicBinary.setMessageHandler { message, reply ->
32+
run {
33+
if (byteBufferCache == null) {
34+
byteBufferCache = ByteBuffer.allocateDirect(message!!.capacity())
35+
byteBufferCache!!.put(message)
36+
}
37+
reply.reply(byteBufferCache)
3138
}
32-
reply.reply(byteBufferCache)
33-
} }
34-
val taskQueue = flutterEngine.dartExecutor.getBinaryMessenger().makeBackgroundTaskQueue();
35-
val backgroundStandard = BasicMessageChannel(flutterEngine.dartExecutor, "dev.flutter.echo.background.standard", StandardMessageCodec.INSTANCE, taskQueue)
39+
}
40+
val taskQueue = flutterEngine.dartExecutor.getBinaryMessenger().makeBackgroundTaskQueue()
41+
val backgroundStandard =
42+
BasicMessageChannel(
43+
flutterEngine.dartExecutor,
44+
"dev.flutter.echo.background.standard",
45+
StandardMessageCodec.INSTANCE,
46+
taskQueue,
47+
)
3648
backgroundStandard.setMessageHandler { message, reply -> reply.reply(message) }
3749
super.configureFlutterEngine(flutterEngine)
3850
}

dev/integration_tests/abstract_method_smoke_test/android/app/src/main/kotlin/com/example/abstract_method_smoke_test/MainActivity.kt

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.example.abstract_method_smoke_test
22

33
import android.content.Context
44
import android.graphics.Color
5-
import android.os.Bundle
65
import android.view.View
76
import android.view.inputmethod.InputMethodManager
87
import androidx.annotation.NonNull
@@ -30,25 +29,34 @@ class MainActivity : FlutterActivity() {
3029
}
3130
}
3231

33-
override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
34-
GeneratedPluginRegistrant.registerWith(flutterEngine);
32+
override fun configureFlutterEngine(
33+
@NonNull flutterEngine: FlutterEngine,
34+
) {
35+
GeneratedPluginRegistrant.registerWith(flutterEngine)
3536

36-
val shimPluginRegistry = ShimPluginRegistry(flutterEngine);
37+
val shimPluginRegistry = ShimPluginRegistry(flutterEngine)
3738
shimPluginRegistry.registrarFor("com.example.abstract_method_smoke_test")
38-
.platformViewRegistry()
39-
.registerViewFactory("simple", object : PlatformViewFactory(StandardMessageCodec.INSTANCE) {
40-
override fun create(context: Context?, viewId: Int, args: Any?): PlatformView {
39+
.platformViewRegistry()
40+
.registerViewFactory(
41+
"simple",
42+
object : PlatformViewFactory(StandardMessageCodec.INSTANCE) {
43+
override fun create(
44+
context: Context?,
45+
viewId: Int,
46+
args: Any?,
47+
): PlatformView {
4148
return SimplePlatformView(this@MainActivity)
4249
}
43-
})
50+
},
51+
)
4452

4553
// Triggers the Android keyboard, which causes the resize of the Flutter view.
4654
// We need to wait for the app to complete.
4755
MethodChannel(flutterEngine.getDartExecutor(), "com.example.abstract_method_smoke_test")
48-
.setMethodCallHandler { _, result ->
49-
toggleInput()
50-
result.success(null)
51-
}
56+
.setMethodCallHandler { _, result ->
57+
toggleInput()
58+
result.success(null)
59+
}
5260
}
5361

5462
override fun onPause() {
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.example.android_embedding_v2_smoke_test
22

3-
import androidx.annotation.NonNull;
3+
import androidx.annotation.NonNull
44
import io.flutter.embedding.android.FlutterActivity
55
import io.flutter.embedding.engine.FlutterEngine
66
import io.flutter.plugins.GeneratedPluginRegistrant
77

8-
class MainActivity: FlutterActivity() {
9-
override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
10-
GeneratedPluginRegistrant.registerWith(flutterEngine);
8+
class MainActivity : FlutterActivity() {
9+
override fun configureFlutterEngine(
10+
@NonNull flutterEngine: FlutterEngine,
11+
) {
12+
GeneratedPluginRegistrant.registerWith(flutterEngine)
1113
}
1214
}

dev/integration_tests/deferred_components_test/android/app/src/main/kotlin/io/flutter/integration/deferred_components_test/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package io.flutter.integration.deferred_components_test
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity : FlutterActivity()

dev/integration_tests/non_nullable/android/app/src/main/kotlin/com/example/non_nullable/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package com.example.non_nullable
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity : FlutterActivity()

dev/integration_tests/spell_check/android/app/src/main/kotlin/com/example/sc_int_test/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package com.example.spell_check
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity : FlutterActivity()

dev/manual_tests/android/app/src/main/kotlin/dev/flutter/manual_tests/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package dev.flutter.manual_tests
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity : FlutterActivity()

dev/tracing_tests/android/app/src/main/kotlin/com/example/tracing_tests/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package com.example.tracing_tests
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity : FlutterActivity()

examples/api/android/app/src/main/kotlin/dev/flutter/flutter_api_samples/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package dev.flutter.flutter_api_samples
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity : FlutterActivity()

examples/hello_world/android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ subprojects {
2424
ignoredDependencies.add("io.flutter:*")
2525
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
2626
if (!project.hasProperty("local-engine-repo")) {
27-
lockAllConfigurations()
27+
lockAllConfigurations()
2828
}
2929
}
3030
}

examples/hello_world/android/settings.gradle.kts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
// See #141540.
88

99
pluginManagement {
10-
val flutterSdkPath = run {
11-
val properties = java.util.Properties()
12-
file("local.properties").inputStream().use { properties.load(it) }
13-
val flutterSdkPath = properties.getProperty("flutter.sdk")
14-
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
15-
flutterSdkPath
16-
}
10+
val flutterSdkPath =
11+
run {
12+
val properties = java.util.Properties()
13+
file("local.properties").inputStream().use { properties.load(it) }
14+
val flutterSdkPath = properties.getProperty("flutter.sdk")
15+
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
16+
flutterSdkPath
17+
}
1718

1819
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1920

packages/flutter_tools/gradle/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ plugins {
77
`groovy`
88
}
99

10-
1110
group = "dev.flutter.plugin"
1211
version = "1.0.0"
1312

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencyResolutionManagement {
2-
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
2+
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
3+
repositories {
4+
google()
5+
mavenCentral()
6+
}
77
}

0 commit comments

Comments
 (0)