From eba7b2ef8ef23bdb61b0390e47be6f27ffde31dc Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Fri, 8 Mar 2013 19:41:32 +1300 Subject: altosdroid: fix side-to-side scrolling in map tab Signed-off-by: Mike Beattie --- .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 4 +- .../org/altusmetrum/AltosDroid/AltosViewPager.java | 43 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java (limited to 'altosdroid/src') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 63043abd..c9ce46a0 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -80,7 +80,7 @@ public class AltosDroid extends FragmentActivity { // Tabs TabHost mTabHost; - ViewPager mViewPager; + AltosViewPager mViewPager; TabsAdapter mTabsAdapter; ArrayList mTabs = new ArrayList(); @@ -272,7 +272,7 @@ public class AltosDroid extends FragmentActivity { mTabHost = (TabHost)findViewById(android.R.id.tabhost); mTabHost.setup(); - mViewPager = (ViewPager)findViewById(R.id.pager); + mViewPager = (AltosViewPager)findViewById(R.id.pager); mViewPager.setOffscreenPageLimit(4); mTabsAdapter = new TabsAdapter(this, mTabHost, mViewPager); diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java new file mode 100644 index 00000000..ebddc266 --- /dev/null +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java @@ -0,0 +1,43 @@ +/* + * Copyright © 2013 Mike Beattie + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +package org.altusmetrum.AltosDroid; + +import android.content.Context; +import android.support.v4.view.ViewPager; +import android.util.AttributeSet; +import android.view.View; + +public class AltosViewPager extends ViewPager { + + public AltosViewPager(Context context) { + super(context); + } + + public AltosViewPager(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected boolean canScroll(View v, boolean checkV, int dx, int x, int y) { + if(v.getClass().getPackage().getName().startsWith("maps.")){ + return true; + } + return super.canScroll(v, checkV, dx, x, y); + } + +} \ No newline at end of file -- cgit v1.2.3 From b7c82b867b12ca016164725f3736bc5b55048999 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Sun, 10 Mar 2013 20:40:13 +1300 Subject: altosdroid: programmatically create map fragment * Allows reliable fetching of a GoogleMap handle. * Set map options, initial location (NCR North for now, temporarily) * Add some info fields below map, and update them accordingly Signed-off-by: Mike Beattie --- altosdroid/res/layout/tab_map.xml | 120 ++++++++++++++++++++- .../src/org/altusmetrum/AltosDroid/TabMap.java | 63 +++++++++-- 2 files changed, 174 insertions(+), 9 deletions(-) (limited to 'altosdroid/src') diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml index 4737fae0..b9f4e69e 100644 --- a/altosdroid/res/layout/tab_map.xml +++ b/altosdroid/res/layout/tab_map.xml @@ -15,8 +15,122 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --> - + android:orientation="vertical" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java index b30b4694..7161a340 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java @@ -17,9 +17,13 @@ package org.altusmetrum.AltosDroid; -import org.altusmetrum.altoslib_1.AltosState; +import org.altusmetrum.altoslib_1.*; + +import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; +import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.LatLng; import android.app.Activity; import android.os.Bundle; @@ -28,12 +32,19 @@ import android.support.v4.app.FragmentTransaction; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; public class TabMap extends Fragment implements AltosDroidTab { AltosDroid mAltosDroid; + private SupportMapFragment mMapFragment; private GoogleMap mMap; + private boolean mapLoaded = false; + private TextView mDistanceView; + private TextView mBearingView; + private TextView mLatitudeView; + private TextView mLongitudeView; @Override public void onAttach(Activity activity) { @@ -42,12 +53,36 @@ public class TabMap extends Fragment implements AltosDroidTab { mAltosDroid.registerTab(this); } + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mMapFragment = new SupportMapFragment() { + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + setupMap(); + } + }; + + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.tab_map, container, false); + mDistanceView = (TextView)v.findViewById(R.id.distance_value); + mBearingView = (TextView)v.findViewById(R.id.bearing_value); + mLatitudeView = (TextView)v.findViewById(R.id.lat_value); + mLongitudeView = (TextView)v.findViewById(R.id.lon_value); return v; } + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + getChildFragmentManager().beginTransaction().add(R.id.map, mMapFragment).commit(); + } + @Override public void onDestroyView() { super.onDestroyView(); @@ -61,12 +96,28 @@ public class TabMap extends Fragment implements AltosDroidTab { //ft.commit(); } + private void setupMap() { + mMap = mMapFragment.getMap(); + if (mMap != null) { + mMap.setMyLocationEnabled(true); + mMap.getUiSettings().setTiltGesturesEnabled(false); + mMap.getUiSettings().setZoomControlsEnabled(false); + mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(40.8,-104.7),8)); + + mapLoaded = true; + } + } + public void update_ui(AltosState state) { -// mRangeView.setText(String.format("%6.0f m", state.range)); -// if (state.from_pad != null) -// mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing)); -// mLatitudeView.setText(pos(state.gps.lat, "N", "S")); -// mLongitudeView.setText(pos(state.gps.lon, "W", "E")); + if (state.from_pad != null) { + mDistanceView.setText(String.format("%6.0f m", state.from_pad.distance)); + mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing)); + } + mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S")); + mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E")); + + if (mapLoaded) { + } } } -- cgit v1.2.3 From b691fc48f5e879045e68e070162af56cd08f03b4 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Sun, 10 Mar 2013 23:27:28 +1300 Subject: altosdroid: Add rocket and pad map markers Signed-off-by: Mike Beattie --- altosdroid/res/drawable/pad.png | Bin 0 -> 584 bytes altosdroid/res/drawable/rocket.png | Bin 0 -> 1286 bytes .../src/org/altusmetrum/AltosDroid/TabMap.java | 25 +++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 altosdroid/res/drawable/pad.png create mode 100644 altosdroid/res/drawable/rocket.png (limited to 'altosdroid/src') diff --git a/altosdroid/res/drawable/pad.png b/altosdroid/res/drawable/pad.png new file mode 100644 index 00000000..b2e65c8a Binary files /dev/null and b/altosdroid/res/drawable/pad.png differ diff --git a/altosdroid/res/drawable/rocket.png b/altosdroid/res/drawable/rocket.png new file mode 100644 index 00000000..7e62f6c4 Binary files /dev/null and b/altosdroid/res/drawable/rocket.png differ diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java index 7161a340..87e4f0bf 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java @@ -23,7 +23,10 @@ import org.altusmetrum.altoslib_1.*; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.LatLng; +import com.google.android.gms.maps.model.Marker; +import com.google.android.gms.maps.model.MarkerOptions; import android.app.Activity; import android.os.Bundle; @@ -41,6 +44,8 @@ public class TabMap extends Fragment implements AltosDroidTab { private GoogleMap mMap; private boolean mapLoaded = false; + private Marker mRocketMarker; + private Marker mPadMarker; private TextView mDistanceView; private TextView mBearingView; private TextView mLatitudeView; @@ -104,6 +109,19 @@ public class TabMap extends Fragment implements AltosDroidTab { mMap.getUiSettings().setZoomControlsEnabled(false); mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(40.8,-104.7),8)); + mRocketMarker = mMap.addMarker( + // From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/ + new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.rocket)) + .position(new LatLng(0,0)) + .visible(false) + ); + + mPadMarker = mMap.addMarker( + new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.pad)) + .position(new LatLng(0,0)) + .visible(false) + ); + mapLoaded = true; } } @@ -117,6 +135,13 @@ public class TabMap extends Fragment implements AltosDroidTab { mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E")); if (mapLoaded) { + mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon)); + mRocketMarker.setVisible(true); + + if (state.state == AltosLib.ao_flight_pad) { + mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon)); + mPadMarker.setVisible(true); + } } } -- cgit v1.2.3 From d7973de32adff5402844cc1e1da3eced05265074 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Sun, 10 Mar 2013 23:28:26 +1300 Subject: altosdroid: Add map polyline between pad and rocket Signed-off-by: Mike Beattie --- altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'altosdroid/src') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java index 87e4f0bf..8fc8f592 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java @@ -17,6 +17,7 @@ package org.altusmetrum.AltosDroid; +import java.util.Arrays; import org.altusmetrum.altoslib_1.*; @@ -27,8 +28,11 @@ import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; +import com.google.android.gms.maps.model.Polyline; +import com.google.android.gms.maps.model.PolylineOptions; import android.app.Activity; +import android.graphics.Color; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; @@ -46,6 +50,8 @@ public class TabMap extends Fragment implements AltosDroidTab { private Marker mRocketMarker; private Marker mPadMarker; + private Polyline mPolyline; + private TextView mDistanceView; private TextView mBearingView; private TextView mLatitudeView; @@ -122,6 +128,13 @@ public class TabMap extends Fragment implements AltosDroidTab { .visible(false) ); + mPolyline = mMap.addPolyline( + new PolylineOptions().add(new LatLng(0,0), new LatLng(0,0)) + .width(3) + .color(Color.BLUE) + .visible(false) + ); + mapLoaded = true; } } @@ -138,6 +151,9 @@ public class TabMap extends Fragment implements AltosDroidTab { mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon)); mRocketMarker.setVisible(true); + mPolyline.setPoints(Arrays.asList(new LatLng(state.pad_lat, state.pad_lon), new LatLng(state.gps.lat, state.gps.lon))); + mPolyline.setVisible(true); + if (state.state == AltosLib.ao_flight_pad) { mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon)); mPadMarker.setVisible(true); -- cgit v1.2.3