From 4cf0cde1abccf08350d3ecdc9cc8ff82230799aa Mon Sep 17 00:00:00 2001 From: posite Date: Sat, 13 Jan 2024 15:57:20 +0900 Subject: [PATCH 01/17] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B0=8F=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=EB=B6=80=EB=B6=84=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EA=B5=AC=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 +- .../presentation/mypage/MyPageFragment.kt | 16 ++++ app/src/main/res/drawable/ic_arrow_24.xml | 9 ++ app/src/main/res/layout/fragment_my_page.xml | 82 +++++++++++++++++++ 4 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/umc/ttoklip/presentation/mypage/MyPageFragment.kt create mode 100644 app/src/main/res/drawable/ic_arrow_24.xml create mode 100644 app/src/main/res/layout/fragment_my_page.xml diff --git a/app/build.gradle b/app/build.gradle index 097b3b13..b4a6d576 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,11 +33,11 @@ android { kotlinOptions { jvmTarget = '17' } - dataBinding{ + dataBinding { enabled = true } - viewBinding{ - enabled =true + viewBinding { + enabled = true } } @@ -88,6 +88,8 @@ dependencies { implementation "com.google.dagger:hilt-android:2.47" kapt "com.google.dagger:hilt-compiler:2.47" + // circleimageview + implementation 'de.hdodenhof:circleimageview:3.1.0' } kapt { correctErrorTypes true diff --git a/app/src/main/java/com/umc/ttoklip/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/umc/ttoklip/presentation/mypage/MyPageFragment.kt new file mode 100644 index 00000000..6dda55d6 --- /dev/null +++ b/app/src/main/java/com/umc/ttoklip/presentation/mypage/MyPageFragment.kt @@ -0,0 +1,16 @@ +package com.umc.ttoklip.presentation.mypage + +import android.os.Bundle +import android.view.View +import com.umc.ttoklip.R +import com.umc.ttoklip.databinding.FragmentMyPageBinding +import com.umc.ttoklip.presentation.base.BaseFragment + + +class MyPageFragment : BaseFragment(R.layout.fragment_my_page) { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_24.xml b/app/src/main/res/drawable/ic_arrow_24.xml new file mode 100644 index 00000000..5bc1b9c3 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml new file mode 100644 index 00000000..b6158cf7 --- /dev/null +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 0d655dc4b02d00997d9e531459aaf1a7ad1fd8b5 Mon Sep 17 00:00:00 2001 From: posite Date: Sun, 14 Jan 2024 14:08:00 +0900 Subject: [PATCH 02/17] =?UTF-8?q?feat:=20app=20name=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EB=B0=8F=20hilt=20annotaion=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +-- .../com/umc/ttoklip/presentation/mypage/MyPageFragment.kt | 2 ++ app/src/main/res/layout/fragment_my_page.xml | 6 +++--- app/src/main/res/values/strings.xml | 4 ++++ 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/values/strings.xml diff --git a/.gitignore b/.gitignore index 8cbed094..6f6921d8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,4 @@ captures .externalNativeBuild .cxx local.properties -.idea -strings.xml \ No newline at end of file +.idea \ No newline at end of file diff --git a/app/src/main/java/com/umc/ttoklip/presentation/mypage/MyPageFragment.kt b/app/src/main/java/com/umc/ttoklip/presentation/mypage/MyPageFragment.kt index 6dda55d6..7149aa1f 100644 --- a/app/src/main/java/com/umc/ttoklip/presentation/mypage/MyPageFragment.kt +++ b/app/src/main/java/com/umc/ttoklip/presentation/mypage/MyPageFragment.kt @@ -5,8 +5,10 @@ import android.view.View import com.umc.ttoklip.R import com.umc.ttoklip.databinding.FragmentMyPageBinding import com.umc.ttoklip.presentation.base.BaseFragment +import dagger.hilt.android.AndroidEntryPoint +@AndroidEntryPoint class MyPageFragment : BaseFragment(R.layout.fragment_my_page) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index b6158cf7..4df5c590 100644 --- a/app/src/main/res/layout/fragment_my_page.xml +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_bell_off_24" - android:background="null" + android:background="@android:color/transparent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" android:layout_marginEnd="16dp" /> @@ -42,7 +42,7 @@ android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/ic_my_on_48" - android:background="null" + android:background="@android:color/transparent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_24" - android:background="null" + android:background="@android:color/transparent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..e9b84d0c --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + 똑립 + 마이페이지 + \ No newline at end of file From 8db6a853ce6b83a18f6718b736c129bc638d3848 Mon Sep 17 00:00:00 2001 From: posite Date: Wed, 17 Jan 2024 00:16:06 +0900 Subject: [PATCH 03/17] =?UTF-8?q?feat:=20string=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B1=B0=EB=9E=98=EB=82=B4=EC=97=AD=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=EA=B9=8C=EC=A7=80=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/cost_search.xml | 4 + .../res/drawable/level_bar_background.xml | 25 ++ app/src/main/res/drawable/round_profile.xml | 26 ++ .../res/drawable/yellow_btn_background.xml | 6 + app/src/main/res/layout/fragment_my_page.xml | 258 +++++++++++++++--- app/src/main/res/values/strings.xml | 14 + app/src/main/res/values/style.xml | 7 + app/src/main/res/values/themes.xml | 4 +- 8 files changed, 311 insertions(+), 33 deletions(-) create mode 100644 app/src/main/res/drawable/cost_search.xml create mode 100644 app/src/main/res/drawable/level_bar_background.xml create mode 100644 app/src/main/res/drawable/round_profile.xml create mode 100644 app/src/main/res/drawable/yellow_btn_background.xml diff --git a/app/src/main/res/drawable/cost_search.xml b/app/src/main/res/drawable/cost_search.xml new file mode 100644 index 00000000..c2323af0 --- /dev/null +++ b/app/src/main/res/drawable/cost_search.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/level_bar_background.xml b/app/src/main/res/drawable/level_bar_background.xml new file mode 100644 index 00000000..e64e70aa --- /dev/null +++ b/app/src/main/res/drawable/level_bar_background.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/round_profile.xml b/app/src/main/res/drawable/round_profile.xml new file mode 100644 index 00000000..00f2bbdb --- /dev/null +++ b/app/src/main/res/drawable/round_profile.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/yellow_btn_background.xml b/app/src/main/res/drawable/yellow_btn_background.xml new file mode 100644 index 00000000..8bbc0157 --- /dev/null +++ b/app/src/main/res/drawable/yellow_btn_background.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index 4df5c590..51448864 100644 --- a/app/src/main/res/layout/fragment_my_page.xml +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -1,7 +1,7 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> @@ -10,39 +10,49 @@ - - - + android:layout_marginTop="24dp" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + android:layout_marginTop="80dp" + app:layout_constraintTop_toTopOf="parent"> @@ -50,32 +60,216 @@ android:id="@+id/nickname_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintStart_toEndOf="@id/profile_img" - app:layout_constraintTop_toTopOf="parent" - android:textAppearance="@style/TextAppearance.App.16sp_600" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" android:text="아무거나" + android:textAppearance="@style/TextAppearance.App.16sp_600" android:textColor="@color/black" - android:layout_marginTop="8dp" /> + app:layout_constraintStart_toEndOf="@id/profile_img" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toEndOf="@id/profile_img" + app:layout_constraintTop_toBottomOf="@id/nickname_tv" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f5e5ac2..071a61fb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,19 @@ ttoklip + + + 마이페이지 + 나의 레벨 + 다음 레벨까지 + 스크랩 + 내가 작성한 글 + 거래내역 + 공지사항 + 이용 관리 + 고객센터 + 알림설정 + 약관 및 정책 + 로그아웃 \ No newline at end of file diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml index 08a17b0d..5be4eeaa 100644 --- a/app/src/main/res/values/style.xml +++ b/app/src/main/res/values/style.xml @@ -1,5 +1,6 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index d3412f75..e97c33ab 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -5,6 +5,15 @@ true @android:color/transparent + @style/AppBottomSheetDialogTheme + + + + + - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file