From 0cb9f3f94e6e794427407302cb8e31bf1dc22e74 Mon Sep 17 00:00:00 2001
From: scottlandis <scottalandis118@gmail.com>
Date: Sun, 30 Sep 2018 16:35:07 -0700
Subject: [PATCH 1/2] - sync with master

---
 torgi/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/torgi/build.gradle b/torgi/build.gradle
index 093dfa8..906485c 100644
--- a/torgi/build.gradle
+++ b/torgi/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "org.sofwerx.torgi"
         minSdkVersion 24
         targetSdkVersion 27
-        versionCode 4
-        versionName "1.0"
+        versionCode 5
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

From 0148fb0f016219276a80b4e26265af199a4d1531 Mon Sep 17 00:00:00 2001
From: scottlandis <scottalandis118@gmail.com>
Date: Mon, 1 Oct 2018 07:32:32 -0700
Subject: [PATCH 2/2] - some resources moved to be accessible for both flavors

---
 .../res/drawable-hdpi/ic_notification_connected.png | Bin
 .../res/drawable-hdpi/ic_notification_warning.png   | Bin
 .../res/drawable-mdpi/ic_notification_connected.png | Bin
 .../res/drawable-mdpi/ic_notification_warning.png   | Bin
 .../drawable-xhdpi/ic_notification_connected.png    | Bin
 .../res/drawable-xhdpi/ic_notification_warning.png  | Bin
 .../drawable-xxhdpi/ic_notification_connected.png   | Bin
 .../res/drawable-xxhdpi/ic_notification_warning.png | Bin
 .../drawable-xxxhdpi/ic_notification_connected.png  | Bin
 .../drawable-xxxhdpi/ic_notification_warning.png    | Bin
 torgi/src/main/res/values/strings.xml               |   5 +++++
 torgi/src/viewer/res/values/strings.xml             |   5 -----
 12 files changed, 5 insertions(+), 5 deletions(-)
 rename torgi/src/{viewer => main}/res/drawable-hdpi/ic_notification_connected.png (100%)
 rename torgi/src/{viewer => main}/res/drawable-hdpi/ic_notification_warning.png (100%)
 rename torgi/src/{viewer => main}/res/drawable-mdpi/ic_notification_connected.png (100%)
 rename torgi/src/{viewer => main}/res/drawable-mdpi/ic_notification_warning.png (100%)
 rename torgi/src/{viewer => main}/res/drawable-xhdpi/ic_notification_connected.png (100%)
 rename torgi/src/{viewer => main}/res/drawable-xhdpi/ic_notification_warning.png (100%)
 rename torgi/src/{viewer => main}/res/drawable-xxhdpi/ic_notification_connected.png (100%)
 rename torgi/src/{viewer => main}/res/drawable-xxhdpi/ic_notification_warning.png (100%)
 rename torgi/src/{viewer => main}/res/drawable-xxxhdpi/ic_notification_connected.png (100%)
 rename torgi/src/{viewer => main}/res/drawable-xxxhdpi/ic_notification_warning.png (100%)

diff --git a/torgi/src/viewer/res/drawable-hdpi/ic_notification_connected.png b/torgi/src/main/res/drawable-hdpi/ic_notification_connected.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-hdpi/ic_notification_connected.png
rename to torgi/src/main/res/drawable-hdpi/ic_notification_connected.png
diff --git a/torgi/src/viewer/res/drawable-hdpi/ic_notification_warning.png b/torgi/src/main/res/drawable-hdpi/ic_notification_warning.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-hdpi/ic_notification_warning.png
rename to torgi/src/main/res/drawable-hdpi/ic_notification_warning.png
diff --git a/torgi/src/viewer/res/drawable-mdpi/ic_notification_connected.png b/torgi/src/main/res/drawable-mdpi/ic_notification_connected.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-mdpi/ic_notification_connected.png
rename to torgi/src/main/res/drawable-mdpi/ic_notification_connected.png
diff --git a/torgi/src/viewer/res/drawable-mdpi/ic_notification_warning.png b/torgi/src/main/res/drawable-mdpi/ic_notification_warning.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-mdpi/ic_notification_warning.png
rename to torgi/src/main/res/drawable-mdpi/ic_notification_warning.png
diff --git a/torgi/src/viewer/res/drawable-xhdpi/ic_notification_connected.png b/torgi/src/main/res/drawable-xhdpi/ic_notification_connected.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-xhdpi/ic_notification_connected.png
rename to torgi/src/main/res/drawable-xhdpi/ic_notification_connected.png
diff --git a/torgi/src/viewer/res/drawable-xhdpi/ic_notification_warning.png b/torgi/src/main/res/drawable-xhdpi/ic_notification_warning.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-xhdpi/ic_notification_warning.png
rename to torgi/src/main/res/drawable-xhdpi/ic_notification_warning.png
diff --git a/torgi/src/viewer/res/drawable-xxhdpi/ic_notification_connected.png b/torgi/src/main/res/drawable-xxhdpi/ic_notification_connected.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-xxhdpi/ic_notification_connected.png
rename to torgi/src/main/res/drawable-xxhdpi/ic_notification_connected.png
diff --git a/torgi/src/viewer/res/drawable-xxhdpi/ic_notification_warning.png b/torgi/src/main/res/drawable-xxhdpi/ic_notification_warning.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-xxhdpi/ic_notification_warning.png
rename to torgi/src/main/res/drawable-xxhdpi/ic_notification_warning.png
diff --git a/torgi/src/viewer/res/drawable-xxxhdpi/ic_notification_connected.png b/torgi/src/main/res/drawable-xxxhdpi/ic_notification_connected.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-xxxhdpi/ic_notification_connected.png
rename to torgi/src/main/res/drawable-xxxhdpi/ic_notification_connected.png
diff --git a/torgi/src/viewer/res/drawable-xxxhdpi/ic_notification_warning.png b/torgi/src/main/res/drawable-xxxhdpi/ic_notification_warning.png
similarity index 100%
rename from torgi/src/viewer/res/drawable-xxxhdpi/ic_notification_warning.png
rename to torgi/src/main/res/drawable-xxxhdpi/ic_notification_warning.png
diff --git a/torgi/src/main/res/values/strings.xml b/torgi/src/main/res/values/strings.xml
index 311cbfc..7b4845c 100644
--- a/torgi/src/main/res/values/strings.xml
+++ b/torgi/src/main/res/values/strings.xml
@@ -20,6 +20,11 @@
     <string name="waiting_baseline">Establishing GNSS baseline…</string>
     <string name="invalid_url">Enter a valid URL</string>
 
+    <string name="action_switch_input">Source</string>
+    <string name="source_this_device">This device\'s sensors</string>
+    <string name="source_this_network">Sensor Observation Service</string>
+    <string name="source_network_hint">network address</string>
+
     <!--<string name="torgi_ready_share">TORGI collected new data</string>
     <string name="torgi_ready_share_narrative">TORGI has new data to send back</string>-->
     <string name="share">Share</string>
diff --git a/torgi/src/viewer/res/values/strings.xml b/torgi/src/viewer/res/values/strings.xml
index 3db0986..d462d78 100644
--- a/torgi/src/viewer/res/values/strings.xml
+++ b/torgi/src/viewer/res/values/strings.xml
@@ -16,11 +16,6 @@
     <string name="risk_high">GNSS Risk HIGH</string>
     <string name="risk_unknown">Determining current GNSS risk...</string>
 
-    <string name="action_switch_input">Source</string>
-    <string name="source_this_device">This device\'s sensors</string>
-    <string name="source_this_network">Sensor Observation Service</string>
-    <string name="source_network_hint">network address</string>
-
     <!-- About -->
     <string name="legal">Legal</string>
     <string name="acknowledgements">Acknowledgements</string>