Skip to content

C
CS123-CanteeneoAndroid
Commit c47946e4 authored by Willard's avatar Willard
Browse files
Options

Minor refactors to nav drawer/main search activity

parent 89e9deae
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 61 deletions
app/src/main/res/layout/activity_nav_drawer.xml
View file @ c47946e4
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:rsb="http://schemas.android.com/apk/res-auto"
xmlns:rsb="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:openDrawer="start"> tools:openDrawer="start">
<include <include
layout="@layout/app_bar_nav_drawer" layout="@layout/app_bar_nav_drawer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"/>
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
android:id="@+id/nav_view" android:id="@+id/nav_view"
...@@ -20,159 +20,161 @@ ...@@ -20,159 +20,161 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
app:headerLayout="@layout/nav_header_nav_drawer" > app:headerLayout="@layout/nav_header_nav_drawer">
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/colorBackground"> android:background="?android:attr/colorBackground"
android:orientation="vertical">
<include layout="@layout/nav_header_nav_drawer" <include layout="@layout/nav_header_nav_drawer"
/> />
<RelativeLayout <RelativeLayout
android:id="@+id/logged_in_header" android:id="@+id/logged_in_header"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:orientation="horizontal">
<Button <Button
android:id="@+id/logout_button" android:id="@+id/logout_button"
android:text="Log Out" style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
style="@style/Widget.AppCompat.Button.Borderless.Colored"/> android:text="Log Out"/>
<TextView <TextView
android:id="@+id/greeting" android:id="@+id/greeting"
android:text="Hello, Willard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="24sp"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"/> android:layout_marginStart="10dp"
android:text="Hello, Willard"
android:textSize="24sp"/>
</RelativeLayout> </RelativeLayout>
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="10dp" /> android:layout_height="10dp"/>
<TextView <TextView
android:typeface="monospace"
android:text="@string/drawer_1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:textColor="#000000" android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="5dp" android:text="@string/drawer_1"
android:textSize="20dp"/> android:textColor="#000000"
android:textSize="20dp"
android:typeface="monospace"/>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@android:color/darker_gray"/> android:background="@android:color/darker_gray"/>
<TextView <TextView
android:typeface="monospace"
android:text="@string/drawer_2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#000000" android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="5dp" android:text="@string/drawer_2"
android:textSize="20dp"/> android:textColor="#000000"
android:textSize="20dp"
android:typeface="monospace"/>
<TextView <TextView
android:typeface="monospace"
android:text="@string/drawer_3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#000000" android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="5dp"/> android:text="@string/drawer_3"
android:textColor="#000000"
android:typeface="monospace"/>
<LinearLayout <LinearLayout
android:id="@+id/type_checkboxes" android:id="@+id/type_checkboxes"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout> </LinearLayout>
<TextView <TextView
android:text="Cuisine"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="#000000"
android:fontFamily="monospace" android:fontFamily="monospace"
android:typeface="monospace"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingLeft="10dp" /> android:paddingLeft="10dp"
android:text="Cuisine"
android:textColor="#000000"
android:textSize="14sp"
android:typeface="monospace"/>
<LinearLayout <LinearLayout
android:id="@+id/cuisine_checkboxes" android:id="@+id/cuisine_checkboxes"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout> </LinearLayout>
<TextView <TextView
android:typeface="monospace"
android:text="@string/drawer_4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#000000" android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="5dp"/> android:text="@string/drawer_4"
android:textColor="#000000"
android:typeface="monospace"/>
<org.florescu.android.rangeseekbar.RangeSeekBar <org.florescu.android.rangeseekbar.RangeSeekBar
android:id="@+id/price_range_bar" android:id="@+id/price_range_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
rsb:textAboveThumbsColor="#000000"
rsb:absoluteMaxValue="300" rsb:absoluteMaxValue="300"
rsb:absoluteMinValue="0"/> rsb:absoluteMinValue="0"
rsb:textAboveThumbsColor="#000000"/>
<TextView <TextView
android:typeface="monospace"
android:text="@string/drawer_5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#000000" android:paddingBottom="5dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="5dp"/> android:text="@string/drawer_5"
android:textColor="#000000"
android:typeface="monospace"/>
<LinearLayout <LinearLayout
android:id="@+id/location_checkboxes" android:id="@+id/location_checkboxes"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout> </LinearLayout>
<Button <Button
android:text="@string/apply_filter" android:id="@+id/apply_filter_button"
style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/apply_filter_button"
android:elevation="10dp" android:elevation="10dp"
style="@style/Widget.AppCompat.Button" /> android:text="@string/apply_filter"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
......
app/src/main/res/layout/content_nav_drawer.xml
View file @ c47946e4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<ListView <ListView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/listView" android:id="@+id/dishListView"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" /> android:layout_alignParentStart="true" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment