Skip to content
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

Feature/#20 mypage UI #25

Merged
merged 13 commits into from
Jan 6, 2024
Merged

Feature/#20 mypage UI #25

merged 13 commits into from
Jan 6, 2024

Conversation

CHANGEL1004
Copy link
Contributor

@CHANGEL1004 CHANGEL1004 commented Jan 4, 2024

๐Ÿ“Œ PR ์š”์•ฝ

๐ŸŒฑ ์ž‘์—…ํ•œ ๋‚ด์šฉ

  • ๋งˆ์ดํŽ˜์ด์ง€ ๋ทฐ ๊ตฌํ˜„

๐ŸŒฑ PR ํฌ์ธํŠธ

  • 100% ์™„์„ฑ์€ ์•„๋‹˜๋ฏธ๋‹ค

๐Ÿ“ธ ์Šคํฌ๋ฆฐ์ƒท

์Šคํฌ๋ฆฐ์ƒท 2024-01-04 181054

๐Ÿ“ฎ ๊ด€๋ จ ์ด์Šˆ

@CHANGEL1004 CHANGEL1004 added โญ [FEAT] ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ๊ตฌํ˜„ ์ฑ„์€ ๊ธˆ์ชฝ์ด ๐Ÿ’Ÿย [UI] UI ์ž‘์—… xml ํŒŒ์ผ ๊ฑด๋“ค๋ฉด ์š”๊ฑฐ labels Jan 4, 2024
@CHANGEL1004 CHANGEL1004 added this to the ui ์ž‘์—… milestone Jan 4, 2024
@CHANGEL1004 CHANGEL1004 self-assigned this Jan 4, 2024
Copy link
Contributor

@Sangwook123 Sangwook123 left a comment

Choose a reason for hiding this comment

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

๊ณ ์ƒํ•˜์…จ์Šด๋‹ค ๋ฆฌ๋ทฐ ํ™•์ธ ๋ฐ”๋žŒ๋‹ˆ๋‹น!

@@ -15,7 +15,8 @@ dependencies {
implementation(libs.appcompat)
implementation(libs.material)
implementation(libs.constraintlayout)
testImplementation(libs.junit)
implementation(project(":core:datastore"))
Copy link
Contributor

Choose a reason for hiding this comment

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

์ด๊ฑฐ ์ง€์›Œ์ฃผ์„ธ์—ฌ

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
Copy link
Contributor

Choose a reason for hiding this comment

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

shape ์ปจ๋ฒค์…˜ ๋งž์ถฐ์ฃผ์„ธ์š” ~

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
Copy link
Contributor

Choose a reason for hiding this comment

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

์–˜๋‘

android:height="83dp"
android:viewportWidth="320"
android:viewportHeight="83">
<path
Copy link
Contributor

Choose a reason for hiding this comment

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

์ด๊ฑด ์–ด๋””์„œ ์“ฐ์ด๊ณ  ์žˆ๋‚˜์š”?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

์‚ญ์ œ ์™„

@@ -1,5 +1,5 @@
[versions]
android-gradle-plugin = "8.1.2"
android-gradle-plugin = "8.2.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

agp ๋ฒ„์ „ ๋‹ค์‹œ ๋Œ๋ ค๋†”์ฃผ์„ธ์—ฌ

Copy link
Contributor Author

Choose a reason for hiding this comment

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

๋„น

@@ -1,6 +1,6 @@
#Thu Dec 21 03:12:17 KST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
Copy link
Contributor

Choose a reason for hiding this comment

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

์–˜๋‘

android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:hint="@string/my_please_wait"
Copy link
Contributor

Choose a reason for hiding this comment

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

ํ…์ŠคํŠธ๋ทฐ ์ค‘์•™์ •๋ ฌ ์‹œ์ผœ์ฃผ์„ธ์š”

@@ -5,4 +5,10 @@
<string name="text_timer">TIMER</string>
<string name="text_my">MY</string>
<string name="text_placeholder">placeholder</string>
<!-- mypage -->
<string name="my_link_number_now">์ง€๊ธˆ ๊นŒ์ง€ ์ฝ์€ ๋งํฌ์ˆ˜</string>
Copy link
Contributor

Choose a reason for hiding this comment

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

my -> mypage๊ฐ€ ๋” ๋‚˜์„๊ฒƒ ๊ฐ™์•„์—ฌ


<TextView
android:id="@+id/tv_now_link"
style="@style/Typography.suit.regular_18"
Copy link
Contributor

Choose a reason for hiding this comment

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

textappearance ์‚ฌ์šฉํ•ด์ฃผ์„ธ์š” ! ๊ทธ๋ฆฌ๊ณ  ํ…์ŠคํŠธ๋ณ„๋กœ ์ปฌ๋Ÿฌ๋„ ์ง€์ •ํ•ด์ฃผ์„ธ์š” ~

Copy link
Contributor

@lsakee lsakee left a comment

Choose a reason for hiding this comment

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

์ปจ๋ฒค์…˜ ๋ณด์‚ผ

@@ -1,5 +1,5 @@
[versions]
android-gradle-plugin = "8.1.2"
android-gradle-plugin = "8.2.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

์š”๋ถ€๋ถ„์€ ๋ฐ”๊พธ์ง€ ๋งˆ์„ธ์šฅ

Copy link
Contributor Author

Choose a reason for hiding this comment

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

๋„ต

<shape xmlns:android="http://schemas.android.com/apk/res/android">

<corners android:radius="12dp"/>
<solid android:color="#F2F2F2"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

์ด๊ฑฐ ์ปฌ๋Ÿฌ์— ์—†๋‚˜์œ ?

Copy link
Contributor

Choose a reason for hiding this comment

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

๋„ค์ด๋ฐ ์ปจ๋ฒค์…˜ ๋งž์ถฐ์ฃผ์„ธ์š”

Copy link
Contributor Author

Choose a reason for hiding this comment

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

์ถ”๊ฐ€ํ–ˆ์œผ์šฉ

Copy link
Contributor

@lsakee lsakee left a comment

Choose a reason for hiding this comment

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

๋ ˆ์ด์•„์›ƒ ๋ทฐ๊ทธ๋ฃน ํ™œ์šฉ ๋”ํ•ด๋ณด์•„์š”

Comment on lines 40 to 46
<LinearLayout
android:id="@+id/ll_mypage_now_link"
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/cl_mypage_title">
Copy link
Contributor

Choose a reason for hiding this comment

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

์ด๋ถ€๋ถ„ ์ œ๊ฑฐํ•ด์ฃผ์„ธ์š”

Comment on lines 8 to 14
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mypage_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".my.MyFragment">
android:layout_height="56dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Copy link
Contributor

Choose a reason for hiding this comment

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

์ปจ์ŠคํŠธ๋ ˆ์ธํŠธ ๋ ˆ์ด์•„์›ƒ์œผ๋กœ ์ถฉ๋ถ„ํžˆ ๊ตฌํ˜„ ๊ฐ€๋Šฅํ•ด ๋ณด์ž…๋‹ˆ๋‹ค

Comment on lines 89 to 92
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mypage_this_week"
android:layout_width="match_parent"
android:layout_height="wrap_content">
Copy link
Contributor

Choose a reason for hiding this comment

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

์š”๋Ÿฐ ๊ฒƒ๋“ค ํ•„์š” ์—†์ง€ ์•Š๋‚˜์š”?

Comment on lines 147 to 150
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mypage_please_wait"
android:layout_width="match_parent"
android:layout_height="match_parent">
Copy link
Contributor

Choose a reason for hiding this comment

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

์š”๋Ÿฐ ๊ฒƒ๋„ ๊ณต๊ธฐ๊ณ„์žˆ์œผ๋ฉด ๊ฐœ๋ฐœ์ž ๋ชจ๋“œ๋กœ ํ•œ๋ฒˆ ๋ณด์‹œ๋ฉด ์ดํ•ด๊ฐ€ ๋ ๊ฑฐ ๊ฐ™์Šต๋‹ˆ๋‹ค

@Marchbreeze
Copy link

์ด์ง‘ ์ฝ”๋ฆฌ ์•ผ๋ฌด์ง€๋„ค์š” ~~~

Comment on lines 8 to 15
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mypage_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".my.MyFragment">
android:layout_height="56dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Copy link
Contributor

Choose a reason for hiding this comment

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

์ด cl_mypage_title ์—ฌ๊ธฐ์„œ ์•„๋ฌด๊ฒƒ๋„ ์•ˆ ๋‹ด๊ธฐ๊ณ  ํƒœ๊ทธ ๋‹ซํžŒ๊ฑฐ ๊ฐ™์€๋ฐ ํ™•์ธ๋ถ€ํƒ๋“œ๋ ค์š”!

android:id="@+id/v_mypage_1"
android:layout_width="match_parent"
android:layout_height="4dp"
android:background="#F2F2F2"
Copy link
Contributor

@codingmy codingmy Jan 5, 2024

Choose a reason for hiding this comment

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

์ด ์ƒ‰์ƒ์ฝ”๋“œ ๋ถ€๋ถ„ color ๋„ค์ž„์œผ๋กœ ๋„ฃ์–ด์ฃผ๋ฉด ๊ฐ€๋…์„ฑ์ด ๋” ์ข‹์•„์งˆ๊ฑฐ ๊ฐ™์•„์š”!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

์—†๋Š” ์ค„ ์•Œ์•˜๋Š”๋ฐ ์žˆ๋”๋ผ๊ตฌ์—ฌ ์ถ”๊ฐ€ํ–ˆ์–ด์œ !~!

Comment on lines +124 to +128
<style name="circleImageView">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">50%</item>
</style>

Copy link
Contributor

Choose a reason for hiding this comment

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

์ด ์นœ๊ตฌ๋Š” ์ด๋ฏธ์ง€๋ทฐ ๊ด€๋ จ ์Šคํƒ€์ผ์ธ๊ฐ€์šฉ??

Copy link
Contributor Author

Choose a reason for hiding this comment

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

๋„น ๋งž์•„์šฉ

@codingmy
Copy link
Contributor

codingmy commented Jan 5, 2024

์ˆ˜๊ณ ํ•˜์…จ์Šด๋‹น!~!

Copy link
Contributor

@lsakee lsakee left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@Sangwook123 Sangwook123 left a comment

Choose a reason for hiding this comment

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

LGTM

@lsakee lsakee merged commit db85386 into develop Jan 6, 2024
1 check passed
@lsakee lsakee deleted the feature/#20-mypage-ui branch January 6, 2024 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
โญ [FEAT] ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ๊ตฌํ˜„ ์ฑ„์€ ๊ธˆ์ชฝ์ด ๐Ÿ’Ÿย [UI] UI ์ž‘์—… xml ํŒŒ์ผ ๊ฑด๋“ค๋ฉด ์š”๊ฑฐ
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[feat] mypage ๊ตฌํ˜„ / UI ๊ตฌํ˜„
5 participants