diff --git a/app/src/main/kotlin/bums/lunatic/launcher/home/NeoRssActivity.kt b/app/src/main/kotlin/bums/lunatic/launcher/home/NeoRssActivity.kt index dd249409..4be2e9e2 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/home/NeoRssActivity.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/home/NeoRssActivity.kt @@ -469,6 +469,7 @@ open class NeoRssActivity : CommonActivity() { val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) view.setPadding(insets.left, insets.top, insets.right, insets.bottom) windowInsets + WindowInsetsCompat.CONSUMED } handleBackPress() diff --git a/app/src/main/kotlin/bums/lunatic/launcher/home/SystemStatusFragment.kt b/app/src/main/kotlin/bums/lunatic/launcher/home/SystemStatusFragment.kt index d92f60de..067af0ba 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/home/SystemStatusFragment.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/home/SystemStatusFragment.kt @@ -232,7 +232,7 @@ class SystemStatusFragment : Fragment() { // 30초 카운트다운 시작 flashTimerJob = CoroutineScope(Dispatchers.Main).launch { for (i in time downTo 1) { - binding.btnQuickFlash.text = "🔦 $i" + "s" + binding.btnQuickFlash.text = "flashlight_off" delay(1000L) } // 시간 종료 후 초기화 @@ -249,7 +249,7 @@ class SystemStatusFragment : Fragment() { } private fun resetFlashButton() { - binding.btnQuickFlash.text = "🔦 조명" + binding.btnQuickFlash.text = "flashlight_on" binding.btnQuickFlash.setTextColor(Color.WHITE) } @@ -326,10 +326,10 @@ class SystemStatusFragment : Fragment() { private fun updateQuickControlUI() { val ringerText = when (audioManager.ringerMode) { - AudioManager.RINGER_MODE_NORMAL -> "🔔 소리" - AudioManager.RINGER_MODE_VIBRATE -> "📳 진동" - AudioManager.RINGER_MODE_SILENT -> "🔕 무음" - else -> "소리" + AudioManager.RINGER_MODE_NORMAL -> "notifications_active" + AudioManager.RINGER_MODE_VIBRATE -> "vibration" + AudioManager.RINGER_MODE_SILENT -> "notifications_off" + else -> "notifications_active" } binding.btnQuickRinger.text = ringerText binding.seekVolume.progress = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC) diff --git a/app/src/main/res/layout/fragment_system_status.xml b/app/src/main/res/layout/fragment_system_status.xml index 2806202e..ab87bc3c 100644 --- a/app/src/main/res/layout/fragment_system_status.xml +++ b/app/src/main/res/layout/fragment_system_status.xml @@ -42,62 +42,41 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:layout_marginBottom="12dp" - android:weightSum="5"> + > + android:layout_width="0dp" + android:text="wifi" /> + + android:layout_width="0dp" + android:text="bluetooth" /> + + android:layout_width="0dp" + android:text="notifications_active" /> + + android:layout_width="0dp" + android:text="flashlight_on" /> + + android:layout_width="0dp" + android:text="face" /> + style="@style/MaterialIconButtonStyle.Small" + android:text="light_mode"/> + style="@style/MaterialIconButtonStyle.Small" + android:text="volume_up"/> 1dp ?attr/selectableItemBackgroundBorderless +