summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/menu/menu_main.xml7
-rw-r--r--app/src/main/res/values/strings.xml6
2 files changed, 5 insertions, 8 deletions
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 5320159..b11af65 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,13 +2,10 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.javispedro.rempe.MainActivity">
- <item
- android:id="@+id/action_remove_all"
- android:orderInCategory="100"
- android:title="Remove all" />
+
<item
android:id="@+id/action_settings"
- android:orderInCategory="101"
+ android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never" />
</menu> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7db9d07..c6832b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,16 +1,16 @@
<resources>
<string name="app_name">Rempe</string>
- <string name="action_remove_all">Remove all</string>
<string name="action_settings">Settings</string>
- <string name="fab_add_device">Add device...</string>
+ <string name="fab_add_device">Add device…</string>
<string name="add_device_failed">Cannot connect to device: %1$s</string>
<string name="add_device_already">Device already on list</string>
+ <string name="remove_device_done">Device removed</string>
<string name="device_placeholder_name">Device</string>
<string name="device_placeholder_status">Status</string>
- <string name="temperature_nothing">--</string>
+ <string name="temperature_nothing">—</string>
<string name="temperature_celsius">%1$s °C</string>
<string name="last_24h">Last 24h:</string>