From 18b2dea577ed4e623465e01fc2d8c7e17236e56e Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Fri, 27 Jan 2023 17:56:43 +0100
Subject: [PATCH] demo/bt Flavors

---
 build.gradle.kts                              |  17 ++-
 src/bt/AndroidManifest.xml                    |  16 ++
 .../jfronny/hc05ac/bt}/BtInputActivity.kt     |   2 +-
 .../jfronny/hc05ac/bt}/ConnectBtTask.kt       |   2 +-
 .../jfronny/hc05ac/bt}/DeviceListActivity.kt  |   2 +-
 .../res/layout/activity_device_list.xml       |   8 +-
 src/demo/AndroidManifest.xml                  |  15 ++
 .../jfronny/hc05ac/demo/DemoActivity.kt       |   0
 src/main/AndroidManifest.xml                  |  12 --
 .../io/gitlab/jfronny/hc05ac/InputActivity.kt |   4 +-
 src/main/res/drawable/divider.xml             |   4 -
 src/main/res/layout/activity_led_control.xml  | 142 ------------------
 src/main/res/layout/activity_main.xml         |   5 +-
 src/main/res/values/strings.xml               |   2 +
 14 files changed, 58 insertions(+), 173 deletions(-)
 create mode 100644 src/bt/AndroidManifest.xml
 rename src/{main/java/io/gitlab/jfronny/hc05ac/live => bt/java/io/gitlab/jfronny/hc05ac/bt}/BtInputActivity.kt (97%)
 rename src/{main/java/io/gitlab/jfronny/hc05ac/live => bt/java/io/gitlab/jfronny/hc05ac/bt}/ConnectBtTask.kt (98%)
 rename src/{main/java/io/gitlab/jfronny/hc05ac/live => bt/java/io/gitlab/jfronny/hc05ac/bt}/DeviceListActivity.kt (98%)
 rename src/{main => bt}/res/layout/activity_device_list.xml (91%)
 create mode 100644 src/demo/AndroidManifest.xml
 rename src/{main => demo}/java/io/gitlab/jfronny/hc05ac/demo/DemoActivity.kt (100%)
 delete mode 100644 src/main/res/drawable/divider.xml
 delete mode 100644 src/main/res/layout/activity_led_control.xml

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name=".bt.DeviceListActivity"
+            android:exported="true"
+            android:screenOrientation="landscape">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".bt.BtInputActivity"/>
+    </application>
+</manifest>
\ 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 @@
 <?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"
-    tools:context=".live.DeviceListActivity">
+    tools:context=".bt.DeviceListActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -23,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="Select A Pairing Device"
+                android:text="@string/device_list_title"
                 android:textColor="#0033FF"
                 android:textSize="16sp"
                 tools:layout_editor_absoluteX="168dp"
@@ -36,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:background="@android:color/holo_blue_light"
-                android:text="Pair"
+                android:text="@string/device_list_refresh"
                 tools:layout_editor_absoluteX="190dp"
                 tools:layout_editor_absoluteY="183dp" />
         </LinearLayout>
@@ -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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name=".demo.DemoActivity"
+            android:exported="true"
+            android:screenOrientation="landscape">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ 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">
-        <activity
-            android:name=".live.DeviceListActivity"
-            android:exported="true"
-            android:screenOrientation="landscape">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".unused.BasicInputActivity"/>
-        <activity android:name=".live.BtInputActivity"/>
     </application>
 
 </manifest>
\ 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 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:height="1dp" />
-    <solid android:color="@color/design_default_color_primary"/>
-</shape>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".unused.BasicInputActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        tools:layout_editor_absoluteX="8dp"
-        tools:layout_editor_absoluteY="8dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/textView2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="progress"
-                android:textAlignment="center"
-                tools:layout_editor_absoluteX="8dp"
-                tools:layout_editor_absoluteY="30dp"
-                android:gravity="center_horizontal" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button2"
-                android:layout_margin="5dp"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@android:color/holo_blue_light"
-                android:text="Combo 1"
-                tools:layout_editor_absoluteX="148dp"
-                tools:layout_editor_absoluteY="88dp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button3"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:background="@android:color/holo_blue_light"
-                android:text="Combo 2"
-                tools:layout_editor_absoluteX="192dp"
-                tools:layout_editor_absoluteY="64dp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button5"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:background="@android:color/holo_blue_light"
-                android:text="Combo 3"
-                tools:layout_editor_absoluteX="61dp"
-                tools:layout_editor_absoluteY="134dp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button6"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:background="@android:color/holo_blue_light"
-                android:text="Combo 4"
-                tools:layout_editor_absoluteX="91dp"
-                tools:layout_editor_absoluteY="168dp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button7"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:background="@android:color/holo_blue_light"
-                android:text="Combo 5"
-                tools:layout_editor_absoluteX="112dp"
-                tools:layout_editor_absoluteY="336dp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/button4"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:background="@android:color/holo_red_light"
-                android:text="Disconnect Pairing"
-                tools:layout_editor_absoluteX="108dp"
-                tools:layout_editor_absoluteY="154dp" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    tools:context=".InputActivity"
-    app:divider="@drawable/divider"
-    app:showDividers="middle">
+    tools:context=".InputActivity">
 
     <TextView
         android:text="@string/zero"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index faccc37..2112b7e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,4 +1,6 @@
 <resources>
     <string name="app_name">HC05AC</string>
     <string name="zero">0</string>
+    <string name="device_list_title">Select A Pairing Device</string>
+    <string name="device_list_refresh">Pair</string>
 </resources>
\ No newline at end of file