diff --git a/app/build.gradle b/app/build.gradle index 218432a..96aa532 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ plugins { 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") +def relStoreFile = System.getenv("RELEASE_KEYSTORE") android { compileSdkVersion 31 @@ -41,13 +41,13 @@ android { storePassword relStorePassword keyPassword relKeyPassword keyAlias relKeyAlias -// storeFile file(relStoreFile) + storeFile file(relStoreFile) } } buildTypes { release { -// signingConfig signingConfigs.release + signingConfig signingConfigs.release minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } diff --git a/app/src/admin/java/h_mal/appttude/com/driver/ui/DriverStatusClass.kt b/app/src/admin/java/h_mal/appttude/com/driver/ui/DriverStatusClass.kt deleted file mode 100644 index ada9224..0000000 --- a/app/src/admin/java/h_mal/appttude/com/driver/ui/DriverStatusClass.kt +++ /dev/null @@ -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 = 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() { - // @Override - // public void onComplete(@NonNull Task 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; - // } -} \ No newline at end of file diff --git a/app/src/admin/res/layout/approval_list_grid_item.xml b/app/src/admin/res/layout/approval_list_grid_item.xml deleted file mode 100644 index 3eef1e4..0000000 --- a/app/src/admin/res/layout/approval_list_grid_item.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/admin/res/layout/empty_users_view.xml b/app/src/admin/res/layout/empty_users_view.xml index 68d156d..d830efc 100644 --- a/app/src/admin/res/layout/empty_users_view.xml +++ b/app/src/admin/res/layout/empty_users_view.xml @@ -3,7 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/background_with_curve" xmlns:app="http://schemas.android.com/apk/res-auto"> + tools:src="@android:drawable/presence_online" + android:contentDescription="@string/user_status" /> ) { - delegate.handle(error, viewMatcher) - // Catch a screenshot on failure - Screengrab.screenshot("error") - } -} \ No newline at end of file diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index 6e186bd..b30cb5f 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -9,9 +9,6 @@ - - - - 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(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?) { - size = map?.size ?: 0 - map?.keys?.toTypedArray()?.let { - mKeys = it - } - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/cars.png b/app/src/main/res/drawable-hdpi/cars.png deleted file mode 100644 index f45e424..0000000 Binary files a/app/src/main/res/drawable-hdpi/cars.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/cars.png b/app/src/main/res/drawable-ldpi/cars.png deleted file mode 100644 index b0b31c7..0000000 Binary files a/app/src/main/res/drawable-ldpi/cars.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/cars.png b/app/src/main/res/drawable-mdpi/cars.png deleted file mode 100644 index c863164..0000000 Binary files a/app/src/main/res/drawable-mdpi/cars.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/cars.png b/app/src/main/res/drawable-xhdpi/cars.png deleted file mode 100644 index fc40c5e..0000000 Binary files a/app/src/main/res/drawable-xhdpi/cars.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/bg.jpg b/app/src/main/res/drawable-xxhdpi/bg.jpg deleted file mode 100644 index 3477474..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/bg.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/cars.png b/app/src/main/res/drawable-xxhdpi/cars.png deleted file mode 100644 index 248c230..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/cars.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/cars.png b/app/src/main/res/drawable-xxxhdpi/cars.png deleted file mode 100644 index bdd868f..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/cars.png and /dev/null differ diff --git a/app/src/main/res/drawable/cardviewoutline.xml b/app/src/main/res/drawable/cardviewoutline.xml deleted file mode 100644 index 9cdbe25..0000000 --- a/app/src/main/res/drawable/cardviewoutline.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/round_edit_text.xml b/app/src/main/res/drawable/round_edit_text.xml deleted file mode 100644 index 744ceb1..0000000 --- a/app/src/main/res/drawable/round_edit_text.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml deleted file mode 100644 index a36d7a1..0000000 --- a/app/src/main/res/drawable/side_nav_bar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/zero.png b/app/src/main/res/drawable/zero.png deleted file mode 100644 index ceadf26..0000000 Binary files a/app/src/main/res/drawable/zero.png and /dev/null differ diff --git a/app/src/main/res/layout/address_dialog.xml b/app/src/main/res/layout/address_dialog.xml deleted file mode 100644 index 39974a2..0000000 --- a/app/src/main/res/layout/address_dialog.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - -