-
Notifications
You must be signed in to change notification settings - Fork 8
1주차 미션 / 1조 류성민 #10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AngryRyu800
wants to merge
1
commit into
Konkuk-KUIT:AngryRyu800
Choose a base branch
from
AngryRyu800:week1
base: AngryRyu800
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
1주차 미션 / 1조 류성민 #10
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,106 +3,78 @@ package com.example.kuit7 | |
| import android.os.Bundle | ||
| import androidx.activity.ComponentActivity | ||
| import androidx.activity.compose.setContent | ||
| import androidx.activity.enableEdgeToEdge | ||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.shape.CircleShape | ||
| import androidx.compose.foundation.layout.* | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.text.font.FontWeight | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import com.example.kuit7.ui.theme.KUIT7week1Theme | ||
|
|
||
| class MainActivity : ComponentActivity() { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| enableEdgeToEdge() | ||
| setContent { | ||
| KUIT7week1Theme { | ||
| Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> | ||
| Box(Modifier.padding(innerPadding)) { | ||
| Row { | ||
| Column( | ||
| Modifier | ||
| .padding(top = 30.dp, start = 70.dp), | ||
| verticalArrangement = Arrangement.spacedBy(20.dp) | ||
| ) { | ||
| Box( | ||
| Modifier | ||
| .size(60.dp) | ||
| .background(Color.Black, shape = RoundedCornerShape(20.dp)) | ||
| Box( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .padding(innerPadding), | ||
| contentAlignment = Alignment.Center | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .background( | ||
| Color(0xFFE0E0E0), | ||
| shape = RoundedCornerShape(16.dp) | ||
| ) | ||
| Box( | ||
| Modifier | ||
| .size(60.dp) | ||
| .border( | ||
| width = 2.dp, | ||
| color = Color.Black, | ||
| shape = RoundedCornerShape(20.dp) | ||
| ) | ||
| ) | ||
| Box( | ||
| Modifier | ||
| .size(76.dp) | ||
| .border(width = 1.dp, color = Color.Black) | ||
| .padding(8.dp) | ||
| .background(Color.Red) | ||
| ) | ||
| Image( | ||
| painter = painterResource(R.drawable.image), | ||
| contentDescription = "강아지 이미지", | ||
| modifier = Modifier.size(80.dp) | ||
| ) | ||
| } | ||
| Column( | ||
| Modifier | ||
| .padding(top = 30.dp, start = 60.dp), | ||
| verticalArrangement = Arrangement.spacedBy(20.dp) | ||
| ) { | ||
| Box( | ||
| Modifier | ||
| .size(60.dp) | ||
| .background(Color.Black, shape = CircleShape) | ||
| ) | ||
| Box( | ||
| Modifier | ||
| .size(60.dp) | ||
| .border( | ||
| width = 2.dp, | ||
| color = Color.Black, | ||
| shape = CircleShape | ||
| ) | ||
| ) | ||
| Box( | ||
| Modifier | ||
| .size(76.dp) | ||
| .border(width = 1.dp, color = Color.Black) | ||
| .padding(8.dp) | ||
| .background(Color.Blue, CircleShape) | ||
| ) | ||
| Image( | ||
| painter = painterResource(R.drawable.image), | ||
| contentDescription = "강아지 이미지", | ||
| modifier = Modifier.size(80.dp) | ||
| .clip(CircleShape) | ||
| ) | ||
| } | ||
| .padding(24.dp), | ||
| horizontalAlignment = Alignment.CenterHorizontally | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Row/Column의 Alignment는 배치 방향의 수직 방향의 정렬을 맞춥니다 피그마 디자인에서 중앙 정렬을 요구하지 않았으니 빼면 됩니다! |
||
| ) { | ||
| Image( | ||
| painter = painterResource(id = R.drawable.image), | ||
| contentDescription = "프로필 이미지", | ||
| modifier = Modifier | ||
| .size(100.dp) | ||
| .clip(RoundedCornerShape(16.dp)) | ||
| ) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| Text( | ||
| text = "이름 : 류성민", | ||
| fontSize = 16.sp, | ||
| fontWeight = FontWeight.Bold | ||
| ) | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
| Text( | ||
| text = "학번 : 202410160", | ||
| fontSize = 16.sp, | ||
| fontWeight = FontWeight.Bold | ||
| ) | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
| Text( | ||
| text = "학과 : 철학과", | ||
| fontSize = 16.sp, | ||
| fontWeight = FontWeight.Bold | ||
| ) | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
| Text( | ||
| text = "생년월일 : 2001/03/21", | ||
| fontSize = 16.sp, | ||
| fontWeight = FontWeight.Bold | ||
| ) | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
피그마처럼 테두리, 배경 색 적용해 주세요~