app/src/main/java/ovh/smayzy/i2d_project_15_app/MainActivity.kt

@@ -52,7 +52,7 @@ class MainActivity : AppCompatActivity() {
 
     private var startTime: Long = 0L
 
-    private val isTesting = false
+    private val isTesting = true
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -72,13 +72,13 @@ class MainActivity : AppCompatActivity() {
         bluetoothManager = getSystemService(BLUETOOTH_SERVICE) as android.bluetooth.BluetoothManager
         bluetoothAdapter = bluetoothManager.adapter
         if (bluetoothAdapter == null) {
-            Toast.makeText(this, getString(R.string.bluetooth_unsupported), Toast.LENGTH_LONG).show()
+            Toast.makeText(this, "Bluetooth not supported by your device", Toast.LENGTH_LONG).show()
             return
         }
 
         connectBtn.setOnClickListener {
             if (isConnected) {
-                Toast.makeText(this, getString(R.string.already_connected), Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Already connected", Toast.LENGTH_SHORT).show()
                 return@setOnClickListener
             }
 
@@ -86,7 +86,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         if (isTesting) {
-            Toast.makeText(this, getString(R.string.is_testing_mode), Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "Running in testing mode", Toast.LENGTH_SHORT).show()
             Log.d(tag, "Starting fake data stream")
 
             Thread {
@@ -111,7 +111,7 @@ class MainActivity : AppCompatActivity() {
         val device = pairedDevices?.find { it.name == deviceName }
 
         if (device == null) {
-            Toast.makeText(this, getString(R.string.hc05_not_found), Toast.LENGTH_LONG).show()
+            Toast.makeText(this, "HC-05 not found, try pairing it to your phone via bluetooth", Toast.LENGTH_LONG).show()
             return
         }
 
@@ -121,13 +121,13 @@ class MainActivity : AppCompatActivity() {
                 bluetoothSocket?.connect()
                 isConnected = true
                 runOnUiThread {
-                    Toast.makeText(this, getString(R.string.connected), Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this, "Connected to HC-05", Toast.LENGTH_SHORT).show()
                 }
                 listenForData()
             } catch (e: IOException) {
                 Log.e(tag, "Connection failed", e)
                 runOnUiThread {
-                    Toast.makeText(this, getString(R.string.connection_failed) + ": ${e.message}", Toast.LENGTH_LONG).show()
+                    Toast.makeText(this, "Connection failed: ${e.message}", Toast.LENGTH_LONG).show()
                 }
             }
         }.start()
@@ -191,7 +191,7 @@ class MainActivity : AppCompatActivity() {
             xAxis.apply {
                 position = XAxis.XAxisPosition.BOTTOM
                 valueFormatter = object : ValueFormatter() {
-                    override fun getFormattedValue(value: Float): String {
+                    override fun getFormattedValue(value: Float): String? {
                         return "${value.toInt()}s"
                     }
                 }
@@ -220,7 +220,7 @@ class MainActivity : AppCompatActivity() {
             humEntries.add(Entry(reading.secSinceStart.toFloat(), reading.humidity))
         }
 
-        val tempSet = LineDataSet(tempEntries, getString(R.string.temp_tx)).apply {
+        val tempSet = LineDataSet(tempEntries, "Temperature (°C)").apply {
             color = Color.RED
             lineWidth = 2f
             setDrawCircles(false)
@@ -229,7 +229,7 @@ class MainActivity : AppCompatActivity() {
             fillDrawable = ContextCompat.getDrawable(this@MainActivity, R.drawable.gradiant_temp)
         }
 
-        val humSet = LineDataSet(humEntries, getString(R.string.hum_tx)).apply {
+        val humSet = LineDataSet(humEntries, "Humidity (%)").apply {
             color = Color.BLUE
             lineWidth = 2f
             setDrawCircles(false)

app/src/main/res/layout/activity_main.xml

@@ -66,7 +66,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
-        android:background="@color/colorBackground"
+        android:background="@android:color/white"
         app:layout_constraintTop_toBottomOf="@id/temp_circle"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -80,7 +80,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:background="@color/colorBackground"
+        android:background="@android:color/white"
         app:layout_constraintTop_toBottomOf="@id/temp_chart"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/values-de/strings.xml

@@ -1,12 +0,0 @@
-<resources>
-    <string name="app_name" translatable="false">I2D_Project_15_app</string>
-    <string name="connect_btn">Anschluss an HC-05</string>
-    <string name="connected">Verbunden mit HC-05</string>
-    <string name="bluetooth_unsupported">Bluetooth wird von Ihrem Gerät nicht unterstützt</string>
-    <string name="already_connected">Das Gerät ist bereits verbunden</string>
-    <string name="is_testing_mode">Die Anwendung läuft im Testmodus, die Werte sind zufällig</string>
-    <string name="hc05_not_found">HC-05 nicht gefunden, versuchen Sie, es über Bluetooth mit Ihrem Telefon zu koppeln</string>
-    <string name="connection_failed">Verbindung fehlgeschlagen</string>
-    <string name="temp_tx">Temperatur (°C)</string>
-    <string name="hum_tx">Luftfeuchtigkeit (%)</string>
-</resources>

app/src/main/res/values-es/strings.xml

@@ -1,12 +0,0 @@
-<resources>
-    <string name="app_name" translatable="false">I2D_Project_15_app</string>
-    <string name="connect_btn">Conectar a HC-05</string>
-    <string name="connected">Conectado a HC-05</string>
-    <string name="bluetooth_unsupported">El dispositivo no es compatible con Bluetooth</string>
-    <string name="already_connected">El dispositivo ya está conectado</string>
-    <string name="is_testing_mode">La aplicación se está ejecutando en modo de prueba los valores son aleatorios</string>
-    <string name="hc05_not_found">HC-05 no encontrado, intente emparejarlo a su teléfono a través de bluetooth</string>
-    <string name="connection_failed">Error de conexión</string>
-    <string name="temp_tx">Temperatura (°C)</string>
-    <string name="hum_tx">Humedad (%)</string>
-</resources>

app/src/main/res/values-fr/strings.xml

@@ -2,11 +2,4 @@
     <string name="app_name" translatable="false">I2D_Project_15_app</string>
     <string name="connect_btn">Se connecter au HC-05</string>
     <string name="connected">Connecté au HC-05</string>
-    <string name="bluetooth_unsupported">Votre appareil ne supporte pas le bluetooth</string>
-    <string name="already_connected">Le module est déja connecté</string>
-    <string name="is_testing_mode">L\'application est en mode de test les valeurs sont aléatoires</string>
-    <string name="hc05_not_found">HC-05 introuvable, essayez de l\'apparailler a votre téléphone en bluetooth</string>
-    <string name="connection_failed">Connexion impossible</string>
-    <string name="temp_tx">Température (°C)</string>
-    <string name="hum_tx">Humidité (%)</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -1,12 +0,0 @@
-<resources>
-    <string name="app_name" translatable="false">I2D_Project_15_app</string>
-    <string name="connect_btn">HC-05に接続</string>
-    <string name="connected">HC-05に接続成功</string>
-    <string name="bluetooth_unsupported">お使いのデバイスではBluetoothがサポートされていません</string>
-    <string name="already_connected">デバイスはすでに接続されている</string>
-    <string name="is_testing_mode">アプリはテストモードで動作しており、値はランダムです。</string>
-    <string name="hc05_not_found">HC-05が見つかりません。ブルートゥースで携帯電話とペアリングしてみてください。</string>
-    <string name="connection_failed">接続に失敗</string>
-    <string name="temp_tx">温度 (°C)</string>
-    <string name="hum_tx">湿度(%)</string>
-</resources>

app/src/main/res/values-night/colors.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary_light">#3D2F71</color>
-    <color name="colorPrimary_dark">#141118</color>
-    <color name="colorAccent">#343434</color>
-    <color name="colorBackground">#141118</color>
-</resources>

app/src/main/res/values-night/themes.xml

@@ -1,10 +1,7 @@
 <resources>
+    <!-- Base application theme. -->
     <style name="Base.Theme.I2D_Project_15_app" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary_light</item>
+        <!-- Customize your dark theme here. -->
-        <item name="colorPrimaryDark">@color/colorPrimary_dark</item>
+        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:background">@color/colorBackground</item>
     </style>
-
-    <style name="Theme.I2D_Project_15_app" parent="Base.Theme.I2D_Project_15_app" />
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -1,12 +0,0 @@
-<resources>
-    <string name="app_name" translatable="false">I2D_Project_15_app</string>
-    <string name="connect_btn">连接至 HC-05</string>
-    <string name="connected">与 HC-05 连接</string>
-    <string name="bluetooth_unsupported">您的设备不支持蓝牙</string>
-    <string name="already_connected">设备已连接</string>
-    <string name="is_testing_mode">应用程序在测试模式下运行，数值是随机的</string>
-    <string name="hc05_not_found">HC-05 未找到，请尝试通过蓝牙将其与手机配对</string>
-    <string name="connection_failed">连接失败</string>
-    <string name="temp_tx">温度（°C）</string>
-    <string name="hum_tx">湿度 (%)</string>
-</resources>

app/src/main/res/values/colors.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary_light">#7C6AE6</color>
+    <color name="colorPrimary_light">#00246B</color>
-    <color name="colorPrimary_dark">#1A1147</color>
+    <color name="colorPrimary_dark">#CADCFC</color>
-    <color name="colorAccent">#676767</color>
+    <color name="colorAccent">#97BAF8</color>
-    <color name="colorBackground">#FFFFFF</color>
+    <color name="colorBackground">#97BAF8</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -3,14 +3,6 @@
 
     <string name="connect_btn">Connect to HC-05</string>
     <string name="connected">Connected to HC-05</string>
-    <string name="bluetooth_unsupported">Bluetooth is not supported by your device</string>
-    <string name="already_connected">The device is already connected</string>
-    <string name="is_testing_mode">The app is running in testing mode the values are random</string>
-    <string name="hc05_not_found">HC-05 not found, try pairing it to your phone via bluetooth</string>
-    <string name="connection_failed">Connection failed</string>
-    <string name="temp_tx">Temperature (°C)</string>
-    <string name="hum_tx">Humidity (%)</string>
-
 
     <string name="temp_format" translatable="false">%.1f°C</string>
     <string name="hum_format" translatable="false">%.1f%%</string>

app/src/main/res/values/themes.xml

@@ -1,4 +1,5 @@
 <resources>
+    <!-- Base application theme. -->
     <style name="Base.Theme.I2D_Project_15_app" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary_light</item>
         <item name="colorPrimaryDark">@color/colorPrimary_dark</item>