diff --git a/app/build.gradle b/app/build.gradle index de01fcf..6466e35 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,8 +66,8 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" // Compose dependencies - implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07" - implementation "androidx.navigation:navigation-compose:2.4.0-alpha08" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-beta01" + implementation "androidx.navigation:navigation-compose:2.4.0-alpha09" implementation "com.google.accompanist:accompanist-flowlayout:0.17.0" // Coroutines @@ -80,7 +80,7 @@ dependencies { //Dagger - Hilt implementation "com.google.dagger:hilt-android:2.38.1" - kapt "com.google.dagger:hilt-android-compiler:2.37" + kapt "com.google.dagger:hilt-android-compiler:2.38.1" implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03" kapt "androidx.hilt:hilt-compiler:1.0.0" implementation 'androidx.hilt:hilt-navigation-compose:1.0.0-alpha03' diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/LinksExtended.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/LinksExtended.kt index 16a44ee..657aa4e 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/LinksExtended.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/LinksExtended.kt @@ -1,8 +1,6 @@ package com.plcoding.cryptocurrencyappyt.data.remote.dto -import com.google.gson.annotations.SerializedName - data class LinksExtended( val stats: Stats, val type: String, diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/Stats.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/Stats.kt index 5b4b14b..6324540 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/Stats.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/Stats.kt @@ -1,8 +1,6 @@ package com.plcoding.cryptocurrencyappyt.data.remote.dto -import com.google.gson.annotations.SerializedName - data class Stats( val contributors: Int, val followers: Int, diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/TeamMember.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/TeamMember.kt index 6590834..2f6fcde 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/TeamMember.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/TeamMember.kt @@ -1,8 +1,6 @@ package com.plcoding.cryptocurrencyappyt.data.remote.dto -import com.google.gson.annotations.SerializedName - data class TeamMember( val id: String, val name: String, diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/Whitepaper.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/Whitepaper.kt index 555f641..b8520a5 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/Whitepaper.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/data/remote/dto/Whitepaper.kt @@ -1,8 +1,6 @@ package com.plcoding.cryptocurrencyappyt.data.remote.dto -import com.google.gson.annotations.SerializedName - data class Whitepaper( val link: String, val thumbnail: String diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/model/Coin.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/model/Coin.kt index 3de35db..7a12e3b 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/model/Coin.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/model/Coin.kt @@ -1,7 +1,5 @@ package com.plcoding.cryptocurrencyappyt.domain.model -import com.google.gson.annotations.SerializedName - data class Coin( val id: String, val isActive: Boolean, diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/use_case/get_coin/GetCoinUseCase.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/use_case/get_coin/GetCoinUseCase.kt index a3ab15c..529ea1f 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/use_case/get_coin/GetCoinUseCase.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/use_case/get_coin/GetCoinUseCase.kt @@ -21,7 +21,7 @@ class GetCoinUseCase @Inject constructor( val coin = repository.getCoinById(coinId).toCoinDetail() emit(Resource.Success(coin)) } catch(e: HttpException) { - emit(Resource.Error(e.localizedMessage ?: "An unexpected error occured")) + emit(Resource.Error(e.localizedMessage ?: "An unexpected error occurred")) } catch(e: IOException) { emit(Resource.Error("Couldn't reach server. Check your internet connection.")) } diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/use_case/get_coins/GetCoinsUseCase.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/use_case/get_coins/GetCoinsUseCase.kt index 714b42e..92d0bcd 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/use_case/get_coins/GetCoinsUseCase.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/domain/use_case/get_coins/GetCoinsUseCase.kt @@ -20,7 +20,7 @@ class GetCoinsUseCase @Inject constructor( val coins = repository.getCoins().map { it.toCoin() } emit(Resource.Success>(coins)) } catch(e: HttpException) { - emit(Resource.Error>(e.localizedMessage ?: "An unexpected error occured")) + emit(Resource.Error>(e.localizedMessage ?: "An unexpected error occurred")) } catch(e: IOException) { emit(Resource.Error>("Couldn't reach server. Check your internet connection.")) } diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailScreen.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailScreen.kt index 1fe9606..378fa05 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailScreen.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailScreen.kt @@ -1,6 +1,14 @@ package com.plcoding.cryptocurrencyappyt.presentation.coin_detail -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.CircularProgressIndicator @@ -16,12 +24,9 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import androidx.navigation.NavController import com.google.accompanist.flowlayout.FlowRow -import com.plcoding.cryptocurrencyappyt.presentation.Screen import com.plcoding.cryptocurrencyappyt.presentation.coin_detail.components.CoinTag import com.plcoding.cryptocurrencyappyt.presentation.coin_detail.components.TeamListItem -import com.plcoding.cryptocurrencyappyt.presentation.coin_list.components.CoinListItem @Composable fun CoinDetailScreen( diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailState.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailState.kt index 91a4cc3..ed89aec 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailState.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailState.kt @@ -1,6 +1,5 @@ package com.plcoding.cryptocurrencyappyt.presentation.coin_detail -import com.plcoding.cryptocurrencyappyt.domain.model.Coin import com.plcoding.cryptocurrencyappyt.domain.model.CoinDetail data class CoinDetailState( diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailViewModel.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailViewModel.kt index b1ed800..83153c4 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailViewModel.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_detail/CoinDetailViewModel.kt @@ -8,7 +8,6 @@ import androidx.lifecycle.viewModelScope import com.plcoding.cryptocurrencyappyt.common.Constants import com.plcoding.cryptocurrencyappyt.common.Resource import com.plcoding.cryptocurrencyappyt.domain.use_case.get_coin.GetCoinUseCase -import com.plcoding.cryptocurrencyappyt.domain.use_case.get_coins.GetCoinsUseCase import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -37,7 +36,7 @@ class CoinDetailViewModel @Inject constructor( } is Resource.Error -> { _state.value = CoinDetailState( - error = result.message ?: "An unexpected error occured" + error = result.message ?: "An unexpected error occurred" ) } is Resource.Loading -> { diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_list/CoinListViewModel.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_list/CoinListViewModel.kt index 1d8e7ff..be8a1ad 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_list/CoinListViewModel.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_list/CoinListViewModel.kt @@ -31,7 +31,7 @@ class CoinListViewModel @Inject constructor( } is Resource.Error -> { _state.value = CoinListState( - error = result.message ?: "An unexpected error occured" + error = result.message ?: "An unexpected error occurred" ) } is Resource.Loading -> { diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_list/components/CoinListItem.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_list/components/CoinListItem.kt index 8ee7d3b..c0e762a 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_list/components/CoinListItem.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/coin_list/components/CoinListItem.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment.Companion.CenterVertically import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -16,7 +15,6 @@ import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import androidx.navigation.NavController import com.plcoding.cryptocurrencyappyt.domain.model.Coin @Composable diff --git a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/ui/theme/Theme.kt b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/ui/theme/Theme.kt index 0f7fa53..45ae656 100644 --- a/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/ui/theme/Theme.kt +++ b/app/src/main/java/com/plcoding/cryptocurrencyappyt/presentation/ui/theme/Theme.kt @@ -21,7 +21,7 @@ private val LightColorPalette = lightColors( ) @Composable -fun CryptocurrencyAppYTTheme(darkTheme: Boolean = true, content: @Composable() () -> Unit) { +fun CryptocurrencyAppYTTheme(darkTheme: Boolean = true, content: @Composable () -> Unit) { val colors = if (darkTheme) { DarkColorPalette } else { diff --git a/build.gradle b/build.gradle index ffcdf92..009f9c1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - compose_version = '1.0.1' + compose_version = '1.0.2' } repositories { google()