Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… 29-fix-지도-연동-문제-수정 # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml
… 29-fix-지도-연동-문제-수정 # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml
… 29-fix-지도-연동-문제-수정 # Conflicts: # .idea/misc.xml # app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt
Closed
1 task
HI-JIN2
approved these changes
Aug 11, 2023
Comment on lines
+38
to
+39
| today = binding.date.text as String | ||
| day = binding.day.text as String |
There was a problem hiding this comment.
그 변환 가능한 속성이라서 String으로 자동 변환이 안된다는 오류 있어서 강제 변환 해줬습니당
Comment on lines
53
to
81
| /* | ||
| binding.root.setOnClickListener { | ||
| // Update the selectedDate to the clicked date | ||
| selectedDate = today as String? | ||
| // Update the background of the clicked date | ||
| for(holder in allViewHolders){ | ||
| holder.binding.weekCardview.setBackgroundResource(com.eatssu.android.R.drawable.ic_selector_background_white) | ||
| Log.d("searchfor", holder.toString()) | ||
| } | ||
| selectedDate?.let { it1 -> Log.d("rootdata", it1) } | ||
| val bundle : Bundle = Bundle() | ||
| bundle.putString("calendardata", selectedDate) | ||
|
|
||
| val intent = Intent(binding.root.context, MainActivity::class.java) | ||
| intent.putExtra("calendardata", selectedDate) | ||
| ContextCompat.startActivity(binding.root.context, intent, null) | ||
|
|
||
| *//*val lunchFragment = LunchFragment() | ||
| lunchFragment.arguments = bundle*//* | ||
|
|
||
| *//*val caledarFragment = CalendarFragment() | ||
|
|
||
| lateinit var dataPassListener : onDataPassListener | ||
|
|
||
| dataPassListener = caledarFragment.context as onDataPassListener | ||
| dataPassListener.onDataPass(selectedDate)*//* | ||
|
|
||
| binding.weekCardview.setBackgroundResource(com.eatssu.android.R.drawable.selector_background_blue) | ||
| }*/ |
There was a problem hiding this comment.
여기는 혹시 나중에 쓰일 코드인가요? 아니면 평생 쓰이지 않을 코드인가용?
There was a problem hiding this comment.
Adapter에 있을 코드를 MainActivity로 옮겨서 삭제할게요!
| android:fontFamily="@font/noto_medium" | ||
| android:text="저작권 도용 의심 (사진 등)" /> | ||
| android:text="저작권 도용 의심 (사진 등)" /> |
There was a problem hiding this comment.
text는 string.xml에 넣어주고 거기서 불러오는 식으로 사용해주세요!
There was a problem hiding this comment.
네! 신고하기 브랜치에서 변경할게용
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
개요
작업 사항
스크린샷 및 작동 영상