Compare commits

..

No commits in common. "master" and "0.2" have entirely different histories.
master ... 0.2

11 changed files with 10 additions and 31 deletions

View File

@ -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)

View File

@ -7,6 +7,4 @@
<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>

View File

@ -7,6 +7,4 @@
<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>

View File

@ -7,6 +7,4 @@
<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>

View File

@ -7,6 +7,4 @@
<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>

View File

@ -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>

View File

@ -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>
<item name="colorPrimaryDark">@color/colorPrimary_dark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:background">@color/colorBackground</item>
<!-- Customize your dark theme here. -->
<!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
</style>
<style name="Theme.I2D_Project_15_app" parent="Base.Theme.I2D_Project_15_app" />
</resources>

View File

@ -7,6 +7,4 @@
<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>

View File

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

View File

@ -8,8 +8,6 @@
<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>

View File

@ -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>