Skip to content

Commit feac47a

Browse files
committed
Restores spotless and applies it
Change-Id: I324781eee58fdc8f1b04265893dd7f7766f5d811
1 parent 7927e0f commit feac47a

File tree

7 files changed

+42
-22
lines changed

7 files changed

+42
-22
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?><!--
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
23
Copyright 2025 The Android Open Source Project
34
45
Licensed under the Apache License, Version 2.0 (the "License");

core/network/src/main/res/xml/startup_initializers.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2025 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
https://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
217
<resources xmlns:android="http://schemas.android.com/apk/res/android">
318
<initializer
419
android:name="com.android.developers.androidify.startup.FirebaseAppCheckInitializer" />

feature/camera/src/screenshotTest/java/com/android/developers/androidify/camera/CameraScreenScreenshotTest.kt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.android.developers.androidify.camera
1717

18+
import android.graphics.Rect
1819
import androidx.compose.foundation.background
1920
import androidx.compose.foundation.layout.Box
2021
import androidx.compose.foundation.layout.fillMaxSize
@@ -34,7 +35,7 @@ class CameraScreenScreenshotTest {
3435
override val orientation: FoldingFeature.Orientation,
3536
override val occlusionType: FoldingFeature.OcclusionType = FoldingFeature.OcclusionType.NONE,
3637
override val isSeparating: Boolean = true,
37-
override val bounds: android.graphics.Rect = android.graphics.Rect()
38+
override val bounds: Rect = Rect(),
3839
) : FoldingFeature
3940

4041
@Preview(showBackground = true, name = "Default State")
@@ -49,10 +50,10 @@ class CameraScreenScreenshotTest {
4950
colors = listOf(
5051
Color.Red,
5152
Color.Green,
52-
Color.Blue
53-
)
54-
)
55-
)
53+
Color.Blue,
54+
),
55+
),
56+
),
5657
)
5758
},
5859
detectedPose = true,
@@ -145,7 +146,7 @@ class CameraScreenScreenshotTest {
145146
fun CameraScreenTabletopScreenshot() {
146147
val tabletopFoldingFeature = MockFoldingFeature(
147148
state = FoldingFeature.State.HALF_OPENED,
148-
orientation = FoldingFeature.Orientation.HORIZONTAL
149+
orientation = FoldingFeature.Orientation.HORIZONTAL,
149150
)
150151
AndroidifyTheme {
151152
StatelessCameraPreviewContent(
@@ -157,7 +158,7 @@ class CameraScreenScreenshotTest {
157158
zoomLevel = { 1f },
158159
onChangeZoomLevel = {},
159160
requestCaptureImage = {},
160-
foldingFeature = tabletopFoldingFeature // Changed
161+
foldingFeature = tabletopFoldingFeature, // Changed
161162
)
162163
}
163164
}
@@ -205,10 +206,10 @@ class CameraScreenScreenshotTest {
205206
colors = listOf(
206207
Color(0xFFFF0000),
207208
Color(0xFF7D299B),
208-
Color(0xFF1854CC)
209-
)
210-
)
211-
)
209+
Color(0xFF1854CC),
210+
),
211+
),
212+
),
212213
)
213214
}
214215
}

feature/home/src/androidTest/java/com/android/developers/androidify/home/HomeScreenTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class HomeScreenTest {
5454
},
5555
onAboutClicked = {}, // Provide a default or mock value,
5656
videoLink = "",
57-
dancingBotLink = ""
57+
dancingBotLink = "",
5858
)
5959
}
6060
}
@@ -78,7 +78,7 @@ class HomeScreenTest {
7878
onClickLetsGo = { },
7979
onAboutClicked = {},
8080
videoLink = "",
81-
dancingBotLink = ""
81+
dancingBotLink = "",
8282
)
8383
}
8484
}

feature/home/src/screenshotTest/java/com/android/developers/androidify/home/HomeScreenScreenshotTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class HomeScreenScreenshotTest {
3535
onClickLetsGo = { },
3636
onAboutClicked = {},
3737
videoLink = "",
38-
dancingBotLink = ""
38+
dancingBotLink = "",
3939
)
4040
}
4141
}

feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ fun ResultsScreenContents(
214214
verboseLayout: Boolean = allowsFullContent(),
215215
downloadClicked: () -> Unit,
216216
shareClicked: () -> Unit,
217-
defaultSelectedResult: ResultOption = ResultOption.ResultImage
217+
defaultSelectedResult: ResultOption = ResultOption.ResultImage,
218218
) {
219219
ResultsBackground()
220220
val showResult = state.value.resultImageBitmap != null

feature/results/src/screenshotTest/java/com/android/developers/androidify/results/ResultsScreenScreenshotTest.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import android.graphics.Color
2121
import android.graphics.LinearGradient
2222
import android.graphics.Paint
2323
import android.graphics.Shader
24-
import android.net.Uri // Added import for Uri
2524
import androidx.compose.foundation.layout.PaddingValues
2625
import androidx.compose.runtime.Composable
2726
import androidx.compose.runtime.CompositionLocalProvider
@@ -88,7 +87,6 @@ class ResultsScreenScreenshotTest {
8887
}
8988
}
9089

91-
9290
@Preview(showBackground = true)
9391
@Composable
9492
fun ResultsScreen_OriginalInputPreview() {
@@ -98,7 +96,7 @@ class ResultsScreenScreenshotTest {
9896
ResultState(
9997
resultImageBitmap = mockBitmap,
10098
promptText = "wearing a hat with straw hair",
101-
)
99+
),
102100
)
103101
}
104102
CompositionLocalProvider(value = LocalInspectionMode provides true) {
@@ -109,7 +107,7 @@ class ResultsScreenScreenshotTest {
109107
verboseLayout = true,
110108
downloadClicked = {},
111109
shareClicked = {},
112-
defaultSelectedResult = ResultOption.OriginalInput // Set the non-default option
110+
defaultSelectedResult = ResultOption.OriginalInput, // Set the non-default option
113111
)
114112
}
115113
}
@@ -123,8 +121,13 @@ class ResultsScreenScreenshotTest {
123121
val canvas = Canvas(mockBitmap)
124122
val paint = Paint()
125123
val gradient = LinearGradient(
126-
0f, 0f, width.toFloat(), height.toFloat(),
127-
Color.RED, Color.BLUE, Shader.TileMode.CLAMP
124+
0f,
125+
0f,
126+
width.toFloat(),
127+
height.toFloat(),
128+
Color.RED,
129+
Color.BLUE,
130+
Shader.TileMode.CLAMP,
128131
)
129132
paint.shader = gradient
130133
canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), paint)

0 commit comments

Comments
 (0)