From b56a0d58bf0836b7c7e9fa93efcab215a0e63bf8 Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 9 Aug 2024 15:22:17 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=8C=EB=9E=8C=20-=20=EB=B3=BC=EB=A5=A8=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/codeStyles/Project.xml | 123 +++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/other.xml | 252 ++++++++++++++++++ .../sodalive/mypage/alarm/AddAlarmActivity.kt | 9 + .../sodalive/mypage/alarm/AlarmActivity.kt | 2 +- .../sodalive/mypage/alarm/db/Alarm.kt | 1 + .../sodalive/mypage/alarm/db/AlarmDatabase.kt | 16 +- .../main/res/layout/activity_add_alarm.xml | 15 ++ 8 files changed, 420 insertions(+), 3 deletions(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/other.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 0000000..4604c44 --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,252 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AddAlarmActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AddAlarmActivity.kt index f88fbdd..bb572d9 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AddAlarmActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AddAlarmActivity.kt @@ -1,7 +1,9 @@ package kr.co.vividnext.sodalive.mypage.alarm import android.app.Activity +import android.content.Context import android.content.Intent +import android.media.AudioManager import android.os.Bundle import android.widget.CheckBox import android.widget.Toast @@ -65,6 +67,11 @@ class AddAlarmActivity : BaseActivity( binding.chkSat ) + val audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager + val maxVol = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) + binding.sbVolume.max = maxVol + binding.sbVolume.progress = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) + if (alarmId != -1) { alarmViewModel.getAlarmById(alarmId).observe(this) { alarm -> alarm?.let { @@ -77,6 +84,7 @@ class AddAlarmActivity : BaseActivity( checkBox.isChecked = it.days.contains(checkBox.text.toString()) } binding.tvContentTitle.text = it.contentTitle + binding.sbVolume.progress = it.volume selectedContentId = it.contentId selectedContentTitle = it.contentTitle @@ -117,6 +125,7 @@ class AddAlarmActivity : BaseActivity( contentId = selectedContentId, contentTitle = selectedContentTitle, contentCreatorNickname = selectedContentCreatorNickname, + volume = binding.sbVolume.progress, days = selectedDays.toList(), ) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmActivity.kt index 7e65973..f88ca46 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmActivity.kt @@ -90,6 +90,7 @@ class AlarmActivity : BaseActivity( .format(alarm.time) binding.tvDate.text = SimpleDateFormat("MM월 dd일", Locale.getDefault()) .format(alarm.time) + setVolume(alarm.volume) } private fun getContent(contentId: Long) { @@ -124,7 +125,6 @@ class AlarmActivity : BaseActivity( } private fun initMediaPlayer(alarmUrl: String) { - setVolume(audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)) mediaPlayer = MediaPlayer() mediaPlayer.isLooping = true mediaPlayer.setDataSource(alarmUrl) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/db/Alarm.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/db/Alarm.kt index 847c87a..e12fc2d 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/db/Alarm.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/db/Alarm.kt @@ -12,6 +12,7 @@ data class Alarm( val contentId: Long, val contentTitle: String, val contentCreatorNickname: String, + var volume: Int, var isEnabled: Boolean = true ) { fun getDaysText(): String { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/db/AlarmDatabase.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/db/AlarmDatabase.kt index c885c5b..4b1edef 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/db/AlarmDatabase.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/db/AlarmDatabase.kt @@ -5,9 +5,11 @@ import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase import kr.co.vividnext.sodalive.common.Converter -@Database(entities = [Alarm::class], version = 1) +@Database(entities = [Alarm::class], version = 2) @TypeConverters(Converter::class) abstract class AlarmDatabase : RoomDatabase() { abstract fun alarmDao(): AlarmDao @@ -22,10 +24,20 @@ abstract class AlarmDatabase : RoomDatabase() { context.applicationContext, AlarmDatabase::class.java, "alarm_database" - ).build() + ) + .addMigrations(MIGRATION_1_2) + .build() INSTANCE = instance instance } } + + private val MIGRATION_1_2 = object : Migration(1, 2) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL( + "ALTER TABLE 'alarms' ADD COLUMN 'volume' integer not null default 15" + ) + } + } } } diff --git a/app/src/main/res/layout/activity_add_alarm.xml b/app/src/main/res/layout/activity_add_alarm.xml index 1d934eb..855c46d 100644 --- a/app/src/main/res/layout/activity_add_alarm.xml +++ b/app/src/main/res/layout/activity_add_alarm.xml @@ -150,6 +150,21 @@ android:src="@drawable/ic_forward" /> + + + +