Merge branch 'master' into develop

README.md

@@ -2,7 +2,33 @@
 
 This is the app for the enviroCar platform. (www.envirocar.org)
 
-## Installation
+## Description
+
+### XFCD Mobile Data Collection and Analysis
+
+**Collecting and analyzing vehicle sensor data**
+
+enviroCar Mobile is an Android application for smartphones that can be used to collect Extended Floating Car Data (XFCD). The app communicates with an OBD2 Bluetooth adapter while the user drives. This enables read access to data from the vehicle’s engine control. The data is recorded along with the smartphone’s GPS position data.The driver can view statistics about his drives and publish his data as open data. The latter happens by uploading tracks to the enviroCar server, where the data is available under the ODbL license for further analysis and use. The data can also be viewed and analyzed via the enviroCar website. enviroCar Mobile is one of the enviroCar Citizen Science Platform’s components (www.envirocar.org).
+
+
+**Key Technologies**
+
+-	Android
+-	Java
+
+**Benefits**
+
+-	Easy collection of Extended Floating Car Data
+- Optional automation of data collection and upload
+- Estimation of fuel consumption and CO2 emissions
+- Publishing anonymized track data as Open Data
+- Map based visualization of track data and track statistics
+
+
+## Quick Start 
+
+
+### Installation
 
 Use the [Google Play Store](https://play.google.com/store/apps/details?id=org.envirocar.app) to install the app on your device.
 
@@ -50,11 +76,20 @@ The enviroCar App is licensed under the [GNU General Public License, Version 3](
 |Short Term Trim 1      |%   	|   	|   	|   	|
 
 
+## Changelog
+
+Check out the [Changelog](https://github.com/enviroCar/enviroCar-app/blob/master/CHANGELOG.md) for current changes.
+
 ## OBD simulator
 
 The repository also contains a simple OBD simulator (dumb, nothing fancy) that can
 be used on another Android device and mock the actual car adapter.
 
+## References
+
+This app is in operational use in the [CITRAM - Citizen Science for Traffic Management](https://www.citram.de/) project. Check out the [enviroCar website](https://envirocar.org/) for more information about the enviroCar project.
+
+
 ## Contributors
 
-[Here is the list of contributors to this project](https://github.com/enviroCar/enviroCar-app/blob/master/CONTRIBUTORS.md)
+Here is the list of [contributors to this project](https://github.com/enviroCar/enviroCar-app/blob/master/CONTRIBUTORS.md)

org.envirocar.app/src/org/envirocar/app/views/dashboard/DashboardFragment.java

@@ -26,6 +26,7 @@
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.transition.AutoTransition;
 import android.transition.ChangeBounds;
 import android.transition.Slide;
@@ -441,25 +442,29 @@ protected void onStartTrackButtonClicked() {
     @OnClick(R.id.fragment_dashboard_indicator_car)
     protected void onCarIndicatorClicked() {
         LOG.info("Car Indicator clicked");
-        // TODO
+        Intent intent = new Intent(getActivity(), CarSelectionActivity.class);
+        getActivity().startActivity(intent);
     }
 
     @OnClick(R.id.fragment_dashboard_indicator_obd)
     protected void onObdIndicatorClicked() {
         LOG.info("OBD indicator clicked");
-        // TODO
+        Intent intent = new Intent(getActivity(), OBDSelectionActivity.class);
+        getActivity().startActivity(intent);
     }
 
     @OnClick(R.id.fragment_dashboard_indicator_bluetooth)
     protected void onBluetoothIndicatorClicked() {
         LOG.info("Bluetooth indicator clicked");
-        // TODO
+        Intent intent = new Intent(getActivity(), OBDSelectionActivity.class);
+        getActivity().startActivity(intent);
     }
 
     @OnClick(R.id.fragment_dashboard_indicator_gps)
     protected void onGPSIndicatorClicked() {
         LOG.info("GPS indicator clicked");
-        // TODO
+        Intent intent=new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+        getActivity().startActivity(intent);
     }
 
     @Subscribe