Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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)
}
}

This file was deleted.

Binary file added app/src/main/res/drawable/ic_pencil.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/ic_photo_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/ic_photo_camera.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_photo_change.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap android:src="@drawable/ic_photo_back" android:gravity="center"/>
</item>
<item>
<bitmap android:src="@drawable/ic_photo_camera" android:gravity="center"/>
</item>
</layer-list>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_user.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap android:src="@drawable/ic_user_back" android:gravity="center"/>
</item>
<item>
<bitmap android:src="@drawable/ic_user_img" android:gravity="center"/>
</item>
</layer-list>
Binary file added app/src/main/res/drawable/ic_user_back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/ic_user_img.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable/icon_back_arrow.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/icon_edit.png
Binary file not shown.
Binary file removed app/src/main/res/drawable/icon_user_img.png
Binary file not shown.
276 changes: 276 additions & 0 deletions app/src/main/res/layout/activity_profile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,276 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".presentation.ui.mypage.ProfileActivity">

<androidx.appcompat.widget.Toolbar
android:id="@+id/tb_profile_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
tools:ignore="MissingConstraints">

<ImageButton
android:id="@+id/ibtn_profile_back"
android:layout_width="9dp"
android:layout_height="18dp"
android:layout_margin="20dp"
android:background="@android:color/transparent"
android:scaleType="fitCenter"
android:src="@drawable/ic_back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_profile_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/mypage_profile_setting"
android:textSize="20sp"
android:textColor="@color/black"
android:layout_gravity="left" />

<TextView
android:id="@+id/tv_leave_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profile_leave_account"
android:textSize="14sp"
android:textColor="@color/gray_4"
android:layout_margin="20dp"
android:layout_gravity="right" />

</androidx.appcompat.widget.Toolbar>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_profile_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tb_profile_top" >

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_profile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
app:layout_constraintBottom_toTopOf="@+id/ll_profile"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" >


<ImageView
android:id="@+id/iv_profile_pic"
android:layout_width="100dp"
android:layout_height="100dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_user" />

<ImageButton
android:id="@+id/ibtn_profile_camera"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:padding="0dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:src="@drawable/ic_photo_change"
app:layout_constraintTop_toTopOf="@+id/iv_profile_pic"
app:layout_constraintEnd_toEndOf="@+id/iv_profile_pic" />

</androidx.constraintlayout.widget.ConstraintLayout>

<LinearLayout
android:id="@+id/ll_profile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="2"
android:orientation="vertical">

<TextView

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idκ°’ μ„€μ •ν•΄μ£Όμ„Έμš©!

android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profile_name"
android:textSize="12sp"
android:fontWeight="400"
android:textColor="@color/gray_4" />

<LinearLayout
android:id="@+id/ll_profile_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<EditText
android:id="@+id/et_profile_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:text="@string/mypage_user_id"
android:textColor="@color/black"
android:textSize="18sp" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageButton
android:id="@+id/ibtn_profile_name_change"
android:layout_width="19dp"
android:layout_height="19dp"
android:background="@color/white"
android:padding="0dp"
android:scaleType="centerCrop"
android:layout_gravity="right"
app:layout_constraintEnd_toEndOf="@id/ll_profile_name"
app:srcCompat="@drawable/ic_pencil" />

</LinearLayout>

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="0.3px"
android:layout_marginBottom="20dp"
android:background="@color/gray_3" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="2"
android:orientation="vertical">

<TextView

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

id κ°’ μ„€μ • ν•΄μ£Όμ„Έμš”!

android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profile_sex"
android:textSize="12sp"
android:textColor="@color/gray_4" />

<EditText
android:id="@+id/et_profile_sex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:text="@string/profile_sex"
android:textColor="@color/black"
android:textSize="18sp"/>

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="0.3px"
android:background="@color/gray_3"
android:layout_marginBottom="20dp"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="2"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profile_birth"
android:textSize="12sp"
android:textColor="@color/gray_4" />

<EditText
android:id="@+id/et_profile_birth"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:text="@string/profile_birth"
android:textColor="@color/black"
android:textSize="18sp" />

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="0.3px"
android:background="@color/gray_3"
android:layout_marginBottom="20dp" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="2"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profile_job"
android:textSize="12sp"
android:textColor="@color/gray_4" />

<LinearLayout
android:id="@+id/ll_profile_job"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<EditText
android:id="@+id/et_profile_job"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:text="@string/profile_job"
android:textColor="@color/black"
android:textSize="18sp" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageButton
android:id="@+id/ibtn_profile_job_change"
android:layout_width="19dp"
android:layout_height="19dp"
android:background="@color/white"
android:padding="0dp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_pencil" />

</LinearLayout>

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="0.3px"
android:background="@color/gray_3" />

</LinearLayout>


</androidx.constraintlayout.widget.ConstraintLayout>


</androidx.constraintlayout.widget.ConstraintLayout>
6 changes: 1 addition & 5 deletions app/src/main/res/layout/fragment_mypage.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:id="@+id/iv_mypage_user_pic"
android:layout_width="80dp"
android:layout_height="80dp"
app:srcCompat="@drawable/icon_user_img" />


<TextView
android:id="@+id/tv_mypage_user_name"
Expand Down
Loading