New push with junit espresso tests

This commit is contained in:
2019-03-11 22:05:02 +11:00
parent 087c3e991c
commit 987b25af31
119 changed files with 6864 additions and 1553 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFffffff"
android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5L15,5L15,3L9,3v2L6.5,5c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
</vector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -3,7 +3,7 @@
<gradient
android:angle="135"
android:centerColor="@color/colorAccent"
android:endColor="#00695C"
android:startColor="@color/colorAccent"
android:endColor="@color/colour_four"
android:startColor="@color/colour_siz"
android:type="linear" />
</shape>

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -0,0 +1,55 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".User.RegisterActivity">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/pb"
android:visibility="gone"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="12dp"
android:layout_centerInParent="true">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/reset_pw"
style="@style/edittexttheme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Enter Emil Address"
android:inputType="textEmailAddress"
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
<Button
android:id="@+id/reset_pw_sign_up"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_margin="12dp"
android:background="@drawable/cardviewoutline"
android:text="Sign Up"
android:textColor="#91ddff"
android:textStyle="bold" />
</RelativeLayout>

View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout 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"
tools:context=".ImageSelectorActivity">
</android.support.constraint.ConstraintLayout>

View File

@@ -10,7 +10,8 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:background="@drawable/cars"
tools:context=".LoginActivity">
android:importantForAutofill="yes"
tools:context=".User.LoginActivity">
<!-- Login progress -->
@@ -41,6 +42,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_marginRight="18dp"
android:importantForAutofill="yes"
android:autofilledHighlight="@android:color/transparent"
android:ems="10"
android:hint="@string/prompt_email"
@@ -69,6 +71,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_marginRight="18dp"
android:importantForAutofill="yes"
android:autofilledHighlight="@android:color/transparent"
android:ems="10"
android:hint="@string/prompt_password"
@@ -84,17 +87,45 @@
<!--</android.support.design.widget.TextInputLayout>-->
</android.support.v7.widget.CardView>
<TextView
<LinearLayout
android:id="@+id/register"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginTop="12dp"
android:layout_marginRight="18dp"
android:text="Sign up"
android:textColor="#03a9f4"
android:textSize="18sp"
android:textStyle="bold" />
android:layout_marginLeft="18dp">
<TextView
android:id="@+id/forgot"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_weight="1"
android:shadowColor="@color/colour_five"
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="1"
android:text="Forgot Password"
android:textColor="@color/colour_seven"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/register_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:paddingRight="2dp"
android:shadowColor="@color/colour_five"
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="1"
android:text="Sign up"
android:textColor="@color/colour_seven"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>

View File

@@ -20,6 +20,24 @@
android:layout_gravity="start"
android:fitsSystemWindows="true"
app:headerLayout="@layout/nav_header_main"
app:menu="@menu/activity_main_drawer" />
app:menu="@menu/activity_main_drawer" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:clickable="true"
android:orientation="vertical">
<TextView
android:id="@+id/logout"
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center"
android:text="Logout"
android:textColor="@color/colorPrimary"
android:textStyle="bold" />
</LinearLayout>
</android.support.design.widget.NavigationView>
</android.support.v4.widget.DrawerLayout>

View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".RegisterActivity">
tools:context=".User.RegisterActivity">
<ProgressBar
android:layout_width="wrap_content"
@@ -19,6 +19,23 @@
android:padding="12dp"
android:layout_centerInParent="true">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/name_register"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Enter Full Name"
android:inputType="textEmailAddress"
android:maxLines="1"
style="@style/edittexttheme" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

View File

@@ -26,6 +26,11 @@
android:layout_height="match_parent"
android:id="@+id/container">
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</FrameLayout>
</LinearLayout>

View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<FrameLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:id="@+id/approval_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center"
android:textSize="22sp"
android:textStyle="bold"
tools:text="Private Hire License" />
</FrameLayout>
<ImageView
android:id="@+id/approval_iv"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="6dp"
android:padding="6dp"
tools:src="@drawable/pending" />
<ImageView
android:id="@+id/archive_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="6dp"
android:tint="@color/colour_three"
android:src="@drawable/ic_archive_black_24dp" />
</LinearLayout>

View File

@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="6dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:background="@color/colour_siz"
android:orientation="vertical">
<TextView
android:id="@+id/date_archived"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginTop="12dp"
android:layout_marginRight="12dp"
android:textColor="@color/colour_two"
android:textStyle="bold"
tools:text="12/12/2019" />
<include
android:id="@+id/image_pager"
layout="@layout/multi_image_selector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginTop="12dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="12dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="12dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Expiry"
android:textColor="@color/colour_four"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/exp_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="12/12/2019" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Insurer"
android:textColor="@color/colour_four"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/archive_insurer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Admiral" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

View File

@@ -0,0 +1,221 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colour_siz"
android:paddingBottom="12dp">
<LinearLayout
android:id="@+id/view_1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_margin="12dp">
<TextView
android:id="@+id/number_plate"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_weight="1"
android:textColor="@color/colour_one"
android:textStyle="bold"
tools:text="PR11 CKK" />
<TextView
android:id="@+id/date_archived"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:textColor="@color/colour_one"
android:textStyle="bold"
tools:text="12/04/2019" />
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/view_1">
<LinearLayout
android:id="@+id/car_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="6dp"
android:layout_toLeftOf="@id/divider"
android:gravity="right"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_margin="3dp"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Make/Model"
android:textColor="@color/colour_four"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/car_text_arch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Honda Jazz" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_margin="3dp"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Colour"
android:textColor="@color/colour_four"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/car_colour"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="right"
tools:text="Blue" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_margin="3dp"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Seized"
android:textColor="@color/colour_four"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/seized"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
tools:text="No" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginRight="3dp"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Date Started"
android:textColor="@color/colour_four"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/first_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="06/06/2017" />
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/divider"
android:layout_width="2dp"
android:layout_height="match_parent"
android:layout_alignBottom="@+id/car_holder"
android:layout_centerHorizontal="true"
android:background="@color/colour_one" />
<LinearLayout
android:id="@+id/right"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginRight="12dp"
android:layout_toRightOf="@id/divider"
android:gravity="left"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:gravity="left"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Keepers Name"
android:textColor="@color/colour_two"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/keeper_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="First Lastname" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:gravity="left"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Keepers Address"
android:textColor="@color/colour_two"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/keeper_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
tools:text="first line of address \nSecond line of address\nArea name\nSS11 4DD" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>

View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout 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"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".MainActivity"
tools:showIn="@layout/app_bar_main">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Archive.ArchiveFragment">
<ListView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@android:color/transparent"
android:id="@+id/archive_listview">
</ListView>
</FrameLayout>

View File

@@ -3,34 +3,50 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".DriverLicenseFragment">
<ImageView
android:id="@+id/driversli_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/dl_view"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:scaleType="centerInside"
android:adjustViewBounds="true"
tools:src="@drawable/bg" />
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".Driver.DriverLicenseFragment">
<LinearLayout
android:id="@+id/dl_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:orientation="vertical"
android:padding="12dp"
android:id="@+id/dl_view"
android:layout_centerInParent="true">
android:paddingLeft="12dp"
android:paddingTop="12dp"
android:paddingRight="12dp">
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="12dp"
app:cardCornerRadius="28dp"
app:cardElevation="0dp">
<ImageView
android:id="@+id/driversli_img"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round" />
<ProgressBar
android:id="@+id/pb_dl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/upload_lic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/lin_lay"
android:layout_alignParentLeft="true"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
@@ -48,14 +64,14 @@
<EditText
android:id="@+id/lic_no"
style="@style/edittexttheme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Drivers License no."
android:inputType="none"
android:maxLines="1"
style="@style/edittexttheme" />
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
@@ -65,16 +81,19 @@
<EditText
android:id="@+id/lic_expiry"
style="@style/edittexttheme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:focusable="false"
android:hint="Drivers License Expiry"
android:inputType="date"
android:maxLines="1"
style="@style/edittexttheme"/>
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>

View File

@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".Driver.homeDriverFragment"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/driver_prof"
style="@style/cardview_theme"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="16dp">
<ImageView
android:src="@drawable/cardviewoutline"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|left"
android:orientation="horizontal">
<ImageView
android:id="@+id/approval_dp"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="right|center"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:padding="6dp"
tools:src="@android:drawable/presence_online" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Driver Profile"
android:textSize="26sp" />
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/private_hire"
style="@style/cardview_theme"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="16dp"
app:cardBackgroundColor="@android:color/transparent">
<ImageView
android:src="@drawable/cardviewoutline"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center|left">
<ImageView
android:id="@+id/approval_ph"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="right|center"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:padding="6dp"
tools:src="@android:drawable/presence_online" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:text="Private Hire License"
android:textSize="22sp" />
<TextView
android:id="@+id/ph_button_exp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Expires: 20/12/2019"/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/drivers_license"
style="@style/cardview_theme"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="16dp"
app:cardBackgroundColor="@android:color/transparent">
<ImageView
android:src="@drawable/cardviewoutline"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center|left">
<ImageView
android:id="@+id/approval_dl"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="right|center"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:padding="6dp"
tools:src="@android:drawable/presence_online" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Drivers License"
android:textSize="22sp" />
<TextView
android:id="@+id/dl_button_exp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
tools:text="Expires: 20/12/2019"/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>

View File

@@ -3,8 +3,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
tools:context=".driverProfileFragment">
tools:context=".Driver.DriverProfileFragment">
<LinearLayout
android:layout_width="match_parent"
@@ -12,13 +13,30 @@
android:orientation="vertical"
android:padding="12dp">
<ImageView
android:id="@+id/driver_pic"
android:layout_width="100dp"
android:layout_height="100dp"
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="12dp"
tools:src="@mipmap/ic_launcher_round" />
app:cardCornerRadius="28dp"
app:cardElevation="0dp">
<ImageView
android:id="@+id/driver_pic"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round" />
<ProgressBar
android:id="@+id/pb_dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="center" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/add_driver_pic"
@@ -29,6 +47,7 @@
android:ems="10"
android:padding="12dp"
android:selectAllOnFocus="true"
android:gravity="center"
android:singleLine="true"
android:text="Add Driver photo"
android:textColorHighlight="#608d91" />
@@ -146,50 +165,6 @@
</android.support.design.widget.TextInputLayout>
<TextView
android:id="@+id/private_hire"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Add Private Hire License"
android:textColorHighlight="#608d91" />
<TextView
android:id="@+id/retrievedPH"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:text="Private hire number : 254215751 \nExpiry Date: 22/10/2019" />
<TextView
android:id="@+id/drivers_li"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Add Drivers License"
android:textColorHighlight="#608d91" />
<TextView
android:id="@+id/retrieved_dl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:text="Drivers license number : AGSCE83858HP4DB \nExpiry Date: 22/10/2019" />
<Button
android:id="@+id/submit_driver"
style="?android:attr/borderlessButtonStyle"

View File

@@ -1,140 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_margin="12dp"
tools:context=".FindAddressFragment">
<TextView
android:id="@+id/findaddress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/lin_lay"
android:layout_alignParentLeft="true"
android:background="@drawable/round_edit_text"
android:ems="10"
android:gravity="center"
android:padding="12dp"
android:layout_marginBottom="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Find Address"
android:textColorHighlight="#608d91" />
<Button
android:id="@+id/submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_margin="12dp"
android:background="@drawable/cardviewoutline"
android:text="@string/submit"
android:textColor="@android:color/black"
android:textStyle="bold"
style="?android:attr/borderlessButtonStyle" />
<!--<RelativeLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content">-->
<!--<view-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="1dp"-->
<!--android:layout_alignParentLeft="true"-->
<!--android:layout_centerVertical="true"-->
<!--android:layout_toLeftOf="@id/or"-->
<!--android:background="#000000" />-->
<!--<TextView-->
<!--android:id="@+id/or"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_centerHorizontal="true"-->
<!--android:layout_centerVertical="true"-->
<!--android:layout_margin="4dp"-->
<!--android:textColor="#000000"-->
<!--android:textStyle="bold"-->
<!--android:text="OR" />-->
<!--<view-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="1dp"-->
<!--android:layout_alignParentRight="true"-->
<!--android:layout_centerVertical="true"-->
<!--android:layout_toRightOf="@id/or"-->
<!--android:background="#000000" />-->
<!--</RelativeLayout>-->
<!--<TextView-->
<!--android:id="@+id/entermanually"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:background="@drawable/round_edit_text"-->
<!--android:ems="10"-->
<!--android:gravity="center"-->
<!--android:padding="12dp"-->
<!--android:selectAllOnFocus="true"-->
<!--android:singleLine="true"-->
<!--android:text="Enter Address Manually"-->
<!--android:textColorHighlight="#608d91" />-->
<LinearLayout
android:id="@+id/lin_lay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:orientation="vertical">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:gravity="top|left"
android:hint="Address"
android:inputType="textMultiLine"
android:lines="4"
android:maxLines="7"
android:minLines="4"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/postcode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Postcode"
android:inputType="none"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
</RelativeLayout>

View File

@@ -4,27 +4,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".homeFragment"
tools:context=".Driver.homeDriverFragment"
android:orientation="vertical">
<!--<android.support.v7.widget.CardView-->
<!--android:id="@+id/driver"-->
<!--style="@style/cardview_theme"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="0dp"-->
<!--android:layout_margin="16dp"-->
<!--android:layout_weight="1"-->
<!--app:background="@drawable/cardviewoutline">-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_gravity="center"-->
<!--android:text="Driver Profile"-->
<!--android:textSize="22sp" />-->
<!--</android.support.v7.widget.CardView>-->
<Button
android:layout_width="match_parent"
android:layout_height="0dp"

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SuperUser.homeSuperUserFragment">
<ListView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/list_view_super"
tools:listitem="@layout/list_item_layout">
</ListView>
</RelativeLayout>

View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffffff">
<com.github.chrisbanes.photoview.PhotoView
android:id="@+id/photo_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#000000"
tools:src="@drawable/cars"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/download_pic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_file_download_black_24dp" />
</RelativeLayout>

View File

@@ -1,22 +1,38 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ins_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="12dp"
android:layout_centerInParent="true">
android:paddingLeft="12dp"
android:paddingTop="12dp"
android:paddingRight="12dp">
<include
android:id="@+id/image_pager"
layout="@layout/multi_image_selector"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_above="@+id/ins_view"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginTop="12dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="12dp" />
<TextView
android:id="@+id/uploadInsurance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/lin_lay"
android:layout_alignParentLeft="true"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
@@ -47,25 +63,6 @@
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/ins_no"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Insurance No.:"
android:inputType="date"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -74,8 +71,8 @@
android:id="@+id/insurance_exp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:focusable="false"
android:hint="Insurance expiry:"
android:inputType="date"
android:maxLines="1"
@@ -88,7 +85,8 @@
<Button
android:id="@+id/submit"
android:id="@+id/submit_ins"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@@ -98,8 +96,9 @@
android:background="@drawable/cardviewoutline"
android:text="@string/submit"
android:textColor="@android:color/black"
android:textStyle="bold"
style="?android:attr/borderlessButtonStyle" />
android:textStyle="bold" />
</RelativeLayout>

View File

@@ -1,9 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".logbookFragment">
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".Driver.logbookFragment">
<LinearLayout
android:id="@+id/lb_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="12dp"
android:layout_alignParentTop="true">
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="12dp"
app:cardCornerRadius="28dp"
app:cardElevation="0dp">
<ImageView
android:id="@+id/log_book_img"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round" />
<ProgressBar
android:id="@+id/pb_lb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="center" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/upload_lb"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/lin_lay"
android:layout_alignParentLeft="true"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:gravity="center"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Upload logbook"
android:textColorHighlight="#608d91" />
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/v5c_no"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="V5C number"
android:inputType="none"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
</FrameLayout>
<Button
android:id="@+id/submit_lb"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_margin="12dp"
android:background="@drawable/cardviewoutline"
android:text="@string/submit"
android:textColor="@android:color/black"
android:textStyle="bold" />
</RelativeLayout>

View File

@@ -3,50 +3,59 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
tools:context=".PrivateHireLicenseFragment">
tools:context=".Driver.PrivateHireLicenseFragment">
<LinearLayout
android:id="@+id/mot_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="12dp"
android:layout_centerInParent="true">
android:layout_alignParentTop="true">
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="12dp"
app:cardCornerRadius="28dp"
app:cardElevation="0dp">
<ImageView
android:id="@+id/mot_img"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round" />
<ProgressBar
android:id="@+id/pb_mot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="center" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/uploadmot"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/lin_lay"
android:layout_alignParentLeft="true"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:gravity="center"
android:padding="12dp"
android:layout_marginBottom="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Upload M.O.T"
android:textColorHighlight="#608d91" />
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/mot_no"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="MOT Number"
android:inputType="none"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -57,6 +66,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:focusable="false"
android:hint="MOT Expiry"
android:inputType="date"
android:maxLines="1"
@@ -69,7 +79,8 @@
<Button
android:id="@+id/submit"
android:id="@+id/submit_mot"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@@ -79,8 +90,7 @@
android:background="@drawable/cardviewoutline"
android:text="@string/submit"
android:textColor="@android:color/black"
android:textStyle="bold"
style="?android:attr/borderlessButtonStyle" />
android:textStyle="bold" />
</RelativeLayout>

View File

@@ -5,26 +5,54 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".PrivateHireLicenseFragment">
tools:context=".Driver.PrivateHireLicenseFragment">
<LinearLayout
android:id="@+id/ph_view_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:padding="12dp"
android:layout_centerInParent="true">
android:paddingLeft="12dp"
android:paddingTop="12dp"
android:paddingRight="12dp">
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="12dp"
app:cardCornerRadius="28dp"
app:cardElevation="0dp">
<ImageView
android:id="@+id/imageView2"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round" />
<ProgressBar
android:id="@+id/pb_priv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/uploadphlic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/lin_lay"
android:layout_alignParentLeft="true"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:gravity="center"
android:padding="12dp"
android:layout_marginBottom="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Upload Private hire photo"
@@ -57,8 +85,8 @@
android:id="@+id/ph_expiry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:focusable="false"
android:hint="Private Hire License Expiry"
android:inputType="date"
android:maxLines="1"
@@ -84,18 +112,7 @@
android:textStyle="bold"
style="?android:attr/borderlessButtonStyle" />
<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/ph_view_holder"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:scaleType="centerInside"
android:adjustViewBounds="true"
tools:src="@drawable/bg" />
</RelativeLayout>

View File

@@ -0,0 +1,118 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".Driver.PrivateHireLicenseFragment">
<LinearLayout
android:id="@+id/ph_view_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:paddingLeft="12dp"
android:paddingTop="12dp"
android:paddingRight="12dp">
<android.support.v7.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="12dp"
app:cardCornerRadius="28dp"
app:cardElevation="0dp">
<ImageView
android:id="@+id/imageView2"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round" />
<ProgressBar
android:id="@+id/pb_priv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/uploadphlic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/lin_lay"
android:layout_alignParentLeft="true"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:gravity="center"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Upload Private hire photo"
android:textColorHighlight="#608d91" />
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/ph_no"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Private Hire Vehicle License no."
android:inputType="none"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/ph_expiry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:focusable="false"
android:hint="Private Hire License Expiry"
android:inputType="date"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
<Button
android:id="@+id/submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_margin="12dp"
android:background="@drawable/cardviewoutline"
android:text="@string/submit"
android:textColor="@android:color/black"
android:textStyle="bold"
style="?android:attr/borderlessButtonStyle" />
</RelativeLayout>

View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".PrivateHireLicenseFragment">
tools:context=".Driver.PrivateHireLicenseFragment">
<LinearLayout
android:id="@+id/ph_view_holder"
@@ -16,11 +16,9 @@
android:layout_centerInParent="true">
<TextView
android:id="@+id/uploadprofilepic"
android:id="@+id/change_profile_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/lin_lay"
android:layout_alignParentLeft="true"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
@@ -28,44 +26,36 @@
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Upload new profile picture"
android:text="Change Profile Name"
android:textColorHighlight="#608d91" />
<android.support.design.widget.TextInputLayout
<TextView
android:id="@+id/change_email"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:gravity="center"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Change Email Address"
android:textColorHighlight="#608d91" />
<EditText
android:id="@+id/profile_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Profile Name"
android:inputType="textPersonName"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
<TextView
android:id="@+id/change_pw"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/profile_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Profile Email"
android:inputType="textEmailAddress"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</android.support.design.widget.TextInputLayout>
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:gravity="center"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Change Password"
android:textColorHighlight="#608d91" />
</LinearLayout>
@@ -88,17 +78,5 @@
android:textColor="@android:color/black"
android:textStyle="bold" />
<ImageView
android:id="@+id/profile_pic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/ph_view_holder"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:adjustViewBounds="true"
android:src="@mipmap/ic_launcher" />
</RelativeLayout>

View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/rel"
tools:context=".SuperUser.UserMainFragment">
<!--<ListView-->
<!--android:id="@+id/approvals_list"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_alignParentStart="true"-->
<!--android:layout_alignParentTop="true"-->
<!--android:orientation="vertical"-->
<!--android:padding="20dp"-->
<!--tools:listitem="@layout/approval_list_item">-->
<!--</ListView>-->
<GridView
android:id="@+id/approvals_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:numColumns="2"
android:rowCount="4"
android:stretchMode="columnWidth"
tools:listitem="@layout/approval_list_grid_item">
</GridView>
</RelativeLayout>

View File

@@ -0,0 +1,253 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/vehicle_prof"
style="@style/cardview_theme"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="16dp">
<ImageView
android:src="@drawable/cardviewoutline"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|left"
android:orientation="horizontal">
<ImageView
android:id="@+id/approval_vehicle"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="right|center"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:padding="6dp"
tools:src="@android:drawable/presence_online" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Vehicle Profile"
android:textSize="26sp" />
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/insurance"
style="@style/cardview_theme"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="16dp"
app:cardBackgroundColor="@android:color/transparent">
<ImageView
android:src="@drawable/cardviewoutline"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|left"
android:orientation="horizontal">
<ImageView
android:id="@+id/approval_insurance"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="right|center"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:padding="6dp"
tools:src="@drawable/approved" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Insurance"
android:textSize="22sp" />
<TextView
android:id="@+id/ins_exp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Expires: 20/12/2019" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/mot"
style="@style/cardview_theme"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="16dp"
app:cardBackgroundColor="@android:color/transparent">
<ImageView
android:src="@drawable/cardviewoutline"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="left|center"
android:orientation="horizontal">
<ImageView
android:id="@+id/approval_mot"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="right|center"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:padding="6dp"
tools:src="@android:drawable/presence_online" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="right"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="M.O.T"
android:textSize="22sp" />
<TextView
android:id="@+id/mot_exp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="Expires: 20/12/2019" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/logbook"
style="@style/cardview_theme"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="16dp"
app:cardBackgroundColor="@android:color/transparent">
<ImageView
android:src="@drawable/cardviewoutline"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|left"
android:orientation="horizontal">
<ImageView
android:id="@+id/approval_lb"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="right|center"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:padding="6dp"
tools:src="@android:drawable/presence_online" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="Logbook"
android:textSize="22sp" />
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:id="@+id/private_hire_vehicle_license"
style="@style/cardview_theme"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="16dp"
android:layout_weight="1"
app:cardBackgroundColor="@android:color/transparent">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@drawable/cardviewoutline" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center|left"
android:orientation="horizontal">
<ImageView
android:id="@+id/approval_ph_car"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="right|center"
android:layout_marginLeft="16dp"
android:layout_marginRight="8dp"
android:padding="6dp"
tools:src="@android:drawable/presence_online" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="P/H Vehicle License"
android:textSize="22sp" />
<TextView
android:id="@+id/ph_car_exp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
tools:text="Expires: 20/12/2019" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>

View File

@@ -22,7 +22,7 @@
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Car reg"
android:inputType="none"
android:inputType="textCapCharacters"
android:maxLines="1"
style="@style/edittexttheme" />
@@ -131,7 +131,7 @@
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Postcode of Keeper"
android:inputType="none"
android:inputType="none|textCapCharacters"
android:maxLines="1"
android:padding="12dp"
android:selectAllOnFocus="true"
@@ -150,6 +150,7 @@
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Start date"
android:focusable="false"
android:inputType="date"
android:maxLines="1"
style="@style/edittexttheme" />
@@ -165,77 +166,14 @@
android:padding="12dp"
android:textSize="18sp"/>
<TextView
android:id="@+id/mot"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Add MOT details"
android:textColorHighlight="#608d91" />
<TextView
android:id="@+id/retrievedmot"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:padding="12dp"
android:text="MOT number : 254215751 \nExpiry Date: 22/10/2019" />
<TextView
android:id="@+id/insurance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Add insurance details"
android:textColorHighlight="#608d91" />
<TextView
android:id="@+id/insurance_retrieved"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:padding="12dp"
android:text="Insurer : Admiral \nInsurance No.: 483sdf4623\nExpiry Date: 22/10/2019"/>
<TextView
android:id="@+id/log_book"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/round_edit_text"
android:ems="10"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Add Log Book"
android:textColorHighlight="#608d91" />
<TextView
android:id="@+id/log_book_retrieved"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:padding="12dp"
android:text="V5C number: 483sdf4623"/>
<Button
android:id="@+id/submit_vehicle"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="22dp"
android:layout_gravity="right"
android:layout_marginBottom="12dp"
android:background="@drawable/cardviewoutline"
android:text="@string/submit"
android:textColor="#91ddff"

View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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="wrap_content"
android:layout_height="match_parent"
tools:layout_height="200dp">
<FrameLayout
android:id="@+id/frame_lay"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:adjustViewBounds="true">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cardCornerRadius="28dp"
app:cardElevation="0dp">
<ImageView
android:id="@+id/main_image"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round" />
<ProgressBar
android:id="@+id/pb_ins"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="center" />
</android.support.v7.widget.CardView>
</FrameLayout>
</FrameLayout>

View File

@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="102dp"
android:layout_margin="6dp">
<FrameLayout
android:id="@+id/round_card_holder"
android:layout_width="102dp"
android:layout_height="102dp"
android:layout_above="@id/id_holder"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true">
<android.support.v7.widget.CardView
android:id="@+id/roundCard"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_above="@id/id_holder"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_gravity="center"
android:padding="3dp"
app:cardCornerRadius="50dp">
<ImageView
android:id="@+id/driverPic"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:contentDescription="@string/list_item_image"
android:scaleType="centerCrop"
tools:srcCompat="@mipmap/ic_launcher_round" />
<ProgressBar
android:id="@+id/pb_su_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone" />
</android.support.v7.widget.CardView>
</FrameLayout>
<LinearLayout
android:id="@+id/textholder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="6dp"
android:layout_toLeftOf="@id/driver_no"
android:layout_toRightOf="@id/round_card_holder"
android:orientation="vertical">
<TextView
android:id="@+id/username_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/roundCard"
android:textSize="18sp"
android:textStyle="bold"
tools:text="Haider Malik" />
<TextView
android:id="@+id/emailaddress_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/roundCard"
android:textSize="14sp"
tools:text="h.malik144.au@gmail.com" />
</LinearLayout>
<TextView
android:id="@+id/driver_no"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:gravity="center"
android:includeFontPadding="false"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:textColor="@color/colour_four"
android:textSize="20dp"
android:textStyle="bold"
app:autoSizeMaxTextSize="22dp"
app:autoSizeMinTextSize="16dp"
tools:text="T22" />
<ImageView
android:id="@+id/approval_iv"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginLeft="6dp"
android:adjustViewBounds="true"
tools:src="@android:drawable/presence_online" />
</RelativeLayout>
</FrameLayout>

View File

@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:rotation="180"
app:srcCompat="@android:drawable/ic_media_play" />
<FrameLayout
android:layout_width="200dp"
android:layout_height="200dp"
android:adjustViewBounds="true">
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</android.support.v4.view.ViewPager>
<ImageView
android:id="@+id/delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
app:srcCompat="@android:drawable/ic_delete" />
</FrameLayout>
<ImageView
android:id="@+id/right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
app:srcCompat="@android:drawable/ic_media_play" />
</LinearLayout>

View File

@@ -28,7 +28,7 @@
android:adjustViewBounds="true"
android:contentDescription="@string/nav_header_desc"
android:scaleType="centerCrop"
app:srcCompat="@mipmap/ic_launcher_round" />
app:srcCompat="@drawable/choice_img_round" />
</android.support.v7.widget.CardView>

View File

@@ -3,14 +3,15 @@
xmlns:tools="http://schemas.android.com/tools"
tools:showIn="navigation_view">
<group android:checkableBehavior="none">
<group android:checkableBehavior="none"
android:id="@+id/menu_group">
<item
android:id="@+id/nav_gallery"
android:icon="@drawable/ic_menu_gallery"
android:icon="@drawable/ic_person_black_24dp"
android:title="Driver profile" />
<item
android:id="@+id/nav_slideshow"
android:icon="@drawable/ic_menu_slideshow"
android:icon="@drawable/ic_local_taxi_black_24dp"
android:title="Vehicle Profile" />
</group>
@@ -19,9 +20,11 @@
<menu>
<item
android:id="@+id/nav_camera"
android:icon="@drawable/ic_menu_camera"
android:icon="@drawable/ic_settings_black_24dp"
android:title="Update User Profile" />
</menu>
</item>
</menu>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/archive"
android:icon="@drawable/ic_sort_black_24dp"
android:title="sort"
app:showAsAction="ifRoom"></item>
</menu>

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

@@ -9,4 +9,6 @@
<color name="colour_three">#a5b0b6</color>
<color name="colour_four">#8549ff</color>
<color name="colour_five">#020122</color>
<color name="colour_siz">#deecf4</color>
<color name="colour_seven">#91ddff</color>
</resources>

View File

@@ -1,5 +1,5 @@
<resources>
<string name="app_name">Driver</string>
<string name="app_name">Choice Minicabs</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="nav_header_title">Driver Name</string>
@@ -14,6 +14,7 @@
<string name="action_sign_in_short">Sign in</string>
<string name="error_invalid_email">This email address is invalid</string>
<string name="error_invalid_password">This password is too short</string>
<string name="no_match_password">Passwords do not match</string>
<string name="error_incorrect_password">This password is incorrect</string>
<string name="error_field_required">This field is required</string>
<string name="permission_rationale">"Contacts permissions are needed for providing email
@@ -26,5 +27,10 @@
<string name="take_pic">Open Camera</string>
<string name="upload_pic">Upload from Storage</string>
<string name="set_date">Select date</string>
<string name="image_required">Driving License Image Required</string>
<string name="image_required">Driver Photo Required</string>
<string name="no_role">No role detected</string>
<string name="list_item_image">list item image</string>
<string name="failed_retrieve">Failed to retrieve data</string>
<string name="failed_upload">Failed to upload data</string>
<string name="unsuccessful">Unable To upload</string>
</resources>

View File

@@ -30,11 +30,12 @@
<!--<item name="android:layout_width">match_parent</item>-->
<!--<item name="android:layout_height">match_parent</item>-->
<!--<item name="cardBackgroundColor">#00fffb</item>-->
<item name="cardElevation">0dp</item>
<item name="cardCornerRadius">22dp</item>
</style>
<style name="edittexttheme">
<item name="android:backgroundTint">@color/colour_five</item>
<item name="android:backgroundTint">@color/colour_three</item>
<item name="android:padding">12dp</item>
<item name="android:selectAllOnFocus">true</item>
<item name="android:singleLine">true</item>