Skip to content

C
CS123-CanteeneoAndroid
Commit 1d28ae86 authored by Tup's avatar Tup
Browse files
Options

Dish view and Stall view done

parent 5f1bcf91
Show whitespace changes
Inline Side-by-side
Showing with 343 additions and 103 deletions
app/src/main/AndroidManifest.xml
View file @ 1d28ae86
......@@ -35,6 +35,10 @@
<activity
android:name=".DishViewActivity"
android:label="@string/title_activity_blahblah"
android:theme="@style/AppTheme" />
<activity
android:name=".StallViewActivity"
android:label="@string/title_activity_stall_view"
android:theme="@style/AppTheme"></activity>
</application>
......
app/src/main/java/com/testapp/DishViewActivity.java
View file @ 1d28ae86
......@@ -16,6 +16,8 @@ public class DishViewActivity extends AppCompatActivity {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
setTitle("Dish Pls");
}
@Override
......
app/src/main/java/com/testapp/LoginActivity.java
View file @ 1d28ae86
......@@ -106,14 +106,29 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
sampleDishButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
sample();
sampleDish();
}
});
Button sampleStallButton = (Button) findViewById(R.id.sample_stall);
sampleStallButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
sampleStall();
}
});
mLoginFormView = findViewById(R.id.login_form);
mProgressView = findViewById(R.id.login_progress);
}
public void sample() {
public void sampleStall() {
Intent intent = new Intent(this, StallViewActivity.class);
startActivity(intent);
}
public void sampleDish() {
Intent intent = new Intent(this, DishViewActivity.class);
startActivity(intent);
......
app/src/main/java/com/testapp/StallViewActivity.java 0 → 100644
View file @ 1d28ae86
package com.testapp;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
public class StallViewActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_stall_view);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
// app icon in action bar clicked; goto parent activity.
this.finish();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
}
app/src/main/res/layout/activity_login.xml
View file @ 1d28ae86
......@@ -98,6 +98,14 @@
android:layout_marginTop="16dp"
android:id="@+id/sample_dish" />
<Button
android:text="Sample Stall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/sample_stall"
android:textColor="?android:attr/textColorSecondary"
android:layout_marginTop="16dp" />
</LinearLayout>
</ScrollView>
</LinearLayout>
app/src/main/res/layout/activity_stall_view.xml 0 → 100644
View file @ 1d28ae86
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="com.testapp.StallViewActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_stall_view" />
</android.support.design.widget.CoordinatorLayout>
app/src/main/res/layout/content_dish_view.xml
View file @ 1d28ae86
......@@ -13,12 +13,22 @@
tools:context="com.testapp.DishViewActivity"
tools:showIn="@layout/activity_dish_view">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:weightSum="5">
android:layout_height="wrap_content">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:weightSum="2">
<LinearLayout
android:orientation="horizontal"
......@@ -31,15 +41,15 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="3"
android:weightSum="7">
android:layout_weight="3">
<TextView
android:text="Name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/textView5"
android:layout_weight="3"/>
android:layout_weight="2"
android:textSize="18sp" />
<TextView
android:text="Price"
......@@ -86,12 +96,14 @@
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="100dp"
android:weightSum="14"
android:layout_height="wrap_content"
android:weightSum="10"
android:paddingTop="10dp"
android:layout_marginLeft="10px"
android:layout_marginRight="10px"
android:layout_weight="1">
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:layout_weight="1"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<TextView
......@@ -103,13 +115,14 @@
android:textSize="18sp" />
<TextView
android:text="TextView"
android:text="This is a foodz"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/dish_desc"
android:layout_weight="13"
android:layout_weight="9"
android:paddingTop="5dp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
......@@ -117,25 +130,43 @@
android:layout_height="wrap_content"
android:layout_weight="3"
android:paddingTop="10dp"
android:layout_marginLeft="10px"
android:layout_marginRight="10px"
android:weightSum="14" >
android:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:weightSum="14"
android:paddingLeft="10dp">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:text="Reviews:"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/textView4"
android:id="@+id/review_text"
android:textSize="18sp"
android:layout_weight="1"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/add_review_button"
android:layout_weight="1"
android:text="+" />
</LinearLayout>
<ListView
android:layout_width="match_parent"
android:id="@+id/dish_reviews"
android:layout_height="150dp" />
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</RelativeLayout>
app/src/main/res/layout/content_stall_view.xml 0 → 100644
View file @ 1d28ae86
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content_stall_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="com.testapp.StallViewActivity"
tools:showIn="@layout/activity_stall_view">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:srcCompat="@mipmap/canteeneo_logo"
android:id="@+id/stall_logo" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:text="Location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/stall_location"
android:layout_weight="1" />
<Button
android:text="Favorite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/stall_favorite"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="10dp"
android:layout_weight="1">
<TextView
android:text="Description:"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/textView"
android:textSize="18sp"
android:paddingTop="0dp"
android:paddingLeft="0dp"
android:paddingRight="0dp" />
<TextView
android:text="STOL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/stall_description"
android:paddingTop="5dp" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:text="Dishes:"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/textView9"
android:layout_marginTop="10dp"
android:textSize="18sp" />
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/stall_dishes" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:text="Reviews:"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/textView10"
android:textSize="18sp"
android:paddingTop="10dp" />
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/stall_reviews" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</RelativeLayout>
app/src/main/res/values/colors.xml
View file @ 1d28ae86
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimary">#3f51b5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
</resources>
app/src/main/res/values/strings.xml
View file @ 1d28ae86
......@@ -45,4 +45,5 @@
<item>Item 333</item>
</string-array>
<string name="title_activity_blahblah">blahblah</string>
<string name="title_activity_stall_view">StallViewActivity</string>
</resources>
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