diff --git a/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileActivity.kt b/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileActivity.kt new file mode 100644 index 00000000..28e71bd7 --- /dev/null +++ b/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileActivity.kt @@ -0,0 +1,15 @@ +package com.example.cherry_pick_android.presentation.ui.mypage + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import com.example.cherry_pick_android.databinding.ActivityProfileBinding + +class ProfileActivity : AppCompatActivity() { + private lateinit var binding: ActivityProfileBinding + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityProfileBinding.inflate(layoutInflater) + val view = binding.root + setContentView(view) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileFragment.kt b/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileFragment.kt deleted file mode 100644 index 64aa3ade..00000000 --- a/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileFragment.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.example.cherry_pick_android.presentation.ui.mypage - - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.cherry_pick_android.R - -class ProfileFragment : Fragment() { - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_profile, container, false) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_pencil.png b/app/src/main/res/drawable/ic_pencil.png new file mode 100644 index 00000000..fbdf502b Binary files /dev/null and b/app/src/main/res/drawable/ic_pencil.png differ diff --git a/app/src/main/res/drawable/ic_photo_back.png b/app/src/main/res/drawable/ic_photo_back.png new file mode 100644 index 00000000..9c7b42c3 Binary files /dev/null and b/app/src/main/res/drawable/ic_photo_back.png differ diff --git a/app/src/main/res/drawable/ic_photo_camera.png b/app/src/main/res/drawable/ic_photo_camera.png new file mode 100644 index 00000000..9101f4c9 Binary files /dev/null and b/app/src/main/res/drawable/ic_photo_camera.png differ diff --git a/app/src/main/res/drawable/ic_photo_change.xml b/app/src/main/res/drawable/ic_photo_change.xml new file mode 100644 index 00000000..7716e37c --- /dev/null +++ b/app/src/main/res/drawable/ic_photo_change.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 00000000..e8a17c2a --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_user_back.png b/app/src/main/res/drawable/ic_user_back.png new file mode 100644 index 00000000..bd33939c Binary files /dev/null and b/app/src/main/res/drawable/ic_user_back.png differ diff --git a/app/src/main/res/drawable/ic_user_img.png b/app/src/main/res/drawable/ic_user_img.png new file mode 100644 index 00000000..3aefa79a Binary files /dev/null and b/app/src/main/res/drawable/ic_user_img.png differ diff --git a/app/src/main/res/drawable/icon_back_arrow.png b/app/src/main/res/drawable/icon_back_arrow.png deleted file mode 100644 index d9315870..00000000 Binary files a/app/src/main/res/drawable/icon_back_arrow.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_edit.png b/app/src/main/res/drawable/icon_edit.png deleted file mode 100644 index b256429f..00000000 Binary files a/app/src/main/res/drawable/icon_edit.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_user_img.png b/app/src/main/res/drawable/icon_user_img.png deleted file mode 100644 index 15bb89d2..00000000 Binary files a/app/src/main/res/drawable/icon_user_img.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml new file mode 100644 index 00000000..7c533362 --- /dev/null +++ b/app/src/main/res/layout/activity_profile.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mypage.xml b/app/src/main/res/layout/fragment_mypage.xml index cdd7e285..6379ceec 100644 --- a/app/src/main/res/layout/fragment_mypage.xml +++ b/app/src/main/res/layout/fragment_mypage.xml @@ -28,11 +28,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8ad06e27..512d209c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,14 +12,16 @@ 개인정보처리방침 - 프로필 - 사진변경 + 계정 설정 + 회원탈퇴 이름 - 생일 성별 + 생년월일 + 직군 정보 + 로그아웃 - 회원탈퇴 + 궁금한 내용을 입력하세요