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

- android bumblebee gradle migration

Browse Source 
- lint driverDebug
 - view binding migration

Took 12 hours 10 minutes
This commit is contained in:
hmalik144
2023-03-24 19:15:48 +00:00
parent 7f4060f1c2
commit 1b00d7d40d
125 changed files with 1163 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/admin/java/h_mal/appttude/com/objects/ApprovalsObject.kt
View File

@@ -1,7 +1,6 @@
package h_mal.appttude.com.objects
class ApprovalsObject {
var driver_details_approval: Int = 0
var driver_license_approval: Int = 0

1
app/src/admin/java/h_mal/appttude/com/objects/UserObject.kt
View File

@@ -1,7 +1,6 @@
package h_mal.appttude.com.objects
class UserObject {
var profileName: String? = null
var profileEmail: String? = null

15
app/src/admin/java/h_mal/appttude/com/objects/wholeObject/MappedObject.kt
View File

@@ -29,14 +29,15 @@ class MappedObject : Parcelable {
companion object {
@JvmField
val CREATOR: Parcelable.Creator<MappedObject?> = object : Parcelable.Creator<MappedObject?> {
override fun createFromParcel(`in`: Parcel): MappedObject? {
return MappedObject(`in`)
}
val CREATOR: Parcelable.Creator<MappedObject?> =
object : Parcelable.Creator<MappedObject?> {
override fun createFromParcel(`in`: Parcel): MappedObject? {
return MappedObject(`in`)
}
override fun newArray(size: Int): Array<MappedObject?> {
return arrayOfNulls(size)
override fun newArray(size: Int): Array<MappedObject?> {
return arrayOfNulls(size)
}
}
}
}
}

2
app/src/admin/java/h_mal/appttude/com/ui/ApprovalListAdapter.kt
View File

@@ -12,7 +12,7 @@ import h_mal.appttude.com.R
class ApprovalListAdapter(
private val activity: Activity,
objects: Array<MappedObject?>
): ArrayAdapter<MappedObject?>(activity, 0, objects) {
) : ArrayAdapter<MappedObject?>(activity, 0, objects) {
var mappedObject: MappedObject? = objects[0]

4
app/src/admin/java/h_mal/appttude/com/ui/HomeSuperUserFragment.kt
View File

@@ -125,7 +125,9 @@ class HomeSuperUserFragment : Fragment() {
}
return s1!!.compareTo((s2)!!)
}
else -> { throw IOException("dfdfs") }
else -> {
throw IOException("dfdfs")
}
// 2 -> return MainActivity.approvalsClass.getOverApprovalStatusCode(o1.wholeDriverObject) -
// MainActivity.approvalsClass.getOverApprovalStatusCode(o2.wholeDriverObject)
// else -> return MainActivity.approvalsClass.getOverApprovalStatusCode(

6
app/src/admin/java/h_mal/appttude/com/ui/MainActivity.kt
View File

@@ -70,7 +70,7 @@ class MainActivity : BaseActivity<MainViewModel>(),
override fun onSuccess(data: Any?) {
super.onSuccess(data)
when(data){
when (data) {
is FirebaseUser -> {
setupDrawer(data)
}
@@ -84,7 +84,7 @@ class MainActivity : BaseActivity<MainViewModel>(),
header.profileImage.setGlideImage(user.photoUrl)
}
private fun setupLogoutInDrawer(){
private fun setupLogoutInDrawer() {
logout.setOnClickListener {
getViewModel().logOut()
}
@@ -93,7 +93,7 @@ class MainActivity : BaseActivity<MainViewModel>(),
override fun onNavigationItemSelected(item: MenuItem): Boolean {
// Handle navigation view item clicks here.
when (item.itemId) {
R.id.nav_user_settings -> { }
R.id.nav_user_settings -> {}
}
drawer_layout.closeDrawer(GravityCompat.START)
return true

5
app/src/admin/res/layout/approval_list_grid_item.xml
View File

@@ -18,7 +18,8 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/cardviewoutline"/>
android:src="@drawable/cardviewoutline" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -75,7 +76,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"/>
android:layout_gravity="center" />
<ImageView
android:id="@+id/archive_icon"

2
app/src/admin/res/layout/fragment_user_main.xml
View File

@@ -12,6 +12,6 @@
android:numColumns="2"
android:rowCount="4"
android:stretchMode="columnWidth"
tools:listitem="@layout/approval_list_grid_item"/>
tools:listitem="@layout/approval_list_grid_item" />
</RelativeLayout>

1
app/src/admin/res/layout/list_item_layout.xml
View File

@@ -21,6 +21,7 @@
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"