Skip to content

Commit f576e24

Browse files
author
Section One
committed
Codi JC24 Bis - Navegació creant la primera pantalla en Jetpack Compose
1 parent 9113e8e commit f576e24

File tree

7 files changed

+62
-18
lines changed

7 files changed

+62
-18
lines changed

.idea/deploymentTargetSelector.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 41 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ dependencies {
5858
implementation(libs.androidx.ui)
5959
implementation(libs.androidx.ui.graphics)
6060
implementation(libs.androidx.ui.tooling.preview)
61-
implementation(libs.androidx.material3)
61+
implementation(libs.androidx.material3.android)
6262
testImplementation(libs.junit)
6363
androidTestImplementation(libs.androidx.junit)
6464
androidTestImplementation(libs.androidx.espresso.core)

app/src/main/java/es/cibernarium/jetpackcomposeapp/MainActivity.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,32 @@ package es.cibernarium.jetpackcomposeapp
33
import android.os.Bundle
44
import androidx.activity.ComponentActivity
55
import androidx.activity.compose.setContent
6-
import androidx.activity.enableEdgeToEdge
76
import androidx.compose.foundation.Image
87
import androidx.compose.foundation.background
98
import androidx.compose.foundation.clickable
109
import androidx.compose.foundation.layout.Column
1110
import androidx.compose.foundation.layout.Row
12-
import androidx.compose.foundation.layout.Spacer
1311
import androidx.compose.foundation.layout.fillMaxSize
14-
import androidx.compose.foundation.layout.fillMaxWidth
1512
import androidx.compose.foundation.layout.height
1613
import androidx.compose.foundation.layout.padding
17-
import androidx.compose.foundation.layout.width
1814
import androidx.compose.foundation.rememberScrollState
1915
import androidx.compose.foundation.shape.CircleShape
2016
import androidx.compose.foundation.verticalScroll
21-
import androidx.compose.material3.Button
22-
import androidx.compose.material3.ButtonDefaults
2317
import androidx.compose.material3.MaterialTheme
24-
import androidx.compose.material3.Scaffold
2518
import androidx.compose.material3.Surface
2619
import androidx.compose.material3.Text
2720
import androidx.compose.runtime.Composable
2821
import androidx.compose.runtime.getValue
2922
import androidx.compose.runtime.mutableStateOf
3023
import androidx.compose.runtime.remember
3124
import androidx.compose.runtime.setValue
32-
import androidx.compose.ui.Alignment
3325
import androidx.compose.ui.Modifier
3426
import androidx.compose.ui.draw.clip
3527
import androidx.compose.ui.graphics.Color
3628
import androidx.compose.ui.res.painterResource
3729
import androidx.compose.ui.text.font.FontFamily
38-
import androidx.compose.ui.text.font.FontFamily.Companion.Serif
3930
import androidx.compose.ui.text.font.FontStyle
4031
import androidx.compose.ui.text.font.FontWeight
41-
import androidx.compose.ui.tooling.preview.Preview
4232
import androidx.compose.ui.unit.dp
4333
import androidx.compose.ui.unit.sp
4434
import es.cibernarium.jetpackcomposeapp.pantalles.PrimeraPantalla
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
package es.cibernarium.jetpackcomposeapp.pantalles
22

33
import android.annotation.SuppressLint
4+
import androidx.compose.foundation.layout.Arrangement
45
import androidx.compose.foundation.layout.Column
6+
import androidx.compose.foundation.layout.fillMaxSize
57
import androidx.compose.material3.Button
68
import androidx.compose.material3.Scaffold
79
import androidx.compose.material3.Text
810
import androidx.compose.runtime.Composable
11+
import androidx.compose.ui.Alignment
12+
import androidx.compose.ui.Modifier
913

1014
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
1115
@Composable
1216
fun PrimeraPantalla(){
13-
Scaffold {
17+
//Scaffold (
1418
ContingutCos()
15-
}
19+
//}
1620
}
1721

1822
@Composable
@@ -24,8 +28,3 @@ fun ContingutCos(){
2428
}
2529
}
2630
}
27-
28-
@Composable
29-
fun VistaPrevia(){
30-
PrimeraPantalla()
31-
}

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ espressoCore = "3.5.1"
88
lifecycleRuntimeKtx = "2.6.1"
99
activityCompose = "1.8.0"
1010
composeBom = "2024.04.01"
11+
material3Android = "1.2.1"
1112

1213
[libraries]
1314
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -24,6 +25,7 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
2425
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
2526
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
2627
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
28+
androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
2729

2830
[plugins]
2931
android-application = { id = "com.android.application", version.ref = "agp" }

0 commit comments

Comments
 (0)