Get rid of those gad-awful buttons, replace with ActionBar

Fixes #21 Adresses #16
bookieio · Oct 25, 2013 · 82918f2 · 82918f2
1 parent 7bf01c7
commit 82918f2
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 79 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -9,7 +9,8 @@
 
     <application
         android:icon="@drawable/logo"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.Holo">
         <activity
             android:name=".BookmarkListActivity"
             android:label="@string/app_name">

diff --git a/res/layout/main.xml b/res/layout/main.xml
@@ -1,47 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="0.97" >
-    </ListView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/TabbishButtonHeight"
-        android:gravity="right" >
-
-        <Button
-            android:id="@+id/newestGlobalButton"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/TabbishButtonHeight"
-            android:layout_margin="@dimen/TabbishButtonMargin"
-            android:minWidth="@dimen/TabbishButtonMinWidth"
-            android:textSize="@dimen/TabbishButtonFontSize" 
-            android:text="@string/button_newest_global_text"/>
-
-        <Button
-            android:id="@+id/newestUserButton"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/TabbishButtonHeight"
-            android:layout_margin="@dimen/TabbishButtonMargin"
-            android:minWidth="@dimen/TabbishButtonMinWidth"
-            android:textSize="@dimen/TabbishButtonFontSize"
-            android:text="@string/button_newest_user_text" />
-
-        <Button
-            android:id="@+id/settingsButton"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/TabbishButtonHeight"
-            android:layout_margin="@dimen/TabbishButtonMargin"
-            android:minWidth="@dimen/TabbishButtonMinWidth"
-            android:textSize="@dimen/TabbishButtonFontSize"
-            android:text="@string/button_settings_text" />
-    </LinearLayout>
-
-</LinearLayout>
+<ListView  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+</ListView>
diff --git a/res/menu/main_activity_actions.xml b/res/menu/main_activity_actions.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/action_everyones_recent"
+        android:title="@string/button_newest_global_text"
+        android:showAsAction="ifRoom"/>
+    <item android:id="@+id/action_recent"
+        android:title="@string/button_newest_user_text"
+        android:showAsAction="ifRoom"/>
+    <item android:id="@+id/action_settings"
+        android:title="@string/button_settings_text" />
+</menu>
diff --git a/src/main/java/us/bmark/android/BookmarkListActivity.java b/src/main/java/us/bmark/android/BookmarkListActivity.java
@@ -8,14 +8,15 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -39,6 +40,7 @@ public class BookmarkListActivity extends ListActivity {
 
     private BookieService service;
     private UserSettings settings;
+    private ListView listView;
 
     private class BookmarkArrayAdapter extends ArrayAdapter<Bookmark> {
 
@@ -74,13 +76,18 @@ public void onCreate(Bundle savedInstanceState) {
         settings = new SharedPrefsBackedUserSettings(this);
         setUpService();
         setContentView(R.layout.main);
-        setUpSettingsButton();
-        setUpNewestGlobalButton();
-        setUpNewestUserButton();
         refreshWithNewestGlobal();
         setUpListView();
     }
 
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.main_activity_actions, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
     private void setUpService() {
         String serverUrl = settings.getBaseUrl();
         RestAdapter adapter = new RestAdapter.Builder()
@@ -177,41 +184,30 @@ public boolean onItemLongClick(AdapterView<?> parent, View view,
         });
     }
 
-    private void setUpSettingsButton() {
-        Button settingsButton = (Button) findViewById(R.id.settingsButton);
 
-        settingsButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch( item.getItemId() ) {
+            case R.id.action_everyones_recent:
+                Log.v("bmark", "glabal bttn clicked");
+                refreshWithNewestGlobal();
+                return true;
+            case R.id.action_recent:
+                Log.v("bmark", "user bttn clicked");
+                refreshWithNewestUser();
+                return true;
+            case R.id.action_settings:
                 Intent settingsIntent =
                         new Intent(BookmarkListActivity.this, SettingsActivity.class);
                 BookmarkListActivity.this.startActivity(settingsIntent);
-            }
-        });
-    }
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
 
-    private void setUpNewestGlobalButton() {
-        Button newestGlobalButton = (Button) findViewById(R.id.newestGlobalButton);
-        newestGlobalButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
 
-                Log.v("bmark", "glabal bttn clicked");
-                refreshWithNewestGlobal();
-            }
-        });
     }
 
-    private void setUpNewestUserButton() {
-        Button newestUserButton = (Button) findViewById(R.id.newestUserButton);
-        newestUserButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Log.v("bmark", "user bttn clicked");
-                refreshWithNewestUser();
-            }
-        });
-    }
 
 
 }