From 5b61a376fccad2368ae2e1b0a1b677019d2ff41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Mon, 12 Feb 2024 19:44:26 +0900 Subject: [PATCH 01/25] =?UTF-8?q?feat=20:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EC=84=A4=EC=A0=95=20-=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 6 +- .../ui/view/keyword/KeywordActivity.kt | 3 +- .../view/settingAlarm/SettingAlarmActivity.kt | 12 ++++ .../res/layout/activity_setting_alarm.xml | 62 +++++++++++++++++++ app/src/main/res/values/strings.xml | 3 + 5 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt create mode 100644 app/src/main/res/layout/activity_setting_alarm.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 52eb7fa4..a9784875 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,6 +17,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.YouDongKnowMe"> + @@ -45,8 +48,7 @@ android:exported="false" /> - + android:exported="false" /> diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt index 009e46d5..025a9714 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt @@ -12,6 +12,7 @@ import com.dongyang.android.youdongknowme.data.local.entity.KeywordEntity import com.dongyang.android.youdongknowme.databinding.ActivityKeywordBinding import com.dongyang.android.youdongknowme.standard.base.BaseActivity import com.dongyang.android.youdongknowme.ui.view.main.MainActivity +import com.dongyang.android.youdongknowme.ui.view.settingAlarm.SettingAlarmActivity import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup import com.google.firebase.FirebaseApp @@ -70,7 +71,7 @@ class KeywordActivity : BaseActivity() viewModel.subscribeCheckedKeyword() if (viewModel.isFirstLaunch.value == true) { viewModel.setFirstLaunch(false) - val intent = Intent(this@KeywordActivity, MainActivity::class.java) + val intent = Intent(this@KeywordActivity, SettingAlarmActivity::class.java) startActivity(intent) } finish() diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt new file mode 100644 index 00000000..abb7ce43 --- /dev/null +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt @@ -0,0 +1,12 @@ +package com.dongyang.android.youdongknowme.ui.view.settingAlarm + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import com.dongyang.android.youdongknowme.R + +class SettingAlarmActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_setting_alarm) + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting_alarm.xml b/app/src/main/res/layout/activity_setting_alarm.xml new file mode 100644 index 00000000..d072c18f --- /dev/null +++ b/app/src/main/res/layout/activity_setting_alarm.xml @@ -0,0 +1,62 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d3c8a1d6..b729f0e2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -104,6 +104,9 @@ 알림함 + 키워드 알림 설정으로 + 중요한 공지사항을 놓치지 마세요! + 알림 설정 및 시작하기 식단 From 9994ce2a7a6ba66e8d8e048d1c1157654c760915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Mon, 12 Feb 2024 19:59:40 +0900 Subject: [PATCH 02/25] =?UTF-8?q?design=20:=20=EC=98=A8=EB=B3=B4=EB=94=A9?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=20-=20=ED=83=80=EC=9D=B4=ED=8B=80=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/activity_setting_alarm.xml | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/app/src/main/res/layout/activity_setting_alarm.xml b/app/src/main/res/layout/activity_setting_alarm.xml index d072c18f..977714e9 100644 --- a/app/src/main/res/layout/activity_setting_alarm.xml +++ b/app/src/main/res/layout/activity_setting_alarm.xml @@ -5,45 +5,42 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".ui.view.settingAlarm.SettingAlarmActivity"> - + Date: Mon, 12 Feb 2024 20:00:31 +0900 Subject: [PATCH 03/25] =?UTF-8?q?chore=20:=20SettingAlarmViewModel=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/settingAlarm/SettingAlarmViewModel.kt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmViewModel.kt diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmViewModel.kt new file mode 100644 index 00000000..78e1623c --- /dev/null +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmViewModel.kt @@ -0,0 +1,6 @@ +package com.dongyang.android.youdongknowme.ui.view.settingAlarm + +import com.dongyang.android.youdongknowme.standard.base.BaseViewModel + +class SettingAlarmViewModel : BaseViewModel() { +} \ No newline at end of file From e8c3f6b417c8112c4e75555ccdc0ee0929ab6f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Mon, 12 Feb 2024 20:16:54 +0900 Subject: [PATCH 04/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=EC=95=8C=EB=A6=BC=20=EC=84=A4=EC=A0=95=20viewModel?= =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/settingAlarm/SettingAlarmActivity.kt | 22 ++- .../res/layout/activity_setting_alarm.xml | 126 ++++++++++-------- 2 files changed, 87 insertions(+), 61 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt index abb7ce43..409fff10 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt @@ -2,11 +2,25 @@ package com.dongyang.android.youdongknowme.ui.view.settingAlarm import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.navigation.fragment.NavHostFragment +import androidx.navigation.plusAssign +import androidx.navigation.ui.setupWithNavController import com.dongyang.android.youdongknowme.R +import com.dongyang.android.youdongknowme.databinding.ActivitySettingAlarmBinding +import com.dongyang.android.youdongknowme.standard.base.BaseActivity +import com.dongyang.android.youdongknowme.ui.view.keyword.KeywordViewModel +import com.dongyang.android.youdongknowme.ui.view.util.KeepStateNavigator +import org.koin.androidx.viewmodel.ext.android.viewModel -class SettingAlarmActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_setting_alarm) +class SettingAlarmActivity : BaseActivity() { + + override val layoutResourceId: Int = R.layout.activity_setting_alarm + override val viewModel: SettingAlarmViewModel by viewModel() + + override fun initStartView() { } + + override fun initDataBinding() {} + + override fun initAfterBinding() {} } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting_alarm.xml b/app/src/main/res/layout/activity_setting_alarm.xml index 977714e9..d9bc309d 100644 --- a/app/src/main/res/layout/activity_setting_alarm.xml +++ b/app/src/main/res/layout/activity_setting_alarm.xml @@ -1,59 +1,71 @@ - - - - - - - - - - - \ No newline at end of file + xmlns:tools="http://schemas.android.com/tools"> + + + + + + + + + + + + + + + + + /> + + \ No newline at end of file From 359f14cb9cf2f9197c4bd74a2f089fc4c7bf6df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Mon, 12 Feb 2024 21:22:18 +0900 Subject: [PATCH 05/25] =?UTF-8?q?design=20:=20=EC=98=A8=EB=B3=B4=EB=94=A9?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=20=EC=84=A4=EC=A0=95=20-=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=EC=84=A4=EC=A0=95=20=EB=B0=95=EC=8A=A4=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/settingAlarm/SettingAlarmActivity.kt | 34 ++++++++++++++++-- .../settingAlarm/SettingAlarmViewModel.kt | 6 ---- .../res/layout/activity_setting_alarm.xml | 36 +++++++++++++++++-- app/src/main/res/values/strings.xml | 1 + 4 files changed, 65 insertions(+), 12 deletions(-) delete mode 100644 app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmViewModel.kt diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt index 409fff10..9220711e 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt @@ -1,7 +1,11 @@ package com.dongyang.android.youdongknowme.ui.view.settingAlarm +import android.content.Intent +import android.os.Build import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.annotation.RequiresApi +import androidx.core.content.ContextCompat import androidx.navigation.fragment.NavHostFragment import androidx.navigation.plusAssign import androidx.navigation.ui.setupWithNavController @@ -9,18 +13,42 @@ import com.dongyang.android.youdongknowme.R import com.dongyang.android.youdongknowme.databinding.ActivitySettingAlarmBinding import com.dongyang.android.youdongknowme.standard.base.BaseActivity import com.dongyang.android.youdongknowme.ui.view.keyword.KeywordViewModel +import com.dongyang.android.youdongknowme.ui.view.main.MainActivity +import com.dongyang.android.youdongknowme.ui.view.setting.SettingViewModel import com.dongyang.android.youdongknowme.ui.view.util.KeepStateNavigator import org.koin.androidx.viewmodel.ext.android.viewModel +import java.security.AccessController.getContext -class SettingAlarmActivity : BaseActivity() { +class SettingAlarmActivity : BaseActivity() { override val layoutResourceId: Int = R.layout.activity_setting_alarm - override val viewModel: SettingAlarmViewModel by viewModel() + override val viewModel: SettingViewModel by viewModel() override fun initStartView() { } override fun initDataBinding() {} - override fun initAfterBinding() {} + @RequiresApi(Build.VERSION_CODES.P) + override fun initAfterBinding() { + binding.btnAlarmComplete.setOnClickListener { + val intent = Intent(this@SettingAlarmActivity, MainActivity::class.java) + startActivity(intent) + finish() + } + + binding.switchAlarm.setOnCheckedChangeListener { compoundButton, _ -> + if (compoundButton.isChecked) { + viewModel.setIsAccessDepartAlarm(true) + binding.mvSwitchAlarm.outlineAmbientShadowColor = getColor(R.color.blue300) + binding.mvSwitchAlarm.outlineSpotShadowColor = getColor(R.color.blue300) + binding.switchAlarm.setTextColor(getColor(R.color.blue300)) + } else { + viewModel.setIsAccessDepartAlarm(false) + binding.mvSwitchAlarm.outlineAmbientShadowColor = getColor(R.color.gray300) + binding.mvSwitchAlarm.outlineSpotShadowColor = getColor(R.color.gray300) + binding.switchAlarm.setTextColor(getColor(R.color.gray300)) + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmViewModel.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmViewModel.kt deleted file mode 100644 index 78e1623c..00000000 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmViewModel.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.dongyang.android.youdongknowme.ui.view.settingAlarm - -import com.dongyang.android.youdongknowme.standard.base.BaseViewModel - -class SettingAlarmViewModel : BaseViewModel() { -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting_alarm.xml b/app/src/main/res/layout/activity_setting_alarm.xml index d9bc309d..e3b1e2db 100644 --- a/app/src/main/res/layout/activity_setting_alarm.xml +++ b/app/src/main/res/layout/activity_setting_alarm.xml @@ -39,11 +39,41 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="16dp" - app:stepValue="@{@string/setting_notice}" android:paddingHorizontal="56dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_alarm_title_sub" /> + app:layout_constraintTop_toBottomOf="@id/tv_alarm_title_sub" + app:stepValue="@{@string/setting_notice}" /> + + + + + + type="com.dongyang.android.youdongknowme.ui.view.setting.SettingViewModel" /> /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b729f0e2..0cfee883 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -46,6 +46,7 @@ 컴퓨터소프트웨어공학과 학과 설정 키워드 + 키워드 알림 설정 키워드 선택 앱 정보 문의하기 From cd1e685a330621b5e33caad3a3542dabe6e6d31e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Mon, 12 Feb 2024 21:27:57 +0900 Subject: [PATCH 06/25] =?UTF-8?q?style=20:=20=EC=98=A8=EB=B3=B4=EB=94=A9?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=20-=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=9D=BC=EC=9D=B4=EB=B8=8C?= =?UTF-8?q?=EB=9F=AC=EB=A6=AC=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/settingAlarm/SettingAlarmActivity.kt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt index 9220711e..da23b8b4 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt @@ -2,22 +2,13 @@ package com.dongyang.android.youdongknowme.ui.view.settingAlarm import android.content.Intent import android.os.Build -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle import androidx.annotation.RequiresApi -import androidx.core.content.ContextCompat -import androidx.navigation.fragment.NavHostFragment -import androidx.navigation.plusAssign -import androidx.navigation.ui.setupWithNavController import com.dongyang.android.youdongknowme.R import com.dongyang.android.youdongknowme.databinding.ActivitySettingAlarmBinding import com.dongyang.android.youdongknowme.standard.base.BaseActivity -import com.dongyang.android.youdongknowme.ui.view.keyword.KeywordViewModel import com.dongyang.android.youdongknowme.ui.view.main.MainActivity import com.dongyang.android.youdongknowme.ui.view.setting.SettingViewModel -import com.dongyang.android.youdongknowme.ui.view.util.KeepStateNavigator import org.koin.androidx.viewmodel.ext.android.viewModel -import java.security.AccessController.getContext class SettingAlarmActivity : BaseActivity() { From b9c70201bb2bffc99d34e37ce08c00e071f285a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Mon, 12 Feb 2024 21:40:43 +0900 Subject: [PATCH 07/25] =?UTF-8?q?design=20:=20=EC=98=A8=EB=B3=B4=EB=94=A9?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=EC=84=A4=EC=A0=95=20-=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EC=83=89=EC=83=81=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/settingAlarm/SettingAlarmActivity.kt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt index da23b8b4..a1009c60 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt @@ -2,6 +2,10 @@ package com.dongyang.android.youdongknowme.ui.view.settingAlarm import android.content.Intent import android.os.Build +import android.text.Spannable +import android.text.SpannableStringBuilder +import android.text.style.ForegroundColorSpan +import android.widget.TextView import androidx.annotation.RequiresApi import com.dongyang.android.youdongknowme.R import com.dongyang.android.youdongknowme.databinding.ActivitySettingAlarmBinding @@ -16,6 +20,7 @@ class SettingAlarmActivity : BaseActivity Date: Sun, 18 Feb 2024 00:56:30 +0900 Subject: [PATCH 08/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?-=20initDataBinding=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jeongho --- .../youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt index a1009c60..3772bd96 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt @@ -23,7 +23,7 @@ class SettingAlarmActivity : BaseActivity Date: Sun, 18 Feb 2024 01:04:23 +0900 Subject: [PATCH 09/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=EC=95=8C=EB=A6=BC=20-=20switch=EC=9D=98=20drawable?= =?UTF-8?q?=20=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jeongho --- app/src/main/res/layout/activity_setting_alarm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_setting_alarm.xml b/app/src/main/res/layout/activity_setting_alarm.xml index e3b1e2db..ef39568c 100644 --- a/app/src/main/res/layout/activity_setting_alarm.xml +++ b/app/src/main/res/layout/activity_setting_alarm.xml @@ -66,7 +66,7 @@ bind_is_checked="@{vm.isAccessDepartAlarm()}" android:layout_width="match_parent" android:layout_height="match_parent" - android:drawableLeft="@drawable/ic_alarm" + android:drawableStart="@drawable/ic_alarm" android:drawableTint="@color/gray300" android:padding="16dp" android:layout_margin="16dp" From a8a2d8e13d2540e16d385008b75c05a4ab70d4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Sun, 18 Feb 2024 01:07:00 +0900 Subject: [PATCH 10/25] =?UTF-8?q?rename=20:=20=EC=98=A8=EB=B3=B4=EB=94=A9?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=20=EC=84=A4=EC=A0=95=20-=20=EB=AA=85?= =?UTF-8?q?=ED=99=95=ED=95=9C=20=EC=9D=B4=EB=A6=84=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- .../youdongknowme/ui/view/keyword/KeywordActivity.kt | 8 ++------ .../OnboardingPermission.kt} | 10 +++++----- ...ng_alarm.xml => activity_onboarding_permission.xml} | 2 +- 4 files changed, 9 insertions(+), 13 deletions(-) rename app/src/main/java/com/dongyang/android/youdongknowme/ui/view/{settingAlarm/SettingAlarmActivity.kt => permission/OnboardingPermission.kt} (84%) rename app/src/main/res/layout/{activity_setting_alarm.xml => activity_onboarding_permission.xml} (98%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a9784875..18b5cdaa 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ android:supportsRtl="true" android:theme="@style/Theme.YouDongKnowMe"> () { @@ -71,7 +67,7 @@ class KeywordActivity : BaseActivity() viewModel.subscribeCheckedKeyword() if (viewModel.isFirstLaunch.value == true) { viewModel.setFirstLaunch(false) - val intent = Intent(this@KeywordActivity, SettingAlarmActivity::class.java) + val intent = Intent(this@KeywordActivity, OnboardingPermission::class.java) startActivity(intent) } finish() diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt similarity index 84% rename from app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt rename to app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt index 3772bd96..a85ac696 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/settingAlarm/SettingAlarmActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt @@ -1,4 +1,4 @@ -package com.dongyang.android.youdongknowme.ui.view.settingAlarm +package com.dongyang.android.youdongknowme.ui.view.permission import android.content.Intent import android.os.Build @@ -8,15 +8,15 @@ import android.text.style.ForegroundColorSpan import android.widget.TextView import androidx.annotation.RequiresApi import com.dongyang.android.youdongknowme.R -import com.dongyang.android.youdongknowme.databinding.ActivitySettingAlarmBinding +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 SettingAlarmActivity : BaseActivity() { +class OnboardingPermission : BaseActivity() { - override val layoutResourceId: Int = R.layout.activity_setting_alarm + override val layoutResourceId: Int = R.layout.activity_onboarding_permission override val viewModel: SettingViewModel by viewModel() override fun initStartView() { @@ -28,7 +28,7 @@ class SettingAlarmActivity : BaseActivity + tools:context=".ui.view.permission.OnboardingPermission"> Date: Sun, 18 Feb 2024 01:12:36 +0900 Subject: [PATCH 11/25] =?UTF-8?q?refactor=20:=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=84=A4=EC=A0=95=20=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youdongknowme/standard/base/BaseActivity.kt | 16 +++++++++++++++- .../ui/view/keyword/KeywordActivity.kt | 13 ------------- .../ui/view/permission/OnboardingPermission.kt | 13 ------------- 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/base/BaseActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/base/BaseActivity.kt index 93c5e0be..0d87d9d6 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/base/BaseActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/base/BaseActivity.kt @@ -1,6 +1,10 @@ package com.dongyang.android.youdongknowme.standard.base import android.os.Bundle +import android.text.Spannable +import android.text.SpannableStringBuilder +import android.text.style.ForegroundColorSpan +import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding @@ -27,7 +31,17 @@ abstract class BaseActivity : AppCompatA initDataBinding() initAfterBinding() } - + protected fun setSpan(spanTextView: TextView, startIdx: Int, endIdx: Int){ + SpannableStringBuilder(spanTextView.text).apply { + setSpan( + ForegroundColorSpan(getColor(com.dongyang.android.youdongknowme.R.color.main)), + startIdx, + endIdx, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ) + spanTextView.text = this + } + } protected fun showToast(message: String) { applicationContext.toast(message) } diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt index d5e44d49..fa2017c9 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt @@ -27,19 +27,6 @@ class KeywordActivity : BaseActivity() setSpan(binding.tvKeywordTitleMain,startIdx = 0, endIdx = 3) } - // 텍스트 부분 색상 설정 - private fun setSpan(spanTextView: TextView, startIdx: Int, endIdx: Int){ - SpannableStringBuilder(spanTextView.text).apply { - setSpan( - ForegroundColorSpan(getColor(R.color.main)), - startIdx, - endIdx, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE - ) - spanTextView.text = this - } - } - override fun initDataBinding() { // 효율을 위해 단 한번만 옵저빙하여 이미 구독중인 항목을 선택 처리 viewModel.localKeywordList.observe(this, object : Observer> { diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt index a85ac696..da8e0758 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt @@ -48,17 +48,4 @@ class OnboardingPermission : BaseActivity Date: Sun, 18 Feb 2024 01:20:34 +0900 Subject: [PATCH 12/25] =?UTF-8?q?chore=20:=20=ED=85=8D=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EB=B6=80=EB=B6=84=20=EC=83=89=EC=83=81=20=EC=A7=80=EC=A0=95?= =?UTF-8?q?=20=ED=95=A8=EC=88=98=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/youdongknowme/standard/base/BaseActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/base/BaseActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/base/BaseActivity.kt index 0d87d9d6..3e2cceec 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/standard/base/BaseActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/standard/base/BaseActivity.kt @@ -31,7 +31,7 @@ abstract class BaseActivity : AppCompatA initDataBinding() initAfterBinding() } - protected fun setSpan(spanTextView: TextView, startIdx: Int, endIdx: Int){ + protected fun setSpanText(spanTextView: TextView, startIdx: Int, endIdx: Int){ SpannableStringBuilder(spanTextView.text).apply { setSpan( ForegroundColorSpan(getColor(com.dongyang.android.youdongknowme.R.color.main)), From e453c7ba8ed471203e820e94b1e6044daad3205a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Thu, 22 Feb 2024 20:39:24 +0900 Subject: [PATCH 13/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?-=20id=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/keyword/KeywordActivity.kt | 2 +- .../view/permission/OnboardingPermission.kt | 18 ++++++++--------- .../layout/activity_onboarding_permission.xml | 20 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt index fa2017c9..c8358026 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt @@ -24,7 +24,7 @@ class KeywordActivity : BaseActivity() binding.vm = viewModel // 부분 색상 지정 - setSpan(binding.tvKeywordTitleMain,startIdx = 0, endIdx = 3) + setSpanText(binding.tvKeywordTitleMain,startIdx = 0, endIdx = 3) } override fun initDataBinding() { diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt index da8e0758..26ae240e 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt @@ -20,30 +20,30 @@ class OnboardingPermission : BaseActivity + binding.switchPermission.setOnCheckedChangeListener { compoundButton, _ -> if (compoundButton.isChecked) { viewModel.setIsAccessDepartAlarm(true) - binding.mvSwitchAlarm.outlineAmbientShadowColor = getColor(R.color.blue300) - binding.mvSwitchAlarm.outlineSpotShadowColor = getColor(R.color.blue300) - binding.switchAlarm.setTextColor(getColor(R.color.blue300)) + binding.mvSwitchPermission.outlineAmbientShadowColor = getColor(R.color.blue300) + binding.mvSwitchPermission.outlineSpotShadowColor = getColor(R.color.blue300) + binding.switchPermission.setTextColor(getColor(R.color.blue300)) } else { viewModel.setIsAccessDepartAlarm(false) - binding.mvSwitchAlarm.outlineAmbientShadowColor = getColor(R.color.gray300) - binding.mvSwitchAlarm.outlineSpotShadowColor = getColor(R.color.gray300) - binding.switchAlarm.setTextColor(getColor(R.color.gray300)) + binding.mvSwitchPermission.outlineAmbientShadowColor = getColor(R.color.gray300) + binding.mvSwitchPermission.outlineSpotShadowColor = getColor(R.color.gray300) + binding.switchPermission.setTextColor(getColor(R.color.gray300)) } } } diff --git a/app/src/main/res/layout/activity_onboarding_permission.xml b/app/src/main/res/layout/activity_onboarding_permission.xml index c42b8541..526c9d53 100644 --- a/app/src/main/res/layout/activity_onboarding_permission.xml +++ b/app/src/main/res/layout/activity_onboarding_permission.xml @@ -9,32 +9,32 @@ tools:context=".ui.view.permission.OnboardingPermission"> + app:layout_constraintTop_toTopOf="@id/tv_permission_title_main" /> Date: Thu, 22 Feb 2024 20:47:51 +0900 Subject: [PATCH 14/25] =?UTF-8?q?design=20:=20=EC=98=A8=EB=B3=B4=EB=94=A9?= =?UTF-8?q?=20=ED=82=A4=EC=9B=8C=EB=93=A4=20=EC=95=8C=EB=A6=BC=20-=20const?= =?UTF-8?q?raint=20=EC=A2=85=EC=86=8D=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_onboarding_permission.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_onboarding_permission.xml b/app/src/main/res/layout/activity_onboarding_permission.xml index 526c9d53..ceb3c362 100644 --- a/app/src/main/res/layout/activity_onboarding_permission.xml +++ b/app/src/main/res/layout/activity_onboarding_permission.xml @@ -54,8 +54,8 @@ android:padding="16dp" app:cardCornerRadius="16dp" app:cardElevation="26dp" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/onboarding_permission_step" + app:layout_constraintBottom_toTopOf="@id/btn_permission_complete" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:strokeWidth="1dp"> From deecc0f243a080818c4b2cb5bf062f084623cba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Thu, 22 Feb 2024 21:01:47 +0900 Subject: [PATCH 15/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?-=20viemodel=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youdongknowme/ui/view/permission/OnboardingPermission.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt index 26ae240e..96cdbca6 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt @@ -20,6 +20,11 @@ class OnboardingPermission : BaseActivity Date: Thu, 22 Feb 2024 21:02:23 +0900 Subject: [PATCH 16/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?-=20=EB=B2=84=EC=A0=84=20=EB=B6=84=EA=B8=B0=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/permission/OnboardingPermission.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt index 96cdbca6..465a1a48 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt @@ -30,7 +30,6 @@ class OnboardingPermission : BaseActivity if (compoundButton.isChecked) { viewModel.setIsAccessDepartAlarm(true) - binding.mvSwitchPermission.outlineAmbientShadowColor = getColor(R.color.blue300) - binding.mvSwitchPermission.outlineSpotShadowColor = getColor(R.color.blue300) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + binding.mvSwitchPermission.outlineAmbientShadowColor = getColor(R.color.blue300) + binding.mvSwitchPermission.outlineSpotShadowColor = getColor(R.color.blue300) + } binding.switchPermission.setTextColor(getColor(R.color.blue300)) } else { viewModel.setIsAccessDepartAlarm(false) - binding.mvSwitchPermission.outlineAmbientShadowColor = getColor(R.color.gray300) - binding.mvSwitchPermission.outlineSpotShadowColor = getColor(R.color.gray300) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + binding.mvSwitchPermission.outlineAmbientShadowColor = getColor(R.color.gray300) + binding.mvSwitchPermission.outlineSpotShadowColor = getColor(R.color.gray300) + } binding.switchPermission.setTextColor(getColor(R.color.gray300)) } } From e667ddc0db0747b96f7684664f0d4b7f6f7afbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Wed, 6 Mar 2024 12:16:48 +0900 Subject: [PATCH 17/25] =?UTF-8?q?fix=20:=20string=20=EC=B6=A9=EB=8F=8C=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0cfee883..9044ebf6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -104,7 +104,6 @@ 처리중 - 알림함 키워드 알림 설정으로 중요한 공지사항을 놓치지 마세요! 알림 설정 및 시작하기 From 22eb659590e22e4d1f7e3ccddc673f77323d3000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= Date: Wed, 6 Mar 2024 12:23:01 +0900 Subject: [PATCH 18/25] =?UTF-8?q?fix=20:=20=ED=95=A8=EC=88=98=20=ED=98=B8?= =?UTF-8?q?=EC=B6=9C=20=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/keyword/OnboardingKeywordActivity.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/OnboardingKeywordActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/OnboardingKeywordActivity.kt index f6b8df32..8d2962c8 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/OnboardingKeywordActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/OnboardingKeywordActivity.kt @@ -4,9 +4,7 @@ import android.content.Intent import androidx.lifecycle.Observer import com.dongyang.android.youdongknowme.R import com.dongyang.android.youdongknowme.data.local.entity.KeywordEntity -import com.dongyang.android.youdongknowme.databinding.ActivityKeywordBinding import com.dongyang.android.youdongknowme.databinding.ActivityOnboardingKeywordBinding -import com.dongyang.android.youdongknowme.function.setSpanText import com.dongyang.android.youdongknowme.standard.base.BaseActivity import com.dongyang.android.youdongknowme.ui.view.main.MainActivity import com.google.android.material.chip.Chip @@ -22,7 +20,7 @@ class OnboardingKeywordActivity : BaseActivity Date: Wed, 6 Mar 2024 12:27:55 +0900 Subject: [PATCH 19/25] =?UTF-8?q?refactor=20:=20=EB=AF=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=ED=95=A8=EC=88=98=20=EB=B0=8F=20=EB=B7=B0=EB=B0=94?= =?UTF-8?q?=EC=9D=B8=EB=94=A9=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youdongknowme/ui/view/keyword/KeywordActivity.kt | 9 ++------- app/src/main/res/layout/activity_keyword.xml | 8 -------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt index d7223d26..7e2643ca 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt @@ -17,13 +17,8 @@ class KeywordActivity : BaseActivity() override val layoutResourceId: Int = R.layout.activity_keyword override val viewModel: KeywordViewModel by viewModel() - override fun initStartView() { - binding.vm = viewModel - - // 부분 색상 지정 - setSpanText(binding.tvKeywordTitleMain,startIdx = 0, endIdx = 3) - } - + override fun initStartView() = Unit + override fun initDataBinding() { // 효율을 위해 단 한번만 옵저빙하여 이미 구독중인 항목을 선택 처리 viewModel.localKeywordList.observe(this, object : Observer> { diff --git a/app/src/main/res/layout/activity_keyword.xml b/app/src/main/res/layout/activity_keyword.xml index 99320169..8f65da88 100644 --- a/app/src/main/res/layout/activity_keyword.xml +++ b/app/src/main/res/layout/activity_keyword.xml @@ -307,12 +307,4 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - - - - - /> - \ No newline at end of file From 6b368e7903617f297931918a9ffab93a7bf288e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= <84004687+huiwoo-jo@users.noreply.github.com> Date: Tue, 12 Mar 2024 19:43:43 +0900 Subject: [PATCH 20/25] =?UTF-8?q?rename=20:=20onboardingPermission=20?= =?UTF-8?q?=EB=84=A4=EC=9E=84=EC=97=90=20Activity=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- .../youdongknowme/ui/view/keyword/KeywordActivity.kt | 5 ++--- ...dingPermission.kt => OnboardingPermissionActivity.kt} | 9 ++------- .../main/res/layout/activity_onboarding_permission.xml | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) rename app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/{OnboardingPermission.kt => OnboardingPermissionActivity.kt} (84%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3f8ac175..23d161f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ android:supportsRtl="true" android:theme="@style/Theme.YouDongKnowMe"> () viewModel.subscribeCheckedKeyword() if (viewModel.isFirstLaunch.value == true) { viewModel.setFirstLaunch(false) - val intent = Intent(this@KeywordActivity, OnboardingPermission::class.java) + val intent = Intent(this@KeywordActivity, OnboardingPermissionActivity::class.java) startActivity(intent) } finish() diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt similarity index 84% rename from app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt rename to app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt index 465a1a48..bfe418ff 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermission.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt @@ -2,11 +2,6 @@ package com.dongyang.android.youdongknowme.ui.view.permission import android.content.Intent import android.os.Build -import android.text.Spannable -import android.text.SpannableStringBuilder -import android.text.style.ForegroundColorSpan -import android.widget.TextView -import androidx.annotation.RequiresApi import com.dongyang.android.youdongknowme.R import com.dongyang.android.youdongknowme.databinding.ActivityOnboardingPermissionBinding import com.dongyang.android.youdongknowme.standard.base.BaseActivity @@ -14,7 +9,7 @@ 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 OnboardingPermission : BaseActivity() { +class OnboardingPermissionActivity : BaseActivity() { override val layoutResourceId: Int = R.layout.activity_onboarding_permission override val viewModel: SettingViewModel by viewModel() @@ -32,7 +27,7 @@ class OnboardingPermission : BaseActivity + tools:context=".ui.view.permission.OnboardingPermissionActivity"> Date: Tue, 12 Mar 2024 19:44:08 +0900 Subject: [PATCH 21/25] =?UTF-8?q?refactor=20:=20=EB=AC=B4=EC=9D=98?= =?UTF-8?q?=EB=AF=B8=20=EA=B3=B5=EB=B0=B1=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/permission/OnboardingPermissionActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt index bfe418ff..a5882498 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt @@ -50,5 +50,4 @@ class OnboardingPermissionActivity : BaseActivity Date: Tue, 12 Mar 2024 19:51:25 +0900 Subject: [PATCH 22/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=203=EB=8B=A8=EA=B3=84=20=ED=83=80=EC=9D=B4=ED=8B=80?= =?UTF-8?q?=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=BB=AC=EB=9F=AC=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_onboarding_permission.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/layout/activity_onboarding_permission.xml b/app/src/main/res/layout/activity_onboarding_permission.xml index 4a997f52..f178df91 100644 --- a/app/src/main/res/layout/activity_onboarding_permission.xml +++ b/app/src/main/res/layout/activity_onboarding_permission.xml @@ -16,6 +16,7 @@ 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" @@ -28,6 +29,7 @@ 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" From 47623075d653de84d4ce89b0aa34dc4b90b8846d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= <84004687+huiwoo-jo@users.noreply.github.com> Date: Tue, 12 Mar 2024 20:32:45 +0900 Subject: [PATCH 23/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?-=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B0=94=EC=9D=B8=EB=94=A9?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/permission/OnboardingPermissionActivity.kt | 2 +- .../youdongknowme/ui/view/setting/SettingViewModel.kt | 4 ++-- .../main/res/layout/activity_onboarding_permission.xml | 9 --------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt index a5882498..77f6c51d 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt @@ -15,7 +15,7 @@ class OnboardingPermissionActivity : BaseActivity = MutableLiveData(true) + private val _isAccessSchoolAlarm: MutableLiveData = MutableLiveData(false) val isAccessSchoolAlarm: LiveData get() = _isAccessSchoolAlarm - private val _isAccessDepartAlarm: MutableLiveData = MutableLiveData(true) + private val _isAccessDepartAlarm: MutableLiveData = MutableLiveData(false) val isAccessDepartAlarm: LiveData get() = _isAccessDepartAlarm private val _myDepartment: MutableLiveData = MutableLiveData() diff --git a/app/src/main/res/layout/activity_onboarding_permission.xml b/app/src/main/res/layout/activity_onboarding_permission.xml index f178df91..31542616 100644 --- a/app/src/main/res/layout/activity_onboarding_permission.xml +++ b/app/src/main/res/layout/activity_onboarding_permission.xml @@ -65,7 +65,6 @@ - - - - - /> - \ No newline at end of file From 04a8fc6f28d00205bd05d29562cf9c07153bd76a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= <84004687+huiwoo-jo@users.noreply.github.com> Date: Tue, 12 Mar 2024 20:41:34 +0900 Subject: [PATCH 24/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?-=20=EB=8C=80=ED=95=99=20=EA=B3=B5=EC=A7=80=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/view/permission/OnboardingPermissionActivity.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt index 77f6c51d..fcc73b0f 100644 --- a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt +++ b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/permission/OnboardingPermissionActivity.kt @@ -15,6 +15,7 @@ class OnboardingPermissionActivity : BaseActivity if (compoundButton.isChecked) { + viewModel.setIsAccessSchoolAlarm(true) viewModel.setIsAccessDepartAlarm(true) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { binding.mvSwitchPermission.outlineAmbientShadowColor = getColor(R.color.blue300) @@ -41,6 +43,7 @@ class OnboardingPermissionActivity : BaseActivity= Build.VERSION_CODES.P) { binding.mvSwitchPermission.outlineAmbientShadowColor = getColor(R.color.gray300) From c6458354bfddadcad7bee83465b37b8f64649f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=ED=9D=AC=EC=9A=B0?= <84004687+huiwoo-jo@users.noreply.github.com> Date: Tue, 12 Mar 2024 20:43:49 +0900 Subject: [PATCH 25/25] =?UTF-8?q?refactor=20:=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?-=20=EC=99=84=EB=A3=8C=20=EB=B2=84=ED=8A=BC=20string=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4ed0dc87..76691fb7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,7 +106,7 @@ 키워드 알림 설정으로 중요한 공지사항을 놓치지 마세요! - 알림 설정 및 시작하기 + 시작하기 키워드 알림함 편집