universal7885: Format Kotlin code using ktlint

* Also, refactor CameraLightSensor

Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
This commit is contained in:
roynatech2544 2022-04-13 12:32:53 +09:00
commit 3c7ca85990
No known key found for this signature in database
GPG key ID: 50ABF73F0D19445D
35 changed files with 338 additions and 402 deletions

View file

@ -17,27 +17,35 @@ class BootReceiver : BroadcastReceiver() {
override fun onReceive(p0: Context?, p1: Intent?) {
val mSharedPreferences = p0?.let { PreferenceManager.getDefaultSharedPreferences(it) }
if (p1 != null && mSharedPreferences != null) {
if (p1.action == Intent.ACTION_BOOT_COMPLETED){
System.loadLibrary("samsungparts_jni")
if (p1.action == Intent.ACTION_BOOT_COMPLETED) {
System.loadLibrary("samsungparts_jni")
// Battery
Battery.chargeSysfs = if (mSharedPreferences
.getBoolean(BatteryFragment.PREF_CHARGE, true)) 0 else 1
Battery.setFastCharge(if (mSharedPreferences
.getBoolean(BatteryFragment.PREF_FASTCHARGE, true)) 0 else 1)
.getBoolean(BatteryFragment.PREF_CHARGE, true)
) 0 else 1
Battery.setFastCharge(
if (mSharedPreferences
.getBoolean(BatteryFragment.PREF_FASTCHARGE, true)
) 0 else 1
)
// Dolby
DolbyCore.setEnabled(mSharedPreferences
.getBoolean(DolbyFragment.PREF_DOLBY_ENABLE, false))
DolbyCore.setProfile(mSharedPreferences
.getInt(DolbyFragment.PREF_DOLBY_PROFILE, 0))
DolbyCore.setEnabled(
mSharedPreferences
.getBoolean(DolbyFragment.PREF_DOLBY_ENABLE, false)
)
DolbyCore.setProfile(
mSharedPreferences
.getInt(DolbyFragment.PREF_DOLBY_PROFILE, 0)
)
// FlashLight
Flashlight.setFlash(mSharedPreferences.getInt(FlashLightFragment.PREF_FLASHLIGHT, 5))
// Display
Display.DT2W = mSharedPreferences.getBoolean(DeviceSettings.PREF_DOUBLE_TAP, true)
Display.GloveMode = mSharedPreferences.getBoolean(DeviceSettings.PREF_GLOVE_MODE, false)
Display.GloveMode = mSharedPreferences.getBoolean(DeviceSettings.PREF_GLOVE_MODE, false)
Log.i("SamsungParts", "Applied settings")
}
}
}
}
}

View file

@ -17,8 +17,8 @@ package com.eurekateam.samsungextras
import android.content.Intent
import android.content.SharedPreferences
import android.os.Bundle
import android.os.Build
import android.os.Bundle
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceManager
@ -26,13 +26,13 @@ import androidx.preference.SwitchPreference
import com.eurekateam.samsungextras.battery.BatteryActivity
import com.eurekateam.samsungextras.flashlight.FlashLightActivity
import com.eurekateam.samsungextras.fps.FPSInfoService
import com.eurekateam.samsungextras.interfaces.Display.GloveMode
import com.eurekateam.samsungextras.interfaces.Display.DT2W
import com.eurekateam.samsungextras.interfaces.Display.GloveMode
import com.eurekateam.samsungextras.speaker.ClearSpeakerActivity
class DeviceSettings : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
private lateinit var mPrefs : SharedPreferences
private lateinit var mPrefs: SharedPreferences
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
System.loadLibrary("samsungparts_jni")
setPreferencesFromResource(R.xml.preferences_samsung_parts, rootKey)
@ -84,7 +84,7 @@ class DeviceSettings : PreferenceFragmentCompat(), Preference.OnPreferenceChange
mPrefs.edit().putBoolean(PREF_KEY_FPS_INFO, mEnabled).apply()
}
PREF_DOUBLE_TAP -> {
DT2W = value as Boolean
DT2W = value as Boolean
mPrefs.edit().putBoolean(PREF_DOUBLE_TAP, value).apply()
}
PREF_GLOVE_MODE -> {

View file

@ -173,4 +173,4 @@ class SurfaceFlingerFPS private constructor() {
mPrevPrevFlipCount = 0
mPrevPrevCheckStartTime = 0
}
}
}

View file

@ -15,11 +15,11 @@
*/
package com.eurekateam.samsungextras.battery
import android.R.id.content
import android.R.id.home
import android.os.Bundle
import android.view.MenuItem
import androidx.fragment.app.FragmentActivity
import android.R.id.content
import android.R.id.home
class BatteryActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {

View file

@ -15,6 +15,7 @@
*/
package com.eurekateam.samsungextras.battery
import android.content.SharedPreferences
import android.os.Bundle
import android.widget.Toast
import androidx.preference.ListPreference
@ -22,14 +23,13 @@ import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceManager
import androidx.preference.SwitchPreference
import android.content.SharedPreferences
import com.eurekateam.samsungextras.R
import com.eurekateam.samsungextras.interfaces.Battery
class BatteryFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
private lateinit var mFastChargePref: SwitchPreference
private lateinit var mChargePref: SwitchPreference
private lateinit var mSharedPreferences : SharedPreferences
private lateinit var mSharedPreferences: SharedPreferences
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.battery_settings)
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
@ -39,7 +39,7 @@ class BatteryFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChang
mChargePref = findPreference(PREF_CHARGE)!!
mChargePref.onPreferenceChangeListener = this
mChargePref.isChecked = mSharedPreferences.getBoolean(PREF_CHARGE, true)
val mBatteryInfo : ListPreference = findPreference(BATTERY_INFO)!!
val mBatteryInfo: ListPreference = findPreference(BATTERY_INFO)!!
val items = arrayOf<CharSequence>(
Battery.getGeneralBatteryStats(1).toString() + " mAh",
Battery.getGeneralBatteryStats(2).toString() + " %",
@ -80,4 +80,4 @@ class BatteryFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChang
const val PREF_CHARGE = "charge_pref"
private const val BATTERY_INFO = "battery_info"
}
}
}

View file

@ -16,10 +16,9 @@
package com.eurekateam.samsungextras.dolby
import android.os.Bundle
import androidx.fragment.app.FragmentActivity
import android.R.id.content
import android.os.Bundle
import androidx.fragment.app.FragmentActivity
class DolbyActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {

View file

@ -18,9 +18,7 @@ package com.eurekateam.samsungextras.dolby
import android.content.Context
import android.media.audiofx.AudioEffect
import com.eurekateam.samsungextras.dolby.DolbyFragment.Companion.PREF_DOLBY_MODES
import java.util.UUID
object DolbyCore {
@ -53,9 +51,11 @@ object DolbyCore {
val profile = getProfile()
val resourceName = PREF_DOLBY_MODES.filter { it.value == profile }.keys.first()
return context.resources.getString(context.resources.getIdentifier(
return context.resources.getString(
context.resources.getIdentifier(
resourceName, "string", context.packageName
))
)
)
}
fun setProfile(profile: Int) {

View file

@ -16,24 +16,20 @@
package com.eurekateam.samsungextras.dolby
import android.content.SharedPreferences
import android.os.Bundle
import android.os.PerformanceHintManager
import android.widget.Switch
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.eurekateam.samsungextras.R
import android.content.SharedPreferences
class DolbyFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener {
private lateinit var switchBar: MainSwitchPreference
private lateinit var mSharedPreferences : SharedPreferences
private lateinit var mSharedPreferences: SharedPreferences
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.dolby_settings)
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
@ -69,15 +65,15 @@ class DolbyFragment : PreferenceFragmentCompat(), OnMainSwitchChangeListener {
const val PREF_DOLBY_ENABLE = "dolby_enable"
const val PREF_DOLBY_PROFILE = "dolby_profile"
val PREF_DOLBY_MODES = mapOf(
"dolby_profile_auto" to DolbyCore.PROFILE_AUTO,
"dolby_profile_movie" to DolbyCore.PROFILE_MOVIE,
"dolby_profile_music" to DolbyCore.PROFILE_MUSIC,
"dolby_profile_voice" to DolbyCore.PROFILE_VOICE,
"dolby_profile_game" to DolbyCore.PROFILE_GAME,
"dolby_profile_off" to DolbyCore.PROFILE_OFF,
"dolby_profile_game_1" to DolbyCore.PROFILE_GAME_1,
"dolby_profile_game_2" to DolbyCore.PROFILE_GAME_2,
"dolby_profile_spacial_audio" to DolbyCore.PROFILE_SPACIAL_AUDIO,
"dolby_profile_auto" to DolbyCore.PROFILE_AUTO,
"dolby_profile_movie" to DolbyCore.PROFILE_MOVIE,
"dolby_profile_music" to DolbyCore.PROFILE_MUSIC,
"dolby_profile_voice" to DolbyCore.PROFILE_VOICE,
"dolby_profile_game" to DolbyCore.PROFILE_GAME,
"dolby_profile_off" to DolbyCore.PROFILE_OFF,
"dolby_profile_game_1" to DolbyCore.PROFILE_GAME_1,
"dolby_profile_game_2" to DolbyCore.PROFILE_GAME_2,
"dolby_profile_spacial_audio" to DolbyCore.PROFILE_SPACIAL_AUDIO,
)
}
}

View file

@ -19,7 +19,6 @@ package com.eurekateam.samsungextras.dolby
import android.database.Cursor
import android.database.MatrixCursor
import android.provider.SearchIndexableResource
import android.provider.SearchIndexablesProvider
import android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME
import android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID
import android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION
@ -30,6 +29,7 @@ import android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID
import android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS
import android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS
import android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS
import android.provider.SearchIndexablesProvider
import com.eurekateam.samsungextras.R
class DolbySearchIndexablesProvider : SearchIndexablesProvider() {

View file

@ -18,9 +18,7 @@ package com.eurekateam.samsungextras.dolby
import android.service.quicksettings.Tile
import android.service.quicksettings.TileService
import androidx.preference.PreferenceManager
import com.eurekateam.samsungextras.dolby.DolbyFragment.Companion.PREF_DOLBY_ENABLE
class DolbyTile : TileService() {
@ -41,8 +39,8 @@ class DolbyTile : TileService() {
isEnabled = !isEnabled
DolbyCore.setEnabled(isEnabled)
PreferenceManager.getDefaultSharedPreferences(this)
.edit()
.putBoolean(PREF_DOLBY_ENABLE, isEnabled)
.apply()
.edit()
.putBoolean(PREF_DOLBY_ENABLE, isEnabled)
.apply()
}
}

View file

@ -16,10 +16,10 @@
package com.eurekateam.samsungextras.flashlight
import android.R.id.content
import android.R.id.home
import android.os.Bundle
import android.view.MenuItem
import androidx.fragment.app.FragmentActivity
import android.R.id.home
class FlashLightActivity : FragmentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {

View file

@ -15,20 +15,19 @@
*/
package com.eurekateam.samsungextras.flashlight
import android.content.SharedPreferences
import android.os.Build
import android.os.Bundle
import android.os.PerformanceHintManager
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceManager
import android.content.SharedPreferences
import com.eurekateam.samsungextras.R
import com.eurekateam.samsungextras.interfaces.Flashlight
import com.eurekateam.samsungextras.preferences.CustomSeekBarPreference
class FlashLightFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
private lateinit var mFlashLightPref: CustomSeekBarPreference
private lateinit var mSharedPreferences : SharedPreferences
private lateinit var mSharedPreferences: SharedPreferences
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.flashlight_settings)
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())

View file

@ -78,8 +78,11 @@ open class FPSInfoService : Service() {
val y = mPaddingTop - mAscent.toInt()
val s = fPSInfoString
canvas.drawText(
s, (LEFT - mPaddingLeft - mMaxWidth).toFloat(), (
y - 1).toFloat(), mOnlinePaint
s, (LEFT - mPaddingLeft - mMaxWidth).toFloat(),
(
y - 1
).toFloat(),
mOnlinePaint
)
}
@ -154,7 +157,7 @@ open class FPSInfoService : Service() {
WindowManager.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY,
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
PixelFormat.TRANSLUCENT
)
params.y = 50
@ -239,11 +242,11 @@ open class FPSInfoService : Service() {
mCurFPSThread = null
}
fun getRunning() : Boolean{
fun getRunning(): Boolean {
return mRunning
}
companion object {
private var surfaceFlingerFPS: SurfaceFlingerFPS? = null
private var mRunning : Boolean = false
private var mRunning: Boolean = false
}
}
}

View file

@ -21,7 +21,7 @@ import android.service.quicksettings.TileService
// TODO: Add FPS drawables
class FPSTileService : TileService() {
private lateinit var fpsinfo : Intent
private lateinit var fpsinfo: Intent
private var isShowing = false
override fun onStartListening() {
super.onStartListening()

View file

@ -25,4 +25,4 @@ object Battery {
external get
external fun getGeneralBatteryStats(id: Int): Int
}
}

View file

@ -19,4 +19,4 @@ package com.eurekateam.samsungextras.interfaces
object Flashlight {
external fun setFlash(value: Int)
external fun getFlash(isA10: Int): Int
}
}

View file

@ -34,13 +34,18 @@ import androidx.preference.PreferenceViewHolder
import androidx.preference.R
open class CustomSeekBarPreference @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = TypedArrayUtils.getAttr(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = TypedArrayUtils.getAttr(
context,
R.attr.preferenceStyle,
android.R.attr.preferenceStyle
), defStyleRes: Int = 0
) : Preference(context, attrs, defStyleAttr, defStyleRes), OnSeekBarChangeListener,
View.OnClickListener, OnLongClickListener {
),
defStyleRes: Int = 0
) : Preference(context, attrs, defStyleAttr, defStyleRes),
OnSeekBarChangeListener,
View.OnClickListener,
OnLongClickListener {
private val TAG: String = javaClass.name
private var mInterval = 1
private var mShowSign = false
@ -114,8 +119,10 @@ open class CustomSeekBarPreference @JvmOverloads constructor(
mValueTextView!!.text = context.getString(
com.eurekateam.samsungextras.R.string.custom_seekbar_value,
if (!mTrackingTouch || mContinuousUpdates) getTextValue(mValue) +
(if (mDefaultValueExists && mValue == mDefaultValue) " (" +
context.getString(com.eurekateam.samsungextras.R.string.custom_seekbar_default_value) + ")" else "") else getTextValue(
(
if (mDefaultValueExists && mValue == mDefaultValue) " (" +
context.getString(com.eurekateam.samsungextras.R.string.custom_seekbar_default_value) + ")" else ""
) else getTextValue(
mTrackingValue
)
)
@ -215,7 +222,8 @@ open class CustomSeekBarPreference @JvmOverloads constructor(
if (mMaxValue - mMinValue > mInterval * 2 && mMaxValue + mMinValue < mValue * 2) Math.floorDiv(
mMaxValue + mMinValue,
2
) else mMinValue, true
) else mMinValue,
true
)
}
com.eurekateam.samsungextras.R.id.plus -> {
@ -223,7 +231,8 @@ open class CustomSeekBarPreference @JvmOverloads constructor(
if (mMaxValue - mMinValue > mInterval * 2 && mMaxValue + mMinValue > mValue * 2) -1 * Math.floorDiv(
-1 * (mMaxValue + mMinValue),
2
) else mMaxValue, true
) else mMaxValue,
true
)
}
}

View file

@ -102,4 +102,4 @@ class ClearSpeakerFragment : PreferenceFragmentCompat(), Preference.OnPreference
private val TAG = ClearSpeakerFragment::class.java.simpleName
private const val PREF_CLEAR_SPEAKER = "clear_speaker_pref"
}
}
}