From 3a3e686e4c9f6f2c95b236e74a66896eba961c21 Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Wed, 21 Jul 2021 03:01:59 +0800
Subject: [PATCH] Add detailed settings screen

Update dependencies.
---
 app/build.gradle                              |  11 +-
 app/src/main/AndroidManifest.xml              |   1 +
 .../brokenithm/BrokenithmApplication.kt       | 138 ++++++------
 .../brokenithm/activity/MainActivity.kt       | 209 ++++++++++--------
 .../brokenithm/activity/SettingsActivity.kt   |  14 ++
 .../brokenithm/fragment/SettingsFragment.kt   |  19 ++
 app/src/main/res/layout/activity_main.xml     |  38 ++--
 app/src/main/res/layout/activity_settings.xml |  41 ++++
 app/src/main/res/values/strings.xml           |  10 +
 app/src/main/res/xml/preferences.xml          |  55 +++++
 build.gradle                                  |   4 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 12 files changed, 351 insertions(+), 191 deletions(-)
 create mode 100644 app/src/main/java/com/github/brokenithm/activity/SettingsActivity.kt
 create mode 100644 app/src/main/java/com/github/brokenithm/fragment/SettingsFragment.kt
 create mode 100644 app/src/main/res/layout/activity_settings.xml
 create mode 100644 app/src/main/res/xml/preferences.xml

diff --git a/app/build.gradle b/app/build.gradle
index a17f6d6..fb5d676 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,14 +35,15 @@ android {
 dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 63baf77..b7dc07c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,6 +27,7 @@
                 <action android:name="android.nfc.action.TECH_DISCOVERED" />
             </intent-filter>
         </activity>
+        <activity android:name=".activity.SettingsActivity" android:configChanges="uiMode|orientation" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/github/brokenithm/BrokenithmApplication.kt b/app/src/main/java/com/github/brokenithm/BrokenithmApplication.kt
index a5c9925..111c3b5 100644
--- a/app/src/main/java/com/github/brokenithm/BrokenithmApplication.kt
+++ b/app/src/main/java/com/github/brokenithm/BrokenithmApplication.kt
@@ -1,77 +1,89 @@
 package com.github.brokenithm
 
 import android.app.Application
+import android.content.Context
+import android.content.SharedPreferences
 
 class BrokenithmApplication : Application() {
-    var lastServer: String
-        get() {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            return config.getString("server", "") ?: ""
-        }
-        set(value) {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            config.edit().putString("server", value).apply()
-        }
 
-    var enableAir: Boolean
-        get() {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            return config.getBoolean("enable_air", true)
-        }
-        set(value) {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            config.edit().putBoolean("enable_air", value).apply()
-        }
+    abstract class BasePreference<T>(context: Context, fileName: String) {
+        protected val config: SharedPreferences = context.getSharedPreferences(fileName, MODE_PRIVATE)
+        abstract fun value(): T
+        abstract fun update(value: T)
+    }
 
-    var airSource: Int
-        get() {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            return config.getInt("air_source", 3)
-        }
-        set(value) {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            config.edit().putInt("air_source", value).apply()
-        }
+    abstract class Settings<T>(context: Context) : BasePreference<T>(context, settings_preference)
 
-    var simpleAir: Boolean
-        get() {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            return config.getBoolean("simple_air", false)
-        }
-        set(value) {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            config.edit().putBoolean("simple_air", value).apply()
-        }
+    open class StringPreference(
+        context: Context,
+        private val key: String,
+        private val defValue: String
+    ) : Settings<String>(context) {
+        override fun value() = config.getString(key, defValue) ?: defValue
+        override fun update(value: String) = config.edit().putString(key, value).apply()
+    }
 
-    var showDelay: Boolean
-        get() {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            return config.getBoolean("show_delay", false)
-        }
-        set(value) {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            config.edit().putBoolean("show_delay", value).apply()
-        }
+    open class BooleanPreference(
+        context: Context,
+        private val key: String,
+        private val defValue: Boolean
+    ) : Settings<Boolean>(context) {
+        override fun value() = config.getBoolean(key, defValue)
+        override fun update(value: Boolean) = config.edit().putBoolean(key, value).apply()
+    }
 
-    var enableVibrate: Boolean
-        get() {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            return config.getBoolean("enable_vibrate", true)
-        }
-        set(value) {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            config.edit().putBoolean("enable_vibrate", value).apply()
-        }
+    open class IntegerPreference(
+        context: Context,
+        private val key: String,
+        private val defValue: Int
+    ) : Settings<Int>(context) {
+        override fun value() = config.getInt(key, defValue)
+        override fun update(value: Int) = config.edit().putInt(key, value).apply()
+    }
 
-    var tcpMode: Boolean
-        get() {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            return config.getBoolean("tcp_mode", false)
-        }
-        set(value) {
-            val config = getSharedPreferences(settings_preference, MODE_PRIVATE)
-            config.edit().putBoolean("tcp_mode", value).apply()
-        }
+    open class FloatPreference(
+        context: Context,
+        private val key: String,
+        private val defValue: Float
+    ) : Settings<Float>(context) {
+        override fun value() = config.getString(key, defValue.toString())?.toFloat() ?: defValue
+        override fun update(value: Float) = config.edit().putString(key, value.toString()).apply()
+    }
+
+    lateinit var lastServer : StringPreference
+    lateinit var enableAir : BooleanPreference
+    lateinit var airSource : IntegerPreference
+    lateinit var simpleAir : BooleanPreference
+    lateinit var showDelay : BooleanPreference
+    lateinit var enableVibrate : BooleanPreference
+    lateinit var tcpMode : BooleanPreference
+    lateinit var enableNFC : BooleanPreference
+    lateinit var wideTouchRange : BooleanPreference
+    lateinit var enableTouchSize : BooleanPreference
+    lateinit var fatTouchThreshold : FloatPreference
+    lateinit var extraFatTouchThreshold : FloatPreference
+    lateinit var gyroAirLowestBound : FloatPreference
+    lateinit var gyroAirHighestBound : FloatPreference
+    lateinit var accelAirThreshold : FloatPreference
+
+    override fun onCreate() {
+        super.onCreate()
+        lastServer = StringPreference(this, "server", "")
+        enableAir = BooleanPreference(this, "enable_air", true)
+        airSource = IntegerPreference(this, "air_source", 3)
+        simpleAir = BooleanPreference(this, "simple_air", false)
+        showDelay = BooleanPreference(this, "show_delay", false)
+        enableVibrate = BooleanPreference(this, "enable_vibrate", true)
+        tcpMode = BooleanPreference(this, "tcp_mode", false)
+        enableNFC = BooleanPreference(this, "enable_nfc", true)
+        wideTouchRange = BooleanPreference(this, "wide_touch_range", false)
+        enableTouchSize = BooleanPreference(this, "enable_touch_size", false)
+        fatTouchThreshold = FloatPreference(this, "fat_touch_threshold", 0.027f)
+        extraFatTouchThreshold = FloatPreference(this, "extra_fat_touch_threshold", 0.035f)
+        gyroAirLowestBound = FloatPreference(this, "gyro_air_lowest", 0.8f)
+        gyroAirHighestBound = FloatPreference(this, "gyro_air_highest", 1.35f)
+        accelAirThreshold = FloatPreference(this, "accel_air_threshold", 2f)
+    }
 
     companion object {
         private const val settings_preference = "settings"
diff --git a/app/src/main/java/com/github/brokenithm/activity/MainActivity.kt b/app/src/main/java/com/github/brokenithm/activity/MainActivity.kt
index 45d2c61..8d47f0e 100644
--- a/app/src/main/java/com/github/brokenithm/activity/MainActivity.kt
+++ b/app/src/main/java/com/github/brokenithm/activity/MainActivity.kt
@@ -48,8 +48,9 @@ class MainActivity : AppCompatActivity() {
     private val numOfGaps = 16
     private val buttonWidthToGap = 7.428571f
     private val numOfAirBlock = 6
-    private val fatTouchSizeThreshold = 0.027f
-    private val extraFatTouchSizeThreshold = 0.035f
+    private var mEnableTouchSize = false
+    private var mFatTouchSizeThreshold = 0.027f
+    private var mExtraFatTouchSizeThreshold = 0.035f
     private var mCurrentDelay = 0f
 
     // Buttons
@@ -68,6 +69,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var mButtonRenderer: View
 
     // vibrator
+    private var mEnableVibrate = true
     private lateinit var vibrator: Vibrator
     private lateinit var vibratorTask: AsyncTaskUtil.AsyncTask<Unit, Unit, Unit>
     private lateinit var vibrateMethod: (Long) -> Unit
@@ -80,7 +82,6 @@ class MainActivity : AppCompatActivity() {
     private var mSimpleAir = false
     private var mDebugInfo = false
     private var mShowDelay = false
-    private var mEnableVibrate = true
     private lateinit var mDelayText: TextView
     private var windowWidth = 0f
     private var windowHeight = 0f
@@ -89,9 +90,10 @@ class MainActivity : AppCompatActivity() {
     // sensor
     private var mSensorManager: SensorManager? = null
     private var mSensorCallback: ((Float) -> Unit)? = null
+    private var mGyroLowestBound = 0.8f
+    private var mGyroHighestBound = 1.35f
+    private var mAccelThreshold = 2f
     private val listener = object : SensorEventListener {
-
-        val threshold = 2f
         var current = 0
         var lastAcceleration = 0f
 
@@ -101,6 +103,7 @@ class MainActivity : AppCompatActivity() {
 
         override fun onSensorChanged(event: SensorEvent?) {
             event ?: return
+            val threshold = mAccelThreshold
             when (event.sensor.type) {
                 Sensor.TYPE_LINEAR_ACCELERATION -> {
                     if (mAirSource != 2)
@@ -165,7 +168,7 @@ class MainActivity : AppCompatActivity() {
     }
     private var adapter: NfcAdapter? = null
     private val mAimeKey = byteArrayOf(0x57, 0x43, 0x43, 0x46, 0x76, 0x32)
-    private var enableNFC = true
+    private var mEnableNFC = true
     private var hasCard = false
     private var cardType = CardType.CARD_AIME
     private val cardId = ByteArray(10)
@@ -183,7 +186,7 @@ class MainActivity : AppCompatActivity() {
                     cardId[9] = 0
                     cardType = CardType.CARD_FELICA
                     hasCard = true
-                    Log.d(TAG, "found felica card: ${cardId.toHexString().removeRange(16..19)}")
+                    Log.d(TAG, "Found FeliCa card: ${cardId.toHexString().removeRange(16..19)}")
                     while (felica.isConnected) Thread.sleep(50)
                     hasCard = false
                     felica.close()
@@ -203,11 +206,11 @@ class MainActivity : AppCompatActivity() {
                     block.copyInto(cardId, 0, 6, 16)
                     cardType = CardType.CARD_AIME
                     hasCard = true
-                    Log.d(TAG, "found aime card: ${cardId.toHexString()}")
+                    Log.d(TAG, "Found Aime card: ${cardId.toHexString()}")
                     while (mifare.isConnected) Thread.sleep(50)
                     hasCard = false
                 } else {
-                    Log.d(TAG, "nfc auth failed")
+                    Log.d(TAG, "NFC auth failed")
                 }
                 mifare.close()
             } catch (e: Exception) {
@@ -236,18 +239,13 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        val settings = findViewById<Button>(R.id.button_settings)
+        settings.setOnClickListener { startActivity(Intent(this, SettingsActivity::class.java)) }
+
         mDelayText = findViewById(R.id.text_delay)
 
-        findViewById<CheckBox>(R.id.check_vibrate).apply {
-            setOnCheckedChangeListener { _, isChecked ->
-                mEnableVibrate = isChecked
-                app.enableVibrate = isChecked
-            }
-            isChecked = app.enableVibrate
-        }
-
         val editServer = findViewById<EditText>(R.id.edit_server).apply {
-            setText(app.lastServer)
+            setText(app.lastServer.value())
         }
         findViewById<Button>(R.id.button_start).setOnClickListener {
             val server = editServer.text.toString()
@@ -259,8 +257,9 @@ class MainActivity : AppCompatActivity() {
                 mExitFlag = false
                 (it as Button).setText(R.string.stop)
                 editServer.isEnabled = false
+                settings.isEnabled = false
 
-                app.lastServer = server
+                app.lastServer.update(server)
                 val address = parseAddress(server)
                 if (!mTCPMode)
                     sendConnect(address)
@@ -273,6 +272,7 @@ class MainActivity : AppCompatActivity() {
                 mExitFlag = true
                 (it as Button).setText(R.string.start)
                 editServer.isEnabled = true
+                settings.isEnabled = true
                 senderTask.cancel()
                 receiverTask.cancel()
                 pingPongTask.cancel()
@@ -289,16 +289,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         val checkSimpleAir = findViewById<CheckBox>(R.id.check_simple_air)
-        findViewById<CheckBox>(R.id.check_enable_air).apply {
-            setOnCheckedChangeListener { _, isChecked ->
-                mEnableAir = isChecked
-                checkSimpleAir.isEnabled = isChecked
-                app.enableAir = isChecked
-            }
-            isChecked = app.enableAir
-            checkSimpleAir.isEnabled = isChecked
-        }
-        mAirSource = app.airSource
+        mAirSource = app.airSource.value()
         findViewById<TextView>(R.id.text_switch_air).apply {
             setOnClickListener {
                 mAirSource = when (mAirSource) {
@@ -325,7 +316,7 @@ class MainActivity : AppCompatActivity() {
                         0
                     }
                 }
-                app.airSource = mAirSource
+                app.airSource.update(mAirSource)
             }
             text = getString(when (mAirSource) {
                 0 -> { checkSimpleAir.isEnabled = false; R.string.disable_air }
@@ -337,12 +328,12 @@ class MainActivity : AppCompatActivity() {
         checkSimpleAir.apply {
             setOnCheckedChangeListener { _, isChecked ->
                 mSimpleAir = isChecked
-                app.simpleAir = isChecked
+                app.simpleAir.update(isChecked)
             }
-            isChecked = app.simpleAir
+            isChecked = app.simpleAir.value()
         }
-        mEnableAir = app.enableAir
-        mSimpleAir = app.simpleAir
+        mEnableAir = app.enableAir.value()
+        mSimpleAir = app.simpleAir.value()
 
         findViewById<View>(R.id.button_test).setOnTouchListener { view, event ->
             mTestButton = when(event.actionMasked) {
@@ -365,12 +356,12 @@ class MainActivity : AppCompatActivity() {
             setOnCheckedChangeListener { _, isChecked ->
                 mShowDelay = isChecked
                 mDelayText.visibility = if (isChecked) View.VISIBLE else View.GONE
-                app.showDelay = isChecked
+                app.showDelay.update(isChecked)
             }
-            isChecked = app.showDelay
+            isChecked = app.showDelay.value()
         }
 
-        mTCPMode = app.tcpMode
+        mTCPMode = app.tcpMode.value()
         findViewById<TextView>(R.id.text_mode).apply {
             text = getString(if (mTCPMode) R.string.tcp else R.string.udp)
             setOnClickListener {
@@ -383,7 +374,7 @@ class MainActivity : AppCompatActivity() {
                     mTCPMode = true
                     R.string.tcp
                 })
-                app.tcpMode = mTCPMode
+                app.tcpMode.update(mTCPMode)
             }
         }
         initTasks()
@@ -393,8 +384,8 @@ class MainActivity : AppCompatActivity() {
         vibratorTask.execute(lifecycleScope)
 
         mSensorCallback = {
-            val lowest = 0.8f
-            val highest = 1.35f
+            val lowest = mGyroLowestBound
+            val highest = mGyroHighestBound
             val steps = (highest - lowest) / numOfAirBlock
             val current = abs(it)
             mCurrentAirHeight = if (mSimpleAir) {
@@ -452,11 +443,7 @@ class MainActivity : AppCompatActivity() {
         val textInfo = findViewById<TextView>(R.id.text_info)
         findViewById<CheckBox>(R.id.check_debug).setOnCheckedChangeListener { _, isChecked ->
             mDebugInfo = isChecked
-            textInfo.visibility = if (isChecked) {
-                View.VISIBLE
-            } else {
-                View.GONE
-            }
+            textInfo.visibility = if (isChecked) View.VISIBLE else View.GONE
         }
 
         gapWidth = windowWidth / (numOfButtons * buttonWidthToGap + numOfGaps)
@@ -510,44 +497,64 @@ class MainActivity : AppCompatActivity() {
                             var index = pointPos.toInt()
                             if (index > numOfButtons) index = numOfButtons
 
-                            var centerButton = index * 2
-                            if (touchedButtons.contains(centerButton)) centerButton++
-                            var leftButton = ((index - 1) * 2).coerceAtLeast(0)
-                            if (touchedButtons.contains(leftButton)) leftButton++
-                            var rightButton = ((index + 1) * 2).coerceAtMost(numOfButtons * 2)
-                            if (touchedButtons.contains(rightButton)) rightButton++
-                            var left2Button = ((index - 2) * 2).coerceAtLeast(0)
-                            if (touchedButtons.contains(left2Button)) left2Button++
-                            var right2Button = ((index + 2) * 2).coerceAtMost(numOfButtons * 2)
-                            if (touchedButtons.contains(right2Button)) right2Button++
+                            if (mEnableTouchSize) {
+                                var centerButton = index * 2
+                                if (touchedButtons.contains(centerButton)) centerButton++
+                                var leftButton = ((index - 1) * 2).coerceAtLeast(0)
+                                if (touchedButtons.contains(leftButton)) leftButton++
+                                var rightButton = ((index + 1) * 2).coerceAtMost(numOfButtons * 2)
+                                if (touchedButtons.contains(rightButton)) rightButton++
+                                var left2Button = ((index - 2) * 2).coerceAtLeast(0)
+                                if (touchedButtons.contains(left2Button)) left2Button++
+                                var right2Button = ((index + 2) * 2).coerceAtMost(numOfButtons * 2)
+                                if (touchedButtons.contains(right2Button)) right2Button++
 
-                            val currentSize = event.getSize(i)
-                            maxTouchedSize = maxTouchedSize.coerceAtLeast(currentSize)
+                                val currentSize = event.getSize(i)
+                                maxTouchedSize = maxTouchedSize.coerceAtLeast(currentSize)
 
-                            touchedButtons.add(centerButton)
-                            when ((pointPos - index) * 4) {
-                                in 0f..1f -> {
-                                    touchedButtons.add(leftButton)
-                                    if (currentSize >= extraFatTouchSizeThreshold) {
-                                        touchedButtons.add(left2Button)
+                                touchedButtons.add(centerButton)
+                                when ((pointPos - index) * 4) {
+                                    in 0f..1f -> {
+                                        touchedButtons.add(leftButton)
+                                        if (currentSize >= mExtraFatTouchSizeThreshold) {
+                                            touchedButtons.add(left2Button)
+                                            touchedButtons.add(rightButton)
+                                        }
+                                    }
+                                    in 1f..3f -> {
+                                        if (currentSize >= mFatTouchSizeThreshold) {
+                                            touchedButtons.add(leftButton)
+                                            touchedButtons.add(rightButton)
+                                        }
+                                        if (currentSize >= mExtraFatTouchSizeThreshold) {
+                                            touchedButtons.add(left2Button)
+                                            touchedButtons.add(right2Button)
+                                        }
+                                    }
+                                    in 3f..4f -> {
                                         touchedButtons.add(rightButton)
+                                        if (currentSize >= mExtraFatTouchSizeThreshold) {
+                                            touchedButtons.add(leftButton)
+                                            touchedButtons.add(right2Button)
+                                        }
                                     }
                                 }
-                                in 1f..3f -> {
-                                    if (currentSize >= fatTouchSizeThreshold) {
-                                        touchedButtons.add(leftButton)
-                                        touchedButtons.add(rightButton)
+                            } else {
+                                if (index > 15) index = 15
+                                var targetIndex = index * 2
+                                if (touchedButtons.contains(targetIndex)) targetIndex++
+                                touchedButtons.add(targetIndex)
+                                if (index > 0) {
+                                    if ((pointPos - index) * 4 < 1) {
+                                        targetIndex = (index - 1) * 2
+                                        if (touchedButtons.contains(targetIndex)) targetIndex++
+                                        touchedButtons.add(targetIndex)
                                     }
-                                    if (currentSize >= extraFatTouchSizeThreshold) {
-                                        touchedButtons.add(left2Button)
-                                        touchedButtons.add(right2Button)
-                                    }
-                                }
-                                in 3f..4f -> {
-                                    touchedButtons.add(rightButton)
-                                    if (currentSize >= extraFatTouchSizeThreshold) {
-                                        touchedButtons.add(leftButton)
-                                        touchedButtons.add(right2Button)
+                                } else if (index < 31) {
+                                    if ((pointPos - index) * 4 > 3) {
+                                        targetIndex = (index + 1) * 2
+                                        if (touchedButtons.contains(targetIndex)) targetIndex++
+                                        touchedButtons.add(targetIndex)
                                     }
                                 }
                             }
@@ -582,6 +589,18 @@ class MainActivity : AppCompatActivity() {
         val accel = mSensorManager?.getDefaultSensor(Sensor.TYPE_LINEAR_ACCELERATION)
         mSensorManager?.registerListener(listener, accel, 10000)
         enableNfcForegroundDispatch()
+        loadPreference()
+    }
+
+    private fun loadPreference() {
+        mEnableTouchSize = app.enableTouchSize.value()
+        mFatTouchSizeThreshold = app.fatTouchThreshold.value()
+        mExtraFatTouchSizeThreshold = app.extraFatTouchThreshold.value()
+        mEnableNFC = app.enableNFC.value()
+        mEnableVibrate = app.enableVibrate.value()
+        mGyroLowestBound = app.gyroAirLowestBound.value()
+        mGyroHighestBound = app.gyroAirHighestBound.value()
+        mAccelThreshold = app.accelAirThreshold.value()
     }
 
     private fun enableNfcForegroundDispatch() {
@@ -657,6 +676,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun Char.byte() = code.toByte()
     private fun initTasks() {
         receiverTask = AsyncTaskUtil.AsyncTask.make(
             doInBackground = {
@@ -671,10 +691,10 @@ class MainActivity : AppCompatActivity() {
                         try {
                             val dataSize = mTCPSocket.getInputStream().read(buffer, 0, 256)
                             if (dataSize >= 3) {
-                                if (dataSize >= 100 && buffer[1] == 'L'.toByte() && buffer[2] == 'E'.toByte() && buffer[3] == 'D'.toByte()) {
+                                if (dataSize >= 100 && buffer[1] == 'L'.byte() && buffer[2] == 'E'.byte() && buffer[3] == 'D'.byte()) {
                                     setLED(buffer)
                                 }
-                                if (dataSize >= 4 && buffer[1] == 'P'.toByte() && buffer[2] == 'O'.toByte() && buffer[3] == 'N'.toByte()) {
+                                if (dataSize >= 4 && buffer[1] == 'P'.byte() && buffer[2] == 'O'.byte() && buffer[3] == 'N'.byte()) {
                                     val delay = calculateDelay(buffer)
                                     if (delay > 0f)
                                         mCurrentDelay = delay
@@ -709,10 +729,10 @@ class MainActivity : AppCompatActivity() {
                             if (packet.address.hostAddress == address.toHostString() && packet.port == address.port) {
                                 val data = packet.data
                                 if (data.size >= 3) {
-                                    if (data.size >= 100 && data[1] == 'L'.toByte() && data[2] == 'E'.toByte() && data[3] == 'D'.toByte()) {
+                                    if (data.size >= 100 && data[1] == 'L'.byte() && data[2] == 'E'.byte() && data[3] == 'D'.byte()) {
                                         setLED(data)
                                     }
-                                    if (data.size >= 4 && data[1] == 'P'.toByte() && data[2] == 'O'.toByte() && data[3] == 'N'.toByte()) {
+                                    if (data.size >= 4 && data[1] == 'P'.byte() && data[2] == 'O'.byte() && data[3] == 'N'.byte()) {
                                         val delay = calculateDelay(data)
                                         if (delay > 0f)
                                             mCurrentDelay = delay
@@ -747,7 +767,7 @@ class MainActivity : AppCompatActivity() {
                         val buffer = applyKeys(buttons, IoBuffer())
                         try {
                             mTCPSocket.getOutputStream().write(constructBuffer(buffer))
-                            if (enableNFC)
+                            if (mEnableNFC)
                                 mTCPSocket.getOutputStream().write(constructCardData())
                         } catch (e: Exception) {
                             e.printStackTrace()
@@ -780,7 +800,7 @@ class MainActivity : AppCompatActivity() {
                         val packet = constructPacket(buffer)
                         try {
                             socket.send(packet)
-                            if (enableNFC)
+                            if (mEnableNFC)
                                 socket.send(constructCardPacket())
                         } catch (e: Exception) {
                             e.printStackTrace()
@@ -824,6 +844,7 @@ class MainActivity : AppCompatActivity() {
         )
     }
 
+    @Suppress("unused")
     enum class FunctionButton {
         UNDEFINED, FUNCTION_COIN, FUNCTION_CARD
     }
@@ -864,7 +885,7 @@ class MainActivity : AppCompatActivity() {
             val selfAddress = getLocalIPAddress()
             if (selfAddress.isEmpty()) return@thread
             val buffer = ByteArray(21)
-            byteArrayOf('C'.toByte(), 'O'.toByte(), 'N'.toByte()).copyInto(buffer, 1)
+            byteArrayOf('C'.byte(), 'O'.byte(), 'N'.byte()).copyInto(buffer, 1)
             ByteBuffer.wrap(buffer)
                     .put(4, if (selfAddress.size == 4) 1.toByte() else 2.toByte())
                     .putShort(5, serverPort.toShort())
@@ -887,7 +908,7 @@ class MainActivity : AppCompatActivity() {
     private fun sendDisconnect(address: InetSocketAddress?) {
         address ?: return
         thread {
-            val buffer = byteArrayOf(3, 'D'.toByte(), 'I'.toByte(), 'S'.toByte())
+            val buffer = byteArrayOf(3, 'D'.byte(), 'I'.byte(), 'S'.byte())
             if (mTCPMode) {
                 try {
                     mTCPSocket.getOutputStream().write(buffer)
@@ -914,7 +935,7 @@ class MainActivity : AppCompatActivity() {
     private fun sendFunctionKey(address: InetSocketAddress?, function: FunctionButton) {
         address ?: return
         thread {
-            val buffer = byteArrayOf(4, 'F'.toByte(), 'N'.toByte(), 'C'.toByte(), function.ordinal.toByte())
+            val buffer = byteArrayOf(4, 'F'.byte(), 'N'.byte(), 'C'.byte(), function.ordinal.toByte())
             if (mTCPMode) {
                 try {
                     mTCPSocket.getOutputStream().write(buffer)
@@ -944,7 +965,7 @@ class MainActivity : AppCompatActivity() {
         if (System.currentTimeMillis() - lastPingTime < pingInterval) return
         lastPingTime = System.currentTimeMillis()
         val buffer = ByteArray(12)
-        byteArrayOf(11, 'P'.toByte(), 'I'.toByte(), 'N'.toByte()).copyInto(buffer)
+        byteArrayOf(11, 'P'.byte(), 'I'.byte(), 'N'.byte()).copyInto(buffer)
         ByteBuffer.wrap(buffer, 4, 8).putLong(SystemClock.elapsedRealtimeNanos())
         try {
             val socket = DatagramSocket()
@@ -963,7 +984,7 @@ class MainActivity : AppCompatActivity() {
         if (System.currentTimeMillis() - lastPingTime < pingInterval) return
         lastPingTime = System.currentTimeMillis()
         val buffer = ByteArray(12)
-        byteArrayOf(11, 'P'.toByte(), 'I'.toByte(), 'N'.toByte()).copyInto(buffer)
+        byteArrayOf(11, 'P'.byte(), 'I'.byte(), 'N'.byte()).copyInto(buffer)
         ByteBuffer.wrap(buffer, 4, 8).putLong(SystemClock.elapsedRealtimeNanos())
         try {
             mTCPSocket.getOutputStream().write(buffer)
@@ -1004,7 +1025,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun constructCardData(): ByteArray {
         val buf = ByteArray(24)
-        byteArrayOf(15, 'C'.toByte(), 'R'.toByte(), 'D'.toByte()).copyInto(buf)
+        byteArrayOf(15, 'C'.byte(), 'R'.byte(), 'D'.byte()).copyInto(buf)
         buf[4] = if (hasCard) 1 else 0
         buf[5] = cardType.ordinal.toByte()
         if (hasCard)
@@ -1024,10 +1045,10 @@ class MainActivity : AppCompatActivity() {
         return buffer.apply {
             if (mEnableAir) {
                 buffer.length = 47
-                buffer.header = byteArrayOf('I'.toByte(), 'N'.toByte(), 'P'.toByte())
+                buffer.header = byteArrayOf('I'.byte(), 'N'.byte(), 'P'.byte())
             } else {
                 buffer.length = 41
-                buffer.header = byteArrayOf('I'.toByte(), 'P'.toByte(), 'T'.toByte())
+                buffer.header = byteArrayOf('I'.byte(), 'P'.byte(), 'T'.byte())
             }
 
             if (event.keys != null && event.keys.isNotEmpty()) {
@@ -1076,14 +1097,12 @@ class MainActivity : AppCompatActivity() {
                 else -> continue
             }
             val right = left + width
-            mLEDCanvas.drawRect(left, 0f, right, drawHeight.toFloat(), makePaint(color.toInt()))
+            mLEDCanvas.drawRect(left, 0f, right, drawHeight.toFloat(), color.toPaint())
             drawXOffset += width
         }
         mButtonRenderer.postInvalidate()
     }
-    private fun makePaint(color: Int): Paint {
-        return Paint().apply { this.color = color }
-    }
+    private fun Long.toPaint(): Paint = Paint().apply { color = toInt() }
 
     companion object {
         private const val TAG = "Brokenithm"
diff --git a/app/src/main/java/com/github/brokenithm/activity/SettingsActivity.kt b/app/src/main/java/com/github/brokenithm/activity/SettingsActivity.kt
new file mode 100644
index 0000000..66eb969
--- /dev/null
+++ b/app/src/main/java/com/github/brokenithm/activity/SettingsActivity.kt
@@ -0,0 +1,14 @@
+package com.github.brokenithm.activity
+
+import android.os.Bundle
+import androidx.fragment.app.FragmentActivity
+import com.github.brokenithm.R
+import com.github.brokenithm.fragment.SettingsFragment
+
+class SettingsActivity : FragmentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_settings)
+        supportFragmentManager.beginTransaction().replace(R.id.settings_container, SettingsFragment()).commit()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/github/brokenithm/fragment/SettingsFragment.kt b/app/src/main/java/com/github/brokenithm/fragment/SettingsFragment.kt
new file mode 100644
index 0000000..550e681
--- /dev/null
+++ b/app/src/main/java/com/github/brokenithm/fragment/SettingsFragment.kt
@@ -0,0 +1,19 @@
+package com.github.brokenithm.fragment
+
+import android.os.Bundle
+import android.text.InputType
+import android.widget.EditText
+import androidx.preference.EditTextPreference
+import androidx.preference.PreferenceFragmentCompat
+import com.github.brokenithm.R
+
+class SettingsFragment : PreferenceFragmentCompat() {
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        preferenceManager.sharedPreferencesName = "settings"
+        setPreferencesFromResource(R.xml.preferences, rootKey)
+        val setDecimalEdit = { editText: EditText -> editText.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL }
+        val entries = listOf("fat_touch_threshold", "extra_fat_touch_threshold", "gyro_air_lowest", "gyro_air_highest", "accel_air_threshold")
+        for (entry in entries)
+            findPreference<EditTextPreference>(entry)?.setOnBindEditTextListener(setDecimalEdit)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 28f8000..27e01ec 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -110,18 +110,6 @@
                 app:layout_constraintStart_toEndOf="@+id/button_coin"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <CheckBox
-                android:id="@+id/check_enable_air"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="8dp"
-                android:text="@string/enable_air"
-                android:textColor="@color/white"
-                android:visibility="gone"
-                app:layout_constraintStart_toEndOf="@+id/button_card"
-                app:layout_constraintTop_toTopOf="parent" />
-
             <TextView
                 android:id="@+id/text_switch_air"
                 android:layout_width="90dp"
@@ -215,25 +203,15 @@
                 app:layout_constraintStart_toEndOf="@+id/button_service"
                 app:layout_constraintTop_toTopOf="@+id/button_service" />
 
-            <CheckBox
-                android:id="@+id/check_vibrate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
-                android:text="@string/enable_vibration"
-                android:textColor="@color/white"
-                app:layout_constraintStart_toEndOf="@+id/check_show_delay"
-                app:layout_constraintTop_toTopOf="@+id/check_show_delay" />
-
             <CheckBox
                 android:id="@+id/check_simple_air"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
                 android:text="@string/simple_air"
                 android:textColor="@color/white"
-                app:layout_constraintStart_toEndOf="@+id/check_vibrate"
-                app:layout_constraintTop_toTopOf="@+id/check_vibrate" />
+                app:layout_constraintBottom_toBottomOf="@+id/check_show_delay"
+                app:layout_constraintStart_toEndOf="@+id/check_show_delay"
+                app:layout_constraintTop_toTopOf="@+id/check_show_delay" />
 
             <TextView
                 android:id="@+id/text_mode"
@@ -253,6 +231,16 @@
                 app:layout_constraintStart_toEndOf="@+id/check_simple_air"
                 app:layout_constraintTop_toTopOf="@+id/check_simple_air" />
 
+            <Button
+                android:id="@+id/button_settings"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:text="@string/settings"
+                app:layout_constraintBottom_toBottomOf="@+id/text_mode"
+                app:layout_constraintStart_toEndOf="@+id/text_mode"
+                app:layout_constraintTop_toTopOf="@+id/text_mode" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </net.cachapa.expandablelayout.ExpandableLayout>
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000..0ae34b3
--- /dev/null
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layout_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#202020"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/text_title2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="Brokenithm-Evolved Settings"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <FrameLayout
+        android:id="@+id/settings_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/layout_top">
+
+    </FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a620a2..077e520 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,4 +27,14 @@
     <string name="accel_air">Accel Air</string>
     <string name="touch_air">Touch Air</string>
     <string name="enable_air">Enable Air</string>
+
+    <string name="settings">Settings</string>
+    <string name="gyro_air_highest">Gyro Air Highest Bound</string>
+    <string name="accel_air_threshold">Accel Air Threshold</string>
+    <string name="gyro_air_lowest">Gyro Air Lowest Bound</string>
+    <string name="extra_fat_touch_threshold">Extra Fat Touch Threshold</string>
+    <string name="fat_touch_threshold">Fat Touch Threshold</string>
+    <string name="enable_touch_size">Enable Touch Size Check</string>
+    <string name="enable_nfc">Enable NFC</string>
+    <string name="enable_vibrate">Enable Vibration</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
new file mode 100644
index 0000000..79c3987
--- /dev/null
+++ b/app/src/main/res/xml/preferences.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory android:title="Common">
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="enable_vibrate"
+            android:title="@string/enable_vibrate" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="enable_nfc"
+            android:title="@string/enable_nfc" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="Touch Judge">
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="enable_touch_size"
+            android:title="@string/enable_touch_size" />
+        <EditTextPreference
+            android:defaultValue="0.027"
+            android:key="fat_touch_threshold"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/fat_touch_threshold" />
+        <EditTextPreference
+            android:defaultValue="0.035"
+            android:key="extra_fat_touch_threshold"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/extra_fat_touch_threshold" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="Sensor">
+
+        <EditTextPreference
+            android:defaultValue="0.8"
+            android:key="gyro_air_lowest"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/gyro_air_lowest" />
+        <EditTextPreference
+            android:defaultValue="1.35"
+            android:key="gyro_air_highest"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/gyro_air_highest" />
+        <EditTextPreference
+            android:defaultValue="2.0"
+            android:key="accel_air_threshold"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/accel_air_threshold" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9d55db3..3c64e01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.30"
+    ext.kotlin_version = "1.5.21"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dd0cc70..ee5e55b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip