From 1b9a4defe73f3aa8c10aa4af49002f0cebd1c292 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 4 Jan 2015 11:12:12 +0100
Subject: o Adding SoilMonitors support in core and view. Still more to do.

---
 app/src/main/res/layout/main.xml        | 15 +++++++++++++
 app/src/main/res/menu/gatt_services.xml | 29 --------------------------
 app/src/main/res/menu/main.xml          | 37 ++++++++++++++++++---------------
 app/src/main/res/menu/menu_main.xml     |  5 -----
 app/src/main/res/values/strings.xml     |  2 ++
 5 files changed, 37 insertions(+), 51 deletions(-)
 create mode 100644 app/src/main/res/layout/main.xml
 delete mode 100644 app/src/main/res/menu/gatt_services.xml
 delete mode 100644 app/src/main/res/menu/menu_main.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
new file mode 100644
index 0000000..c96edfd
--- /dev/null
+++ b/app/src/main/res/layout/main.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:paddingStart="8dp"
+              android:paddingEnd="8dp">
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/menu/gatt_services.xml b/app/src/main/res/menu/gatt_services.xml
deleted file mode 100644
index 25d64b6..0000000
--- a/app/src/main/res/menu/gatt_services.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_refresh"
-        android:checkable="false"
-        android:orderInCategory="1"
-        android:showAsAction="ifRoom"/>
-    <item android:id="@+id/menu_connect"
-        android:title="@string/menu_connect"
-        android:orderInCategory="100"
-        android:showAsAction="ifRoom|withText"/>
-    <item android:id="@+id/menu_disconnect"
-        android:title="@string/menu_disconnect"
-        android:orderInCategory="101"
-        android:showAsAction="ifRoom|withText"/>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 08b604e..2272040 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/menu_refresh"
         android:checkable="false"
         android:orderInCategory="1"
         android:showAsAction="ifRoom"/>
-    <item android:id="@+id/menu_scan"
+
+    <item
+        android:id="@+id/menu_scan"
         android:title="@string/menu_scan"
         android:orderInCategory="100"
         android:showAsAction="ifRoom|withText"/>
-    <item android:id="@+id/menu_stop"
+
+    <item
+        android:id="@+id/menu_stop"
         android:title="@string/menu_stop"
         android:orderInCategory="101"
         android:showAsAction="ifRoom|withText"/>
-</menu>
\ No newline at end of file
+
+    <item
+        android:id="@+id/menu_group_by_device"
+        android:title="@string/group_by_device"
+        android:orderInCategory="140"
+        android:checkable="true"/>
+
+    <item
+        android:id="@+id/menu_show_all"
+        android:title="@string/show_all"
+        android:orderInCategory="150"
+        android:checkable="true"/>
+
+</menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
deleted file mode 100644
index 87a750e..0000000
--- a/app/src/main/res/menu/menu_main.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity">
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" android:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8aa5e33..0764a26 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,5 +31,7 @@
     <string name="title_name">Name</string>
     <string name="refresh">Refresh</string>
     <string name="current_value">Current value</string>
+    <string name="show_all">Show all</string>
+    <string name="group_by_device">Group by device</string>
 
 </resources>
-- 
cgit v1.2.3