#8 [ui] Daily Routine - 추가하기 #18

minemi00 · 2024-01-09T18:58:31Z

📑 Work Description

데일리 루틴 추가하기 뷰 작업
뷰페이저 양옆 보이게 완
리사이클러뷰 클릭리스너 완

🛠️ Issue

closed [ui] Daily Routine - 추가하기 #8

📷 Screenshot

Screen_recording_20240112_234226.mp4

💬 To Reviewers

pump9918

양옆 뷰페이저 저도 찾아보겠습니다... 고생했어요!

pump9918 · 2024-01-10T06:56:31Z

app/src/main/java/com/sopetit/softie/ui/daily/DailyAddActivity.kt

+            state: RecyclerView.State
+        ) {
+            super.getItemOffsets(outRect, view, parent, state)
+            outRect.left = divHeight


position == 0일 경우와 아닌 경우 나눠서 divHeight을 두면 첫 margin만 구분을 줄 수 있습니다!

아하 ! 꼼꼼한 리뷰 감사합니다

pump9918 · 2024-01-10T06:58:54Z

app/src/main/res/values/dimens.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>


xml이랑 kotlin사이 황금비 3.5 겨우 찾았는데
dimen쓰면 해결되는거였네...

오빠 황금비율 대신 내가 가져옴ㅎ.ㅎ

pump9918 · 2024-01-10T07:00:04Z

app/build.gradle.kts

@@ -124,6 +124,9 @@ dependencies {
    testImplementation("junit:junit:4.13.2")
    androidTestImplementation("androidx.test.ext:junit:1.1.5")
    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+
+    //indicator


인디케이터 잘 쓰겠습니다^^

^^ 오빠가 기쁘니 좋다

…roid into feature/#8-add-daily-routine

…roid into feature/#8-add-daily-routine # Conflicts: # app/src/main/AndroidManifest.xml

stellar-halo · 2024-01-12T16:16:44Z

app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddActivity.kt

+        dailyRoutineAddViewModel.mockThemeList.observe(this) {
+            dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyFirstCardList.value)
+            dailyRoutineAddThemeAdapter.submitList(dailyRoutineAddViewModel.mockThemeList.value)
+        }


함수로 따로 빼주세요!~ setupAdapter와 맞지 않는 것 같습니다!

아하 넵!

stellar-halo · 2024-01-12T17:58:54Z

app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddActivity.kt

+        when (item.themeId) {
+            1 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyFirstCardList.value)
+            2 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailySecondCardList.value)
+            3 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyThirdCardList.value)
+            4 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyFourthCardList.value)
+            5 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyFifthCardList.value)
+            6 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailySixthCardList.value)
+            7 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailySeventhCardList.value)
+            8 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyEighthCardList.value)
+            9 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyNinthCardList.value)
+            10 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyTenthCardList.value)
+            11 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyEleventhCardList.value)
+            12 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyTwelfthCardList.value)
+
+            else -> dailyRoutineAddCardPagerAdapter.submitList(
+                dailyRoutineAddViewModel.mockDailyFirstCardList.value
+            )
+        }


val themeDailyRoutineList = listOf(startNewDayroutineList, healthyBodyRoutineList, ...)

dailyRoutineAddCardPagerAdapter.submitList(themeDailyRoutineList[item.themeId].value)
로 바꾸면 when을 안써도 되지 않을까요?

강희언니 리뷰처럼 하나의 리스트로 처리해도 될 것 같습니다! 어처피 저희 routineId가 각각 themeId와 상관없이 모두 다르니까요...!!

오 좋습니당!! 바꿔보겠슴당

emjayMJkim

뷰페이저 하느라 정말 수고했다...!!

emjayMJkim · 2024-01-13T18:25:52Z

app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddActivity.kt

+        when (item.themeId) {
+            1 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyFirstCardList.value)
+            2 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailySecondCardList.value)
+            3 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyThirdCardList.value)
+            4 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyFourthCardList.value)
+            5 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyFifthCardList.value)
+            6 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailySixthCardList.value)
+            7 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailySeventhCardList.value)
+            8 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyEighthCardList.value)
+            9 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyNinthCardList.value)
+            10 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyTenthCardList.value)
+            11 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyEleventhCardList.value)
+            12 -> dailyRoutineAddCardPagerAdapter.submitList(dailyRoutineAddViewModel.mockDailyTwelfthCardList.value)
+
+            else -> dailyRoutineAddCardPagerAdapter.submitList(
+                dailyRoutineAddViewModel.mockDailyFirstCardList.value
+            )
+        }


강희언니 리뷰처럼 하나의 리스트로 처리해도 될 것 같습니다! 어처피 저희 routineId가 각각 themeId와 상관없이 모두 다르니까요...!!

emjayMJkim · 2024-01-13T18:28:28Z

.../main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddThemeAdapter.kt

+            true -> {
+                binding.ivDailyRoutineAddThemeBackground.setBackgroundResource(R.drawable.ic_daily_theme_background_click)
+                binding.tvDailyRoutineAddThemeName.setTextColor(
+                    ContextCompat.getColor(
+                        binding.root.context,
+                        R.color.gray700
+                    )
+                )
+            }
+
+            false -> {
+                binding.ivDailyRoutineAddThemeBackground.setBackgroundResource(R.drawable.ic_daily_theme_background)
+                binding.tvDailyRoutineAddThemeName.setTextColor(
+                    ContextCompat.getColor(
+                        binding.root.context,
+                        R.color.gray400
+                    )
+                )
+            }
+        }


여기 imageView background와 textView color 바꾸는 부분도 따로 함수로 빼주면 더 좋을 것 같습니다!

아하 넵!! 잘게잘게 쪼개볼게요

emjayMJkim · 2024-01-13T18:30:20Z

app/src/main/res/layout/item_daily_routine_add_theme.xml

+            <!--            <ImageView-->
+            <!--                android:id="@+id/iv_daily_routine_add_theme_icon"-->
+            <!--                setImage="@{data.iconImageUrl}"-->
+            <!--                android:layout_width="30dp"-->
+            <!--                android:layout_height="30dp"-->
+            <!--                android:layout_gravity="center"-->
+            <!--                android:src="@color/red"-->
+            <!--                app:layout_constraintBottom_toBottomOf="@id/iv_daily_routine_add_theme_background"-->
+            <!--                app:layout_constraintEnd_toEndOf="@id/iv_daily_routine_add_theme_background"-->
+            <!--                app:layout_constraintStart_toStartOf="@id/iv_daily_routine_add_theme_background"-->
+            <!--                app:layout_constraintTop_toTopOf="@id/iv_daily_routine_add_theme_background" />-->


삭제 부탁드립니닷...!

stellar-halo

고생했어요~!~~!

stellar-halo · 2024-01-14T02:58:42Z

app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddActivity.kt

+        val decoration = PageDecoration(decoMargin)
+
+        binding.vpDailyRoutineAddCard.also {
+            it.offscreenPageLimit = 3


3이 쓰인 곳이 많아서, ,companion object중에 의미가 맞는 게 있는지 한 번 살펴보는 것도 좋을 것 같아요!

넵 한번 찾아보겠습니당

stellar-halo · 2024-01-14T03:00:39Z

app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddActivity.kt

+            offscreenPageLimit = 3
+
+            val dpValue = 40
+            val margin = (dpValue * resources.displayMetrics.density).toInt()
+            setPadding(margin, 0, margin, 0)


이 친구들도 상수로 빼면 좋을 것 같아요!

stellar-halo · 2024-01-14T03:09:02Z

app/src/main/res/layout/item_daily_routine_add_theme.xml

+        <!--        <TextView-->
+        <!--            android:id="@+id/tv_daily_routine_add_theme_name"-->
+        <!--            android:layout_width="wrap_content"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginTop="6dp"-->
+        <!--            android:text="@{data.name}"-->
+        <!--            android:textAppearance="@style/caption1"-->
+        <!--            android:textColor="@color/gray400"-->
+        <!--            app:layout_constraintEnd_toEndOf="@id/fl_daily_routine_add_theme"-->
+        <!--            app:layout_constraintStart_toStartOf="@id/fl_daily_routine_add_theme"-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/fl_daily_routine_add_theme"-->
+        <!--            tools:text="테마" />-->


역시 삭제 부탁드립니다!

…roid into feature/#8-add-daily-routine

…roid into feature/#8-add-daily-routine # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/res/drawable/ic_daily_theme_background.xml # app/src/main/res/drawable/ic_daily_theme_background_click.xml

stellar-halo

고생했어요~

stellar-halo · 2024-01-14T13:48:25Z

app/build.gradle.kts

+
+    // indicator
+    implementation("com.tbuonomo:dotsindicator:5.0")


여기 삭제해주세요~

stellar-halo · 2024-01-14T13:50:01Z

...n/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddCardPagerAdapter.kt

+class DailyRoutineAddCardPagerAdapter :
+    ListAdapter<DailyCard, DailyRoutineAddCardPagerAdapter.DailyPagerViewHolder>(
+        ItemDiffCallback<DailyCard>(
+            onItemsTheSame = { oldItem, newItem -> oldItem == newItem },


이 부분에 item이 고유한 값으로 지닌 값으로 비교해주세요~
예시로,

Suggested change

onItemsTheSame = { oldItem, newItem -> oldItem == newItem },

onItemsTheSame = { oldItem, newItem -> oldItem.themeId == newItem.themeId },

minemi00 added 12 commits January 9, 2024 16:35

[add] : drawable 및 이미지 에셋 추출

30917a4

[feat] 데일리 루틴 테마 리사이클러뷰 item

411796f

[add] 인디케이터 selector 만들기

9272708

[ui] 데일리 루틴 추가하기 1차 구현

13db25d

[add] 데일리루틴 뷰페이저 어댑터 생성

d3b843a

[feat] 데일리루틴 추가 viewpager, indicator 로직

c5c057f

[feat] 데일리루틴 추가 viewpager, indicator 로직

022f0a8

[chore] indicator 수정

b81bf10

[feat] 리사이클러뷰 연결

041f285

[chore] 이미지 로드 이슈 해결

fdecc78

[chore] 뷰페이저 가운데 정렬 완

a859f4e

[chore] 뷰페이저 가운데 정렬 완

6ec660e

minemi00 self-assigned this Jan 10, 2024

minemi00 requested review from stellar-halo, pump9918 and emjayMJkim January 10, 2024 02:39

minemi00 added UI ui 관련 작업 민회🐹 민회가 작업함! labels Jan 10, 2024

minemi00 changed the title ~~Feature/#8 add daily routine~~ #8[ui] Daily Routine - 추가하기 Jan 10, 2024

minemi00 changed the title ~~#8[ui] Daily Routine - 추가하기~~ #8 [ui] Daily Routine - 추가하기 Jan 10, 2024

minemi00 added 2 commits January 10, 2024 11:44

[add] manifest에 데일리루틴추가하기 뷰 추가

db96226

[chore] 글자 행간 수정

bf52dfe

stellar-halo marked this pull request as draft January 10, 2024 06:49

[chore] 리사이클러뷰 클릭이벤트 수정

47d5fdf

pump9918 approved these changes Jan 10, 2024

View reviewed changes

minemi00 added 5 commits January 11, 2024 16:26

Merge branch 'develop' of https://github.com/Team-Sopetit/Sopetit-And…

5527708

…roid into feature/#8-add-daily-routine

[chore] 네이밍 및 폴더링 변경

b6ca29f

[chore] mocklist, 데이터클래스 변경

66e7e17

Merge branch 'develop' of https://github.com/Team-Sopetit/Sopetit-And…

82afb19

…roid into feature/#8-add-daily-routine # Conflicts: # app/src/main/AndroidManifest.xml

#8 [chore] 뷰모델 가짜데이터, 데이터 클래스 수정

ccb3045

minemi00 added 8 commits January 12, 2024 12:31

#8 [chore] 이미지 로드 이슈 해결

9f2ea54

#8 [feat] 리사이클러뷰 클릭 이벤트 적용

63d2a52

#8 [feat] : 리사이클러뷰 클릭이벤트 색깔 바뀌게

14c3e99

#8 [chore] : 이미지 로드 문제 해결

2d71560

#8 [chore] : 이미지 로드 비율 맞추기

7b7fd6d

Merge branch 'develop' of https://github.com/Team-Sopetit/Sopetit-And…

7432bc5

…roid into feature/#8-add-daily-routine # Conflicts: # app/src/main/AndroidManifest.xml

#8 [chore] : 이미지 로드 비율 수정

4a4db0f

#8 [chore] : ci 오류 수정

d51808e

minemi00 marked this pull request as ready for review January 12, 2024 15:04

minemi00 added 4 commits January 13, 2024 01:07

#8 [chore] : ci 오류 재수정

85e1ad0

#8 [chore] : ci 오류 재수정

ce2ab8b

#8 [chore] : ci 오류 재수정

f3f751c

#8 [chore] : 테마 리스트 변수명 변경

c490a1a

stellar-halo reviewed Jan 12, 2024

View reviewed changes

emjayMJkim approved these changes Jan 13, 2024

View reviewed changes

stellar-halo requested changes Jan 14, 2024

View reviewed changes

minemi00 added 9 commits January 14, 2024 15:42

#8 [refact] : 코드리뷰 반영

f0d7e14

#8 [add] : 데일리추가하기 데이터 클래스 생성

fe5d383

#8 [refact] : 데일리 루틴 리스트 불러오기

0182c04

Merge branch 'develop' of https://github.com/Team-Sopetit/Sopetit-And…

f608e2d

…roid into feature/#8-add-daily-routine

#8 [chore] : ci 오류 수정

914c300

#8 [add] : 액티비티 종료

7d53ab7

#8 [add] : 액티비티 종료

1ce1e29

Merge branch 'develop' of https://github.com/Team-Sopetit/Sopetit-And…

8e73d6c

…roid into feature/#8-add-daily-routine # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/res/drawable/ic_daily_theme_background.xml # app/src/main/res/drawable/ic_daily_theme_background_click.xml

#8 [chore] : 중복 indicator 삭제

2ba41c2

stellar-halo approved these changes Jan 14, 2024

View reviewed changes

minemi00 added 2 commits January 14, 2024 23:00

#8 [chore] : 코드리뷰 반영

a3713b0

#8 [add] : 데일리루틴뷰, 추가뷰 연결

dea9844

minemi00 merged commit 8a0d24e into develop Jan 14, 2024
1 check passed

minemi00 deleted the feature/#8-add-daily-routine branch January 14, 2024 15:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#8 [ui] Daily Routine - 추가하기 #18

#8 [ui] Daily Routine - 추가하기 #18

minemi00 commented Jan 9, 2024 •

edited

Loading

pump9918 left a comment

pump9918 Jan 10, 2024

minemi00 Jan 12, 2024

pump9918 Jan 10, 2024

minemi00 Jan 12, 2024

pump9918 Jan 10, 2024

minemi00 Jan 12, 2024

stellar-halo Jan 12, 2024

minemi00 Jan 14, 2024

stellar-halo Jan 12, 2024

emjayMJkim Jan 13, 2024

minemi00 Jan 14, 2024

emjayMJkim left a comment

emjayMJkim Jan 13, 2024

emjayMJkim Jan 13, 2024

minemi00 Jan 14, 2024

emjayMJkim Jan 13, 2024

stellar-halo left a comment

stellar-halo Jan 14, 2024

minemi00 Jan 14, 2024

stellar-halo Jan 14, 2024

minemi00 Jan 14, 2024

stellar-halo Jan 14, 2024

stellar-halo left a comment

stellar-halo Jan 14, 2024

stellar-halo Jan 14, 2024

		@@ -0,0 +1,4 @@
		<?xml version="1.0" encoding="utf-8"?>
		<resources>


		// indicator
		implementation("com.tbuonomo:dotsindicator:5.0")

	onItemsTheSame = { oldItem, newItem -> oldItem == newItem },
	onItemsTheSame = { oldItem, newItem -> oldItem.themeId == newItem.themeId },

#8 [ui] Daily Routine - 추가하기 #18

#8 [ui] Daily Routine - 추가하기 #18

Conversation

minemi00 commented Jan 9, 2024 • edited Loading

📑 Work Description

🛠️ Issue

📷 Screenshot

💬 To Reviewers

pump9918 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emjayMJkim left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stellar-halo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stellar-halo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

minemi00 commented Jan 9, 2024 •

edited

Loading