From a27d2f133df218c63aa550624e688c202452706a Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Fri, 19 Apr 2024 23:29:56 +0900
Subject: [PATCH 01/12] =?UTF-8?q?add/#6:=20viewBinding=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index f534bf6..36b9bd1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,6 +35,7 @@ android {
     }
     buildFeatures {
         compose true
+        viewBinding true
     }
     composeOptions {
         kotlinCompilerExtensionVersion '1.5.1'
@@ -55,6 +56,12 @@ dependencies {
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.compose.material3:material3'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.activity:activity:1.8.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

From 2e8b194b107de19512ab5b14e8db40b7ef7fc542 Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Fri, 19 Apr 2024 23:32:38 +0900
Subject: [PATCH 02/12] =?UTF-8?q?mod/#6:=20=EC=A4=91=EB=B3=B5=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20Composable=EB=A1=9C=20=EC=9E=AC=EC=82=AC=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sopt/now/compose/LoginActivity.kt     | 126 ++++++++--------
 .../com/sopt/now/compose/SignUpActivity.kt    | 134 +++++++-----------
 2 files changed, 108 insertions(+), 152 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/compose/LoginActivity.kt b/app/src/main/java/com/sopt/now/compose/LoginActivity.kt
index 5eacdf5..8c02e07 100644
--- a/app/src/main/java/com/sopt/now/compose/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/compose/LoginActivity.kt
@@ -6,12 +6,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
@@ -28,9 +23,11 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -49,9 +46,9 @@ class LoginActivity : ComponentActivity() {
                     val userId = intent.getStringExtra("userId").toString()
                     val userPw = intent.getStringExtra("userPw").toString()
                     val userName = intent.getStringExtra("userName").toString()
-                    val userMbti = intent.getStringExtra("userMbti").toString()
+                    val userDescription = intent.getStringExtra("userDescription").toString()
 
-                    LoginCompose(userId, userPw, userName ,userMbti)
+                    LoginCompose(userId, userPw, userName ,userDescription)
                 }
             }
         }
@@ -59,7 +56,43 @@ class LoginActivity : ComponentActivity() {
 }
 
 @Composable
-fun LoginCompose(userId: String, userPw: String, userName: String, userMbti: String) {
+fun LoginInputField(label: String, value: String, onValueChange: (String) -> Unit) {
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        Text(
+            text = label,
+            fontSize = 20.sp,
+            fontWeight = FontWeight.Bold,
+            textAlign = TextAlign.Start
+        )
+        Spacer(modifier = Modifier.height(10.dp))
+        TextField(
+            value = value,
+            onValueChange = onValueChange,
+            modifier = Modifier.fillMaxWidth(),
+            label = { Text(label) },
+            singleLine = true,
+            visualTransformation = if (label == "비밀번호") PasswordVisualTransformation() else VisualTransformation.None,
+            keyboardOptions = if (label == "비밀번호") KeyboardOptions(keyboardType = KeyboardType.Password) else KeyboardOptions.Default
+        )
+    }
+}
+
+@Composable
+fun LoginButton(text: String, onClick: () -> Unit) {
+    Button(
+        onClick = onClick,
+        colors = ButtonDefaults.buttonColors(containerColor = Color.Black),
+        shape = RoundedCornerShape(50.dp),
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        Text(text, color = Color.White)
+    }
+}
+
+@Composable
+fun LoginCompose(userId: String, userPw: String, userName: String, userDescription: String) {
     val context = LocalContext.current
     var inputId by remember { mutableStateOf("") }
     var inputPw by remember { mutableStateOf("") }
@@ -67,86 +100,39 @@ fun LoginCompose(userId: String, userPw: String, userName: String, userMbti: Str
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(horizontal = 30.dp),
+            .padding(horizontal = 30.dp, vertical = 60.dp),
     ) {
-        Spacer(modifier = Modifier.height(60.dp))
         Text(
-            text = "Welcom To SOPT",
+            text = stringResource(id = R.string.title_login),
             fontSize = 30.sp,
             fontWeight = FontWeight.Bold,
             textAlign = TextAlign.Center,
             modifier = Modifier.fillMaxWidth()
         )
         Spacer(modifier = Modifier.height(60.dp))
-        Text(
-            text = "ID",
-            fontSize = 20.sp,
-            fontWeight = FontWeight.Bold,
-            textAlign = TextAlign.Start
-        )
-        Spacer(modifier = Modifier.height(10.dp))
-        TextField(
-            value = inputId,
-            onValueChange = { inputId = it },
-            modifier = Modifier.fillMaxWidth(),
-            label = { Text("아이디를 입력하세요.") },
-            singleLine = true, //단일 줄로 제한
-        )
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(
-            text = "비밀번호",
-            fontSize = 20.sp,
-            fontWeight = FontWeight.Bold,
-            textAlign = TextAlign.Start
-        )
-        Spacer(modifier = Modifier.height(10.dp))
-        TextField(
-            value = inputPw,
-            onValueChange = { inputPw = it },
-            modifier = Modifier.fillMaxWidth(),
-            label = { Text("비밀번호를 입력하세요.") },
-            singleLine = true, //단일 줄로 제한
-            visualTransformation = PasswordVisualTransformation(), // 비밀번호 마스킹 처리
-            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password)
-        )
+        LoginInputField(label = stringResource(id = R.string.tv_id), value = inputId) { inputId = it }
+        Spacer(modifier = Modifier.height(60.dp))
+        LoginInputField(label = stringResource(id = R.string.tv_pw), value = inputPw) { inputPw = it }
         Spacer(modifier = Modifier.weight(2f))
-        Button(
-            onClick = {
-                // 로그인
-                if(userId == inputId && userPw == inputPw){
-                    moveToMain(context, userId, userPw, userName ,userMbti)
-                }
-            },
-            colors = ButtonDefaults.buttonColors(containerColor = Color.Black),
-            shape = RoundedCornerShape(50.dp),
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            Text("로그인", color = Color.White)
+        LoginButton(stringResource(id = R.string.btn_login)) {
+            if (userId == inputId && userPw == inputPw) {
+                moveToMain(context, userId, userPw, userName, userDescription)
+            }
         }
         Spacer(modifier = Modifier.height(10.dp))
-        Button(
-            onClick = {
-                // 회원가입 페이지로 이동
-                val intent = Intent(context, SignUpActivity::class.java)
-                context.startActivity(intent)
-            },
-            colors = ButtonDefaults.buttonColors(containerColor = Color.Black),
-            shape = RoundedCornerShape(50.dp),
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            Text("회원가입", color = Color.White)
+        LoginButton(stringResource(id = R.string.btn_sign_up)) {
+            val intent = Intent(context, SignUpActivity::class.java)
+            context.startActivity(intent)
         }
-        Spacer(modifier = Modifier.padding(bottom = 60.dp))
     }
 }
 
-// 메인 페이지로 이동
-private fun moveToMain(context: Context, userId: String, userPw: String, userName: String, userMbti: String) {
+private fun moveToMain(context: Context, userId: String, userPw: String, userName: String, userDescription: String) {
     val intent = Intent(context, MainActivity::class.java).apply {
         putExtra("userId", userId)
         putExtra("userPw", userPw)
         putExtra("userName", userName)
-        putExtra("userMbti", userMbti)
+        putExtra("userDescription", userDescription)
     }
     context.startActivity(intent)
     Toast.makeText(context, "로그인 성공!", Toast.LENGTH_SHORT).show()
diff --git a/app/src/main/java/com/sopt/now/compose/SignUpActivity.kt b/app/src/main/java/com/sopt/now/compose/SignUpActivity.kt
index fde8d08..50259db 100644
--- a/app/src/main/java/com/sopt/now/compose/SignUpActivity.kt
+++ b/app/src/main/java/com/sopt/now/compose/SignUpActivity.kt
@@ -6,12 +6,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -19,14 +14,11 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -56,120 +48,98 @@ fun SignUpCompose(){
     var userId by remember { mutableStateOf("") }
     var userPw by remember { mutableStateOf("") }
     var userName by remember { mutableStateOf("") }
-    var userMbti by remember { mutableStateOf("") }
+    var userDescription by remember { mutableStateOf("") }
 
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(horizontal = 30.dp),
+            .padding(horizontal = 30.dp, vertical = 60.dp),
     ) {
-        Spacer(modifier = Modifier.height(60.dp))
         Text(
-            text = "Sign Up",
+            text = stringResource(id = R.string.title_sign_up),
             fontSize = 30.sp,
             fontWeight = FontWeight.Bold,
             textAlign = TextAlign.Center,
             modifier = Modifier.fillMaxWidth()
         )
         Spacer(modifier = Modifier.height(60.dp))
-        Text(
-            text = "ID",
-            fontSize = 20.sp,
-            textAlign = TextAlign.Start
-        )
-        Spacer(modifier = Modifier.height(10.dp))
-        TextField(
-            value = userId,
-            onValueChange = { userId = it },
-            modifier = Modifier.fillMaxWidth(),
-            label = { Text("아이디를 입력하세요.") },
-            singleLine = true //단일 줄로 제한
-        )
+        TextFieldWithLabel(
+            stringResource(id = R.string.tv_id), userId,
+            stringResource(id = R.string.hint_id)
+        ) { userId = it }
         Spacer(modifier = Modifier.height(30.dp))
-        Text(
-            text = "비밀번호",
-            fontSize = 20.sp,
-            textAlign = TextAlign.Start
-        )
-        Spacer(modifier = Modifier.height(10.dp))
-        TextField(
-            value = userPw,
-            onValueChange = { userPw = it },
-            modifier = Modifier.fillMaxWidth(),
-            label = { Text("비밀번호를 입력하세요.") },
-            singleLine = true
-        )
-        Spacer(modifier = Modifier.height(10.dp))
+        TextFieldWithLabel(
+            stringResource(id = R.string.tv_pw), userPw,
+            stringResource(id = R.string.hint_pw)
+        ) { userPw = it }
         Spacer(modifier = Modifier.height(30.dp))
-        Text(
-            text = "닉네임",
-            fontSize = 20.sp,
-            textAlign = TextAlign.Start
-        )
-        Spacer(modifier = Modifier.height(10.dp))
-        TextField(
-            value = userName,
-            onValueChange = { userName = it },
-            modifier = Modifier.fillMaxWidth(),
-            label = { Text("닉네임을 입력하세요.") },
-            singleLine = true
-        )
+        TextFieldWithLabel(
+            stringResource(id = R.string.tv_user_name), userName,
+            stringResource(id = R.string.hint_user_name)
+        ) { userName = it }
         Spacer(modifier = Modifier.height(30.dp))
-        Text(
-            text = "MBTI",
-            fontSize = 20.sp,
-            textAlign = TextAlign.Start
-        )
-        Spacer(modifier = Modifier.height(10.dp))
-        TextField(
-            value = userMbti,
-            onValueChange = { userMbti = it },
-            modifier = Modifier.fillMaxWidth(),
-            label = { Text("MBTI를 입력하세요.") },
-            singleLine = true
-        )
+        TextFieldWithLabel(
+            stringResource(id = R.string.tv_user_description), userDescription,
+            stringResource(id = R.string.hint_user_description)
+        ) { userDescription = it }
         Spacer(modifier = Modifier.weight(2f))
         Button(
             onClick = {
-                checkSignUp(context, userId, userPw, userName, userMbti)
+                checkSignUp(context, userId, userPw, userName, userDescription)
             },
             colors = ButtonDefaults.buttonColors(containerColor = Color.Black),
             shape = RoundedCornerShape(50.dp),
             modifier = Modifier.fillMaxWidth()
         ) {
-            Text("회원가입", color = Color.White)
+            Text(stringResource(id = R.string.btn_sign_up), color = Color.White)
         }
-        Spacer(modifier = Modifier.padding(bottom = 60.dp))
+    }
+}
+
+@Composable
+fun TextFieldWithLabel(label: String, value: String, hint: String, onValueChange: (String) -> Unit) {
+    Column {
+        Text(
+            text = label,
+            fontSize = 20.sp,
+            textAlign = TextAlign.Start
+        )
+        Spacer(modifier = Modifier.height(10.dp))
+        TextField(
+            value = value,
+            onValueChange = onValueChange,
+            modifier = Modifier.fillMaxWidth(),
+            label = { Text(hint) },
+            singleLine = true
+        )
     }
 }
 
 // 회원 가입 가능 여부 체크
-fun checkSignUp(context: Context, userId: String, userPw: String, userName: String, userMbti: String) {
+fun checkSignUp(context: Context, userId: String, userPw: String, userName: String, userDescription: String) {
     val isValidId = userId.length in 6..10
     val isValidPw = userPw.length in 8..12
     val isValidName = userName.trim().isEmpty() // 공백으로만 이루어진 경우 판단
-    val isEmpty = userId.isEmpty() || userPw.isEmpty() || userName.isEmpty() || userMbti.isEmpty()
 
     val message = when {
-        !isValidId -> "ID는 6~10 글자여야 합니다."
-        !isValidPw -> "Password는 8~12 글자여야 합니다."
-        isValidName -> "공백으로만 이루어진 닉네임은 불가합니다."
-        isEmpty -> "모든 정보를 입력해주세요."
+        !isValidId -> context.getString(R.string.error_invalid_id)
+        !isValidPw -> context.getString(R.string.error_invalid_pw)
+        isValidName -> context.getString(R.string.error_empty_name)
         else -> {
-            moveToLogin(context, userId, userPw, userName, userMbti)
-            "회원가입 성공!"
+            moveToLogin(context, userId, userPw, userName, userDescription)
+            context.getString(R.string.signup_success)
         }
     }
     Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
 }
 
-// 로그인 페이지로 이동
-private fun moveToLogin(context: Context, userId: String, userPw: String, userName: String, userMbti: String) {
+// Move to login page
+private fun moveToLogin(context: Context, userId: String, userPw: String, userName: String, userDescription: String) {
     val intent = Intent(context, LoginActivity::class.java).apply {
         putExtra("userId", userId)
         putExtra("userPw", userPw)
         putExtra("userName", userName)
-        putExtra("userMbti", userMbti)
+        putExtra("userDescription", userDescription)
     }
     context.startActivity(intent)
 }

From 4188b5e4a473a6cbc9d585b2ab5dff41887973b1 Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Fri, 19 Apr 2024 23:33:02 +0900
Subject: [PATCH 03/12] =?UTF-8?q?add/#6:=20string=20=EC=B6=94=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/strings.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be0d381..6790dcb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,26 @@
 <resources>
     <string name="app_name">NOW SOPT Android</string>
+    <string name="title_login">Welcome to SOPT</string>
+    <string name="btn_sign_up">회원가입</string>
+    <string name="btn_login">로그인</string>
+    <string name="tv_id">ID</string>
+    <string name="hint_id">아이디를 입력해주세요.</string>
+    <string name="tv_pw">비밀번호</string>
+    <string name="hint_pw">비밀번호를 입력해주세요.</string>
+
+    <string name="title_sign_up">SIGN UP</string>
+    <string name="tv_user_name">닉네임</string>
+    <string name="hint_user_name">닉네임을 입력해주세요.</string>
+    <string name="tv_user_description">한 줄 소개</string>
+    <string name="hint_user_description">한 줄 소개를 입력해주세요.</string>
+
+    <string name="error_invalid_id">ID는 6~10 글자여야 합니다.</string>
+    <string name="error_invalid_pw">Password는 8~12 글자여야 합니다.</string>
+    <string name="error_empty_name">공백으로만 이루어진 닉네임은 불가합니다.</string>
+    <string name="signup_success">회원가입 성공!</string>
+    <!-- Strings used for fragments for navigation -->
+    <string name="first_fragment_label">First Fragment</string>
+    <string name="second_fragment_label">Second Fragment</string>
+    <string name="next">Next</string>
+    <string name="previous">Previous</string>
 </resources>
\ No newline at end of file

From 9a19af3006f1087e5bda51f9b2e16cbeabcfc46e Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Fri, 19 Apr 2024 23:33:41 +0900
Subject: [PATCH 04/12] =?UTF-8?q?mod/#6:=20Main=20UI=EB=A5=BC=20MyPage?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sopt/now/compose/MyPageView.kt   | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 app/src/main/java/com/sopt/now/compose/MyPageView.kt

diff --git a/app/src/main/java/com/sopt/now/compose/MyPageView.kt b/app/src/main/java/com/sopt/now/compose/MyPageView.kt
new file mode 100644
index 0000000..d0589b6
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/compose/MyPageView.kt
@@ -0,0 +1,82 @@
+package com.sopt.now.compose
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.sopt.now.compose.ui.theme.NOWSOPTAndroidTheme
+
+@Composable
+fun MyPageView(userId: String, userPw: String, userName: String, userDescription: String) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 30.dp, vertical = 60.dp),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Image(
+                painter = painterResource(id = R.drawable.iv_user_profile),
+                contentDescription = stringResource(id = R.string.app_name),
+                Modifier
+                    .size(100.dp)
+                    .aspectRatio(1f)
+            )
+            Spacer(modifier = Modifier.width(20.dp))
+            Text(
+                text = userName,
+                fontSize = 20.sp
+            )
+        }
+        Spacer(modifier = Modifier.height(60.dp))
+        UserInfoItem(
+            label = stringResource(id = R.string.tv_id),
+            value = userId
+        )
+        Spacer(modifier = Modifier.height(30.dp))
+        UserInfoItem(
+            label = stringResource(id = R.string.tv_pw),
+            value = userPw
+        )
+        Spacer(modifier = Modifier.height(30.dp))
+        UserInfoItem(
+            label = stringResource(id = R.string.tv_user_description),
+            value = userDescription
+        )
+    }
+}
+
+@Composable
+fun UserInfoItem(label: String, value: String) {
+    Column {
+        Text(
+            text = label,
+            fontSize = 20.sp,
+            fontWeight = FontWeight.Bold
+        )
+        Spacer(modifier = Modifier.height(10.dp))
+        Text(
+            text = value,
+            fontSize = 20.sp
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun MyPagePreview() {
+    NOWSOPTAndroidTheme {
+        MyPageView("myPageSopt", "mypagePassword123", "MyPageUserName", "INFJ 입니다!")
+    }
+}

From 025f95748cb0b8bb674332c15d3f535261c9b548 Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Fri, 19 Apr 2024 23:34:21 +0900
Subject: [PATCH 05/12] =?UTF-8?q?add/#6:=20Profile=20Data=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/compose/item/Profile.kt | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 app/src/main/java/com/sopt/now/compose/item/Profile.kt

diff --git a/app/src/main/java/com/sopt/now/compose/item/Profile.kt b/app/src/main/java/com/sopt/now/compose/item/Profile.kt
new file mode 100644
index 0000000..0cb2a55
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/compose/item/Profile.kt
@@ -0,0 +1,7 @@
+package com.sopt.now.compose.item
+
+data class Profile(
+    val userProfile: Int,
+    val userName: String,
+    val userDescription: String
+)
\ No newline at end of file

From efc87e8b7bdd9c0602a3adb15119d91bb83db843 Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Fri, 19 Apr 2024 23:35:15 +0900
Subject: [PATCH 06/12] =?UTF-8?q?ui/#6:=20UserItem=20UI=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sopt/now/compose/item/UserItem.kt     |  54 ++++++++++++++++++
 app/src/main/res/drawable/iv_user_profile.jpg | Bin 0 -> 7022 bytes
 2 files changed, 54 insertions(+)
 create mode 100644 app/src/main/java/com/sopt/now/compose/item/UserItem.kt
 create mode 100644 app/src/main/res/drawable/iv_user_profile.jpg

diff --git a/app/src/main/java/com/sopt/now/compose/item/UserItem.kt b/app/src/main/java/com/sopt/now/compose/item/UserItem.kt
new file mode 100644
index 0000000..823c5cd
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/compose/item/UserItem.kt
@@ -0,0 +1,54 @@
+package com.sopt.now.compose.item
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.sopt.now.compose.R
+import com.sopt.now.compose.ui.theme.NOWSOPTAndroidTheme
+
+@Composable
+fun UserItem(profileData:Profile) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 10.dp, vertical = 20.dp),
+    ) {
+        Image(
+            painter = painterResource(profileData.userProfile),
+            contentDescription = stringResource(id = R.string.app_name),
+            Modifier
+                .size(80.dp)
+                .aspectRatio(1f)
+        )
+        Spacer(modifier = Modifier.width(10.dp))
+        Text(
+            text = profileData.userName,
+            fontSize = 20.sp,
+            fontWeight = FontWeight.Bold,
+        )
+        Spacer(modifier = Modifier.weight(1f))
+        Text(
+            text = profileData.userDescription,
+            fontSize = 20.sp,
+            textAlign = TextAlign.End,
+            maxLines = 1
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun UserPreview() {
+    NOWSOPTAndroidTheme {
+        UserItem(Profile(R.drawable.iv_user_profile, "youjin", "welcome"))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/iv_user_profile.jpg b/app/src/main/res/drawable/iv_user_profile.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f82418514ce9f38dc0eb5e1304d11827659041d2
GIT binary patch
literal 7022
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
bCbUfXLPGQ5fgC}d--eCPI|^qi{x1C=y!6B@

literal 0
HcmV?d00001


From 4369aa1aaa2d0e450f47726e599288b771b36f99 Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Fri, 19 Apr 2024 23:35:33 +0900
Subject: [PATCH 07/12] =?UTF-8?q?ui/#6:=20FriendItem=20UI=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sopt/now/compose/item/FriendItem.kt   |  54 ++++++++++++++++++
 app/src/main/res/drawable/img_profile.jpg     | Bin 7022 -> 0 bytes
 .../main/res/drawable/iv_friend_profile.jpg   | Bin 0 -> 5115 bytes
 3 files changed, 54 insertions(+)
 create mode 100644 app/src/main/java/com/sopt/now/compose/item/FriendItem.kt
 delete mode 100644 app/src/main/res/drawable/img_profile.jpg
 create mode 100644 app/src/main/res/drawable/iv_friend_profile.jpg

diff --git a/app/src/main/java/com/sopt/now/compose/item/FriendItem.kt b/app/src/main/java/com/sopt/now/compose/item/FriendItem.kt
new file mode 100644
index 0000000..a7224d1
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/compose/item/FriendItem.kt
@@ -0,0 +1,54 @@
+package com.sopt.now.compose.item
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.sopt.now.compose.R
+import com.sopt.now.compose.ui.theme.NOWSOPTAndroidTheme
+
+@Composable
+fun FriendItem(profile: Profile) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 10.dp, vertical = 20.dp),
+    ) {
+        Image(
+            painter = painterResource(profile.userProfile),
+            contentDescription = stringResource(id = R.string.app_name),
+            Modifier
+                .size(50.dp)
+                .aspectRatio(1f)
+        )
+        Spacer(modifier = Modifier.width(10.dp))
+        Text(
+            text = profile.userName,
+            fontSize = 20.sp,
+            fontWeight = FontWeight.Bold,
+        )
+        Spacer(modifier = Modifier.weight(1f))
+        Text(
+            text = profile.userDescription,
+            fontSize = 20.sp,
+            textAlign = TextAlign.End,
+            maxLines = 1
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun FriendPreview() {
+    NOWSOPTAndroidTheme {
+        FriendItem(Profile(R.drawable.iv_user_profile, "youjin", "welcome"))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/img_profile.jpg b/app/src/main/res/drawable/img_profile.jpg
deleted file mode 100644
index f82418514ce9f38dc0eb5e1304d11827659041d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7022
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
bCbUfXLPGQ5fgC}d--eCPI|^qi{x1C=y!6B@

diff --git a/app/src/main/res/drawable/iv_friend_profile.jpg b/app/src/main/res/drawable/iv_friend_profile.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..212e30aa234c5c159c8e99579a32de248111076d
GIT binary patch
literal 5115
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
a8@_dqF#R-4Xz%hm09)4o%2C<5KJY&#Aoz&@

literal 0
HcmV?d00001


From 4bfcebbfe6b77fde5e74efabf15fd42ee62312d4 Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Fri, 19 Apr 2024 23:36:11 +0900
Subject: [PATCH 08/12] =?UTF-8?q?feat/#6:=20HomeView=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sopt/now/compose/HomeView.kt     | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 app/src/main/java/com/sopt/now/compose/HomeView.kt

diff --git a/app/src/main/java/com/sopt/now/compose/HomeView.kt b/app/src/main/java/com/sopt/now/compose/HomeView.kt
new file mode 100644
index 0000000..7534e1b
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/compose/HomeView.kt
@@ -0,0 +1,106 @@
+package com.sopt.now.compose
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import com.sopt.now.compose.item.FriendItem
+import com.sopt.now.compose.item.Profile
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.sopt.now.compose.item.UserItem
+import com.sopt.now.compose.ui.theme.NOWSOPTAndroidTheme
+
+@Composable
+fun HomeView() {
+    LazyColumn(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        item {
+            UserItem(friendList.first())
+        }
+
+        // 첫 번째 요소는 건너뛰고 적용
+        itemsIndexed(friendList) { index, profile ->
+            if (index > 0) {
+                FriendItem(profile)
+            }
+        }
+    }
+}
+
+val friendList = listOf(
+    Profile(
+        userProfile = R.drawable.iv_user_profile,
+        userName = "박유진",
+        userDescription = "안녕하세요~!!"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "AAA",
+        userDescription = "AAA님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "BBB",
+        userDescription = "BBB님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "CCC",
+        userDescription = "CCC님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "DDD",
+        userDescription = "DDD님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "EEE",
+        userDescription = "EEE님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "FFF",
+        userDescription = "FFF님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "GGG",
+        userDescription = "GGG님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "HHH",
+        userDescription = "HHH님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "III",
+        userDescription = "III님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "JJJ",
+        userDescription = "JJJ님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "KKK",
+        userDescription = "KKK님의 한 줄 소개"
+    ),
+    Profile(
+        userProfile = R.drawable.iv_friend_profile,
+        userName = "LLL",
+        userDescription = "LLL님의 한 줄 소개"
+    )
+)
+
+@Preview(showBackground = true)
+@Composable
+fun HomePreview() {
+    NOWSOPTAndroidTheme {
+        HomeView()
+    }
+}
\ No newline at end of file

From 1cc3632865a82668c7b3aa3dd538afd41e232a5e Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Fri, 19 Apr 2024 23:38:53 +0900
Subject: [PATCH 09/12] =?UTF-8?q?feat/#6:=20BottomNavigation=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sopt/now/compose/BottomNavigationItem.kt  |   8 +
 .../java/com/sopt/now/compose/MainActivity.kt | 140 +++++++++---------
 2 files changed, 80 insertions(+), 68 deletions(-)
 create mode 100644 app/src/main/java/com/sopt/now/compose/BottomNavigationItem.kt

diff --git a/app/src/main/java/com/sopt/now/compose/BottomNavigationItem.kt b/app/src/main/java/com/sopt/now/compose/BottomNavigationItem.kt
new file mode 100644
index 0000000..efc4679
--- /dev/null
+++ b/app/src/main/java/com/sopt/now/compose/BottomNavigationItem.kt
@@ -0,0 +1,8 @@
+package com.sopt.now.compose
+
+import androidx.compose.ui.graphics.vector.ImageVector
+
+data class BottomNavigationItem(
+    val icon: ImageVector,
+    val label: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/compose/MainActivity.kt b/app/src/main/java/com/sopt/now/compose/MainActivity.kt
index 29f448d..30a05a3 100644
--- a/app/src/main/java/com/sopt/now/compose/MainActivity.kt
+++ b/app/src/main/java/com/sopt/now/compose/MainActivity.kt
@@ -3,26 +3,29 @@ package com.sopt.now.compose
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.sopt.now.compose.ui.theme.NOWSOPTAndroidTheme
 
 class MainActivity : ComponentActivity() {
@@ -34,12 +37,18 @@ class MainActivity : ComponentActivity() {
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background
                 ) {
-                    val userId = intent.getStringExtra("userId")?: ""
-                    val userPw = intent.getStringExtra("userPw")?: ""
-                    val userName = intent.getStringExtra("userName")?: ""
-                    val userMbti = intent.getStringExtra("userMbti")?: ""
 
-                    MainCompose(userId, userPw, userName, userMbti)
+                    val userId = intent.getStringExtra("userId").toString()
+                    val userPw = intent.getStringExtra("userPw").toString()
+                    val userName = intent.getStringExtra("userName").toString()
+                    val userDescription = intent.getStringExtra("userDescription").toString()
+
+                    ScaffoldExample(
+                        userId = userId,
+                        userPw = userPw,
+                        userName = userName,
+                        userDescription = userDescription
+                    )
                 }
             }
         }
@@ -47,60 +56,55 @@ class MainActivity : ComponentActivity() {
 }
 
 @Composable
-fun MainCompose(userId: String, userPw: String, userName: String, userMbti: String){
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(horizontal = 30.dp),
-    ) {
-        Spacer(modifier = Modifier.height(60.dp))
-        Row (
+fun ScaffoldExample(userId: String, userPw: String, userName: String, userDescription: String) {
+    var selectedItem by remember { mutableIntStateOf(0) }
+    val items = listOf(
+        BottomNavigationItem(
+            icon = Icons.Filled.Home,
+            label = "Home"
+        ),
+        BottomNavigationItem(
+            icon = Icons.Filled.Search,
+            label = "Search"
+        ),
+        BottomNavigationItem(
+            icon = Icons.Filled.Person,
+            label = "Profile"
+        )
+    )
+
+    Scaffold(
+        bottomBar = {
+            NavigationBar {
+                items.forEachIndexed { index, item ->
+                    NavigationBarItem(
+                        icon = { Icon(item.icon, contentDescription = item.label) },
+                        label = { Text(item.label) },
+                        selected = selectedItem == index,
+                        onClick = { selectedItem = index }
+                    )
+                }
+            }
+        },
+    ) { innerPadding ->
+        Column(
             modifier = Modifier
-            .fillMaxWidth()
-        ){
-            Image(
-                painter = painterResource(id = R.drawable.img_profile),
-                contentDescription = "Profile",
-                Modifier
-                    .size(100.dp)
-                    .aspectRatio(1f/1f)
-            )
-            Spacer(modifier = Modifier.width(20.dp))
-            Text(
-                text = userName,
-                fontSize = 20.sp
-            )
+                .padding(innerPadding),
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+        ) {
+            when(selectedItem) {
+                0 -> {
+                    HomeView()
+                }
+                1 -> {
+                    Text(text ="Search")
+                }
+                2 -> {
+                    MyPageView(userId, userPw, userName, userDescription)
+                }
+            }
+
         }
-        Spacer(modifier = Modifier.height(60.dp))
-        Text(
-            text = "ID",
-            fontSize = 20.sp
-        )
-        Spacer(modifier = Modifier.height(10.dp))
-        Text(
-            text = userId,
-            fontSize = 20.sp
-        )
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(
-            text = "PW",
-            fontSize = 20.sp,
-        )
-        Spacer(modifier = Modifier.height(10.dp))
-        Text(
-            text = userPw,
-            fontSize = 20.sp,
-        )
-        Spacer(modifier = Modifier.height(30.dp))
-        Text(
-            text = "MBTI",
-            fontSize = 20.sp,
-        )
-        Spacer(modifier = Modifier.height(10.dp))
-        Text(
-            text = userMbti,
-            fontSize = 20.sp,
-        )
     }
 }
 
@@ -108,6 +112,6 @@ fun MainCompose(userId: String, userPw: String, userName: String, userMbti: Stri
 @Composable
 fun MainPreview() {
     NOWSOPTAndroidTheme {
-        MainCompose("nowSopt", "password123", "UserName", "ISTP")
+        ScaffoldExample("Id1234", "Password123", "UserName", "INFJ 입니다!")
     }
 }
\ No newline at end of file

From eb9441a0b23eff8d496a4546155973fdf61952df Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Thu, 2 May 2024 19:09:24 +0900
Subject: [PATCH 10/12] =?UTF-8?q?mod/#6:=20=EB=A7=90=20=EC=A4=84=EC=9E=84?=
 =?UTF-8?q?=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/compose/item/FriendItem.kt | 7 ++++++-
 app/src/main/java/com/sopt/now/compose/item/UserItem.kt   | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/compose/item/FriendItem.kt b/app/src/main/java/com/sopt/now/compose/item/FriendItem.kt
index a7224d1..de33f4f 100644
--- a/app/src/main/java/com/sopt/now/compose/item/FriendItem.kt
+++ b/app/src/main/java/com/sopt/now/compose/item/FriendItem.kt
@@ -9,12 +9,14 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.sopt.now.compose.R
 import com.sopt.now.compose.ui.theme.NOWSOPTAndroidTheme
 
+
 @Composable
 fun FriendItem(profile: Profile) {
     Row(
@@ -34,13 +36,16 @@ fun FriendItem(profile: Profile) {
             text = profile.userName,
             fontSize = 20.sp,
             fontWeight = FontWeight.Bold,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis
         )
         Spacer(modifier = Modifier.weight(1f))
         Text(
             text = profile.userDescription,
             fontSize = 20.sp,
             textAlign = TextAlign.End,
-            maxLines = 1
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis
         )
     }
 }
diff --git a/app/src/main/java/com/sopt/now/compose/item/UserItem.kt b/app/src/main/java/com/sopt/now/compose/item/UserItem.kt
index 823c5cd..8f75cfa 100644
--- a/app/src/main/java/com/sopt/now/compose/item/UserItem.kt
+++ b/app/src/main/java/com/sopt/now/compose/item/UserItem.kt
@@ -9,6 +9,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -34,13 +35,15 @@ fun UserItem(profileData:Profile) {
             text = profileData.userName,
             fontSize = 20.sp,
             fontWeight = FontWeight.Bold,
+            overflow = TextOverflow.Ellipsis
         )
         Spacer(modifier = Modifier.weight(1f))
         Text(
             text = profileData.userDescription,
             fontSize = 20.sp,
             textAlign = TextAlign.End,
-            maxLines = 1
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis
         )
     }
 }

From a9e7d2d9a316c479a9beff5c44b456c0df0c5285 Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Thu, 2 May 2024 19:09:51 +0900
Subject: [PATCH 11/12] =?UTF-8?q?mod/#6:=20MainView=EB=A1=9C=20=EB=84=A4?=
 =?UTF-8?q?=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sopt/now/compose/MainActivity.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/compose/MainActivity.kt b/app/src/main/java/com/sopt/now/compose/MainActivity.kt
index 30a05a3..d6075a3 100644
--- a/app/src/main/java/com/sopt/now/compose/MainActivity.kt
+++ b/app/src/main/java/com/sopt/now/compose/MainActivity.kt
@@ -43,7 +43,7 @@ class MainActivity : ComponentActivity() {
                     val userName = intent.getStringExtra("userName").toString()
                     val userDescription = intent.getStringExtra("userDescription").toString()
 
-                    ScaffoldExample(
+                    MainView(
                         userId = userId,
                         userPw = userPw,
                         userName = userName,
@@ -56,7 +56,7 @@ class MainActivity : ComponentActivity() {
 }
 
 @Composable
-fun ScaffoldExample(userId: String, userPw: String, userName: String, userDescription: String) {
+fun MainView(userId: String, userPw: String, userName: String, userDescription: String) {
     var selectedItem by remember { mutableIntStateOf(0) }
     val items = listOf(
         BottomNavigationItem(
@@ -112,6 +112,6 @@ fun ScaffoldExample(userId: String, userPw: String, userName: String, userDescri
 @Composable
 fun MainPreview() {
     NOWSOPTAndroidTheme {
-        ScaffoldExample("Id1234", "Password123", "UserName", "INFJ 입니다!")
+        MainView("Id1234", "Password123", "UserName", "ISTP 입니다!")
     }
 }
\ No newline at end of file

From 2e0c262240d301a67d4401f0f34f4c7dc26433af Mon Sep 17 00:00:00 2001
From: youjin09222 <youjin09222@gmail.com>
Date: Thu, 2 May 2024 19:56:47 +0900
Subject: [PATCH 12/12] =?UTF-8?q?refactor/#6:=20=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=ED=98=B8=EC=9D=B4=EC=8A=A4=ED=8C=85=20=EB=B0=8F=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=EB=AC=B8=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sopt/now/compose/LoginActivity.kt     | 131 ++++++++++++------
 1 file changed, 88 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/compose/LoginActivity.kt b/app/src/main/java/com/sopt/now/compose/LoginActivity.kt
index 8c02e07..d4f42de 100644
--- a/app/src/main/java/com/sopt/now/compose/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/compose/LoginActivity.kt
@@ -48,7 +48,7 @@ class LoginActivity : ComponentActivity() {
                     val userName = intent.getStringExtra("userName").toString()
                     val userDescription = intent.getStringExtra("userDescription").toString()
 
-                    LoginCompose(userId, userPw, userName ,userDescription)
+                    LoginView(userId, userPw, userName ,userDescription)
                 }
             }
         }
@@ -56,7 +56,64 @@ class LoginActivity : ComponentActivity() {
 }
 
 @Composable
-fun LoginInputField(label: String, value: String, onValueChange: (String) -> Unit) {
+fun LoginView(
+    userId: String,
+    userPw: String,
+    userName: String,
+    userDescription: String
+) {
+    val context = LocalContext.current
+    var inputId by remember { mutableStateOf("") }
+    var inputPw by remember { mutableStateOf("") }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 30.dp, vertical = 60.dp),
+    ) {
+        Text(
+            text = stringResource(id = R.string.title_login),
+            fontSize = 30.sp,
+            fontWeight = FontWeight.Bold,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.fillMaxWidth()
+        )
+        Spacer(modifier = Modifier.height(60.dp))
+        LoginInputField(
+            label = stringResource(id = R.string.tv_id),
+            inputData = inputId,
+            isPassword = false
+        ) { inputId = it }
+        Spacer(modifier = Modifier.height(60.dp))
+        LoginInputField(
+            label = stringResource(id = R.string.tv_pw),
+            inputData = inputPw,
+            isPassword = true
+        ) { inputPw = it }
+        Spacer(modifier = Modifier.weight(2f))
+        LoginButton(
+            text = stringResource(id = R.string.btn_login),
+            onClick = {
+                checkLogin(context, userId, userPw, userName, userDescription, inputId, inputPw)
+            }
+        )
+        Spacer(modifier = Modifier.height(10.dp))
+        LoginButton(
+            stringResource(id = R.string.btn_sign_up)) {
+            Intent(context, SignUpActivity::class.java).apply {
+                context.startActivity(this)
+            }
+        }
+    }
+}
+
+@Composable
+fun LoginInputField(
+    label: String,
+    inputData: String,
+    isPassword: Boolean,
+    onValueChange: (String) -> Unit
+) {
     Column(
         modifier = Modifier.fillMaxWidth()
     ) {
@@ -68,17 +125,22 @@ fun LoginInputField(label: String, value: String, onValueChange: (String) -> Uni
         )
         Spacer(modifier = Modifier.height(10.dp))
         TextField(
-            value = value,
+            value = inputData,
             onValueChange = onValueChange,
             modifier = Modifier.fillMaxWidth(),
             label = { Text(label) },
             singleLine = true,
-            visualTransformation = if (label == "비밀번호") PasswordVisualTransformation() else VisualTransformation.None,
-            keyboardOptions = if (label == "비밀번호") KeyboardOptions(keyboardType = KeyboardType.Password) else KeyboardOptions.Default
+            visualTransformation =
+            if (isPassword)
+                PasswordVisualTransformation()
+            else VisualTransformation.None,
+            keyboardOptions =
+            if (isPassword)
+                KeyboardOptions(keyboardType = KeyboardType.Password)
+            else KeyboardOptions.Default
         )
     }
 }
-
 @Composable
 fun LoginButton(text: String, onClick: () -> Unit) {
     Button(
@@ -91,50 +153,33 @@ fun LoginButton(text: String, onClick: () -> Unit) {
     }
 }
 
-@Composable
-fun LoginCompose(userId: String, userPw: String, userName: String, userDescription: String) {
-    val context = LocalContext.current
-    var inputId by remember { mutableStateOf("") }
-    var inputPw by remember { mutableStateOf("") }
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(horizontal = 30.dp, vertical = 60.dp),
-    ) {
-        Text(
-            text = stringResource(id = R.string.title_login),
-            fontSize = 30.sp,
-            fontWeight = FontWeight.Bold,
-            textAlign = TextAlign.Center,
-            modifier = Modifier.fillMaxWidth()
-        )
-        Spacer(modifier = Modifier.height(60.dp))
-        LoginInputField(label = stringResource(id = R.string.tv_id), value = inputId) { inputId = it }
-        Spacer(modifier = Modifier.height(60.dp))
-        LoginInputField(label = stringResource(id = R.string.tv_pw), value = inputPw) { inputPw = it }
-        Spacer(modifier = Modifier.weight(2f))
-        LoginButton(stringResource(id = R.string.btn_login)) {
-            if (userId == inputId && userPw == inputPw) {
-                moveToMain(context, userId, userPw, userName, userDescription)
-            }
-        }
-        Spacer(modifier = Modifier.height(10.dp))
-        LoginButton(stringResource(id = R.string.btn_sign_up)) {
-            val intent = Intent(context, SignUpActivity::class.java)
-            context.startActivity(intent)
-        }
+private fun checkLogin(
+    context: Context,
+    userId: String,
+    userPw: String,
+    userName: String,
+    userDescription: String,
+    inputId: String,
+    inputPw: String
+) {
+    if (userId == inputId && userPw == inputPw) {
+        moveToMain(context, userId, userPw, userName, userDescription)
     }
 }
 
-private fun moveToMain(context: Context, userId: String, userPw: String, userName: String, userDescription: String) {
-    val intent = Intent(context, MainActivity::class.java).apply {
+private fun moveToMain(
+    context: Context,
+    userId: String,
+    userPw: String,
+    userName: String,
+    userDescription: String
+) {
+    Intent(context, MainActivity::class.java).apply {
         putExtra("userId", userId)
         putExtra("userPw", userPw)
         putExtra("userName", userName)
         putExtra("userDescription", userDescription)
     }
-    context.startActivity(intent)
     Toast.makeText(context, "로그인 성공!", Toast.LENGTH_SHORT).show()
 }
 
@@ -142,6 +187,6 @@ private fun moveToMain(context: Context, userId: String, userPw: String, userNam
 @Composable
 fun LoginPreview() {
     NOWSOPTAndroidTheme {
-        LoginCompose("","","","")
+        LoginView("","","","")
     }
 }
\ No newline at end of file