Fix format issues

core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/DefaultSearchContentsRepository.kt

@@ -1,17 +1,17 @@
 /*
  * Copyright 2023 The Android Open Source Project
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * You may obtain a copy of the License at
  *
- *       https://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
+ * Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
- *   limitations under the License.
+ * limitations under the License.
  */
 
 package com.google.samples.apps.nowinandroid.core.data.repository
@@ -41,17 +41,17 @@ class DefaultSearchContentsRepository @Inject constructor(
     override fun searchContents(searchQuery: String): Flow<SearchResult> {
         // Surround the query by asterisks to match the query when it's in the middle of
         // a word
-        val newsResourceIds = newsResourceFtsDao.searchAllNewsResources("*${searchQuery}*")
+        val newsResourceIds = newsResourceFtsDao.searchAllNewsResources("*$searchQuery*")
-        val topicIds = topicFtsDao.searchAllTopics("*${searchQuery}*")
+        val topicIds = topicFtsDao.searchAllTopics("*$searchQuery*")
 
         return combine(
             newsResourceDao.getNewsResources(filterNewsIds = newsResourceIds.toSet()),
-            topicDao.getTopicEntities(topicIds.toSet())
+            topicDao.getTopicEntities(topicIds.toSet()),
-            ) { newsResources, topics ->
+        ) { newsResources, topics ->
             SearchResult(
                 topics = topics.map { it.asExternalModel() },
-                newsResources = newsResources.map { it.asExternalModel() }
+                newsResources = newsResources.map { it.asExternalModel() },
             )
         }
     }
-}
+}

core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeSearchContentsRepository.kt

@@ -24,8 +24,7 @@ import javax.inject.Inject
 /**
  * Fake implementation of the [SearchContentsRepository]
  */
-class FakeSearchContentsRepository @Inject constructor(
+class FakeSearchContentsRepository @Inject constructor() : SearchContentsRepository {
-) : SearchContentsRepository {
 
     override fun populateFtsData() {}
     override fun searchContents(searchQuery: String): Flow<SearchResult> {

core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicFtsDao.kt

@@ -29,6 +29,7 @@ import com.google.samples.apps.nowinandroid.core.database.model.TopicFtsEntity
 interface TopicFtsDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertAll(topics: List<TopicFtsEntity>)
+
     @Query("SELECT topicId FROM topicsFts WHERE topicsFts MATCH :query")
     fun searchAllTopics(query: String): List<String>
 

core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/TopicFtsEntity.kt

@@ -44,5 +44,5 @@ fun TopicEntity.asFtsEntity() = TopicFtsEntity(
     topicId = id,
     name = name,
     shortDescription = shortDescription,
-    longDescription = longDescription
+    longDescription = longDescription,
 )

core/domain/src/main/java/com/google/samples/apps/nowinandroid/core/domain/GetSearchContentsUseCase.kt

@@ -1,17 +1,17 @@
 /*
  * Copyright 2023 The Android Open Source Project
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * You may obtain a copy of the License at
  *
- *       https://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
+ * Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
- *   limitations under the License.
+ * limitations under the License.
  */
 
 package com.google.samples.apps.nowinandroid.core.domain
@@ -24,8 +24,6 @@ import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
 import com.google.samples.apps.nowinandroid.core.model.data.UserData
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.filterNot
-import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
 
 class GetSearchContentsUseCase @Inject constructor(
@@ -61,4 +59,4 @@ fun Flow<SearchResult>.mapToUserSearchResult(userDataStream: Flow<UserData>): Fl
 data class UserSearchResult(
     val topics: List<FollowableTopic> = emptyList(),
     val newsResources: List<UserNewsResource> = emptyList(),
-)
+)

core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestSearchContentsRepository.kt

@@ -1,17 +1,17 @@
 /*
  * Copyright 2023 The Android Open Source Project
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * You may obtain a copy of the License at
  *
- *       https://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
+ * Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
- *   limitations under the License.
+ * limitations under the License.
  */
 
 package com.google.samples.apps.nowinandroid.core.testing.repository
@@ -59,4 +59,4 @@ class TestSearchContentsRepository : SearchContentsRepository {
     fun addNewsResources(newsResources: List<NewsResource>) {
         cachedNewsResources.addAll(newsResources)
     }
-}
+}

feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt

@@ -44,7 +44,6 @@ import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -100,7 +99,7 @@ internal fun SearchRoute(
         onSearchQueryChanged = searchViewModel::onSearchQueryChanged,
         onTopicClick = onTopicClick,
         onNewsResourcesCheckedChanged = forYouViewModel::updateNewsResourceSaved,
-        uiState = uiState
+        uiState = uiState,
     )
 }
 

feature/search/src/main/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt

@@ -58,4 +58,4 @@ class SearchViewModel @Inject constructor(
     fun onSearchQueryChanged(query: String) {
         searchQuery.value = query
     }
-}
+}

feature/search/src/test/java/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt

@@ -1,17 +1,17 @@
 /*
  * Copyright 2023 The Android Open Source Project
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * You may obtain a copy of the License at
  *
- *       https://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
+ * Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
- *   limitations under the License.
+ * limitations under the License.
  */
 
 package com.google.samples.apps.nowinandroid.feature.search
@@ -86,4 +86,4 @@ class SearchViewModelTest {
 
         collectJob.cancel()
     }
-}
+}