diff --git a/build.gradle.kts b/build.gradle.kts
index 42fbceb..a0048c1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,10 +17,25 @@ android {
buildTypes {
getByName("release") {
- isMinifyEnabled = false
+ isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
+ getByName("debug") {
+ isMinifyEnabled = false
+ }
}
+ flavorDimensions += "connectivity"
+ productFlavors {
+ create("demo") {
+ dimension = "connectivity"
+ applicationIdSuffix = ".demo"
+ }
+ create("bt") {
+ dimension = "connectivity"
+ applicationIdSuffix = ".bt"
+ }
+ }
+
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
diff --git a/src/bt/AndroidManifest.xml b/src/bt/AndroidManifest.xml
new file mode 100644
index 0000000..d4c6215
--- /dev/null
+++ b/src/bt/AndroidManifest.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/io/gitlab/jfronny/hc05ac/live/BtInputActivity.kt b/src/bt/java/io/gitlab/jfronny/hc05ac/bt/BtInputActivity.kt
similarity index 97%
rename from src/main/java/io/gitlab/jfronny/hc05ac/live/BtInputActivity.kt
rename to src/bt/java/io/gitlab/jfronny/hc05ac/bt/BtInputActivity.kt
index 7aec38b..72b885d 100644
--- a/src/main/java/io/gitlab/jfronny/hc05ac/live/BtInputActivity.kt
+++ b/src/bt/java/io/gitlab/jfronny/hc05ac/bt/BtInputActivity.kt
@@ -1,4 +1,4 @@
-package io.gitlab.jfronny.hc05ac.live
+package io.gitlab.jfronny.hc05ac.bt
import android.bluetooth.BluetoothSocket
import android.os.Bundle
diff --git a/src/main/java/io/gitlab/jfronny/hc05ac/live/ConnectBtTask.kt b/src/bt/java/io/gitlab/jfronny/hc05ac/bt/ConnectBtTask.kt
similarity index 98%
rename from src/main/java/io/gitlab/jfronny/hc05ac/live/ConnectBtTask.kt
rename to src/bt/java/io/gitlab/jfronny/hc05ac/bt/ConnectBtTask.kt
index d802116..cb3eff7 100644
--- a/src/main/java/io/gitlab/jfronny/hc05ac/live/ConnectBtTask.kt
+++ b/src/bt/java/io/gitlab/jfronny/hc05ac/bt/ConnectBtTask.kt
@@ -1,4 +1,4 @@
-package io.gitlab.jfronny.hc05ac.live
+package io.gitlab.jfronny.hc05ac.bt
import android.annotation.SuppressLint
import android.app.Activity
diff --git a/src/main/java/io/gitlab/jfronny/hc05ac/live/DeviceListActivity.kt b/src/bt/java/io/gitlab/jfronny/hc05ac/bt/DeviceListActivity.kt
similarity index 98%
rename from src/main/java/io/gitlab/jfronny/hc05ac/live/DeviceListActivity.kt
rename to src/bt/java/io/gitlab/jfronny/hc05ac/bt/DeviceListActivity.kt
index 20efeb9..42b7e73 100644
--- a/src/main/java/io/gitlab/jfronny/hc05ac/live/DeviceListActivity.kt
+++ b/src/bt/java/io/gitlab/jfronny/hc05ac/bt/DeviceListActivity.kt
@@ -1,4 +1,4 @@
-package io.gitlab.jfronny.hc05ac.live
+package io.gitlab.jfronny.hc05ac.bt
import android.annotation.SuppressLint
import android.bluetooth.BluetoothAdapter
diff --git a/src/main/res/layout/activity_device_list.xml b/src/bt/res/layout/activity_device_list.xml
similarity index 91%
rename from src/main/res/layout/activity_device_list.xml
rename to src/bt/res/layout/activity_device_list.xml
index 9278e08..037762f 100644
--- a/src/main/res/layout/activity_device_list.xml
+++ b/src/bt/res/layout/activity_device_list.xml
@@ -1,10 +1,9 @@
+ tools:context=".bt.DeviceListActivity">
@@ -51,6 +50,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="150dp"
+ android:layout_marginStart="150dp"
android:footerDividersEnabled="false"
tools:layout_editor_absoluteX="8dp"
tools:layout_editor_absoluteY="8dp" />
diff --git a/src/demo/AndroidManifest.xml b/src/demo/AndroidManifest.xml
new file mode 100644
index 0000000..086dab4
--- /dev/null
+++ b/src/demo/AndroidManifest.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/io/gitlab/jfronny/hc05ac/demo/DemoActivity.kt b/src/demo/java/io/gitlab/jfronny/hc05ac/demo/DemoActivity.kt
similarity index 100%
rename from src/main/java/io/gitlab/jfronny/hc05ac/demo/DemoActivity.kt
rename to src/demo/java/io/gitlab/jfronny/hc05ac/demo/DemoActivity.kt
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 93b6c9e..8d69974 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -19,18 +19,6 @@
android:supportsRtl="true"
android:theme="@style/Theme.HC05AC"
tools:targetApi="31">
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/io/gitlab/jfronny/hc05ac/InputActivity.kt b/src/main/java/io/gitlab/jfronny/hc05ac/InputActivity.kt
index bd8f67a..47ae47b 100644
--- a/src/main/java/io/gitlab/jfronny/hc05ac/InputActivity.kt
+++ b/src/main/java/io/gitlab/jfronny/hc05ac/InputActivity.kt
@@ -67,9 +67,7 @@ abstract class InputActivity : BaseActivity() {
}
private fun screenToByte(y: Float): Byte {
- val scaled = (y * 255f / root!!.height).toInt().clamp(0, 255)
- val mapped: Byte = scaled.xor(0x80).toByte()
- return (-mapped).toByte()
+ return (127 - (y * 255f / root!!.height).toInt().clamp(0, 255)).toByte()
}
private enum class Side {
diff --git a/src/main/res/drawable/divider.xml b/src/main/res/drawable/divider.xml
deleted file mode 100644
index 82e7318..0000000
--- a/src/main/res/drawable/divider.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/layout/activity_led_control.xml b/src/main/res/layout/activity_led_control.xml
deleted file mode 100644
index 964abee..0000000
--- a/src/main/res/layout/activity_led_control.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/layout/activity_main.xml b/src/main/res/layout/activity_main.xml
index d4a9986..1cb6310 100644
--- a/src/main/res/layout/activity_main.xml
+++ b/src/main/res/layout/activity_main.xml
@@ -1,14 +1,11 @@
+ tools:context=".InputActivity">
HC05AC
0
+ Select A Pairing Device
+ Pair
\ No newline at end of file