Merge https://github.com/VandyMobile/guide-android

Conflicts: .gitignore GuideAndroid/src/edu/vanderbilt/vm/guide/ui/AgendaFragment.java GuideAndroid/src/edu/vanderbilt/vm/guide/ui/StatsFragment.java GuideAndroid/src/edu/vanderbilt/vm/guide/ui/adapter/PlaceItemView.java JakeWharton-ActionBarSherlock-88fc341/library/libs/android-support-v4.jar
VandyApps · Jun 12, 2013 · 39f945a · 39f945a
2 parents 7590c05 + b74bbf1
commit 39f945a
Show file tree

Hide file tree

Showing 83 changed files with 1,376 additions and 721 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@
 target/
 bin/
 gen/
-.classpath
+*.orig
 
 # Local configuration file (sdk path, etc)
 local.properties

diff --git a/GuideAndroid/.classpath b/GuideAndroid/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/GuideAndroid/assets/nodes.json b/GuideAndroid/assets/nodes.json
diff --git a/GuideAndroid/pom.xml b/GuideAndroid/pom.xml
@@ -70,6 +70,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
       <version>2.2.4</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>support-v4</artifactId>
+      <version>r6</version>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/GuideAndroid/project.properties b/GuideAndroid/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-17
+target=android-16
 
 android.library.reference.1=../google-play-services_lib
-android.library.reference.2=../../../Apps/localeats/ActionBarSherlock
+android.library.reference.2=../JakeWharton-ActionBarSherlock-88fc341/library
diff --git a/...Android/res/layout/navigator_chooser3.xml → .../res/layout/fragment_agenda_navigator.xml b/...Android/res/layout/navigator_chooser3.xml → .../res/layout/fragment_agenda_navigator.xml
diff --git a/...eAndroid/res/layout/navigator_chooser.xml → ...d/res/layout/fragment_place_navigator.xml b/...eAndroid/res/layout/navigator_chooser.xml → ...d/res/layout/fragment_place_navigator.xml
diff --git a/GuideAndroid/res/layout/navigator_chooser2.xml b/GuideAndroid/res/layout/navigator_chooser2.xml
diff --git a/GuideAndroid/res/layout/place_list_item.xml b/GuideAndroid/res/layout/place_list_item.xml
@@ -31,7 +31,7 @@
         android:orientation="horizontal" >
 
         <ImageView
-            android:id="@+id/placelist_item_thunbnail"
+            android:id="@+id/placelist_item_thumbnail"
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_gravity="center"

diff --git a/GuideAndroid/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java b/GuideAndroid/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
@@ -0,0 +1,144 @@
+package android.support.v4.app;
+
+import android.util.Log;
+import android.view.View;
+import android.view.Window;
+import com.actionbarsherlock.ActionBarSherlock.OnCreatePanelMenuListener;
+import com.actionbarsherlock.ActionBarSherlock.OnMenuItemSelectedListener;
+import com.actionbarsherlock.ActionBarSherlock.OnPreparePanelListener;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
+import java.util.ArrayList;
+
+/** I'm in ur package. Stealing ur variables. */
+public abstract class _ActionBarSherlockTrojanHorse extends FragmentActivity implements OnCreatePanelMenuListener, OnPreparePanelListener, OnMenuItemSelectedListener {
+    private static final boolean DEBUG = false;
+    private static final String TAG = "_ActionBarSherlockTrojanHorse";
+
+    /** Fragment interface for menu creation callback. */
+    public interface OnCreateOptionsMenuListener {
+        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater);
+    }
+    /** Fragment interface for menu preparation callback. */
+    public interface OnPrepareOptionsMenuListener {
+        public void onPrepareOptionsMenu(Menu menu);
+    }
+    /** Fragment interface for menu item selection callback. */
+    public interface OnOptionsItemSelectedListener {
+      public boolean onOptionsItemSelected(MenuItem item);
+    }
+
+    private ArrayList<Fragment> mCreatedMenus;
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Sherlock menu handling
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public boolean onCreatePanelMenu(int featureId, Menu menu) {
+        if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu);
+
+        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
+            boolean result = onCreateOptionsMenu(menu);
+            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] activity create result: " + result);
+
+            MenuInflater inflater = getSupportMenuInflater();
+            boolean show = false;
+            ArrayList<Fragment> newMenus = null;
+            if (mFragments.mActive != null) {
+                for (int i = 0; i < mFragments.mAdded.size(); i++) {
+                    Fragment f = mFragments.mAdded.get(i);
+                    if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnCreateOptionsMenuListener) {
+                        show = true;
+                        ((OnCreateOptionsMenuListener)f).onCreateOptionsMenu(menu, inflater);
+                        if (newMenus == null) {
+                            newMenus = new ArrayList<Fragment>();
+                        }
+                        newMenus.add(f);
+                    }
+                }
+            }
+
+            if (mCreatedMenus != null) {
+                for (int i = 0; i < mCreatedMenus.size(); i++) {
+                    Fragment f = mCreatedMenus.get(i);
+                    if (newMenus == null || !newMenus.contains(f)) {
+                        f.onDestroyOptionsMenu();
+                    }
+                }
+            }
+
+            mCreatedMenus = newMenus;
+
+            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] fragments create result: " + show);
+            result |= show;
+
+            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result);
+            return result;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onPreparePanel(int featureId, View view, Menu menu) {
+        if (DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + " menu: " + menu);
+
+        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
+            boolean result = onPrepareOptionsMenu(menu);
+            if (DEBUG) Log.d(TAG, "[onPreparePanel] activity prepare result: " + result);
+
+            boolean show = false;
+            if (mFragments.mActive != null) {
+                for (int i = 0; i < mFragments.mAdded.size(); i++) {
+                    Fragment f = mFragments.mAdded.get(i);
+                    if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnPrepareOptionsMenuListener) {
+                        show = true;
+                        ((OnPrepareOptionsMenuListener)f).onPrepareOptionsMenu(menu);
+                    }
+                }
+            }
+
+            if (DEBUG) Log.d(TAG, "[onPreparePanel] fragments prepare result: " + show);
+            result |= show;
+
+            result &= menu.hasVisibleItems();
+            if (DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result);
+            return result;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        if (DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item);
+
+        if (featureId == Window.FEATURE_OPTIONS_PANEL) {
+            if (onOptionsItemSelected(item)) {
+                return true;
+            }
+
+            if (mFragments.mActive != null) {
+                for (int i = 0; i < mFragments.mAdded.size(); i++) {
+                    Fragment f = mFragments.mAdded.get(i);
+                    if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnOptionsItemSelectedListener) {
+                        if (((OnOptionsItemSelectedListener)f).onOptionsItemSelected(item)) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public abstract boolean onCreateOptionsMenu(Menu menu);
+
+    public abstract boolean onPrepareOptionsMenu(Menu menu);
+
+    public abstract boolean onOptionsItemSelected(MenuItem item);
+
+    public abstract MenuInflater getSupportMenuInflater();
+}
diff --git a/GuideAndroid/src/edu/vanderbilt/vm/guide/ui/AgendaFragment.java b/GuideAndroid/src/edu/vanderbilt/vm/guide/ui/AgendaFragment.java
@@ -118,9 +118,13 @@ public void onClick(View v) {
 
                 }
 
-                Toast.makeText(getActivity(),
-                        "Removed " + checkedSet.size() + " Places from the Agenda",
-                        Toast.LENGTH_LONG).show();
+                if (checkedSet.size() == 1) {
+                    Toast.makeText(getActivity(), "Removed 1 place from the Agenda",
+                            Toast.LENGTH_LONG).show();
+                } else if (checkedSet.size() > 1) {
+                    Toast.makeText(getActivity(), "Removed " + checkedSet.size() + " places from the Agenda",
+                            Toast.LENGTH_LONG).show();
+                }
 
                 v.setVisibility(View.GONE);
                 mEditButton.setVisibility(View.VISIBLE);

diff --git a/GuideAndroid/src/edu/vanderbilt/vm/guide/ui/AgendaMapFrag.java b/GuideAndroid/src/edu/vanderbilt/vm/guide/ui/AgendaMapFrag.java
@@ -2,7 +2,11 @@
 package edu.vanderbilt.vm.guide.ui;
 
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 
+import org.jgrapht.graph.DefaultWeightedEdge;
+import org.jgrapht.graph.SimpleWeightedGraph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,6 +24,7 @@
 import com.google.android.gms.maps.GoogleMap.OnMapLongClickListener;
 import com.google.android.gms.maps.GoogleMap.OnMarkerClickListener;
 import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
@@ -30,16 +35,18 @@
 import edu.vanderbilt.vm.guide.R;
 import edu.vanderbilt.vm.guide.container.Agenda;
 import edu.vanderbilt.vm.guide.container.Graph;
+import edu.vanderbilt.vm.guide.container.MapVertex;
 import edu.vanderbilt.vm.guide.container.Node;
 import edu.vanderbilt.vm.guide.container.Place;
 import edu.vanderbilt.vm.guide.db.GuideDBConstants;
 import edu.vanderbilt.vm.guide.db.GuideDBOpenHelper;
 import edu.vanderbilt.vm.guide.util.DBUtils;
 import edu.vanderbilt.vm.guide.util.Geomancer;
 import edu.vanderbilt.vm.guide.util.GlobalState;
+import edu.vanderbilt.vm.guide.util.GuideConstants;
 
 public class AgendaMapFrag extends SupportMapFragment implements OnMapLongClickListener,
-        OnMarkerClickListener {
+        OnMarkerClickListener, IGraphMapper {
 
     // @SuppressWarnings("unused")
     private static final Logger logger = LoggerFactory.getLogger("ui.AgendaMapFrag");
@@ -325,4 +332,28 @@ public boolean onMarkerClick(Marker marker) {
         return true;
     }
 
+    @Override
+    public void mapGraph(SimpleWeightedGraph<MapVertex, DefaultWeightedEdge> graph) {
+        GoogleMap map = getMap();
+        map.clear();
+        for (MapVertex mv : graph.vertexSet()) {
+            if (mv.id <= GuideConstants.MAX_PLACE_ID) {
+                map.addMarker(new MarkerOptions().position(new LatLng(mv.lat, mv.lon))
+                        .title(DBUtils.getPlaceNameById(mv.id, GlobalState.getReadableDatabase(getActivity())))
+                        .icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_AZURE)));
+            }
+        }
+        mapEdges(map, graph);
+    }
+
+    private void mapEdges(GoogleMap map, SimpleWeightedGraph<MapVertex, DefaultWeightedEdge> graph) {
+        for (DefaultWeightedEdge e : graph.edgeSet()) {
+            MapVertex mv1 = graph.getEdgeSource(e);
+            MapVertex mv2 = graph.getEdgeTarget(e);
+            PolylineOptions opts = new PolylineOptions();
+            opts.add(new LatLng(mv1.lat, mv1.lon)).add(new LatLng(mv2.lat, mv2.lon));
+            map.addPolyline(opts);
+        }
+    }
+
 }
diff --git a/...derbilt/vm/guide/ui/NavAgendaChooser.java → .../vm/guide/ui/AgendaNavigatorFragment.java b/...derbilt/vm/guide/ui/NavAgendaChooser.java → .../vm/guide/ui/AgendaNavigatorFragment.java
@@ -8,11 +8,11 @@
 import android.view.View.OnClickListener;
 import edu.vanderbilt.vm.guide.R;
 
-public class NavAgendaChooser extends Fragment implements OnClickListener{
+public class AgendaNavigatorFragment extends NavigatorFragment implements OnClickListener{
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.navigator_chooser3, container, false);
+        return inflater.inflate(R.layout.fragment_agenda_navigator, container, false);
     }
 
     @Override
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
     target/
     bin/
     gen/
-    .classpath
+    *.orig
     # Local configuration file (sdk path, etc)
     local.properties
@@ Expand Down @@