Skip to content
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

scan settings from QR code #3

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

scan settings from QR code #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
009208e
Add function to scan settings from QR code.
poempelfox Mar 30, 2013
a0e78e7
also allow to scan just the server-URL via QR code and show error mes…
poempelfox Mar 31, 2013
70cd16d
include our username in the webpagerequest.
poempelfox Mar 31, 2013
2ae739e
use existing function in Util.java instead of copy+pasteing the whole…
poempelfox Mar 31, 2013
f9377fe
add two checkboxes to settings to allow selecting between network and…
poempelfox Mar 31, 2013
973c0c1
s/http/http-error/ in exception-string
poempelfox Mar 31, 2013
031bfa3
First but not very successful attempts at https-Support. Unfortunatel…
poempelfox Mar 31, 2013
d29c474
remove unused old debug counter, add location to location-changed log…
poempelfox Mar 31, 2013
a933278
implement setting for requested gps update rate.
poempelfox Apr 24, 2013
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
12 changes: 6 additions & 6 deletions mobile/android/res/layout/locus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
>
<WebView
android:id="@+id/webView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
/>
android:layout_height="fill_parent" />

<TextView
android:id="@+id/setupLabel"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="@string/setup"
android:visibility="gone"
/>
</LinearLayout>
android:visibility="gone" />

</LinearLayout>
33 changes: 32 additions & 1 deletion mobile/android/res/layout/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
<!--<TextView
Expand Down Expand Up @@ -71,6 +71,37 @@
android:layout_height="wrap_content"
android:inputType="number"
/>

<CheckBox
android:id="@+id/useNetworkLocation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/useNetworkLocationLabel" />

<CheckBox
android:id="@+id/useGPSLocation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/useGPSLocationLabel" />

<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gpsupdreqtext" />

<Spinner
android:id="@+id/gpsreqrate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/gpsupdreqfs" />

<Button
android:id="@+id/qrscanButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/qrscanButton" />

<Button
android:id="@+id/saveButton"
android:layout_width="match_parent"
Expand Down
12 changes: 12 additions & 0 deletions mobile/android/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,16 @@
<string name="tag">Tag</string>
<string name="name">Name</string>
<string name="cancel">Cancel</string>
<string name="qrscanButton">Scan settings from QR code</string>
<string name="useNetworkLocationLabel">Use network location</string>
<string name="useGPSLocationLabel">Use GPS Location</string>
<string name="errormsg_needalocationsource">ERROR: You need to enable at least one of the Network/GPS location checkboxes</string>
<string name="errormsg_invalidurl_nohttp">ERROR: URL needs to start with http:// or https://</string>
<string name="toastmsg_settings_saved">Settings saved.</string>
<string name="gpsupdreqtext">Request GPS Updates</string>
<string-array name="gpsupdreqfs">
<item>Twice per Update Tick</item>
<item>Once per Update Tick</item>
<item>Always</item>
</string-array>
</resources>
Loading