Skip to content

Commit ec94606

Browse files
shorthouseshorthouse
committed
Merge branch 'list-to-market' into main
2 parents 677090c + 6faa7de commit ec94606

File tree

12 files changed

+98
-98
lines changed

12 files changed

+98
-98
lines changed

‎app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/CoinListScreenTest.kt

+28-28
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import com.google.common.truth.Truth.assertThat
1111
import dev.shorthouse.coinwatch.model.Coin
1212
import dev.shorthouse.coinwatch.model.Percentage
1313
import dev.shorthouse.coinwatch.model.Price
14-
import dev.shorthouse.coinwatch.ui.screen.list.ListScreen
15-
import dev.shorthouse.coinwatch.ui.screen.list.ListUiState
14+
import dev.shorthouse.coinwatch.ui.screen.market.MarketScreen
15+
import dev.shorthouse.coinwatch.ui.screen.market.MarketUiState
1616
import dev.shorthouse.coinwatch.ui.theme.AppTheme
1717
import java.math.BigDecimal
1818
import kotlinx.collections.immutable.persistentListOf
@@ -26,11 +26,11 @@ class CoinListScreenTest {
2626

2727
@Test
2828
fun when_uiStateLoading_should_showSkeletonLoader() {
29-
val uiStateLoading = ListUiState.Loading
29+
val uiStateLoading = MarketUiState.Loading
3030

3131
composeTestRule.setContent {
3232
AppTheme {
33-
ListScreen(
33+
MarketScreen(
3434
uiState = uiStateLoading,
3535
onCoinClick = {},
3636
onRefresh = {}
@@ -46,11 +46,11 @@ class CoinListScreenTest {
4646

4747
@Test
4848
fun when_uiStateError_should_showErrorState() {
49-
val uiStateError = ListUiState.Error("Error message")
49+
val uiStateError = MarketUiState.Error("Error message")
5050

5151
composeTestRule.setContent {
5252
AppTheme {
53-
ListScreen(
53+
MarketScreen(
5454
uiState = uiStateError,
5555
onCoinClick = {},
5656
onRefresh = {}
@@ -69,11 +69,11 @@ class CoinListScreenTest {
6969
@Test
7070
fun when_uiStateErrorRetryClicked_should_callOnRefresh() {
7171
var onRefreshCalled = false
72-
val uiStateError = ListUiState.Error("Error message")
72+
val uiStateError = MarketUiState.Error("Error message")
7373

7474
composeTestRule.setContent {
7575
AppTheme {
76-
ListScreen(
76+
MarketScreen(
7777
uiState = uiStateError,
7878
onCoinClick = {},
7979
onRefresh = { onRefreshCalled = true }
@@ -90,13 +90,13 @@ class CoinListScreenTest {
9090

9191
@Test
9292
fun when_uiStateSuccess_should_showExpectedContent() {
93-
val uiStateSuccess = ListUiState.Success(
93+
val uiStateSuccess = MarketUiState.Success(
9494
coins = persistentListOf()
9595
)
9696

9797
composeTestRule.setContent {
9898
AppTheme {
99-
ListScreen(
99+
MarketScreen(
100100
uiState = uiStateSuccess,
101101
onCoinClick = {},
102102
onRefresh = {}
@@ -112,13 +112,13 @@ class CoinListScreenTest {
112112

113113
@Test
114114
fun when_uiStateSuccess_favouriteCoinsEmpty_should_showEmptyState() {
115-
val uiStateSuccess = ListUiState.Success(
115+
val uiStateSuccess = MarketUiState.Success(
116116
coins = persistentListOf()
117117
)
118118

119119
composeTestRule.setContent {
120120
AppTheme {
121-
ListScreen(
121+
MarketScreen(
122122
uiState = uiStateSuccess,
123123
onCoinClick = {},
124124
onRefresh = {}
@@ -136,13 +136,13 @@ class CoinListScreenTest {
136136

137137
@Test
138138
fun when_uiStateSuccess_favouriteCoinsList_should_showExpectedContent() {
139-
val uiStateSuccess = ListUiState.Success(
139+
val uiStateSuccess = MarketUiState.Success(
140140
coins = persistentListOf()
141141
)
142142

143143
composeTestRule.setContent {
144144
AppTheme {
145-
ListScreen(
145+
MarketScreen(
146146
uiState = uiStateSuccess,
147147
onCoinClick = {},
148148
onRefresh = {}
@@ -176,13 +176,13 @@ class CoinListScreenTest {
176176

177177
@Test
178178
fun when_uiStateSuccess_coinsEmpty_should_showEmptyState() {
179-
val uiStateSuccess = ListUiState.Success(
179+
val uiStateSuccess = MarketUiState.Success(
180180
coins = persistentListOf()
181181
)
182182

183183
composeTestRule.setContent {
184184
AppTheme {
185-
ListScreen(
185+
MarketScreen(
186186
uiState = uiStateSuccess,
187187
onCoinClick = {},
188188
onRefresh = {}
@@ -198,7 +198,7 @@ class CoinListScreenTest {
198198

199199
@Test
200200
fun when_uiStateSuccess_coinsList_should_showExpectedContent() {
201-
val uiStateSuccess = ListUiState.Success(
201+
val uiStateSuccess = MarketUiState.Success(
202202
coins = persistentListOf(
203203
Coin(
204204
id = "bitcoin",
@@ -247,7 +247,7 @@ class CoinListScreenTest {
247247

248248
composeTestRule.setContent {
249249
AppTheme {
250-
ListScreen(
250+
MarketScreen(
251251
uiState = uiStateSuccess,
252252
onCoinClick = {},
253253
onRefresh = {}
@@ -280,7 +280,7 @@ class CoinListScreenTest {
280280
fun when_coinItemClicked_should_callOnClick() {
281281
var onCoinClickCalled = false
282282

283-
val uiStateSuccess = ListUiState.Success(
283+
val uiStateSuccess = MarketUiState.Success(
284284
coins = persistentListOf(
285285
Coin(
286286
id = "bitcoin",
@@ -301,7 +301,7 @@ class CoinListScreenTest {
301301

302302
composeTestRule.setContent {
303303
AppTheme {
304-
ListScreen(
304+
MarketScreen(
305305
uiState = uiStateSuccess,
306306
onCoinClick = ({ onCoinClickCalled = true }),
307307
onRefresh = {}
@@ -320,13 +320,13 @@ class CoinListScreenTest {
320320
fun when_favouriteCoinItemClicked_should_callOnClick() {
321321
var onCoinClickCalled = false
322322

323-
val uiStateSuccess = ListUiState.Success(
323+
val uiStateSuccess = MarketUiState.Success(
324324
coins = persistentListOf()
325325
)
326326

327327
composeTestRule.setContent {
328328
AppTheme {
329-
ListScreen(
329+
MarketScreen(
330330
uiState = uiStateSuccess,
331331
onCoinClick = ({ onCoinClickCalled = true }),
332332
onRefresh = {}
@@ -343,13 +343,13 @@ class CoinListScreenTest {
343343

344344
@Test
345345
fun when_timeOfDayMorning_should_showMorningGreeting() {
346-
val uiStateSuccess = ListUiState.Success(
346+
val uiStateSuccess = MarketUiState.Success(
347347
coins = persistentListOf()
348348
)
349349

350350
composeTestRule.setContent {
351351
AppTheme {
352-
ListScreen(
352+
MarketScreen(
353353
uiState = uiStateSuccess,
354354
onCoinClick = {},
355355
onRefresh = {}
@@ -364,13 +364,13 @@ class CoinListScreenTest {
364364

365365
@Test
366366
fun when_timeOfDayAfternoon_should_showAfternoonGreeting() {
367-
val uiStateSuccess = ListUiState.Success(
367+
val uiStateSuccess = MarketUiState.Success(
368368
coins = persistentListOf()
369369
)
370370

371371
composeTestRule.setContent {
372372
AppTheme {
373-
ListScreen(
373+
MarketScreen(
374374
uiState = uiStateSuccess,
375375
onCoinClick = {},
376376
onRefresh = {}
@@ -385,13 +385,13 @@ class CoinListScreenTest {
385385

386386
@Test
387387
fun when_timeOfDayEvening_should_showEveningGreeting() {
388-
val uiStateSuccess = ListUiState.Success(
388+
val uiStateSuccess = MarketUiState.Success(
389389
coins = persistentListOf()
390390
)
391391

392392
composeTestRule.setContent {
393393
AppTheme {
394-
ListScreen(
394+
MarketScreen(
395395
uiState = uiStateSuccess,
396396
onCoinClick = {},
397397
onRefresh = {}

‎app/src/main/java/dev/shorthouse/coinwatch/navigation/NavigationBarScaffold.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.navigation.compose.composable
2525
import androidx.navigation.compose.currentBackStackEntryAsState
2626
import androidx.navigation.compose.rememberNavController
2727
import dev.shorthouse.coinwatch.ui.screen.favourites.FavouritesScreen
28-
import dev.shorthouse.coinwatch.ui.screen.list.ListScreen
28+
import dev.shorthouse.coinwatch.ui.screen.market.MarketScreen
2929
import dev.shorthouse.coinwatch.ui.screen.search.SearchScreen
3030
import kotlinx.collections.immutable.persistentListOf
3131

@@ -89,7 +89,7 @@ private fun NavigationBarNavHost(
8989
modifier = modifier
9090
) {
9191
composable(route = NavigationBarScreen.Market.route) {
92-
ListScreen(onNavigateDetails = onNavigateDetails)
92+
MarketScreen(onNavigateDetails = onNavigateDetails)
9393
}
9494
composable(route = NavigationBarScreen.Favourites.route) {
9595
FavouritesScreen(onNavigateDetails = onNavigateDetails)

‎app/src/main/java/dev/shorthouse/coinwatch/ui/previewdata/ListUiStatePreviewProvider.kt ‎app/src/main/java/dev/shorthouse/coinwatch/ui/previewdata/MarketUiStatePreviewProvider.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ import dev.shorthouse.coinwatch.model.Coin
55
import dev.shorthouse.coinwatch.model.Percentage
66
import dev.shorthouse.coinwatch.model.Price
77
import dev.shorthouse.coinwatch.ui.previewdata.CoinListPreviewData.coins
8-
import dev.shorthouse.coinwatch.ui.screen.list.ListUiState
8+
import dev.shorthouse.coinwatch.ui.screen.market.MarketUiState
99
import java.math.BigDecimal
1010
import kotlinx.collections.immutable.persistentListOf
1111

12-
class ListUiStatePreviewProvider : PreviewParameterProvider<ListUiState> {
12+
class MarketUiStatePreviewProvider : PreviewParameterProvider<MarketUiState> {
1313
override val values = sequenceOf(
14-
ListUiState.Success(
14+
MarketUiState.Success(
1515
coins = coins
1616
),
17-
ListUiState.Success(
17+
MarketUiState.Success(
1818
coins = persistentListOf()
1919
),
20-
ListUiState.Error("No internet connection"),
21-
ListUiState.Loading
20+
MarketUiState.Error("No internet connection"),
21+
MarketUiState.Loading
2222
)
2323
}
2424

‎app/src/main/java/dev/shorthouse/coinwatch/ui/screen/list/ListUiState.kt

-13
This file was deleted.

0 commit comments

Comments
 (0)