Add food/dish actions made buttons

Author: bosik

portable/comp-android/diacomp/src/main/java/org/bosik/diacomp/android/frontend/fragments/FragmentTabBase.java

@@ -38,9 +38,8 @@
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.AbsListView.MultiChoiceModeListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -167,6 +166,21 @@ public void afterTextChanged(Editable s)
 				runSearch();
 			}
 		});
+
+		final Button buttonAddFood = rootView.findViewById(R.id.buttonAddFood);
+		final Button buttonAddDish = rootView.findViewById(R.id.buttonAddDish);
+
+		buttonAddFood.setOnClickListener(v -> {
+			final FoodItem food = new FoodItem();
+			food.setName(editSearch.getText().toString());
+			showFoodEditor(new Versioned<>(food), true);
+		});
+		buttonAddDish.setOnClickListener(v -> {
+			final DishItem dish = new DishItem();
+			dish.setName(editSearch.getText().toString());
+			showDishEditor(new Versioned<>(dish), true);
+		});
+
 		list = rootView.findViewById(R.id.listBaseEditorSearchResults);
 		list.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE_MODAL);
 		list.setMultiChoiceModeListener(new MultiChoiceModeListener()
@@ -494,32 +508,6 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
 		}
 	}
 
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item)
-	{
-		switch (item.getItemId())
-		{
-			case R.id.item_base_addFood:
-			{
-				FoodItem food = new FoodItem();
-				food.setName(editSearch.getText().toString());
-				showFoodEditor(new Versioned<>(food), true);
-				return true;
-			}
-			case R.id.item_base_addDish:
-			{
-				DishItem dish = new DishItem();
-				dish.setName(editSearch.getText().toString());
-				showDishEditor(new Versioned<>(dish), true);
-				return true;
-			}
-			default:
-			{
-				return false;// super.onOptionsItemSelected(item);
-			}
-		}
-	}
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent intent)

portable/comp-android/diacomp/src/main/res/drawable-xhdpi/base_add_dish.png

@@ -5,8 +5,7 @@
     android:orientation="vertical"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin">
+    android:paddingRight="@dimen/activity_horizontal_margin">
 
     <EditText
         android:id="@+id/editBaseEditorSearch"
@@ -19,8 +18,38 @@
     <ListView
         android:id="@+id/listBaseEditorSearchResults"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         android:fadingEdgeLength="5dp"
         android:requiresFadingEdge="vertical" />
 
+
+    <LinearLayout
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="top"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/buttonAddFood"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="100dp"
+            android:layout_weight="1"
+            android:backgroundTint="@color/app_background"
+            android:drawableTop="@drawable/base_add_food"
+            android:paddingTop="@dimen/padding_large" />
+
+        <Button
+            android:id="@+id/buttonAddDish"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="100dp"
+            android:layout_weight="1"
+            android:backgroundTint="@color/app_background"
+            android:drawableTop="@drawable/base_add_dish"
+            android:paddingTop="@dimen/padding_large" />
+    </LinearLayout>
+
 </LinearLayout>

portable/comp-android/diacomp/src/main/res/drawable-xhdpi/base_add_food.png

@@ -2,22 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/item_base_add"
-        android:icon="@drawable/ic_action_new"
-        android:title="+"
-        app:showAsAction="ifRoom">
-        <menu>
-            <item
-                android:id="@+id/item_base_addFood"
-                android:icon="@drawable/ic_menu_new_food"
-                android:title="@string/base_action_new_food" />
-            <item
-                android:id="@+id/item_base_addDish"
-                android:icon="@drawable/ic_menu_new_dish"
-                android:title="@string/base_action_new_dish" />
-        </menu>
-    </item>
     <item
         android:id="@+id/item_common_login"
         android:icon="@drawable/ic_action_new_account"