layout and login fix

Yumm/AndroidManifest.xml

@@ -24,6 +24,7 @@
  <activity android:name="se.yumm.ListMapActivity" android:label="@string/app_name" android:theme="@style/CustomTheme">
  </activity>
  <activity android:name="RestaurantListActivity"></activity>
+ <activity android:name="RestaurantMenuActivity"></activity>
 
  </application>
 

Yumm/gen/se/yumm/R.java

@@ -61,64 +61,75 @@ public static final class dimen {
  public static final int side_navigation_width=0x7f080006;
  }
  public static final class drawable {
- public static final int hotspicy=0x7f020000;
- public static final int ic_launcher=0x7f020001;
- public static final int redfish=0x7f020002;
- public static final int side_navigation_shadow=0x7f020003;
+ public static final int back_button=0x7f020000;
+ public static final int bag_button=0x7f020001;
+ public static final int hotspicy=0x7f020002;
+ public static final int ic_launcher=0x7f020003;
+ public static final int info_square=0x7f020004;
+ public static final int list_view_button=0x7f020005;
+ public static final int map_button=0x7f020006;
+ public static final int menu_button=0x7f020007;
+ public static final int redfish=0x7f020008;
+ public static final int side_navigation_shadow=0x7f020009;
  }
  public static final class id {
- public static final int RelativeLayout1=0x7f0c0022;
- public static final int RelativeLayoutRestList=0x7f0c001f;
+ public static final int RelativeLayout1=0x7f0c001f;
+ public static final int RelativeLayoutRestList=0x7f0c0025;
  public static final int action_bar_container=0x7f0c0000;
  public static final int actionbar=0x7f0c001b;
  public static final int actionbar_actionIcons=0x7f0c0002;
  public static final int actionbar_item=0x7f0c0004;
  public static final int actionbar_title=0x7f0c0003;
- public static final int add_option=0x7f0c002d;
- public static final int addressText=0x7f0c0024;
+ public static final int add_option=0x7f0c0032;
+ public static final int addressText=0x7f0c0029;
  public static final int autoCompletePlaces=0x7f0c0005;
  public static final int autoCompleteVarious=0x7f0c0007;
  public static final int bottom_bar_container=0x7f0c0016;
  public static final int bottom_button_bar=0x7f0c0014;
  public static final int bottombar=0x7f0c001a;
- public static final int distanceText=0x7f0c0025;
+ public static final int distanceText=0x7f0c002a;
  public static final int frameLayout=0x7f0c000b;
  public static final int horiz2ndSlide=0x7f0c0010;
  public static final int horizRestImage=0x7f0c0011;
  public static final int horizRestLayout=0x7f0c000f;
  public static final int horizRestText=0x7f0c0012;
  public static final int horizRestText2=0x7f0c0013;
  public static final int horizScrollView=0x7f0c000e;
+ public static final int info_square_image=0x7f0c0021;
+ public static final int info_square_main_text=0x7f0c0022;
+ public static final int info_square_rating_text=0x7f0c0023;
  public static final int kitchenTopText=0x7f0c000a;
  public static final int layoutlistmap=0x7f0c001c;
  public static final int leftActionBarBtn=0x7f0c0001;
  public static final int linearLayoutWithHorizView=0x7f0c000c;
- public static final int linearlayoutListView=0x7f0c0020;
+ public static final int linearlayoutListView=0x7f0c0026;
  public static final int listMapView=0x7f0c001e;
  public static final int locationButton=0x7f0c0006;
  public static final int location_sort_button=0x7f0c0018;
  public static final int mapView=0x7f0c001d;
- public static final int menu_settings=0x7f0c002c;
+ public static final int menu_header=0x7f0c0024;
+ public static final int menu_headers_list_view=0x7f0c0020;
+ public static final int menu_settings=0x7f0c0031;
  public static final int name_sort_button=0x7f0c0017;
  public static final int placesTopText=0x7f0c0009;
  public static final int rating_sort_button=0x7f0c0019;
- public static final int restaurantName=0x7f0c0023;
- public static final int restaurant_list_view=0x7f0c0021;
+ public static final int restaurantName=0x7f0c0028;
+ public static final int restaurant_list_view=0x7f0c0027;
  public static final int searchButton=0x7f0c0008;
- public static final int shadow=0x7f0c0029;
- public static final int side_navigation_item_icon=0x7f0c002a;
- public static final int side_navigation_item_text=0x7f0c002b;
- public static final int side_navigation_listview=0x7f0c0028;
- public static final int side_navigation_menu=0x7f0c0027;
- public static final int side_navigation_menu_item1=0x7f0c002e;
- public static final int side_navigation_menu_item2=0x7f0c002f;
- public static final int side_navigation_menu_item3=0x7f0c0030;
- public static final int side_navigation_menu_item4=0x7f0c0031;
- public static final int side_navigation_menu_item5=0x7f0c0032;
- public static final int side_navigation_menu_item6=0x7f0c0033;
- public static final int side_navigation_menu_item7=0x7f0c0034;
- public static final int side_navigation_menu_item8=0x7f0c0035;
- public static final int side_navigation_outside_view=0x7f0c0026;
+ public static final int shadow=0x7f0c002e;
+ public static final int side_navigation_item_icon=0x7f0c002f;
+ public static final int side_navigation_item_text=0x7f0c0030;
+ public static final int side_navigation_listview=0x7f0c002d;
+ public static final int side_navigation_menu=0x7f0c002c;
+ public static final int side_navigation_menu_item1=0x7f0c0033;
+ public static final int side_navigation_menu_item2=0x7f0c0034;
+ public static final int side_navigation_menu_item3=0x7f0c0035;
+ public static final int side_navigation_menu_item4=0x7f0c0036;
+ public static final int side_navigation_menu_item5=0x7f0c0037;
+ public static final int side_navigation_menu_item6=0x7f0c0038;
+ public static final int side_navigation_menu_item7=0x7f0c0039;
+ public static final int side_navigation_menu_item8=0x7f0c003a;
+ public static final int side_navigation_outside_view=0x7f0c002b;
  public static final int side_navigation_view=0x7f0c0015;
  public static final int startPageListView=0x7f0c000d;
  }
@@ -132,10 +143,12 @@ public static final class layout {
  public static final int custom_bottom_layout=0x7f030006;
  public static final int cutom_title=0x7f030007;
  public static final int list_map_activity=0x7f030008;
- public static final int restaurant_list_activity=0x7f030009;
- public static final int restaurant_row_view=0x7f03000a;
- public static final int side_navigation=0x7f03000b;
- public static final int side_navigation_item=0x7f03000c;
+ public static final int menu_headers_activity=0x7f030009;
+ public static final int menu_items_row_view=0x7f03000a;
+ public static final int restaurant_list_activity=0x7f03000b;
+ public static final int restaurant_row_view=0x7f03000c;
+ public static final int side_navigation=0x7f03000d;
+ public static final int side_navigation_item=0x7f03000e;
  }
  public static final class menu {
  public static final int activity_main=0x7f0b0000;

Yumm/res/layout/actionbar.xml

@@ -9,7 +9,6 @@
  android:layout_alignParentLeft="true"
  android:layout_width = "wrap_content"
  android:layout_height="fill_parent"
- android:background = "@drawable/ic_launcher"
  android:padding = "0dip"
  android:contentDescription="@string/imageDesc"/>
  <LinearLayout android:id="@+id/actionbar_actionIcons"

Yumm/res/layout/actionbar_icon.xml

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageButton xmlns:android="https://schemas.android.com/apk/res/android"
+<ImageView xmlns:android="https://schemas.android.com/apk/res/android"
  android:id="@+id/actionbar_item" 
- android:layout_width="44dip"
- android:scaleType="fitXY" 
+ android:layout_width="wrap_content" 
  android:layout_height="44dip"
- android:background="@drawable/ic_launcher" 
- android:padding="4dip" 
- android:layout_marginLeft="1dip" 
- android:layout_centerVertical="true"
- android:singleLine="true" 
+ android:layout_alignParentRight="true"
+ android:padding="0dip" 
  android:visibility="visible"
  android:contentDescription="@string/imageDesc" />

Yumm/res/layout/menu_headers_activity.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="https://schemas.android.com/apk/res/android"
+ android:id="@+id/RelativeLayout1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <se.yumm.views.SideNavigationView
+ android:id="@+id/side_navigation_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+ </se.yumm.views.SideNavigationView>
+
+ <ListView
+ android:id="@+id/menu_headers_list_view"
+ android:layout_width="match_parent"
+ android:layout_height="296dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true" >
+ </ListView>
+
+ <ImageView
+ android:id="@+id/info_square_image"
+ android:layout_width="wrap_content"
+ android:layout_height="110dp"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:contentDescription="@string/imageDesc"
+ android:src="@drawable/info_square" />
+
+ <TextView
+ android:id="@+id/info_square_main_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginTop="20dp"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:id="@+id/info_square_rating_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/menu_headers_list_view"
+ android:layout_alignParentRight="true"
+ android:layout_marginBottom="16dp"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</RelativeLayout>

Yumm/res/layout/menu_items_row_view.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 
+ xmlns:android="https://schemas.android.com/apk/res/android"
+ android:id="@+id/RelativeLayout1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="5dp" >
+
+ <TextView
+ android:id="@+id/menu_header"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="top|left"
+ android:textSize="16sp" >
+
+ </TextView>
+
+</RelativeLayout>

Yumm/res/layout/restaurant_list_activity.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="https://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="https://schemas.android.com/apk/res/android"
  android:id="@+id/RelativeLayoutRestList"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
@@ -15,19 +15,25 @@
  android:layout_width="match_parent"
  android:layout_height="300dp" >
  </ListView>
+
  </LinearLayout>
 
+ <se.yumm.views.SideNavigationView
+ android:id="@+id/side_navigation_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@id/restaurant_list_view" >
+
+ </se.yumm.views.SideNavigationView>
+
  <se.yumm.views.BottomButtonBar
  android:id="@+id/bottom_button_bar"
  android:layout_width="match_parent"
  android:layout_height="@dimen/bottom_bar_height"
+ android:layout_alignParentBottom="true"
  android:focusable="true"
  android:gravity="bottom" >
- </se.yumm.views.BottomButtonBar>
 
- <se.yumm.views.SideNavigationView
- android:id="@+id/side_navigation_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ </se.yumm.views.BottomButtonBar>
 
-</LinearLayout>
+</RelativeLayout>

Yumm/src/se/yumm/BaseActivity.java

@@ -67,7 +67,7 @@ protected void SetupActionBar(final IEventListener listener)
  {
  m_actionBar = (ActionBar) findViewById(R.id.actionbar);
  m_actionBar.setTitle(R.string.app_name);
- m_actionBar.setHomeLogo(R.drawable.ic_launcher, new OnClickListener() {
+ m_actionBar.setHomeLogo(R.drawable.menu_button, new OnClickListener() {
  @Override
  public void onClick(View v) {
 

Yumm/src/se/yumm/ListMapActivity.java

@@ -12,7 +12,7 @@
 
 import se.yumm.adapters.ListMapAdapter;
 import se.yumm.handlers.LocationHandler;
-import se.yumm.handlers.RestaurantHandler;
+import se.yumm.handlers.TaskHandler;
 import se.yumm.handlers.WebServiceHandler;
 import se.yumm.items.Restaurants;
 import se.yumm.listeners.ISideNavigationListener;
@@ -89,7 +89,7 @@ public void onCreate(Bundle icicle)
 
 
  Location location = m_locationHndlr.getLocation();
- final RestaurantHandler rh = m_webHandler.GetRestaurantHandler();
+ final TaskHandler rh = m_webHandler.GetTaskHandler();
  rh.setRestaurants(restaurants);
 
  ListMapAdapter listMapAdp = new ListMapAdapter(getBaseContext());
@@ -169,7 +169,7 @@ private void AnimateToPoint(Location location)
 
  public void Sort(Comparator<Restaurants> method)
  {
- RestaurantHandler rh = m_webHandler.GetRestaurantHandler();
+ TaskHandler rh = m_webHandler.GetTaskHandler();
  ArrayList<Restaurants> list = rh.getRestaurants();
  if (rh.isAscending()) {
  Collections.sort(list, method);
@@ -220,14 +220,14 @@ public void onClick(View v) {
 
  m_actionBar = (ActionBar) findViewById(R.id.actionbar);
  m_actionBar.setTitle(R.string.app_name);
- m_actionBar.setHomeLogo(R.drawable.ic_launcher, homeButton);
+ m_actionBar.setHomeLogo(R.drawable.menu_button, homeButton);
 
- m_actionBar.addActionIcon(R.drawable.ic_launcher, new OnClickListener() {
+ m_actionBar.addActionIcon(R.drawable.list_view_button, new OnClickListener() {
 
  @Override
  public void onClick(View v) {
  Intent intent = new Intent(getApplicationContext(), RestaurantListActivity.class);
- intent.putParcelableArrayListExtra("Restaurants", m_webHandler.GetRestaurantHandler().getRestaurants());
+ intent.putParcelableArrayListExtra("Restaurants", m_webHandler.GetTaskHandler().getRestaurants());
  intent.putExtra("loggedIn", m_webHandler.isLoggedIn());
  startActivity(intent);
 
@@ -268,15 +268,15 @@ private void SetUpBottomButtons() {
 
  @Override
  public void onClick(View v) {
- Sort(RestaurantHandler.NameComparator);
+ Sort(TaskHandler.NameComparator);
 
  }
  });
  m_bottomBar.SetUpButton(2, R.drawable.ic_launcher, new OnClickListener() {
 
  @Override
  public void onClick(View v) {
- Sort(RestaurantHandler.RatingComparator);
+ Sort(TaskHandler.RatingComparator);
 
  }
  });