Merge Api and Impl module into one feature module.

Change-Id: I72bf1bfdd86d1782cd25b84f8c85bccb0a16faf9
pull/2046/head
Jaehwa Noh 2 weeks ago
parent 3d3b968398
commit 4a90bda82e

@ -36,7 +36,6 @@ import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.testing.TestLifecycleOwner
import com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData
import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState
import com.google.samples.apps.nowinandroid.feature.bookmarks.impl.R
import kotlinx.coroutines.test.runTest
import org.junit.Rule
import org.junit.Test

@ -21,4 +21,5 @@
<string name="feature_foryou_api_navigate_up">Navigate up</string>
<string name="feature_foryou_api_onboarding_guidance_title">What are you interested in?</string>
<string name="feature_foryou_api_onboarding_guidance_subtitle">Updates from topics you follow will appear here. Follow some things to get started.</string>
</resources>
<string name="feature_foryou_api_app_name">Now in Android</string>
</resources>

@ -29,7 +29,7 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import com.google.samples.apps.nowinandroid.core.ui.R as CoreUiR
import com.google.samples.apps.nowinandroid.feature.interests.api.R as InterestsR
import com.google.samples.apps.nowinandroid.feature.interests.R as InterestsR
/**
* UI test for checking the correct behaviour of the Interests screen;

@ -38,11 +38,11 @@ import com.google.samples.apps.nowinandroid.core.model.data.Topic
import com.google.samples.apps.nowinandroid.core.navigation.Navigator
import com.google.samples.apps.nowinandroid.core.navigation.rememberNavigationState
import com.google.samples.apps.nowinandroid.core.navigation.toEntries
import com.google.samples.apps.nowinandroid.feature.interests.impl.R
import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsNavKey
import com.google.samples.apps.nowinandroid.feature.interests.LIST_PANE_TEST_TAG
import com.google.samples.apps.nowinandroid.feature.interests.navigation.interestsEntry
import com.google.samples.apps.nowinandroid.feature.topic.impl.navigation.topicEntry
import com.google.samples.apps.nowinandroid.feature.interests.R
import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsNavKey
import com.google.samples.apps.nowinandroid.navigation.interests.interestsEntry
import com.google.samples.apps.nowinandroid.navigation.topic.topicEntry
import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity
import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest

@ -35,7 +35,6 @@ import com.google.samples.apps.nowinandroid.core.model.data.UserData
import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource
import com.google.samples.apps.nowinandroid.core.testing.data.followableTopicTestData
import com.google.samples.apps.nowinandroid.core.testing.data.newsResourcesTestData
import com.google.samples.apps.nowinandroid.feature.search.impl.R
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@ -70,8 +69,10 @@ class SearchScreenTest {
@Before
fun setup() {
composeTestRule.activity.apply {
clearSearchContentDesc = getString(R.string.feature_search_api_clear_search_text_content_desc)
clearRecentSearchesContentDesc = getString(R.string.feature_search_api_clear_recent_searches_content_desc)
clearSearchContentDesc =
getString(R.string.feature_search_api_clear_search_text_content_desc)
clearRecentSearchesContentDesc =
getString(R.string.feature_search_api_clear_recent_searches_content_desc)
followButtonContentDesc =
getString(com.google.samples.apps.nowinandroid.core.ui.R.string.core_ui_interests_card_follow_button_content_desc)
unfollowButtonContentDesc =

@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.google.samples.apps.nowinandroid.feature.topic.api.navigation
package com.google.samples.apps.nowinandroid.feature.topic.navigation
import androidx.navigation3.runtime.NavKey
import kotlinx.serialization.Serializable

Loading…
Cancel
Save