Skip to content

Commit a07bb82

Browse files
committed
complete!
1 parent 4e28670 commit a07bb82

File tree

1 file changed

+15
-30
lines changed

1 file changed

+15
-30
lines changed

app/src/main/java/com/example/androiddevchallenge/MainActivity.kt

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,33 @@
1616
package com.example.androiddevchallenge
1717

1818
import android.content.Intent
19-
import android.graphics.drawable.Drawable
2019
import android.os.Bundle
2120
import androidx.activity.compose.setContent
22-
import androidx.annotation.DrawableRes
2321
import androidx.appcompat.app.AppCompatActivity
2422
import androidx.compose.foundation.Image
25-
import androidx.compose.foundation.background
2623
import androidx.compose.foundation.clickable
27-
import androidx.compose.foundation.layout.*
24+
import androidx.compose.foundation.layout.fillMaxWidth
25+
import androidx.compose.foundation.layout.Row
26+
import androidx.compose.foundation.layout.Column
27+
import androidx.compose.foundation.layout.size
28+
import androidx.compose.foundation.layout.padding
29+
import androidx.compose.foundation.layout.wrapContentWidth
30+
import androidx.compose.foundation.layout.height
31+
import androidx.compose.foundation.layout.wrapContentHeight
32+
import androidx.compose.foundation.layout.Spacer
2833
import androidx.compose.foundation.lazy.LazyColumn
2934
import androidx.compose.foundation.lazy.items
3035
import androidx.compose.material.MaterialTheme
31-
import androidx.compose.material.Surface
3236
import androidx.compose.material.Text
33-
import androidx.compose.material.TopAppBar
3437
import androidx.compose.runtime.Composable
3538
import androidx.compose.ui.Alignment
3639
import androidx.compose.ui.Modifier
3740
import androidx.compose.ui.draw.clip
3841
import androidx.compose.ui.graphics.Color
39-
import androidx.compose.ui.graphics.vector.ImageVector
4042
import androidx.compose.ui.layout.ContentScale
4143
import androidx.compose.ui.res.painterResource
4244
import androidx.compose.ui.text.style.TextAlign
4345
import androidx.compose.ui.text.style.TextOverflow
44-
import androidx.compose.ui.tooling.preview.Preview
45-
import androidx.compose.ui.unit.TextUnit
4646
import androidx.compose.ui.unit.dp
4747
import com.example.androiddevchallenge.entities.Pet
4848
import com.example.androiddevchallenge.ui.public.AppBar
@@ -114,9 +114,9 @@ class MainActivity : AppCompatActivity() {
114114
val dataSource = getPets()
115115
setContent {
116116
MyTheme {
117-
MyApp(dataSource){
118-
val intent = Intent(this,DetailActivity::class.java)
119-
intent.putExtra(DetailActivity.KEY_PET,it)
117+
MyApp(dataSource) {
118+
val intent = Intent(this, DetailActivity::class.java)
119+
intent.putExtra(DetailActivity.KEY_PET, it)
120120
startActivity(intent)
121121
}
122122
}
@@ -138,11 +138,11 @@ class MainActivity : AppCompatActivity() {
138138

139139
// Start building your app here!
140140
@Composable
141-
fun MyApp(dataSource: List<Pet>,onItemClick:(Pet)->Unit) {
141+
fun MyApp(dataSource: List<Pet>, onItemClick: (Pet) -> Unit) {
142142
LazyColumn {
143143
item { AppBar("Welcome to Cat House") }
144144
items(dataSource) { pet ->
145-
Row(Modifier.clickable { onItemClick(pet)}) {
145+
Row(Modifier.clickable { onItemClick(pet) }) {
146146
Image(painter = painterResource(id = pet.photo),
147147
contentDescription = null,
148148
modifier = Modifier
@@ -194,19 +194,4 @@ fun MyApp(dataSource: List<Pet>,onItemClick:(Pet)->Unit) {
194194
textAlign = TextAlign.Center)
195195
}
196196
}
197-
}
198-
//@Preview("Light Theme", widthDp = 360, heightDp = 640)
199-
//@Composable
200-
//fun LightPreview() {
201-
// MyTheme {
202-
// MyApp()
203-
// }
204-
//}
205-
//
206-
//@Preview("Dark Theme", widthDp = 360, heightDp = 640)
207-
//@Composable
208-
//fun DarkPreview() {
209-
// MyTheme(darkTheme = true) {
210-
// MyApp()
211-
// }
212-
//}
197+
}

0 commit comments

Comments
 (0)