Merge pull request #17 from 47star/main

riggaroo · web-flow · commit f6b24d7e2aea · 2025-05-23T11:54:36.000-07:00
Remove redundant license comment header
diff --git a/app/src/main/java/com/android/developers/androidify/navigation/ListSaver.kt b/app/src/main/java/com/android/developers/androidify/navigation/ListSaver.kt
@@ -34,22 +34,6 @@ import kotlinx.serialization.encoding.decodeStructure
 import kotlinx.serialization.encoding.encodeStructure
 import kotlinx.serialization.serializer
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
-
 @Composable
 fun <T : Any> rememberMutableStateListOf(vararg elements: T): SnapshotStateList<Any> {
     return rememberSaveable(saver = snapshotStateListSaver(serializableListSaver())) {
diff --git a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt
@@ -45,21 +45,6 @@ import com.android.developers.androidify.home.AboutScreen
 import com.android.developers.androidify.home.HomeScreen
 import com.android.developers.androidify.theme.transitions.ColorSplashTransitionScreen
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 @ExperimentalMaterial3ExpressiveApi
 @Composable
 fun MainNavigation() {
diff --git a/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt b/app/src/main/java/com/android/developers/androidify/navigation/NavigationRoutes.kt
@@ -20,21 +20,6 @@ package com.android.developers.androidify.navigation
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 interface NavigationRoute
 
 @Serializable
diff --git a/core/network/src/main/java/com/android/developers/androidify/RemoteConfigDataSource.kt b/core/network/src/main/java/com/android/developers/androidify/RemoteConfigDataSource.kt
@@ -20,21 +20,6 @@ import com.google.firebase.remoteconfig.remoteConfig
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 interface RemoteConfigDataSource {
     fun isAppInactive(): Boolean
     fun textModelName(): String
diff --git a/core/network/src/main/java/com/android/developers/androidify/di/NetworkModule.kt b/core/network/src/main/java/com/android/developers/androidify/di/NetworkModule.kt
@@ -37,21 +37,6 @@ import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 @Module
 @InstallIn(SingletonComponent::class)
 internal class NetworkModule @Inject constructor() {
diff --git a/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt b/core/network/src/main/java/com/android/developers/androidify/vertexai/FirebaseAiDataSource.kt
@@ -44,22 +44,6 @@ import kotlinx.serialization.json.jsonPrimitive
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
-
 interface FirebaseAiDataSource {
     suspend fun validatePromptHasEnoughInformation(inputPrompt: String): ValidatedDescription
     suspend fun validateImageHasEnoughInformation(image: Bitmap): ValidatedImage
diff --git a/core/theme/src/main/java/com/android/developers/androidify/theme/Motion.kt b/core/theme/src/main/java/com/android/developers/androidify/theme/Motion.kt
@@ -23,21 +23,6 @@ import androidx.compose.material3.MotionScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.geometry.Rect
 
-/*
-* 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
-*
-*     http://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.
-*/
 @OptIn(
     ExperimentalMaterial3ExpressiveApi::class,
     ExperimentalSharedTransitionApi::class,
diff --git a/core/theme/src/main/java/com/android/developers/androidify/theme/SharedElementsConfig.kt b/core/theme/src/main/java/com/android/developers/androidify/theme/SharedElementsConfig.kt
@@ -66,21 +66,6 @@ import androidx.navigation3.ui.LocalNavAnimatedContentScope
 import com.android.developers.androidify.util.skipToLookaheadPlacement
 import kotlin.math.max
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 sealed interface SharedElementKey {
     object CameraButtonToFullScreenCamera : SharedElementKey
     object CaptureImageToDetails : SharedElementKey
diff --git a/core/theme/src/main/java/com/android/developers/androidify/theme/components/Backgrounds.kt b/core/theme/src/main/java/com/android/developers/androidify/theme/components/Backgrounds.kt
@@ -46,21 +46,6 @@ import com.android.developers.androidify.util.backgroundRepeatX
 import com.android.developers.androidify.util.dpToPx
 import com.android.developers.androidify.util.isAtLeastMedium
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 @Composable
 fun SquiggleBackground(
     modifier: Modifier = Modifier,
diff --git a/core/util/src/main/java/com/android/developers/androidify/util/AdaptivePreview.kt b/core/util/src/main/java/com/android/developers/androidify/util/AdaptivePreview.kt
@@ -22,22 +22,6 @@ import androidx.compose.ui.tooling.preview.Devices.PIXEL_FOLD
 import androidx.compose.ui.tooling.preview.Devices.PIXEL_TABLET
 import androidx.compose.ui.tooling.preview.Preview
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
-
 @Preview(device = PIXEL_7_PRO, name = "Phone preview")
 annotation class PhonePreview
 
diff --git a/core/util/src/main/java/com/android/developers/androidify/util/AnimationUtils.kt b/core/util/src/main/java/com/android/developers/androidify/util/AnimationUtils.kt
@@ -31,21 +31,6 @@ import kotlinx.coroutines.delay
 import java.text.BreakIterator
 import java.text.StringCharacterIterator
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 /**
  * Skips to the end size for a particular composable, skipping through the intermediate animated sizes.
  * Similar to skipToLookaheadSize, but for placement instead.
diff --git a/core/util/src/main/java/com/android/developers/androidify/util/GraphicsUtils.kt b/core/util/src/main/java/com/android/developers/androidify/util/GraphicsUtils.kt
@@ -36,21 +36,6 @@ import androidx.compose.ui.unit.dp
 import androidx.core.graphics.PathSegment
 import androidx.core.graphics.flatten
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 @Composable
 fun Dp.dpToPx() = with(LocalDensity.current) { this@dpToPx.toPx() }
 
diff --git a/core/util/src/main/java/com/android/developers/androidify/util/LayoutUtils.kt b/core/util/src/main/java/com/android/developers/androidify/util/LayoutUtils.kt
@@ -15,22 +15,6 @@
  */
 package com.android.developers.androidify.util
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
-
 import android.annotation.SuppressLint
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
diff --git a/core/util/src/main/java/com/android/developers/androidify/util/LocalFileProvider.kt b/core/util/src/main/java/com/android/developers/androidify/util/LocalFileProvider.kt
@@ -31,21 +31,6 @@ import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 interface LocalFileProvider {
     fun saveBitmapToFile(bitmap: Bitmap, file: File): File
     fun getFileFromCache(fileName: String): File
diff --git a/data/src/main/java/com/android/developers/androidify/data/DataModule.kt b/data/src/main/java/com/android/developers/androidify/data/DataModule.kt
@@ -32,22 +32,6 @@ import kotlinx.coroutines.Dispatchers
 import javax.inject.Named
 import javax.inject.Singleton
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
-
 @Module
 @InstallIn(SingletonComponent::class)
 internal object DataModule {
diff --git a/data/src/main/java/com/android/developers/androidify/data/Exceptions.kt b/data/src/main/java/com/android/developers/androidify/data/Exceptions.kt
@@ -17,21 +17,6 @@ package com.android.developers.androidify.data
 
 import com.android.developers.androidify.model.ImageValidationError as ModelImageValidationError
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
 class InsufficientInformationException(errorMessage: String? = null) : Exception(errorMessage)
 
 class ImageValidationException(val imageValidationError: ImageValidationError? = null) : Exception(imageValidationError.toString())
diff --git a/data/src/main/java/com/android/developers/androidify/data/GeminiNanoGenerationDataSource.kt b/data/src/main/java/com/android/developers/androidify/data/GeminiNanoGenerationDataSource.kt
@@ -19,22 +19,6 @@ import android.util.Log
 import javax.inject.Inject
 import javax.inject.Singleton
 
-/*
-* Copyright 2025 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
-*
-*     http://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.
-*/
-
 interface GeminiNanoGenerationDataSource {
     suspend fun initialize()
     suspend fun generatePrompt(prompt: String): String?
diff --git a/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt b/data/src/main/java/com/android/developers/androidify/data/ImageGenerationRepository.kt
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/AndroidBotColorPicker.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/AndroidBotColorPicker.kt
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationViewModel.kt
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt
diff --git a/feature/home/src/main/java/com/android/developers/androidify/home/HomeViewModel.kt b/feature/home/src/main/java/com/android/developers/androidify/home/HomeViewModel.kt
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsViewModel.kt
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ShareAction.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ShareAction.kt
