Skip to content

U
uBus
Commit ab6c9aa0 authored by Pearl Jen Santos's avatar Pearl Jen Santos
Browse files
Options

changed layouts for different interfaces

parent 389fbc86
Hide whitespace changes
Inline Side-by-side
Showing with 309 additions and 73 deletions
mobile-app/10-16-15/Project/.idea/misc.xml
View file @ ab6c9aa0
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
mobile-app/10-16-15/Project/app/src/main/java/com/example/pearlsantos/project/ReservingSeats.java
View file @ ab6c9aa0
...@@ -30,7 +30,7 @@ public class ReservingSeats extends Dialog { ...@@ -30,7 +30,7 @@ public class ReservingSeats extends Dialog {
busSchedule = getContext().getSharedPreferences("bus", Context.MODE_PRIVATE); busSchedule = getContext().getSharedPreferences("bus", Context.MODE_PRIVATE);
this.setTitle("Reserve Seat(s) for Bus"); this.setTitle("Reserve Seat(s) for Bus");
setContentView(R.layout.number_of_tickets); setContentView(R.layout.activity_reserving_seats);
String bN = busSchedule.getString("busNum", "").trim(); String bN = busSchedule.getString("busNum", "").trim();
String pN = busSchedule.getString("plateNum", "").trim(); String pN = busSchedule.getString("plateNum", "").trim();
......
mobile-app/10-16-15/Project/app/src/main/res/layout/activity_confirmation.xml
View file @ ab6c9aa0
...@@ -6,60 +6,96 @@ ...@@ -6,60 +6,96 @@
android:orientation="vertical" android:orientation="vertical"
tools:context="${relativePackage}.${activityClass}" > tools:context="${relativePackage}.${activityClass}" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp">
<TextView
android:id="@+id/noOfSeats"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="00 "
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/noOfSeatsLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Seats Reserved!"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceLarge" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/LinearLayout2" android:id="@+id/LinearLayout2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal" >
<LinearLayout <FrameLayout
android:id="@+id/LinearLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:layout_width="wrap_content"
android:marginLeft="20dp"
android:marginRight="20dp"
android:layout_weight="2">
<TextView <ImageView
android:id="@+id/busNum"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Large Text" android:layout_gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:src="@drawable/ubus_logo"
android:id="@+id/busCompanyLogo2" />
<TextView </FrameLayout>
android:id="@+id/plateNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Medium Text"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/LinearLayout4" android:id="@+id/LinearLayout3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical"
android:layout_weight="2">
<TextView <TextView
android:id="@+id/fromLabel" android:id="@+id/fromLabel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="From" android:text="From"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
android:id="@+id/from" android:id="@+id/from"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="25dp" android:text="PlaceA"
android:text="Medium Text" android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/depTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ETD 00:00"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/LinearLayout5" android:id="@+id/LinearLayout4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical"
android:layout_weight="2">
<TextView <TextView
android:id="@+id/toLabel" android:id="@+id/toLabel"
...@@ -72,67 +108,87 @@ ...@@ -72,67 +108,87 @@
android:id="@+id/to" android:id="@+id/to"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="27dp" android:text="PlaceB"
android:text="Medium Text"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/depTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Medium Text"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
android:id="@+id/seatsAvailableLabel" android:id="@+id/arrTime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Seats Available" android:text="ETA 00:00"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView </LinearLayout>
android:id="@+id/seatsAvailable" </LinearLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="25dp"
android:text="Medium Text"
android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout <LinearLayout
android:id="@+id/LinearLayout6" android:id="@+id/LinearLayout5"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView <LinearLayout
android:id="@+id/cost" android:id="@+id/LinearLayout6"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Large Text" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:layout_weight="2"
android:orientation="horizontal" >
<TextView <ImageView
android:id="@+id/forLabel" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="center"
android:text="for" android:id="@+id/seatsPurchasedLogo"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:src="@drawable/ubus_logo"/>
<TextView
android:id="@+id/seatsPurchased"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="00"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/noOfSeatsReserved"
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout8"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Large Text" android:layout_gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:layout_weight="2"
android:orientation="horizontal" >
<TextView
android:id="@+id/purchaseLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="TOTAL: P "
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/purchase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="00"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/LinearLayout7" android:id="@+id/LinearLayout7"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="right"
android:orientation="horizontal" > android:orientation="horizontal" >
<Button <Button
...@@ -140,13 +196,7 @@ ...@@ -140,13 +196,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity = "center" android:layout_gravity = "center"
android:text="OK" /> android:text="OK"
android:layout_marginRight="20dp"/>
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity = "center"
android:text="Cancel" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
mobile-app/10-16-15/Project/app/src/main/res/layout/listview3.xml 0 → 100644
View file @ ab6c9aa0
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/LinearLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="${relativePackage}.${activityClass}" >
<LinearLayout
android:id="@+id/LinearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/LinearLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity = "center"
android:orientation="horizontal" >
<FrameLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:marginLeft="20dp"
android:marginRight="20dp"
android:layout_weight="2">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/busCompanyLogo"
android:src="@drawable/ubus_logo"
/>
</FrameLayout>
<LinearLayout
android:id="@+id/LinearLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="2">
<TextView
android:id="@+id/fromLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="From"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="PlaceA"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/depTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ETD 00:00"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="2">
<TextView
android:id="@+id/toLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="To"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="PlaceB"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/arrTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ETA 00:00"
android:marginLeft="20dp"
android:marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<LinearLayout
android:id="@+id/LinearLayout6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="2"
android:orientation="horizontal" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/seatsAvailableLogo"
android:src="@drawable/ubus_logo"/>
<TextView
android:id="@+id/seatsAvailable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="00"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="2"
android:orientation="horizontal" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/costLogo"
android:src="@drawable/ubus_logo"/>
<TextView
android:id="@+id/cost"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="00"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="right">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Buy Tickets"
android:id="@+id/buyTickets"
android:layout_marginRight="20dp"
android:layout_gravity="center" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
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