Skip to content

Commit 7c16594

Browse files
committed
Load images in background
1 parent 3ac668a commit 7c16594

4 files changed

Lines changed: 22 additions & 12 deletions

File tree

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.github.zsoltk.pokedex.common
2+
3+
import androidx.compose.Composable
4+
import androidx.compose.unaryPlus
5+
import androidx.ui.foundation.DrawImage
6+
import androidx.ui.graphics.Color
7+
import androidx.ui.res.loadImageResource
8+
9+
@Composable
10+
fun LoadImage(imageResId: Int, tint: Color? = null) {
11+
(+loadImageResource(imageResId)).resource.resource?.let {
12+
DrawImage(
13+
image = it,
14+
tint = tint
15+
)
16+
}
17+
}

app/src/main/java/com/github/zsoltk/pokedex/common/PokeBall.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package com.github.zsoltk.pokedex.common
22

33
import androidx.compose.Composable
4-
import androidx.compose.unaryPlus
54
import androidx.ui.core.Opacity
65
import androidx.ui.core.dp
7-
import androidx.ui.foundation.DrawImage
86
import androidx.ui.graphics.Color
97
import androidx.ui.layout.Container
10-
import androidx.ui.res.imageResource
118
import androidx.ui.tooling.preview.Preview
129
import com.github.zsoltk.pokedex.R
1310

@@ -24,10 +21,7 @@ fun PokeBallSmall(tint: Color, opacity: Float = 1f) {
2421
@Composable
2522
private fun PokeBall(tint: Color, opacity: Float, imageResId: Int) {
2623
Opacity(opacity = opacity) {
27-
DrawImage(
28-
image = +imageResource(imageResId),
29-
tint = tint
30-
)
24+
LoadImage(imageResId, tint)
3125
}
3226
}
3327

app/src/main/java/com/github/zsoltk/pokedex/home/news/NewsCard.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.compose.Composable
44
import androidx.compose.unaryPlus
55
import androidx.ui.core.Text
66
import androidx.ui.core.dp
7-
import androidx.ui.foundation.DrawImage
87
import androidx.ui.foundation.shape.corner.RoundedCornerShape
98
import androidx.ui.layout.Column
109
import androidx.ui.layout.Container
@@ -15,10 +14,10 @@ import androidx.ui.layout.Spacing
1514
import androidx.ui.material.MaterialTheme
1615
import androidx.ui.material.surface.Surface
1716
import androidx.ui.res.colorResource
18-
import androidx.ui.res.imageResource
1917
import androidx.ui.text.font.FontWeight
2018
import com.github.zsoltk.pokedex.R
2119
import com.github.zsoltk.pokedex.common.HorizontalRuler
20+
import com.github.zsoltk.pokedex.common.LoadImage
2221
import com.github.zsoltk.pokedex.entity.NewsItem
2322

2423
@Composable
@@ -55,7 +54,7 @@ private fun NewsImage() {
5554
Padding(left = 48.dp) {
5655
Surface(shape = RoundedCornerShape(8.dp)) {
5756
Container(width = 112.dp, height = 64.dp) {
58-
DrawImage(image = +imageResource(R.drawable.news1))
57+
LoadImage(R.drawable.news1)
5958
}
6059
}
6160
}

app/src/main/java/com/github/zsoltk/pokedex/pokedex/PokemonDetails.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import androidx.ui.material.Tab
2323
import androidx.ui.material.TabRow
2424
import androidx.ui.material.surface.Surface
2525
import androidx.ui.res.colorResource
26-
import androidx.ui.res.imageResource
2726
import androidx.ui.text.TextStyle
2827
import androidx.ui.text.font.FontFamily
2928
import androidx.ui.text.font.FontWeight
3029
import androidx.ui.tooling.preview.Preview
3130
import com.github.zsoltk.pokedex.R
31+
import com.github.zsoltk.pokedex.common.LoadImage
3232
import com.github.zsoltk.pokedex.common.PokeBallLarge
3333
import com.github.zsoltk.pokedex.common.PokemonTypeLabels
3434
import com.github.zsoltk.pokedex.common.Rotate
@@ -160,7 +160,7 @@ private fun StackChildren.Image(pokemon: Pokemon) {
160160
pokemon.image?.let { image ->
161161
positioned(topInset = 140.dp) {
162162
Container(width = 200.dp, height = 200.dp) {
163-
DrawImage(+imageResource(image))
163+
LoadImage(image)
164164
}
165165
}
166166
}

0 commit comments

Comments
 (0)