hmalik144/Driver
1
0
Fork 0
mirror of https://github.com/hmalik144/Driver.git synced 2026-03-17 23:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Facelift for app

Browse Source 
- Decouple driver and admin apps
 - Flavours added
This commit is contained in:
hmalik144
2023-02-21 00:46:01 +00:00
parent 5685da9c92
commit 3cdb8fa3cf
92 changed files with 1446 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/build.gradle
View File

@@ -13,8 +13,13 @@ repositories {
mavenCentral() mavenCentral()
} }
def relStorePassword = System.getenv("RELEASE_STORE_PASSWORD")
def relKeyPassword = System.getenv("RELEASE_KEY_PASSWORD")
def relKeyAlias = System.getenv("RELEASE_KEY_ALIAS")
def relStoreFile = System.getenv("RELEASE_KEYSTORE")
android { android {
compileSdkVersion 30 compileSdkVersion 31
defaultConfig { defaultConfig {
applicationId "h_mal.appttude.com" applicationId "h_mal.appttude.com"
minSdkVersion 24 minSdkVersion 24
@@ -23,16 +28,23 @@ android {
versionName "1.6" versionName "1.6"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
} }
signingConfigs {
release {
storePassword relStorePassword
keyPassword relKeyPassword
keyAlias relKeyAlias
storeFile file(relStoreFile)
}
}
buildTypes { buildTypes {
release { release {
minifyEnabled false signingConfig signingConfigs.release
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "1.8"
} }
@@ -45,7 +57,7 @@ android {
versionName "1.0.5" versionName "1.0.5"
} }
admin { admin {
applicationIdSuffix ".driver_admin" applicationIdSuffix ".driverAdmin"
versionCode 4 versionCode 4
versionName "0.0.5" versionName "0.0.5"
} }
@@ -66,34 +78,34 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "androidx.appcompat:appcompat:1.0.0" implementation "androidx.appcompat:appcompat:1.4.2"
implementation "com.google.android.material:material:1.0.0" implementation "com.google.android.material:material:1.6.0"
implementation "androidx.cardview:cardview:1.0.0" implementation "androidx.cardview:cardview:1.0.0"
implementation "androidx.legacy:legacy-support-v4:1.0.0" implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "androidx.exifinterface:exifinterface:1.0.0" implementation "androidx.exifinterface:exifinterface:1.3.6"
implementation "androidx.constraintlayout:constraintlayout:1.1.3" implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.fragment:fragment-ktx:1.2.5" implementation "androidx.fragment:fragment-ktx:1.4.0"
implementation "androidx.activity:activity-ktx:1.2.0" implementation "androidx.activity:activity-ktx:1.4.0"
implementation "androidx.recyclerview:recyclerview:1.1.0" implementation "androidx.recyclerview:recyclerview:1.2.1"
implementation "androidx.navigation:navigation-fragment-ktx:2.3.3" implementation "androidx.navigation:navigation-fragment-ktx:2.5.3"
implementation "androidx.navigation:navigation-ui-ktx:2.3.3" implementation "androidx.navigation:navigation-ui-ktx:2.5.3"
implementation "androidx.drawerlayout:drawerlayout:1.1.1" implementation "androidx.drawerlayout:drawerlayout:1.1.1"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
implementation 'androidx.viewpager:viewpager:1.0.0' implementation 'androidx.viewpager:viewpager:1.0.0'
testImplementation "junit:junit:4.12" testImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test.ext:junit:1.1.1" androidTestImplementation "androidx.test.ext:junit:1.1.5"
androidTestImplementation "androidx.test.espresso:espresso-core:3.1.0" androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
androidTestImplementation "androidx.test:rules:1.1.1" androidTestImplementation "androidx.test:rules:1.5.0"
implementation 'androidx.test.espresso:espresso-idling-resource:3.1.1' implementation 'androidx.test.espresso:espresso-idling-resource:3.5.1'
implementation "androidx.legacy:legacy-support-v4:1.0.0" implementation "androidx.legacy:legacy-support-v4:1.0.0"
// Google play services // Google play services
implementation "com.google.android.gms:play-services-auth:15.0.1" implementation "com.google.android.gms:play-services-auth:20.4.1"
// Google firebase // Google firebase
def firebaseVer = "16.0.1" def firebaseVer = "20.1.0"
implementation "com.google.firebase:firebase-core:$firebaseVer" implementation "com.google.firebase:firebase-core:$firebaseVer"
implementation "com.google.firebase:firebase-auth:$firebaseVer" implementation "com.google.firebase:firebase-auth:21.0.0"
implementation "com.google.firebase:firebase-storage:$firebaseVer" implementation "com.google.firebase:firebase-storage:$firebaseVer"
implementation "com.google.firebase:firebase-database:$firebaseVer" implementation "com.google.firebase:firebase-database:$firebaseVer"
// Photoviewer // Photoviewer
@@ -101,9 +113,9 @@ dependencies {
/* Picasso photo loader */ /* Picasso photo loader */
implementation "com.squareup.picasso:picasso:2.71828" implementation "com.squareup.picasso:picasso:2.71828"
/* Gson */ /* Gson */
implementation "com.google.code.gson:gson:2.3.1" implementation "com.google.code.gson:gson:2.8.9"
/* coroutines support for firebase operations */ /* coroutines support for firebase operations */
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.1.1" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.1"
// Circle Image View // Circle Image View
implementation "com.mikhaellopez:circularimageview:4.2.0" implementation "com.mikhaellopez:circularimageview:4.2.0"

2
app/src/driver_admin/java/h_mal/appttude/com/Objects/ApprovalsObject.kt → app/src/admin/java/h_mal/appttude/com/objects/ApprovalsObject.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.Objects package h_mal.appttude.com.objects

2
app/src/driver_admin/java/h_mal/appttude/com/Objects/ArchiveObject.kt → app/src/admin/java/h_mal/appttude/com/objects/ArchiveObject.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.Objects package h_mal.appttude.com.objects
import h_mal.appttude.com.model.* import h_mal.appttude.com.model.*
import java.util.* import java.util.*

2
app/src/driver_admin/java/h_mal/appttude/com/Objects/UserObject.kt → app/src/admin/java/h_mal/appttude/com/objects/UserObject.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.Objects package h_mal.appttude.com.objects

6
app/src/driver_admin/java/h_mal/appttude/com/Objects/WholeDriverObject.kt → app/src/admin/java/h_mal/appttude/com/objects/WholeDriverObject.kt
View File

@@ -1,7 +1,7 @@
package h_mal.appttude.com.Objects package h_mal.appttude.com.objects
import h_mal.appttude.com.Objects.WholeObject.DriverProfile import h_mal.appttude.com.objects.wholeObject.DriverProfile
import h_mal.appttude.com.Objects.WholeObject.VehicleProfile import h_mal.appttude.com.objects.wholeObject.VehicleProfile
class WholeDriverObject { class WholeDriverObject {

2
app/src/driver_admin/java/h_mal/appttude/com/Objects/WholeObject/DriverProfile.kt → app/src/admin/java/h_mal/appttude/com/objects/wholeObject/DriverProfile.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.Objects.WholeObject package h_mal.appttude.com.objects.wholeObject
import h_mal.appttude.com.model.DriverProfileObject import h_mal.appttude.com.model.DriverProfileObject
import h_mal.appttude.com.model.DriversLicenseObject import h_mal.appttude.com.model.DriversLicenseObject

5
app/src/driver_admin/java/h_mal/appttude/com/Objects/WholeObject/MappedObject.kt → app/src/admin/java/h_mal/appttude/com/objects/wholeObject/MappedObject.kt
View File

@@ -1,8 +1,8 @@
package h_mal.appttude.com.Objects.WholeObject package h_mal.appttude.com.objects.wholeObject
import android.os.Parcel import android.os.Parcel
import android.os.Parcelable import android.os.Parcelable
import h_mal.appttude.com.Objects.WholeDriverObject import h_mal.appttude.com.objects.WholeDriverObject
class MappedObject : Parcelable { class MappedObject : Parcelable {
@@ -28,6 +28,7 @@ class MappedObject : Parcelable {
} }
companion object { companion object {
@JvmField
val CREATOR: Parcelable.Creator<MappedObject?> = object : Parcelable.Creator<MappedObject?> { val CREATOR: Parcelable.Creator<MappedObject?> = object : Parcelable.Creator<MappedObject?> {
override fun createFromParcel(`in`: Parcel): MappedObject? { override fun createFromParcel(`in`: Parcel): MappedObject? {
return MappedObject(`in`) return MappedObject(`in`)

2
app/src/driver_admin/java/h_mal/appttude/com/Objects/WholeObject/VehicleProfile.kt → app/src/admin/java/h_mal/appttude/com/objects/wholeObject/VehicleProfile.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.Objects.WholeObject package h_mal.appttude.com.objects.wholeObject
import h_mal.appttude.com.model.InsuranceObject import h_mal.appttude.com.model.InsuranceObject
import h_mal.appttude.com.model.LogbookObject import h_mal.appttude.com.model.LogbookObject

6
app/src/driver_admin/java/h_mal/appttude/com/ApprovalListAdapter.kt → app/src/admin/java/h_mal/appttude/com/ui/ApprovalListAdapter.kt
View File

@@ -1,16 +1,16 @@
package h_mal.appttude.com.SuperUser package h_mal.appttude.com.ui
import android.app.Activity import android.app.Activity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import h_mal.appttude.com.Objects.WholeObject.MappedObject import h_mal.appttude.com.objects.wholeObject.MappedObject
import h_mal.appttude.com.R import h_mal.appttude.com.R
class ApprovalListAdapter( class ApprovalListAdapter(
val activity: Activity, private val activity: Activity,
objects: Array<MappedObject?> objects: Array<MappedObject?>
): ArrayAdapter<MappedObject?>(activity, 0, objects) { ): ArrayAdapter<MappedObject?>(activity, 0, objects) {

2
app/src/driver_admin/java/h_mal/appttude/com/DriverStatusClass.kt → app/src/admin/java/h_mal/appttude/com/ui/DriverStatusClass.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.SuperUser package h_mal.appttude.com.ui
import android.app.AlertDialog import android.app.AlertDialog
import android.content.Context import android.content.Context

11
app/src/driver_admin/java/h_mal/appttude/com/homeSuperUserFragment.kt → app/src/admin/java/h_mal/appttude/com/ui/HomeSuperUserFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.SuperUser package h_mal.appttude.com.ui
import android.app.AlertDialog import android.app.AlertDialog
import android.content.DialogInterface import android.content.DialogInterface
@@ -12,16 +12,15 @@ import com.google.firebase.database.DataSnapshot
import com.google.firebase.database.DatabaseError import com.google.firebase.database.DatabaseError
import com.google.firebase.database.DatabaseReference import com.google.firebase.database.DatabaseReference
import com.google.firebase.database.ValueEventListener import com.google.firebase.database.ValueEventListener
import h_mal.appttude.com.ui.driver.MainActivity import h_mal.appttude.com.objects.WholeDriverObject
import h_mal.appttude.com.Objects.WholeDriverObject import h_mal.appttude.com.objects.wholeObject.MappedObject
import h_mal.appttude.com.Objects.WholeObject.MappedObject
import h_mal.appttude.com.R import h_mal.appttude.com.R
import kotlinx.android.synthetic.main.fragment_home_super_user.* import kotlinx.android.synthetic.admin.fragment_home_super_user.*
import java.io.IOException import java.io.IOException
import java.util.* import java.util.*
class homeSuperUserFragment : Fragment() { class HomeSuperUserFragment : Fragment() {
var users: DatabaseReference? = null var users: DatabaseReference? = null
var mappedObjectList: MutableList<MappedObject>? = null var mappedObjectList: MutableList<MappedObject>? = null
private var sharedPreferences: SharedPreferences? = null private var sharedPreferences: SharedPreferences? = null

3
app/src/driver/java/h_mal/appttude/com/ui/driver/MainActivity.kt → app/src/admin/java/h_mal/appttude/com/ui/MainActivity.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver package h_mal.appttude.com.ui
import android.os.Bundle import android.os.Bundle
@@ -37,6 +37,7 @@ class MainActivity : BaseActivity<MainViewModel>(),
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setSupportActionBar(toolbar) setSupportActionBar(toolbar)
supportActionBar?.setDisplayShowTitleEnabled(false)
navController = findNavController(R.id.container) navController = findNavController(R.id.container)
appBarConfiguration = AppBarConfiguration(navController.graph, drawer_layout) appBarConfiguration = AppBarConfiguration(navController.graph, drawer_layout)

7
app/src/driver_admin/java/h_mal/appttude/com/RecyclerViewAdapter.kt → app/src/admin/java/h_mal/appttude/com/ui/RecyclerViewAdapter.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.SuperUser package h_mal.appttude.com.ui
import android.app.AlertDialog import android.app.AlertDialog
import android.content.Context import android.content.Context
@@ -12,9 +12,8 @@ import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.squareup.picasso.Picasso import com.squareup.picasso.Picasso
import h_mal.appttude.com.ui.driver.MainActivity import h_mal.appttude.com.objects.UserObject
import h_mal.appttude.com.Objects.UserObject import h_mal.appttude.com.objects.wholeObject.MappedObject
import h_mal.appttude.com.Objects.WholeObject.MappedObject
import h_mal.appttude.com.R import h_mal.appttude.com.R

4
app/src/driver_admin/java/h_mal/appttude/com/UserMainFragment.kt → app/src/admin/java/h_mal/appttude/com/ui/UserMainFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.SuperUser package h_mal.appttude.com.ui
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
@@ -7,7 +7,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.GridView import android.widget.GridView
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import h_mal.appttude.com.Objects.WholeObject.MappedObject import h_mal.appttude.com.objects.wholeObject.MappedObject
import h_mal.appttude.com.R import h_mal.appttude.com.R

2
app/src/main/res/layout/approval_list_grid_item.xml → app/src/admin/res/layout/approval_list_grid_item.xml
View File

@@ -83,7 +83,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@drawable/ic_archive_black_24dp" android:src="@drawable/ic_archive_black_24dp"
android:tint="@color/colour_three" /> app:tint="@color/colour_three" />
</FrameLayout> </FrameLayout>
</RelativeLayout> </RelativeLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

3
app/src/main/res/layout/fragment_home_super_user.xml → app/src/admin/res/layout/fragment_home_super_user.xml
View File

@@ -3,8 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".SuperUser.homeSuperUserFragment"> tools:context=".ui.HomeSuperUserFragment">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"

17
app/src/admin/res/layout/fragment_user_main.xml Normal file
View File

@@ -0,0 +1,17 @@
<?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=".ui.UserMainFragment">
<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"/>
</RelativeLayout>

75
app/src/admin/res/layout/list_item_layout.xml Normal file
View File

@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.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="wrap_content"
android:background="@color/colour_nine">
<com.mikhaellopez.circularimageview.CircularImageView
android:id="@+id/driverPic"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="24dp"
android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
app:civ_border_width="3dp"
app:civ_shadow_radius="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/choice_img_round" />
<ImageView
android:id="@+id/approval_iv"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginRight="3dp"
android:layout_marginTop="3dp"
app:layout_constraintTop_toTopOf="@id/driverPic"
app:layout_constraintRight_toRightOf="@id/driverPic"
android:adjustViewBounds="true"
tools:src="@android:drawable/presence_online" />
<TextView
android:id="@+id/driver_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:textColor="@android:color/white"
android:textSize="12sp"
android:textStyle="bold"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/driverPic"
tools:text="T22" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="24dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@id/driverPic"
app:layout_constraintLeft_toRightOf="@id/driverPic"
app:layout_constraintRight_toLeftOf="@id/driver_no"
app:layout_constraintTop_toTopOf="@id/driverPic">
<TextView
android:id="@+id/username_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
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:textColor="@android:color/white"
android:textSize="11sp"
tools:text="h.malik144.au@gmail.com" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/driver/AndroidManifest.xml
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application> <application android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round">
<activity <activity
android:name="h_mal.appttude.com.ui.user.LoginActivity" android:name="h_mal.appttude.com.ui.user.LoginActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar.User"> android:theme="@style/AppTheme.NoActionBar.User"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@@ -14,7 +16,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name="h_mal.appttude.com.ui.driver.MainActivity" android:name="h_mal.appttude.com.ui.MainActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar" /> android:theme="@style/AppTheme.NoActionBar" />

2
app/src/driver/java/h_mal/appttude/com/ui/driver/DriverOverallFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/DriverOverallFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver package h_mal.appttude.com.ui
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View

2
app/src/driver/java/h_mal/appttude/com/ui/driver/HomeFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/HomeFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver package h_mal.appttude.com.ui
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View

101
app/src/driver/java/h_mal/appttude/com/ui/MainActivity.kt Normal file
View File

@@ -0,0 +1,101 @@
package h_mal.appttude.com.ui
import android.os.Bundle
import android.view.MenuItem
import android.view.View
import androidx.core.view.GravityCompat
import androidx.navigation.NavController
import androidx.navigation.findNavController
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.navigateUp
import androidx.navigation.ui.setupActionBarWithNavController
import androidx.navigation.ui.setupWithNavController
import com.google.android.material.navigation.NavigationView
import com.google.firebase.auth.FirebaseUser
import h_mal.appttude.com.R
import h_mal.appttude.com.base.BaseActivity
import h_mal.appttude.com.dialogs.ExitDialog.displayExitDialog
import h_mal.appttude.com.utils.setGlideImage
import h_mal.appttude.com.viewmodels.MainViewModel
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.app_bar_main.*
import kotlinx.android.synthetic.main.nav_header_main.view.*
class MainActivity : BaseActivity<MainViewModel>(),
NavigationView.OnNavigationItemSelectedListener {
private val vm by createLazyViewModel<MainViewModel>()
override fun getViewModel(): MainViewModel = vm
override val layoutId: Int = R.layout.activity_main
lateinit var navController: NavController
lateinit var appBarConfiguration: AppBarConfiguration
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setSupportActionBar(toolbar)
supportActionBar?.setDisplayShowTitleEnabled(false)
navController = findNavController(R.id.container)
appBarConfiguration = AppBarConfiguration(navController.graph, drawer_layout)
nav_view.setupWithNavController(navController)
setupActionBarWithNavController(navController, appBarConfiguration)
getViewModel().getUserDetails()
setupLogoutInDrawer()
}
override fun onSupportNavigateUp(): Boolean {
return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
}
override fun setTitle(title: CharSequence) {
toolbar.title = title
}
override fun onBackPressed() {
if (drawer_layout.isDrawerOpen(GravityCompat.START)) {
drawer_layout.closeDrawer(GravityCompat.START)
} else {
val navHostFragment = supportFragmentManager.findFragmentById(R.id.container)
navHostFragment?.childFragmentManager?.backStackEntryCount?.takeIf { it >= 1 }?.let {
return super.onBackPressed()
}
displayExitDialog()
}
}
override fun onSuccess(data: Any?) {
super.onSuccess(data)
when(data){
is FirebaseUser -> {
setupDrawer(data)
}
}
}
private fun setupDrawer(user: FirebaseUser) {
val header: View = nav_view.getHeaderView(0)
header.driver_email.text = user.email
header.driver_name.text = user.displayName
header.profileImage.setGlideImage(user.photoUrl)
}
private fun setupLogoutInDrawer(){
logout.setOnClickListener {
getViewModel().logOut()
}
}
override fun onNavigationItemSelected(item: MenuItem): Boolean {
// Handle navigation view item clicks here.
when (item.itemId) {
R.id.nav_user_settings -> { }
}
drawer_layout.closeDrawer(GravityCompat.START)
return true
}
}

2
app/src/driver/java/h_mal/appttude/com/ui/driver/VehicleOverallFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/VehicleOverallFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver package h_mal.appttude.com.ui
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View

20
app/src/driver/java/h_mal/appttude/com/ui/WelcomeFragment.kt Normal file
View File

@@ -0,0 +1,20 @@
package h_mal.appttude.com.ui
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.View
import h_mal.appttude.com.R
import h_mal.appttude.com.utils.navigateTo
import kotlinx.android.synthetic.driver.fragment_welcome.*
class WelcomeFragment : Fragment(R.layout.fragment_welcome) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
email_sign_in_button.setOnClickListener {
view.navigateTo(R.id.to_driverOverallFragment)
}
}
}

2
app/src/driver/java/h_mal/appttude/com/ui/driver/driverprofile/DriverLicenseFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/driverprofile/DriverLicenseFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver.driverprofile package h_mal.appttude.com.ui.driverprofile
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle

2
app/src/driver/java/h_mal/appttude/com/ui/driver/driverprofile/DriverProfileFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/driverprofile/DriverProfileFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver.driverprofile package h_mal.appttude.com.ui.driverprofile
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle

2
app/src/driver/java/h_mal/appttude/com/ui/driver/driverprofile/PrivateHireLicenseFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/driverprofile/PrivateHireLicenseFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver.driverprofile package h_mal.appttude.com.ui.driverprofile
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle

2
app/src/driver/java/h_mal/appttude/com/ui/driver/vehicleprofile/InsuranceFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/InsuranceFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver.vehicleprofile package h_mal.appttude.com.ui.vehicleprofile
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle

2
app/src/driver/java/h_mal/appttude/com/ui/driver/vehicleprofile/LogbookFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/LogbookFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver.vehicleprofile package h_mal.appttude.com.ui.vehicleprofile
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle

2
app/src/driver/java/h_mal/appttude/com/ui/driver/vehicleprofile/MotFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/MotFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver.vehicleprofile package h_mal.appttude.com.ui.vehicleprofile
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle

2
app/src/driver/java/h_mal/appttude/com/ui/driver/vehicleprofile/PrivateHireVehicleFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/PrivateHireVehicleFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver.vehicleprofile package h_mal.appttude.com.ui.vehicleprofile
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle

2
app/src/driver/java/h_mal/appttude/com/ui/driver/vehicleprofile/VehicleProfileFragment.kt → app/src/driver/java/h_mal/appttude/com/ui/vehicleprofile/VehicleProfileFragment.kt
View File

@@ -1,4 +1,4 @@
package h_mal.appttude.com.ui.driver.vehicleprofile package h_mal.appttude.com.ui.vehicleprofile
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View

74
app/src/driver/res/layout/fragment_welcome.xml Normal file
View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.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"
android:background="@drawable/background_with_curve"
tools:context=".ui.user.LoginFragment">
<ImageView
android:id="@+id/background_img"
android:src="@drawable/welcome_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
style="@style/imageBackground"
android:contentDescription="@string/image_description" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/activity_horizontal_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.button.MaterialButton
android:id="@+id/email_sign_in_button"
style="@style/TextButton.WithIcon"
android:text="@string/login"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.9" />
<TextView
android:id="@+id/register_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/or_create_my_account"
android:textColor="@android:color/white"
android:layout_marginTop="@dimen/activity_horizontal_margin"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/email_sign_in_button" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/hello_nice_to_meet_you"
android:textColor="@android:color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginTop="32dp"/>
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/get_a_new_experience"
android:layout_marginTop="6dp"
android:textStyle="bold"
android:textSize="24sp"
app:layout_constraintLeft_toLeftOf="parent"
android:textColor="@android:color/white"
app:layout_constraintTop_toBottomOf="@id/textView3"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/driver/res/values/strings.xml Normal file
View File

@@ -0,0 +1,4 @@
<resources>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>

27
app/src/main/java/h_mal/appttude/com/base/BaseFragment.kt
View File

@@ -8,25 +8,25 @@ import android.os.Bundle
import androidx.annotation.LayoutRes import androidx.annotation.LayoutRes
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import h_mal.appttude.com.application.ApplicationViewModelFactory import h_mal.appttude.com.application.ApplicationViewModelFactory
import h_mal.appttude.com.data.ViewState import h_mal.appttude.com.data.ViewState
import h_mal.appttude.com.utils.PermissionsUtils import h_mal.appttude.com.utils.PermissionsUtils
import kotlinx.android.synthetic.main.fragment_driver_profile.view.*
import org.kodein.di.KodeinAware import org.kodein.di.KodeinAware
import org.kodein.di.android.x.kodein import org.kodein.di.android.x.kodein
import org.kodein.di.generic.instance import org.kodein.di.generic.instance
const val IMAGE_SELECT_REQUEST_CODE = 401 const val IMAGE_SELECT_REQUEST_CODE = 401
abstract class BaseFragment<V : BaseViewModel>(@LayoutRes contentLayoutId: Int) : Fragment(contentLayoutId), KodeinAware {
abstract class BaseFragment<V : BaseViewModel>(@LayoutRes contentLayoutId: Int) :
Fragment(contentLayoutId), KodeinAware {
var mActivity: BaseActivity<V>? = null var mActivity: BaseActivity<V>? = null
abstract fun getViewModel(): V abstract fun getViewModel(): V
private var multipleImage: Boolean = false private var multipleImage: Boolean = false
fun setImageSelectionAsMultiple(){ fun setImageSelectionAsMultiple() {
multipleImage = true multipleImage = true
} }
@@ -64,22 +64,22 @@ abstract class BaseFragment<V : BaseViewModel>(@LayoutRes contentLayoutId: Int)
} }
private fun configureObserver() { private fun configureObserver() {
getViewModel().uiState.observe(viewLifecycleOwner, Observer { getViewModel().uiState.observe(viewLifecycleOwner) {
when (it) { when (it) {
is ViewState.HasStarted -> onStarted() is ViewState.HasStarted -> onStarted()
is ViewState.HasData<*> -> onSuccess(it.data.getContentIfNotHandled()) is ViewState.HasData<*> -> onSuccess(it.data.getContentIfNotHandled())
is ViewState.HasError -> onFailure(it.error.getContentIfNotHandled()) is ViewState.HasError -> onFailure(it.error.getContentIfNotHandled())
} }
}) }
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)
if (resultCode == Activity.RESULT_OK){ if (resultCode == Activity.RESULT_OK) {
when(requestCode){ when (requestCode) {
IMAGE_SELECT_REQUEST_CODE -> { IMAGE_SELECT_REQUEST_CODE -> {
data?.clipData?.convertToList()?.let { clip -> data?.clipData?.convertToList()?.let { clip ->
val list = clip.takeIf { it.size > 10 }?.let{ val list = clip.takeIf { it.size > 10 }?.let {
clip.subList(0, 9) clip.subList(0, 9)
} ?: clip } ?: clip
onImageGalleryResult(list) onImageGalleryResult(list)
@@ -105,7 +105,7 @@ abstract class BaseFragment<V : BaseViewModel>(@LayoutRes contentLayoutId: Int)
fun onPermissionRequest( fun onPermissionRequest(
requestCode: Int, ourRequestCode: Int, grantResults: IntArray, requestCode: Int, ourRequestCode: Int, grantResults: IntArray,
permissionGranted: () -> Unit permissionGranted: () -> Unit
){ ) {
when (requestCode) { when (requestCode) {
ourRequestCode -> { ourRequestCode -> {
if (PermissionsUtils.isGranted(grantResults)) { if (PermissionsUtils.isGranted(grantResults)) {
@@ -119,16 +119,17 @@ abstract class BaseFragment<V : BaseViewModel>(@LayoutRes contentLayoutId: Int)
/** /**
* Called on the result of image selection * Called on the result of image selection
*/ */
open fun onImageGalleryResult(imageUri: Uri?){ } open fun onImageGalleryResult(imageUri: Uri?) {}
/** /**
* Called on the result of multiple image selection * Called on the result of multiple image selection
*/ */
open fun onImageGalleryResult(imageUris: List<Uri>?){ } open fun onImageGalleryResult(imageUris: List<Uri>?) {}
fun openGalleryForImage() { fun openGalleryForImage() {
val intent = Intent(Intent.ACTION_PICK) val intent = Intent(Intent.ACTION_PICK)
intent.type = "image/*" intent.type = "image/*"
intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, multipleImage); intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, multipleImage)
startActivityForResult(intent, IMAGE_SELECT_REQUEST_CODE) startActivityForResult(intent, IMAGE_SELECT_REQUEST_CODE)
} }

8
app/src/main/java/h_mal/appttude/com/base/DataSubmissionBaseFragment.kt
View File

@@ -8,9 +8,7 @@ import android.view.View
import android.widget.EditText import android.widget.EditText
import androidx.annotation.LayoutRes import androidx.annotation.LayoutRes
import androidx.core.widget.doAfterTextChanged import androidx.core.widget.doAfterTextChanged
import androidx.lifecycle.Observer
import h_mal.appttude.com.data.UserAuthState import h_mal.appttude.com.data.UserAuthState
import h_mal.appttude.com.ui.driver.MainActivity
import h_mal.appttude.com.ui.user.LoginActivity import h_mal.appttude.com.ui.user.LoginActivity
import h_mal.appttude.com.utils.PermissionsUtils.askForPermissions import h_mal.appttude.com.utils.PermissionsUtils.askForPermissions
import h_mal.appttude.com.utils.TextValidationUtils.validateEditText import h_mal.appttude.com.utils.TextValidationUtils.validateEditText
@@ -26,14 +24,14 @@ abstract class DataSubmissionBaseFragment<V : DataSubmissionBaseViewModel<T>, T:
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
getViewModel().stateLiveData.observe(viewLifecycleOwner, Observer { getViewModel().stateLiveData.observe(viewLifecycleOwner) {
if (it is UserAuthState.LoggedOut){ if (it is UserAuthState.LoggedOut) {
val intent = Intent(requireContext(), LoginActivity::class.java) val intent = Intent(requireContext(), LoginActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK) intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
startActivity(intent) startActivity(intent)
requireActivity().finish() requireActivity().finish()
} }
}) }
getViewModel().getDataFromDatabase() getViewModel().getDataFromDatabase()
} }

2
app/src/main/java/h_mal/appttude/com/espresso/IdlingResourceClass.kt
View File

@@ -16,7 +16,7 @@ object IdlingResourceClass {
} }
fun decrement() { fun decrement() {
if (!countingIdlingResource.isIdleNow) { if (countingIdlingResource.isIdleNow) {
countingIdlingResource.decrement() countingIdlingResource.decrement()
} }
} }

4
app/src/main/java/h_mal/appttude/com/ui/user/LoginActivity.kt
View File

@@ -5,7 +5,7 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import com.google.firebase.auth.AuthResult import com.google.firebase.auth.AuthResult
import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.FirebaseUser
import h_mal.appttude.com.ui.driver.MainActivity import h_mal.appttude.com.ui.MainActivity
import h_mal.appttude.com.R import h_mal.appttude.com.R
import h_mal.appttude.com.base.BaseActivity import h_mal.appttude.com.base.BaseActivity
import h_mal.appttude.com.viewmodels.UserViewModel import h_mal.appttude.com.viewmodels.UserViewModel
@@ -20,8 +20,8 @@ class LoginActivity : BaseActivity<UserViewModel>() {
override val layoutId: Int = R.layout.activity_login override val layoutId: Int = R.layout.activity_login
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
createViewModel<UserViewModel>() createViewModel<UserViewModel>()
super.onCreate(savedInstanceState)
} }
override fun onSuccess(data: Any?) { override fun onSuccess(data: Any?) {

BIN
app/src/main/res/drawable-hdpi/background_with_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
app/src/main/res/drawable-hdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 86 KiB

BIN
app/src/main/res/drawable-ldpi/background_with_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
app/src/main/res/drawable-ldpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
app/src/main/res/drawable-mdpi/background_with_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
app/src/main/res/drawable-mdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/drawable-xhdpi/background_with_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
app/src/main/res/drawable-xhdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 125 KiB

BIN
app/src/main/res/drawable-xxhdpi/background_with_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 58 KiB

BIN
app/src/main/res/drawable-xxhdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 224 KiB

BIN
app/src/main/res/drawable-xxxhdpi/background_with_curve.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
app/src/main/res/drawable-xxxhdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 330 KiB

5
app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml Normal file
View File

@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
</vector>

5
app/src/main/res/drawable/ic_baseline_assignment_ind_24.xml Normal file
View File

@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM12,7c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM18,19L6,19v-1.4c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1L18,19z"/>
</vector>

8
app/src/main/res/layout/activity_main.xml
View File

@@ -20,6 +20,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
app:itemTextColor="@android:color/white"
app:headerLayout="@layout/nav_header_main" app:headerLayout="@layout/nav_header_main"
app:menu="@menu/activity_main_drawer" > app:menu="@menu/activity_main_drawer" >
@@ -27,16 +28,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:clickable="true"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/logout" android:id="@+id/logout"
style="@style/headerStyle"
android:background="@color/colour_nine"
android:textSize="14sp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:gravity="center" android:gravity="center"
android:text="Logout" android:text="@string/logout"
android:textColor="@color/colorPrimary"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</com.google.android.material.navigation.NavigationView> </com.google.android.material.navigation.NavigationView>

10
app/src/main/res/layout/app_bar_main.xml
View File

@@ -5,18 +5,21 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context=".ui.driver.MainActivity"> tools:context=".ui.MainActivity">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:elevation="0dp"
android:background="@android:color/transparent"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary" android:background="@android:color/transparent"
app:popupTheme="@style/AppTheme.PopupOverlay" /> app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
@@ -32,6 +35,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/main_navigation" app:navGraph="@navigation/main_navigation"
tools:context=".ui.auth.AuthActivity" /> tools:context=".ui.auth.AuthActivity"
tools:ignore="FragmentTagUsage" />
</LinearLayout> </LinearLayout>

141
app/src/main/res/layout/archive_license_item.xml
View File

@@ -1,109 +1,66 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="4dp" android:background="@color/colour_nine">
android:paddingBottom="4dp">
<RelativeLayout <com.mikhaellopez.circularimageview.CircularImageView
android:layout_width="match_parent" android:id="@+id/image_archive"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
app:civ_border_width="3dp"
app:civ_shadow_radius="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/choice_img_round" />
<TextView
android:id="@+id/date_archived"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp" android:layout_marginEnd="24dp"
android:background="@color/colour_siz"> android:textColor="@android:color/white"
android:textSize="12sp"
<FrameLayout android:textStyle="bold"
android:id="@+id/frame_lay" app:layout_constraintRight_toRightOf="parent"
android:layout_width="120dp" app:layout_constraintTop_toTopOf="@id/image_archive"
android:layout_height="120dp" tools:text="12/12/2019" />
android:adjustViewBounds="true"
android:layout_alignParentLeft="true">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cardCornerRadius="28dp"
app:cardElevation="0dp">
<ImageView
android:id="@+id/image_archive"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:scaleType="centerCrop"
android:adjustViewBounds="true"
tools:src="@drawable/choice_img_round" />
</androidx.cardview.widget.CardView>
</FrameLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="24dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@id/image_archive"
app:layout_constraintLeft_toRightOf="@id/image_archive"
app:layout_constraintRight_toLeftOf="@id/date_archived"
app:layout_constraintTop_toTopOf="@id/image_archive">
<TextView <TextView
android:id="@+id/date_archived" android:id="@+id/exp_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:textColor="@android:color/white"
android:layout_alignParentRight="true" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/colour_two" tools:text="Haider Malik" />
tools:text="12/12/2019" />
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/field_two_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:textColor="@android:color/white"
android:layout_marginLeft="12dp" android:textSize="11sp"
android:layout_toEndOf="@+id/frame_lay" tools:text="DALEH574263JD8JE" />
android:orientation="vertical"> </androidx.appcompat.widget.LinearLayoutCompat>
<LinearLayout
android:id="@+id/expiry_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Expiry"
android:textSize="12sp"
android:textStyle="bold"
android:textColor="@color/colour_four"/>
<TextView
android:id="@+id/exp_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="12/12/2019" />
</LinearLayout>
<LinearLayout
android:id="@+id/field_two_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/field_two"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:textStyle="bold"
android:textColor="@color/colour_four"
android:text="License No.: " />
<TextView
android:id="@+id/field_two_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="DALEH574263JD8JE" />
</LinearLayout>
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>
</FrameLayout>

91
app/src/main/res/layout/fragment_delete_profile.xml
View File

@@ -3,106 +3,69 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
style="@style/constraint_container" style="@style/parent_constraint_layout"
android:background="#73000000"
tools:context=".ui.update.DeleteProfileFragment"> tools:context=".ui.update.DeleteProfileFragment">
<TextView <TextView
android:id="@+id/login_title_tv" android:id="@+id/login_title_tv"
style="@style/title_text" style="@style/headerStyle"
android:layout_width="0dp" android:layout_marginBottom="12dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="96dp"
android:layout_marginEnd="24dp"
android:text="@string/delete_profile" android:text="@string/delete_profile"
android:textColor="#ffffff" app:layout_constraintBottom_toTopOf="@id/login_subtitle_tv"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView <TextView
android:id="@+id/login_subtitle_tv" android:id="@+id/login_subtitle_tv"
android:layout_width="0dp" style="@style/subheader"
android:layout_height="wrap_content" android:layout_marginBottom="24dp"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:text="@string/delete_profile_subtitle" android:text="@string/delete_profile_subtitle"
android:textColor="#ffffff" app:layout_constraintBottom_toTopOf="@id/til_old_email"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/login_title_tv" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_old_email" android:id="@+id/til_old_email"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="24dp"
android:layout_marginTop="48dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/login_subtitle_tv"> app:layout_constraintTop_toTopOf="parent">
<EditText <EditText
android:id="@+id/email_update" android:id="@+id/email_update"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="match_parent"
android:hint="@string/prompt_email" android:hint="@string/prompt_email"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
style="@style/edit_text_entry_style" /> android:autofillHints="emailAddress" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_password_top" android:id="@+id/til_password_top"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_old_email"> app:layout_constraintTop_toBottomOf="@+id/til_old_email">
<EditText <EditText
android:id="@+id/password_top" android:id="@+id/password_top"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="match_parent"
android:hint="@string/prompt_password" android:hint="@string/prompt_password"
android:inputType="textPassword" android:inputType="textPassword"
style="@style/edit_text_entry_style"/> android:autofillHints="password" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/submission_button_label"
<androidx.cardview.widget.CardView style="@style/TextButton.WithIcon"
android:id="@+id/email_sign_up" android:text="@string/submit"
android:layout_width="match_parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="64dp"
android:backgroundTint="@color/colour_one"
android:enabled="false"
app:cardCornerRadius="24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_password_top"> app:layout_constraintTop_toBottomOf="@+id/til_password_top"
app:layout_constraintTop_toTopOf="parent"
<TextView app:layout_constraintVertical_bias="0.8" />
android:id="@+id/submission_button_label"
style="@style/button_inner_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/submit"
android:textColor="@android:color/white" />
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

102
app/src/main/res/layout/fragment_driver_license.xml
View File

@@ -1,39 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" style="@style/parent_constraint_layout"
android:layout_height="match_parent" tools:context=".ui.driverprofile.DriverLicenseFragment">
tools:context=".ui.driver.driverprofile.DriverLicenseFragment">
<LinearLayout
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:paddingLeft="12dp"
android:paddingTop="12dp"
android:paddingRight="12dp">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="36dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
app:cardCornerRadius="28dp" app:cardCornerRadius="28dp"
app:cardElevation="0dp"> app:cardElevation="0dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toTopOf="@id/til_lic_no">
<ImageView <ImageView
android:id="@+id/driversli_img" android:id="@+id/driversli_img"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="200dp"
android:layout_alignParentLeft="true" android:layout_alignParentStart="true"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round" /> tools:src="@drawable/choice_img_round"
android:contentDescription="@string/image_description" />
<com.mikhaellopez.circularimageview.CircularImageView <com.mikhaellopez.circularimageview.CircularImageView
android:id="@+id/search_image" android:id="@+id/search_image"
@@ -47,65 +38,52 @@
android:alpha="1" android:alpha="1"
app:civ_circle_color="@color/colour_one" app:civ_circle_color="@color/colour_one"
android:layout_margin="18dp" android:layout_margin="18dp"
android:layout_gravity="bottom|right" /> android:layout_gravity="bottom|end" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" android:id="@+id/til_lic_no"
android:layout_height="wrap_content"> style="@style/text_input_layout"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<EditText <EditText
android:id="@+id/lic_no" android:id="@+id/lic_no"
style="@style/edittexttheme" style="@style/EditTextStyle.Date"
android:layout_width="match_parent" android:hint="@string/drivers_license_no"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Drivers License no."
android:inputType="none" android:inputType="none"
android:maxLines="1" /> android:maxLines="1"
android:importantForAutofill="no" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" android:id="@+id/til_submission"
android:layout_height="wrap_content"> style="@style/text_input_layout"
app:layout_constraintTop_toBottomOf="@id/til_lic_no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<EditText <EditText
android:hint="@string/license_expiry_date"
android:id="@+id/lic_expiry" android:id="@+id/lic_expiry"
style="@style/edittexttheme" style="@style/EditTextStyle.Date"
android:layout_width="match_parent" android:autofillHints="date" />
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" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<TextView <com.google.android.material.button.MaterialButton
android:id="@+id/submit" android:id="@+id/submit"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:text="@string/submit"
android:layout_alignParentEnd="true" app:layout_constraintTop_toBottomOf="@+id/til_submission"
android:layout_alignParentRight="true" app:layout_constraintBottom_toBottomOf="parent"
android:layout_alignParentBottom="true" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginLeft="12dp" app:layout_constraintStart_toStartOf="parent"
android:layout_marginRight="12dp" app:layout_constraintTop_toTopOf="parent"
android:layout_marginBottom="48dp" app:layout_constraintVertical_bias="0.8"/>
android:background="@drawable/round_edit_text"
android:ems="10"
android:gravity="center"
android:padding="12dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="Submit"
android:textColor="@android:color/black"
android:textColorHighlight="#608d91"
android:textStyle="bold" />
</RelativeLayout> </androidx.constraintlayout.widget.ConstraintLayout>

109
app/src/main/res/layout/fragment_driver_overall.xml
View File

@@ -3,115 +3,54 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" style="@style/parent_constraint_layout"
android:layout_height="match_parent" tools:context="h_mal.appttude.com.ui.HomeFragment">
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="h_mal.appttude.com.ui.driver.HomeFragment">
<TextView <TextView
android:id="@+id/prova_title_tv" android:id="@+id/prova_title_tv"
android:layout_width="match_parent" style="@style/headerStyle"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="48dp" android:layout_marginTop="48dp"
android:layout_marginEnd="24dp" android:selectAllOnFocus="true"
android:adjustViewBounds="true" android:text="@string/profile_title"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent=".60" app:layout_constraintWidth_percent=".60" />
android:selectAllOnFocus="true"
android:text="@string/profile_title"
style="@style/title_text"/>
<TextView <TextView
android:id="@+id/subtitle" android:id="@+id/subtitle"
android:layout_width="match_parent" style="@style/subheader"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:selectAllOnFocus="true"
android:text="@string/driver_profile_subtitle" android:text="@string/driver_profile_subtitle"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/prova_title_tv" /> app:layout_constraintTop_toBottomOf="@id/prova_title_tv" />
<androidx.cardview.widget.CardView <com.google.android.material.button.MaterialButton
android:id="@+id/driver_prof" android:id="@+id/driver_prof"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:layout_marginBottom="12dp"
android:layout_marginStart="24dp" android:text="@string/driver_profile"
android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@id/private_hire"
android:layout_marginEnd="24dp"
android:backgroundTint="@color/colour_one"
app:cardCornerRadius="8dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintBottom_toTopOf="@id/private_hire">
<TextView <com.google.android.material.button.MaterialButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="Driver Profile"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/private_hire" android:id="@+id/private_hire"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:layout_marginBottom="12dp"
android:layout_marginStart="24dp" android:text="@string/private_hire_license"
android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@id/drivers_license"
android:layout_marginEnd="24dp"
app:cardCornerRadius="8dp"
android:backgroundTint="@color/colour_one"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintBottom_toTopOf="@id/drivers_license">
<TextView <com.google.android.material.button.MaterialButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="Private Hire License"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/drivers_license" android:id="@+id/drivers_license"
android:layout_width="0dp" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="64dp" android:layout_marginBottom="64dp"
android:backgroundTint="@color/colour_one" android:text="@string/drivers_license"
android:selectAllOnFocus="true" app:layout_constraintBottom_toBottomOf="parent"
app:cardCornerRadius="8dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="Drivers License"
android:textColor="@android:color/white"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

127
app/src/main/res/layout/fragment_driver_profile.xml
View File

@@ -1,35 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView 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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/parent_constraint_layout"
android:orientation="vertical" android:orientation="vertical"
tools:context=".ui.driver.driverprofile.DriverProfileFragment"> tools:context=".ui.driverprofile.DriverProfileFragment">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical">
android:padding="12dp">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center">
android:layout_marginBottom="12dp">
<com.mikhaellopez.circularimageview.CircularImageView <com.mikhaellopez.circularimageview.CircularImageView
android:id="@+id/add_photo" android:id="@+id/add_photo"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:src="@drawable/ic_baseline_photo_library_24"
android:scaleType="centerInside"
android:elevation="1dp"
app:civ_border_width="1dp"
app:civ_shadow_radius="0.5dp"
android:alpha="1" android:alpha="1"
android:elevation="1dp"
android:scaleType="centerInside"
android:src="@drawable/ic_baseline_photo_library_24"
app:civ_border_width="1dp"
app:civ_circle_color="@color/colour_one" app:civ_circle_color="@color/colour_one"
app:civ_shadow_radius="0.5dp"
app:layout_constraintBottom_toBottomOf="@id/driver_pic" app:layout_constraintBottom_toBottomOf="@id/driver_pic"
app:layout_constraintRight_toRightOf="@id/driver_pic" /> app:layout_constraintRight_toRightOf="@id/driver_pic" />
@@ -39,140 +36,104 @@
android:layout_height="120dp" android:layout_height="120dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
tools:src="@drawable/choice_img_round"
android:src="@drawable/ic_baseline_photo_library_24" android:src="@drawable/ic_baseline_photo_library_24"
app:civ_border_width="3dp" app:civ_border_width="3dp"
app:civ_shadow_radius="1dp" app:civ_shadow_radius="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/> tools:src="@drawable/choice_img_round" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout style="@style/text_input_layout">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/names_input" android:id="@+id/names_input"
style="@style/edittexttheme" style="@style/EditTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:ems="10"
android:hint="Forename(s)" android:hint="@string/full_name"
android:inputType="textPersonName" android:inputType="textPersonName"
android:maxLines="1" /> android:maxLines="1"
android:autofillHints="name" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout style="@style/text_input_layout">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/address_input" android:id="@+id/address_input"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:ems="10"
android:gravity="top|start" android:gravity="top|start"
android:hint="Address" android:hint="@string/address"
android:inputType="textMultiLine|textPostalAddress" android:inputType="textMultiLine|textPostalAddress"
android:lines="4" android:lines="4"
android:maxLines="7" android:maxLines="7"
android:minLines="4" android:minLines="4"
android:padding="12dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"
android:textColorHighlight="#608d91" /> android:autofillHints="postalAddress" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout style="@style/text_input_layout">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/postcode_input" android:id="@+id/postcode_input"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/postcode"
android:hint="Postcode"
android:inputType="none" android:inputType="none"
android:maxLines="1" android:maxLines="1"
android:padding="12dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"
android:textColorHighlight="#608d91" /> android:autofillHints="postalCode" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout style="@style/text_input_layout">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/dob_input" android:id="@+id/dob_input"
style="@style/edittexttheme" style="@style/EditTextStyle.Date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/date_of_birth"
android:focusable="false" android:autofillHints="date" />
android:hint="Date of birth"
android:inputType="textPersonName"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout style="@style/text_input_layout">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/ni_number" android:id="@+id/ni_number"
style="@style/edittexttheme" style="@style/EditTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/ni_number"
android:hint="NI number" android:maxLines="1"
android:maxLines="1" /> android:importantForAutofill="no"
android:inputType="none"
tools:ignore="TextFields" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout style="@style/text_input_layout">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/date_first" android:id="@+id/date_first"
style="@style/edittexttheme" style="@style/EditTextStyle.Date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/date_first_available"
android:focusable="false" android:autofillHints="date" />
android:hint="Date first available"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<Button <com.google.android.material.button.MaterialButton
android:id="@+id/submit_driver" android:id="@+id/submit_driver"
style="?android:attr/borderlessButtonStyle" style="@style/TextButton"
android:layout_width="wrap_content" android:text="@string/submit" />
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginBottom="12dp"
android:background="@drawable/cardviewoutline"
android:text="@string/submit"
android:textColor="#91ddff"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

78
app/src/main/res/layout/fragment_forgot_password.xml
View File

@@ -1,84 +1,56 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
android:background="#73000000" style="@style/parent_constraint_layout"
style="@style/constraint_container"
tools:context="ui.user.ForgotPasswordFragment"> tools:context="ui.user.ForgotPasswordFragment">
<TextView <TextView
android:id="@+id/login_title_tv" android:id="@+id/login_title_tv"
style="@style/title_text" style="@style/headerStyle"
android:textColor="#ffffff" android:layout_marginBottom="12dp"
android:text="@string/reset_password" android:text="@string/reset_password"
android:layout_width="0dp" app:layout_constraintBottom_toTopOf="@id/login_subtitle_tv"
android:layout_height="wrap_content"
android:layout_marginTop="96dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView <TextView
android:id="@+id/login_subtitle_tv" android:id="@+id/login_subtitle_tv"
android:textColor="#ffffff" style="@style/subheader"
android:layout_marginBottom="24dp"
android:text="@string/reset_password_subtitle" android:text="@string/reset_password_subtitle"
android:layout_width="0dp" app:layout_constraintBottom_toTopOf="@id/til_submission"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/login_title_tv"/>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_submission" android:id="@+id/til_submission"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="24dp"
android:layout_marginTop="96dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/login_subtitle_tv"> app:layout_constraintTop_toTopOf="parent">
<EditText <EditText
android:id="@+id/submission_et" android:id="@+id/submission_et"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="match_parent"
android:hint="@string/prompt_email" android:hint="@string/prompt_email"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
style="@style/edit_text_entry_style"/> android:autofillHints="emailAddress" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<androidx.cardview.widget.CardView <com.google.android.material.button.MaterialButton
android:id="@+id/submission_button" android:id="@+id/submission_button"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:text="@string/reset_password"
android:layout_gravity="start" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="64dp"
android:enabled="false"
app:cardCornerRadius="24dp"
android:backgroundTint="@color/colour_one"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_submission"> app:layout_constraintTop_toBottomOf="@+id/til_submission"
<TextView app:layout_constraintTop_toTopOf="parent"
android:id="@+id/submission_button_label" app:layout_constraintVertical_bias="0.8" />
style="@style/button_inner_text"
android:textColor="@android:color/white"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/submit"/>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

28
app/src/main/res/layout/fragment_home_driver.xml
View File

@@ -3,13 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" style="@style/parent_constraint_layout"
android:layout_height="match_parent" tools:context="h_mal.appttude.com.ui.HomeFragment">
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="h_mal.appttude.com.ui.driver.HomeFragment">
<ImageView <ImageView
android:id="@+id/prova_logo" android:id="@+id/prova_logo"
@@ -23,29 +18,22 @@
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent=".60" /> app:layout_constraintWidth_percent=".50"
android:contentDescription="@string/image_description" />
<TextView <TextView
android:id="@+id/prova_title_tv" android:id="@+id/prova_title_tv"
style="@style/title_text" style="@style/headerStyle"
android:layout_width="match_parent" android:layout_marginBottom="12dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:selectAllOnFocus="true"
android:text="@string/welcome_title" android:text="@string/welcome_title"
android:layout_marginTop="24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/prova_logo" /> app:layout_constraintTop_toBottomOf="@id/prova_logo" />
<TextView <TextView
android:layout_width="match_parent" style="@style/subheader"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:selectAllOnFocus="true"
android:text="@string/welcome_subtitle" android:text="@string/welcome_subtitle"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

145
app/src/main/res/layout/fragment_insurance.xml
View File

@@ -1,97 +1,80 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/constraint_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <com.synnapps.carouselview.CarouselView
android:id="@+id/carouselView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="200dp"
android:orientation="vertical" app:layout_constraintLeft_toLeftOf="parent"
android:paddingLeft="12dp" app:layout_constraintRight_toRightOf="parent"
android:paddingTop="12dp" app:layout_constraintBottom_toTopOf="@id/uploadInsurance"
android:paddingRight="12dp"> android:layout_marginBottom="12dp"
app:autoPlay="false"
app:fillColor="#FFFFFFFF"
app:pageColor="#00000000"
app:radius="6dp"
app:strokeColor="#FF777777"
app:strokeWidth="1dp" />
<com.synnapps.carouselview.CarouselView <com.google.android.material.button.MaterialButton
android:id="@+id/carouselView" android:id="@+id/uploadInsurance"
android:layout_width="match_parent" style="@style/TextButton"
android:layout_height="200dp" android:text="@string/upload_insurance_documents"
android:layout_marginBottom="12dp" app:layout_constraintBottom_toTopOf="@id/til_insurer"
app:fillColor="#FFFFFFFF" app:layout_constraintEnd_toEndOf="parent"
app:pageColor="#00000000" app:layout_constraintStart_toStartOf="parent" />
app:radius="6dp"
app:autoPlay="false"
app:strokeColor="#FF777777"
app:strokeWidth="1dp"/>
<TextView <com.google.android.material.textfield.TextInputLayout
android:id="@+id/uploadInsurance" android:id="@+id/til_insurer"
android:layout_width="match_parent" style="@style/text_input_layout"
android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent"
android:layout_alignParentLeft="true" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginBottom="12dp" app:layout_constraintStart_toStartOf="parent"
android:background="@drawable/round_edit_text" app:layout_constraintTop_toTopOf="parent">
android:ems="10"
android:gravity="center" <EditText
android:padding="12dp" android:id="@+id/insurer"
style="@style/EditTextStyle"
android:hint="@string/insurer"
android:inputType="none"
android:maxLines="1"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"
android:text="Upload Insurance Documents" android:importantForAutofill="no" />
android:textColorHighlight="#608d91" />
<com.google.android.material.textfield.TextInputLayout </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_ins_exp"
style="@style/text_input_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/til_insurer">
<EditText
android:id="@+id/insurance_exp"
style="@style/EditTextStyle.Date"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:inputType="date"
android:hint="@string/insurance_expiry"
android:importantForAutofill="no" />
</com.google.android.material.textfield.TextInputLayout>
<EditText <com.google.android.material.button.MaterialButton
android:id="@+id/insurer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:ems="10"
android:hint="Insurer:"
android:inputType="none"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/insurance_exp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:focusable="false"
android:hint="Insurance expiry:"
android:inputType="date"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<Button
android:id="@+id/submit_ins" android:id="@+id/submit_ins"
style="?android:attr/borderlessButtonStyle" style="@style/TextButton.WithIcon"
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:text="@string/submit"
android:textColor="@android:color/black" app:layout_constraintBottom_toBottomOf="parent"
android:textStyle="bold" /> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/til_ins_exp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.8" />
</RelativeLayout> </androidx.constraintlayout.widget.ConstraintLayout>

137
app/src/main/res/layout/fragment_logbook.xml
View File

@@ -1,85 +1,72 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
style="@style/parent_constraint_layout"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".ui.driver.vehicleprofile.LogbookFragment"> tools:context=".ui.vehicleprofile.LogbookFragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="12dp"
android:layout_alignParentTop="true">
<androidx.cardview.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" />
</androidx.cardview.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" />
<com.google.android.material.textfield.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" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<Button <androidx.cardview.widget.CardView
android:id="@+id/submit_lb"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_gravity="center"
android:layout_alignParentRight="true" android:layout_marginBottom="12dp"
android:layout_alignParentBottom="true" app:cardCornerRadius="28dp"
android:layout_margin="12dp" app:cardElevation="0dp"
android:background="@drawable/cardviewoutline" app:layout_constraintLeft_toLeftOf="parent"
android:text="@string/submit" app:layout_constraintRight_toRightOf="parent"
android:textColor="@android:color/black" app:layout_constraintBottom_toTopOf="@id/upload_lb">
android:textStyle="bold" />
</RelativeLayout> <ImageView
android:id="@+id/log_book_img"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentStart="true"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round"
android:contentDescription="@string/image_description" />
</androidx.cardview.widget.CardView>
<com.google.android.material.button.MaterialButton
android:id="@+id/upload_lb"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/til_v5c"
style="@style/TextButton.Rounded"
android:selectAllOnFocus="true"
android:singleLine="true"
android:text="@string/upload_logbook" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_v5c"
style="@style/text_input_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<EditText
android:id="@+id/v5c_no"
style="@style/EditTextStyle"
android:hint="@string/v5c_number"
android:inputType="none"
android:importantForAutofill="no" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/submit_lb"
style="@style/TextButton.WithIcon"
android:text="@string/submit"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.8"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_v5c">
</com.google.android.material.button.MaterialButton>
</androidx.constraintlayout.widget.ConstraintLayout>

189
app/src/main/res/layout/fragment_login.xml
View File

@@ -1,127 +1,82 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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" xmlns:app="http://schemas.android.com/apk/res-auto"
android:gravity="center_horizontal" xmlns:tools="http://schemas.android.com/tools"
android:paddingLeft="@dimen/activity_horizontal_margin" style="@style/parent_constraint_layout"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:background="#73000000"
android:importantForAutofill="yes"
tools:context=".ui.user.LoginFragment"> tools:context=".ui.user.LoginFragment">
<com.google.android.material.button.MaterialButton
android:id="@+id/email_sign_in_button"
style="@style/TextButton.WithIcon"
android:layout_marginTop="24dp"
android:text="@string/login"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/forgot" />
<LinearLayout <TextView
android:id="@+id/fields_holder" android:id="@+id/register_button"
style="@style/subheader"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/activity_horizontal_margin"
android:text="@string/create_my_account"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/email_sign_in_button" />
<TextView
android:id="@+id/textView4"
style="@style/headerStyle"
android:layout_marginBottom="24dp"
android:text="@string/welcome_back"
app:layout_constraintBottom_toTopOf="@id/til_email"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_email"
style="@style/text_input_layout"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<EditText
android:id="@+id/email"
style="@style/EditTextStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_centerHorizontal="true" android:hint="@string/prompt_email"
android:layout_centerVertical="true" android:inputType="textEmailAddress"
android:orientation="vertical"> android:autofillHints="emailAddress" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_email" android:id="@+id/til_password"
android:layout_width="match_parent" style="@style/text_input_layout"
android:layout_height="wrap_content" android:layout_marginTop="12dp"
android:layout_marginStart="24dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="24dp" app:layout_constraintStart_toStartOf="parent"
android:background="#99000000" app:layout_constraintTop_toBottomOf="@id/til_email">
android:textColorHint="@android:color/white">
<EditText <EditText
android:id="@+id/email" android:id="@+id/password"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="match_parent" android:layout_width="match_parent"
android:hint="@string/prompt_email" android:layout_height="match_parent"
android:inputType="textEmailAddress" android:hint="@string/prompt_password"
style="@style/edit_text_entry_style" /> android:inputType="textPassword"
</com.google.android.material.textfield.TextInputLayout> android:autofillHints="password" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <TextView
android:id="@+id/til_password" android:id="@+id/forgot"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/activity_horizontal_margin"
android:layout_marginStart="24dp" android:text="@string/forgot_password"
android:layout_marginEnd="24dp" android:textColor="@android:color/white"
android:background="#99000000" app:layout_constraintLeft_toLeftOf="parent"
android:textColorHint="@android:color/white"> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_password" />
<EditText </androidx.constraintlayout.widget.ConstraintLayout>
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/prompt_password"
android:inputType="textPassword"
style="@style/edit_text_entry_style"/>
</com.google.android.material.textfield.TextInputLayout>
<androidx.cardview.widget.CardView
android:id="@+id/email_sign_in_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="24dp"
android:enabled="false"
app:cardCornerRadius="24dp"
android:backgroundTint="@color/colour_one"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_submission">
<TextView
android:id="@+id/submission_button_label"
style="@style/button_inner_text"
android:textColor="@android:color/white"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/submit"/>
</androidx.cardview.widget.CardView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp">
<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: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>
</RelativeLayout>

137
app/src/main/res/layout/fragment_mot.xml
View File

@@ -1,88 +1,67 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.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" xmlns:tools="http://schemas.android.com/tools"
style="@style/parent_constraint_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical">
android:orientation="vertical"
>
<LinearLayout <androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="12dp"
android:layout_alignParentTop="true">
<androidx.cardview.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" />
</androidx.cardview.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:selectAllOnFocus="true"
android:singleLine="true"
android:text="Upload M.O.T"
android:textColorHighlight="#608d91" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/mot_expiry"
android:layout_width="match_parent"
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"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<Button
android:id="@+id/submit_mot"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_gravity="center"
android:layout_alignParentRight="true" android:layout_marginBottom="12dp"
android:layout_alignParentBottom="true" app:cardCornerRadius="28dp"
android:layout_margin="12dp" app:cardElevation="0dp"
android:background="@drawable/cardviewoutline" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toTopOf="@id/uploadmot">
<ImageView
android:id="@+id/mot_img"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentStart="true"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round"
android:contentDescription="@string/image_description" />
</androidx.cardview.widget.CardView>
<com.google.android.material.button.MaterialButton
android:id="@+id/uploadmot"
style="@style/TextButton.Rounded"
android:text="@string/upload_mot"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/til_submission"/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_submission"
style="@style/text_input_layout"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent">
<EditText
android:id="@+id/mot_expiry"
style="@style/EditTextStyle.Date"
android:hint="@string/mot_expiry_date"
android:autofillHints="" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/submit_mot"
style="@style/TextButton.WithIcon"
android:text="@string/submit" android:text="@string/submit"
android:textColor="@android:color/black" app:layout_constraintBottom_toBottomOf="parent"
android:textStyle="bold" /> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_submission"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.8" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>

175
app/src/main/res/layout/fragment_private_hire_license.xml
View File

@@ -1,110 +1,81 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" style="@style/parent_constraint_layout"
android:layout_height="match_parent" tools:context=".ui.driverprofile.PrivateHireLicenseFragment">
android:orientation="vertical"
tools:context=".ui.driver.driverprofile.PrivateHireLicenseFragment">
<LinearLayout <androidx.cardview.widget.CardView
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">
<androidx.cardview.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" />
</androidx.cardview.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" />
<com.google.android.material.textfield.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 License no."
android:inputType="none"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textColorHighlight="#608d91" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.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" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<Button
android:id="@+id/submit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_gravity="center"
android:layout_alignParentRight="true" android:layout_marginBottom="12dp"
android:layout_alignParentBottom="true" app:cardCornerRadius="28dp"
android:layout_margin="12dp" app:cardElevation="0dp"
android:background="@drawable/cardviewoutline" app:layout_constraintBottom_toTopOf="@id/uploadphlic"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
<ImageView
android:id="@+id/imageView2"
android:layout_width="200dp"
android:layout_height="200dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round"
android:contentDescription="@string/image_description" />
</androidx.cardview.widget.CardView>
<com.google.android.material.button.MaterialButton
android:id="@+id/uploadphlic"
style="@style/TextButton.Rounded"
android:layout_marginBottom="12dp"
android:text="@string/upload_private_hire_photo"
app:layout_constraintBottom_toTopOf="@id/til_submission"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_submission"
style="@style/text_input_layout"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<EditText
android:id="@+id/ph_no"
style="@style/EditTextStyle"
android:hint="@string/private_hire_license_no"
android:importantForAutofill="no"
tools:ignore="TextFields" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_ph_expiry"
style="@style/text_input_layout"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/til_submission">
<EditText
android:id="@+id/ph_expiry"
style="@style/EditTextStyle.Date"
android:hint="@string/private_hire_license_expiry"
android:autofillHints="date" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/submit"
style="@style/TextButton.WithIcon"
android:text="@string/submit" android:text="@string/submit"
android:textColor="@android:color/black" app:layout_constraintBottom_toBottomOf="parent"
android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent"
style="?android:attr/borderlessButtonStyle" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_submission"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.8" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>

175
app/src/main/res/layout/fragment_private_hire_vehicle.xml
View File

@@ -1,110 +1,81 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" style="@style/parent_constraint_layout"
android:layout_height="match_parent" tools:context=".ui.vehicleprofile.PrivateHireVehicleFragment">
android:orientation="vertical"
tools:context=".ui.driver.vehicleprofile.PrivateHireVehicleFragment">
<LinearLayout <androidx.cardview.widget.CardView
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">
<androidx.cardview.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" />
</androidx.cardview.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" />
<com.google.android.material.textfield.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" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.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" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<Button
android:id="@+id/submit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_gravity="center"
android:layout_alignParentRight="true" android:layout_marginBottom="12dp"
android:layout_alignParentBottom="true" app:cardCornerRadius="28dp"
android:layout_margin="12dp" app:cardElevation="0dp"
android:background="@drawable/cardviewoutline" app:layout_constraintBottom_toTopOf="@id/uploadphlic"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
<ImageView
android:id="@+id/imageView2"
android:layout_width="200dp"
android:layout_height="200dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
tools:src="@drawable/choice_img_round"
android:contentDescription="@string/image_description" />
</androidx.cardview.widget.CardView>
<com.google.android.material.button.MaterialButton
android:id="@+id/uploadphlic"
style="@style/TextButton.Rounded"
android:layout_marginBottom="12dp"
android:text="@string/upload_private_hire_vehicle_certificate"
app:layout_constraintBottom_toTopOf="@id/til_submission"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_submission"
style="@style/text_input_layout"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<EditText
android:id="@+id/ph_no"
style="@style/EditTextStyle"
android:hint="@string/private_hire_certificate_license_no"
android:importantForAutofill="no"
tools:ignore="TextFields" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_ph_expiry"
style="@style/text_input_layout"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/til_submission">
<EditText
android:id="@+id/ph_expiry"
style="@style/EditTextStyle.Date"
android:hint="@string/private_hire_certificate_expiry"
android:autofillHints="date" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/submit"
style="@style/TextButton.WithIcon"
android:text="@string/submit" android:text="@string/submit"
android:textColor="@android:color/black" app:layout_constraintBottom_toBottomOf="parent"
android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent"
style="?android:attr/borderlessButtonStyle" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_submission"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.8" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>

20
app/src/main/res/layout/fragment_register.xml
View File

@@ -49,11 +49,12 @@
<EditText <EditText
android:id="@+id/name_register" android:id="@+id/name_register"
style="@style/edit_text_entry_style" style="@style/EditTextStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:hint="@string/promt_name" android:hint="@string/promt_name"
android:inputType="textPersonName" /> android:inputType="textPersonName"
android:autofillHints="name" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
@@ -71,11 +72,12 @@
<EditText <EditText
android:id="@+id/email_register" android:id="@+id/email_register"
style="@style/edit_text_entry_style" style="@style/EditTextStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:hint="@string/prompt_email" android:hint="@string/prompt_email"
android:inputType="textEmailAddress" /> android:inputType="textEmailAddress"
android:autofillHints="emailAddress" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
@@ -93,11 +95,12 @@
<EditText <EditText
android:id="@+id/password_top" android:id="@+id/password_top"
style="@style/edit_text_entry_style" style="@style/EditTextStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:hint="@string/prompt_password" android:hint="@string/prompt_password"
android:inputType="textPassword" /> android:inputType="textPassword"
android:autofillHints="password" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
@@ -115,11 +118,12 @@
<EditText <EditText
android:id="@+id/password_bottom" android:id="@+id/password_bottom"
style="@style/edit_text_entry_style" style="@style/EditTextStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:hint="@string/prompt_password" android:hint="@string/prompt_password"
android:inputType="textPassword" /> android:inputType="textPassword"
android:autofillHints="password" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView

105
app/src/main/res/layout/fragment_update_email.xml
View File

@@ -3,125 +3,88 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
style="@style/constraint_container" style="@style/parent_constraint_layout"
android:background="#73000000"
tools:context=".ui.update.UpdateEmailFragment"> tools:context=".ui.update.UpdateEmailFragment">
<TextView <TextView
android:id="@+id/login_title_tv" android:id="@+id/login_title_tv"
style="@style/title_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="96dp" android:layout_marginTop="96dp"
android:layout_marginEnd="24dp"
android:text="@string/update_email" android:text="@string/update_email"
android:textColor="#ffffff" style="@style/headerStyle"
android:layout_marginBottom="12dp"
app:layout_constraintBottom_toTopOf="@id/login_subtitle_tv"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView <TextView
android:id="@+id/login_subtitle_tv" android:id="@+id/login_subtitle_tv"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:text="@string/update_email_subtitle" android:text="@string/update_email_subtitle"
android:textColor="#ffffff" style="@style/subheader"
android:layout_marginBottom="24dp"
app:layout_constraintBottom_toTopOf="@id/til_old_email"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/login_title_tv" /> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_old_email" android:id="@+id/til_old_email"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="48dp" android:layout_marginTop="48dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/login_subtitle_tv"> app:layout_constraintBottom_toTopOf="@+id/til_password_top">
<EditText <EditText
android:id="@+id/email_update" android:id="@+id/email_update"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/prompt_email" android:hint="@string/prompt_email"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
style="@style/edit_text_entry_style" /> style="@style/EditTextStyle"
android:autofillHints="emailAddress" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_password_top" android:id="@+id/til_password_top"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_old_email"> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<EditText <EditText
android:id="@+id/password_top" android:id="@+id/password_top"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="match_parent"
android:hint="@string/prompt_password" android:hint="@string/prompt_password"
android:inputType="textPassword" android:inputType="textPassword"
style="@style/edit_text_entry_style"/> android:autofillHints="password" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_new_email" android:id="@+id/til_new_email"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_password_top"> app:layout_constraintTop_toBottomOf="@+id/til_password_top">
<EditText <EditText
android:id="@+id/new_email" android:id="@+id/new_email"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/prompt_new_email" android:hint="@string/prompt_new_email"
style="@style/edit_text_entry_style" /> style="@style/EditTextStyle"
android:autofillHints="emailAddress"
android:inputType="textEmailAddress" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<androidx.cardview.widget.CardView <com.google.android.material.button.MaterialButton
android:id="@+id/email_sign_up" style="@style/TextButton.WithIcon"
android:layout_width="match_parent" android:text="@string/submit"
android:layout_height="wrap_content" android:id="@+id/submission_button_label"
android:layout_gravity="start" app:layout_constraintTop_toTopOf="parent"
android:layout_marginStart="24dp" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="24dp" app:layout_constraintVertical_bias="0.8"
android:layout_marginEnd="24dp"
android:layout_marginBottom="64dp"
android:backgroundTint="@color/colour_one"
android:enabled="false"
app:cardCornerRadius="24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_new_email"> app:layout_constraintTop_toBottomOf="@+id/til_password_top"/>
<TextView
android:id="@+id/submission_button_label"
style="@style/button_inner_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/submit"
android:textColor="@android:color/white" />
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

101
app/src/main/res/layout/fragment_update_password.xml
View File

@@ -3,126 +3,89 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
style="@style/constraint_container" style="@style/parent_constraint_layout"
android:background="#73000000"
tools:context="ui.user.ForgotPasswordFragment"> tools:context="ui.user.ForgotPasswordFragment">
<TextView <TextView
android:id="@+id/login_title_tv" android:id="@+id/login_title_tv"
style="@style/title_text" style="@style/headerStyle"
android:layout_width="0dp" android:layout_marginBottom="12dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="96dp"
android:layout_marginEnd="24dp"
android:text="@string/update_password" android:text="@string/update_password"
android:textColor="#ffffff" app:layout_constraintBottom_toTopOf="@id/login_subtitle_tv"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView <TextView
android:id="@+id/login_subtitle_tv" android:id="@+id/login_subtitle_tv"
android:layout_width="0dp" style="@style/subheader"
android:layout_height="wrap_content" android:layout_marginBottom="24dp"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:text="@string/update_password_subtitle" android:text="@string/update_password_subtitle"
android:textColor="#ffffff" app:layout_constraintBottom_toTopOf="@id/til_old_email"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/login_title_tv" /> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_old_email" android:id="@+id/til_old_email"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="48dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/login_subtitle_tv"> app:layout_constraintBottom_toTopOf="@id/til_password_top">
<EditText <EditText
android:id="@+id/email_update" android:id="@+id/email_update"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="match_parent"
android:hint="@string/prompt_email" android:hint="@string/prompt_email"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
style="@style/edit_text_entry_style" /> android:autofillHints="emailAddress" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_password_top" android:id="@+id/til_password_top"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_old_email"> app:layout_constraintTop_toBottomOf="@+id/til_old_email">
<EditText <EditText
android:id="@+id/password_top" android:id="@+id/password_top"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="match_parent"
android:hint="@string/prompt_password" android:hint="@string/prompt_password"
android:inputType="textPassword" android:inputType="textPassword"
style="@style/edit_text_entry_style"/> android:autofillHints="password" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_new_password" android:id="@+id/til_new_password"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_password_top"> app:layout_constraintTop_toBottomOf="@+id/til_password_top">
<EditText <EditText
android:id="@+id/password_bottom" android:id="@+id/password_bottom"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="match_parent"
android:hint="@string/prompt_new_password" android:hint="@string/prompt_new_password"
android:inputType="textPassword" android:inputType="textPassword"
style="@style/edit_text_entry_style" /> android:autofillHints="password" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<androidx.cardview.widget.CardView <com.google.android.material.button.MaterialButton
android:id="@+id/email_sign_up" android:id="@+id/email_sign_up"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:text="@string/submit"
android:layout_gravity="start" app:layout_constraintTop_toTopOf="parent"
android:layout_marginStart="24dp" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="24dp" app:layout_constraintVertical_bias="0.8"
android:layout_marginEnd="24dp"
android:layout_marginBottom="64dp"
android:backgroundTint="@color/colour_one"
android:enabled="false"
app:cardCornerRadius="24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_new_password"> app:layout_constraintTop_toBottomOf="@+id/til_new_password">
<TextView </com.google.android.material.button.MaterialButton>
android:id="@+id/submission_button_label"
style="@style/button_inner_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/submit"
android:textColor="@android:color/white" />
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

90
app/src/main/res/layout/fragment_update_profile.xml
View File

@@ -3,47 +3,39 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
style="@style/constraint_container" style="@style/parent_constraint_layout"
android:background="#73000000"
tools:context=".ui.user.ForgotPasswordFragment"> tools:context=".ui.user.ForgotPasswordFragment">
<TextView <TextView
android:id="@+id/login_title_tv" android:id="@+id/login_title_tv"
style="@style/title_text" style="@style/headerStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="96dp"
android:layout_marginEnd="24dp"
android:text="@string/update_profile" android:text="@string/update_profile"
android:textColor="#ffffff" android:layout_marginBottom="12dp"
app:layout_constraintBottom_toTopOf="@id/login_subtitle_tv"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView <TextView
android:id="@+id/login_subtitle_tv" android:id="@+id/login_subtitle_tv"
android:layout_width="0dp" style="@style/subheader"
android:layout_height="wrap_content" android:layout_marginBottom="24dp"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:text="@string/update_profile_section_subtitle" android:text="@string/update_profile_section_subtitle"
android:textColor="#ffffff" app:layout_constraintBottom_toTopOf="@id/profile_img"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/login_title_tv" />
<com.mikhaellopez.circularimageview.CircularImageView <com.mikhaellopez.circularimageview.CircularImageView
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:src="@drawable/ic_baseline_photo_library_24"
android:scaleType="centerInside"
android:elevation="1dp"
app:civ_border_width="1dp"
app:civ_shadow_radius="0.5dp"
android:alpha="1" android:alpha="1"
android:elevation="1dp"
android:scaleType="centerInside"
android:src="@drawable/ic_baseline_photo_library_24"
app:civ_border_width="1dp"
app:civ_circle_color="@color/colour_one" app:civ_circle_color="@color/colour_one"
app:civ_shadow_radius="0.5dp"
app:layout_constraintBottom_toBottomOf="@id/profile_img" app:layout_constraintBottom_toBottomOf="@id/profile_img"
app:layout_constraintRight_toRightOf="@id/profile_img" /> app:layout_constraintRight_toRightOf="@id/profile_img" />
@@ -51,62 +43,40 @@
android:id="@+id/profile_img" android:id="@+id/profile_img"
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="120dp" android:layout_height="120dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="48dp"
tools:src="@drawable/choice_img_round"
app:civ_border_width="3dp" app:civ_border_width="3dp"
app:civ_shadow_radius="1dp" app:civ_shadow_radius="1dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/login_subtitle_tv" /> app:layout_constraintBottom_toTopOf="@id/til_new_email"
tools:src="@drawable/choice_img_round" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_new_email" android:id="@+id/til_new_email"
android:layout_width="0dp" style="@style/text_input_layout"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:background="#99000000"
android:textColorHint="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/profile_img" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="48dp" app:layout_constraintBottom_toBottomOf="parent">
tools:layout_editor_absoluteY="438dp">
<EditText <EditText
android:id="@+id/update_name" android:id="@+id/update_name"
android:layout_width="match_parent" style="@style/EditTextStyle"
android:layout_height="match_parent"
android:hint="@string/prompt_insert_name" android:hint="@string/prompt_insert_name"
android:inputType="textPersonName" android:inputType="textPersonName"
style="@style/edit_text_entry_style" /> android:autofillHints="name" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<androidx.cardview.widget.CardView <com.google.android.material.button.MaterialButton
android:id="@+id/submit_update_profile" android:id="@+id/submit_update_profile"
style="@style/TextButton.WithIcon"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start" android:text="@string/submit"
android:layout_marginStart="24dp" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="64dp"
android:backgroundTint="@color/colour_one"
android:enabled="false"
app:cardCornerRadius="24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_new_email"> app:layout_constraintTop_toBottomOf="@+id/til_new_email"
app:layout_constraintTop_toTopOf="parent"
<TextView app:layout_constraintVertical_bias="0.8" />
android:id="@+id/submission_button_label"
style="@style/button_inner_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/submit"
android:textColor="@android:color/white" />
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

32
app/src/main/res/layout/fragment_user_main.xml
View File

@@ -1,32 +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"
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>

158
app/src/main/res/layout/fragment_vehicle_overall.xml
View File

@@ -9,157 +9,69 @@
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="h_mal.appttude.com.ui.driver.VehicleOverallFragment"> tools:context="h_mal.appttude.com.ui.VehicleOverallFragment">
<TextView <TextView
android:id="@+id/prova_title_tv" android:id="@+id/prova_title_tv"
android:layout_width="match_parent" style="@style/headerStyle"
android:layout_height="wrap_content" android:layout_marginTop="64dp"
android:layout_marginStart="24dp" android:text="@string/vehicle_details_title"
android:layout_marginTop="48dp"
android:layout_marginEnd="24dp"
android:adjustViewBounds="true"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintWidth_percent=".60"
android:selectAllOnFocus="true"
android:text="@string/vehicle_details_title"
style="@style/title_text"/>
<TextView <TextView
android:id="@+id/subtitle" android:id="@+id/subtitle"
android:layout_width="match_parent" style="@style/subheader"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:selectAllOnFocus="true"
android:text="@string/vehicle_details_subtitle" android:text="@string/vehicle_details_subtitle"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/prova_title_tv" /> app:layout_constraintTop_toBottomOf="@id/prova_title_tv" />
<androidx.cardview.widget.CardView <com.google.android.material.button.MaterialButton
android:id="@+id/vehicle_prof" android:id="@+id/vehicle_prof"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:layout_marginBottom="12dp"
android:layout_marginStart="24dp" android:text="@string/vehicle_profile"
android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@id/insurance"
android:layout_marginEnd="24dp"
android:backgroundTint="@color/colour_one"
app:cardCornerRadius="8dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintBottom_toTopOf="@id/insurance">
<TextView <com.google.android.material.button.MaterialButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="Vehicle Profile"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/insurance" android:id="@+id/insurance"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:layout_marginBottom="12dp"
android:layout_marginStart="24dp" android:text="@string/insurance"
android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@id/mot"
android:layout_marginEnd="24dp"
android:backgroundTint="@color/colour_one"
app:cardCornerRadius="8dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintBottom_toTopOf="@id/mot">
<TextView <com.google.android.material.button.MaterialButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="Insurance"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/mot" android:id="@+id/mot"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:layout_marginBottom="12dp"
android:layout_marginStart="24dp" android:text="@string/m_o_t"
android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@id/logbook"
android:layout_marginEnd="24dp"
android:backgroundTint="@color/colour_one"
app:cardCornerRadius="8dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintBottom_toTopOf="@id/logbook">
<TextView <com.google.android.material.button.MaterialButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="M.O.T"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/logbook" android:id="@+id/logbook"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:layout_marginBottom="12dp"
android:layout_marginStart="24dp" android:text="@string/log_book"
android:layout_marginBottom="24dp" app:layout_constraintBottom_toTopOf="@id/private_hire_vehicle_license"
android:layout_marginEnd="24dp"
app:cardCornerRadius="8dp"
android:backgroundTint="@color/colour_one"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintBottom_toTopOf="@id/private_hire_vehicle_license">
<TextView <com.google.android.material.button.MaterialButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="Log book"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/private_hire_vehicle_license" android:id="@+id/private_hire_vehicle_license"
android:layout_width="0dp" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="64dp" android:layout_marginBottom="64dp"
android:backgroundTint="@color/colour_one" android:text="@string/private_hire_vehicle_license"
android:selectAllOnFocus="true" app:layout_constraintBottom_toBottomOf="parent"
app:cardCornerRadius="8dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="P/H Vehicle License"
android:textColor="@android:color/white"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

110
app/src/main/res/layout/fragment_vehicle_setup.xml
View File

@@ -4,7 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:orientation="vertical"
tools:context=".ui.driver.vehicleprofile.VehicleProfileFragment"> tools:context=".ui.vehicleprofile.VehicleProfileFragment">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -13,76 +13,62 @@
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" style="@style/text_input_layout">
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/reg" android:id="@+id/reg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/car_reg"
android:hint="Car reg"
android:inputType="textCapCharacters" android:inputType="textCapCharacters"
android:maxLines="1" style="@style/EditTextStyle"
style="@style/edittexttheme" /> android:autofillHints="none" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" style="@style/text_input_layout">
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/make" android:id="@+id/make"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/car_make"
android:hint="Make"
android:inputType="none" android:inputType="none"
android:maxLines="1" android:maxLines="1"
style="@style/edittexttheme" /> style="@style/EditTextStyle"
android:importantForAutofill="no" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" style="@style/text_input_layout">
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/car_model" android:id="@+id/car_model"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/car_model"
android:hint="Model"
android:inputType="none" android:inputType="none"
android:maxLines="1" android:maxLines="1"
style="@style/edittexttheme" /> style="@style/EditTextStyle"
android:importantForAutofill="no" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" style="@style/text_input_layout">
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/colour" android:id="@+id/colour"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/car_colour"
android:hint="Colour"
android:inputType="none" android:inputType="none"
android:maxLines="1" android:maxLines="1"
style="@style/edittexttheme" /> style="@style/EditTextStyle"
android:autofillHints="color" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" style="@style/text_input_layout">
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/keeper_name" android:id="@+id/keeper_name"
@@ -90,71 +76,61 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:ems="10"
android:hint="Name of keeper" android:hint="@string/name_of_keeper"
android:inputType="textPersonName" android:inputType="textPersonName"
android:maxLines="1" android:maxLines="1"
style="@style/edittexttheme" /> style="@style/EditTextStyle"
android:autofillHints="name" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" style="@style/text_input_layout">
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/address" android:id="@+id/address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:gravity="top|start"
android:gravity="top|left" android:hint="@string/address_of_keeper"
android:hint="Address of Keeper"
android:inputType="textMultiLine" android:inputType="textMultiLine"
android:lines="4" android:lines="4"
android:maxLines="7" android:maxLines="7"
android:minLines="4" android:minLines="4"
android:padding="12dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"
android:textColorHighlight="#608d91" /> style="@style/EditTextStyle"
android:autofillHints="postalAddress" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" style="@style/text_input_layout">
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/postcode" android:id="@+id/postcode"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/postcode_of_keeper"
android:hint="Postcode of Keeper"
android:inputType="none|textCapCharacters" android:inputType="none|textCapCharacters"
android:maxLines="1" android:maxLines="1"
android:padding="12dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"
android:textColorHighlight="#608d91" /> style="@style/EditTextStyle"
android:autofillHints="postalCode" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" style="@style/text_input_layout">
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/start_date" android:id="@+id/start_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:ems="10" android:hint="@string/car_start_date"
android:hint="Start date" style="@style/EditTextStyle.Date"
android:focusable="false" android:autofillHints="date" />
android:inputType="date"
android:maxLines="1"
style="@style/edittexttheme" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@@ -163,22 +139,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:hint="Vehicle Siezed" android:hint="@string/vehicle_seized"
android:buttonTint="@color/colour_eight"
android:padding="12dp" android:padding="12dp"
android:textSize="18sp"/> android:textSize="18sp"/>
<Button <com.google.android.material.button.MaterialButton
android:id="@+id/submit_vehicle" android:id="@+id/submit_vehicle"
style="?android:attr/borderlessButtonStyle" style="@style/TextButton.WithIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="22dp"
android:layout_gravity="right"
android:background="@drawable/cardviewoutline"
android:text="@string/submit" android:text="@string/submit"
android:textColor="#91ddff" android:layout_marginBottom="48dp"
android:textStyle="bold" /> android:layout_gravity="end" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

47
app/src/main/res/layout/home_buttons_container.xml
View File

@@ -4,50 +4,19 @@
android:id="@+id/driver_profile_request_container" android:id="@+id/driver_profile_request_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="64dp"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginBottom="64dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<androidx.cardview.widget.CardView <com.google.android.material.button.MaterialButton
android:id="@+id/driver" android:id="@+id/driver"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:text="@string/driver_profile"
android:layout_marginBottom="24dp" android:layout_marginBottom="12dp"/>
android:backgroundTint="#D5D5D5" <com.google.android.material.button.MaterialButton
app:cardCornerRadius="8dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="Driver Profile"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/car" android:id="@+id/car"
android:layout_width="match_parent" style="@style/TextButton.WithIcon"
android:layout_height="wrap_content" android:text="@string/vehicle_profile"/>
android:backgroundTint="@color/colour_one"
android:selectAllOnFocus="true"
app:cardCornerRadius="8dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:gravity="center"
android:text="Vehicle Profile"
android:textColor="@android:color/white"
android:textSize="18sp"
android:textStyle="bold" />
</androidx.cardview.widget.CardView>
</LinearLayout> </LinearLayout>

113
app/src/main/res/layout/list_item_layout.xml
View File

@@ -1,113 +0,0 @@
<?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_alignParentLeft="true"
android:layout_alignParentTop="true">
<androidx.cardview.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" />
<!--<androidx.cardview.widget.CardView-->
<!--android:id="@+id/status_icon"-->
<!--android:layout_width="20dp"-->
<!--android:layout_height="20dp"-->
<!--android:layout_gravity="bottom|right"-->
<!--android:layout_margin="3dp"-->
<!--tools:cardBackgroundColor="@android:color/holo_red_dark"-->
<!--app:cardCornerRadius="12dp" />-->
</androidx.cardview.widget.CardView>
</FrameLayout>
<LinearLayout
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>

36
app/src/main/res/layout/nav_header_main.xml
View File

@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height" android:layout_height="@dimen/nav_header_height"
android:background="@drawable/side_nav_bar" xmlns:tools="http://schemas.android.com/tools"
android:background="@color/colour_nine"
android:gravity="bottom" android:gravity="bottom"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -12,24 +13,22 @@
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark"> android:theme="@style/ThemeOverlay.AppCompat.Dark">
<androidx.cardview.widget.CardView <com.mikhaellopez.circularimageview.CircularImageView
android:layout_width="100dp" android:id="@+id/profileImage"
android:layout_height="100dp" android:layout_width="80dp"
android:layout_above="@id/id_holder" android:layout_height="80dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="18dp" android:layout_marginStart="24dp"
app:cardCornerRadius="50dp"> android:layout_marginEnd="24dp"
android:src="@drawable/ic_baseline_photo_library_24"
<ImageView app:civ_border_width="3dp"
android:id="@+id/profileImage" app:civ_shadow_radius="1dp"
android:layout_width="match_parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="match_parent" app:layout_constraintEnd_toEndOf="parent"
android:adjustViewBounds="true" app:layout_constraintStart_toStartOf="parent"
android:contentDescription="@string/nav_header_desc" app:layout_constraintTop_toTopOf="parent"
android:scaleType="centerCrop" tools:src="@drawable/choice_img_round" />
app:srcCompat="@drawable/choice_img_round" />
</androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
@@ -41,14 +40,17 @@
<TextView <TextView
android:id="@+id/driver_name" android:id="@+id/driver_name"
style="@style/headerStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing" android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="@string/nav_header_title" android:text="@string/nav_header_title"
android:textSize="18sp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView <TextView
android:id="@+id/driver_email" android:id="@+id/driver_email"
style="@style/subheader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/nav_header_subtitle" /> android:text="@string/nav_header_subtitle" />

4
app/src/main/res/layout/update_activity.xml
View File

@@ -5,7 +5,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/cars"
tools:context=".ui.update.UpdateActivity"> tools:context=".ui.update.UpdateActivity">
<fragment <fragment
@@ -19,7 +18,8 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/update_navigation" app:navGraph="@navigation/update_navigation"
tools:context=".ui.auth.AuthActivity" /> tools:context=".ui.auth.AuthActivity"
tools:ignore="FragmentTagUsage" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

118
app/src/main/res/layout/update_overview_fragment.xml
View File

@@ -3,123 +3,63 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
style="@style/constraint_container" style="@style/parent_constraint_layout"
android:background="#73000000" tools:context="ui.update.UpdateOverviewFragment">
tools:context=".update.UpdateOverviewFragment">
<TextView <TextView
android:id="@+id/login_title_tv" android:id="@+id/login_title_tv"
style="@style/title_text" style="@style/headerStyle"
android:layout_width="0dp" android:layout_marginTop="64dp"
android:layout_height="wrap_content" android:layout_marginBottom="12dp"
android:layout_marginStart="24dp"
android:layout_marginTop="96dp"
android:layout_marginEnd="24dp"
android:text="@string/Update_profile_label" android:text="@string/Update_profile_label"
android:textColor="#ffffff"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/login_subtitle_tv" android:id="@+id/login_subtitle_tv"
android:layout_width="0dp" style="@style/subheader"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginEnd="24dp"
android:text="@string/update_profile_subtitle" android:text="@string/update_profile_subtitle"
android:textColor="#ffffff"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/login_title_tv" /> app:layout_constraintTop_toBottomOf="@+id/login_title_tv" />
<androidx.cardview.widget.CardView <com.google.android.material.button.MaterialButton
style="@style/TextButton.WithIcon"
android:id="@+id/update_email_button" android:id="@+id/update_email_button"
android:layout_width="match_parent" android:layout_marginBottom="12dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
android:backgroundTint="@color/colour_one"
android:enabled="false"
app:cardCornerRadius="24dp"
app:layout_constraintBottom_toTopOf="@id/update_password_button" app:layout_constraintBottom_toTopOf="@id/update_password_button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent"
android:text="@string/update_email"/>
<TextView <com.google.android.material.button.MaterialButton
style="@style/button_inner_text" style="@style/TextButton.WithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/update_email"
android:textColor="@android:color/white" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/update_password_button" android:id="@+id/update_password_button"
android:layout_width="match_parent" android:layout_marginBottom="12dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
android:backgroundTint="@color/colour_one"
android:enabled="false"
app:cardCornerRadius="24dp"
app:layout_constraintBottom_toTopOf="@id/update_profile_button" app:layout_constraintBottom_toTopOf="@id/update_profile_button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent"
android:text="@string/update_password"/>
<TextView <com.google.android.material.button.MaterialButton
style="@style/button_inner_text" style="@style/TextButton.WithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/update_password"
android:textColor="@android:color/white" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/update_profile_button" android:id="@+id/update_profile_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/colour_one"
android:layout_gravity="start"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:enabled="false"
app:cardCornerRadius="24dp"
app:layout_constraintBottom_toTopOf="@id/delete_profile" app:layout_constraintBottom_toTopOf="@id/delete_profile"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent"
android:text="@string/update_profile"/>
<TextView <com.google.android.material.button.MaterialButton
style="@style/button_inner_text" style="@style/TextButton.WithIcon"
android:layout_width="match_parent" android:id="@+id/delete_profile"
android:layout_height="wrap_content" android:layout_marginBottom="64dp"
android:text="@string/update_profile" android:text="@string/delete_profile"
android:textColor="@android:color/white" /> android:backgroundTint="@color/colour_nine"
</androidx.cardview.widget.CardView> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
<Button app:layout_constraintStart_toStartOf="parent"/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:id="@+id/delete_profile"
android:text="@string/delete_profile"
android:textAllCaps="false"
android:textSize="18sp"
android:textStyle="bold"
android:textColor="@android:color/holo_red_dark"
android:layout_gravity="start"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="64dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
</Button>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/menu/activity_main_drawer.xml
View File

@@ -3,12 +3,12 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:showIn="navigation_view"> tools:showIn="navigation_view">
<item android:title="User Profile"> <item android:title="@string/user_profile">
<menu> <menu>
<item <item
android:id="@+id/nav_user_settings" android:id="@+id/nav_user_settings"
android:icon="@drawable/ic_settings_black_24dp" android:icon="@drawable/ic_baseline_assignment_ind_24"
android:title="Update User Profile" /> android:title="@string/update_user_profile" />
</menu> </menu>

BIN
app/src/main/res/mipmap-hdpi/drawable-hdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 86 KiB

BIN
app/src/main/res/mipmap-hdpi/drawable-ldpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
app/src/main/res/mipmap-hdpi/drawable-mdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
app/src/main/res/mipmap-hdpi/drawable-xhdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 125 KiB

BIN
app/src/main/res/mipmap-hdpi/drawable-xxhdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 224 KiB

BIN
app/src/main/res/mipmap-hdpi/drawable-xxxhdpi/welcome_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 330 KiB

22
app/src/main/res/navigation/main_navigation.xml
View File

@@ -6,7 +6,7 @@
<fragment <fragment
android:id="@+id/homeDriverFragment" android:id="@+id/homeDriverFragment"
android:name="h_mal.appttude.com.ui.driver.HomeFragment" android:name="h_mal.appttude.com.ui.HomeFragment"
android:label="fragment_home" android:label="fragment_home"
tools:layout="@layout/fragment_home_driver" > tools:layout="@layout/fragment_home_driver" >
<action <action
@@ -26,7 +26,7 @@
</fragment> </fragment>
<fragment <fragment
android:id="@+id/driverOverallFragment" android:id="@+id/driverOverallFragment"
android:name="h_mal.appttude.com.ui.driver.DriverOverallFragment" android:name="h_mal.appttude.com.ui.DriverOverallFragment"
android:label="DriverOverallFragment" android:label="DriverOverallFragment"
tools:layout="@layout/fragment_driver_overall"> tools:layout="@layout/fragment_driver_overall">
<action <action
@@ -54,7 +54,7 @@
</fragment> </fragment>
<fragment <fragment
android:id="@+id/vehicleOverallFragment" android:id="@+id/vehicleOverallFragment"
android:name="h_mal.appttude.com.ui.driver.VehicleOverallFragment" android:name="h_mal.appttude.com.ui.VehicleOverallFragment"
android:label="VehicleOverallFragment" android:label="VehicleOverallFragment"
tools:layout="@layout/fragment_vehicle_overall"> tools:layout="@layout/fragment_vehicle_overall">
<action <action
@@ -96,34 +96,34 @@
</fragment> </fragment>
<fragment <fragment
android:id="@+id/driverProfileFragment" android:id="@+id/driverProfileFragment"
android:name="h_mal.appttude.com.ui.driver.driverprofile.DriverProfileFragment" android:name="h_mal.appttude.com.ui.driverprofile.DriverProfileFragment"
android:label="fragment_driver_profile" android:label="fragment_driver_profile"
tools:layout="@layout/fragment_driver_profile" /> tools:layout="@layout/fragment_driver_profile" />
<fragment <fragment
android:id="@+id/driverLicenseFragment" android:id="@+id/driverLicenseFragment"
android:name="h_mal.appttude.com.ui.driver.driverprofile.DriverLicenseFragment" android:name="h_mal.appttude.com.ui.driverprofile.DriverLicenseFragment"
android:label="fragment_driver_license" android:label="fragment_driver_license"
tools:layout="@layout/fragment_driver_license" /> tools:layout="@layout/fragment_driver_license" />
<fragment <fragment
android:id="@+id/vehicleSetupFragment" android:id="@+id/vehicleSetupFragment"
android:name="h_mal.appttude.com.ui.driver.vehicleprofile.VehicleProfileFragment" android:name="h_mal.appttude.com.ui.vehicleprofile.VehicleProfileFragment"
android:label="VehicleSetupFragment" android:label="VehicleSetupFragment"
tools:layout="@layout/fragment_vehicle_setup"/> tools:layout="@layout/fragment_vehicle_setup"/>
<fragment <fragment
android:id="@+id/insuranceFragment" android:id="@+id/insuranceFragment"
android:name="h_mal.appttude.com.ui.driver.vehicleprofile.InsuranceFragment" android:name="h_mal.appttude.com.ui.vehicleprofile.InsuranceFragment"
android:label="InsuranceFragment" android:label="InsuranceFragment"
tools:layout="@layout/fragment_insurance"/> tools:layout="@layout/fragment_insurance"/>
<fragment <fragment
android:id="@+id/motFragment" android:id="@+id/motFragment"
android:name="h_mal.appttude.com.ui.driver.vehicleprofile.MotFragment" android:name="h_mal.appttude.com.ui.vehicleprofile.MotFragment"
android:label="MotFragment" android:label="MotFragment"
tools:layout="@layout/fragment_mot"/> tools:layout="@layout/fragment_mot"/>
<fragment <fragment
android:id="@+id/logbookFragment" android:id="@+id/logbookFragment"
android:name="h_mal.appttude.com.ui.driver.vehicleprofile.LogbookFragment" android:name="h_mal.appttude.com.ui.vehicleprofile.LogbookFragment"
android:label="fragment_logbook" android:label="fragment_logbook"
tools:layout="@layout/fragment_logbook" /> tools:layout="@layout/fragment_logbook" />
<activity <activity
@@ -133,12 +133,12 @@
tools:layout="@layout/update_activity" /> tools:layout="@layout/update_activity" />
<fragment <fragment
android:id="@+id/privateHireLicenseFragment2" android:id="@+id/privateHireLicenseFragment2"
android:name="h_mal.appttude.com.ui.driver.driverprofile.PrivateHireLicenseFragment" android:name="h_mal.appttude.com.ui.driverprofile.PrivateHireLicenseFragment"
android:label="fragment_private_hire_license" android:label="fragment_private_hire_license"
tools:layout="@layout/fragment_private_hire_license" /> tools:layout="@layout/fragment_private_hire_license" />
<fragment <fragment
android:id="@+id/privateHireVehicleFragment" android:id="@+id/privateHireVehicleFragment"
android:name="h_mal.appttude.com.ui.driver.vehicleprofile.PrivateHireVehicleFragment" android:name="h_mal.appttude.com.ui.vehicleprofile.PrivateHireVehicleFragment"
android:label="fragment_private_hire_vehicle" android:label="fragment_private_hire_vehicle"
tools:layout="@layout/fragment_private_hire_vehicle" /> tools:layout="@layout/fragment_private_hire_vehicle" />
</navigation> </navigation>

3
app/src/main/res/values/colors.xml
View File

@@ -12,4 +12,7 @@
<color name="colour_five">#020122</color> <color name="colour_five">#020122</color>
<color name="colour_siz">#deecf4</color> <color name="colour_siz">#deecf4</color>
<color name="colour_seven">#91ddff</color> <color name="colour_seven">#91ddff</color>
<color name="colour_eight">#9958BE3F</color>
<color name="colour_nine">#303030</color>
</resources> </resources>

49
app/src/main/res/values/strings.xml
View File

@@ -40,4 +40,53 @@
<string name="vehicle_details_title">Vehicle Details</string> <string name="vehicle_details_title">Vehicle Details</string>
<string name="vehicle_details_subtitle">Add/update your vehicle details to complete your profile</string> <string name="vehicle_details_subtitle">Add/update your vehicle details to complete your profile</string>
<string name="prompt_insert_name">Update name</string> <string name="prompt_insert_name">Update name</string>
<string name="login">Login</string>
<string name="welcome_back">Welcome back!</string>
<string name="create_my_account">Or create my account</string>
<string name="license_expiry_date">License Expiry Date</string>
<string name="drivers_license_no">Drivers License no.</string>
<string name="date_first_available">Date first available</string>
<string name="mot_expiry_date">MOT Expiry Date</string>
<string name="upload_mot">Upload M.O.T</string>
<string name="upload_private_hire_photo">Upload Private hire photo</string>
<string name="user_profile">User Profile</string>
<string name="update_user_profile">Update User Profile</string>
<string name="car_reg">Car reg</string>
<string name="car_make">Make</string>
<string name="car_model">Model</string>
<string name="name_of_keeper">Name of keeper</string>
<string name="car_colour">Colour</string>
<string name="address_of_keeper">Address of Keeper</string>
<string name="postcode_of_keeper">Postcode of Keeper</string>
<string name="car_start_date">Start date</string>
<string name="vehicle_seized">Vehicle Seized</string>
<string name="full_name">Full name</string>
<string name="address">Address</string>
<string name="postcode">Postcode</string>
<string name="date_of_birth">Date of birth</string>
<string name="ni_number">NI number</string>
<string name="image_description">basic app image</string>
<string name="private_hire_license_no">Private Hire License no.</string>
<string name="private_hire_license_expiry">Private Hire License Expiry</string>
<string name="upload_private_hire_vehicle_certificate">Upload Private hire vehicle certificate</string>
<string name="private_hire_certificate_license_no">Private Hire Certificate License no.</string>
<string name="private_hire_certificate_expiry">Private Hire Certificate Expiry</string>
<string name="driver_profile">Driver Profile</string>
<string name="private_hire_license">Private Hire License</string>
<string name="drivers_license">Drivers License</string>
<string name="v5c_number">V5C number</string>
<string name="upload_logbook">Upload logbook</string>
<string name="or_create_my_account">Or create my account</string>
<string name="hello_nice_to_meet_you">Hello, nice to meet you!</string>
<string name="get_a_new_experience">Get a new experience</string>
<string name="vehicle_profile">Vehicle Profile</string>
<string name="insurance">Insurance</string>
<string name="m_o_t">M.O.T</string>
<string name="log_book">Log book</string>
<string name="private_hire_vehicle_license">Private hire Vehicle License</string>
<string name="upload_insurance_documents">Upload Insurance Documents</string>
<string name="insurer">Insurer</string>
<string name="insurance_expiry">Insurance expiry</string>
<string name="logout">Logout</string>
<string name="forgot_password">Forgot password?</string>
</resources> </resources>

102
app/src/main/res/values/styles.xml
View File

@@ -1,16 +1,16 @@
<resources> <resources>
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="android:windowBackground">@drawable/bg</item> <item name="android:windowBackground">@drawable/background_with_curve</item>
<item name="android:actionMenuTextColor">@android:color/white</item>
<item name="android:textColorHint">@color/colour_five</item> <item name="android:textColorHint">@android:color/white</item>
<item name="android:textColor">@color/colour_five</item> <item name="android:textColor">@android:color/white</item>
</style> </style>
<style name="AppTheme.NoActionBar"> <style name="AppTheme.NoActionBar">
@@ -41,7 +41,7 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="cardview_theme" parent="CardView"> <style name="CardViewTheme" parent="CardView">
<!--<item name="android:layout_width">match_parent</item>--> <!--<item name="android:layout_width">match_parent</item>-->
<!--<item name="android:layout_height">match_parent</item>--> <!--<item name="android:layout_height">match_parent</item>-->
<!--<item name="cardBackgroundColor">#00fffb</item>--> <!--<item name="cardBackgroundColor">#00fffb</item>-->
@@ -79,12 +79,98 @@
<item name="android:paddingBottom">@dimen/activity_vertical_margin</item> <item name="android:paddingBottom">@dimen/activity_vertical_margin</item>
</style> </style>
<style name="edit_text_entry_style"> <style name="EditTextStyle">
<item name="android:backgroundTint">@android:color/white</item> <item name="android:backgroundTint">@color/colour_eight</item>
<item name="android:textColor">@android:color/white</item> <item name="android:textColor">@android:color/white</item>
<item name="android:maxLines">1</item> <item name="android:maxLines">1</item>
<item name="android:selectAllOnFocus">true</item> <item name="android:selectAllOnFocus">true</item>
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
</style>
<style name="EditTextStyle.Date" parent="EditTextStyle">
<item name="android:focusable">false</item>
<item name="android:inputType">date</item>
<item name="android:maxLines">1</item>
</style>
<style name="TextButton" parent="Theme.MaterialComponents.DayNight">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">@color/colour_eight</item>
</style>
<style name="TextButton.Rounded" parent="TextButton">
<item name="cornerRadius">28dp</item>
</style>
<style name="TextButton.WithIcon" parent="TextButton">
<item name="android:layoutDirection">rtl</item>
<item name="android:gravity">start|center</item>
<item name="android:paddingRight">40dp</item>
<item name="iconGravity">start</item>
<item name="icon">@drawable/ic_baseline_arrow_forward_24</item>
<item name="tint">@android:color/white</item>
</style>
<style name="TextButton.WithIcon.SubmitConstraints" parent="TextButton.WithIcon" >
<item name="layout_constraintTop_toTopOf">parent</item>
<item name="layout_constraintBottom_toBottomOf">parent</item>
<item name="layout_constraintLeft_toLeftOf">parent</item>
<item name="layout_constraintRight_toRightOf">parent</item>
<item name="layout_constraintVertical_bias">0.8</item>
</style>
<style name="iconButton" parent="Widget.AppCompat.Button.Borderless">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layoutDirection">rtl</item>
<item name="android:gravity">start</item>
<item name="android:paddingRight">40dp</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:backgroundTint">@color/colour_eight</item>
<item name="iconGravity">start</item>
<item name="icon">@drawable/ic_baseline_arrow_forward_24</item>
</style>
<style name="imageBackground">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">#000000</item>
<item name="android:contentDescription">background</item>
<item name="android:scaleType">center</item>
</style>
<style name="headerStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">6dp</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">24sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="parent_constraint_layout">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:paddingLeft">@dimen/activity_horizontal_margin</item>
<item name="android:paddingTop">@dimen/activity_vertical_margin</item>
<item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
<item name="android:paddingBottom">@dimen/activity_vertical_margin</item>
</style>
<style name="subheader">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">#ffffff</item>
</style>
<style name="text_input_layout">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColorHint">@android:color/white</item>
</style> </style>
</resources> </resources>

10
build.gradle
View File

@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = "1.3.72" ext.kotlin_version = "1.7.10"
repositories { repositories {
google() google()
@@ -9,11 +9,11 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.google.gms:google-services:4.0.1' classpath 'com.google.gms:google-services:4.3.15'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
def nav_version = "2.1.0-alpha06" def nav_version = "2.4.1"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

6
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Sun Oct 11 00:29:59 BST 2020 #Mon Feb 13 21:54:13 GMT 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip zipStoreBase=GRADLE_USER_HOME