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 8dcee76..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 @@ -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 @@ -56,6 +57,7 @@ class RhythmFragment : BaseFragment(R.layout.fragment_rhy observeRhythmUrlState() observeDownloadState() observeRecordSaveState() + setStatusBarColor(R.color.white) } private fun initChangeLevelBtnListener() { @@ -70,6 +72,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 +84,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) 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() { 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