Migrated to latest version of Android ActionBar[1]

[1] https://github.com/johannilsson/android-actionbar/tree/mimic-native-api
johannilsson · May 26, 2011 · a018410 · a018410
1 parent bbcd013
commit a018410
Show file tree

Hide file tree

Showing 14 changed files with 2,395 additions and 89 deletions.
diff --git a/res/drawable-hdpi/logo.png b/res/drawable-hdpi/logo.png
diff --git a/res/menu/actionbar_departures.xml b/res/menu/actionbar_departures.xml
diff --git a/res/menu/actionbar_deviations.xml b/res/menu/actionbar_deviations.xml
diff --git a/res/menu/actionbar_map.xml b/res/menu/actionbar_map.xml
diff --git a/res/menu/actionbar_route_detail.xml b/res/menu/actionbar_route_detail.xml
diff --git a/res/menu/actionbar_routes.xml b/res/menu/actionbar_routes.xml
diff --git a/res/values/ids.xml b/res/values/ids.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <item type="id" name="actionbar_item_sms" />
+</resources>
diff --git a/src/com/markupartist/sthlmtraveling/BaseListActivity.java b/src/com/markupartist/sthlmtraveling/BaseListActivity.java
@@ -5,7 +5,7 @@
 import android.app.ListActivity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
+import android.view.MenuItem;
 
 import com.flurry.android.FlurryAgent;
 import com.markupartist.android.widget.ActionBar;
@@ -39,21 +39,23 @@ protected void registerEvent(String event, Map<String, String> parameters) {
         FlurryAgent.onEvent(event, parameters);
     }
 
-    protected ActionBar initActionBar() {
+    protected ActionBar initActionBar(int menuResource) {
         ActionBar actionBar = (ActionBar) findViewById(R.id.actionbar);
-
-        /*actionBar.setHomeAction(new IntentAction(this,
-                new Intent(this, StartActivity.class),
-                R.drawable.ic_actionbar_home_default));*/
-        final Intent startIntent = new Intent(this, StartActivity.class);
-        startIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        actionBar.setOnTitleClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(startIntent);
-            }
-        });
-
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+        actionBar.setDisplayShowHomeEnabled(true);
+        getMenuInflater().inflate(menuResource, actionBar.asMenu());
         return actionBar;
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.actionbar_item_home:
+            final Intent startIntent = new Intent(this, StartActivity.class);
+            startIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(startIntent);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/src/com/markupartist/sthlmtraveling/DeparturesActivity.java b/src/com/markupartist/sthlmtraveling/DeparturesActivity.java
@@ -27,12 +27,14 @@
 import android.content.Intent;
 import android.content.DialogInterface.OnClickListener;
 import android.database.Cursor;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.format.Time;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.CompoundButton;
@@ -101,31 +103,25 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mSectionedAdapter = new DepartureAdapter(this);
 
-        mActionBar = initActionBar();
+        mActionBar = initActionBar(R.menu.actionbar_departures);
         mActionBar.setTitle(R.string.departures);
-        mActionBar.addAction(mRefreshAction);
     }
 
-    private ActionBar.Action mRefreshAction = new ActionBar.Action() {
-
-        @Override
-        public void performAction(View view) {
-            if (mSite != null) {
-                new GetDeparturesTask().execute(mSite);
-            }
-        }
-
-        @Override
-        public int getDrawable() {
-            return R.drawable.ic_actionbar_refresh_default;
-        }
-    };
-
     @Override
     public void setTitle(CharSequence title) {
         mActionBar.setTitle(title);
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.actionbar_item_refresh:
+            new GetDeparturesTask().execute(mSite);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     /**
      * We need to call loadDeapartures after restoreLocalState that's
      * why we need to override this method. Only needed for 1.5 devices though.

diff --git a/src/com/markupartist/sthlmtraveling/DeviationsActivity.java b/src/com/markupartist/sthlmtraveling/DeviationsActivity.java
@@ -32,8 +32,6 @@
 import android.text.format.Time;
 import android.util.Log;
 import android.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
@@ -74,23 +72,19 @@ protected void onCreate(Bundle savedInstanceState) {
         loadDeviations();
         registerForContextMenu(getListView());
 
-        mActionBar = initActionBar();
-        mActionBar.addAction(mRefreshAction);
+        mActionBar = initActionBar(R.menu.actionbar_deviations);
     }
 
-    private ActionBar.Action mRefreshAction = new ActionBar.Action() {
-
-        @Override
-        public void performAction(View view) {
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.actionbar_item_refresh:
             mGetDeviationsTask = new GetDeviationsTask();
             mGetDeviationsTask.execute();
+            return true;
         }
-
-        @Override
-        public int getDrawable() {
-            return R.drawable.ic_actionbar_refresh_default;
-        }
-    };
+        return super.onOptionsItemSelected(item);
+    }
 
     private void loadDeviations() {
         @SuppressWarnings("unchecked")

diff --git a/src/com/markupartist/sthlmtraveling/PointOnMapActivity.java b/src/com/markupartist/sthlmtraveling/PointOnMapActivity.java
@@ -129,6 +129,10 @@ public void onClick(View v) {
         }
 
         ActionBar actionBar = (ActionBar) findViewById(R.id.actionbar);
+        getMenuInflater().inflate(R.menu.actionbar_map, actionBar.asMenu());
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+        actionBar.setDisplayShowHomeEnabled(true);
+        actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setTitle(R.string.point_on_map);
 
         mMapView = (MapView) findViewById(R.id.mapview);
@@ -192,6 +196,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     toastMissingMyLocationSource();
                 }
                 return true;
+            case R.id.actionbar_item_home:
+                finish();
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }

diff --git a/src/com/markupartist/sthlmtraveling/RouteDetailActivity.java b/src/com/markupartist/sthlmtraveling/RouteDetailActivity.java
@@ -36,6 +36,7 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -47,6 +48,7 @@
 import android.widget.Toast;
 
 import com.markupartist.android.widget.ActionBar;
+import com.markupartist.android.widget.actionbar.R;
 import com.markupartist.sthlmtraveling.provider.JourneysProvider.Journey.Journeys;
 import com.markupartist.sthlmtraveling.provider.planner.JourneyQuery;
 import com.markupartist.sthlmtraveling.provider.planner.Planner;
@@ -85,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mTrip = extras.getParcelable(EXTRA_JOURNEY_TRIP);
         mJourneyQuery = extras.getParcelable(EXTRA_JOURNEY_QUERY);
 
-        mActionBar = initActionBar();
+        mActionBar = initActionBar(R.menu.actionbar_route_detail);
 
         View headerView = getLayoutInflater().inflate(R.layout.route_header, null);
         TextView startPointView = (TextView) headerView.findViewById(R.id.route_from);
@@ -160,18 +162,21 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    protected ActionBar initActionBar() {
-        ActionBar actionBar = super.initActionBar();
-
-        Intent departuresIntent = new Intent(this, DeparturesActivity.class);
-        departuresIntent.putExtra(DeparturesActivity.EXTRA_SITE_NAME,
-                mTrip.origin.name);
-        actionBar.addAction(new ActionBar.IntentAction(this,
-                departuresIntent, R.drawable.ic_actionbar_time));
-
-        return actionBar;
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.actionbar_item_time:
+            Intent departuresIntent = new Intent(this, DeparturesActivity.class);
+            departuresIntent.putExtra(DeparturesActivity.EXTRA_SITE_NAME,
+                    mTrip.origin.name);
+            startActivity(departuresIntent);
+            return true;
+        case R.id.actionbar_item_sms:
+            showDialog(DIALOG_BUY_SMS_TICKET);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
     }
-    
+
     @Override
     protected void onListItemClick(ListView l, View v, int position, long id) {
         super.onListItemClick(l, v, position, id);
@@ -273,18 +278,10 @@ public void onRouteDetailsResult(Trip2 trip) {
         setListAdapter(mSubTripAdapter);
 
         if (trip.canBuySmsTicket()) {
-            mActionBar.addAction(new ActionBar.Action() {
-
-                @Override
-                public void performAction(View view) {
-                    showDialog(DIALOG_BUY_SMS_TICKET);
-                }
-
-                @Override
-                public int getDrawable() {
-                    return R.drawable.ic_actionbar_sms;
-                }
-            }, 0); // Makes sure this is added first in the list of actions.
+            mActionBar.addAction(
+                mActionBar.newAction(R.id.actionbar_item_sms)
+                    .setIcon(R.drawable.ic_actionbar_sms)
+            );
         }
 
         mTrip = trip;

diff --git a/src/com/markupartist/sthlmtraveling/RoutesActivity.java b/src/com/markupartist/sthlmtraveling/RoutesActivity.java
@@ -43,6 +43,7 @@
 import android.text.format.Time;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Adapter;
@@ -57,6 +58,7 @@
 import android.widget.SimpleAdapter.ViewBinder;
 
 import com.markupartist.android.widget.ActionBar;
+import com.markupartist.android.widget.actionbar.R;
 import com.markupartist.sthlmtraveling.MyLocationManager.MyLocationFoundListener;
 import com.markupartist.sthlmtraveling.SectionedAdapter.Section;
 import com.markupartist.sthlmtraveling.provider.JourneysProvider.Journey.Journeys;
@@ -199,7 +201,7 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        mActionBar = initActionBar();
+        mActionBar = initActionBar(R.menu.actionbar_routes);
 
         View headerView = getLayoutInflater().inflate(R.layout.route_header, null);
         mFromView = (TextView) headerView.findViewById(R.id.route_from);
@@ -217,25 +219,15 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    protected ActionBar initActionBar() {
-        ActionBar actionBar = super.initActionBar();
-
-        actionBar.addAction(new ActionBar.Action() {
-
-            @Override
-            public void performAction(View view) {
-                reverseJourneyQuery();
-            }
-
-            @Override
-            public int getDrawable() {
-                return R.drawable.ic_actionbar_reverse;
-            }
-        });
-
-        return actionBar;
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case R.id.actionbar_item_reverse:
+            reverseJourneyQuery();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
     }
-    
+
     private JourneyQuery getJourneyQueryFromIntent(Intent intent) {
         JourneyQuery journeyQuery;
         if (intent.hasExtra(EXTRA_JOURNEY_QUERY)) {

diff --git a/src/com/markupartist/sthlmtraveling/ViewOnMapActivity.java b/src/com/markupartist/sthlmtraveling/ViewOnMapActivity.java
@@ -68,6 +68,10 @@ public void onCreate(Bundle savedInstanceState) {
         String markerText = extras.getString(EXTRA_MARKER_TEXT);
 
         ActionBar actionBar = (ActionBar) findViewById(R.id.actionbar);
+        getMenuInflater().inflate(R.menu.actionbar_map, actionBar.asMenu());
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+        actionBar.setDisplayShowHomeEnabled(true);
+        actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setTitle(R.string.stop_label);
 
         mMapView = (MapView) findViewById(R.id.mapview);
@@ -111,6 +115,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     toastMissingMyLocationSource();
                 }
                 return true;
+            case R.id.actionbar_item_home:
+                finish();
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }