Skip to content

Moved some resources to fix Logger flavor build #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianblenke merged 2 commits into from
Oct 1, 2018
Merged

Moved some resources to fix Logger flavor build #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cb9f3f
- sync with master
scottlandis Sep 30, 2018
0148fb0
- some resources moved to be accessible for both flavors
scottlandis Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions torgi/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...awable-hdpi/ic_notification_connected.png → ...awable-hdpi/ic_notification_connected.png
View file
Open in desktop
File renamed without changes
0 ...drawable-hdpi/ic_notification_warning.png → ...drawable-hdpi/ic_notification_warning.png
View file
Open in desktop
File renamed without changes
0 ...awable-mdpi/ic_notification_connected.png → ...awable-mdpi/ic_notification_connected.png
View file
Open in desktop
File renamed without changes
0 ...drawable-mdpi/ic_notification_warning.png → ...drawable-mdpi/ic_notification_warning.png
View file
Open in desktop
File renamed without changes
0 ...wable-xhdpi/ic_notification_connected.png → ...wable-xhdpi/ic_notification_connected.png
View file
Open in desktop
File renamed without changes
0 ...rawable-xhdpi/ic_notification_warning.png → ...rawable-xhdpi/ic_notification_warning.png
View file
Open in desktop
File renamed without changes
0 ...able-xxhdpi/ic_notification_connected.png → ...able-xxhdpi/ic_notification_connected.png
View file
Open in desktop
File renamed without changes
0 ...awable-xxhdpi/ic_notification_warning.png → ...awable-xxhdpi/ic_notification_warning.png
View file
Open in desktop
File renamed without changes
0 ...ble-xxxhdpi/ic_notification_connected.png → ...ble-xxxhdpi/ic_notification_connected.png
View file
Open in desktop
File renamed without changes
0 ...wable-xxxhdpi/ic_notification_warning.png → ...wable-xxxhdpi/ic_notification_warning.png
View file
Open in desktop
File renamed without changes
5 changes: 5 additions & 0 deletions torgi/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions torgi/src/viewer/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down