Skip to content

Commit

Permalink
- Finish Track Driver
Browse files Browse the repository at this point in the history
  • Loading branch information
Jose Torres committed Mar 15, 2016
1 parent 04927a4 commit 174db20
Show file tree
Hide file tree
Showing 15 changed files with 250 additions and 68 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ android {
productFlavors {
production {
applicationId "com.bentonow.bentonow"
versionName '1.22-rc03'
versionName '1.22-rc04'
}
stage {
applicationId "com.bentonow.bentonow.stage"
versionName '1.22-rc03-dev'
versionName '1.22-rc04-dev'
}
}

Expand Down
184 changes: 165 additions & 19 deletions app/src/main/java/com/bentonow/bentonow/controllers/order/OrderStatusActivity.java
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/src/main/java/com/bentonow/bentonow/service/OrderSocketService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ public void trackGloc(String sDriverId) {
@Override
public void call(Object... args) {
try {
DebugUtils.logDebug(TAG, "Get Track Gloc");
ResponseSocketModel mResponse = SocketResponseParser.parseResponse(args[0].toString());
switch (mResponse.getCode()) {
case 0:
Expand Down
Binary file removed app/src/main/res/drawable-xxxhdpi/car.png
View file
Binary file not shown.
Binary file modified app/src/main/res/drawable-xxxhdpi/marker_car.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/marker_car_down.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/marker_car_down_left.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/marker_car_down_righ.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/marker_car_left.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/marker_car_left_up.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/marker_car_up.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/marker_car_up_right.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 10 additions & 9 deletions app/src/main/res/drawable/bg_green_corner_bottom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#87b05f"/>
<solid android:color="#87b05f" />

<padding android:left="1dp"
android:top="1dp"
android:right="1dp"
android:bottom="1dp"
/>
<padding
android:bottom="1dp"
android:left="1dp"
android:right="1dp"
android:top="1dp" />

<corners
android:topLeftRadius="0dp" android:topRightRadius="0dp"
android:bottomLeftRadius="7dp" android:bottomRightRadius="7dp"
/>
android:bottomLeftRadius="7dp"
android:bottomRightRadius="7dp"
android:topLeftRadius="0dp"
android:topRightRadius="0dp" />
</shape>
104 changes: 69 additions & 35 deletions app/src/main/res/layout/activity_order_status.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<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/base_relative_layout"
android:layout_width="match_parent"
Expand Down Expand Up @@ -72,6 +73,7 @@
android:orientation="vertical">

<FrameLayout
android:id="@+id/frame_prep_one"
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_gravity="center|top"
Expand All @@ -87,6 +89,7 @@
android:orientation="vertical">

<FrameLayout
android:id="@+id/frame_prep_two"
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_gravity="center|top"
Expand All @@ -101,6 +104,7 @@
android:orientation="vertical">

<FrameLayout
android:id="@+id/frame_prep_three"
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_gravity="center|top"
Expand Down Expand Up @@ -150,6 +154,7 @@
android:orientation="vertical">

<FrameLayout
android:id="@+id/frame_del_one"
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_gravity="center|top"
Expand All @@ -164,6 +169,7 @@
android:orientation="vertical">

<FrameLayout
android:id="@+id/frame_del_two"
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_gravity="center|top"
Expand All @@ -178,6 +184,7 @@
android:orientation="vertical">

<FrameLayout
android:id="@+id/frame_del_three"
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_gravity="center|top"
Expand All @@ -198,6 +205,7 @@
android:gravity="center">

<TextView
android:id="@+id/txt_indicator_assembly"
android:layout_width="20dp"
android:layout_height="20dp"
android:background="@drawable/background_circle_gray"
Expand All @@ -207,6 +215,7 @@
</RelativeLayout>

<com.bentonow.bentonow.ui.AutoFitTxtView
android:id="@+id/txt_description_assembly"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="3dp"
Expand All @@ -225,6 +234,7 @@
android:orientation="vertical">

<FrameLayout
android:id="@+id/frame_ass_one"
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_gravity="center|top"
Expand All @@ -239,6 +249,7 @@
android:orientation="vertical">

<FrameLayout
android:id="@+id/frame_ass_two"
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_gravity="center|top"
Expand All @@ -253,6 +264,7 @@
android:orientation="vertical">

<FrameLayout
android:id="@+id/frame_ass_three"
android:layout_width="4dp"
android:layout_height="4dp"
android:layout_gravity="center|top"
Expand Down Expand Up @@ -308,51 +320,73 @@
android:layout_width="match_parent"
android:layout_height="match_parent">


<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true">


<ImageView
android:id="@+id/imageView3"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:background="@drawable/vector_face_green" />

<com.bentonow.bentonow.ui.AutoFitTxtView
android:id="@+id/txt_order_status_title"
style="@style/TextViewStatusP"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView3"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:maxLines="1"
android:text="Your Bento is here!"
android:textSize="23sp" />
android:layout_height="match_parent"
android:layout_above="@+id/btn_add_other_bento"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true">

<com.bentonow.bentonow.ui.AutoFitTxtView
android:id="@+id/txt_order_status_description"
style="@style/TextViewStatusD"
android:layout_width="wrap_content"
<RelativeLayout
android:id="@+id/relativeLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/txt_order_status_title"
android:layout_centerHorizontal="true"
android:layout_margin="20dp"
android:gravity="center"
android:maxLines="2"
android:text="Please meet your driver ar the curbside to pick up your order." />
android:layout_centerInParent="true">


<ImageView
android:id="@+id/imageView3"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:background="@drawable/vector_face_green" />

<com.bentonow.bentonow.ui.AutoFitTxtView
android:id="@+id/txt_order_status_title"
style="@style/TextViewStatusP"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView3"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:maxLines="1"
android:text="Your Bento is here!" />

<com.bentonow.bentonow.ui.AutoFitTxtView
android:id="@+id/txt_order_status_description"
style="@style/TextViewStatusD"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/txt_order_status_title"
android:layout_centerHorizontal="true"
android:layout_margin="20dp"
android:gravity="center"
android:maxLines="2"
android:text="Please meet your driver ar the curbside to pick up your order." />
</RelativeLayout>
</RelativeLayout>


<com.bentonow.bentonow.ui.BackendButton
android:id="@+id/btn_add_other_bento"
style="@style/TxtOpenSansBold"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@drawable/btn_rounded_green"
android:text="New Button"
android:textColor="@color/white"
app:key="completed-button" />
</RelativeLayout>

<RelativeLayout
android:id="@+id/wrapper_status_delivery"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:visibility="gone">

<fragment
android:id="@+id/map_driver_location"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,13 +309,13 @@
<style name="TextViewStatusP" parent="@android:style/Widget.TextView">
<item name="android:textSize">23sp</item>
<item name="android:textColor">@color/dark_blue</item>
<item name="fontPath">fonts/OpenSans-Regular.ttf</item>
<item name="fontPath">fonts/OpenSans-Bold.ttf</item>
</style>

<style name="TextViewStatusD" parent="@android:style/Widget.TextView">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/dark_blue</item>
<item name="fontPath">fonts/OpenSans-Bold.ttf</item>
<item name="android:textColor">@color/gray</item>
<item name="fontPath">fonts/OpenSans-Regular.ttf</item>
</style>

//ImageView
Expand Down

0 comments on commit 174db20

Please sign in to comment.