Skip to content

Commit 13397c4

Browse files
authored
updated to STABLE (#108)
* change api level back to 29 * update coreKtx version * update coroutines version * update appcompat version * update navigation compose and constraintLayout compose version * update lottie compose version * update paging version * replace deprecated accompanist to coil in crypto module * update compose and material version * update readme version badge
1 parent ad3b729 commit 13397c4

File tree

8 files changed

+25
-26
lines changed

8 files changed

+25
-26
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ jobs:
3636
- name: Compose UI tests
3737
uses: reactivecircus/android-emulator-runner@v2
3838
with:
39-
api-level: 27
39+
api-level: 29
4040
script: ./gradlew connectedCheck

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<div align="center">
1717
<a href = "https://developer.android.com/jetpack/androidx/versions/all-channel#december_16_2020">
18-
<img src = "https://img.shields.io/badge/Jetpack%20Compose-1.0.0%20rc02-brightgreen" />
18+
<img src = "https://img.shields.io/badge/Jetpack%20Compose-1.0.0-brightgreen" />
1919
</a>
2020
<a href = "https://github.com/Gurupreet/ComposeCookBook/actions/workflows/android.yml">
2121
<img src = "https://github.com/Gurupreet/ComposeCookBook/actions/workflows/android.yml/badge.svg" />

buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/Dependencies.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ object Dependencies {
6161
const val gson = "com.google.code.gson:gson:${Versions.gson}"
6262
const val okHttpGsonConverter =
6363
"com.squareup.retrofit2:converter-gson:${Versions.retrofitConverterGson}"
64-
const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutine}"
64+
const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}"
6565
const val coroutinesAndroid =
66-
"org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutine}"
66+
"org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}"
6767
const val lifecycleExtensions =
6868
"androidx.lifecycle:lifecycle-extensions:${Versions.androidLifecycleGrouped}"
6969
const val liveDataKtx =

buildSrc/src/main/kotlin/com/guru/composecookbook/build/dependencies/Versions.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
package com.guru.composecookbook.build.dependencies
22

33
internal object Versions {
4-
const val compose = "1.0.0-rc02"
4+
const val compose = "1.0.0"
55
const val lifecycleViewModelCompose = "1.0.0-alpha08"
66
const val activityCompose = "1.3.0-rc01"
7-
const val pagingCompose = "1.0.0-alpha09"
8-
const val navCompose = "2.4.0-alpha02"
9-
const val constraintLayoutCompose = "1.0.0-alpha08"
10-
const val lottieCompose = "1.0.0-beta03-1"
7+
const val pagingCompose = "1.0.0-alpha12"
8+
const val navCompose = "2.4.0-alpha05"
9+
const val constraintLayoutCompose = "1.0.0-beta01"
10+
const val lottieCompose = "1.0.0-rc02-1"
1111
const val fontAwesomeCompose = "1.0.0-beta02"
1212
const val accompanistCoil = "0.14.0"
1313
const val coilCompose = "1.3.0"
1414
const val kotlin = "1.5.10"
15-
const val coroutine = "1.4.2"
15+
const val coroutines = "1.5.1"
1616
const val androidLifecycleGrouped = "2.2.0"
1717
const val flinger = "1.0.0"
18-
const val paging = "3.0.0"
18+
const val paging = "3.0.1"
1919
const val lottie = "3.6.1"
2020
const val room = "2.4.0-alpha03"
21-
const val coreKtx = "1.6.0-beta02"
22-
const val appcompat = "1.2.0"
21+
const val coreKtx = "1.6.0"
22+
const val appcompat = "1.3.1"
2323
const val paletteKtx = "1.0.0"
24-
const val material = "1.2.1"
24+
const val material = "1.4.0"
2525
const val playServicesAds = "19.6.0"
2626
const val googleMaps = "3.1.0-beta"
2727
const val playServicesMaps = "17.0.0"

demos/cryptoapp/app/src/main/java/com/guru/composecookbook/cryptoapp/ui/detail/components/CryptoDetailScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import androidx.compose.ui.platform.LocalContext
2222
import androidx.compose.ui.text.font.FontWeight
2323
import androidx.compose.ui.unit.dp
2424
import androidx.lifecycle.viewmodel.compose.viewModel
25-
import com.google.accompanist.coil.rememberCoilPainter
25+
import coil.compose.rememberImagePainter
2626
import com.guru.composecookbook.charts.BarCharts
2727
import com.guru.composecookbook.charts.LineChart
2828
import com.guru.composecookbook.cryptoapp.data.db.models.Crypto
@@ -82,7 +82,7 @@ fun CryptoTopSection(crypto: Crypto, scrollState: ScrollState) {
8282
modifier = Modifier.padding(end = 8.dp)
8383
)
8484
Image(
85-
painter = rememberCoilPainter(request = crypto.image),
85+
painter = rememberImagePainter(data = crypto.image),
8686
modifier = Modifier.size(28.dp),
8787
contentDescription = null
8888
)

demos/cryptoapp/app/src/main/java/com/guru/composecookbook/cryptoapp/ui/detail/components/FavoriteCryptoCard.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier
99
import androidx.compose.ui.graphics.Color
1010
import androidx.compose.ui.tooling.preview.Preview
1111
import androidx.compose.ui.unit.dp
12-
import com.google.accompanist.coil.rememberCoilPainter
12+
import coil.compose.rememberImagePainter
1313
import com.guru.composecookbook.cryptoapp.data.CryptoDemoDataProvider
1414
import com.guru.composecookbook.cryptoapp.data.db.models.Crypto
1515
import com.guru.composecookbook.cryptoapp.ui.internal.extensions.roundToTwoDecimals
@@ -27,7 +27,7 @@ fun FavoriteCryptoCard(crypto: Crypto) {
2727
) {
2828
Row(modifier = Modifier.weight(1f)) {
2929
Image(
30-
painter = rememberCoilPainter(request = crypto.image),
30+
painter = rememberImagePainter(data = crypto.image),
3131
modifier = Modifier.size(24.dp),
3232
contentDescription = null
3333
)

demos/cryptoapp/app/src/main/java/com/guru/composecookbook/cryptoapp/ui/home/components/CryptoHomeScreen.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import androidx.paging.LoadState
3030
import androidx.paging.compose.LazyPagingItems
3131
import androidx.paging.compose.collectAsLazyPagingItems
3232
import androidx.paging.compose.itemsIndexed
33-
import com.google.accompanist.coil.rememberCoilPainter
33+
import coil.compose.rememberImagePainter
3434
import com.guru.composecookbook.cryptoapp.data.CryptoDemoDataProvider
3535
import com.guru.composecookbook.cryptoapp.data.db.models.Crypto
3636
import com.guru.composecookbook.cryptoapp.ui.home.CryptoHomeInteractionEvents
@@ -121,7 +121,8 @@ fun ShowFavorites(
121121
CryptoHomeInteractionEvents.OpenDetailScreen(crypto = crypto)
122122
)
123123
}
124-
})
124+
}
125+
)
125126
}
126127
}
127128
}
@@ -138,10 +139,8 @@ fun FavoriteItem(crypto: Crypto, openCryptoDetail: () -> Unit) {
138139
verticalAlignment = Alignment.CenterVertically
139140
) {
140141
Image(
141-
painter = rememberCoilPainter(request = crypto.image), modifier = Modifier.size(
142-
24
143-
.dp
144-
),
142+
painter = rememberImagePainter(data = crypto.image),
143+
modifier = Modifier.size(24.dp),
145144
contentDescription = null
146145
)
147146
Text(

demos/cryptoapp/app/src/main/java/com/guru/composecookbook/cryptoapp/ui/home/components/CryptoListItem.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import androidx.compose.ui.text.style.TextAlign
1919
import androidx.compose.ui.tooling.preview.Preview
2020
import androidx.compose.ui.unit.dp
2121
import androidx.compose.ui.unit.sp
22-
import com.google.accompanist.coil.rememberCoilPainter
22+
import coil.compose.rememberImagePainter
2323
import com.guru.composecookbook.charts.LineChart
2424
import com.guru.composecookbook.cryptoapp.data.CryptoDemoDataProvider
2525
import com.guru.composecookbook.cryptoapp.data.db.models.Crypto
@@ -53,7 +53,7 @@ fun CryptoListItem(
5353
verticalAlignment = Alignment.CenterVertically
5454
) {
5555
Image(
56-
painter = rememberCoilPainter(request = crypto.image),
56+
painter = rememberImagePainter(data = crypto.image),
5757
modifier = Modifier
5858
.size(40.dp)
5959
.padding(4.dp),

0 commit comments

Comments
 (0)