From f8f7ed75bf34287b129b5e6ce01a113858c51d1d Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Fri, 21 Sep 2018 15:59:10 +0100 Subject: [PATCH] Tweaks to text, another attempted fix for 0,0 --- .gitignore | 1 + .idea/misc.xml | 2 +- .../main/java/uk/ac/masts/sifids/CatchApplication.java | 2 +- .../uk/ac/masts/sifids/services/CatchLocationService.java | 3 ++- catch/src/main/res/layout/activity_fish_1_forms.xml | 3 ++- catch/src/main/res/values/strings.xml | 8 ++++---- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 182b8fc..c7fb4e2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ .externalNativeBuild .idea/caches/ catch/src/main/res/values/keys.xml +tags diff --git a/.idea/misc.xml b/.idea/misc.xml index 48eb1be..3b4d06d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -45,7 +45,7 @@ - + diff --git a/catch/src/main/java/uk/ac/masts/sifids/CatchApplication.java b/catch/src/main/java/uk/ac/masts/sifids/CatchApplication.java index bbf1041..42b37ca 100644 --- a/catch/src/main/java/uk/ac/masts/sifids/CatchApplication.java +++ b/catch/src/main/java/uk/ac/masts/sifids/CatchApplication.java @@ -28,7 +28,7 @@ */ public class CatchApplication extends Application { - public final static String VERSION = "0.6.4"; + public final static String VERSION = "0.6.5"; public final static TimeZone TIME_ZONE = TimeZone.getTimeZone("TIME_ZONE"); diff --git a/catch/src/main/java/uk/ac/masts/sifids/services/CatchLocationService.java b/catch/src/main/java/uk/ac/masts/sifids/services/CatchLocationService.java index 96320dc..f7acbe0 100644 --- a/catch/src/main/java/uk/ac/masts/sifids/services/CatchLocationService.java +++ b/catch/src/main/java/uk/ac/masts/sifids/services/CatchLocationService.java @@ -54,7 +54,8 @@ public LocationListener(String provider) { //Update location and persist @Override public void onLocationChanged(Location location) { - if(location.getAccuracy() > 0.0) { + if(location.getAccuracy() > 0.01) { + Log.e("LOCATION","Location logged with accuracy "+location.getAccuracy()); mLastLocation.set(location); this.writeLocation(); } diff --git a/catch/src/main/res/layout/activity_fish_1_forms.xml b/catch/src/main/res/layout/activity_fish_1_forms.xml index 816a7f9..9569df4 100644 --- a/catch/src/main/res/layout/activity_fish_1_forms.xml +++ b/catch/src/main/res/layout/activity_fish_1_forms.xml @@ -108,6 +108,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" + android:gravity="center_horizontal" android:text="@string/fish_1_forms_header" /> - \ No newline at end of file + diff --git a/catch/src/main/res/values/strings.xml b/catch/src/main/res/values/strings.xml index 212a7fa..e0ce868 100644 --- a/catch/src/main/res/values/strings.xml +++ b/catch/src/main/res/values/strings.xml @@ -19,7 +19,7 @@ Owner/Master Address Owner/Master Email Address - Usual Ports + Usual Landing and Departing Ports Ports Gear Details @@ -45,7 +45,7 @@ We invite you to participate in a research project aimed at improving the sustainability within commercial inshore fisheries (i.e. vessels of 12m or less fishing out to the 12nm limit). This project aims to trial ways to capture information that could contribute to the industry’s long-term sustainability and profitability. The project aims to generate this information through industry gathered data via a mobile phone application (Android App) that can be used within the scope of marine spatial planning and fisheries management. The project also seeks to identify how the App could provide a platform to capture useful observations and experiential information from fishers in a standardised format so that these data can either in isolation or collated over time, contribute to fisheries management and marine planning. This will involve engagement (through a trial using the mobile phone App) with a sample of inshore fishers to study the quality of the data provided through the App and will enable a better understanding of the fishing activities. This study is being conducted as part of the Scottish Inshore Fisheries Integrated Database System (SIFIDS) project, led by Dr Mark James who is based the University of St Andrews, Scotland. What does the App do? - With your agreement, we would like you to start using our App’s FISH1 form to record information about your daily catches. All information will be sent securely, via email, from your phone to your local Fishery Office and to researchers at the University of St Andrews. The FISH1 form will be available to for you review at any time in the App and can be sent to yours/the masters email address. The App has been approved by Marine Scotland for this trial. + With your agreement, we would like you to start using our App’s FISH1 form to record information about your daily catches. All information will be sent securely, via email, from your phone to your local Fishery Office and to researchers at the University of St Andrews. The FISH1 form will be available to for you review at any time in the App and can be sent to your/the master's email address. The App has been approved by Marine Scotland for this trial. If you are willing to assist us further, we would like to collect some GPS tracking data using the App whilst you are fishing. The GPS track will only be seen by researchers and yourself. This will allow the researchers to understand the areas you fish and frequency you fish in these locations. There is also an observation reporter. This will allow you to record unusual sightings or interactions with wildlife such as whales, dolphins, wrasse and octopus whilst fishing. This information will only be seen by researchers and yourself. These observations will provide useful, often unrecorded information on the distribution of these species. After the trial, we will seek your feedback on the overall functionality of the App and how we might improve it. Please be assured that all the information and data that we collect in this research project will be treated as STRICTLY CONFIDENTIAL. The results will be analysed and presented in such a way that no personal details or information which might compromise your fishing activities will be made public. @@ -105,7 +105,7 @@ Email Telephone Number FISH1/ logbook Data Access Consent - 12. I, the fishing license holder named below, agree for the researchers at the University of St Andrews to have access to the data submitted via the FISH1 form through the mobile phone application developed by the University of St Andrews for the purposes of research under the EMFF SIFIDS Project for the above stated vessel. + 12. I, the fishing licence holder named below, agree for the researchers at the University of St Andrews to have access to the data submitted via the FISH1 form through the mobile phone application developed by the University of St Andrews for the purposes of research under the EMFF SIFIDS Project for the above stated vessel. The information provided will span the period 1st December 2016 to 31st May 2019 (the duration of the SIFIDS Project). I accept all the numbered statements above I confirm that I accept all statements 1 to 12 above to be true, and that all details I have entered here are correct. @@ -129,7 +129,7 @@ Stopped tracking location Recorded location information will now indicate that you are fishing Recorded location information will no longer indicate that you are fishing - FISH1 Forms + FISH1 Forms (for owners of vessels 10m and under only)