Skip to content

Commit

Permalink
feat: 설정 화면에서 개인정보 처리 방침, 서비스 이용 약관 링크 연결 (#496)
Browse files Browse the repository at this point in the history
* feat: 개인정보 처리 방침, 서비스 이용 약관 설정에서 링크 연결

* refactor: 노션 uri들 local properties에서 관리

* android ci에 uri들 추가
  • Loading branch information
haeum808 committed Sep 9, 2024
1 parent 0592a6f commit a33d7e4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/android-ci-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ jobs:
echo base_url='${{ secrets.BASE_URL }}' > ./local.properties
echo kakao_api_key='{{ secrets.KAKAO_API_KEY }}' > ./local.properties
echo kakao_native_key='{{ secrets.KAKAO_NATIVE_KEY }}' > ./local.properties
echo term_uri='{{ secrets.TERM_URI }}' > ./local.properties
echo privacy_policy_uri='{{ secrets.PRIVACY_POLICY_URI }}' > ./local.properties
- name: Check ktLint
run: ./gradlew ktlintCheck
Expand Down
2 changes: 2 additions & 0 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ android {
buildConfigField("String", "BASE_URL", properties["BASE_URL"].toString())
buildConfigField("String", "KAKAO_API_KEY", properties["KAKAO_API_KEY"].toString())
buildConfigField("String", "KAKAO_NATIVE_KEY", properties["KAKAO_NATIVE_KEY"].toString())
buildConfigField("String", "PRIVACY_POLICY_URI", properties["PRIVACY_POLICY_URI"].toString())
buildConfigField("String", "TERM_URI", properties["TERM_URI"].toString())
manifestPlaceholders["KAKAO_NATIVE_KEY"] = properties["KAKAO_NATIVE_KEY"].toString().trim('"')
}
buildTypes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ package com.mulberry.ody.presentation.setting

import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.widget.LinearLayout
import com.google.android.material.divider.MaterialDividerItemDecoration
import com.mulberry.ody.BuildConfig
import com.mulberry.ody.R
import com.mulberry.ody.databinding.ActivitySettingBinding
import com.mulberry.ody.presentation.common.binding.BindingActivity
Expand Down Expand Up @@ -36,9 +38,7 @@ class SettingActivity :
dividerInsetStart = dpToPx(SETTING_ITEM_HORIZONTAL_MARGIN_DP)
dividerInsetEnd = dpToPx(SETTING_ITEM_HORIZONTAL_MARGIN_DP)
}

binding.rvSetting.addItemDecoration(dividerItemDecoration)

adapter.submitList(SettingUiModel.entries)
}

Expand All @@ -47,9 +47,13 @@ class SettingActivity :
override fun onClickSettingItem(settingUiModel: SettingUiModel) {
when (settingUiModel) {
SettingUiModel.PRIVACY_POLICY -> {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.PRIVACY_POLICY_URI))
startActivity(intent)
}

SettingUiModel.TERM -> {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.TERM_URI))
startActivity(intent)
}

SettingUiModel.LOGOUT -> {
Expand Down

0 comments on commit a33d7e4

Please sign in to comment.