From 201c4fa92a8ed90619089a7417d925902167e836 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Thu, 3 Nov 2022 17:38:17 +0900
Subject: [PATCH] universal7885: FMRadio: Restore output selection too

---
 .../fmradio/fragments/MainFragment.kt         | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt
index 5a21922..470ea8d 100644
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt
@@ -119,6 +119,7 @@ class MainFragment :
         mSeekBar.min = 1
         mSeekBar.max = 15
         mSeekBar.progress = mVolume
+        updateOutputStatus(false)
         if (!mFreqSearchDone) {
            val mRestoreFreq = mSharedPref.getInt("freq", mFMInterface.mDevCtl.getValue(GetType.GET_TYPE_FM_LOWER_LIMIT))
            mFMInterface.mDefaultCtl.setValue(SetType.SET_TYPE_FM_FREQ, mRestoreFreq)
@@ -206,27 +207,33 @@ class MainFragment :
         }
     }
 
+    private fun updateOutputStatus(mInverted : Boolean) {
+        var mCurrent = mSharedPref.getBoolean("speaker", false)
+        if (mInverted) mCurrent = !mCurrent
+        if (mCurrent) {
+            mOutputSwitch.setImageIcon(
+                 Icon.createWithResource(
+                       requireContext(),
+                       R.drawable.ic_volume_up
+                 )
+            )
+            mFMInterface.mDevCtl.setValue(SetType.SET_TYPE_FM_SPEAKER_ROUTE, 1)
+        } else {
+            mOutputSwitch.setImageIcon(
+                Icon.createWithResource(
+                     requireContext(),
+                     R.drawable.ic_headphones
+                )
+            )
+            mFMInterface.mDevCtl.setValue(SetType.SET_TYPE_FM_SPEAKER_ROUTE, 0)
+        }
+    }
+
     override fun onClick(v: View) {
         when (v.id) {
             mOutputSwitch.id -> {
                 val mCurrent = mSharedPref.getBoolean("speaker", false)
-                if (!mCurrent) {
-                    mOutputSwitch.setImageIcon(
-                        Icon.createWithResource(
-                            requireContext(),
-                            R.drawable.ic_volume_up
-                        )
-                    )
-                    mFMInterface.mDevCtl.setValue(SetType.SET_TYPE_FM_SPEAKER_ROUTE, 1)
-                } else {
-                    mOutputSwitch.setImageIcon(
-                        Icon.createWithResource(
-                            requireContext(),
-                            R.drawable.ic_headphones
-                        )
-                    )
-                    mFMInterface.mDevCtl.setValue(SetType.SET_TYPE_FM_SPEAKER_ROUTE, 0)
-                }
+                updateOutputStatus(true)
                 mSharedPref.edit().putBoolean("speaker", !mCurrent).apply()
             }
             mVolumeUp.id -> {