Merge pull request #508 from android/mm/chipcolor
Update topic chips to show a different color based on whether the user is following that topicpull/524/head
MagicalMeghan
2 years ago
committed by
GitHub
commit
de5ceb40ea
@ -1,27 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
*
|
|
||||||
* https://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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.google.samples.apps.nowinandroid.core.domain.model
|
|
||||||
|
|
||||||
import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A [NewsResource] with the additional information for whether it is saved.
|
|
||||||
*/
|
|
||||||
data class SaveableNewsResource(
|
|
||||||
val newsResource: NewsResource,
|
|
||||||
val isSaved: Boolean,
|
|
||||||
)
|
|
||||||
@ -0,0 +1,106 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2023 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
|
||||||
|
*
|
||||||
|
* https://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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.google.samples.apps.nowinandroid.core.domain
|
||||||
|
|
||||||
|
import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
|
||||||
|
import com.google.samples.apps.nowinandroid.core.domain.model.UserNewsResource
|
||||||
|
import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig.FOLLOW_SYSTEM
|
||||||
|
import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
|
||||||
|
import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Article
|
||||||
|
import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand.DEFAULT
|
||||||
|
import com.google.samples.apps.nowinandroid.core.model.data.Topic
|
||||||
|
import com.google.samples.apps.nowinandroid.core.model.data.UserData
|
||||||
|
import kotlinx.datetime.Clock
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertTrue
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
class UserNewsResourceTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Given: Some user data and news resources
|
||||||
|
* When: They are combined using `UserNewsResource.from`
|
||||||
|
* Then: The correct UserNewsResources are constructed
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
fun userNewsResourcesAreConstructedFromNewsResourcesAndUserData() {
|
||||||
|
|
||||||
|
val newsResource1 = NewsResource(
|
||||||
|
id = "N1",
|
||||||
|
title = "Test news title",
|
||||||
|
content = "Test news content",
|
||||||
|
url = "Test URL",
|
||||||
|
headerImageUrl = "Test image URL",
|
||||||
|
publishDate = Clock.System.now(),
|
||||||
|
type = Article,
|
||||||
|
topics = listOf(
|
||||||
|
Topic(
|
||||||
|
id = "T1",
|
||||||
|
name = "Topic 1",
|
||||||
|
shortDescription = "Topic 1 short description",
|
||||||
|
longDescription = "Topic 1 long description",
|
||||||
|
url = "Topic 1 URL",
|
||||||
|
imageUrl = "Topic 1 image URL"
|
||||||
|
),
|
||||||
|
Topic(
|
||||||
|
id = "T2",
|
||||||
|
name = "Topic 2",
|
||||||
|
shortDescription = "Topic 2 short description",
|
||||||
|
longDescription = "Topic 2 long description",
|
||||||
|
url = "Topic 2 URL",
|
||||||
|
imageUrl = "Topic 2 image URL"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
val userData = UserData(
|
||||||
|
bookmarkedNewsResources = setOf("N1"),
|
||||||
|
followedTopics = setOf("T1"),
|
||||||
|
themeBrand = DEFAULT,
|
||||||
|
darkThemeConfig = FOLLOW_SYSTEM,
|
||||||
|
shouldHideOnboarding = true
|
||||||
|
)
|
||||||
|
|
||||||
|
val userNewsResource = UserNewsResource(newsResource1, userData)
|
||||||
|
|
||||||
|
// Check that the simple field mappings have been done correctly.
|
||||||
|
assertEquals(newsResource1.id, userNewsResource.id)
|
||||||
|
assertEquals(newsResource1.title, userNewsResource.title)
|
||||||
|
assertEquals(newsResource1.content, userNewsResource.content)
|
||||||
|
assertEquals(newsResource1.url, userNewsResource.url)
|
||||||
|
assertEquals(newsResource1.headerImageUrl, userNewsResource.headerImageUrl)
|
||||||
|
assertEquals(newsResource1.publishDate, userNewsResource.publishDate)
|
||||||
|
|
||||||
|
// Check that each Topic has been converted to a FollowedTopic correctly.
|
||||||
|
assertEquals(newsResource1.topics.size, userNewsResource.followableTopics.size)
|
||||||
|
for (topic in newsResource1.topics) {
|
||||||
|
|
||||||
|
// Construct the expected FollowableTopic.
|
||||||
|
val followableTopic = FollowableTopic(
|
||||||
|
topic = topic,
|
||||||
|
isFollowed = userData.followedTopics.contains(topic.id)
|
||||||
|
)
|
||||||
|
assertTrue(userNewsResource.followableTopics.contains(followableTopic))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check that the saved flag is set correctly.
|
||||||
|
assertEquals(
|
||||||
|
userData.bookmarkedNewsResources.contains(newsResource1.id),
|
||||||
|
userNewsResource.isSaved
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in new issue