Merge pull request Cheesebaron#37 from jamesmontemagno/master

Fix logo padding & Implement Custom BaseAdapter for spinner
jamesmontemagno · Apr 22, 2013 · f73432a · f73432a
2 parents 0cd4b4b + 56d4579
commit f73432a
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 30 deletions.
diff --git a/LegacyBar.Library/Bar/LegacyBar.cs b/LegacyBar.Library/Bar/LegacyBar.cs
@@ -329,33 +329,72 @@ public void SetHomeAction(LegacyBarAction legacyBarAction)
             ((LayoutParams)_titleLayout.LayoutParameters).AddRule(LayoutRules.RightOf, Resource.Id.actionbar_home_bg);
         }
 
-        public void SetDropDown(Context context, string[] items, EventHandler<AdapterView.ItemSelectedEventArgs> eventHandler)
+ 		 public int DropDownSelectedItemPosition
         {
-            if (items == null)
-                return;
-            //if no items then show the title.
-            if (items.Length == 0)
+            get { return _titleDropdown.SelectedItemPosition; }
+            set
             {
-                _titleView.Visibility = ViewStates.Visible;
-                _titleDropdown.Visibility = ViewStates.Gone;
+                try
+                {
+                    _titleDropdown.SetSelection(value);
+                }
+                catch (Exception)
+                {
+                }
+
             }
-            else
-            {
-                var previousSelected = _titleDropdown.SelectedItemPosition;
-                _titleView.Visibility = ViewStates.Gone;
-                var adapter = new ArrayAdapter(context, Android.Resource.Layout.SimpleSpinnerItem, items);
-                adapter.SetDropDownViewResource(Android.Resource.Layout.SimpleDropDownItem1Line);
+        }
 
-                _titleDropdown.Visibility = ViewStates.Visible;
-                _titleDropdown.Adapter = adapter;
-                if(eventHandler != null)
-                    _titleDropdown.ItemSelected += eventHandler;
 
-                if (previousSelected >= 0 && previousSelected < items.Length)
-                    _titleDropdown.SetSelection(previousSelected);
+        /// <summary>
+        /// Sets teh drop down list with a customer adapter and callback when items change
+        /// if adapter.Count == 0 then the spinner will NOT be shown and you will have to call this method again.
+        /// </summary>
+        /// <param name="adapter">Adapter to display</param>
+        /// <param name="eventHandler">Event handler to callback. (can be null)</param>
+         public void SetDropDown(BaseAdapter adapter, EventHandler<AdapterView.ItemSelectedEventArgs> eventHandler)
+         {
+             if (adapter == null)
+                 return;
+
+
+
+             if (adapter.Count == 0)
+             {
+                 _titleView.Visibility = ViewStates.Visible;
+                 _titleDropdown.Visibility = ViewStates.Gone;
+             }
+             else
+             {
+                 var previousSelected = _titleDropdown.SelectedItemPosition;
+                 _titleView.Visibility = ViewStates.Gone;
+
+                 _titleDropdown.Visibility = ViewStates.Visible;
+                 _titleDropdown.Adapter = adapter;
+                 if (eventHandler != null)
+                     _titleDropdown.ItemSelected += eventHandler;
+
+                 if (previousSelected >= 0 && previousSelected < adapter.Count)
+                     _titleDropdown.SetSelection(previousSelected);
+             }
+        }
+
+        /// <summary>
+        /// Sets the drop down items with a SimpleDropDownItem1Line Array Adapter
+         /// if items.Length == 0 then the spinner will NOT be shown and you will have to call this method again.
+        /// </summary>
+        /// <param name="context">context to create under for adapter</param>
+        /// <param name="items"> items to set</param>
+         /// <param name="eventHandler">event handler for item selected change (can be null)</param>
+       public void SetDropDown(Context context, string[] items, EventHandler<AdapterView.ItemSelectedEventArgs> eventHandler)
+        {
+            if (items == null)
+                return;
 
+            var adapter = new ArrayAdapter(context, Android.Resource.Layout.SimpleSpinnerItem, items);
+            adapter.SetDropDownViewResource(Android.Resource.Layout.SimpleDropDownItem1Line);
 
-            }
+           SetDropDown(adapter, eventHandler);
         }
 
 

diff --git a/LegacyBar.Library/Resources/Layout/actionbar.axml b/LegacyBar.Library/Resources/Layout/actionbar.axml
@@ -27,11 +27,8 @@
     android:visibility="visible">
     <ImageView 
       android:id="@+id/actionbar_home_logo" 
-      android:scaleType="center" 
-      android:layout_width="wrap_content" 
-      android:layout_height="@dimen/actionbar_item_height" 
+      android:scaleType="centerCrop" 
       android:background="@drawable/actionbar_btn" 
-      android:layout_marginLeft="6dp" 
       style="@style/actionbarhomelogo" 
       android:visibility="gone"/>
     <RelativeLayout 
@@ -45,9 +42,8 @@
       <!-- TODO: Make configurable. -->
       <ImageButton 
         android:id="@+id/actionbar_home_btn" 
-        android:scaleType="center" 
+        android:scaleType="centerCrop" 
         style="@style/actionbarhomeitem" 
-        android:paddingRight="0dp" 
         android:background="@drawable/actionbar_btn"/>
     </RelativeLayout>
     <ImageView 

diff --git a/LegacyBar.Library/Resources/Resource.designer.cs b/LegacyBar.Library/Resources/Resource.designer.cs
diff --git a/LegacyBar.Library/Resources/Values/styles.xml b/LegacyBar.Library/Resources/Values/styles.xml
@@ -40,11 +40,15 @@
     <item name="android:layout_height">@dimen/actionbar_item_height</item>
     <item name="android:layout_marginRight">1px</item>
     <item name="android:layout_marginLeft">0px</item>
-    <item name="android:padding">4dp</item>
+    <item name="android:padding">8dp</item>
   </style>
-  <style name="actionbarhomelogo">
+  <style name="actionbarhomelogo" parent="actionbaritem">
+    <item name="android:layout_width">@dimen/actionbar_home_item_width</item>
+    <item name="android:layout_height">@dimen/actionbar_item_height</item>
     <item name="android:layout_marginRight">1px</item>
-    <item name="android:layout_marginLeft">6dp</item>
+    <item name="android:layout_marginLeft">6px</item>
+    <item name="android:paddingTop">8dp</item>
+    <item name="android:padding">8dp</item>
   </style>
   <style name="actionbarprogressbar" parent="@android:style/Widget.ProgressBar.Small">
   </style>