diff --git a/app/FlashControl/res/xml/flash_settings.xml b/app/FlashControl/res/xml/flash_settings.xml index a72d03a..7025dae 100644 --- a/app/FlashControl/res/xml/flash_settings.xml +++ b/app/FlashControl/res/xml/flash_settings.xml @@ -21,23 +21,23 @@ - - - - - diff --git a/app/FlashControl/src/com/royna/flashcontrol/FlashActivity.kt b/app/FlashControl/src/com/royna/flashcontrol/FlashActivity.kt index f9bde43..52feddc 100644 --- a/app/FlashControl/src/com/royna/flashcontrol/FlashActivity.kt +++ b/app/FlashControl/src/com/royna/flashcontrol/FlashActivity.kt @@ -19,7 +19,6 @@ package com.royna.flashcontrol import android.os.Bundle import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity -import com.android.settingslib.widget.R class FlashActivity : CollapsingToolbarBaseActivity() { private var mInstance : FlashFragment? = null @@ -27,7 +26,7 @@ class FlashActivity : CollapsingToolbarBaseActivity() { super.onCreate(savedInstanceState) if (mInstance == null) mInstance = FlashFragment() supportFragmentManager.beginTransaction().replace( - R.id.content_frame, + com.android.settingslib.collapsingtoolbar.R.id.content_frame, mInstance!! ).commit() } diff --git a/app/FlashControl/src/com/royna/flashcontrol/FlashFragment.kt b/app/FlashControl/src/com/royna/flashcontrol/FlashFragment.kt index d8e418b..dd888fd 100644 --- a/app/FlashControl/src/com/royna/flashcontrol/FlashFragment.kt +++ b/app/FlashControl/src/com/royna/flashcontrol/FlashFragment.kt @@ -27,15 +27,15 @@ import android.os.ServiceManager import android.provider.Settings import android.util.Log import android.widget.Toast -import android.widget.Switch +import android.widget.CompoundButton +import android.widget.CompoundButton.OnCheckedChangeListener import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceManager import com.android.settingslib.widget.MainSwitchPreference -import com.android.settingslib.widget.OnMainSwitchChangeListener -import com.android.settingslib.widget.RadioButtonPreference +import com.android.settingslib.widget.SelectorWithWidgetPreference import java.lang.IllegalStateException @@ -43,7 +43,7 @@ import com.royna.flashcontrol.R import vendor.samsung_ext.hardware.camera.flashlight.IFlashlight -class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener { +class FlashFragment : PreferenceFragmentCompat(), OnCheckedChangeListener { private lateinit var switchBar: MainSwitchPreference private val mService : IFlashlight? = IFlashlight.Stub.asInterface(ServiceManager.waitForDeclaredService("vendor.samsung_ext.hardware.camera.flashlight.IFlashlight/default")) @@ -77,7 +77,7 @@ class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener { val mSavedIntesity = mSharedPreferences.getInt(PREF_FLASH_INTESITY, 1) for ((key, value) in PREF_FLASH_MODES) { - val preference = findPreference(key)!! + val preference = findPreference(key)!! preference.isChecked = value == mSavedIntesity preference.isEnabled = switchBar.isChecked preference.setOnPreferenceClickListener { @@ -136,17 +136,17 @@ class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener { } } - override fun onSwitchChanged(switchView: Switch, isChecked: Boolean) { + override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) { if (mService == null) { Log.e(TAG, "mService is null...") - switchView.setChecked(false) + buttonView.setChecked(false) return } try { mService.enableFlash(isChecked) } catch (e : IllegalStateException) { Log.w(TAG, "enableFlash() failed") - switchView.setChecked(false) + buttonView.setChecked(false) return } val kBright = mService.getCurrentBrightness() @@ -158,7 +158,7 @@ class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener { private fun changeRadioButtons(enable: Boolean) { for ((key, _) in PREF_FLASH_MODES) { - val mPreference = findPreference(key)!! + val mPreference = findPreference(key)!! mPreference.isEnabled = enable } } @@ -174,7 +174,7 @@ class FlashFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener { } mService.setBrightness(intesity) for ((key, value) in PREF_FLASH_MODES) { - val preference = findPreference(key)!! + val preference = findPreference(key)!! preference.isChecked = value == intesity } mSharedPreferences.edit().putInt(PREF_FLASH_INTESITY, intesity).apply() diff --git a/app/SmartCharge/src/com/royna/smartcharge/SmartChargeActivity.kt b/app/SmartCharge/src/com/royna/smartcharge/SmartChargeActivity.kt index bb38a81..e8b8af6 100644 --- a/app/SmartCharge/src/com/royna/smartcharge/SmartChargeActivity.kt +++ b/app/SmartCharge/src/com/royna/smartcharge/SmartChargeActivity.kt @@ -19,7 +19,6 @@ package com.royna.smartcharge import android.os.Bundle import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity -import com.android.settingslib.widget.R class SmartChargeActivity : CollapsingToolbarBaseActivity() { private var mInstance : SmartChargeFragment? = null @@ -27,8 +26,8 @@ class SmartChargeActivity : CollapsingToolbarBaseActivity() { super.onCreate(savedInstanceState) if (mInstance == null) mInstance = SmartChargeFragment() supportFragmentManager.beginTransaction().replace( - R.id.content_frame, + com.android.settingslib.collapsingtoolbar.R.id.content_frame, mInstance!! ).commit() } -} \ No newline at end of file +} diff --git a/app/SmartCharge/src/com/royna/smartcharge/SmartChargeFragment.kt b/app/SmartCharge/src/com/royna/smartcharge/SmartChargeFragment.kt index 8a654e5..3012ed2 100644 --- a/app/SmartCharge/src/com/royna/smartcharge/SmartChargeFragment.kt +++ b/app/SmartCharge/src/com/royna/smartcharge/SmartChargeFragment.kt @@ -23,7 +23,8 @@ import android.os.Handler import android.os.Looper import android.os.ServiceManager import android.util.Log -import android.widget.Switch +import android.widget.CompoundButton +import android.widget.CompoundButton.OnCheckedChangeListener import android.widget.Toast import androidx.preference.Preference @@ -33,7 +34,6 @@ import androidx.preference.SeekBarPreference import androidx.preference.SwitchPreference import com.android.settingslib.widget.MainSwitchPreference -import com.android.settingslib.widget.OnMainSwitchChangeListener import com.royna.smartcharge.R @@ -42,7 +42,7 @@ import vendor.samsung_ext.framework.battery.ISmartCharge import java.lang.IllegalArgumentException import java.lang.IllegalStateException -class SmartChargeFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener { +class SmartChargeFragment : PreferenceFragmentCompat(), OnCheckedChangeListener { private lateinit var mMainSwitch : MainSwitchPreference private lateinit var mStopBar : SeekBarPreference private lateinit var mRestartBar : SeekBarPreference @@ -138,7 +138,7 @@ class SmartChargeFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListen } } - override fun onSwitchChanged(switchView: Switch, isChecked: Boolean) { + override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) { runCatching { if (isChecked) { when (mConfig) { Config.STOP_RESTART -> { @@ -162,7 +162,7 @@ class SmartChargeFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListen is IllegalStateException -> { // Config error... mMainHandler.post { - switchView.isChecked = false + mMainSwitch.isChecked = false Toast.makeText(requireContext(), R.string.smart_charge_invalid_config, Toast.LENGTH_SHORT).show() }