From 43f54d3a2365f91c43586181d1c8d2bdd837b386 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 1 Aug 2024 21:03:41 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[ADD/#38]=20=EC=9E=AC=EC=83=9D=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=8B=A4=ED=96=89=20=EC=8B=9C=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=20=EC=9E=90=EB=8F=99=20=EA=BA=BC=EC=A7=90=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/presentation/src/main/java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt b/presentation/src/main/java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt index 8dcee76..961fc52 100644 --- a/presentation/src/main/java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt +++ b/presentation/src/main/java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt @@ -9,6 +9,7 @@ import android.hardware.SensorManager import android.media.MediaPlayer import android.os.Bundle import android.view.View +import android.view.WindowManager import androidx.core.view.isVisible import androidx.fragment.app.activityViewModels import androidx.lifecycle.flowWithLifecycle @@ -70,6 +71,7 @@ class RhythmFragment : BaseFragment(R.layout.fragment_rhy if (::mediaPlayer.isInitialized) { mediaPlayer.start() switchPlayingState(true) + requireActivity().window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) } else { toast(stringOf(R.string.error_msg)) } @@ -81,6 +83,7 @@ class RhythmFragment : BaseFragment(R.layout.fragment_rhy if (::mediaPlayer.isInitialized) { mediaPlayer.pause() switchPlayingState(false) + requireActivity().window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) } rhythmSaveDialog = RhythmSaveDialog() rhythmSaveDialog?.show(parentFragmentManager, DIALOG_RHYTHM_SAVE) From 45c8797c41ff440cbe7b312f138aaf7014799ba1 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 1 Aug 2024 21:19:50 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FIX/#38]=20Study=EB=B7=B0=20=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=ED=94=BC=EA=B7=B8=EB=A7=88=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/fragment_study.xml | 6 ++++-- .../src/main/res/layout/item_study_exercise.xml | 7 ++++--- .../main/res/layout/item_study_information.xml | 16 ++++++++-------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/presentation/src/main/res/layout/fragment_study.xml b/presentation/src/main/res/layout/fragment_study.xml index b401721..c7b3f30 100644 --- a/presentation/src/main/res/layout/fragment_study.xml +++ b/presentation/src/main/res/layout/fragment_study.xml @@ -8,16 +8,18 @@ + android:layout_height="match_parent" + android:background="@color/gray_100"> + android:background="@drawable/shape_white_fill_gray200_line_8_rect"> + \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_study_information.xml b/presentation/src/main/res/layout/item_study_information.xml index 748d5e4..662dc76 100644 --- a/presentation/src/main/res/layout/item_study_information.xml +++ b/presentation/src/main/res/layout/item_study_information.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_gray200_line_8_rect" + android:background="@drawable/shape_white_fill_gray200_line_8_rect" android:paddingHorizontal="18dp" android:paddingVertical="20dp"> @@ -16,28 +16,28 @@ android:ellipsize="end" android:gravity="start" android:maxLines="2" - tools:text="뇌성마비 아동의 인지 기능 향상을 위한 양극 경두개직류 경두개직류류류류류률류류류류률률류류류류류" android:textColor="@color/black" app:layout_constraintBottom_toTopOf="@id/tv_study_exercise_content" app:layout_constraintEnd_toStartOf="@id/iv_study_information_thumbnail" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:text="뇌성마비 아동의 인지 기능 향상을 위한 양극 경두개직류 경두개직류류류류류률류류류류률률류류류류류" /> + app:layout_constraintTop_toBottomOf="@id/tv_study_information_title" + tools:text="서울아산병원 재활의학과 고은재 교수는 올해 열린 대한재활의학대회에서 수상을 할뻔 했지만 미끄러졌어요" /> + app:layout_constraintTop_toTopOf="parent" + tools:src="@drawable/img_default_content" /> \ No newline at end of file From b581d8b0f9c0c810d74e7bab8a610e9abfb37d43 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 1 Aug 2024 21:23:58 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[FIX/#38]=20=ED=94=84=EB=A1=9C=ED=95=84?= =?UTF-8?q?=EB=B7=B0=20=EA=B8=B0=EA=B8=B0=20=EC=83=81=ED=83=9C=EB=B0=94=20?= =?UTF-8?q?=EC=83=89=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 --- .../com/kkkk/presentation/main/profile/ProfileFragment.kt | 3 +++ .../java/com/kkkk/presentation/main/record/RecordFragment.kt | 2 ++ .../java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt | 1 + .../java/com/kkkk/presentation/main/study/StudyFragment.kt | 4 +++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/kkkk/presentation/main/profile/ProfileFragment.kt b/presentation/src/main/java/com/kkkk/presentation/main/profile/ProfileFragment.kt index 44c56ed..3853b44 100644 --- a/presentation/src/main/java/com/kkkk/presentation/main/profile/ProfileFragment.kt +++ b/presentation/src/main/java/com/kkkk/presentation/main/profile/ProfileFragment.kt @@ -5,7 +5,9 @@ import android.net.Uri import android.os.Bundle import android.view.View import com.kkkk.core.base.BaseFragment +import com.kkkk.core.extension.colorOf import com.kkkk.core.extension.setOnSingleClickListener +import com.kkkk.core.extension.setStatusBarColor import com.kkkk.core.extension.toast import dagger.hilt.android.AndroidEntryPoint import kr.genti.presentation.R @@ -21,6 +23,7 @@ class ProfileFragment : BaseFragment(R.layout.fragment_p initWebBtnListener() initReportBtnListener() + setStatusBarColor(R.color.gray_100) } private fun initWebBtnListener() { diff --git a/presentation/src/main/java/com/kkkk/presentation/main/record/RecordFragment.kt b/presentation/src/main/java/com/kkkk/presentation/main/record/RecordFragment.kt index bba77a8..a3c6b31 100644 --- a/presentation/src/main/java/com/kkkk/presentation/main/record/RecordFragment.kt +++ b/presentation/src/main/java/com/kkkk/presentation/main/record/RecordFragment.kt @@ -13,6 +13,7 @@ import com.github.mikephil.charting.data.LineDataSet import com.github.mikephil.charting.formatter.ValueFormatter import com.kkkk.core.base.BaseFragment import com.kkkk.core.extension.colorOf +import com.kkkk.core.extension.setStatusBarColor import com.kkkk.core.extension.stringOf import com.kkkk.core.extension.toast import com.kkkk.core.state.UiState @@ -37,6 +38,7 @@ class RecordFragment : BaseFragment(R.layout.fragment_rec binding.vm = viewModel observeReportMonth() observeChartEntry() + setStatusBarColor(R.color.white) } private fun observeReportMonth() { diff --git a/presentation/src/main/java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt b/presentation/src/main/java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt index 961fc52..1378975 100644 --- a/presentation/src/main/java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt +++ b/presentation/src/main/java/com/kkkk/presentation/main/rhythm/RhythmFragment.kt @@ -57,6 +57,7 @@ class RhythmFragment : BaseFragment(R.layout.fragment_rhy observeRhythmUrlState() observeDownloadState() observeRecordSaveState() + setStatusBarColor(R.color.white) } private fun initChangeLevelBtnListener() { diff --git a/presentation/src/main/java/com/kkkk/presentation/main/study/StudyFragment.kt b/presentation/src/main/java/com/kkkk/presentation/main/study/StudyFragment.kt index 574ac37..e6d51f7 100644 --- a/presentation/src/main/java/com/kkkk/presentation/main/study/StudyFragment.kt +++ b/presentation/src/main/java/com/kkkk/presentation/main/study/StudyFragment.kt @@ -2,9 +2,10 @@ package com.kkkk.presentation.main.study import android.os.Bundle import android.view.View -import androidx.fragment.app.viewModels import com.google.android.material.tabs.TabLayoutMediator import com.kkkk.core.base.BaseFragment +import com.kkkk.core.extension.colorOf +import com.kkkk.core.extension.setStatusBarColor import dagger.hilt.android.AndroidEntryPoint import kr.genti.presentation.R import kr.genti.presentation.databinding.FragmentStudyBinding @@ -21,6 +22,7 @@ class StudyFragment : BaseFragment(R.layout.fragment_study setTabLayout() setViewPager() + setStatusBarColor(R.color.white) } private fun setTabLayout() {