Merge pull request #7 from ENTS-H104/daffa/dev

90% complete 🤩✨

Author: daf2a

app/build.gradle.kts

@@ -98,4 +98,13 @@ dependencies {
 
     //paging 3
     implementation("androidx.paging:paging-runtime-ktx:3.3.0")
+
+    // Library PhotoPicker
+    implementation("androidx.activity:activity-compose:1.9.0")
+    implementation("androidx.activity:activity-ktx:1.9.0")
+    // Library Crop Image
+//    implementation("com.github.yalantis:ucrop:2.2.8")
+
+    //skeleton
+    implementation("com.facebook.shimmer:shimmer:0.5.0")
 }

app/src/main/AndroidManifest.xml

@@ -8,6 +8,8 @@
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
 
     <application
         android:allowBackup="true"
@@ -24,6 +26,7 @@
             android:screenOrientation="portrait"
             android:exported="false"
             android:windowSoftInputMode="adjustPan" />
+
         <activity
             android:name=".ui.auth.AuthActivity"
             android:screenOrientation="portrait"

app/src/main/ic_launcher-playstore.png

@@ -10,7 +10,6 @@ data class  UpdateUserRequest(val username: String, val phone_number: String)
 
 data class  UpdatePhotoUserRequest(val imageUrl: String)
 
-
 data class CreateTransactionRequest(
     val user_uid: String,
     val partner_uid: String,

app/src/main/java/com/entsh104/highking/data/model/Request.kt

@@ -23,6 +23,16 @@ data class UserUpdateResponse(
     val phone_number: String?
 )
 
+data class UpdatePhotoResponse(
+    val status: Int,
+    val message: String,
+    val data: PhotoData
+)
+
+data class PhotoData(
+    val image_url: String
+)
+
 data class UserResponse(
     val user_uid: String?,
     val verified_status_uuid: String?,
@@ -193,6 +203,24 @@ data class CreateTransactionResponse(
     val data: TransactionData
 )
 
+data class TransactionDetailResponse(
+    val status: Int,
+    val message: String,
+    val data: List<TransactionDetail>
+)
+
+data class TransactionDetail(
+    val token: String?,
+    val name: String,
+    val phone_number: String,
+    val start_date: String,
+    val start_time: String,
+    val status_accepted: String,
+    val status_payment: String,
+    val meeting_point: String,
+    val name_participant: String
+)
+
 data class TransactionData(
     val transaction_logs_uuid: String,
     val user_uid: String,

app/src/main/java/com/entsh104/highking/data/model/Response.kt

@@ -1,9 +1,7 @@
-import androidx.lifecycle.LiveData
-import androidx.paging.Pager
-import androidx.paging.PagingConfig
-import androidx.paging.PagingData
-import androidx.paging.PagingSource
-import androidx.paging.PagingSourceFactory
+import android.content.ContentResolver
+import android.net.Uri
+import android.provider.OpenableColumns
+import android.util.Log
 import com.entsh104.highking.data.model.BasicResponse
 import com.entsh104.highking.data.model.LoginRequest
 import com.entsh104.highking.data.model.MitraProfileResponse
@@ -16,14 +14,21 @@ import com.entsh104.highking.data.model.ResetPasswordRequest
 import com.entsh104.highking.data.model.SearchOpenTripResponse
 import com.entsh104.highking.data.model.TokenResponse
 import com.entsh104.highking.data.model.TripFilter
+import com.entsh104.highking.data.model.UpdatePhotoResponse
 import com.entsh104.highking.data.model.UpdateUserRequest
-import com.entsh104.highking.data.model.UserApiResponse
 import com.entsh104.highking.data.model.UserResponse
 import com.entsh104.highking.data.model.UserUpdateApiResponse
 import com.entsh104.highking.data.source.local.SharedPreferencesManager
-import com.entsh104.highking.ui.cust.mountain.MountainPagingSource
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
 
 class UserRepository(
     private val apiService: ApiService,
@@ -81,6 +86,51 @@ class UserRepository(
         }
     }
 
+    suspend fun uploadPhoto(
+        contentResolver: ContentResolver,
+        cacheDir: File,
+        imageUri: Uri
+    ): Result<UpdatePhotoResponse> {
+        val token = prefs.getToken() ?: return Result.failure(Exception("Token not found"))
+        Log.d("UploadPhoto", "Token: $token")
+        val parcelFileDescriptor = contentResolver.openFileDescriptor(imageUri, "r", null) ?: return Result.failure(Exception("Failed to open file descriptor"))
+        Log.d("UploadPhoto", "File Descriptor opened successfully")
+        val inputStream = FileInputStream(parcelFileDescriptor.fileDescriptor)
+        val file = File(cacheDir, contentResolver.getFileName(imageUri))
+        val outputStream = FileOutputStream(file)
+        inputStream.copyTo(outputStream)
+
+        val requestFile = file.asRequestBody("image/*".toMediaTypeOrNull())
+        val body = MultipartBody.Part.createFormData("image", file.name, requestFile)
+
+        return try {
+            val response = apiService.updatePhotoUser("Bearer $token", body)
+            Log.d("UploadPhoto", "Response: ${response.message()}")
+            if (response.isSuccessful) {
+                Result.success(response.body()!!)
+            } else {
+                Result.failure(Exception("Failed to upload photo: ${response.message()}"))
+            }
+        } catch (e: Exception) {
+            Log.e("UploadPhoto", "Error: ${e.message}", e)
+            Result.failure(e)
+        }
+
+    }
+
+
+    fun ContentResolver.getFileName(uri: Uri): String {
+        var name = ""
+        val returnCursor = this.query(uri, null, null, null, null)
+        if (returnCursor != null) {
+            val nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+            returnCursor.moveToFirst()
+            name = returnCursor.getString(nameIndex)
+            returnCursor.close()
+        }
+        return name
+    }
+
     suspend fun registerUser(
         email: String,
         username: String,

app/src/main/java/com/entsh104/highking/data/repository/UserRepository.kt

@@ -11,7 +11,9 @@ import com.entsh104.highking.data.model.RegisterRequest
 import com.entsh104.highking.data.model.ResetPasswordRequest
 import com.entsh104.highking.data.model.SearchOpenTripResponse
 import com.entsh104.highking.data.model.TokenResponse
+import com.entsh104.highking.data.model.TransactionDetailResponse
 import com.entsh104.highking.data.model.TransactionHistoryResponse
+import com.entsh104.highking.data.model.UpdatePhotoResponse
 import com.entsh104.highking.data.model.UpdatePhotoUserRequest
 import com.entsh104.highking.data.model.UpdateUserRequest
 import com.entsh104.highking.data.model.UserApiResponse
@@ -46,11 +48,12 @@ interface ApiService {
         @Body request: UpdateUserRequest
     ): Response<UserUpdateApiResponse>
 
+    @Multipart
     @PUT("users/update/photo")
     suspend fun updatePhotoUser(
         @Header("Authorization") token: String,
-        @Part("image_url") imageUrl: MultipartBody.Part
-    ): Response<UserUpdateApiResponse>
+        @Part imageUrl: MultipartBody.Part
+    ): Response<UpdatePhotoResponse>
 
 
     @GET("users/get-current-user")
@@ -95,6 +98,9 @@ interface ApiService {
         @Query("status") status: String
     ): Response<TransactionHistoryResponse>
 
+    @GET("transaction/get-detail_transaction/{id}")
+    suspend fun getTransactionDetail(@Path("id") transactionId: String): Response<TransactionDetailResponse>
+
     @GET("open-trips/partners/{partner_uid}")
     suspend fun getMitraProfile(@Path("partner_uid") partnerUid: String): Response<MitraProfileResponse>
 

…king/data/source/local/MountainEntity.kt …ta/source/local/entity/MountainEntity.ktapp/src/main/java/com/entsh104/highking/data/source/local/MountainEntity.kt renamed to app/src/main/java/com/entsh104/highking/data/source/local/entity/MountainEntity.kt app/src/main/java/com/entsh104/highking/data/source/local/MountainEntity.kt renamed to app/src/main/java/com/entsh104/highking/data/source/local/entity/MountainEntity.kt

@@ -1,5 +1,6 @@
 package com.entsh104.highking.ui.adapters
 
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +17,7 @@ import com.entsh104.highking.ui.util.NavOptionsUtil
 
 class OrdersAdapter(
     private val orders: Map<String, OpenTripDetail>,
-    pendingOrders: List<TransactionHistory>
+    Orders: List<TransactionHistory>
 ) :
     RecyclerView.Adapter<OrdersAdapter.OrderViewHolder>() {
 
@@ -27,7 +28,7 @@ class OrdersAdapter(
     }
 
     override fun onBindViewHolder(holder: OrderViewHolder, position: Int) {
-        holder.bind(orders.values.elementAt(position))
+        holder.bind(orders.keys.elementAt(position), orders.values.elementAt(position))
     }
 
     override fun getItemCount(): Int {
@@ -39,7 +40,7 @@ class OrdersAdapter(
         private val textViewOrderName: TextView = itemView.findViewById(R.id.textViewOrderName)
         private val textViewPrice: TextView = itemView.findViewById(R.id.textViewOrderPrice)
 
-        fun bind(order: OpenTripDetail?) {
+        fun bind(transactionId: String, order: OpenTripDetail?) {
             Glide.with(itemView.context)
                 .load(order?.image_url)
                 .into(imageView)
@@ -49,8 +50,9 @@ class OrdersAdapter(
 
             itemView.setOnClickListener {
                 if (order != null) {
-                    val action = TicketFragmentDirections.actionNavOrdersToOrderDetailsFragment(order)
-                    it.findNavController().navigate(action, NavOptionsUtil.defaultNavOptions)
+                    val action =
+                        TicketFragmentDirections.actionNavOrdersToOrderDetailsFragment(transactionId, order)
+                    it.findNavController().navigate(action)
                 }
             }
         }