Skip to content

Commit e3fe8af

Browse files
claraf3claraf3
committed
Split feature modules into api and impl modules
Source code is still left in api module. impl module is empty at this point.
1 parent 30a5af5 commit e3fe8af

File tree

100 files changed

+385
-251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+385
-251
lines changed

‎app/build.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ android {
7171
}
7272

7373
dependencies {
74-
implementation(projects.feature.interests)
75-
implementation(projects.feature.foryou)
76-
implementation(projects.feature.bookmarks)
77-
implementation(projects.feature.topic)
78-
implementation(projects.feature.search)
79-
implementation(projects.feature.settings)
74+
implementation(projects.feature.interests.api)
75+
implementation(projects.feature.foryou.api)
76+
implementation(projects.feature.bookmarks.api)
77+
implementation(projects.feature.topic.api)
78+
implementation(projects.feature.search.api)
79+
implementation(projects.feature.settings.api)
8080

8181
implementation(projects.core.common)
8282
implementation(projects.core.ui)

‎app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ import org.junit.Before
4747
import org.junit.Rule
4848
import org.junit.Test
4949
import javax.inject.Inject
50-
import com.google.samples.apps.nowinandroid.feature.bookmarks.R as BookmarksR
51-
import com.google.samples.apps.nowinandroid.feature.foryou.R as FeatureForyouR
52-
import com.google.samples.apps.nowinandroid.feature.search.R as FeatureSearchR
53-
import com.google.samples.apps.nowinandroid.feature.settings.R as SettingsR
50+
import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as BookmarksR
51+
import com.google.samples.apps.nowinandroid.feature.foryou.api.R as FeatureForyouR
52+
import com.google.samples.apps.nowinandroid.feature.search.api.R as FeatureSearchR
53+
import com.google.samples.apps.nowinandroid.feature.settings.api.R as SettingsR
5454

5555
/**
5656
* Tests all the navigation flows that are handled by the navigation library.
@@ -83,8 +83,8 @@ class NavigationTest {
8383
lateinit var newsRepository: NewsRepository
8484

8585
// The strings used for matching in these tests
86-
private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_navigate_up)
87-
private val forYou by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_title)
86+
private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_api_navigate_up)
87+
private val forYou by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_api_title)
8888
private val interests by composeTestRule.stringResource(FeatureSearchR.string.feature_search_interests)
8989
private val sampleTopic = "Headlines"
9090
private val appName by composeTestRule.stringResource(R.string.app_name)

‎app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ package com.google.samples.apps.nowinandroid.navigation
1919
import androidx.compose.runtime.Composable
2020
import androidx.compose.ui.Modifier
2121
import androidx.navigation.compose.NavHost
22-
import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksScreen
23-
import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouBaseRoute
24-
import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouSection
25-
import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests
26-
import com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen
27-
import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic
28-
import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
22+
import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.bookmarksScreen
23+
import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouBaseRoute
24+
import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.forYouSection
25+
import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.navigateToInterests
26+
import com.google.samples.apps.nowinandroid.feature.search.api.navigation.searchScreen
27+
import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopic
28+
import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.topicScreen
2929
import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.INTERESTS
3030
import com.google.samples.apps.nowinandroid.ui.NiaAppState
3131
import com.google.samples.apps.nowinandroid.ui.interests2pane.interestsListDetailScreen

‎app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import androidx.annotation.StringRes
2020
import androidx.compose.ui.graphics.vector.ImageVector
2121
import com.google.samples.apps.nowinandroid.R
2222
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
23-
import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksRoute
24-
import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouBaseRoute
25-
import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRoute
26-
import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
23+
import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute
24+
import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouBaseRoute
25+
import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute
26+
import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute
2727
import kotlin.reflect.KClass
28-
import com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksR
29-
import com.google.samples.apps.nowinandroid.feature.foryou.R as forYouR
30-
import com.google.samples.apps.nowinandroid.feature.search.R as searchR
28+
import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as bookmarksR
29+
import com.google.samples.apps.nowinandroid.feature.foryou.api.R as forYouR
30+
import com.google.samples.apps.nowinandroid.feature.search.api.R as searchR
3131

3232
/**
3333
* Type for the top level destinations in the application. Contains metadata about the destination
@@ -54,23 +54,23 @@ enum class TopLevelDestination(
5454
FOR_YOU(
5555
selectedIcon = NiaIcons.Upcoming,
5656
unselectedIcon = NiaIcons.UpcomingBorder,
57-
iconTextId = forYouR.string.feature_foryou_title,
57+
iconTextId = forYouR.string.feature_foryou_api_title,
5858
titleTextId = R.string.app_name,
5959
route = ForYouRoute::class,
6060
baseRoute = ForYouBaseRoute::class,
6161
),
6262
BOOKMARKS(
6363
selectedIcon = NiaIcons.Bookmarks,
6464
unselectedIcon = NiaIcons.BookmarksBorder,
65-
iconTextId = bookmarksR.string.feature_bookmarks_title,
66-
titleTextId = bookmarksR.string.feature_bookmarks_title,
65+
iconTextId = bookmarksR.string.feature_bookmarks_api_title,
66+
titleTextId = bookmarksR.string.feature_bookmarks_api_title,
6767
route = BookmarksRoute::class,
6868
),
6969
INTERESTS(
7070
selectedIcon = NiaIcons.Grid3x3,
7171
unselectedIcon = NiaIcons.Grid3x3,
72-
iconTextId = searchR.string.feature_search_interests,
73-
titleTextId = searchR.string.feature_search_interests,
72+
iconTextId = searchR.string.feature_search_api_interests,
73+
titleTextId = searchR.string.feature_search_api_interests,
7474
route = InterestsRoute::class,
7575
),
7676
}

‎app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopAp
7171
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
7272
import com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColors
7373
import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradientColors
74-
import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialog
74+
import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsDialog
7575
import com.google.samples.apps.nowinandroid.navigation.NiaNavHost
7676
import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
7777
import kotlin.reflect.KClass
78-
import com.google.samples.apps.nowinandroid.feature.settings.R as settingsR
78+
import com.google.samples.apps.nowinandroid.feature.settings.api.R as settingsR
7979

8080
@Composable
8181
fun NiaApp(

‎app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourc
3434
import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
3535
import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
3636
import com.google.samples.apps.nowinandroid.core.ui.TrackDisposableJank
37-
import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.navigateToBookmarks
38-
import com.google.samples.apps.nowinandroid.feature.foryou.navigation.navigateToForYou
39-
import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests
40-
import com.google.samples.apps.nowinandroid.feature.search.navigation.navigateToSearch
37+
import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.navigateToBookmarks
38+
import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.navigateToForYou
39+
import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.navigateToInterests
40+
import com.google.samples.apps.nowinandroid.feature.search.api.navigation.navigateToSearch
4141
import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
4242
import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.BOOKMARKS
4343
import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.FOR_YOU

‎app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package com.google.samples.apps.nowinandroid.ui.interests2pane
1919
import androidx.lifecycle.SavedStateHandle
2020
import androidx.lifecycle.ViewModel
2121
import androidx.navigation.toRoute
22-
import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
22+
import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute
2323
import dagger.hilt.android.lifecycle.HiltViewModel
2424
import kotlinx.coroutines.flow.StateFlow
2525
import javax.inject.Inject

‎app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ import androidx.hilt.navigation.compose.hiltViewModel
5252
import androidx.lifecycle.compose.collectAsStateWithLifecycle
5353
import androidx.navigation.NavGraphBuilder
5454
import androidx.navigation.compose.composable
55-
import com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute
56-
import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute
57-
import com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholder
58-
import com.google.samples.apps.nowinandroid.feature.topic.TopicScreen
59-
import com.google.samples.apps.nowinandroid.feature.topic.TopicViewModel
60-
import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRoute
55+
import com.google.samples.apps.nowinandroid.feature.interests.api.InterestsRoute
56+
import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute
57+
import com.google.samples.apps.nowinandroid.feature.topic.api.TopicDetailPlaceholder
58+
import com.google.samples.apps.nowinandroid.feature.topic.api.TopicScreen
59+
import com.google.samples.apps.nowinandroid.feature.topic.api.TopicViewModel
60+
import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.TopicRoute
6161
import kotlinx.coroutines.launch
6262
import kotlinx.serialization.Serializable
6363
import kotlin.math.max

‎app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/InterestsListDetailScreenTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import org.robolectric.annotation.Config
4545
import javax.inject.Inject
4646
import kotlin.properties.ReadOnlyProperty
4747
import kotlin.test.assertTrue
48-
import com.google.samples.apps.nowinandroid.feature.topic.R as FeatureTopicR
48+
import com.google.samples.apps.nowinandroid.feature.topic.api.R as FeatureTopicR
4949

5050
private const val EXPANDED_WIDTH = "w1200dp-h840dp"
5151
private const val COMPACT_WIDTH = "w412dp-h915dp"

‎feature/bookmarks/README.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)