-
Notifications
You must be signed in to change notification settings - Fork 0
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
Feat : 온보딩 3단계 키워드 알림 설정 페이지 구현 #186
Merged
Merged
Changes from 60 commits
Commits
Show all changes
63 commits
Select commit
Hold shift + click to select a range
5b61a37
feat : 온보딩 알림 설정 - 화면 생성
huiwoo-jo 9994ce2
design : 온보딩 알림 - 타이틀 설정
huiwoo-jo bb17132
chore : SettingAlarmViewModel 생성
huiwoo-jo e8c3f6b
refactor : 온보딩 알림 설정 viewModel 연결
huiwoo-jo 359f14c
design : 온보딩 알림 설정 - 알림설정 박스 색상 변경
huiwoo-jo cd1e685
style : 온보딩 알림 - 사용하지 않는 라이브러리 정리
huiwoo-jo b9c7020
design : 온보딩 알림설정 - 부분 색상 설정
huiwoo-jo a7b7ca8
refactor : 온보딩 키워드 알림 - initDataBinding 수정
huiwoo-jo dc7dd90
refactor : 온보딩 알림 - switch의 drawable 위치 수정
huiwoo-jo a8a2d8e
rename : 온보딩 알림 설정 - 명확한 이름으로 변경
huiwoo-jo 41b48c9
Merge branch 'feat/onboarding-#3' of https://github.com/TeamDMU/DMU-A…
huiwoo-jo b8d60bb
refactor : 색상 부분 설정 함수 분리
huiwoo-jo 36551d7
chore : 텍스트 부분 색상 지정 함수명 변경
huiwoo-jo e453c7b
refactor : 온보딩 키워드 알림 - id 수정
huiwoo-jo c7932d7
design : 온보딩 키워들 알림 - constraint 종속성 수정
huiwoo-jo deecc0f
refactor : 온보딩 키워드 알림 - viemodel 데이터 추가
huiwoo-jo 0c0f367
refactor : 온보딩 키워드 알림 - 버전 분기 설정
huiwoo-jo 80c7d46
Merge branch 'develop' into feat/onboarding-#3
huiwoo-jo e667ddc
fix : string 충돌 제거
huiwoo-jo cbe48f9
Merge branch 'feat/onboarding-#3' of https://github.com/TeamDMU/DMU-A…
huiwoo-jo 22eb659
fix : 함수 호출 방식 수정
huiwoo-jo eabd63c
refactor : 미사용 함수 및 뷰바인딩 제거
huiwoo-jo 6b368e7
rename : onboardingPermission 네임에 Activity 추가
huiwoo-jo d27a68d
refactor : 무의미 공백 제거
huiwoo-jo 427ac9b
refactor : 온보딩 3단계 타이틀 텍스트 컬러 설정
huiwoo-jo 4762307
refactor : 온보딩 키워드 알림 - 데이터 바인딩 제거
huiwoo-jo 04a8fc6
refactor : 온보딩 키워드 알림 - 대학 공지 알림 연동
huiwoo-jo c645835
refactor : 온보딩 키워드 알림 - 완료 버튼 string 수정
huiwoo-jo 4e7eb45
Merge branch 'develop' into feat/onboarding-#3
huiwoo-jo 2afa00b
feat : 온보딩 알림 설정 - 화면 생성
huiwoo-jo e62d998
design : 온보딩 알림 - 타이틀 설정
huiwoo-jo dd4c8ff
chore : SettingAlarmViewModel 생성
huiwoo-jo 485a6f5
refactor : 온보딩 알림 설정 viewModel 연결
huiwoo-jo c6155be
design : 온보딩 알림 설정 - 알림설정 박스 색상 변경
huiwoo-jo d0dadfc
style : 온보딩 알림 - 사용하지 않는 라이브러리 정리
huiwoo-jo b2de0d4
design : 온보딩 알림설정 - 부분 색상 설정
huiwoo-jo ddd2d2d
refactor : 온보딩 키워드 알림 - initDataBinding 수정
huiwoo-jo 8c68b0f
rename : 온보딩 알림 설정 - 명확한 이름으로 변경
huiwoo-jo c4015f1
refactor : 온보딩 알림 - switch의 drawable 위치 수정
huiwoo-jo 9e1772f
refactor : 색상 부분 설정 함수 분리
huiwoo-jo 0a5c15d
chore : 텍스트 부분 색상 지정 함수명 변경
huiwoo-jo 78d178e
refactor : 온보딩 키워드 알림 - id 수정
huiwoo-jo b51d68e
design : 온보딩 키워들 알림 - constraint 종속성 수정
huiwoo-jo b9b9458
refactor : 온보딩 키워드 알림 - viemodel 데이터 추가
huiwoo-jo 8c3d35d
refactor : 온보딩 키워드 알림 - 버전 분기 설정
huiwoo-jo c8d1bdd
fix : string 충돌 제거
huiwoo-jo 648bce6
fix : 함수 호출 방식 수정
huiwoo-jo f4d5613
refactor : 미사용 함수 및 뷰바인딩 제거
huiwoo-jo ec074a5
rename : onboardingPermission 네임에 Activity 추가
huiwoo-jo e567d8e
refactor : 무의미 공백 제거
huiwoo-jo 769ed24
refactor : 온보딩 3단계 타이틀 텍스트 컬러 설정
huiwoo-jo d5a7010
refactor : 온보딩 키워드 알림 - 데이터 바인딩 제거
huiwoo-jo 1d13019
refactor : 온보딩 키워드 알림 - 대학 공지 알림 연동
huiwoo-jo 34f3fe5
refactor : 온보딩 키워드 알림 - 완료 버튼 string 수정
huiwoo-jo 184e6d0
Merge branch 'feat/onboarding-#3' of https://github.com/TeamDMU/DMU-A…
huiwoo-jo 808284f
refactor : 타이틀 부분 색상 설정 인자값 추가
huiwoo-jo f208f05
design : 온보딩 알림 설정 그림자 제거 및 테두리 추가
huiwoo-jo 1cd295f
design : 채워진 종 모양 아이콘 추가
huiwoo-jo 9810a43
refactor : 온보딩 키워드 알림설정 디자인 수정
huiwoo-jo 146b04a
refactor : 온보딩 화면 전화 경로 수정
huiwoo-jo e594a56
Merge branch 'develop' into feat/onboarding-#3
huiwoo-jo af953a7
refactor : 알림 설정 함수로 분리
huiwoo-jo 06a88f9
Merge branch 'develop' into feat/onboarding-#3
huiwoo-jo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
53 changes: 53 additions & 0 deletions
53
...ava/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
package com.dongyang.android.youdongknowme.ui.view.permission | ||
|
||
import android.content.Intent | ||
import android.content.res.ColorStateList | ||
import androidx.core.content.ContextCompat | ||
import com.dongyang.android.youdongknowme.R | ||
import com.dongyang.android.youdongknowme.databinding.ActivityOnboardingPermissionBinding | ||
import com.dongyang.android.youdongknowme.standard.base.BaseActivity | ||
import com.dongyang.android.youdongknowme.ui.view.main.MainActivity | ||
import com.dongyang.android.youdongknowme.ui.view.setting.SettingViewModel | ||
import org.koin.androidx.viewmodel.ext.android.viewModel | ||
|
||
class OnboardingPermissionActivity : BaseActivity<ActivityOnboardingPermissionBinding, SettingViewModel>() { | ||
|
||
override val layoutResourceId: Int = R.layout.activity_onboarding_permission | ||
override val viewModel: SettingViewModel by viewModel() | ||
|
||
override fun initStartView() { | ||
viewModel.setIsAccessSchoolAlarm(false) | ||
viewModel.setIsAccessDepartAlarm(false) | ||
|
||
viewModel.checkAccessAlarm() | ||
viewModel.getUserDepartment() | ||
|
||
setSpanText(this, binding.tvPermissionTitleMain,startIdx = 0, endIdx = 9) | ||
} | ||
|
||
override fun initDataBinding() = Unit | ||
|
||
override fun initAfterBinding() { | ||
binding.btnPermissionComplete.setOnClickListener { | ||
val intent = Intent(this@OnboardingPermissionActivity, MainActivity::class.java) | ||
startActivity(intent) | ||
finish() | ||
} | ||
|
||
binding.switchPermission.setOnCheckedChangeListener { compoundButton, _ -> | ||
if (compoundButton.isChecked) { | ||
viewModel.setIsAccessSchoolAlarm(true) | ||
viewModel.setIsAccessDepartAlarm(true) | ||
binding.switchPermission.compoundDrawableTintList = | ||
ColorStateList.valueOf(ContextCompat.getColor(this, R.color.blue300)) | ||
binding.switchPermission.setTextColor(getColor(R.color.blue300)) | ||
} else { | ||
viewModel.setIsAccessSchoolAlarm(false) | ||
viewModel.setIsAccessDepartAlarm(false) | ||
binding.switchPermission.compoundDrawableTintList = | ||
ColorStateList.valueOf(ContextCompat.getColor(this, R.color.gray300)) | ||
binding.switchPermission.setTextColor(getColor(R.color.gray300)) | ||
} | ||
} | ||
} | ||
} |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<vector android:height="31.25dp" android:viewportHeight="25" | ||
android:viewportWidth="24" android:width="30dp" xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<path android:fillColor="#4967E2" android:pathData="M5.417,18.044H18.574C19.354,18.044 19.828,17.637 19.828,17.039C19.828,16.209 18.981,15.462 18.267,14.723C17.719,14.15 17.57,12.972 17.503,12.017C17.445,8.83 16.599,6.63 14.391,5.833C14.075,4.754 13.22,3.891 11.992,3.891C10.771,3.891 9.908,4.754 9.601,5.833C7.393,6.63 6.546,8.83 6.488,12.017C6.422,12.972 6.272,14.15 5.725,14.723C5.002,15.462 4.164,16.209 4.164,17.039C4.164,17.637 4.629,18.044 5.417,18.044ZM11.992,21.364C13.403,21.364 14.432,20.334 14.54,19.172H9.452C9.56,20.334 10.589,21.364 11.992,21.364Z"/> | ||
</vector> |
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
94 changes: 94 additions & 0 deletions
94
app/src/main/res/layout/activity_onboarding_permission.xml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<layout xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||
xmlns:tools="http://schemas.android.com/tools"> | ||
|
||
<androidx.constraintlayout.widget.ConstraintLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
tools:context=".ui.view.permission.OnboardingPermissionActivity"> | ||
|
||
<TextView | ||
android:id="@+id/tv_permission_title_main" | ||
style="@style/PretendardBold32" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_marginHorizontal="16dp" | ||
android:layout_marginTop="60dp" | ||
android:text="@string/alarm_title_main" | ||
android:textColor="@color/gray500" | ||
app:layout_constraintBottom_toTopOf="@id/tv_permission_title_sub" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toTopOf="parent" /> | ||
|
||
<TextView | ||
android:id="@+id/tv_permission_title_sub" | ||
style="@style/PretendardBold24" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_marginHorizontal="16dp" | ||
android:text="@string/alarm_title_sub" | ||
android:textColor="@color/gray500" | ||
app:layout_constraintBottom_toTopOf="@id/onboarding_permission_step" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toTopOf="@id/tv_permission_title_main" /> | ||
|
||
<include | ||
android:id="@+id/onboarding_permission_step" | ||
layout="@layout/layout_onboarding_step" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_margin="16dp" | ||
android:paddingHorizontal="56dp" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toBottomOf="@id/tv_permission_title_sub" | ||
app:stepValue="@{@string/setting_notice}" /> | ||
|
||
<com.google.android.material.card.MaterialCardView | ||
android:id="@+id/mv_switch_permission" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_margin="16dp" | ||
android:padding="16dp" | ||
app:cardCornerRadius="16dp" | ||
app:layout_constraintBottom_toTopOf="@id/btn_permission_complete" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toBottomOf="@id/onboarding_permission_step" | ||
app:strokeColor="@color/blue300" | ||
app:strokeWidth="3dp"> | ||
|
||
<androidx.appcompat.widget.SwitchCompat | ||
android:id="@+id/switch_permission" | ||
style="@style/PretendardSemiBold20" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:layout_margin="16dp" | ||
android:drawableStart="@drawable/ic_alarm_fill" | ||
android:drawableTint="@color/gray300" | ||
android:paddingVertical="16dp" | ||
android:paddingHorizontal="32dp" | ||
android:text="@string/setting_keyword_alarm" | ||
android:textAlignment="center" | ||
android:textColor="@color/gray300" /> | ||
</com.google.android.material.card.MaterialCardView> | ||
|
||
<androidx.appcompat.widget.AppCompatButton | ||
android:id="@+id/btn_permission_complete" | ||
style="@style/PretendardRegular20" | ||
android:layout_width="0dp" | ||
android:layout_height="56dp" | ||
android:layout_marginHorizontal="16dp" | ||
android:layout_marginBottom="20dp" | ||
android:background="@drawable/btn_gray_to_blue_10dp_enabled" | ||
android:text="@string/alarm_complete" | ||
android:textColor="@color/white" | ||
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" /> | ||
|
||
</androidx.constraintlayout.widget.ConstraintLayout> | ||
</layout> |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
버튼 눌렀을 때 권한 요청 받는 부분은 아직 구현 안 하신 건가요 ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
추가로 버튼을 체크했다가 다시 눌렀을 때
isChecked
가false
로 변환 되는 부분이 없는 것 같아요! 영상 보니 다시 switch 버튼을 해제했을 때 알림 아이콘 색상이 변경이 안 되는 것 같네용There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
앗 권한 요청까지 수정해서 같이 올리도록 하겠습니다
isChecked
는 확인해보도록 하겠습니다색상 변경은 수정 했는데 제가 수정 전 영상으로 업로드했네요..!!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
권한 설정 부분은 세팅 화면과도 얽혀있어서 개별 작업하는 것이 나을거 같습니다
isChecked
와setIsAccessSchoolAlarm
,setIsAccessDepartAlarm
은 코드 내에서 반복적으로 사용하여 함수로 분리해보았습니다.