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.

Sign up for GitHub

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

Jump to bottom

[FEAT/#133] 알림 화면 연결 #142

Merged
merged 16 commits into from
Feb 12, 2024
Merged

[FEAT/#133] 알림 화면 연결 #142

merged 16 commits into from
Feb 12, 2024

Conversation

blueme0
Copy link
Member

@blueme0 blueme0 commented Feb 12, 2024

📌 개요

✨ 작업 내용

  • 홈 - 알림 리스트 화면 연결
  • 알림 리스트 서버 연결
  • 마이페이지 - 푸시 알림 on/off 적용 (DataStore)
  • 알림 type 별로 화면 연결

📸 스크린샷/동영상

@blueme0
[fix/#132] 소셜로그인 웹뷰 disable CookieManager
dca96b8
@blueme0
[feat/#133] 알림 리스트 UI 구현
a5284e4
@blueme0
[feat/#133] 마이페이지 - 푸시 알림 on/off 적용
7a4d63c
@blueme0
[feat/#133] 알림 type 별로 화면 연결
3176f44
@blueme0
[feat/#133] 알림 리스트 서버 연결
be6876d
@blueme0
Merge remote-tracking branch 'origin/feature/#138-card-back-add-detai…
874402b 
…l' into feature/#132-disable-cookie
@blueme0
[feat/#132] 카드 후면 연결 중
eae9b5c
@blueme0
[fix/#132] common dialog 취소 버튼 텍스트 색상 수정
d08ead1
@blueme0
[fix/#132] 위치 권한 액티비티 -> common dialog 적용
d5fdf95
@blueme0
Merge remote-tracking branch 'origin/feature/#138-card-back-add-detai…
a1126a5 
…l' into feature/#132-disable-cookie
@blueme0
Merge remote-tracking branch 'origin/main' into feature/#132-disable-…
60acb2d 
…cookie
@blueme0
[fix/#132] 자기소개서 카드 interest 삭제 반영되도록
c2c3c42
@blueme0
[fix/#132] 소셜로그인 실패 메시지 토스트로 수정
ddbf356
@blueme0
Merge branch 'main' into feature/#133-notification-list
d7ebb59 
# Conflicts:
#	app/src/main/java/com/teumteum/teumteum/presentation/splash/SplashActivity.kt
#	app/src/main/res/values/strings.xml
@blueme0 blueme0 self-assigned this Feb 12, 2024
@blueme0 blueme0 added 세연 FEAT 새로운 기능 구현 labels Feb 12, 2024
Mnseo
Mnseo approved these changes Feb 12, 2024
View reviewed changes
Copy link
Collaborator

@Mnseo Mnseo left a comment

Choose a reason for hiding this comment

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

확인했습니다 알림 기능 구현하느라 고생했어용

...rc/main/java/com/teumteum/teumteum/presentation/mypage/setting/viewModel/SettingViewModel.kt
@@ -142,11 +142,12 @@ class SettingViewModel @Inject constructor(
return false
}

private val _alarmState = MutableStateFlow(false)
private val _alarmState = MutableStateFlow(settingRepository.getNotification())
Copy link
Collaborator

Choose a reason for hiding this comment

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

여기 변동 확인했슴다

Copy link
Member Author

Choose a reason for hiding this comment

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

감삼당 ~~~👍🏻👍🏻

@Mnseo Mnseo merged commit 086130b into main Feb 12, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mnseo Mnseo Mnseo approved these changes

Assignees

@blueme0 blueme0

Labels
FEAT 새로운 기능 구현 세연
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEAT] 알림 화면 연결
2 participants
@blueme0 @Mnseo