Add spotless (android#23)

* Add spotless * Using init script. * Add spotless * Remove editorconfig.
pedrosax · Dec 8, 2022 · 0655c15 · 0655c15
1 parent 85ab926
commit 0655c15
Show file tree

Hide file tree

Showing 22 changed files with 740 additions and 437 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,5 +40,8 @@ jobs:
       with:
         java-version: 11
 
+    - name: Check formatting
+      run: ./gradlew :compose:spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
+
     - name: Build Compose
       run: ./gradlew :compose:build
diff --git a/...ighlighter/src/main/java/com/example/android/compose/recomposehighlighter/MainActivity.kt b/...ighlighter/src/main/java/com/example/android/compose/recomposehighlighter/MainActivity.kt
@@ -1,20 +1,21 @@
 /*
- *  Copyright 2022 Google Inc.
+ * Copyright 2022 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.example.android.compose.recomposehighlighter
 
-import android.content.Context
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -46,7 +47,8 @@ private fun Content() {
     Column(
         Modifier
             .fillMaxSize()
-            .padding(16.dp)) {
+            .padding(16.dp)
+    ) {
         Button(
             onClick = { counter++ },
             Modifier.padding(bottom = 12.dp)

diff --git a/...er/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt b/...er/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt
@@ -1,15 +1,17 @@
 /*
- *  Copyright 2022 Google Inc.
+ * Copyright 2022 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.example.android.compose.recomposehighlighter
@@ -78,7 +80,7 @@ private val recomposeModifier =
 
                 val (color, strokeWidthPx) =
                     when (numCompositionsSinceTimeout) {
-                        // We need at least one composition to draw, so draw the smallest border 
+                        // We need at least one composition to draw, so draw the smallest border
                         // color in blue.
                         1L -> Color.Blue to 1f
                         // 2 compositions is _probably_ okay.

diff --git a/...c/androidTest/java/com/example/compose/snippets/interop/AddingComposeToYourAppSnippets.kt b/...c/androidTest/java/com/example/compose/snippets/interop/AddingComposeToYourAppSnippets.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.example.compose.snippets.interop
 
 import androidx.compose.ui.test.assertIsDisplayed
@@ -11,16 +27,16 @@ import org.junit.Test
 
 // [START android_compose_interop_add_compose_test_mixed]
 class MyActivityTest {
-  @Rule
-  @JvmField
-  val composeTestRule = createAndroidComposeRule<MyActivity>()
+    @Rule
+    @JvmField
+    val composeTestRule = createAndroidComposeRule<MyActivity>()
 
-  @Test
-  fun testGreeting() {
-    val greeting = InstrumentationRegistry.getInstrumentation()
-      .targetContext.resources.getString(R.string.greeting)
+    @Test
+    fun testGreeting() {
+        val greeting = InstrumentationRegistry.getInstrumentation()
+            .targetContext.resources.getString(R.string.greeting)
 
-    composeTestRule.onNodeWithText(greeting).assertIsDisplayed()
-  }
+        composeTestRule.onNodeWithText(greeting).assertIsDisplayed()
+    }
 }
 // [END android_compose_interop_add_compose_test_mixed]
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/MyActivity.kt b/compose/snippets/src/main/java/com/example/compose/snippets/MyActivity.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.example.compose.snippets
 
 import android.os.Bundle
@@ -7,10 +23,10 @@ import androidx.compose.material3.Text
 import androidx.compose.ui.res.stringResource
 
 class MyActivity : ComponentActivity() {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContent {
-      Text(text = stringResource(id = R.string.greeting))
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            Text(text = stringResource(id = R.string.greeting))
+        }
     }
-  }
-}
+}
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt b/compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt
@@ -1,29 +1,29 @@
 /*
- *  Copyright 2022 Google LLC
+ * Copyright 2022 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package com.example.compose.snippets
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.example.compose.snippets.graphics.BrushExamplesScreen
 import com.example.compose.snippets.images.ImageExamplesScreen
 import com.example.compose.snippets.ui.theme.SnippetsTheme
 
@@ -38,13 +38,15 @@ class SnippetsActivity : ComponentActivity() {
                     color = MaterialTheme.colorScheme.background
                 ) {
                     // TODO - We should put these in different navigation destinations
-                    Column(modifier = Modifier
-                        .fillMaxSize()) {
-                       // BrushExamplesScreen()
+                    Column(
+                        modifier = Modifier
+                            .fillMaxSize()
+                    ) {
+                        // BrushExamplesScreen()
                         ImageExamplesScreen()
                     }
                 }
             }
         }
     }
-}
+}
diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/graphics/BrushExampleSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/graphics/BrushExampleSnippets.kt
@@ -1,16 +1,19 @@
 /*
- *  Copyright 2022 Google LLC
+ * Copyright 2022 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     https://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package com.example.compose.snippets.graphics
 
 import android.graphics.RuntimeShader
@@ -91,7 +94,6 @@ fun BrushExamplesScreen() {
     }
 }
 
-
 @Preview
 @Composable
 fun GraphicsBrushCanvasUsage() {
@@ -160,7 +162,6 @@ fun GraphicsBrushSize() {
                     tileMode = TileMode.Mirror
                 )
             }
-
         }
     }
     Box(
@@ -201,7 +202,6 @@ fun GraphicsBrushSizeRadialGradientAfter() {
                 colorStops = listOf(0f, 0.95f)
             )
         }
-
     }
 
     Box(
@@ -228,14 +228,14 @@ fun GraphicsBrushSizeRecreationExample() {
             .drawBehind {
                 drawRect(brush = brush) // will allocate a shader to occupy the 200 x 200 dp drawing area
                 inset(10f) {
-                    /* Will allocate a shader to occupy the 180 x 180 dp drawing area as the
-                     inset scope reduces the drawing  area by 10 pixels on the left, top, right,
-                    bottom sides */
+          /* Will allocate a shader to occupy the 180 x 180 dp drawing area as the
+           inset scope reduces the drawing  area by 10 pixels on the left, top, right,
+          bottom sides */
                     drawRect(brush = brush)
                     inset(5f) {
-                        /* will allocate a shader to occupy the 170 x 170 dp drawing area as the
-                         inset scope reduces the  drawing area by 5 pixels on the left, top,
-                         right, bottom sides */
+            /* will allocate a shader to occupy the 170 x 170 dp drawing area as the
+             inset scope reduces the  drawing area by 5 pixels on the left, top,
+             right, bottom sides */
                         drawRect(brush = brush)
                     }
                 }
@@ -249,7 +249,8 @@ fun GraphicsBrushSizeRecreationExample() {
 @Composable
 fun GraphicsImageBrush() {
     // [START android_compose_graphics_brush_image]
-    val imageBrush = ShaderBrush(ImageShader(ImageBitmap.imageResource(id = R.drawable.dog)))
+    val imageBrush =
+        ShaderBrush(ImageShader(ImageBitmap.imageResource(id = R.drawable.dog)))
 
     // Use ImageShader Brush with background
     Box(
@@ -262,7 +263,17 @@ fun GraphicsImageBrush() {
     Text(
         text = "Hello Android!",
         style = TextStyle(
-            brush =  imageBrush,
+            brush = imageBrush,
+            fontWeight = FontWeight.ExtraBold,
+            fontSize = 36.sp
+        )
+    )
+
+    // Use ImageShader Brush with TextStyle
+    Text(
+        text = "Hello Android!",
+        style = TextStyle(
+            brush = imageBrush,
             fontWeight = FontWeight.ExtraBold,
             fontSize = 36.sp
         )
@@ -299,28 +310,36 @@ val LightYellow = Color(0xFFF8EE94)
 @Composable
 @Preview
 fun ShaderBrushExample() {
-    Box(modifier = Modifier
-        .drawWithCache {
-            val shader = RuntimeShader(CUSTOM_SHADER)
-            val shaderBrush = ShaderBrush(shader)
-            shader.setFloatUniform("resolution", size.width, size.height)
-            onDrawBehind {
-                shader.setColorUniform(
-                    "color",
-                    android.graphics.Color.valueOf(
-                        LightYellow.red, LightYellow.green, LightYellow
-                            .blue, LightYellow.alpha
+    Box(
+        modifier = Modifier
+            .drawWithCache {
+                val shader = RuntimeShader(CUSTOM_SHADER)
+                val shaderBrush = ShaderBrush(shader)
+                shader.setFloatUniform("resolution", size.width, size.height)
+                onDrawBehind {
+                    shader.setColorUniform(
+                        "color",
+                        android.graphics.Color.valueOf(
+                            LightYellow.red, LightYellow.green,
+                            LightYellow
+                                .blue,
+                            LightYellow.alpha
+                        )
                     )
-                )
-                shader.setColorUniform(
-                    "color2",
-                    android.graphics.Color.valueOf(Coral.red, Coral.green, Coral.blue, Coral.alpha)
-                )
-                drawRect(shaderBrush)
+                    shader.setColorUniform(
+                        "color2",
+                        android.graphics.Color.valueOf(
+                            Coral.red,
+                            Coral.green,
+                            Coral.blue,
+                            Coral.alpha
+                        )
+                    )
+                    drawRect(shaderBrush)
+                }
             }
-        }
-        .fillMaxWidth()
-        .height(200.dp)
+            .fillMaxWidth()
+            .height(200.dp)
     )
 }
 // [END android_compose_brush_custom_shader_usage]