- lint checks

This commit is contained in:
2023-06-28 13:57:28 +01:00
parent b75bab5deb
commit 26136aeb24
33 changed files with 18 additions and 994 deletions

View File

@@ -9,7 +9,7 @@ plugins {
def relStorePassword = System.getenv("RELEASE_STORE_PASSWORD") def relStorePassword = System.getenv("RELEASE_STORE_PASSWORD")
def relKeyPassword = System.getenv("RELEASE_KEY_PASSWORD") def relKeyPassword = System.getenv("RELEASE_KEY_PASSWORD")
def relKeyAlias = System.getenv("RELEASE_KEY_ALIAS") def relKeyAlias = System.getenv("RELEASE_KEY_ALIAS")
//def relStoreFile = System.getenv("RELEASE_KEYSTORE") def relStoreFile = System.getenv("RELEASE_KEYSTORE")
android { android {
compileSdkVersion 31 compileSdkVersion 31
@@ -41,13 +41,13 @@ android {
storePassword relStorePassword storePassword relStorePassword
keyPassword relKeyPassword keyPassword relKeyPassword
keyAlias relKeyAlias keyAlias relKeyAlias
// storeFile file(relStoreFile) storeFile file(relStoreFile)
} }
} }
buildTypes { buildTypes {
release { release {
// signingConfig signingConfigs.release signingConfig signingConfigs.release
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }

View File

@@ -1,107 +0,0 @@
package h_mal.appttude.com.driver.ui
import android.app.AlertDialog
import android.content.Context
import android.view.View
import androidx.cardview.widget.CardView
class DriverStatusClass : View.OnClickListener {
var userId: String? = null
var cardView: CardView? = null
var context: Context? = null
var currentSelection: Boolean = false
override fun onClick(v: View) {
val choices: Array<String> = arrayOf("Active", "Inactive")
val alertDialog: AlertDialog.Builder = AlertDialog.Builder(context)
var selection: Int = -1
if (currentSelection) {
selection = 0
} else if (!currentSelection) {
selection = 1
}
alertDialog.setSingleChoiceItems(
choices,
selection
) { dialog, which -> }
alertDialog.create().show()
}
private fun SetStatus(status: Boolean) {
// MainActivity.mDatabase!!.child(FirebaseClass.USER_FIREBASE)
// .child((userId)!!).child(FirebaseClass.DRIVER_STATUS).setValue(status)
// .addOnCompleteListener { task ->
// if (task.isSuccessful) {
// cardView!!.setBackgroundColor(setStatusColour(status))
// } else {
// }
// }
}
private fun setStatusColour(b: Boolean): Int {
if (b) {
return android.R.color.holo_green_dark
} else {
return android.R.color.holo_red_dark
}
} // public int getOverApprovalStatusCode(WholeDriverObject wholeDriverObject){
//
// if (wholeDriverObject.approvalsObject != null){
// ApprovalsObject approvalsObject = wholeDriverObject.approvalsObject;
//
// int[] ints = new int[]{approvalsObject.getDriver_details_approval(),
// approvalsObject.driver_license_approval,
// approvalsObject.private_hire_approval,
// approvalsObject.vehicle_details_approval,
// approvalsObject.insurance_details_approval,
// approvalsObject.mot_details_approval,
// approvalsObject.log_book_approval,
// approvalsObject.ph_car_approval};
//
//
// return setImageResource(mode(ints));
// }
//
// return setImageResource(NO_DATE_PRESENT);
// }
//
// public void setStatusCode(String userId,String approvalNameString,int status){
//
// if (!approvalNameString.equals("")) {
// mDatabase.child(USER_FIREBASE).child(userId).child(USER_APPROVALS).child(approvalNameString)
// .setValue(status).addOnCompleteListener(new OnCompleteListener<Void>() {
// @Override
// public void onComplete(@NonNull Task<Void> task) {
// if (task.isSuccessful()) {
//
// } else {
//
// }
// }
// });
// }
//
//
// }
//
// public int setImageResource(int statusCode){
// int imageResource;
//
// switch (statusCode){
// case APPROVAL_PENDING:
// imageResource = R.drawable.pending;
// break;
// case APPROVAL_DENIED:
// imageResource = R.drawable.denied;
// break;
// case APPROVED:
// imageResource = R.drawable.approved;
// break;
// default:
// imageResource = R.drawable.zero;
// break;
// }
//
// return imageResource;
// }
}

View File

@@ -1,93 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center"
app:cardCornerRadius="22dp"
app:cardBackgroundColor="@android:color/transparent"
app:cardElevation="0dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/cardviewoutline" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/approval_iv"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="center"
tools:src="@drawable/pending" />
<View
android:id="@+id/view_1"
android:layout_width="match_parent"
android:layout_height="3dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
<TextView
android:id="@+id/approval_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textSize="17sp"
android:textStyle="bold"
tools:text="Private Hire License" />
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
<FrameLayout
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_margin="12dp">
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
<ImageView
android:id="@+id/archive_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_archive_black_24dp"
app:tint="@color/colour_three" />
</FrameLayout>
</RelativeLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>

View File

@@ -3,7 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/background_with_curve"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<ImageView <ImageView

View File

@@ -10,7 +10,7 @@
android:id="@+id/driverPic" android:id="@+id/driverPic"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
@@ -26,18 +26,19 @@
android:id="@+id/approval_iv" android:id="@+id/approval_iv"
android:layout_width="10dp" android:layout_width="10dp"
android:layout_height="10dp" android:layout_height="10dp"
android:layout_marginRight="3dp" android:layout_marginEnd="3dp"
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
app:layout_constraintTop_toTopOf="@id/driverPic" app:layout_constraintTop_toTopOf="@id/driverPic"
app:layout_constraintRight_toRightOf="@id/driverPic" app:layout_constraintRight_toRightOf="@id/driverPic"
android:adjustViewBounds="true" android:adjustViewBounds="true"
tools:src="@android:drawable/presence_online" /> tools:src="@android:drawable/presence_online"
android:contentDescription="@string/user_status" />
<TextView <TextView
android:id="@+id/driver_no" android:id="@+id/driver_no"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="24dp" android:layout_marginEnd="24dp"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
@@ -48,7 +49,7 @@
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="@id/driverPic" app:layout_constraintBottom_toBottomOf="@id/driverPic"
app:layout_constraintLeft_toRightOf="@id/driverPic" app:layout_constraintLeft_toRightOf="@id/driverPic"

View File

@@ -1,23 +0,0 @@
package h_mal.appttude.com.driver.helpers
import android.content.Context
import android.view.View
import androidx.test.espresso.FailureHandler
import androidx.test.espresso.base.DefaultFailureHandler
import org.hamcrest.Matcher
import tools.fastlane.screengrab.Screengrab
class CustomFailureHandler(targetContext: Context) : FailureHandler {
private val delegate: FailureHandler
init {
delegate = DefaultFailureHandler(targetContext)
}
override fun handle(error: Throwable, viewMatcher: Matcher<View>) {
delegate.handle(error, viewMatcher)
// Catch a screenshot on failure
Screengrab.screenshot("error")
}
}

View File

@@ -9,9 +9,6 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<!-- Allows changing locales -->
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application <application
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"

View File

@@ -1,37 +0,0 @@
package h_mal.appttude.com.driver.archive
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ListView
import androidx.fragment.app.Fragment
import com.google.firebase.database.DatabaseReference
import h_mal.appttude.com.driver.R
class ArchiveFragment : Fragment() {
// var archive: ArchiveObject? = null
private var reference: DatabaseReference? = null
private var listView: ListView? = null
var archiveString: String? = null
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
// Inflate the layout for this fragment
val view: View = inflater.inflate(R.layout.fragment_archive, container, false)
listView = view.findViewById(R.id.archive_listview)
// reference!!.addListenerForSingleValueEvent(valueEventListener)
return view
}
// var valueEventListener: ValueEventListener = object : ValueEventListener {
// override fun onDataChange(dataSnapshot: DataSnapshot) {
// archive = dataSnapshot.getValue(ArchiveObject::class.java)
// listView!!.adapter = ArchiveObjectListAdapter(archive, requireContext(), archiveString)
// }
//
// override fun onCancelled(databaseError: DatabaseError) {}
// }
}

View File

@@ -1,216 +0,0 @@
package h_mal.appttude.com.driver.archive
//import h_mal.appttude.com.driver.Global.FirebaseClass
//import h_mal.appttude.com.driver.Global.ImageSwiperClass
//import h_mal.appttude.com.driver.Objects.ArchiveObject
import android.content.Context
import android.view.View
import android.view.ViewGroup
import android.widget.BaseAdapter
import android.widget.TextView
import h_mal.appttude.com.driver.utils.DateUtils.convertDateStringDatePattern
import java.text.ParseException
class ArchiveObjectListAdapter(
// var archiveObject: ArchiveObject?,
var context: Context?,
var archiveString: String?
) : BaseAdapter() {
var size: Int = 0
lateinit var mKeys: Array<String>
private var dateArchivedText: TextView? = null
override fun getCount(): Int {
return size
}
override fun getItem(position: Int): Any? {
when (archiveString) {
// FirebaseClass.PRIVATE_HIRE_FIREBASE -> return archiveObject?.private_hire
// ?.get(mKeys[position])
// FirebaseClass.DRIVERS_LICENSE_FIREBASE -> return archiveObject?.driver_license
// ?.get(mKeys[position])
// FirebaseClass.VEHICLE_DETAILS_FIREBASE -> return archiveObject?.vehicle_details
// ?.get(mKeys[position])
// FirebaseClass.MOT_FIREBASE -> return archiveObject?.mot_details?.get(mKeys[position])
// FirebaseClass.INSURANCE_FIREBASE -> return archiveObject?.insurance_details?.get(
// mKeys[position]
// )
// FirebaseClass.LOG_BOOK_FIREBASE -> return archiveObject?.log_book
// ?.get(mKeys.get(position))
// FirebaseClass.PRIVATE_HIRE_VEHICLE_LICENSE -> return archiveObject?.ph_car?.get(mKeys[position])
else -> return mKeys[position]
}
}
override fun getItemId(position: Int): Long {
return position.toLong()
}
override fun getView(position: Int, convertView: View, parent: ViewGroup): View {
var listItemView: View = convertView
//
// if (listItemView == null) {
// if (((archiveString == FirebaseClass.PRIVATE_HIRE_FIREBASE) || (archiveString == FirebaseClass.DRIVERS_LICENSE_FIREBASE) || (archiveString == FirebaseClass.MOT_FIREBASE) || (archiveString == FirebaseClass.LOG_BOOK_FIREBASE) || (archiveString == FirebaseClass.PRIVATE_HIRE_VEHICLE_LICENSE))) {
// listItemView = LayoutInflater.from(context).inflate(
// R.layout.archive_license_item, parent, false
// )
// val imageView: ImageView = listItemView.findViewById(R.id.image_archive)
// dateArchivedText = listItemView.findViewById(R.id.date_archived)
// val expiryHolder: LinearLayout = listItemView.findViewById(R.id.expiry_view)
// val fieldTwo: LinearLayout = listItemView.findViewById(R.id.field_two_view)
// val expiryText: TextView = listItemView.findViewById(R.id.exp_text)
// val fiewTwoLable: TextView = listItemView.findViewById(R.id.field_two)
// val fieldTwoText: TextView = listItemView.findViewById(R.id.field_two_text)
// when (archiveString) {
//// FirebaseClass.PRIVATE_HIRE_FIREBASE -> {
//// expiryHolder.visibility = View.VISIBLE
//// fieldTwo.visibility = View.VISIBLE
//// val privateHireObject: PrivateHireObject =
//// getItem(position) as PrivateHireObject
//// Picasso.get().load(privateHireObject.phImageString)
//// .placeholder(R.drawable.choice_img)
//// .into(imageView)
//// dateString(position)
//// expiryText.text = privateHireObject.phExpiry
//// fiewTwoLable.text = "Private Hire License No.:"
//// fieldTwoText.text = privateHireObject.phNumber
//// }
//// FirebaseClass.DRIVERS_LICENSE_FIREBASE -> {
//// expiryHolder.visibility = View.VISIBLE
//// fieldTwo.visibility = View.VISIBLE
//// val driversLicenseObject: DriversLicenseObject =
//// getItem(position) as DriversLicenseObject
//// Picasso.get().load(driversLicenseObject.licenseImageString)
//// .placeholder(R.drawable.choice_img)
//// .into(imageView)
//// dateString(position)
//// expiryText.text = driversLicenseObject.licenseExpiry
//// fiewTwoLable.text = "License No.:"
//// fieldTwoText.text = driversLicenseObject.licenseNumber
//// }
//// FirebaseClass.MOT_FIREBASE -> {
//// expiryHolder.visibility = View.VISIBLE
//// fieldTwo.visibility = View.GONE
//// val motObject: MotObject = getItem(position) as MotObject
//// Picasso.get().load(motObject.motImageString)
//// .placeholder(R.drawable.choice_img)
//// .into(imageView)
//// dateString(position)
//// expiryText.text = motObject.motExpiry
//// }
//// FirebaseClass.LOG_BOOK_FIREBASE -> {
//// expiryHolder.visibility = View.GONE
//// fieldTwo.visibility = View.VISIBLE
//// val logbookObject: LogbookObject = getItem(position) as LogbookObject
//// Picasso.get().load(logbookObject.photoString)
//// .into(MainActivity.loadImage(imageView))
//// dateString(position)
//// fiewTwoLable.text = "V5C No.:"
//// fieldTwoText.text = logbookObject.v5cnumber
//// }
//// FirebaseClass.PRIVATE_HIRE_VEHICLE_LICENSE -> {
//// expiryHolder.visibility = View.VISIBLE
//// fieldTwo.visibility = View.VISIBLE
//// val privateHireVehicleObject: PrivateHireVehicleObject =
//// getItem(position) as PrivateHireVehicleObject
//// Picasso.get().load(privateHireVehicleObject.phCarImageString)
//// .into(MainActivity.loadImage(imageView))
//// dateString(position)
//// expiryText.text = privateHireVehicleObject.phCarExpiry
//// fiewTwoLable.text = "Private Hire Vehicle License No.:"
//// fieldTwoText.text = privateHireVehicleObject.phCarNumber
//// }
//// }
//// } else if ((archiveString == FirebaseClass.INSURANCE_FIREBASE)) {
//// listItemView = LayoutInflater.from(context).inflate(
//// R.layout.archive_insurance_item, parent, false
//// )
//// val holder: View = listItemView.findViewById(R.id.image_pager)
//// val swiperClass: ImageSwiperClass = ImageSwiperClass(context, holder)
//// // swiperClass.hideDelete();
//// listItemView.findViewById<View>(R.id.delete).visibility = View.GONE
//// // holder.findViewById(R.id.delete).setVisibility(View.INVISIBLE);
//// dateArchivedText = listItemView.findViewById(R.id.date_archived)
//// dateString(position)
//// val expiryText: TextView = listItemView.findViewById(R.id.exp_text)
//// val fieldTwoText: TextView = listItemView.findViewById(R.id.archive_insurer)
//// val insuranceObject: InsuranceObject = getItem(position) as InsuranceObject
////// swiperClass.reinstantiateList(insuranceObject.photoStrings)
//// expiryText.text = insuranceObject.expiryDate
//// fieldTwoText.text = insuranceObject.insurerName
//// } else if ((archiveString == FirebaseClass.VEHICLE_DETAILS_FIREBASE)) {
//// listItemView = LayoutInflater.from(context).inflate(
//// R.layout.archive_vehicle_item, parent, false
//// )
//// dateArchivedText = listItemView.findViewById(R.id.date_archived)
//// dateString(position)
//// val numberPlate: TextView = listItemView.findViewById(R.id.number_plate)
//// val keeperName: TextView = listItemView.findViewById(R.id.keeper_name)
//// val keeperAddress: TextView = listItemView.findViewById(R.id.keeper_address)
//// val carText: TextView = listItemView.findViewById(R.id.car_text_arch)
//// val carColour: TextView = listItemView.findViewById(R.id.car_colour)
//// val carSeized: TextView = listItemView.findViewById(R.id.seized_checkbox)
//// val startDate: TextView = listItemView.findViewById(R.id.first_date)
//// val vehicleProfileObject: VehicleProfileObject =
//// getItem(position) as VehicleProfileObject
//// numberPlate.text = vehicleProfileObject.reg
//// keeperName.text = vehicleProfileObject.keeperName
//// keeperAddress.text = vehicleProfileObject.keeperAddress + "\n" + vehicleProfileObject.keeperPostCode
//// carText.text = vehicleProfileObject.make + " " + vehicleProfileObject.model
//// carColour.text = vehicleProfileObject.colour
//// val s: String
//// if (vehicleProfileObject.isSeized) {
//// s = "Yes"
//// } else {
//// s = "No"
//// }
//// carSeized.text = s
//// startDate.text = vehicleProfileObject.startDate
//// }
//// }
return listItemView
}
private fun dateString(position: Int) {
var success: Boolean = true
try {
dateArchivedText!!.text =
mKeys[position].convertDateStringDatePattern("yyyyMMdd_HHmmss", "dd/MM/yyyy")
} catch (e: ParseException) {
e.printStackTrace()
success = false
} finally {
if (!success) {
dateArchivedText!!.text = mKeys.get(position).substring(0, 8)
}
}
}
companion object {
private val TAG: String = "ArchiveObjectListAdapte"
}
// init {
// archiveObject?.apply {
// val map = when (archiveString) {
// FirebaseClass.PRIVATE_HIRE_FIREBASE -> private_hire
// FirebaseClass.DRIVERS_LICENSE_FIREBASE -> driver_license
// FirebaseClass.VEHICLE_DETAILS_FIREBASE -> vehicle_details
// FirebaseClass.MOT_FIREBASE -> mot_details
// FirebaseClass.INSURANCE_FIREBASE -> insurance_details
// FirebaseClass.LOG_BOOK_FIREBASE -> log_book
// FirebaseClass.PRIVATE_HIRE_VEHICLE_LICENSE -> ph_car
// else -> null
// }
// setUp(map)
// }
//
// }
private fun setUp(map: HashMap<String, *>?) {
size = map?.size ?: 0
map?.keys?.toTypedArray()?.let {
mKeys = it
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 923 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 437 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 566 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 MiB

View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/transparent" />
<stroke
android:width="2dip"
android:color="#03a9f4" />
<corners android:radius="22dip" />
<padding
android:left="0dip"
android:top="0dip"
android:right="0dip"
android:bottom="0dip" />
</shape>

View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
android:padding="10dp">
<solid android:color="#03a9f4" />
<corners
android:bottomRightRadius="22dp"
android:bottomLeftRadius="22dp"
android:topLeftRadius="22dp"
android:topRightRadius="22dp" />
</shape>

View File

@@ -1,9 +0,0 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="135"
android:centerColor="@color/colorAccent"
android:endColor="@color/colour_four"
android:startColor="@color/colour_siz"
android:type="linear" />
</shape>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -1,65 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_margin="12dp"
android:orientation="vertical">
<Button
android:id="@+id/upload"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@drawable/cardviewoutline"
android:text="@string/upload_pic"
android:textColor="@android:color/black"
android:textStyle="bold" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/or"
android:background="#616161"
android:gravity="center" />
<TextView
android:id="@+id/or"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_margin="4dp"
android:text="@string/or" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/or"
android:background="#616161"
android:gravity="center" />
</RelativeLayout>
<Button
android:id="@+id/take_pic"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@drawable/cardviewoutline"
android:text="@string/take_pic"
android:textColor="@android:color/black"
android:textStyle="bold" />
</androidx.appcompat.widget.LinearLayoutCompat>

View File

@@ -1,92 +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="wrap_content"
android:orientation="vertical"
android:padding="6dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:background="@color/colour_siz"
android:orientation="vertical">
<TextView
android:id="@+id/date_archived"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginTop="12dp"
android:layout_marginRight="12dp"
android:textColor="@color/colour_two"
android:textStyle="bold"
tools:text="12/12/2019" />
<include
android:id="@+id/image_pager"
layout="@layout/multi_image_selector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="20dp"
android:layout_marginTop="12dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="12dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="12dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Expiry"
android:textColor="@color/colour_four"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/exp_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="12/12/2019" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Insurer"
android:textColor="@color/colour_four"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/archive_insurer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Admiral" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

View File

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

View File

@@ -1,17 +0,0 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:srcCompat="@drawable/choice_img"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

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

View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#000000" android:background="#000000"
tools:src="@drawable/cars" /> tools:src="@drawable/splash_screen" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/download_pic" android:id="@+id/download_pic"

View File

@@ -23,7 +23,7 @@
android:layout_height="200dp" android:layout_height="200dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
tools:src="@drawable/driver_license_private_hire" tools:src="@drawable/choice_img"
android:contentDescription="@string/image_description" /> android:contentDescription="@string/image_description" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
@@ -34,8 +34,7 @@
android:text="@string/upload_private_hire_photo" android:text="@string/upload_private_hire_photo"
app:layout_constraintBottom_toTopOf="@id/til_submission" app:layout_constraintBottom_toTopOf="@id/til_submission"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent" />
tools:visibility="gone"/>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/til_submission" android:id="@+id/til_submission"
@@ -80,7 +79,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/til_submission" app:layout_constraintTop_toBottomOf="@+id/til_submission"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.8" app:layout_constraintVertical_bias="0.8"/>
tools:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -1,43 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:rotation="180"
app:srcCompat="@android:drawable/ic_media_play" />
<FrameLayout
android:layout_width="200dp"
android:layout_height="200dp"
android:adjustViewBounds="true">
<androidx.viewpager.widget.ViewPager
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</androidx.viewpager.widget.ViewPager>
<ImageView
android:id="@+id/delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
app:srcCompat="@android:drawable/ic_delete" />
</FrameLayout>
<ImageView
android:id="@+id/right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
app:srcCompat="@android:drawable/ic_media_play" />
</LinearLayout>

View File

@@ -11,7 +11,8 @@
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"
android:theme="@style/ThemeOverlay.AppCompat.Dark"> android:theme="@style/ThemeOverlay.AppCompat.Dark"
tools:ignore="Overdraw">
<com.mikhaellopez.circularimageview.CircularImageView <com.mikhaellopez.circularimageview.CircularImageView
android:id="@+id/profileImage" android:id="@+id/profileImage"

View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="#4D000000">
<ProgressBar <ProgressBar
android:id="@+id/progress_circular" android:id="@+id/progress_circular"

View File

@@ -2,8 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout 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"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@drawable/background_with_curve">
<ImageView <ImageView
android:id="@+id/background_img" android:id="@+id/background_img"

View File

@@ -1,8 +0,0 @@
<resources>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
</resources>

View File

@@ -116,4 +116,5 @@
<string name="no_authorization">Authentication has failed</string> <string name="no_authorization">Authentication has failed</string>
<string name="no_authorization_subtext">There is a problem with authentication.</string> <string name="no_authorization_subtext">There is a problem with authentication.</string>
<string name="image_icon_for_feedback_view">Image icon for feedback view.</string> <string name="image_icon_for_feedback_view">Image icon for feedback view.</string>
<string name="user_status">user status</string>
</resources> </resources>