Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

run spotless

Clara Fokdc29a5eb627f
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt
index e717a9b39..f5fd1f93c 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt
@@ -55,7 +55,6 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch
import javax.inject.Inject
-import javax.inject.Provider
@AndroidEntryPoint
class MainActivity : ComponentActivity() {
@@ -166,7 +165,7 @@ class MainActivity : ComponentActivity() {
) {
NiaApp(
appState,
- entryProviderBuilders = entryProviderBuilders
+ entryProviderBuilders = entryProviderBuilders,
)
}
}
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/di/NiaNavigatorProvider.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/di/NiaNavigatorProvider.kt
index 59ae9c398..aa0aa48f7 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/di/NiaNavigatorProvider.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/di/NiaNavigatorProvider.kt
@@ -16,21 +16,16 @@
package com.google.samples.apps.nowinandroid.di
-import androidx.navigation3.runtime.EntryProviderScope
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigatorState
import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ActivityComponent
-import dagger.hilt.android.scopes.ActivityRetainedScoped
import dagger.hilt.components.SingletonComponent
import kotlinx.serialization.modules.PolymorphicModuleBuilder
import kotlinx.serialization.modules.SerializersModule
import kotlinx.serialization.modules.polymorphic
-import javax.inject.Provider
import javax.inject.Singleton
@Module
@@ -50,8 +45,6 @@ object NiaNavigatorProvider {
// ): NiaNavigator =
// NiaNavigator(state)
-
-
/**
* Registers feature modules' polymorphic serializers to support
* feature keys' save and restore by savedstate
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavDisplay.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavDisplay.kt
index ecb78ac9c..de9e70a41 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavDisplay.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavDisplay.kt
@@ -19,24 +19,11 @@ package com.google.samples.apps.nowinandroid.navigation
import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneStrategy
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.key
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.snapshots.SnapshotStateList
-import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
import androidx.navigation3.runtime.EntryProviderScope
-import androidx.navigation3.runtime.NavEntry
-import androidx.navigation3.runtime.NavEntryDecorator
-import androidx.navigation3.runtime.entryProvider
-import androidx.navigation3.runtime.rememberDecoratedNavEntries
import androidx.navigation3.ui.NavDisplay
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.getEntries
-import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute
-import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute
-import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute
-import kotlin.collections.forEach
import kotlin.collections.plus
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/TestUtil.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/TestUtil.kt
index d0be3c5b0..268cc8ee8 100644
--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/TestUtil.kt
+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/TestUtil.kt
@@ -17,8 +17,8 @@
package com.google.samples.apps.nowinandroid.ui
import androidx.navigation3.runtime.EntryProviderScope
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute
import com.google.samples.apps.nowinandroid.feature.foryou.impl.ForYouScreen
diff --git a/benchmarks/README.md b/benchmarks/README.md
index 5387bbe5e..657ad5422 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# `:benchmarks`
## Module dependency graph
@@ -133,8 +132,3 @@ classDef unknown fill:#FFADAD,stroke:#000,stroke-width:2px,color:#000;
</details>
<!--endregion-->
-=======
-# :benchmarks module
-## Dependency graph
-![Dependency graph](../docs/images/graphs/dep_graph_benchmarks.svg)
->>>>>>> a059e426 (Update readme and build dependency graph)
diff --git a/core/navigation/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaBackStackViewModelTest.kt b/core/navigation/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaBackStackViewModelTest.kt
index d91065138..e1e27be2c 100644
--- a/core/navigation/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaBackStackViewModelTest.kt
+++ b/core/navigation/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaBackStackViewModelTest.kt
@@ -16,9 +16,7 @@
package com.google.samples.apps.nowinandroid.core.navigation
-import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.remember
-import androidx.compose.runtime.snapshots.SnapshotStateList
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.createSavedStateHandle
@@ -69,7 +67,7 @@ class NiaBackStackViewModelTest {
fun testNonTopLevelKeySaved() {
val viewModel = createViewModel()
rule.setContent {
- val navigator = remember { NiaNavigator( viewModel.niaNavigatorState) }
+ val navigator = remember { NiaNavigator(viewModel.niaNavigatorState) }
navigator.navigate(TestKeyFirst)
}
assertThat(viewModel.backStackMap.size).isEqualTo(1)
@@ -82,7 +80,7 @@ class NiaBackStackViewModelTest {
fun testTopLevelKeySaved() {
val viewModel = createViewModel()
rule.setContent {
- val navigator = remember { NiaNavigator( viewModel.niaNavigatorState) }
+ val navigator = remember { NiaNavigator(viewModel.niaNavigatorState) }
navigator.navigate(TestKeyFirst)
navigator.navigate(TestTopLevelKeyFirst)
@@ -103,7 +101,7 @@ class NiaBackStackViewModelTest {
fun testMultiStacksSaved() {
val viewModel = createViewModel()
rule.setContent {
- val navigator = remember { NiaNavigator( viewModel.niaNavigatorState) }
+ val navigator = remember { NiaNavigator(viewModel.niaNavigatorState) }
navigator.navigate(TestKeyFirst)
navigator.navigate(TestTopLevelKeyFirst)
navigator.navigate(TestKeySecond)
@@ -124,7 +122,7 @@ class NiaBackStackViewModelTest {
fun testPopSaved() {
val viewModel = createViewModel()
rule.setContent {
- val navigator = remember { NiaNavigator( viewModel.niaNavigatorState) }
+ val navigator = remember { NiaNavigator(viewModel.niaNavigatorState) }
navigator.navigate(TestKeyFirst)
diff --git a/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaBackStackViewModel.kt b/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaBackStackViewModel.kt
index c442919d4..3d61dc3ff 100644
--- a/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaBackStackViewModel.kt
+++ b/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaBackStackViewModel.kt
@@ -46,7 +46,7 @@ class NiaBackStackViewModel @Inject constructor(
internal var backStackMap by savedStateHandle.saved(
serializer = MapSerializer(
serializer<NiaNavKey>(),
- serializer<List<NiaNavKey>>()
+ serializer<List<NiaNavKey>>(),
),
configuration = config,
) {
@@ -63,7 +63,7 @@ class NiaBackStackViewModel @Inject constructor(
init {
if (backStackMap.isNotEmpty()) {
- // Restore backstack from saved state handle if not emtpy
+ // Restore backstack from saved state handle if not emtpy
@Suppress("UNCHECKED_CAST")
niaNavigatorState.restore(
activeTopLeveLKeys,
@@ -79,4 +79,4 @@ class NiaBackStackViewModel @Inject constructor(
}.collect()
}
}
-}
\ No newline at end of file
+}
diff --git a/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigator.kt b/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigator.kt
index 20366590a..8152d0e91 100644
--- a/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigator.kt
+++ b/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigator.kt
@@ -78,7 +78,7 @@ class NiaNavigatorState(
// https://github.com/android/nowinandroid/issues/1934
class NiaNavigator @Inject constructor(
- val navigatorState: NiaNavigatorState
+ val navigatorState: NiaNavigatorState,
) {
fun navigate(key: NiaNavKey) {
val currentActiveSubStacks = linkedSetOf<NiaNavKey>()
@@ -117,8 +117,6 @@ class NiaNavigator @Inject constructor(
}
updateActiveTopLevelKeys(currentActiveSubStacks.toList())
}
-
-
}
fun pop() {
@@ -148,7 +146,7 @@ public fun NiaNavigatorState.getEntries(
val decorated = key(topLevelKey) {
val decorators = listOf(
rememberSaveableStateHolderNavEntryDecorator(),
- rememberViewModelStoreNavEntryDecorator<NiaNavKey>()
+ rememberViewModelStoreNavEntryDecorator<NiaNavKey>(),
)
rememberDecoratedNavEntries(
backStack = backStacks[topLevelKey]!!,
@@ -161,4 +159,4 @@ public fun NiaNavigatorState.getEntries(
)
}
entries + decorated
-}
\ No newline at end of file
+ }
diff --git a/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksEntryProvider.kt b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksEntryProvider.kt
index e1bee5e88..aed257d84 100644
--- a/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksEntryProvider.kt
+++ b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksEntryProvider.kt
@@ -21,8 +21,8 @@ import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.SnackbarResult.ActionPerformed
import androidx.compose.runtime.compositionLocalOf
import androidx.navigation3.runtime.EntryProviderScope
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute
import com.google.samples.apps.nowinandroid.feature.bookmarks.impl.BookmarksScreen
import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopic
diff --git a/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/navigation/ForYouEntryProvider.kt b/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/navigation/ForYouEntryProvider.kt
index 81fe584d2..7e942f261 100644
--- a/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/navigation/ForYouEntryProvider.kt
+++ b/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/navigation/ForYouEntryProvider.kt
@@ -17,8 +17,8 @@
package com.google.samples.apps.nowinandroid.feature.foryou.impl.navigation
import androidx.navigation3.runtime.EntryProviderScope
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute
import com.google.samples.apps.nowinandroid.feature.foryou.impl.ForYouScreen
import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopic
diff --git a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/navigation/InterestsEntryProvider.kt b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/navigation/InterestsEntryProvider.kt
index 7f759c653..ba8691473 100644
--- a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/navigation/InterestsEntryProvider.kt
+++ b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/navigation/InterestsEntryProvider.kt
@@ -20,8 +20,8 @@ import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.navigation3.runtime.EntryProviderScope
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute
import com.google.samples.apps.nowinandroid.feature.interests.impl.InterestsDetailPlaceholder
import com.google.samples.apps.nowinandroid.feature.interests.impl.InterestsScreen
diff --git a/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsListDetailScreenTest.kt b/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsListDetailScreenTest.kt
index cd21bf058..0f251322f 100644
--- a/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsListDetailScreenTest.kt
+++ b/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsListDetailScreenTest.kt
@@ -29,7 +29,6 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
-import androidx.navigation3.runtime.EntryProviderBuilder
import androidx.navigation3.runtime.EntryProviderScope
import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.ui.NavDisplay
@@ -37,9 +36,9 @@ import androidx.test.espresso.Espresso
import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import com.google.samples.apps.nowinandroid.core.model.data.Topic
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaBackStackViewModel
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.feature.interests.api.R
import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute
import com.google.samples.apps.nowinandroid.feature.interests.impl.LIST_PANE_TEST_TAG
@@ -50,7 +49,6 @@ import dagger.hilt.EntryPoint
import dagger.hilt.EntryPoints
import dagger.hilt.InstallIn
import dagger.hilt.android.components.ActivityComponent
-import dagger.hilt.android.components.ActivityComponent
import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest
import dagger.hilt.android.testing.HiltTestApplication
diff --git a/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchRoute.kt b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchRoute.kt
index fbd80b040..f2e135e0b 100644
--- a/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchRoute.kt
+++ b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchRoute.kt
@@ -16,8 +16,8 @@
package com.google.samples.apps.nowinandroid.feature.search.api.navigation
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import kotlinx.serialization.Serializable
@Serializable
diff --git a/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/navigation/SearchEntryProvider.kt b/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/navigation/SearchEntryProvider.kt
index dbb3f0fe5..f62d3cf43 100644
--- a/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/navigation/SearchEntryProvider.kt
+++ b/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/navigation/SearchEntryProvider.kt
@@ -17,8 +17,8 @@
package com.google.samples.apps.nowinandroid.feature.search.impl.navigation
import androidx.navigation3.runtime.EntryProviderScope
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute
import com.google.samples.apps.nowinandroid.feature.search.api.navigation.SearchRoute
import com.google.samples.apps.nowinandroid.feature.search.impl.SearchScreen
diff --git a/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicRoute.kt b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicRoute.kt
index 1f226099f..5289c99ff 100644
--- a/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicRoute.kt
+++ b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicRoute.kt
@@ -16,8 +16,8 @@
package com.google.samples.apps.nowinandroid.feature.topic.api.navigation
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import kotlinx.serialization.Serializable
@Serializable
diff --git a/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/navigation/TopicEntryProvider.kt b/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/navigation/TopicEntryProvider.kt
index 92f871104..6cf48ad14 100644
--- a/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/navigation/TopicEntryProvider.kt
+++ b/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/navigation/TopicEntryProvider.kt
@@ -20,8 +20,8 @@ import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.navigation3.runtime.EntryProviderScope
-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator
import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.TopicRoute
import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopic
import com.google.samples.apps.nowinandroid.feature.topic.impl.TopicScreen
diff --git a/lint/README.md b/lint/README.md
index 7d4c89ac0..24d312242 100644
--- a/lint/README.md
+++ b/lint/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# `:lint`
## Module dependency graph
@@ -44,8 +43,3 @@ classDef unknown fill:#FFADAD,stroke:#000,stroke-width:2px,color:#000;
</details>
<!--endregion-->
-=======
-# :lint module
-## Dependency graph
-![Dependency graph](../docs/images/graphs/dep_graph_lint.svg)
->>>>>>> a059e426 (Update readme and build dependency graph)
diff --git a/ui-test-hilt-manifest/README.md b/ui-test-hilt-manifest/README.md
index 3a53ecbfb..eb4e4b1f7 100644
--- a/ui-test-hilt-manifest/README.md
+++ b/ui-test-hilt-manifest/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# `:ui-test-hilt-manifest`
## Module dependency graph
@@ -44,8 +43,3 @@ classDef unknown fill:#FFADAD,stroke:#000,stroke-width:2px,color:#000;
</details>
<!--endregion-->
-=======
-# :ui-test-hilt-manifest module
-## Dependency graph
-![Dependency graph](../docs/images/graphs/dep_graph_ui_test_hilt_manifest.svg)
->>>>>>> a059e426 (Update readme and build dependency graph)