diff --git a/app/src/main/java/ovh/smayzy/i2d_project_15_app/MainActivity.kt b/app/src/main/java/ovh/smayzy/i2d_project_15_app/MainActivity.kt
index 4868604..30c1a17 100644
--- a/app/src/main/java/ovh/smayzy/i2d_project_15_app/MainActivity.kt
+++ b/app/src/main/java/ovh/smayzy/i2d_project_15_app/MainActivity.kt
@@ -4,7 +4,6 @@ import android.Manifest
import android.bluetooth.BluetoothAdapter
import android.bluetooth.BluetoothDevice
import android.bluetooth.BluetoothSocket
-import android.content.Context
import android.content.pm.PackageManager
import android.os.Bundle
import android.util.Log
@@ -26,6 +25,7 @@ import java.text.SimpleDateFormat
import java.util.*
import android.graphics.Color
import androidx.core.content.ContextCompat
+import android.widget.TextView
class MainActivity : AppCompatActivity() {
@@ -44,6 +44,9 @@ class MainActivity : AppCompatActivity() {
private lateinit var lineChart: LineChart
+ private lateinit var tempCircle: TextView
+ private lateinit var humCircle: TextView
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
@@ -54,6 +57,9 @@ class MainActivity : AppCompatActivity() {
lineChart = findViewById(R.id.Chart)
setupChart()
+ tempCircle = findViewById(R.id.temp_circle)
+ humCircle = findViewById(R.id.hum_circle)
+
bluetoothManager = getSystemService(BLUETOOTH_SERVICE) as android.bluetooth.BluetoothManager
bluetoothAdapter = bluetoothManager.adapter
if (bluetoothAdapter == null) {
@@ -130,6 +136,8 @@ class MainActivity : AppCompatActivity() {
Log.d(tag, "Store: $reading")
runOnUiThread {
+ tempCircle.text = getString(R.string.temp_format, temp)
+ humCircle.text = getString(R.string.hum_format, hum)
updateChartData()
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5d249e5..9efba11 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -18,7 +18,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
I2D_Project_15_app
+
Connect to HC-05
Connected to HC-05
+
+ %.1f°C
+ %.1f%%
\ No newline at end of file