fix category display

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-05-08T14:50:55.425322500Z">
+        <DropdownSelection timestamp="2025-08-23T01:49:41.982701700Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Gracia Hotmauli\.android\avd\Pixel_8_2_2.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Gracia Hotmauli\.android\avd\Pixel_9a.avd" />
             </handle>
           </Target>
         </DropdownSelection>

.idea/deviceManager.xml

@@ -5,7 +5,7 @@
       <list>
         <ColumnSorterState>
           <option name="column" value="Name" />
-          <option name="order" value="ASCENDING" />
+          <option name="order" value="DESCENDING" />
         </ColumnSorterState>
       </list>
     </option>

app/build.gradle.kts

@@ -1,4 +1,5 @@
 import java.util.Properties
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
@@ -124,4 +125,11 @@ dependencies {
     implementation(platform("com.google.firebase:firebase-bom:33.13.0"))
     implementation("com.google.firebase:firebase-analytics")
     implementation("com.google.firebase:firebase-messaging-ktx")
+
+    //Splash screen
+    implementation("androidx.core:core-splashscreen:1.0.0")
+
+    //pdf compression
+    implementation("com.tom-roush:pdfbox-android:2.0.27.0")
+
 }

app/src/main/AndroidManifest.xml

@@ -29,6 +29,9 @@
         android:theme="@style/Theme.Ecommerce_serang"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.profile.ChangePasswordActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.auth.ResetPassActivity"
             android:exported="false" />
@@ -170,7 +173,8 @@
         <activity
             android:name=".ui.auth.RegisterActivity"
             android:exported="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.App.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/alya/ecommerce_serang/data/api/dto/ChangePasswordRequest.kt

@@ -0,0 +1,6 @@
+package com.alya.ecommerce_serang.data.api.dto
+
+data class ChangePasswordRequest(
+    val currentPassword: String,
+    val newPassword: String
+)

app/src/main/java/com/alya/ecommerce_serang/data/api/dto/PaymentUpdate.kt

@@ -0,0 +1,21 @@
+package com.alya.ecommerce_serang.data.api.dto
+
+import com.google.gson.annotations.SerializedName
+import java.io.File
+
+data class PaymentUpdate(
+    @field:SerializedName("id")
+    val id: Int? = null,
+
+    @field:SerializedName("bank_name")
+    val bankName: String,
+
+    @field:SerializedName("bank_num")
+    val bankNum: String,
+
+    @field:SerializedName("account_name")
+    val accountName: String,
+
+    @field:SerializedName("qris_image")
+    val qrisImage: File? = null
+)

app/src/main/java/com/alya/ecommerce_serang/data/api/dto/Store.kt

@@ -10,9 +10,6 @@ data class Store(
     @field:SerializedName("store_status")
     val storeStatus: String,
 
-    @field:SerializedName("sppirt")
-    val sppirt: String,
-
     @field:SerializedName("user_name")
     val userName: String,
 
@@ -37,9 +34,6 @@ data class Store(
     @field:SerializedName("user_phone")
     val userPhone: String,
 
-    @field:SerializedName("halal")
-    val halal: String,
-
     @field:SerializedName("id")
     val id: Int,
 

app/src/main/java/com/alya/ecommerce_serang/data/api/response/auth/ChangePassResponse.kt

@@ -0,0 +1,9 @@
+package com.alya.ecommerce_serang.data.api.response.auth
+
+import com.google.gson.annotations.SerializedName
+
+data class ChangePassResponse(
+
+	@field:SerializedName("message")
+	val message: String? = null
+)

app/src/main/java/com/alya/ecommerce_serang/data/api/response/store/StoreResponse.kt

@@ -1,18 +1,13 @@
 package com.alya.ecommerce_serang.data.api.response.store
 
+import com.alya.ecommerce_serang.data.api.dto.Store
+import com.alya.ecommerce_serang.data.api.response.store.profile.Payment
+import com.alya.ecommerce_serang.data.api.response.store.profile.Shipping
 import com.google.gson.annotations.SerializedName
 
 data class StoreResponse(
     val message: String,
-    val store: Store
+    val store: Store,
-)
+    val shipping: List<Shipping> = emptyList(),
-
+    val payment: List<Payment> = emptyList()
-data class Store(
-    @SerializedName("store_id") val storeId: Int,
-    @SerializedName("store_status") val storeStatus: String,
-    @SerializedName("store_name") val storeName: String,
-    @SerializedName("user_name") val userName: String,
-    val email: String,
-    @SerializedName("user_phone") val userPhone: String,
-    val balance: String
 )

app/src/main/java/com/alya/ecommerce_serang/data/api/retrofit/ApiService.kt

@@ -1,10 +1,10 @@
 package com.alya.ecommerce_serang.data.api.retrofit
 
 
-import com.alya.ecommerce_serang.data.api.dto.AddEvidenceRequest
 import com.alya.ecommerce_serang.data.api.dto.AddPaymentInfoResponse
 import com.alya.ecommerce_serang.data.api.dto.CancelOrderReq
 import com.alya.ecommerce_serang.data.api.dto.CartItem
+import com.alya.ecommerce_serang.data.api.dto.ChangePasswordRequest
 import com.alya.ecommerce_serang.data.api.dto.CityResponse
 import com.alya.ecommerce_serang.data.api.dto.CompletedOrderRequest
 import com.alya.ecommerce_serang.data.api.dto.ConfirmPaymentRequest
@@ -16,7 +16,6 @@ import com.alya.ecommerce_serang.data.api.dto.LoginRequest
 import com.alya.ecommerce_serang.data.api.dto.OrderRequest
 import com.alya.ecommerce_serang.data.api.dto.OrderRequestBuy
 import com.alya.ecommerce_serang.data.api.dto.OtpRequest
-import com.alya.ecommerce_serang.data.api.dto.PaymentConfirmRequest
 import com.alya.ecommerce_serang.data.api.dto.ProvinceResponse
 import com.alya.ecommerce_serang.data.api.dto.RegisterRequest
 import com.alya.ecommerce_serang.data.api.dto.ResetPassReq
@@ -27,7 +26,7 @@ import com.alya.ecommerce_serang.data.api.dto.StoreAddressResponse
 import com.alya.ecommerce_serang.data.api.dto.UpdateCart
 import com.alya.ecommerce_serang.data.api.dto.UpdateChatRequest
 import com.alya.ecommerce_serang.data.api.dto.VerifRegisReq
-import com.alya.ecommerce_serang.data.api.response.auth.CheckStoreResponse
+import com.alya.ecommerce_serang.data.api.response.auth.ChangePassResponse
 import com.alya.ecommerce_serang.data.api.response.auth.FcmTokenResponse
 import com.alya.ecommerce_serang.data.api.response.auth.HasStoreResponse
 import com.alya.ecommerce_serang.data.api.response.auth.ListNotifResponse
@@ -81,12 +80,10 @@ import com.alya.ecommerce_serang.data.api.response.store.product.UpdateProductRe
 import com.alya.ecommerce_serang.data.api.response.store.product.ViewStoreProductsResponse
 import com.alya.ecommerce_serang.data.api.response.store.profile.StoreDataResponse
 import com.alya.ecommerce_serang.data.api.response.store.review.ProductReviewResponse
-import com.alya.ecommerce_serang.data.api.response.store.sells.PaymentConfirmationResponse
 import com.alya.ecommerce_serang.data.api.response.store.topup.BalanceTopUpResponse
 import com.alya.ecommerce_serang.data.api.response.store.topup.TopUpResponse
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
-import retrofit2.Call
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -97,7 +94,6 @@ import retrofit2.http.PUT
 import retrofit2.http.Part
 import retrofit2.http.PartMap
 import retrofit2.http.Path
-import retrofit2.http.Query
 
 interface ApiService {
     @POST("registeruser")
@@ -110,9 +106,6 @@ interface ApiService {
         @Body verifRegisReq: VerifRegisReq
     ):VerifRegisterResponse
 
-    @GET("checkstore")
-    suspend fun checkStore (): Response<CheckStoreResponse>
-
     @Multipart
     @POST("registerstore")
     suspend fun registerStore(
@@ -202,11 +195,6 @@ interface ApiService {
         @Path("id") orderId: Int
     ): Response<OrderDetailResponse>
 
-    @POST("order/addevidence")
-    suspend fun addEvidence(
-        @Body request : AddEvidenceRequest,
-    ): Response<AddEvidenceResponse>
-
     @Multipart
     @POST("order/addevidence")
     suspend fun addEvidenceMultipart(
@@ -254,15 +242,9 @@ interface ApiService {
     @GET("mystore")
     suspend fun getMyStoreData(): Response<com.alya.ecommerce_serang.data.api.response.store.StoreResponse>
 
-    @GET("mystore")
-    suspend fun getStoreAddress(): Response<StoreAddressResponse>
-
     @GET("mystore/product") // Replace with actual endpoint
     suspend fun getStoreProduct(): Response<ViewStoreProductsResponse>
 
-    @GET("category")
-    fun getCategories(): Call<CategoryResponse>
-
     @Multipart
     @POST("store/createproduct")
     suspend fun addProduct(
@@ -372,9 +354,6 @@ interface ApiService {
     @GET("store/topup")
     suspend fun getTopUpHistory(): Response<TopUpResponse>
 
-    @GET("store/topup")
-    suspend fun getFilteredTopUpHistory(@Query("date") date: String): Response<TopUpResponse>
-
     @Multipart
     @POST("store/createtopup")
     suspend fun addBalanceTopUp(
@@ -386,11 +365,6 @@ interface ApiService {
         @Part("bank_num") bankNum: RequestBody
     ): Response<BalanceTopUpResponse>
 
-    @PUT("store/payment/update")
-    suspend fun paymentConfirmation(
-        @Body confirmPaymentReq : PaymentConfirmRequest
-    ): Response<PaymentConfirmationResponse>
-
     @Multipart
     @PUT("mystore/edit")
     suspend fun updateStoreProfileMultipart(
@@ -402,13 +376,26 @@ interface ApiService {
     ): Response<StoreDataResponse>
 
     @Multipart
-    @POST("mystore/payment/add")
+    @PUT("mystore/edit")
-    suspend fun addPaymentInfo(
+    suspend fun updateStoreApprovalMultipart(
-        @Part("bank_name") bankName: RequestBody,
+        @Part("store_name") storeName: RequestBody,
-        @Part("bank_num") bankNum: RequestBody,
+        @Part("store_description") storeDescription: RequestBody,
-        @Part("account_name") accountName: RequestBody,
+        @Part("store_type_id") storeTypeId: RequestBody,
-        @Part qris: MultipartBody.Part?
+        @Part("latitude") storeLatitude: RequestBody,
-    ): Response<GenericResponse>
+        @Part("longitude") storeLongitude: RequestBody,
+        @Part("province_id") storeProvince: RequestBody,
+        @Part("city_id") storeCity: RequestBody,
+        @Part("subdistrict") storeSubdistrict: RequestBody,
+        @Part("village_id") storeVillage: RequestBody,
+        @Part("street") storeStreet: RequestBody,
+        @Part("postal_code") storePostalCode: RequestBody,
+        @Part("detail") storeAddressDetail: RequestBody,
+        @Part("user_phone") storeUserPhone: RequestBody,
+        @Part storeimg: MultipartBody.Part?,
+        @Part ktp: MultipartBody.Part?,
+        @Part npwp: MultipartBody.Part?,
+        @Part nib: MultipartBody.Part?
+    ): Response<StoreDataResponse>
 
     @Multipart
     @POST("mystore/payment/add")
@@ -419,6 +406,16 @@ interface ApiService {
         @Part qris: MultipartBody.Part?
     ): Response<AddPaymentInfoResponse>
 
+    @Multipart
+    @PUT("mystore/payment/edit")
+    suspend fun updatePaymentInfo(
+        @Part("payment_info_id") paymentInfoId: RequestBody,
+        @Part("account_name") accountName: RequestBody,
+        @Part("bank_name") bankName: RequestBody,
+        @Part("bank_num") bankNum: RequestBody,
+        @Part qris: MultipartBody.Part? = null
+    ): Response<GenericResponse>
+
     @DELETE("mystore/payment/delete/{id}")
     suspend fun deletePaymentInfo(
         @Path("id") paymentMethodId: Int
@@ -462,15 +459,6 @@ interface ApiService {
     @GET("search")
     suspend fun getSearchHistory(): Response<SearchHistoryResponse>
 
-    @Multipart
-    @POST("sendchat")
-    suspend fun sendChatLine(
-        @Part("store_id") storeId: RequestBody,
-        @Part("message") message: RequestBody,
-        @Part("product_id") productId: RequestBody?,
-        @Part chatimg: MultipartBody.Part?
-    ): Response<SendChatResponse>
-
     @Multipart
     @POST("store/sendchat")
     suspend fun sendChatMessageStore(
@@ -530,6 +518,11 @@ interface ApiService {
         @Body request: ResetPassReq
     ): Response<ResetPassResponse>
 
+    @POST("changepass")
+    suspend fun changePassword(
+        @Body request: ChangePasswordRequest
+    ): Response<ChangePassResponse>
+
     @GET("profile/address/detail/{id}")
     suspend fun getDetailAddress(
         @Path("id") addressId: Int

app/src/main/java/com/alya/ecommerce_serang/data/repository/MyStoreRepository.kt

@@ -1,27 +1,33 @@
 package com.alya.ecommerce_serang.data.repository
 
 import android.util.Log
+import com.alya.ecommerce_serang.data.api.dto.PaymentUpdate
 import com.alya.ecommerce_serang.data.api.dto.ProductsItem
+import com.alya.ecommerce_serang.data.api.dto.ShippingServiceRequest
 import com.alya.ecommerce_serang.data.api.dto.Store
 import com.alya.ecommerce_serang.data.api.response.auth.ListStoreTypeResponse
-import com.alya.ecommerce_serang.data.api.response.customer.product.StoreResponse
+import com.alya.ecommerce_serang.data.api.response.store.StoreResponse
 import com.alya.ecommerce_serang.data.api.response.store.profile.StoreDataResponse
 import com.alya.ecommerce_serang.data.api.response.store.sells.OrderListResponse
 import com.alya.ecommerce_serang.data.api.retrofit.ApiService
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import retrofit2.HttpException
 import retrofit2.Response
+import java.io.File
 import java.io.IOException
 
 class MyStoreRepository(private val apiService: ApiService) {
-    suspend fun fetchMyStoreProfile(): Result<Store?> {
+    suspend fun fetchMyStoreProfile(): Result<StoreResponse?> {
         return try {
-            val response = apiService.getStore()
+            val response = apiService.getMyStoreData()
 
             if (response.isSuccessful) {
-                val storeResponse: StoreResponse? = response.body()
+                val storeResponse = response.body()
-                Result.Success(storeResponse?.store)
+                Result.Success(storeResponse)
             } else {
                 val errorMessage = response.errorBody()?.string() ?: "Unknown API error"
                 Log.e("MyStoreRepository", "Error: $errorMessage")
@@ -139,6 +145,186 @@ class MyStoreRepository(private val apiService: ApiService) {
         }
     }
 
+    suspend fun updateStoreApproval(
+        storeName: RequestBody,
+        description: RequestBody,
+        storeType: RequestBody,
+        latitude: RequestBody,
+        longitude: RequestBody,
+        storeProvince: RequestBody,
+        storeCity: RequestBody,
+        storeSubdistrict: RequestBody,
+        storeVillage: RequestBody,
+        storeStreet: RequestBody,
+        storePostalCode: RequestBody,
+        storeAddressDetail: RequestBody,
+        userPhone: RequestBody,
+        paymentsToUpdate: List<PaymentUpdate> = emptyList(),
+        paymentIdToDelete: List<Int> = emptyList(),
+        storeCourier: List<String>? = null,
+        storeImage: MultipartBody.Part?,
+        ktpImage: MultipartBody.Part?,
+        npwpDocument: MultipartBody.Part?,
+        nibDocument: MultipartBody.Part?
+    ): Response<StoreDataResponse>? {
+        return try {
+            Log.d(TAG, "Updating store profile & address for approval...")
+
+            val profileResp = apiService.updateStoreApprovalMultipart(
+                storeName = storeName,
+                storeDescription = description,
+                storeTypeId = storeType,
+                storeLatitude = latitude,
+                storeLongitude = longitude,
+                storeProvince = storeProvince,
+                storeCity = storeCity,
+                storeSubdistrict = storeSubdistrict,
+                storeVillage = storeVillage,
+                storeStreet = storeStreet,
+                storePostalCode = storePostalCode,
+                storeAddressDetail = storeAddressDetail,
+                storeUserPhone = userPhone,
+                storeimg = storeImage,
+                ktp = ktpImage,
+                npwp = npwpDocument,
+                nib = nibDocument
+            )
+
+            if (!profileResp.isSuccessful) {
+                Log.e(TAG, "Profile update failed: ${profileResp.code()} ${profileResp.errorBody()?.string()}")
+                return profileResp // short-circuit; let caller inspect the failure
+            }
+
+            // 2) Payments: delete, then upsert (safer if you’re changing accounts)
+            if (paymentIdToDelete.isNotEmpty() || paymentsToUpdate.isNotEmpty()) {
+                Log.d(TAG, "Synchronizing payments: delete=${paymentIdToDelete.size}, upsert=${paymentsToUpdate.size}")
+            }
+
+            // 2a) Delete payments
+            paymentIdToDelete.forEach { id ->
+                runCatching {
+                    apiService.deletePaymentInfo(id)
+                }.onSuccess {
+                    if (!it.isSuccessful) {
+                        Log.e(TAG, "Delete payment $id failed: ${it.code()} ${it.errorBody()?.string()}")
+                    } else {
+                        Log.d(TAG, "Deleted payment $id")
+                    }
+                }.onFailure { e ->
+                    Log.e(TAG, "Delete payment $id exception", e)
+                }
+            }
+
+            // 2b) Upsert payments (add if id==null, else update)
+            paymentsToUpdate.forEach { item ->
+                runCatching {
+                    // --- CHANGE HERE if your PaymentUpdate field names differ ---
+                    val id = item.id            // Int?  (null => add)
+                    val bankName = item.bankName // String
+                    val bankNum = item.bankNum   // String
+                    val accountName = item.accountName // String
+                    val qrisImage = item.qrisImage // File? (Optional)
+                    // -----------------------------------------------------------
+
+                    if (id == null) {
+                        // ADD
+                        val resp = apiService.addPaymentInfoDirect(
+                            bankName = bankName.toPlain(),
+                            bankNum = bankNum.toPlain(),
+                            accountName = accountName.toPlain(),
+                            qris = createQrisPartOrNull(qrisImage)
+                        )
+                        if (!resp.isSuccessful) {
+                            Log.e(TAG, "Add payment failed: ${resp.code()} ${resp.errorBody()?.string()}")
+                        } else {
+                            Log.d(TAG, "Added payment: $bankName/$bankNum")
+                        }
+                    } else {
+                        // UPDATE
+                        val resp = apiService.updatePaymentInfo(
+                            paymentInfoId = id.toString().toPlain(),
+                            accountName = accountName.toPlain(),
+                            bankName = bankName.toPlain(),
+                            bankNum = bankNum.toPlain(),
+                            qris = createQrisPartOrNull(qrisImage)
+                        )
+                        if (!resp.isSuccessful) {
+                            Log.e(TAG, "Update payment $id failed: ${resp.code()} ${resp.errorBody()?.string()}")
+                        } else {
+                            Log.d(TAG, "Updated payment $id: $bankName/$bankNum")
+                        }
+                    }
+                }.onFailure { e ->
+                    Log.e(TAG, "Upsert payment exception", e)
+                }
+            }
+
+            // 3) Shipping: sync to desiredCouriers (if provided)
+            storeCourier?.let { desired ->
+                try {
+                    val current = apiService.getStoreData().let { resp ->
+                        if (resp.isSuccessful) {
+                            resp.body()?.shipping?.mapNotNull { it.courier } ?: emptyList()
+                        } else {
+                            Log.e(TAG, "Failed to read current shipping: ${resp.code()} ${resp.errorBody()?.string()}")
+                            emptyList()
+                        }
+                    }
+
+                    val desiredSet = desired.toSet()
+                    val currentSet = current.toSet()
+
+                    val toAdd = (desiredSet - currentSet).toList()
+                    val toDel = (currentSet - desiredSet).toList()
+
+                    if (toAdd.isNotEmpty()) {
+                        val addResp = apiService.addShippingService(ShippingServiceRequest(couriers = toAdd))
+                        if (!addResp.isSuccessful) {
+                            Log.e(TAG, "Add couriers failed: ${addResp.code()} ${addResp.errorBody()?.string()}")
+                        } else {
+                            Log.d(TAG, "Added couriers: $toAdd")
+                        }
+                    }
+
+                    if (toDel.isNotEmpty()) {
+                        val delResp = apiService.deleteShippingService(ShippingServiceRequest(couriers = toDel))
+                        if (!delResp.isSuccessful) {
+                            Log.e(TAG, "Delete couriers failed: ${delResp.code()} ${delResp.errorBody()?.string()}")
+                        } else {
+                            Log.d(TAG, "Deleted couriers: $toDel")
+                        }
+                    }
+                } catch (e: Exception) {
+                    Log.e(TAG, "Sync shipping exception", e)
+                }
+            }
+
+            // Return the profile response (already successful here)
+            profileResp
+        } catch (e: Exception) {
+            Log.e(TAG, "Error updating store approval flow", e)
+            null
+        }
+    }
+
+    private fun String.toPlain(): RequestBody =
+        this.toRequestBody("text/plain".toMediaTypeOrNull())
+
+    private fun createQrisPartOrNull(file: File?): MultipartBody.Part? =
+        file?.let {
+            val mime = when (it.extension.lowercase()) {
+                "jpg", "jpeg" -> "image/jpeg"
+                "png" -> "image/png"
+                else -> "application/octet-stream"
+            }.toMediaTypeOrNull()
+
+            MultipartBody.Part.createFormData(
+                "qris",
+                it.name,
+                it.asRequestBody(mime)
+            )
+        }
+
     companion object {
         private var TAG = "MyStoreRepository"
     }

app/src/main/java/com/alya/ecommerce_serang/data/repository/ProductRepository.kt

@@ -194,7 +194,7 @@ class ProductRepository(private val apiService: ApiService) {
             if (response.isSuccessful) {
                 Result.Success(response.body()!!)
             } else {
-                Result.Error(Exception("Failed to create product: ${response.code()}"))
+                Result.Error(Exception("Failed to create product: ${response.code()} message:${response.message()}"))
             }
         } catch (e: Exception) {
             Result.Error(e)

app/src/main/java/com/alya/ecommerce_serang/data/repository/UserRepository.kt

@@ -3,6 +3,7 @@ package com.alya.ecommerce_serang.data.repository
 import android.content.Context
 import android.net.Uri
 import android.util.Log
+import com.alya.ecommerce_serang.data.api.dto.ChangePasswordRequest
 import com.alya.ecommerce_serang.data.api.dto.FcmReq
 import com.alya.ecommerce_serang.data.api.dto.LoginRequest
 import com.alya.ecommerce_serang.data.api.dto.OtpRequest
@@ -10,6 +11,7 @@ import com.alya.ecommerce_serang.data.api.dto.RegisterRequest
 import com.alya.ecommerce_serang.data.api.dto.ResetPassReq
 import com.alya.ecommerce_serang.data.api.dto.UserProfile
 import com.alya.ecommerce_serang.data.api.dto.VerifRegisReq
+import com.alya.ecommerce_serang.data.api.response.auth.ChangePassResponse
 import com.alya.ecommerce_serang.data.api.response.auth.FcmTokenResponse
 import com.alya.ecommerce_serang.data.api.response.auth.HasStoreResponse
 import com.alya.ecommerce_serang.data.api.response.auth.ListStoreTypeResponse
@@ -516,6 +518,29 @@ class UserRepository(private val apiService: ApiService) {
             Result.Error(e)
         }
     }
+
+    suspend fun changePassword(currentPassword: String, newPassword: String): Result<ChangePassResponse> {
+        return try {
+            val request = ChangePasswordRequest(currentPassword, newPassword)
+            val response = apiService.changePassword(request)  // Make the API call
+
+            if (response.isSuccessful) {
+                val changePassResponse = response.body()
+                if (changePassResponse != null) {
+                    Result.Success(changePassResponse)  // Return success with the response message
+                } else {
+                    Result.Error(Exception("Empty response from server"))
+                }
+            } else {
+                val errorBody = response.errorBody()?.string() ?: "Unknown error"
+                Log.e(TAG, "Error changing password: $errorBody")
+                Result.Error(Exception(errorBody))
+            }
+        } catch (e: Exception) {
+            Result.Error(e)
+        }
+    }
+
     companion object{
         private const val TAG = "UserRepository"
     }

app/src/main/java/com/alya/ecommerce_serang/ui/auth/LoginActivity.kt

@@ -5,10 +5,9 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.WindowCompat
+import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.dto.FcmReq
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
 import com.alya.ecommerce_serang.data.repository.Result
@@ -16,6 +15,7 @@ import com.alya.ecommerce_serang.data.repository.UserRepository
 import com.alya.ecommerce_serang.databinding.ActivityLoginBinding
 import com.alya.ecommerce_serang.ui.MainActivity
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.SessionManager
 import com.alya.ecommerce_serang.utils.viewmodel.LoginViewModel
 import com.google.firebase.FirebaseApp
@@ -39,31 +39,14 @@ class LoginActivity : AppCompatActivity() {
 
         binding = ActivityLoginBinding.inflate(layoutInflater)
         setContentView(binding.root)
-
+//
-        WindowCompat.setDecorFitsSystemWindows(window, false)
+//        WindowCompat.setDecorFitsSystemWindows(window, false)
-        enableEdgeToEdge()
+//        enableEdgeToEdge()
-
-//        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, windowInsets ->
-//            val systemBars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-//            view.setPadding(
-//                systemBars.left,
-//                systemBars.top,
-//                systemBars.right,
-//                systemBars.bottom
-//            )
-//            windowInsets
-//        }
-
-//        onBackPressedDispatcher.addCallback(this) {
-//            // Handle the back button event
-//        }
 
         setupListeners()
         observeLoginState()
 
         FirebaseApp.initializeApp(this)
-
-        // Request FCM token at app startup
     }
 
     private fun setupListeners() {
@@ -72,7 +55,7 @@ class LoginActivity : AppCompatActivity() {
             val password = binding.etLoginPassword.text.toString()
 
             if (email.isEmpty() || password.isEmpty()) {
-                Toast.makeText(this, "Please fill in all fields", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Mohon masukkan email atau password dengan benar", Toast.LENGTH_SHORT).show()
             } else {
                 loginViewModel.login(email, password)
             }
@@ -100,14 +83,24 @@ class LoginActivity : AppCompatActivity() {
                     retrieveFCMToken()
 //                    sessionManager.saveUserId(response.userId)
 
-                    Toast.makeText(this, "Login Successful", Toast.LENGTH_SHORT).show()
+                    PopUpDialog.showConfirmDialog(
+                        context = this,
+                        iconRes = R.drawable.checkmark__1_,
+                        title = "Berhasil Masuk"
+                    )
+                    Toast.makeText(this, "Berhasil masuk", Toast.LENGTH_SHORT).show()
 
                     startActivity(Intent(this, MainActivity::class.java))
                     finish()
                 }
                 is com.alya.ecommerce_serang.data.repository.Result.Error -> {
                     Log.e("LoginActivity", "Login Failed: ${result.exception.message}")
-                    Toast.makeText(this, "Login Failed: ${result.exception.message}", Toast.LENGTH_LONG).show()
+                    PopUpDialog.showConfirmDialog(
+                        context = this,
+                        iconRes = R.drawable.ic_cancel,
+                        title = "Gagal Masuk"
+                    )
+                    Toast.makeText(this, "Gagal masuk", Toast.LENGTH_LONG).show()
                 }
                 is Result.Loading -> {
                     // Show loading state

app/src/main/java/com/alya/ecommerce_serang/ui/auth/OtpBottomsheetDialog.kt

@@ -29,7 +29,7 @@ class OtpBottomSheetDialog(
                 onRegister(updatedUserData) // Send full data to ViewModel
                 dismiss() // Close dialog
             } else {
-                Toast.makeText(requireContext(), "Please enter OTP", Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), "Silahkan masukkan kode OTP", Toast.LENGTH_SHORT).show()
             }
         }
         return view

app/src/main/java/com/alya/ecommerce_serang/ui/auth/RegisterActivity.kt

@@ -6,6 +6,7 @@ import android.util.Log
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -39,6 +40,8 @@ class RegisterActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Thread.sleep(3000)
+        installSplashScreen()
         binding = ActivityRegisterBinding.inflate(layoutInflater)
         setContentView(binding.root)
         sessionManager = SessionManager(this)
@@ -86,20 +89,72 @@ class RegisterActivity : AppCompatActivity() {
         }
     }
 
-    // navigate step register in fragment
+    // In RegisterActivity, add debug to navigateToStep:
+
     fun navigateToStep(step: Int, userData: RegisterRequest?) {
-        val fragment = when (step) {
+        Log.d("RegisterActivity", "=== NAVIGATE TO STEP START ===")
-            1 -> RegisterStep1Fragment.newInstance()
+        Log.d("RegisterActivity", "Target step: $step")
-            2 -> RegisterStep2Fragment.newInstance(userData)
+        Log.d("RegisterActivity", "Current fragment count: ${supportFragmentManager.fragments.size}")
-            3 -> RegisterStep3Fragment.newInstance()
+        Log.d("RegisterActivity", "UserData: ${userData?.email}")
-            else -> null
+
+        Log.d("RegisterActivity", "Navigation called from:")
+        Thread.currentThread().stackTrace.take(10).forEach { element ->
+            Log.d("RegisterActivity", "  at ${element.className}.${element.methodName}(${element.fileName}:${element.lineNumber})")
         }
 
-        fragment?.let {
+
-            supportFragmentManager.beginTransaction()
+        try {
-                .replace(R.id.fragment_container, it)
+            val fragment = when (step) {
-                .addToBackStack(null)
+                1 -> {
-                .commit()
+                    Log.d("RegisterActivity", "Creating RegisterStep1Fragment")
+                    RegisterStep1Fragment.newInstance()
+                }
+                2 -> {
+                    Log.d("RegisterActivity", "Creating RegisterStep2Fragment")
+                    RegisterStep2Fragment.newInstance(userData)
+                }
+                3 -> {
+                    Log.d("RegisterActivity", "Creating RegisterStep3Fragment")
+                    RegisterStep3Fragment.newInstance()
+                }
+                else -> {
+                    Log.e("RegisterActivity", "Invalid step: $step")
+                    return
+                }
+            }
+
+            Log.d("RegisterActivity", "Fragment created, starting transaction")
+
+            val transaction = supportFragmentManager.beginTransaction()
+            transaction.replace(R.id.fragment_container, fragment)
+
+            Log.d("RegisterActivity", "About to commit transaction")
+            transaction.commit()
+
+            Log.d("RegisterActivity", "Transaction committed")
+
+            // Update ViewModel step
+            registerViewModel.setStep(step)
+            Log.d("RegisterActivity", "ViewModel step updated to: $step")
+
+        } catch (e: Exception) {
+            Log.e("RegisterActivity", "Exception in navigateToStep: ${e.message}", e)
+            e.printStackTrace()
+        }
+
+        Log.d("RegisterActivity", "=== NAVIGATE TO STEP END ===")
+    }
+
+    // Handle Android back button - close activity or go to step 1
+    override fun onBackPressed() {
+        val currentStep = registerViewModel.currentStep.value ?: 1
+
+        if (currentStep == 1) {
+            // On step 1, exit the activity
+            super.onBackPressed()
+        } else {
+            // On other steps, go back to step 1
+            navigateToStep(1, null)
         }
     }
 }

app/src/main/java/com/alya/ecommerce_serang/ui/auth/ResetPassActivity.kt

@@ -5,13 +5,14 @@ import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.activity.viewModels
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
 import com.alya.ecommerce_serang.data.repository.Result
 import com.alya.ecommerce_serang.data.repository.UserRepository
 import com.alya.ecommerce_serang.databinding.ActivityResetPassBinding
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.viewmodel.LoginViewModel
 
 class ResetPassActivity : AppCompatActivity() {
@@ -36,7 +37,7 @@ class ResetPassActivity : AppCompatActivity() {
 
         setupToolbar()
         setupUI()
-
+        observeResetPassword()
     }
 
     private fun setupToolbar(){
@@ -98,26 +99,23 @@ class ResetPassActivity : AppCompatActivity() {
     private fun handleSuccess(message: String) {
         Toast.makeText(this, message, Toast.LENGTH_LONG).show()
 
-        // Show success dialog and navigate back to login
+        PopUpDialog.showConfirmDialog(
-        AlertDialog.Builder(this)
+            context = this,
-            .setTitle("Berhasil Ubah Password")
+            iconRes = R.drawable.checkmark__1_,
-            .setMessage(message)
+            title = "Berhasil Ubah Password",
-            .setPositiveButton("OK") { _, _ ->
+            positiveText = "OK"
-                // Navigate back to login activity
+        )
-                finish()
-            }
-            .setCancelable(false)
-            .show()
     }
 
     private fun handleError(errorMessage: String) {
-        Toast.makeText(this, "Error: $errorMessage", Toast.LENGTH_LONG).show()
+        Log.e(TAG, "Error: $errorMessage")
 
-        // Optionally show error dialog
+        PopUpDialog.showConfirmDialog(
-        AlertDialog.Builder(this)
+            context = this,
-            .setTitle("Gagal Ubah Password")
+            iconRes = R.drawable.ic_cancel,
-            .setMessage(errorMessage)
+            title = "Gagal Ubah Password",
-            .setPositiveButton("OK", null)
+            message = errorMessage,
-            .show()
+            positiveText = "OK"
+        )
     }
 }

app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep1Fragment.kt

@@ -155,19 +155,20 @@ class RegisterStep1Fragment : Fragment() {
                         "email" -> {
                             isEmailValid = isValid
                             if (!isValid) {
-                                Toast.makeText(requireContext(), "Email is already registered", Toast.LENGTH_SHORT).show()
+                                Toast.makeText(requireContext(), "Email sudah digunakan. Gunakan email lainnya.", Toast.LENGTH_SHORT).show()
                             }
                         }
                         "phone" -> {
                             isPhoneValid = isValid
                             if (!isValid) {
-                                Toast.makeText(requireContext(), "Phone number is already registered", Toast.LENGTH_SHORT).show()
+                                Toast.makeText(requireContext(), "Nomor handphone sudah digunakan. Gunakan nomor lainnya. ", Toast.LENGTH_SHORT).show()
                             }
                         }
                     }
                 }
                 is com.alya.ecommerce_serang.data.repository.Result.Error -> {
-                    Toast.makeText(requireContext(), "Validation failed: ${result.exception.message}", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(requireContext(), "Gagal melakukan validasi", Toast.LENGTH_SHORT).show()
+                    Log.e(TAG, "Validation failed: ${result.exception.message}")
                 }
             }
         }
@@ -200,7 +201,8 @@ class RegisterStep1Fragment : Fragment() {
                 is Result.Error -> {
                     binding.progressBar.visibility = View.GONE
                     binding.btnNext.isEnabled = true
-                    Toast.makeText(requireContext(), "OTP Request Failed: ${result.exception.message}", Toast.LENGTH_SHORT).show()
+                    Log.e(TAG, "OTP Request Failed: ${result.exception.message}")
+                    Toast.makeText(requireContext(), "Gagal mendapatkan OTP. Kirim ulang OTP", Toast.LENGTH_SHORT).show()
                 }
             }
         }
@@ -229,13 +231,13 @@ class RegisterStep1Fragment : Fragment() {
         // Check if all fields are filled
         if (email.isEmpty() || password.isEmpty() || confirmPassword.isEmpty() || phone.isEmpty() ||
             username.isEmpty() || fullName.isEmpty() || birthDate.isEmpty()) {
-            Toast.makeText(requireContext(), "Please fill all required fields", Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Silahkan lengkapi seluruh isian", Toast.LENGTH_SHORT).show()
             return
         }
 
         // Check if passwords match
         if (password != confirmPassword) {
-            Toast.makeText(requireContext(), "Passwords do not match", Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Konfirmasi kata sandi tidak sesua. Periksa kembali", Toast.LENGTH_SHORT).show()
             return
         }
 
@@ -253,7 +255,7 @@ class RegisterStep1Fragment : Fragment() {
         if (isEmailValid && isPhoneValid) {
             requestOtp(email)
         } else {
-            Toast.makeText(requireContext(), "Please fix validation errors before proceeding", Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Silahkan perbaiki data yang dimasukkan", Toast.LENGTH_SHORT).show()
         }
     }
 

app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep2Fragment.kt

@@ -1,5 +1,7 @@
 package com.alya.ecommerce_serang.ui.auth.fragments
 
+import android.content.Context
+import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -13,6 +15,7 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.alya.ecommerce_serang.R
+import com.alya.ecommerce_serang.data.api.dto.FcmReq
 import com.alya.ecommerce_serang.data.api.dto.RegisterRequest
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
 import com.alya.ecommerce_serang.data.repository.OrderRepository
@@ -24,11 +27,15 @@ import com.alya.ecommerce_serang.utils.BaseViewModelFactory
 import com.alya.ecommerce_serang.utils.SessionManager
 import com.alya.ecommerce_serang.utils.viewmodel.RegisterViewModel
 import com.google.android.material.progressindicator.LinearProgressIndicator
+import com.google.firebase.messaging.FirebaseMessaging
 
 class RegisterStep2Fragment : Fragment() {
     private var _binding: FragmentRegisterStep2Binding? = null
     private val binding get() = _binding!!
     private lateinit var sessionManager: SessionManager
+    private var countDownTimer: CountDownTimer? = null
+    private var timeRemaining = 30
+    private var isTimerRunning = false
 
     // In RegisterStep2Fragment AND RegisterStep3Fragment:
     private val registerViewModel: RegisterViewModel by activityViewModels {
@@ -39,8 +46,8 @@ class RegisterStep2Fragment : Fragment() {
             RegisterViewModel(userRepository, orderRepository, requireContext())
         }
     }
-    private var countDownTimer: CountDownTimer? = null
+//    private var countDownTimer: CountDownTimer? = null
-    private var timeRemaining = 30 // 30 seconds cooldown for resend
+//    private var timeRemaining = 30 // 30 seconds cooldown for resend
 
     companion object {
 
@@ -112,6 +119,20 @@ class RegisterStep2Fragment : Fragment() {
         observeRegistrationState()
         observeLoginState()
         Log.d(TAG, "Registration and login state observers set up")
+        binding.btnBack.setOnClickListener {
+            Log.d(TAG, "Back button clicked - cleaning up timer and going to step 1")
+
+            // Stop the timer before navigating
+            stopTimer()
+            // Small delay to ensure timer is properly canceled
+            binding.root.postDelayed({
+//                (activity as? RegisterActivity)?.navigateToStep(1, null)
+                val intent = Intent(requireContext(), RegisterActivity::class.java)
+                startActivity(intent)
+                requireActivity().finish()
+
+            }, 100)
+        }
     }
 
     private fun verifyOtp(userData: RegisterRequest?) {
@@ -129,11 +150,6 @@ class RegisterStep2Fragment : Fragment() {
             Log.d(TAG, "Updating user data with OTP: $otp")
             registerViewModel.updateUserData(updatedUserData)
 
-            // For demo purposes, we're just proceeding to Step 3
-            // In a real app, you would verify the OTP with the server first
-//            registerViewModel.setStep(3)
-//            (activity as? RegisterActivity)?.navigateToStep(3, updatedUserData)
-
             registerViewModel.registerUser(updatedUserData)
         }  ?: Log.e(TAG, "userData is null, cannot proceed with verification")
     }
@@ -170,37 +186,9 @@ class RegisterStep2Fragment : Fragment() {
         } ?: Log.e(TAG, "Cannot resend OTP: email is null")
     }
 
-    private fun startResendCooldown() {
-        Log.d(TAG, "startResendCooldown called")
-        timeRemaining = 30
-        binding.tvResendOtp.isEnabled = false
-        binding.tvResendOtp.setTextColor(ContextCompat.getColor(requireContext(), R.color.soft_gray))
-
-        countDownTimer?.cancel()
-        countDownTimer = object : CountDownTimer(30000, 1000) {
-            override fun onTick(millisUntilFinished: Long) {
-                timeRemaining = (millisUntilFinished / 1000).toInt()
-                binding.tvTimer.text = "Kirim ulang OTP dalam waktu 00:${String.format("%02d", timeRemaining)}"
-                if (timeRemaining % 5 == 0) {
-                    Log.d(TAG, "Cooldown remaining: $timeRemaining seconds")
-                }
-            }
-
-            override fun onFinish() {
-                Log.d(TAG, "Cooldown finished, enabling resend button")
-                binding.tvTimer.text = "Dapat mengirim ulang kode OTP"
-                binding.tvResendOtp.isEnabled = true
-                binding.tvResendOtp.setTextColor(ContextCompat.getColor(requireContext(), R.color.blue1))
-                timeRemaining = 0
-            }
-        }.start()
-    }
-
     private fun observeRegistrationState() {
         registerViewModel.message.observe(viewLifecycleOwner) { message ->
             Log.d(TAG, "Message from server: $message")
-            // You can use the message here if needed, e.g., for showing in a specific UI element
-            // or for storing for later use
         }
         registerViewModel.registerState.observe(viewLifecycleOwner) { result ->
             when (result) {
@@ -250,6 +238,8 @@ class RegisterStep2Fragment : Fragment() {
                     // Save the token in fragment
                     val accessToken = result.data.accessToken
                     sessionManager.saveToken(accessToken)
+                    retrieveFCMToken()
+
                     Log.d(TAG, "Token saved to SessionManager: $accessToken")
 
                     // Proceed to Step 3
@@ -279,9 +269,116 @@ class RegisterStep2Fragment : Fragment() {
         }
     }
 
-    override fun onDestroyView() {
+    private fun retrieveFCMToken() {
-        super.onDestroyView()
+        FirebaseMessaging.getInstance().token
+            .addOnCompleteListener { task ->
+                if (!task.isSuccessful) {
+                    Log.e(TAG, "Failed to get FCM token", task.exception)
+                    return@addOnCompleteListener
+                }
+
+                val token = task.result
+//                tokenTes = token
+                Log.d(TAG, "FCM token retrieved: $token")
+
+                // Save token locally
+                val sharedPreferences = requireContext().getSharedPreferences("FCM_PREFS", Context.MODE_PRIVATE)
+                sharedPreferences.edit().putString("FCM_TOKEN", token).apply()
+
+                // Send to your server
+                sendTokenToServer(token)
+            }
+    }
+
+    private fun sendTokenToServer(token: String) {
+        Log.d(TAG, "Would send token to server: $token")
+        val tokenFcm=FcmReq(
+            fcmToken = token
+        )
+        registerViewModel.sendFcm(tokenFcm)
+        Log.d(TAG, "Sent token fcm: $token")
+
+    }
+
+    private fun startResendCooldown() {
+        Log.d(TAG, "startResendCooldown called")
+
+        // Cancel any existing timer first
+        stopTimer()
+
+        timeRemaining = 30
+        isTimerRunning = true
+        binding.tvResendOtp.isEnabled = false
+        binding.tvResendOtp.setTextColor(ContextCompat.getColor(requireContext(), R.color.soft_gray))
+
+        countDownTimer = object : CountDownTimer(30000, 1000) {
+            override fun onTick(millisUntilFinished: Long) {
+                if (!isTimerRunning) {
+                    cancel()
+                    return
+                }
+
+                timeRemaining = (millisUntilFinished / 1000).toInt()
+
+                // Check if fragment is still attached before updating UI
+                if (isAdded && _binding != null) {
+                    binding.tvTimer.text = "Kirim ulang OTP dalam waktu 00:${String.format("%02d", timeRemaining)}"
+                    if (timeRemaining % 5 == 0) {
+                        Log.d(TAG, "Cooldown remaining: $timeRemaining seconds")
+                    }
+                }
+            }
+
+            override fun onFinish() {
+                if (!isTimerRunning) return
+
+                Log.d(TAG, "Cooldown finished, enabling resend button")
+
+                // Check if fragment is still attached before updating UI
+                if (isAdded && _binding != null) {
+                    binding.tvTimer.text = "Dapat mengirim ulang kode OTP"
+                    binding.tvResendOtp.isEnabled = true
+                    binding.tvResendOtp.setTextColor(ContextCompat.getColor(requireContext(), R.color.blue1))
+                    timeRemaining = 0
+                }
+                isTimerRunning = false
+            }
+        }.start()
+    }
+
+    private fun stopTimer() {
+        Log.d(TAG, "stopTimer called")
+        isTimerRunning = false
         countDownTimer?.cancel()
+        countDownTimer = null
+    }
+
+
+    override fun onPause() {
+        super.onPause()
+        Log.d(TAG, "onPause - stopping timer")
+        stopTimer()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        Log.d(TAG, "onStop - stopping timer")
+        stopTimer()
+    }
+
+    override fun onDestroyView() {
+        Log.d(TAG, "onDestroyView - cleaning up")
+        super.onDestroyView()
+
+        // Ensure timer is stopped
+        stopTimer()
+
         _binding = null
     }
+
+    override fun onDetach() {
+        super.onDetach()
+        Log.d(TAG, "onDetach - final cleanup")
+        stopTimer()
+    }
 }

app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep3Fragment.kt

@@ -27,6 +27,7 @@ import com.alya.ecommerce_serang.ui.order.address.SubdsitrictAdapter
 import com.alya.ecommerce_serang.ui.order.address.ViewState
 import com.alya.ecommerce_serang.ui.order.address.VillagesAdapter
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.SessionManager
 import com.alya.ecommerce_serang.utils.viewmodel.RegisterViewModel
 import com.google.android.material.progressindicator.LinearProgressIndicator
@@ -96,26 +97,30 @@ class RegisterStep3Fragment : Fragment() {
             Log.d(TAG, "Auto-filled name: ${it.name}, phone: ${it.phone}")
         }
 
-        // Set up province and city dropdowns
         setupAutoComplete()
-
         setupEdgeToEdge()
 
         // Set up button listeners
         binding.btnPrevious.setOnClickListener {
-            // Go back to the previous step
+            val step2Fragment = RegisterStep2Fragment()
-            parentFragmentManager.popBackStack()
+            parentFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container, step2Fragment)
+                .commit()
         }
 
         binding.btnRegister.setOnClickListener {
-            submitAddress()
+            PopUpDialog.showConfirmDialog(
+                context = requireContext(),
+                title = "Apakah anda yakin data anda sudah benar?",
+                message = "Pastikan data yang dimasukkan sudah benar",
+                positiveText = "Ya",
+                negativeText = "Tidak",
+                onYesClicked = {
+                    submitAddress()
+                }
+            )
         }
 
-        // If user skips address entry
-//        binding.btnSkip.setOnClickListener {
-//            showRegistrationSuccess()
-//        }
-
         // Observe address submission state
         observeAddressSubmissionState()
 
@@ -503,7 +508,9 @@ class RegisterStep3Fragment : Fragment() {
 
     private fun showRegistrationSuccess() {
         // Now we can show the success message for the overall registration process
-        Toast.makeText(requireContext(), "Registration completed successfully!", Toast.LENGTH_LONG).show()
+
+        Toast.makeText(requireContext(), "Berhasil mendaftarkan akun", Toast.LENGTH_LONG).show()
+        sessionManager.clearAll()
 
         // Navigate to login screen
         startActivity(Intent(requireContext(), LoginActivity::class.java))
@@ -521,4 +528,5 @@ class RegisterStep3Fragment : Fragment() {
         ViewCompat.setWindowInsetsAnimationCallback(binding.root, null)
         _binding = null
     }
+
 }

app/src/main/java/com/alya/ecommerce_serang/ui/cart/CartActivity.kt

@@ -41,11 +41,14 @@ class CartActivity : AppCompatActivity() {
     }
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        sessionManager = SessionManager(this)
+        apiService = ApiConfig.getApiService(sessionManager)
         binding = ActivityCartBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        sessionManager = SessionManager(this)
+        if (!sessionManager.isLoggedIn()){
-        apiService = ApiConfig.getApiService(sessionManager)
+            binding.emptyCart.text = "Silahkan masuk terlebih dahulu"
+        }
 
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
@@ -118,7 +121,7 @@ class CartActivity : AppCompatActivity() {
                             // Start checkout with the prepared items
                             startCheckoutWithWholesaleInfo(selectedItems)
                         } else {
-                            Toast.makeText(this, "Please select items from a single store only", Toast.LENGTH_SHORT).show()
+                            Toast.makeText(this, "Pilih produk yang sama dengan toko", Toast.LENGTH_SHORT).show()
                         }
                     }
                 } else {
@@ -196,7 +199,8 @@ class CartActivity : AppCompatActivity() {
 
         viewModel.errorMessage.observe(this) { errorMessage ->
             errorMessage?.let {
-                Toast.makeText(this, it, Toast.LENGTH_SHORT).show()
+                binding.emptyCart.visibility = View.VISIBLE
+                Log.e("CartActivity", "Error message: $it")
             }
         }
 
@@ -249,6 +253,10 @@ class CartActivity : AppCompatActivity() {
                 storeAdapter.updateWholesaleStatus(wholesaleStatusMap, wholesalePriceMap)
             }
         }
+
+        viewModel.productImages.observe(this) { productImages ->
+            storeAdapter.updateProductImages(productImages)
+        }
     }
 
     private fun showEmptyState(isEmpty: Boolean) {
@@ -267,5 +275,5 @@ class CartActivity : AppCompatActivity() {
         val format = NumberFormat.getCurrencyInstance(Locale("id", "ID"))
         return format.format(amount).replace("Rp", "Rp ")
     }
-}
 
+}

app/src/main/java/com/alya/ecommerce_serang/ui/cart/CartViewModel.kt

@@ -8,6 +8,7 @@ import androidx.lifecycle.viewModelScope
 import com.alya.ecommerce_serang.data.api.dto.UpdateCart
 import com.alya.ecommerce_serang.data.api.response.customer.cart.DataItemCart
 import com.alya.ecommerce_serang.data.api.response.customer.product.CartItemCheckoutInfo
+import com.alya.ecommerce_serang.data.api.response.customer.product.Product
 import com.alya.ecommerce_serang.data.repository.OrderRepository
 import com.alya.ecommerce_serang.data.repository.Result
 import kotlinx.coroutines.launch
@@ -52,6 +53,12 @@ class CartViewModel(private val repository: OrderRepository) : ViewModel() {
     private val _hasConsistentWholesaleStatus = MutableLiveData<Boolean>(true)
     val hasConsistentWholesaleStatus: LiveData<Boolean> = _hasConsistentWholesaleStatus
 
+    private val _productDetail = MutableLiveData<Product?>()
+    val productDetail: LiveData<Product?> get() = _productDetail
+
+    private val _productImages = MutableLiveData<Map<Int, String>>()
+    val productImages: LiveData<Map<Int, String>> = _productImages
+
     fun getCart() {
         _isLoading.value = true
         _errorMessage.value = null
@@ -62,6 +69,12 @@ class CartViewModel(private val repository: OrderRepository) : ViewModel() {
                     _cartItems.value = result.data
                     _isLoading.value = false
 
+                    result.data.forEach { store ->
+                        store.cartItems.forEach { item ->
+                            loadProductImage(item.productId)
+                        }
+                    }
+
                     // After loading cart items, check wholesale status
                     checkWholesaleStatus()
                 }
@@ -404,4 +417,29 @@ class CartViewModel(private val repository: OrderRepository) : ViewModel() {
 
         _hasConsistentWholesaleStatus.value = allSameStatus
     }
+
+    fun loadProductImage(productId: Int) {
+        viewModelScope.launch {
+            try {
+                val result = repository.fetchProductDetail(productId)
+                val imageUrl = result?.product?.image ?: ""
+
+                val currentMap = _productImages.value?.toMutableMap() ?: mutableMapOf()
+                currentMap[productId] = imageUrl
+                _productImages.value = currentMap
+
+            } catch (e: Exception) {
+                Log.e("CartViewModel", "Error loading product image: ${e.message}")
+            }
+        }
+    }
+
+//    fun loadProductDetail(productId: Int) {
+//        viewModelScope.launch {
+//            val result = repository.fetchProductDetail(productId)
+//            val currentMap = _productImages.value?.toMutableMap() ?: mutableMapOf()
+//            currentMap[productId] = result?.product?.image ?: ""
+//            _productImages.value = currentMap
+//        }
+//    }
 }

app/src/main/java/com/alya/ecommerce_serang/ui/cart/StoreAdapter.kt

@@ -11,6 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import com.alya.ecommerce_serang.BuildConfig.BASE_URL
 import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.response.customer.cart.CartItemsItem
 import com.alya.ecommerce_serang.data.api.response.customer.cart.DataItemCart
@@ -30,6 +31,12 @@ class StoreAdapter(
     private var activeStoreId: Int? = null
     private var wholesaleStatusMap: Map<Int, Boolean> = mapOf()
     private var wholesalePriceMap: Map<Int, Double> = mapOf()
+    private var productImages: Map<Int, String> = emptyMap()
+
+    fun updateProductImages(newImages: Map<Int, String>) {
+        productImages = newImages
+        notifyDataSetChanged()
+    }
 
     companion object {
         private const val VIEW_TYPE_STORE = 0
@@ -135,7 +142,8 @@ class StoreAdapter(
                     wholesalePrice,
                     { isChecked -> onItemCheckChanged(cartItem.cartItemId, store.storeId, isChecked) },
                     { quantity -> onItemQuantityChanged(cartItem.cartItemId, quantity) },
-                    { onItemDeleted(cartItem.cartItemId) }
+                    { onItemDeleted(cartItem.cartItemId) },
+                    productImages
                 )
             }
         }
@@ -197,7 +205,8 @@ class StoreAdapter(
             wholesalePrice: Double?,
             onCheckedChange: (Boolean) -> Unit,
             onQuantityChanged: (Int) -> Unit,
-            onDelete: () -> Unit
+            onDelete: () -> Unit,
+            productImages: Map<Int, String>
         ) {
             // Set product name
             tvProductName.text = cartItem.productName
@@ -216,20 +225,6 @@ class StoreAdapter(
             // Set quantity
             tvQuantity.text = cartItem.quantity.toString()
 
-            // Visual indication for wholesale items
-//            if (isWholesale) {
-//                // You can add a background or border to indicate wholesale items
-//                // For example:
-////                itemView.setBackgroundResource(R.drawable.bg_wholesale_item)
-//                // If you don't have this drawable, you can use a simple color tint instead:
-//                 itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.wholesale_item_bg))
-//            } else {
-//                // Reset to default background
-////                itemView.setBackgroundResource(R.drawable.bg_normal_item)
-//                // Or if you don't have this drawable:
-//                 itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, R.color.normal_item_bg))
-//            }
-
             // Set checkbox state without triggering listener
             cbItem.setOnCheckedChangeListener(null)
             cbItem.isChecked = isSelected
@@ -247,11 +242,16 @@ class StoreAdapter(
                 onCheckedChange(isChecked)
             }
 
-            // Load product image
+            val fullImageUrl = when (val img = productImages[cartItem.productId]) {
+                is String -> {
+                    if (img.startsWith("/")) BASE_URL + img.substring(1) else img
+                }
+                else -> null
+            }
+
             Glide.with(itemView.context)
-                .load("https://example.com/images/${cartItem.productId}.jpg") // Assume image URL based on product ID
+                .load(fullImageUrl)
                 .placeholder(R.drawable.placeholder_image)
-                .error(R.drawable.placeholder_image)
                 .into(ivProduct)
 
             // Quantity control

app/src/main/java/com/alya/ecommerce_serang/ui/chat/ChatActivity.kt

@@ -124,7 +124,7 @@ class ChatActivity : AppCompatActivity() {
 
         if (token.isEmpty()) {
             // User not logged in, redirect to login
-            Toast.makeText(this, "Please login first", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "Silahkan masuk terlebih dahulu", Toast.LENGTH_SHORT).show()
             startActivity(Intent(this, LoginActivity::class.java))
             finish()
             return
@@ -506,7 +506,7 @@ class ChatActivity : AppCompatActivity() {
             }
             startActivity(intent)
         } catch (e: Exception) {
-            Toast.makeText(this, "Cannot open product details", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "Gagal memuat produk", Toast.LENGTH_SHORT).show()
             Log.e(TAG, "Error navigating to product detail", e)
         }
     }
@@ -622,7 +622,7 @@ class ChatActivity : AppCompatActivity() {
                 if (outputFile.exists() && outputFile.length() > 0) {
                     if (outputFile.length() > 5 * 1024 * 1024) {
                         Log.e(TAG, "File too large: ${outputFile.length()} bytes")
-                        Toast.makeText(this, "Image too large (max 5MB)", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(this, "Gambar terlalu besar. Maksimal 1MB", Toast.LENGTH_SHORT).show()
                         return
                     }
 

app/src/main/java/com/alya/ecommerce_serang/ui/chat/ChatListFragment.kt

@@ -5,7 +5,6 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
@@ -80,8 +79,10 @@ class ChatListFragment : Fragment() {
                     }
                 }
                 is Result.Error -> {
-                    binding.tvEmptyChat.visibility = View.VISIBLE
+//                    binding.tvEmptyChat.visibility = View.VISIBLE
-                    Toast.makeText(requireContext(), "Failed to load chats", Toast.LENGTH_SHORT).show()
+                    binding.progressBarChat.visibility = View.VISIBLE
+//                    Toast.makeText(requireContext(), "Failed to load chats", Toast.LENGTH_SHORT).show()
+                    Log.e(TAG, "Failed to load chats")
                 }
                 Result.Loading -> {
                     binding.progressBarChat.visibility = View.VISIBLE

app/src/main/java/com/alya/ecommerce_serang/ui/home/HomeFragment.kt

@@ -6,6 +6,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -32,6 +33,7 @@ import com.alya.ecommerce_serang.utils.SessionManager
 import com.alya.ecommerce_serang.utils.setLightStatusBar
 import com.alya.ecommerce_serang.utils.viewmodel.HomeUiState
 import com.alya.ecommerce_serang.utils.viewmodel.HomeViewModel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 //@AndroidEntryPoint
@@ -67,12 +69,10 @@ class HomeFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-
         initUi()
         setupRecyclerView()
         observeData()
         setupSearchView()
-
     }
 
     private fun setupRecyclerView() {
@@ -140,24 +140,26 @@ class HomeFragment : Fragment() {
                 viewModel.uiState.collect { state ->
                     when (state) {
                         is HomeUiState.Loading -> {
-                            binding.loading.root.isVisible = true
+                            binding.loadingAll.root.visibility = View.VISIBLE
                             binding.error.root.isVisible = false
                             binding.home.isVisible = false
                         }
                         is HomeUiState.Success -> {
-                            binding.loading.root.isVisible = false
+                            val products = state.products
+                            viewModel.loadStoresForProducts(products)
+                            delay(2000)
+                            binding.loadingAll.root.visibility = View.GONE
                             binding.error.root.isVisible = false
                             binding.home.isVisible = true
-                            val products = state.products
-                            viewModel.loadStoresForProducts(products) // << add this here
-
                             productAdapter?.updateLimitedProducts(products)
                         }
                         is HomeUiState.Error -> {
-                            binding.loading.root.isVisible = false
+                            binding.loadingAll.root.visibility = View.GONE
                             binding.error.root.isVisible = true
                             binding.home.isVisible = false
-                            binding.error.errorMessage.text = state.message
+//                            binding.error.errorMessage.text = state.message
+                            Log.e("HomeFragment", "Error load data: ${state.message}")
+                            Toast.makeText(requireContext(), "Terjadi kendala. Muat ulang halaman", Toast.LENGTH_SHORT) .show()
                             binding.error.retryButton.setOnClickListener {
                                 viewModel.retry()
                             }
@@ -166,7 +168,6 @@ class HomeFragment : Fragment() {
                 }
 
             }
-
         }
 
         viewLifecycleOwner.lifecycleScope.launch {

app/src/main/java/com/alya/ecommerce_serang/ui/home/SearchHomeFragment.kt

@@ -7,12 +7,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
+import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.GridLayoutManager
+import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.dto.ProductsItem
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
 import com.alya.ecommerce_serang.data.repository.ProductRepository
@@ -106,6 +109,11 @@ class SearchHomeFragment : Fragment() {
                 }
             })
 
+            val searchText = findViewById<TextView>(androidx.appcompat.R.id.search_src_text)
+            searchText.textSize = 14f   // in sp
+            searchText.setHintTextColor(ContextCompat.getColor(context, R.color.black_200))
+            searchText.setTextColor(ContextCompat.getColor(context, R.color.black))
+
             if (args.query.isNullOrEmpty()) {
                 requestFocus()
                 post {

app/src/main/java/com/alya/ecommerce_serang/ui/notif/fcm/FCMService.kt

@@ -78,4 +78,4 @@ import com.google.firebase.messaging.RemoteMessage
             val notificationId = System.currentTimeMillis().toInt()
             notificationManager.notify(notificationId, notificationBuilder.build())
         }
-    }
+    }

app/src/main/java/com/alya/ecommerce_serang/ui/order/CartCheckoutAdapter.kt

@@ -1,9 +1,11 @@
 package com.alya.ecommerce_serang.ui.order
 
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.alya.ecommerce_serang.BuildConfig.BASE_URL
 import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.dto.CheckoutData
 import com.alya.ecommerce_serang.data.api.response.customer.cart.CartItemsItem
@@ -13,37 +15,57 @@ import com.bumptech.glide.Glide
 import java.text.NumberFormat
 import java.util.Locale
 
-class CartCheckoutAdapter(private val checkoutData: CheckoutData) :
+class CartCheckoutAdapter(
-    RecyclerView.Adapter<CartCheckoutAdapter.SellerViewHolder>() {
+    private val checkoutData: CheckoutData
+) : RecyclerView.Adapter<CartCheckoutAdapter.SellerViewHolder>() {
 
-    class SellerViewHolder(val binding: ItemOrderSellerBinding) : RecyclerView.ViewHolder(binding.root)
+    private var productImages: Map<Int, String> = emptyMap()
+    private val viewHolders = mutableListOf<SellerViewHolder>() // Keep references
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SellerViewHolder {
+    class SellerViewHolder(val binding: ItemOrderSellerBinding) : RecyclerView.ViewHolder(binding.root) {
-        val binding = ItemOrderSellerBinding.inflate(
+        val childAdapter = MultiCartItemsAdapter(emptyList(), emptyMap())
-            LayoutInflater.from(parent.context), parent, false
+        init {
-        )
+            binding.rvSellerOrderProduct.apply {
-        return SellerViewHolder(binding)
+                layoutManager = LinearLayoutManager(binding.root.context)
-    }
+                adapter = childAdapter
-
-    override fun getItemCount(): Int = 1 // Only one seller
-
-    override fun onBindViewHolder(holder: SellerViewHolder, position: Int) {
-        with(holder.binding) {
-            // Set seller name
-            tvStoreName.text = checkoutData.sellerName
-
-            // Set up products RecyclerView with multiple items
-            rvSellerOrderProduct.apply {
-                layoutManager = LinearLayoutManager(context)
-                adapter = MultiCartItemsAdapter(checkoutData.cartItems)
                 isNestedScrollingEnabled = false
             }
         }
     }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SellerViewHolder {
+        val binding = ItemOrderSellerBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        val holder = SellerViewHolder(binding)
+        viewHolders.add(holder) // Keep reference
+        return holder
+    }
+
+    fun updateProductImages(newImages: Map<Int, String>) {
+        productImages = newImages
+        // Update all existing child adapters
+        viewHolders.forEach { holder ->
+            holder.childAdapter.updateProductImages(newImages)
+        }
+    }
+
+    override fun getItemCount(): Int = 1
+
+    override fun onBindViewHolder(holder: SellerViewHolder, position: Int) {
+        holder.binding.tvStoreName.text = checkoutData.sellerName
+        holder.childAdapter.updateData(checkoutData.cartItems)
+        holder.childAdapter.updateProductImages(productImages) // Apply current images
+    }
+
+    override fun onViewRecycled(holder: SellerViewHolder) {
+        super.onViewRecycled(holder)
+        viewHolders.remove(holder) // Clean up reference
+    }
 }
 
-class MultiCartItemsAdapter(private val cartItems: List<CartItemsItem>) :
+class MultiCartItemsAdapter(
-    RecyclerView.Adapter<MultiCartItemsAdapter.CartItemViewHolder>() {
+    private var cartItems: List<CartItemsItem> = emptyList(),
+    private var productImages: Map<Int, String> = emptyMap()
+) : RecyclerView.Adapter<MultiCartItemsAdapter.CartItemViewHolder>() {
 
     class CartItemViewHolder(val binding: ItemOrderProductBinding) : RecyclerView.ViewHolder(binding.root)
 
@@ -56,24 +78,57 @@ class MultiCartItemsAdapter(private val cartItems: List<CartItemsItem>) :
 
     override fun getItemCount(): Int = cartItems.size
 
+    fun updateProductImages(images: Map<Int, String>) {
+        Log.d("MultiCartItemsAdapter", "updateProductImages called with: $images")
+        Log.d("MultiCartItemsAdapter", "Current cartItems productIds: ${cartItems.map { it.productId }}")
+        productImages = images
+        notifyDataSetChanged()
+        Log.d("MultiCartItemsAdapter", "notifyDataSetChanged() called")
+    }
+
     override fun onBindViewHolder(holder: CartItemViewHolder, position: Int) {
         val item = cartItems[position]
+        Log.d("MultiCartItemsAdapter", "onBindViewHolder - position: $position, productId: ${item.productId}")
+        Log.d("MultiCartItemsAdapter", "Available images: $productImages")
 
         with(holder.binding) {
-            // Set cart item details
             tvProductName.text = item.productName
             tvProductQuantity.text = "${item.quantity} buah"
             tvProductPrice.text = formatCurrency(item.price.toDouble())
 
-            // Load placeholder image
+            val img = productImages[item.productId]
+            Log.d("MultiCartItemsAdapter", "Image for productId ${item.productId}: $img")
+
+            val fullImageUrl = when (img) {
+                is String -> {
+                    val url = if (img.startsWith("/")) BASE_URL + img.substring(1) else img
+                    Log.d("MultiCartItemsAdapter", "Full image URL: $url")
+                    url
+                }
+                else -> {
+                    Log.d("MultiCartItemsAdapter", "No image found, using placeholder")
+                    null
+                }
+            }
+
+            Log.d("MultiCartItemsAdapter", "Loading image with Glide: $fullImageUrl")
             Glide.with(ivProduct.context)
-                .load(R.drawable.placeholder_image)
+                .load(fullImageUrl)
+                .placeholder(R.drawable.placeholder_image)
+                .error(R.drawable.placeholder_image)  // Add error handling
                 .into(ivProduct)
         }
     }
 
+    // Minimal helpers to update adapter data from parent adapter
+    fun updateData(items: List<CartItemsItem>) {
+        cartItems = items
+        notifyDataSetChanged()
+    }
+
+
     private fun formatCurrency(amount: Double): String {
         val formatter = NumberFormat.getCurrencyInstance(Locale("in", "ID"))
         return formatter.format(amount).replace(",00", "")
     }
-}
+}

app/src/main/java/com/alya/ecommerce_serang/ui/order/CheckoutActivity.kt

@@ -26,6 +26,7 @@ import com.alya.ecommerce_serang.data.repository.OrderRepository
 import com.alya.ecommerce_serang.databinding.ActivityCheckoutBinding
 import com.alya.ecommerce_serang.ui.order.address.AddressActivity
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.SessionManager
 import java.text.NumberFormat
 import java.util.Locale
@@ -35,6 +36,8 @@ class CheckoutActivity : AppCompatActivity() {
     private lateinit var binding: ActivityCheckoutBinding
     private lateinit var sessionManager: SessionManager
     private var paymentAdapter: PaymentMethodAdapter? = null
+    private var cartCheckoutAdapter: CartCheckoutAdapter? = null
+    private var checkoutSellerAdapter: CheckoutSellerAdapter? = null
     private var paymentMethodsLoaded = false
 
     private val viewModel: CheckoutViewModel by viewModels {
@@ -154,8 +157,18 @@ class CheckoutActivity : AppCompatActivity() {
 
         // Observe address details
         viewModel.addressDetails.observe(this) { address ->
-            binding.tvPlacesAddress.text = address?.recipient
+            if (address != null) {
-            binding.tvAddress.text = "${address?.street}, ${address?.subdistrict}"
+                // Show selected address
+                binding.containerEmptyAddress.visibility = View.GONE
+                binding.containerAddress.visibility = View.VISIBLE
+
+                binding.tvPlacesAddress.text = address.recipient
+                binding.tvAddress.text = "${address.street}, ${address.subdistrict}"
+            } else {
+                // Show empty address state
+                binding.containerEmptyAddress.visibility = View.VISIBLE
+                binding.containerAddress.visibility = View.GONE
+            }
         }
 
         viewModel.availablePaymentMethods.observe(this) { paymentMethods ->
@@ -172,9 +185,7 @@ class CheckoutActivity : AppCompatActivity() {
 
                 // Update the adapter ONLY if it exists
                 paymentAdapter?.let { adapter ->
-                    // This line was causing issues - using setSelectedPayment instead of setSelectedPaymentName
                     adapter.setSelectedPaymentId(selectedPayment.id)
-
                     Log.d("CheckoutActivity", "Updated adapter with selected payment: ${selectedPayment.id}")
                 }
             }
@@ -183,33 +194,47 @@ class CheckoutActivity : AppCompatActivity() {
         // Observe loading state
         viewModel.isLoading.observe(this) { isLoading ->
             binding.btnPay.isEnabled = !isLoading
-
         }
 
         // Observe error messages
         viewModel.errorMessage.observe(this) { message ->
             if (message.isNotEmpty()) {
-                Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Terdapat kendala di pemesanan", Toast.LENGTH_SHORT).show()
+                Log.e("CheckoutActivity", "Error from errorMessage: $message")
             }
         }
 
         // Observe order creation
         viewModel.orderCreated.observe(this) { created ->
             if (created) {
-                Toast.makeText(this, "Order successfully created!", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Berhasil membuat pesanan", Toast.LENGTH_SHORT).show()
                 setResult(RESULT_OK)
                 finish()
             }
         }
+
+        viewModel.productImages.observe(this) { images ->
+            Log.d("CheckoutActivity", "Product images updated: ${images.keys}")
+            // Update adapter when images arrive
+            cartCheckoutAdapter?.updateProductImages(images)
+            checkoutSellerAdapter?.updateProductImages(images)
+        }
     }
 
     private fun setupPaymentMethodsRecyclerView(paymentMethods: List<DetailPaymentItem>) {
         if (paymentMethods.isEmpty()) {
             Log.e("CheckoutActivity", "Payment methods list is empty")
-            Toast.makeText(this, "No payment methods available", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "Tidak ditemukan metode pembayaran", Toast.LENGTH_SHORT).show()
+
+            // Show empty payment state
+            binding.containerEmptyPayment.visibility = View.VISIBLE
+            binding.rvPaymentInfo.visibility = View.GONE
             return
         }
 
+        binding.containerEmptyPayment.visibility = View.GONE
+        binding.rvPaymentInfo.visibility = View.VISIBLE
+
         // Debug logging
         Log.d("CheckoutActivity", "Setting up payment methods: ${paymentMethods.size} methods available")
 
@@ -255,17 +280,47 @@ class CheckoutActivity : AppCompatActivity() {
     }
 
     private fun setupProductRecyclerView(checkoutData: CheckoutData) {
-        val adapter = if (checkoutData.isBuyNow || checkoutData.cartItems.size <= 1) {
+        if (checkoutData.isBuyNow || checkoutData.cartItems.size <= 1) {
-            CheckoutSellerAdapter(checkoutData)
+            Log.d("CheckoutActivity", "Using CheckoutSellerAdapter")
+            val adapter = CheckoutSellerAdapter(checkoutData)
+
+            // Keep reference for image updates - create a field in your activity
+            checkoutSellerAdapter = adapter
+
+            binding.rvProductItems.apply {
+                layoutManager = LinearLayoutManager(this@CheckoutActivity)
+                this.adapter = adapter
+                isNestedScrollingEnabled = false
+            }
+
+            // Load images for cart items
+            if (!checkoutData.isBuyNow) {
+                checkoutData.cartItems.forEach { item ->
+                    viewModel.loadProductImage(item.productId)
+                }
+            }
         } else {
-            CartCheckoutAdapter(checkoutData)
+            Log.d("CheckoutActivity", "Using CartCheckoutAdapter")
+            Log.d("CheckoutActivity", "Cart items count: ${checkoutData.cartItems.size}")
+
+            // Create adapter and keep reference
+            cartCheckoutAdapter = CartCheckoutAdapter(checkoutData)
+
+            binding.rvProductItems.apply {
+                layoutManager = LinearLayoutManager(this@CheckoutActivity)
+                adapter = cartCheckoutAdapter
+                isNestedScrollingEnabled = false
+            }
+
+            // Load images for each product
+            checkoutData.cartItems.forEach { item ->
+                Log.d("CheckoutActivity", "Loading image for productId: ${item.productId}")
+                viewModel.loadProductImage(item.productId)
+            }
         }
 
-        binding.rvProductItems.apply {
+        binding.containerEmptyProducts.visibility = View.GONE
-            layoutManager = LinearLayoutManager(this@CheckoutActivity)
+        binding.rvProductItems.visibility = View.VISIBLE
-            this.adapter = adapter
-            isNestedScrollingEnabled = false
-        }
     }
 
     private fun updateOrderSummary() {
@@ -290,7 +345,8 @@ class CheckoutActivity : AppCompatActivity() {
 
     private fun updateShippingUI(shipName: String, shipService: String, shipEtd: String, shipPrice: Int) {
         if (shipName.isNotEmpty() && shipService.isNotEmpty()) {
-            // Display shipping name and service in one line
+            // Hide empty state and show selected shipping
+            binding.containerEmptyShipping.visibility = View.GONE
             binding.cardShipment.visibility = View.VISIBLE
 
             binding.tvCourierName.text = "$shipName $shipService"
@@ -298,6 +354,8 @@ class CheckoutActivity : AppCompatActivity() {
             binding.tvShippingPrice.text = formatCurrency(shipPrice.toDouble())
             binding.rbJne.isChecked = true
         } else {
+            // Show empty shipping state
+            binding.containerEmptyShipping.visibility = View.VISIBLE
             binding.cardShipment.visibility = View.GONE
         }
     }
@@ -310,10 +368,10 @@ class CheckoutActivity : AppCompatActivity() {
         }
 
         // Shipping method selection
-        binding.layoutShippingMethod.setOnClickListener {
+        binding.tvShippingOption.setOnClickListener {
             val addressId = viewModel.addressDetails.value?.id ?: 0
             if (addressId <= 0) {
-                Toast.makeText(this, "Please select delivery address first", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Silahkan pilih alamat dahulu", Toast.LENGTH_SHORT).show()
                 return@setOnClickListener
             }
 
@@ -344,7 +402,16 @@ class CheckoutActivity : AppCompatActivity() {
         // Create order button
         binding.btnPay.setOnClickListener {
             if (validateOrder()) {
-                viewModel.createOrder()
+                PopUpDialog.showConfirmDialog(
+                    context = this,
+                    title = "Apakah anda yakin membuat pesanan?",
+                    message = "Pastikan data yang dimasukkan sudah benar",
+                    positiveText = "Ya",
+                    negativeText = "Tidak",
+                    onYesClicked = {
+                        viewModel.createOrder()
+                    }
+                )
             }
         }
 
@@ -363,7 +430,7 @@ class CheckoutActivity : AppCompatActivity() {
                 viewModel.setSelectedAddress(addressId)
 
                 // You might want to show a toast or some UI feedback
-                Toast.makeText(this, "Address selected successfully", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Berhasil memilih alamat", Toast.LENGTH_SHORT).show()
             }
         }
     }

app/src/main/java/com/alya/ecommerce_serang/ui/order/CheckoutSellerAdapter.kt

@@ -11,31 +11,53 @@ import com.alya.ecommerce_serang.databinding.ItemOrderSellerBinding
 class CheckoutSellerAdapter(private val checkoutData: CheckoutData) :
     RecyclerView.Adapter<CheckoutSellerAdapter.SellerViewHolder>() {
 
+    private var productImages: Map<Int, String> = emptyMap()
+    private var currentViewHolder: SellerViewHolder? = null
+
     class SellerViewHolder(val binding: ItemOrderSellerBinding) : RecyclerView.ViewHolder(binding.root)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SellerViewHolder {
         val binding = ItemOrderSellerBinding.inflate(
             LayoutInflater.from(parent.context), parent, false
         )
-        return SellerViewHolder(binding)
+        val holder = SellerViewHolder(binding)
+        currentViewHolder = holder
+        return holder
     }
 
-    override fun getItemCount(): Int = 1 // Only one seller
+    fun updateProductImages(newImages: Map<Int, String>) {
+        productImages = newImages
+        currentViewHolder?.let { holder ->
+            // Update the nested adapter
+            val adapter = holder.binding.rvSellerOrderProduct.adapter
+            when (adapter) {
+                is SingleCartItemAdapter -> adapter.updateProductImages(newImages)
+                is SingleProductAdapter -> {
+                    // For SingleProductAdapter, you might need to update differently
+                    // since it uses checkoutData.productImageUrl
+                }
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = 1
 
     override fun onBindViewHolder(holder: SellerViewHolder, position: Int) {
+        currentViewHolder = holder
         with(holder.binding) {
-            // Set seller name
             tvStoreName.text = checkoutData.sellerName
 
-            // Set up products RecyclerView
             rvSellerOrderProduct.apply {
                 layoutManager = LinearLayoutManager(context)
                 adapter = if (checkoutData.isBuyNow) {
-                    // Single product for Buy Now
                     SingleProductAdapter(checkoutData)
                 } else {
-                    // Single cart item
+                    SingleCartItemAdapter(checkoutData.cartItems.first()).also { adapter ->
-                    SingleCartItemAdapter(checkoutData.cartItems.first())
+                        // Apply existing images if available
+                        if (productImages.isNotEmpty()) {
+                            adapter.updateProductImages(productImages)
+                        }
+                    }
                 }
                 isNestedScrollingEnabled = false
             }

app/src/main/java/com/alya/ecommerce_serang/ui/order/CheckoutViewModel.kt

@@ -40,7 +40,10 @@ class CheckoutViewModel(private val repository: OrderRepository) : ViewModel() {
     private val _orderCreated = MutableLiveData<Boolean>()
     val orderCreated: LiveData<Boolean> = _orderCreated
 
+    private val _productImages = MutableLiveData<Map<Int, String>>(emptyMap())
+    val productImages: LiveData<Map<Int, String>> = _productImages
 
+    private val currentImages = mutableMapOf<Int, String>()
 
     // Initialize "Buy Now" checkout
     fun initializeBuyNow(
@@ -145,6 +148,8 @@ class CheckoutViewModel(private val repository: OrderRepository) : ViewModel() {
                             isReseller = isWholesaleMap.any { it.value }
                         )
 
+                        Log.d(TAG, "Cek is reseller: ${orderRequest.isReseller}")
+
                         _checkoutData.value = CheckoutData(
                             orderRequest = orderRequest,
                             productName = matchingItems.first().productName,
@@ -156,9 +161,13 @@ class CheckoutViewModel(private val repository: OrderRepository) : ViewModel() {
                         )
 
                         Log.d(TAG, "CheckoutData initialized with ${matchingItems.size} items")
-                        matchingItems.forEachIndexed { index, item ->
+                        matchingItems.forEach { item ->
-                            val isWholesale = isWholesaleMap[item.cartItemId] ?: false
+                            Log.d("CheckoutViewModel", "About to load image for productId: ${item.productId}")
-                            Log.d(TAG, "Item $index: ${item.productName}, Price: ${item.price}, IsWholesale: $isWholesale")
+                            loadProductImage(item.productId)
+                        }
+
+                        matchingItems.forEach { item ->
+                            loadProductImage(item.productId)
                         }
 
                         // Calculate totals with updated prices
@@ -179,6 +188,8 @@ class CheckoutViewModel(private val repository: OrderRepository) : ViewModel() {
         }
     }
 
+
+
     fun getPaymentMethods() {
         viewModelScope.launch {
             try {
@@ -378,6 +389,7 @@ class CheckoutViewModel(private val repository: OrderRepository) : ViewModel() {
                 } else {
                     // For Cart checkout, use the standard order endpoint
                     val cartRequest = data.orderRequest as OrderRequest
+                    Log.d(TAG, "data: ${cartRequest.cartItemId}")
                     repository.createOrder(cartRequest)
                 }
 
@@ -416,6 +428,31 @@ class CheckoutViewModel(private val repository: OrderRepository) : ViewModel() {
         }
     }
 
+    fun loadProductImage(productId: Int) {
+        Log.d("CheckoutViewModel", "loadProductImage called for productId: $productId")
+        viewModelScope.launch {
+            try {
+                Log.d("CheckoutViewModel", "Fetching product detail for productId: $productId")
+                val productDetail = repository.fetchProductDetail(productId)
+                Log.d("CheckoutViewModel", "Product detail result: $productDetail")
+
+                val imageUrl = productDetail?.product?.image
+                Log.d("CheckoutViewModel", "Extracted image URL: $imageUrl")
+
+                currentImages[productId] = imageUrl.toString()
+                Log.d("CheckoutViewModel", "Updated currentImages: $currentImages")
+
+                _productImages.postValue(currentImages.toMap())
+                Log.d("CheckoutViewModel", "Posted to _productImages LiveData")
+            } catch (e: Exception) {
+                Log.e("CheckoutViewModel", "Error loading image for productId $productId", e)
+                // fallback if error
+                currentImages[productId] = ""
+                _productImages.postValue(currentImages.toMap())
+            }
+        }
+    }
+
     // Get shipping price
     private fun getShippingPrice(): Double {
         val data = _checkoutData.value ?: return 0.0
@@ -430,4 +467,5 @@ class CheckoutViewModel(private val repository: OrderRepository) : ViewModel() {
     companion object {
         private const val TAG = "CheckoutViewModel"
     }
-}
+}
+

app/src/main/java/com/alya/ecommerce_serang/ui/order/ShippingActivity.kt

@@ -67,7 +67,7 @@ class ShippingActivity : AppCompatActivity() {
         // Validate required information
         if (addressId <= 0 || productId <= 0) {
             Log.e(TAG, "Missing required shipping information: addressId=$addressId, productId=$productId")
-            Toast.makeText(this, "Missing required shipping information", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "Gagal memuat pengiriman", Toast.LENGTH_SHORT).show()
             finish()
             return
         }

app/src/main/java/com/alya/ecommerce_serang/ui/order/SingleItemCartAdapter.kt

@@ -3,6 +3,7 @@ package com.alya.ecommerce_serang.ui.order
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.alya.ecommerce_serang.BuildConfig.BASE_URL
 import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.response.customer.cart.CartItemsItem
 import com.alya.ecommerce_serang.databinding.ItemOrderProductBinding
@@ -13,6 +14,8 @@ import java.util.Locale
 class SingleCartItemAdapter(private val cartItem: CartItemsItem) :
     RecyclerView.Adapter<SingleCartItemAdapter.CartItemViewHolder>() {
 
+    private var productImages: Map<Int, String> = emptyMap()
+
     class CartItemViewHolder(val binding: ItemOrderProductBinding) : RecyclerView.ViewHolder(binding.root)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CartItemViewHolder {
@@ -24,16 +27,28 @@ class SingleCartItemAdapter(private val cartItem: CartItemsItem) :
 
     override fun getItemCount(): Int = 1
 
+    fun updateProductImages(newImages: Map<Int, String>) {
+        productImages = newImages
+        notifyDataSetChanged()
+    }
+
     override fun onBindViewHolder(holder: CartItemViewHolder, position: Int) {
         with(holder.binding) {
-            // Set cart item details
             tvProductName.text = cartItem.productName
             tvProductQuantity.text = "${cartItem.quantity} buah"
             tvProductPrice.text = formatCurrency(cartItem.price.toDouble())
 
-            // Load placeholder image
+            // Get the image for this product
+            val img = productImages[cartItem.productId]
+            val fullImageUrl = when (img) {
+                is String -> {
+                    if (img.startsWith("/")) BASE_URL + img.substring(1) else img
+                }
+                else -> null
+            }
+
             Glide.with(ivProduct.context)
-                .load(R.drawable.placeholder_image)
+                .load(fullImageUrl)
                 .placeholder(R.drawable.placeholder_image)
                 .error(R.drawable.placeholder_image)
                 .into(ivProduct)

app/src/main/java/com/alya/ecommerce_serang/ui/order/SingleProductAdapter.kt

@@ -3,6 +3,7 @@ package com.alya.ecommerce_serang.ui.order
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.alya.ecommerce_serang.BuildConfig.BASE_URL
 import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.dto.CheckoutData
 import com.alya.ecommerce_serang.data.api.dto.OrderRequestBuy
@@ -36,9 +37,16 @@ class SingleProductAdapter(private val checkoutData: CheckoutData) :
 
             tvProductPrice.text = formatCurrency(checkoutData.productPrice)
 
+            val fullImageUrl = when (val img = checkoutData.productImageUrl) {
+                is String -> {
+                    if (img.startsWith("/")) BASE_URL + img.substring(1) else img
+                }
+                else -> null
+            }
+
             // Load product image
             Glide.with(ivProduct.context)
-                .load(checkoutData.productImageUrl)
+                .load(fullImageUrl)
                 .apply(
                     RequestOptions()
                     .placeholder(R.drawable.placeholder_image)

app/src/main/java/com/alya/ecommerce_serang/ui/order/address/AddressActivity.kt

@@ -52,12 +52,12 @@ class AddressActivity : AppCompatActivity() {
             windowInsets
         }
 
+        viewModel.fetchAddresses()
 
         setupToolbar()
         setupRecyclerView()
         setupObservers()
 
-        viewModel.fetchAddresses()
     }
 
 
@@ -126,6 +126,11 @@ class AddressActivity : AppCompatActivity() {
         finish()
     }
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.fetchAddresses()
+    }
+
     companion object {
         const val EXTRA_ADDRESS_ID = "extra_address_id"
     }

app/src/main/java/com/alya/ecommerce_serang/ui/order/address/ProvinceAdapter.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.Log
 import android.widget.ArrayAdapter
 import android.widget.Spinner
+import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.response.customer.order.CitiesItem
 import com.alya.ecommerce_serang.data.api.response.customer.order.ProvincesItem
 import com.alya.ecommerce_serang.data.api.response.customer.order.SubdistrictsItem
@@ -134,23 +135,8 @@ class BankAdapter(
     }
 
     private fun loadHardcodedData() {
-        val defaultBanks = listOf(
+        val bankNames = context.resources.getStringArray(R.array.bank_names)
-            BankItem("Bank Mandiri", "008", "PT Bank Mandiri (Persero) Tbk"),
+        val defaultBanks = bankNames.map { BankItem(bankName = it) }
-            BankItem("Bank BRI", "002", "PT Bank Rakyat Indonesia (Persero) Tbk"),
-            BankItem("Bank BCA", "014", "PT Bank Central Asia Tbk"),
-            BankItem("Bank BNI", "009", "PT Bank Negara Indonesia (Persero) Tbk"),
-            BankItem("Bank BTN", "200", "PT Bank Tabungan Negara (Persero) Tbk"),
-            BankItem("Bank CIMB Niaga", "022", "PT Bank CIMB Niaga Tbk"),
-            BankItem("Bank Danamon", "011", "PT Bank Danamon Indonesia Tbk"),
-            BankItem("Bank Permata", "013", "PT Bank Permata Tbk"),
-            BankItem("Bank OCBC NISP", "028", "PT Bank OCBC NISP Tbk"),
-            BankItem("Bank Maybank", "016", "PT Bank Maybank Indonesia Tbk"),
-            BankItem("Bank Panin", "019", "PT Bank Panin Dubai Syariah Tbk"),
-            BankItem("Bank UOB", "023", "PT Bank UOB Indonesia"),
-            BankItem("Bank Mega", "426", "PT Bank Mega Tbk"),
-            BankItem("Bank Bukopin", "441", "PT Bank Bukopin Tbk"),
-            BankItem("Bank BJB", "110", "PT Bank Pembangunan Daerah Jawa Barat dan Banten Tbk")
-        )
         updateData(defaultBanks)
     }
 

app/src/main/java/com/alya/ecommerce_serang/ui/order/detail/AddEvidencePaymentActivity.kt

@@ -33,6 +33,7 @@ import com.alya.ecommerce_serang.data.repository.OrderRepository
 import com.alya.ecommerce_serang.data.repository.Result
 import com.alya.ecommerce_serang.databinding.ActivityAddEvidencePaymentBinding
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.SessionManager
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
@@ -61,8 +62,8 @@ class AddEvidencePaymentActivity : AppCompatActivity() {
     }
 
     private val paymentMethods = arrayOf(
+        "Pilih Metode Pembayaran",
         "Transfer Bank",
-        "QRIS",
     )
 
 //    private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? ->
@@ -122,7 +123,6 @@ class AddEvidencePaymentActivity : AppCompatActivity() {
 
         } catch (e: Exception) {
             Log.e(TAG, "ERROR in AddEvidencePaymentActivity onCreate: ${e.message}", e)
-            Toast.makeText(this, "Error: ${e.message}", Toast.LENGTH_LONG).show()
         }
     }
 
@@ -167,6 +167,7 @@ class AddEvidencePaymentActivity : AppCompatActivity() {
 
         // Submit button
         binding.btnSubmit.setOnClickListener {
+
             validateAndUpload()
             Log.d(TAG, "AddEvidencePaymentActivity onCreate completed")
         }
@@ -288,7 +289,7 @@ class AddEvidencePaymentActivity : AppCompatActivity() {
             }
         } catch (e: Exception) {
             Log.e(TAG, "Error handling selected image", e)
-            Toast.makeText(this, "Error: ${e.message}", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, "Terjadi kendala", Toast.LENGTH_SHORT).show()
         }
     }
 
@@ -314,25 +315,35 @@ class AddEvidencePaymentActivity : AppCompatActivity() {
             return
         }
 
-        if (binding.spinnerPaymentMethod.selectedItemPosition == 0) {
+        //in case applied metode pembayaran yang lain
-            Toast.makeText(this, "Silahkan pilih metode pembayaran", Toast.LENGTH_SHORT).show()
+//        if (binding.spinnerPaymentMethod.selectedItemPosition == 0) {
-            return
+//            Toast.makeText(this, "Silahkan pilih metode pembayaran", Toast.LENGTH_SHORT).show()
-        }
+//            return
+//        }
         binding.etAccountNumber.visibility = View.GONE
 
+        //in case applied nomor rekening
 //        if (binding.etAccountNumber.text.toString().trim().isEmpty()) {
 //            Toast.makeText(this, "Silahkan isi nomor rekening/HP", Toast.LENGTH_SHORT).show()
 //            return
 //        }
 
-        if (binding.tvPaymentDate.text.toString() == "Pilih tanggal") {
+//        if (binding.tvPaymentDate.text.toString() == "Pilih tanggal") {
-            Toast.makeText(this, "Silahkan pilih tanggal pembayaran", Toast.LENGTH_SHORT).show()
+//            Toast.makeText(this, "Silahkan pilih tanggal pembayaran", Toast.LENGTH_SHORT).show()
-            return
+//            return
-        }
+//        }
 
         // All validations passed, proceed with upload
-        uploadPaymentProof()
+        PopUpDialog.showConfirmDialog(
-
+            context = this,
+            title = "Apakah bukti yang dikirimkan sudah benar?",
+            message = "Pastikan bukti yang dikirimkan valid",
+            positiveText = "Ya",
+            negativeText = "Tidak",
+            onYesClicked = {
+                uploadPaymentProof()
+            }
+        )
     }
 
     private fun uploadPaymentProof() {
@@ -367,7 +378,7 @@ class AddEvidencePaymentActivity : AppCompatActivity() {
                     viewModel.uploadPaymentProof(request)
                 } catch (e: Exception) {
                     Log.e(TAG, "Error creating upload request: ${e.message}", e)
-                    Toast.makeText(this, "Error preparing upload: ${e.message}", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this, "Gagal mengunggah foto", Toast.LENGTH_SHORT).show()
                 }
             }
         }

app/src/main/java/com/alya/ecommerce_serang/ui/order/detail/PaymentActivity.kt

@@ -160,7 +160,8 @@ class PaymentActivity : AppCompatActivity() {
 
         viewModel.error.observe(this) { error ->
             if (error.isNotEmpty()) {
-                Toast.makeText(this, error, Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Gagal melakukan pembayaran", Toast.LENGTH_SHORT).show()
+                Log.e(TAG, "Failed payment: $error")
             }
         }
     }
@@ -231,7 +232,6 @@ class PaymentActivity : AppCompatActivity() {
             else -> emptyList()
         }
 
-        // Tampilkan instruksi dalam dialog
         val dialog = AlertDialog.Builder(this)
             .setTitle("Petunjuk Transfer $type")
             .setItems(instructions.toTypedArray(), null)

app/src/main/java/com/alya/ecommerce_serang/ui/order/history/HistoryActivity.kt

@@ -27,7 +27,6 @@ class HistoryActivity : AppCompatActivity() {
         }
     }
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHistoryBinding.inflate(layoutInflater)
@@ -58,6 +57,14 @@ class HistoryActivity : AppCompatActivity() {
         }
     }
 
+//    override fun onDialogConfirmed() {
+//        // Option 1: refresh activity
+//        recreate()
+//
+//        // Or Option 2: reload only data
+//        // viewModel.loadOrders()
+//    }
+
     private fun setupToolbar() {
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayShowTitleEnabled(false)

app/src/main/java/com/alya/ecommerce_serang/ui/order/history/HistoryViewModel.kt

@@ -37,9 +37,6 @@ class HistoryViewModel(private val repository: OrderRepository) : ViewModel()  {
         private const val TAG = "HistoryViewModel"
     }
 
-//    private val _orders = MutableLiveData<ViewState<List<OrdersItem>>>()
-//    val orders: LiveData<ViewState<List<OrdersItem>>> = _orders
-
     private val _orderCompletionStatus = MutableLiveData<Result<CompletedOrderResponse>>()
     val orderCompletionStatus: LiveData<Result<CompletedOrderResponse>> = _orderCompletionStatus
 
@@ -113,83 +110,6 @@ class HistoryViewModel(private val repository: OrderRepository) : ViewModel()  {
                 ViewState.Loading                          // ② initial value, still fine
             )
 
-
-//    fun getOrderList(status: String) {
-//        _orders.value = ViewState.Loading
-//        viewModelScope.launch {
-//            try {
-//                if (status == "all") {
-//                    // Get all orders by combining all statuses
-//                    getAllOrdersCombined()
-//                } else {
-//                    // Get orders for specific status
-//                    when (val result = repository.getOrderList(status)) {
-//                        is Result.Success -> {
-//                            _orders.value = ViewState.Success(result.data.orders)
-//                            Log.d(TAG, "Orders loaded successfully: ${result.data.orders.size} items")
-//                        }
-//                        is Result.Error -> {
-//                            _orders.value = ViewState.Error(result.exception.message ?: "Unknown error occurred")
-//                            Log.e(TAG, "Error loading orders", result.exception)
-//                        }
-//                        is Result.Loading -> {
-//                            // Keep loading state
-//                        }
-//                    }
-//                }
-//            } catch (e: Exception) {
-//                _orders.value = ViewState.Error("An unexpected error occurred: ${e.message}")
-//                Log.e(TAG, "Exception in getOrderList", e)
-//            }
-//        }
-//    }
-
-//    private suspend fun getAllOrdersCombined() {
-//        try {
-//            val allStatuses = listOf("unpaid", "paid", "processed", "shipped", "completed", "canceled")
-//            val allOrders = mutableListOf<OrdersItem>()
-//
-//            // Use coroutineScope to allow launching async blocks
-//            coroutineScope {
-//                val deferreds = allStatuses.map { status ->
-//                    async {
-//                        when (val result = repository.getOrderList(status)) {
-//                            is Result.Success -> {
-//                                // Tag each order with the status it was fetched from
-//                                result.data.orders.onEach { it.displayStatus = status }
-//                            }
-//                            is Result.Error -> {
-//                                Log.e(TAG, "Error loading orders for status $status", result.exception)
-//                                emptyList<OrdersItem>()
-//                            }
-//                            is Result.Loading -> emptyList<OrdersItem>()
-//                        }
-//                    }
-//                }
-//
-//                // Await all results and combine
-//                deferreds.awaitAll().forEach { orders ->
-//                    allOrders.addAll(orders)
-//                }
-//            }
-//
-//            // Sort orders
-//            val sortedOrders = allOrders.sortedByDescending { order ->
-//                try {
-//                    SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault()).parse(order.createdAt)
-//                } catch (e: Exception) {
-//                    null
-//                }
-//            }
-//
-//            _orders.value = ViewState.Success(sortedOrders)
-//            Log.d(TAG, "All orders loaded successfully: ${sortedOrders.size} items")
-//
-//        } catch (e: Exception) {
-//            _orders.value = ViewState.Error("An unexpected error occurred: ${e.message}")
-//            Log.e(TAG, "Exception in getAllOrdersCombined", e)
-//        }
-//    }
     private suspend fun getAllOrdersCombined(): ViewState<List<OrdersItem>> = try {
         val statuses = listOf("unpaid", "paid", "processed", "shipped", "completed", "canceled")
 
@@ -292,11 +212,6 @@ class HistoryViewModel(private val repository: OrderRepository) : ViewModel()  {
         }
     }
 
-//    fun refreshOrders(status: String = "all") {
-//        Log.d(TAG, "Refreshing orders with status: $status")
-//        // Don't set Loading here if you want to show current data while refreshing
-//        getOrderList(status)
-//    }
 
     fun updateStatus(status: String, forceRefresh: Boolean = false) {
         Log.d(TAG, "↪️  updateStatus(status = $status, forceRefresh = $forceRefresh)")
@@ -316,19 +231,21 @@ class HistoryViewModel(private val repository: OrderRepository) : ViewModel()  {
         }
     }
 
-    private suspend fun refresh(status: String) {
+    fun refresh(status: String) {
         Log.d(TAG, "⏳  refresh(\"$status\") started")
 
         try {
-            if (status == "all") {
+            viewModelScope.launch {
-                Log.d(TAG, "🌐  Calling getAllOrdersCombined()")
+                if (status == "all") {
-                getAllOrdersCombined()                      // network → cache
+                    Log.d(TAG, "🌐  Calling getAllOrdersCombined()")
-            } else {
+                    getAllOrdersCombined()                      // network → cache
-                Log.d(TAG, "🌐  repository.getOrderList(\"$status\")")
+                } else {
-                repository.getOrderList(status)            // network → cache
+                    Log.d(TAG, "🌐  repository.getOrderList(\"$status\")")
+                    repository.getOrderList(status)            // network → cache
+                }
+                Log.d(TAG, "✅  refresh(\"$status\") completed (repository updated)")
+                // Flow that watches DB/cache will emit automatically
             }
-            Log.d(TAG, "✅  refresh(\"$status\") completed (repository updated)")
-            // Flow that watches DB/cache will emit automatically
         } catch (e: Exception) {
             Log.e(TAG, "❌  refresh(\"$status\") failed: ${e.message}", e)
         }

app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryAdapter.kt

@@ -28,6 +28,7 @@ import com.alya.ecommerce_serang.ui.order.detail.PaymentActivity
 import com.alya.ecommerce_serang.ui.order.history.cancelorder.CancelOrderBottomSheet
 import com.alya.ecommerce_serang.ui.order.review.CreateReviewActivity
 import com.alya.ecommerce_serang.ui.product.ReviewProductActivity
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.textfield.TextInputLayout
 import com.google.gson.Gson
@@ -41,7 +42,8 @@ import java.util.TimeZone
 class OrderHistoryAdapter(
     private val onOrderClickListener: (OrdersItem) -> Unit,
     private val viewModel: HistoryViewModel,
-    private val callbacks: OrderActionCallbacks
+    private val callbacks: OrderActionCallbacks,
+    private val listener: OnDialogActionListener
 ) : RecyclerView.Adapter<OrderHistoryAdapter.OrderViewHolder>() {
 
     interface OrderActionCallbacks {
@@ -200,10 +202,6 @@ class OrderHistoryAdapter(
 //                            viewModel.refreshOrders()
                         }
                     }
-//                    deadlineDate.apply {
-//                        visibility = View.VISIBLE
-//                        text = formatDatePay(order.updatedAt)
-//                    }
                 }
                 "processed" -> {
                     // Untuk status processed, tampilkan "Hubungi Penjual"
@@ -215,15 +213,6 @@ class OrderHistoryAdapter(
                         visibility = View.VISIBLE
                         text = itemView.context.getString(R.string.dl_processed)
                     }
-                    // gabisa complaint
-//                    btnLeft.apply {
-//                        visibility = View.VISIBLE
-//                        text = itemView.context.getString(R.string.canceled_order_btn)
-//                        setOnClickListener {
-//                            showCancelOrderDialog(order.orderId.toString())
-//                            viewModel.refreshOrders()
-//                        }
-//                    }
                 }
                 "shipped" -> {
                     // Untuk status shipped, tampilkan "Lacak Pengiriman" dan "Terima Barang"
@@ -250,9 +239,18 @@ class OrderHistoryAdapter(
                             callbacks.onShowLoading(true)
 
                             // Call ViewModel
-                            viewModel.confirmOrderCompleted(order.orderId, "completed")
+                            PopUpDialog.showConfirmDialog(
+                                context = itemView.context,
+                                title = "Apakah anda yakin pesanan sudah sampai?",
+                                message = "Pastikan pesanan sudah samapi di alamat tujuan",
+                                positiveText = "Ya",
+                                negativeText = "Tidak",
+                                onYesClicked = {
+                                    viewModel.confirmOrderCompleted(order.orderId, "completed")
+                                    listener.onDialogConfirmed()
+                                }
+                            )
 //                            viewModel.refreshOrders()
-
                         }
 
                     }
@@ -517,14 +515,14 @@ class OrderHistoryAdapter(
                     } else {
                         // Log error and show a Toast instead if we can't get a FragmentManager
                         Log.e("OrderHistoryAdapter", "Cannot show bottom sheet: Context is not a FragmentActivity")
-                        Toast.makeText(context, "Cannot show cancel order dialog", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(context, "Terjadi kendala di batalkan pesanan", Toast.LENGTH_SHORT).show()
                         return
                     }
                 }
                 else -> {
                     // Log error and show a Toast instead if we can't get a FragmentManager
                     Log.e("OrderHistoryAdapter", "Cannot show bottom sheet: Context is not a FragmentActivity")
-                    Toast.makeText(context, "Cannot show cancel order dialog", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, "Terjadi kendala di batalkan pesanan", Toast.LENGTH_SHORT).show()
                     return
                 }
             }
@@ -533,9 +531,19 @@ class OrderHistoryAdapter(
             val bottomSheet = CancelOrderBottomSheet(
                 orderId = orderId,
                 onOrderCancelled = {
-                    callbacks.onOrderCancelled(orderId.toString(), true, "Order cancelled successfully")
+
-                    // Show a success message
+                    PopUpDialog.showConfirmDialog(
-                    Toast.makeText(context, "Order cancelled successfully", Toast.LENGTH_SHORT).show()
+                        context = itemView.context,
+                        title = "Apakah anda yakin ingin membatalkan pesanan?",
+                        positiveText = "Ya",
+                        negativeText = "Tidak",
+                        onYesClicked = {
+                            callbacks.onOrderCancelled(orderId.toString(), true, "Order cancelled successfully")
+                            // Show a success message
+                            Toast.makeText(context, "Pesanan berhasil dibatalkan", Toast.LENGTH_SHORT).show()
+                            listener.onDialogConfirmed()
+                        }
+                    )
                 }
             )
 
@@ -547,18 +555,10 @@ class OrderHistoryAdapter(
             // Use ViewModel to fetch order details
             viewModel.getOrderDetails(order.orderId)
 
-            // Create loading dialog
-//            val loadingDialog = Dialog(itemView.context).apply {
-//                requestWindowFeature(Window.FEATURE_NO_TITLE)
-//                setContentView(R.layout.dialog_loading)
-//                window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-//                setCancelable(false)
-//            }
-//            loadingDialog.show()
-
             viewModel.error.observe(itemView.findViewTreeLifecycleOwner()!!) { errorMsg ->
                 if (!errorMsg.isNullOrEmpty()) {
-                    Toast.makeText(itemView.context, errorMsg, Toast.LENGTH_SHORT).show()
+                    Log.e("OrderHistoryAdapter", "Error $errorMsg")
+                    Toast.makeText(itemView.context, "Terdapat kendala di tambah ulasan", Toast.LENGTH_SHORT).show()
                 }
             }
 
@@ -594,7 +594,7 @@ class OrderHistoryAdapter(
                 } else {
                     Toast.makeText(
                         itemView.context,
-                        "No items to review",
+                        "Tidak ada produk untuk direview",
                         Toast.LENGTH_SHORT
                     ).show()
                 }
@@ -623,4 +623,8 @@ class OrderHistoryAdapter(
             }
         }
     }
+}
+
+interface OnDialogActionListener {
+    fun onDialogConfirmed()
 }

app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderHistoryFragment.kt

@@ -44,8 +44,6 @@ class OrderHistoryFragment : Fragment() {
         sessionManager = SessionManager(requireContext())
 
         setupViewPager()
-
-
     }
 
     private fun setupViewPager() {
@@ -67,17 +65,25 @@ class OrderHistoryFragment : Fragment() {
             }
         }.attach()
 
+        statusPage()
+    }
+
+    private fun statusPage(){
         binding.viewPager.registerOnPageChangeCallback(
             object : ViewPager2.OnPageChangeCallback() {
                 override fun onPageSelected(position: Int) {
                     val status = viewPagerAdapter.orderStatuses[position]
-                    /* setStatus() is the API we added earlier; TRUE → always re‑query */
                     historyVm.updateStatus(status, forceRefresh = true)
                 }
             }
         )
     }
 
+    override fun onResume() {
+        super.onResume()
+        statusPage()
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

app/src/main/java/com/alya/ecommerce_serang/ui/order/history/OrderListFragment.kt

@@ -3,6 +3,7 @@ package com.alya.ecommerce_serang.ui.order.history
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -23,7 +24,7 @@ import com.alya.ecommerce_serang.ui.order.history.detailorder.DetailOrderStatusA
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
 import com.alya.ecommerce_serang.utils.SessionManager
 
-class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
+class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks, OnDialogActionListener {
 
     private var _binding: FragmentOrderListBinding? = null
     private val binding get() = _binding!!
@@ -84,8 +85,6 @@ class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
         setupRecyclerView()
         observeOrderList()
         observeViewModel()
-//        observeOrderCompletionStatus()
-//        loadOrders()
     }
 
     private fun setupRecyclerView() {
@@ -94,7 +93,8 @@ class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
                 navigateToOrderDetail(order)
             },
             viewModel = viewModel,
-            callbacks = this // Pass this fragment as callback
+            callbacks = this,
+            listener = this// Pass this fragment as callback
         )
 
         orderAdapter.setFragmentStatus(status)
@@ -106,31 +106,6 @@ class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
     }
 
     private fun observeOrderList() {
-        // Now we only need to observe one LiveData for all cases
-//        viewModel.orders.observe(viewLifecycleOwner) { result ->
-//            when (result) {
-//                is ViewState.Success -> {
-//                    binding.progressBar.visibility = View.GONE
-//
-//                    if (result.data.isNullOrEmpty()) {
-//                        binding.tvEmptyState.visibility = View.VISIBLE
-//                        binding.rvOrders.visibility = View.GONE
-//                    } else {
-//                        binding.tvEmptyState.visibility = View.GONE
-//                        binding.rvOrders.visibility = View.VISIBLE
-//                        orderAdapter.submitList(result.data)
-//                    }
-//                }
-//                is ViewState.Error -> {
-//                    binding.progressBar.visibility = View.GONE
-//                    binding.tvEmptyState.visibility = View.VISIBLE
-//                    Toast.makeText(requireContext(), result.message, Toast.LENGTH_SHORT).show()
-//                }
-//                is ViewState.Loading -> {
-//                    binding.progressBar.visibility = View.VISIBLE
-//                }
-//            }
-//        }
         viewLifecycleOwner.lifecycleScope.launchWhenStarted {
             viewModel.orders.collect { state ->
                 when (state) {
@@ -141,7 +116,7 @@ class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
                         binding.progressBar.isVisible = false
                         binding.tvEmptyState.isVisible = true
                         binding.rvOrders.isVisible = false
-                        Toast.makeText(requireContext(), state.message, Toast.LENGTH_SHORT).show()
+                        Log.e("OrderListFragment", "Error in order list: ${state.message}")
                     }
                     is ViewState.Success -> {
                         binding.progressBar.isVisible = false
@@ -157,47 +132,19 @@ class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
     }
 
     private fun observeViewModel() {
-        // Observe order completion
-//        viewModel.orderCompletionStatus.observe(viewLifecycleOwner) { result ->
-//            when (result) {
-//                is Result.Success -> {
-//                    Toast.makeText(requireContext(), "Order completed successfully!", Toast.LENGTH_SHORT).show()
-////                    loadOrders() // Refresh here
-//                }
-//                is Result.Error -> {
-//                    Toast.makeText(requireContext(), "Failed: ${result.exception.message}", Toast.LENGTH_SHORT).show()
-//                }
-//                is Result.Loading -> {
-//                    // Show loading if needed
-//                }
-//            }
-//        }
-//
-//        // Observe cancel order status
-//        viewModel.cancelOrderStatus.observe(viewLifecycleOwner) { result ->
-//            when (result) {
-//                is Result.Success -> {
-//                    Toast.makeText(requireContext(), "Order cancelled successfully!", Toast.LENGTH_SHORT).show()
-//                    loadOrders() // Refresh here
-//                }
-//                is Result.Error -> {
-//                    Toast.makeText(requireContext(), "Failed to cancel: ${result.exception.message}", Toast.LENGTH_SHORT).show()
-//                }
-//                is Result.Loading -> {
-//                    // Show loading if needed
-//                }
-//            }
-//        }
         viewModel.orderCompletionStatus.observe(viewLifecycleOwner) { result ->
             when (result) {
                 is Result.Success -> {
                     Toast.makeText(requireContext(),
-                        "Order completed!", Toast.LENGTH_SHORT).show()
+                        "Pesanan Selesai", Toast.LENGTH_SHORT).show()
+                    Log.d("OrderListFragment", "Order selesai")
                     viewModel.updateStatus(status, forceRefresh = true)
                 }
                 is Result.Error ->
-                    Toast.makeText(requireContext(),
+//                    Toast.makeText(requireContext(),
-                        "Failed: ${result.exception.message}", Toast.LENGTH_SHORT).show()
+//                        "Failed: ${result.exception.message}", Toast.LENGTH_SHORT).show()
+                    Log.e("OrderListFragment", "Failed: ${result.exception.message}")
+
                 else -> { /* Loading → no UI change */ }
             }
         }
@@ -206,31 +153,19 @@ class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
             when (result) {
                 is Result.Success -> {
                     Toast.makeText(requireContext(),
-                        "Order cancelled!", Toast.LENGTH_SHORT).show()
+                        "Pesanan Dibatalkan", Toast.LENGTH_SHORT).show()
+                    Log.d("OrderListFragment", "Order dibatalkan")
                     viewModel.updateStatus(status, forceRefresh = true)
                 }
                 is Result.Error ->
-                    Toast.makeText(requireContext(),
+                    Log.e("OrderListFragment", "Failed: ${result.exception.message}")
-                        "Failed: ${result.exception.message}", Toast.LENGTH_SHORT).show()
+//                    Toast.makeText(requireContext(),
+//                        "Failed: ${result.exception.message}", Toast.LENGTH_SHORT).show()
                 else -> { /* Loading */ }
             }
         }
     }
 
-//    private fun loadOrders() {
-//        // Simple - just call getOrderList for any status including "all"
-//        viewModel.getOrderList(status)
-//    }
-
-//    private val detailOrderLauncher = registerForActivityResult(
-//        ActivityResultContracts.StartActivityForResult()
-//    ) { result ->
-//        if (result.resultCode == Activity.RESULT_OK) {
-//            // Refresh order list when returning with OK result
-////            loadOrders()
-//        }
-//    }
-
     private fun navigateToOrderDetail(order: OrdersItem) {
         val intent = Intent(requireContext(), DetailOrderStatusActivity::class.java).apply {
             putExtra("ORDER_ID", order.orderId)
@@ -239,11 +174,9 @@ class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
         detailOrderLauncher.launch(intent)
     }
 
-
-
     override fun onOrderCancelled(orderId: String, success: Boolean, message: String) {
         if (success) {
-            Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+            Log.d("OrderListFragment", "Order cancel success: $message")
 //            loadOrders() // Refresh the list
             if (success) viewModel.updateStatus(status, forceRefresh = true)
 
@@ -254,11 +187,13 @@ class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
 
     override fun onOrderCompleted(orderId: Int, success: Boolean, message: String) {
         if (success) {
-            Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "Pesanan selesai", Toast.LENGTH_SHORT).show()
+            Log.d("OrderListFragment", "Pesanan selesai: $message")
 //            loadOrders() // Refresh the list
             if (success) viewModel.updateStatus(status, forceRefresh = true)
         } else {
-            Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+            Log.e("OrderListFragment", "Error Order Complete: $message")
+            Toast.makeText(requireContext(), "Terdapat kendala di pesanan selesai", Toast.LENGTH_SHORT).show()
         }
     }
 
@@ -271,20 +206,18 @@ class OrderListFragment : Fragment(), OrderHistoryAdapter.OrderActionCallbacks {
         _binding = null
     }
 
-//    private fun observeOrderCompletionStatus() {
+    override fun onResume() {
-//        viewModel.orderCompletionStatus.observe(viewLifecycleOwner) { result ->
+        super.onResume()
-//            when (result) {
+        observeOrderList()
-//                is Result.Loading -> {
+    }
-//                    // Handle loading state if needed
+
-//                }
+    override fun onDialogConfirmed() {
-//                is Result.Success -> {
+
-//                    Toast.makeText(requireContext(), "Order completed successfully!", Toast.LENGTH_SHORT).show()
+        viewModel.refresh(status)
-////                    loadOrders()
+        // Option 1: refresh seluruh fragment
-//                }
+        requireActivity().supportFragmentManager.beginTransaction()
-//                is Result.Error -> {
+            .detach(this)
-//                    Toast.makeText(requireContext(), "Failed to complete order: ${result.exception.message}", Toast.LENGTH_SHORT).show()
+            .attach(this)
-//                }
+            .commit()
-//            }
+    }
-//        }
-//    }
 }

app/src/main/java/com/alya/ecommerce_serang/ui/order/history/cancelorder/CancelOrderBottomSheet.kt

@@ -67,7 +67,7 @@ class CancelOrderBottomSheet(
 
         btnConfirm.setOnClickListener {
             if (selectedReason == null) {
-                Toast.makeText(context, "Please select a reason", Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, "Pilih alasan pembatalan", Toast.LENGTH_SHORT).show()
                 return@setOnClickListener
             }
 
@@ -130,13 +130,6 @@ class CancelOrderBottomSheet(
                 is Result.Success -> {
                     // Hide loading indicator
                     showLoading(false)
-
-                    // Show success message
-                    Toast.makeText(
-                        context,
-                        "Pesanan berhasil dibatalkan",
-                        Toast.LENGTH_SHORT
-                    ).show()
                     Log.d(TAG, "Cancel order status: SUCCESS, message: ${result.data.message}")
 
                     // Notify callback and close dialog

app/src/main/java/com/alya/ecommerce_serang/ui/order/review/CreateReviewActivity.kt

@@ -90,7 +90,7 @@ class CreateReviewActivity : AppCompatActivity() {
                     )
                 })
             } catch (e: Exception) {
-                Toast.makeText(this, "Error loading review items", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Gagal memuat ulasan", Toast.LENGTH_SHORT).show()
                 finish()
             }
         } else {
@@ -110,7 +110,7 @@ class CreateReviewActivity : AppCompatActivity() {
                     )
                 )
             } else {
-                Toast.makeText(this, "No items to review", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Tidak ada produk untuk direview", Toast.LENGTH_SHORT).show()
                 finish()
             }
         }

app/src/main/java/com/alya/ecommerce_serang/ui/product/DetailProductActivity.kt

@@ -1,18 +1,26 @@
 package com.alya.ecommerce_serang.ui.product
 
+import android.app.Dialog
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.util.Log
 import android.view.View
+import android.view.ViewGroup
+import android.view.Window
 import android.widget.Button
 import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SwitchCompat
+import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -36,6 +44,9 @@ import com.alya.ecommerce_serang.ui.product.storeDetail.StoreDetailActivity
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
 import com.alya.ecommerce_serang.utils.SessionManager
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.transition.Transition
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import java.text.NumberFormat
 import java.util.Locale
@@ -51,6 +62,8 @@ class DetailProductActivity : AppCompatActivity() {
     private var isWholesaleSelected: Boolean = false
     private var minOrder: Int = 0
 
+    private var TAG = "DetailProductActivity"
+
     private val viewModel: ProductUserViewModel by viewModels {
         BaseViewModelFactory {
             val apiService = ApiConfig.getApiService(sessionManager)
@@ -112,13 +125,17 @@ class DetailProductActivity : AppCompatActivity() {
             when (result) {
                 is Result.Success -> {
                     updateStoreInfo(result.data)
+                    binding.progressBarDetailStore.visibility = View.GONE
                 }
                 is Result.Error -> {
                     // Show error message, maybe a Toast or Snackbar
-                    Toast.makeText(this, "Failed to load store: ${result.exception.message}", Toast.LENGTH_SHORT).show()
+                    binding.progressBarDetailStore.visibility = View.GONE
+                    Log.e("DetailProfileActivity", "Failed to load store: ${result.exception.message}")
+                    Toast.makeText(this, "Kendala memuat toko", Toast.LENGTH_SHORT).show()
                 }
                 is Result.Loading -> {
                     // Show loading indicator if needed
+                    binding.progressBarDetailStore.visibility = View.VISIBLE
                 }
             }
         }
@@ -160,6 +177,10 @@ class DetailProductActivity : AppCompatActivity() {
             val products = viewModel.otherProducts.value.orEmpty()
             if (products.isNotEmpty()) {
                 updateOtherProducts(products, storeMap)
+            } else {
+                binding.emptyOtherProducts.visibility = View.VISIBLE
+                binding.recyclerViewOtherProducts.visibility = View.GONE
+                binding.tvViewAllProducts.visibility = View.GONE
             }
         }
     }
@@ -190,12 +211,14 @@ class DetailProductActivity : AppCompatActivity() {
     private fun updateOtherProducts(products: List<ProductsItem>, storeMap: Map<Int, StoreItem>) {
         if (products.isEmpty()) {
             Log.d("DetailProductActivity", "Product list is empty, hiding RecyclerView")
-            binding.recyclerViewOtherProducts.visibility = View.VISIBLE
+            binding.recyclerViewOtherProducts.visibility = View.GONE
+            binding.emptyOtherProducts.visibility = View.VISIBLE
             binding.tvViewAllProducts.visibility = View.GONE
         } else {
             Log.d("DetailProductActivity", "Displaying product list in RecyclerView")
             binding.recyclerViewOtherProducts.visibility = View.VISIBLE
             binding.tvViewAllProducts.visibility = View.VISIBLE
+            binding.emptyOtherProducts.visibility = View.GONE
 
             productAdapter = OtherProductAdapter(products, onClick = { product ->
                 handleProductClick(product)
@@ -282,6 +305,16 @@ class DetailProductActivity : AppCompatActivity() {
             .placeholder(R.drawable.placeholder_image)
             .into(binding.ivProductImage)
 
+        binding.ivProductImage.setOnClickListener {
+            val img = product.image
+            if (!img.isNullOrEmpty()){
+                showDetailProduct(img)
+            }else {
+                Toast.makeText(this, "Gambar tidak tersedia", Toast.LENGTH_SHORT).show()
+                Log.e(TAG, "There is no photo product")
+            }
+        }
+
         val ratingStr = product.rating
         val ratingValue = ratingStr?.toFloatOrNull()
 
@@ -316,11 +349,13 @@ class DetailProductActivity : AppCompatActivity() {
         val limitedReviewList = if (reviewList.isNotEmpty()) listOf(reviewList.first()) else emptyList()
         if (reviewList.isEmpty()) {
             binding.recyclerViewReviews.visibility = View.GONE
+            binding.emptyReview.visibility = View.VISIBLE
             binding.tvViewAllReviews.visibility = View.GONE
 //            binding.tvNoReviews.visibility = View.VISIBLE
         } else {
             binding.recyclerViewReviews.visibility = View.VISIBLE
             binding.tvViewAllReviews.visibility = View.VISIBLE
+            binding.emptyReview.visibility = View.GONE
         }
 //            binding.tvNoReviews.visibility = View.GONE
         reviewsAdapter = ReviewsAdapter(
@@ -519,7 +554,64 @@ class DetailProductActivity : AppCompatActivity() {
             attachProduct = true // This will auto-attach the product!
 
         )
+    }
 
+    private fun showDetailProduct(photoProduct: String) {
+        val dialog = Dialog(this)
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.setContentView(R.layout.dialog_image_viewer)
+        dialog.setCancelable(true)
+
+        // Set dialog to fullscreen
+        val window = dialog.window
+        window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        window?.setBackgroundDrawable(Color.WHITE.toDrawable())
+
+        // Get views from dialog
+        val imageView = dialog.findViewById<ImageView>(R.id.iv_payment_evidence)
+        val btnClose = dialog.findViewById<ImageButton>(R.id.btn_close)
+        val tvTitle = dialog.findViewById<TextView>(R.id.tv_title)
+        val progressBar = dialog.findViewById<ProgressBar>(R.id.progress_bar)
+
+        tvTitle.text = "Gambar Produk"
+        val fullImageUrl =
+            if (photoProduct.startsWith("/")) BASE_URL + photoProduct.substring(1)
+            else photoProduct
+
+        progressBar.visibility = View.VISIBLE
+
+        Glide.with(this)
+            .load(fullImageUrl)
+            .placeholder(R.drawable.placeholder_image)
+            .error(R.drawable.placeholder_image)
+            .diskCacheStrategy(DiskCacheStrategy.ALL)
+            .into(object : CustomTarget<Drawable>() {
+                override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
+                    progressBar.visibility = View.GONE
+                    imageView.setImageDrawable(resource)
+                }
+
+                override fun onLoadCleared(placeholder: Drawable?) {
+                    progressBar.visibility = View.GONE
+                    imageView.setImageDrawable(placeholder)
+                }
+
+                override fun onLoadFailed(errorDrawable: Drawable?) {
+                    progressBar.visibility = View.GONE
+                    imageView.setImageDrawable(errorDrawable)
+                    Toast.makeText(this@DetailProductActivity, "Gagal memuat gambar", Toast.LENGTH_SHORT).show()
+                }
+            })
+
+        btnClose.setOnClickListener { dialog.dismiss() }
+        imageView.setOnClickListener { dialog.dismiss() }
+
+        dialog.show()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        loadData()
     }
 
     companion object {

app/src/main/java/com/alya/ecommerce_serang/ui/product/category/CategoryProductsActivity.kt

@@ -88,13 +88,14 @@ class CategoryProductsActivity : AppCompatActivity() {
             setSupportActionBar(toolbar)
             supportActionBar?.apply {
                 setDisplayHomeAsUpEnabled(true)
-//                title = category.name
+                title = ""
             }
 
-            val fullImageUrl = if (category.image.startsWith("/")) {
+            val fullImageUrl = when (val img = category.image) {
-                BASE_URL + category.image.removePrefix("/") // Append base URL if the path starts with "/"
+                is String -> {
-            } else {
+                    if (img.startsWith("/")) BASE_URL + img.substring(1) else img
-                category.image // Use as is if it's already a full URL
+                }
+                else -> null
             }
 
             // Load category image

app/src/main/java/com/alya/ecommerce_serang/ui/product/category/ProductsCategoryAdapter.kt

@@ -3,7 +3,7 @@ package com.alya.ecommerce_serang.ui.product.category
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.alya.ecommerce_serang.BuildConfig
+import com.alya.ecommerce_serang.BuildConfig.BASE_URL
 import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.dto.ProductsItem
 import com.alya.ecommerce_serang.databinding.ItemProductGridBinding
@@ -46,8 +46,15 @@ class ProductsCategoryAdapter(
                 val priceValue = product.price.toDoubleOrNull() ?: 0.0
                 tvProductPrice.text = "Rp ${NumberFormat.getNumberInstance(Locale("id", "ID")).format(priceValue.toInt())}"
                 // Load product image
+
+                val fullImageUrl = when (val img = product.image) {
+                    is String -> {
+                        if (img.startsWith("/")) BASE_URL + img.substring(1) else img
+                    }
+                    else -> null
+                }
                 Glide.with(itemView.context)
-                    .load("${BuildConfig.BASE_URL}${product.image}")
+                    .load(fullImageUrl)
                     .placeholder(R.drawable.placeholder_image)
                     .error(R.drawable.placeholder_image)
                     .centerCrop()
@@ -57,15 +64,6 @@ class ProductsCategoryAdapter(
                 root.setOnClickListener {
                     onClick(product)
                 }
-
-//                // Optional: Show stock status
-//                if (product.stock > 0) {
-//                    tvStockStatus.text = "Stock: ${product.stock}"
-//                    tvStockStatus.setTextColor(ContextCompat.getColor(itemView.context, R.color.green))
-//                } else {
-//                    tvStockStatus.text = "Out of Stock"
-//                    tvStockStatus.setTextColor(ContextCompat.getColor(itemView.context, R.color.red))
-//                }
             }
         }
     }

app/src/main/java/com/alya/ecommerce_serang/ui/product/storeDetail/StoreDetailActivity.kt

@@ -64,10 +64,9 @@ class StoreDetailActivity : AppCompatActivity() {
             )
             windowInsets
         }
-
+        loadData()
         setupUI()
         setupObservers()
-        loadData()
     }
 
     private fun setupUI() {
@@ -88,15 +87,18 @@ class StoreDetailActivity : AppCompatActivity() {
         viewModel.storeDetail.observe(this) { result ->
             when (result) {
                 is Result.Success -> {
+                    binding.progressBarDetailProdItem.visibility = View.GONE
                     updateStoreInfo(result.data)
                     viewModel.loadOtherProducts(result.data.storeId)
                 }
                 is Result.Error -> {
                     // Show error message, maybe a Toast or Snackbar
+                    binding.progressBarDetailProdItem.visibility = View.GONE
                     Toast.makeText(this, "Failed to load store: ${result.exception.message}", Toast.LENGTH_SHORT).show()
                 }
                 is Result.Loading -> {
                     // Show loading indicator if needed
+                    binding.progressBarDetailProdItem.visibility = View.VISIBLE
                 }
             }
         }
@@ -109,6 +111,9 @@ class StoreDetailActivity : AppCompatActivity() {
             val products = viewModel.otherProducts.value.orEmpty()
             if (products.isNotEmpty()) {
                 updateProducts(products, storeMap)
+            } else {
+                binding.progressBarDetailProdItem.visibility = View.VISIBLE
+                binding.rvProducts.visibility = View.GONE
             }
         }
     }
@@ -146,7 +151,7 @@ class StoreDetailActivity : AppCompatActivity() {
                 .into(binding.ivStoreImage)
 
             val ratingStr = it.storeRating
-            val ratingValue = ratingStr?.toFloatOrNull()
+            val ratingValue = ratingStr?.toFloatOrNull() ?: 0f
 
             if (ratingValue != null && ratingValue > 0f) {
                 binding.tvStoreRating.text = String.format("%.1f", ratingValue)
@@ -161,10 +166,12 @@ class StoreDetailActivity : AppCompatActivity() {
     private fun updateProducts(products: List<ProductsItem>, storeMap: Map<Int, StoreItem>) {
         if (products.isEmpty()) {
             binding.rvProducts.visibility = View.GONE
+            binding.progressBarDetailProdItem.visibility = View.VISIBLE
             Log.d("StoreDetailActivity", "Product list is empty, hiding RecyclerView")
         } else {
             Log.d("StoreDetailActivity", "Displaying product list in RecyclerView")
 
+            binding.progressBarDetailProdItem.visibility = View.GONE
             binding.rvProducts.visibility = View.VISIBLE
             productAdapter = HorizontalProductAdapter(products, onClick = { product ->
                 handleProductClick(product)

app/src/main/java/com/alya/ecommerce_serang/ui/product/storeDetail/StoreDetailViewModel.kt

@@ -45,11 +45,11 @@ class StoreDetailViewModel (private val repository: ProductRepository
                     } // Filter by storeId and exclude current product
                     _otherProducts.value = filteredProducts // Update LiveData
                 } else if (result is Result.Error) {
-                    Log.e("ProductViewModel", "Error loading other products: ${result.exception.message}")
+                    Log.e("StoreDetailViewModel", "Error loading other products: ${result.exception.message}")
                     _otherProducts.value = emptyList() // Set empty list on failure
                 }
             } catch (e: Exception) {
-                Log.e("ProductViewModel", "Exception loading other products: ${e.message}")
+                Log.e("StoreDetailViewModel", "Exception loading other products: ${e.message}")
                 _otherProducts.value = emptyList()
             }
         }
@@ -67,7 +67,7 @@ class StoreDetailViewModel (private val repository: ProductRepository
                     loadStoreDetail(storeId)
                 }
             } catch (e: Exception) {
-                Log.e("ProductViewModel", "Error loading product details: ${e.message}")
+                Log.e("StoreDetailViewModel", "Error loading product details: ${e.message}")
                 _error.value = "Failed to load product details: ${e.message}"
             } finally {
                 _isLoading.value = false
@@ -82,7 +82,7 @@ class StoreDetailViewModel (private val repository: ProductRepository
                 val result = repository.fetchStoreDetail(storeId)
                 _storeDetail.value = result
             } catch (e: Exception) {
-                Log.e("ProductViewModel", "Error loading store details: ${e.message}")
+                Log.e("StoreDetailViewModel", "Error loading store details: ${e.message}")
                 _storeDetail.value = Result.Error(e)
             }
         }
@@ -99,10 +99,10 @@ class StoreDetailViewModel (private val repository: ProductRepository
                     if (result is Result.Success) {
                         map[storeId] = result.data
                     } else if (result is Result.Error) {
-                        Log.e("ProductViewModel", "Failed to load storeId $storeId", result.exception)
+                        Log.e("StoreDetailViewModel", "Failed to load storeId $storeId", result.exception)
                     }
                 } catch (e: Exception) {
-                    Log.e("ProductViewModel", "Exception fetching storeId $storeId", e)
+                    Log.e("StoreDetailViewModel", "Exception fetching storeId $storeId", e)
                 }
             }
 

app/src/main/java/com/alya/ecommerce_serang/ui/profile/ChangePasswordActivity.kt

@@ -0,0 +1,79 @@
+package com.alya.ecommerce_serang.ui.profile
+
+import android.os.Bundle
+import android.widget.Toast
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.lifecycle.Observer
+import com.alya.ecommerce_serang.R
+import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
+import com.alya.ecommerce_serang.data.api.retrofit.ApiService
+import com.alya.ecommerce_serang.data.repository.Result
+import com.alya.ecommerce_serang.data.repository.UserRepository
+import com.alya.ecommerce_serang.databinding.ActivityChangePasswordBinding
+import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.SessionManager
+import com.alya.ecommerce_serang.utils.viewmodel.ProfileViewModel
+import kotlin.getValue
+
+class ChangePasswordActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityChangePasswordBinding
+    private lateinit var apiService: ApiService
+    private lateinit var sessionManager: SessionManager
+
+    private val viewModel: ProfileViewModel by viewModels {
+        BaseViewModelFactory {
+            apiService = ApiConfig.getApiService(sessionManager)
+            val userRepository = UserRepository(apiService)
+            ProfileViewModel(userRepository)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityChangePasswordBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        sessionManager = SessionManager(this)
+
+        binding.header.headerTitle.text = "Ubah Kata Sandi"
+        binding.header.headerLeftIcon.setOnClickListener {
+            onBackPressedDispatcher.onBackPressed()
+            finish()
+        }
+
+        // Listen for the result of the password change
+        viewModel.changePasswordResult.observe(this, Observer { result ->
+            when (result) {
+                is Result.Error -> {
+                    Toast.makeText(
+                        this,
+                        "Gagal mengubah kata sandi: ${result.exception.message}",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+                is Result.Success -> {
+                    Toast.makeText(this, "Berhasil mengubah kata sandi", Toast.LENGTH_SHORT).show()
+                    finish()
+                }
+                is Result.Loading -> {}
+            }
+        })
+
+        // Button to trigger password change
+        binding.btnChangePass.setOnClickListener {
+            val currentPassword = binding.etLoginPassword.text.toString()
+            val newPassword = binding.etLoginNewPassword.text.toString()
+
+            if (currentPassword.isNotEmpty() && newPassword.isNotEmpty()) {
+                // Call change password function from ViewModel
+                viewModel.changePassword(currentPassword, newPassword)
+            } else {
+                Toast.makeText(this, "Lengkapi data", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+}

app/src/main/java/com/alya/ecommerce_serang/ui/profile/DetailProfileActivity.kt

@@ -90,6 +90,8 @@ class DetailProfileActivity : AppCompatActivity() {
             Log.e("DetailProfileActivity", "Error from ViewModel: $error")
             Toast.makeText(this, error, Toast.LENGTH_SHORT).show()
         }
+
+
     }
 
     private fun setupClickListeners() {
@@ -106,7 +108,8 @@ class DetailProfileActivity : AppCompatActivity() {
                 }
                 editProfileLauncher.launch(intent)
             } ?: run {
-                Toast.makeText(this, "Profile data is not available", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "Akun tidak ditemukan", Toast.LENGTH_SHORT).show()
+                Log.e("DetailProfileActivity", "Profile data is not available")
             }
         }
     }

app/src/main/java/com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt

@@ -1,6 +1,5 @@
 package com.alya.ecommerce_serang.ui.profile
 
-import android.app.AlertDialog
 import android.app.ProgressDialog
 import android.content.Intent
 import android.os.Bundle
@@ -20,13 +19,14 @@ import com.alya.ecommerce_serang.data.repository.MyStoreRepository
 import com.alya.ecommerce_serang.data.repository.UserRepository
 import com.alya.ecommerce_serang.databinding.FragmentProfileBinding
 import com.alya.ecommerce_serang.ui.auth.LoginActivity
-import com.alya.ecommerce_serang.ui.profile.mystore.RegisterStoreActivity
 import com.alya.ecommerce_serang.ui.order.address.AddressActivity
 import com.alya.ecommerce_serang.ui.order.history.HistoryActivity
 import com.alya.ecommerce_serang.ui.profile.mystore.MyStoreActivity
+import com.alya.ecommerce_serang.ui.profile.mystore.RegisterStoreActivity
 import com.alya.ecommerce_serang.ui.profile.mystore.StoreOnReviewActivity
 import com.alya.ecommerce_serang.ui.profile.mystore.StoreSuspendedActivity
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.SessionManager
 import com.alya.ecommerce_serang.utils.viewmodel.MyStoreViewModel
 import com.alya.ecommerce_serang.utils.viewmodel.ProfileViewModel
@@ -58,7 +58,6 @@ class ProfileFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        sessionManager = SessionManager(requireContext())
     }
 
     override fun onCreateView(
@@ -72,26 +71,59 @@ class ProfileFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        sessionManager = SessionManager(requireContext())
+
+        if (!sessionManager.isLoggedIn()) {
+            // Redirect to LoginActivity
+            binding.tvName.text = "Selamat Datang"
+            binding.tvUsername.text = "Silahkan masuk"
+            binding.btnDetailProfile.text = "Masuk"
+            binding.btnDetailProfile.setOnClickListener {
+                val intent = Intent(requireContext(), LoginActivity::class.java)
+                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                startActivity(intent)
+
+                // ✅ Finish the host activity so user can’t go back
+                requireActivity().finish()
+            }
+
+            binding.containerBukaToko.visibility = View.GONE
+            binding.cardPesanan.visibility = View.GONE
+            binding.tvPengaturanAkun.visibility = View.GONE
+            binding.containerSettings.visibility = View.GONE
+            binding.cardAbout.visibility = View.GONE
+            binding.cardLogout.visibility = View.GONE
+        }
+
+
+        viewModel.loadUserProfile()
+        viewModel.checkStoreUser()
+
         observeUserProfile()
 
         observeStoreStatus()
 
-        viewModel.loadUserProfile()
-        viewModel.checkStoreUser()
 
         binding.cardBukaToko.setOnClickListener{
 //            if (hasStore == true) startActivity(Intent(requireContext(), MyStoreActivity::class.java))
 //            else startActivity(Intent(requireContext(), RegisterStoreActivity::class.java))
             if (viewModel.checkStore.value == true) {
                 myStoreViewModel.loadMyStore()
-                myStoreViewModel.myStoreProfile.observe(viewLifecycleOwner) { store ->
+                myStoreViewModel.myStoreProfile.observe(viewLifecycleOwner) { storeDataResponse ->
-                    store?.let {
+                    storeDataResponse?.let { storeResponse ->
-                        when (store.storeStatus) {
+                        val store = storeResponse.store
+                        when (store.approvalStatus) {
                             "process" -> startActivity(Intent(requireContext(), StoreOnReviewActivity::class.java))
-                            "active" -> startActivity(Intent(requireContext(), MyStoreActivity::class.java))
+                            "rejected" -> startActivity(
-                            "inactive" -> startActivity(Intent(requireContext(), MyStoreActivity::class.java))
+                                Intent(requireContext(), RegisterStoreActivity::class.java)
-                            "suspended" -> startActivity(Intent(requireContext(), StoreSuspendedActivity::class.java))
+                                    .putExtra("REAPPLY", true)
-                            else -> startActivity(Intent(requireContext(), RegisterStoreActivity::class.java))
+                            )
+                            else -> {
+                                when(store.storeStatus){
+                                    "suspended" -> startActivity(Intent(requireContext(), StoreSuspendedActivity::class.java))
+                                    else -> startActivity(Intent(requireContext(), MyStoreActivity::class.java))
+                                }
+                            }
                         }
                     } ?: run {
                         Toast.makeText(requireContext(), "Gagal memuat data toko", Toast.LENGTH_SHORT).show()
@@ -115,6 +147,11 @@ class ProfileFragment : Fragment() {
             startActivity(intent)
         }
 
+        binding.cardChangePass.setOnClickListener{
+            val intent = Intent(requireContext(), ChangePasswordActivity::class.java)
+            startActivity(intent)
+        }
+
         binding.cardLogout.setOnClickListener{
             logout()
         }
@@ -130,7 +167,8 @@ class ProfileFragment : Fragment() {
             user?.let { updateUI(it) }
         }
         viewModel.errorMessage.observe(viewLifecycleOwner) { errorMessage ->
-            Toast.makeText(requireContext(), errorMessage, Toast.LENGTH_SHORT).show()
+//            Toast.makeText(requireContext(), errorMessage, Toast.LENGTH_SHORT).show()
+            Log.e("Profile Fragment", "Failed to load profile: $errorMessage")
         }
     }
 
@@ -162,14 +200,16 @@ class ProfileFragment : Fragment() {
 
     private fun logout(){
 
-        AlertDialog.Builder(requireContext())
+        PopUpDialog.showConfirmDialog(
-            .setTitle("Konfirmasi")
+            context = requireContext(),
-            .setMessage("Apakah anda yakin ingin keluar?")
+            title = "Konfirmasi",
-            .setPositiveButton("Ya") { _, _ ->
+            message = "Apakah anda yakin ingin keluar?",
+            positiveText = "Ya",
+            negativeText = "Tidak",
+            onYesClicked = {
                 actionLogout()
             }
-            .setNegativeButton("Tidak", null)
+        )
-            .show()
     }
 
     private fun actionLogout(){
@@ -186,6 +226,8 @@ class ProfileFragment : Fragment() {
                 sessionManager.clearAll()
                 val intent = Intent(requireContext(), LoginActivity::class.java)
                 startActivity(intent)
+                requireActivity().finish()
+
             } catch (e: Exception) {
                 Toast.makeText(
                     requireContext(),
@@ -196,4 +238,11 @@ class ProfileFragment : Fragment() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.loadUserProfile()
+        viewModel.checkStoreUser()
+    }
+
+
 }

app/src/main/java/com/alya/ecommerce_serang/ui/profile/editprofile/EditProfileCustActivity.kt

@@ -24,16 +24,15 @@ import com.alya.ecommerce_serang.BuildConfig.BASE_URL
 import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.dto.UserProfile
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
-import com.alya.ecommerce_serang.data.api.retrofit.ApiService
 import com.alya.ecommerce_serang.data.repository.Result
 import com.alya.ecommerce_serang.data.repository.UserRepository
 import com.alya.ecommerce_serang.databinding.ActivityEditProfileCustBinding
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.SessionManager
 import com.alya.ecommerce_serang.utils.viewmodel.ProfileViewModel
 import com.bumptech.glide.Glide
 import com.google.gson.Gson
-import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -41,9 +40,9 @@ import java.util.TimeZone
 
 class EditProfileCustActivity : AppCompatActivity() {
     private lateinit var binding: ActivityEditProfileCustBinding
-    private lateinit var apiService: ApiService
     private lateinit var sessionManager: SessionManager
     private var selectedImageUri: Uri? = null
+    private var currentUser: UserProfile? = null
 
     private val viewModel: ProfileViewModel by viewModels {
         BaseViewModelFactory {
@@ -54,7 +53,7 @@ class EditProfileCustActivity : AppCompatActivity() {
     }
 
     private val getContent = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode == Activity.RESULT_OK) {
+        if (result.resultCode == RESULT_OK) {
             val data: Intent? = result.data
             data?.data?.let {
                 selectedImageUri = it
@@ -105,8 +104,8 @@ class EditProfileCustActivity : AppCompatActivity() {
         }
 
         userProfile?.let {
+            currentUser = it
             populateFields(it)
-
             setupClickListeners()
             observeViewModel()
         }
@@ -118,7 +117,7 @@ class EditProfileCustActivity : AppCompatActivity() {
         binding.etNumberPhoneUser.setText(profile.phone)
 
         // Format birth date for display
-        profile.birthDate?.let {
+        profile.birthDate.let {
             binding.etDateBirth.setText(formatDate(it))
         }
 
@@ -156,7 +155,7 @@ class EditProfileCustActivity : AppCompatActivity() {
         }
 
         binding.btnSave.setOnClickListener {
-            saveProfile()
+            if (hasChanged()) confirmUpdate() else finish()
         }
     }
 
@@ -213,25 +212,43 @@ class EditProfileCustActivity : AppCompatActivity() {
         datePickerDialog.show()
     }
 
+    private fun confirmUpdate() {
+
+        PopUpDialog.showConfirmDialog(
+            context = this,
+            title = "Apakah Anda yakin ingin menyimpan perubahan profil?",
+            message = "Pastikan data yang dimasukkan sudah benar",
+            positiveText = "Ya",
+            negativeText = "Tidak",
+            onYesClicked = {
+                saveProfile()
+            }
+        )
+    }
+
+    private fun hasChanged(): Boolean {
+        val name = binding.etNameUser.text.toString() != currentUser?.name
+        val username = binding.etUsername.text.toString() != currentUser?.username
+        val email = binding.etEmailUser.text.toString() != currentUser?.email
+        val phone = binding.etNumberPhoneUser.text.toString() != currentUser?.phone
+        val displayDate = binding.etDateBirth.text.toString() != currentUser?.birthDate.toString()
+        val imgProfile = selectedImageUri != null
+        return name || username || email || phone || displayDate || imgProfile
+    }
+
     private fun saveProfile() {
         val name = binding.etNameUser.text.toString()
         val username = binding.etUsername.text.toString()
         val email = binding.etEmailUser.text.toString()
         val phone = binding.etNumberPhoneUser.text.toString()
         val displayDate = binding.etDateBirth.text.toString()
+        val imgProfile = selectedImageUri
 
-        if (name.isEmpty() || username.isEmpty() || email.isEmpty() || phone.isEmpty() || displayDate.isEmpty()) {
-            Toast.makeText(this, "Semua field harus diisi", Toast.LENGTH_SHORT).show()
-            return
-        }
-
-        // Convert date to server format
         val serverBirthDate = convertToServerDateFormat(displayDate)
 
         Log.d(TAG, "Starting profile save with direct method")
         Log.d(TAG, "Selected image URI: $selectedImageUri")
 
-        // Disable the button to prevent multiple clicks
         binding.btnSave.isEnabled = false
 
         // Call the repository method via ViewModel
@@ -242,82 +259,10 @@ class EditProfileCustActivity : AppCompatActivity() {
             phone = phone,
             birthDate = serverBirthDate,
             email = email,
-            imageUri = selectedImageUri
+            imageUri = imgProfile
         )
     }
 
-    private fun getRealPathFromURI(uri: Uri): String? {
-        Log.d(TAG, "Getting real path from URI: $uri")
-
-        // Handle different URI schemes
-        when {
-            // File URI
-            uri.scheme == "file" -> {
-                val path = uri.path
-                Log.d(TAG, "URI is file scheme, path: $path")
-                return path
-            }
-
-            // Content URI
-            uri.scheme == "content" -> {
-                try {
-                    val projection = arrayOf(MediaStore.Images.Media.DATA)
-                    contentResolver.query(uri, projection, null, null, null)?.use { cursor ->
-                        if (cursor.moveToFirst()) {
-                            val columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
-                            val path = cursor.getString(columnIndex)
-                            Log.d(TAG, "Found path from content URI: $path")
-                            return path
-                        } else {
-                            Log.e(TAG, "Cursor is empty")
-                        }
-                    } ?: Log.e(TAG, "Cursor is null")
-
-                    // If the above fails, try the documented API way
-                    contentResolver.openInputStream(uri)?.use { inputStream ->
-                        // Create a temp file
-                        val fileName = getFileName(uri) ?: "temp_img_${System.currentTimeMillis()}.jpg"
-                        val tempFile = File(cacheDir, fileName)
-                        tempFile.outputStream().use { outputStream ->
-                            inputStream.copyTo(outputStream)
-                        }
-                        Log.d(TAG, "Created temporary file: ${tempFile.absolutePath}")
-                        return tempFile.absolutePath
-                    }
-                } catch (e: Exception) {
-                    Log.e(TAG, "Error getting real path: ${e.message}", e)
-                }
-            }
-        }
-
-        Log.e(TAG, "Could not get real path for URI: $uri")
-        return null
-    }
-
-    private fun getFileName(uri: Uri): String? {
-        var result: String? = null
-        if (uri.scheme == "content") {
-            contentResolver.query(uri, null, null, null, null)?.use { cursor ->
-                if (cursor.moveToFirst()) {
-                    val columnIndex = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
-                    if (columnIndex >= 0) {
-                        result = cursor.getString(columnIndex)
-                        Log.d(TAG, "Found filename from content URI: $result")
-                    }
-                }
-            }
-        }
-        if (result == null) {
-            result = uri.path
-            val cut = result?.lastIndexOf('/') ?: -1
-            if (cut != -1) {
-                result = result?.substring(cut + 1)
-            }
-            Log.d(TAG, "Extracted filename from path: $result")
-        }
-        return result
-    }
-
     private fun formatDate(dateString: String?): String {
         if (dateString.isNullOrEmpty()) return "N/A"
 

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/MyStoreActivity.kt

@@ -59,12 +59,13 @@ class MyStoreActivity : AppCompatActivity() {
             finish()
         }
 
+        viewModel.myStoreProfile.observe(this){ user ->
+            user?.let { myStoreProfileOverview(it.store) }
+        }
+
         viewModel.loadMyStore()
         viewModel.loadMyStoreProducts()
-
+        viewModel.fetchBalance()
-        viewModel.myStoreProfile.observe(this){ user ->
-            user?.let { myStoreProfileOverview(it) }
-        }
 
         viewModel.errorMessage.observe(this) { error ->
             Toast.makeText(this, error, Toast.LENGTH_SHORT).show()
@@ -72,7 +73,6 @@ class MyStoreActivity : AppCompatActivity() {
         setUpClickListeners()
         getCountOrder()
         observeViewModel()
-        viewModel.fetchBalance()
         fetchBalance()
     }
 
@@ -206,6 +206,16 @@ class MyStoreActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        lifecycleScope.launch {
+            viewModel.getAllStatusCounts()
+        }
+        viewModel.loadMyStore()
+        viewModel.loadMyStoreProducts()
+        viewModel.fetchBalance()
+    }
+
     companion object {
         private const val PROFILE_REQUEST_CODE = 100
     }

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/RegisterStoreActivity.kt

@@ -21,22 +21,34 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
+import androidx.core.net.toUri
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import com.alya.ecommerce_serang.R
+import com.alya.ecommerce_serang.data.api.dto.PaymentUpdate
 import com.alya.ecommerce_serang.data.api.response.auth.StoreTypesItem
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
+import com.alya.ecommerce_serang.data.repository.MyStoreRepository
 import com.alya.ecommerce_serang.data.repository.Result
-import com.alya.ecommerce_serang.data.repository.UserRepository
 import com.alya.ecommerce_serang.databinding.ActivityRegisterStoreBinding
 import com.alya.ecommerce_serang.ui.order.address.BankAdapter
 import com.alya.ecommerce_serang.ui.order.address.CityAdapter
 import com.alya.ecommerce_serang.ui.order.address.ProvinceAdapter
 import com.alya.ecommerce_serang.ui.order.address.SubdsitrictAdapter
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.FileUtils
+import com.alya.ecommerce_serang.utils.ImageUtils
+import com.alya.ecommerce_serang.utils.PopUpDialog
+import com.alya.ecommerce_serang.utils.RegisterStoreViewModelFactory
 import com.alya.ecommerce_serang.utils.SessionManager
+import com.alya.ecommerce_serang.utils.viewmodel.MyStoreViewModel
 import com.alya.ecommerce_serang.utils.viewmodel.RegisterStoreViewModel
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.io.File
 
 class RegisterStoreActivity : AppCompatActivity() {
 
@@ -48,22 +60,43 @@ class RegisterStoreActivity : AppCompatActivity() {
     private lateinit var subdistrictAdapter: SubdsitrictAdapter
     private lateinit var bankAdapter: BankAdapter
 
+    // pending values (filled from myStoreProfile once)
+    private var wantedProvinceId: Int? = null
+    private var wantedCityId: String? = null
+    private var wantedSubdistrictId: String? = null
+    private var wantedBankName: String? = null
+
+    // one-shot guards so we don't re-apply repeatedly
+    private var provinceApplied = false
+    private var cityApplied = false
+    private var subdistrictApplied = false
+    private var bankApplied = false
+
+    // avoid clearing/overriding while restoring
+    private var isRestoringSelections = false
+
     // Request codes for file picking
     private val PICK_STORE_IMAGE_REQUEST = 1001
     private val PICK_KTP_REQUEST = 1002
     private val PICK_NPWP_REQUEST = 1003
     private val PICK_NIB_REQUEST = 1004
+    private var isReapply: Boolean = false
 
     // Location request code
     private val LOCATION_PERMISSION_REQUEST = 2001
 
     private val viewModel: RegisterStoreViewModel by viewModels {
+        RegisterStoreViewModelFactory(this, intent.extras)
+    }
+
+    private val myStoreViewModel: MyStoreViewModel by viewModels {
         BaseViewModelFactory {
-            val apiService = ApiConfig.Companion.getApiService(sessionManager)
+            val apiService = ApiConfig.getApiService(sessionManager)
-            val orderRepository = UserRepository(apiService)
+            val myStoreRepository = MyStoreRepository(apiService)
-            RegisterStoreViewModel(orderRepository)
+            MyStoreViewModel(myStoreRepository)
         }
     }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityRegisterStoreBinding.inflate(layoutInflater)
@@ -89,6 +122,8 @@ class RegisterStoreActivity : AppCompatActivity() {
 
         setupHeader()
 
+        isReapply = intent.getBooleanExtra("REAPPLY", false)
+
         provinceAdapter = ProvinceAdapter(this)
         cityAdapter = CityAdapter(this)
         subdistrictAdapter = SubdsitrictAdapter(this)
@@ -101,6 +136,10 @@ class RegisterStoreActivity : AppCompatActivity() {
         setupSpinners() // Location spinners
         Log.d(TAG, "onCreate: Spinners setup completed")
 
+        binding.checkboxApprove.setOnCheckedChangeListener { _, _ ->
+            validateRequiredFields()
+        }
+
         // Setup observers
         setupStoreTypesObserver() // Store type observer
         setupObservers()
@@ -129,19 +168,182 @@ class RegisterStoreActivity : AppCompatActivity() {
         viewModel.cityId.observe(this) { validateRequiredFields() }
         viewModel.storeTypeId.observe(this) { validateRequiredFields() }
 
-        // Setup register button
+        if (isReapply) {
-        binding.btnRegister.setOnClickListener {
+            binding.btnRegister.text = "Ajukan Kembali"
-            Log.d(TAG, "Register button clicked")
+            binding.layoutRejected.visibility = View.VISIBLE
-            if (viewModel.validateForm()) {
+
-                Log.d(TAG, "Form validation successful, proceeding with registration")
+            myStoreViewModel.loadMyStore()
-                viewModel.registerStore(this)
+
-            } else {
+            myStoreViewModel.myStoreProfile.observe(this) { storeDataResponse ->
-                Log.e(TAG, "Form validation failed")
+                storeDataResponse?.let { storeResponse ->
-                Toast.makeText(this, "Harap lengkapi semua field yang wajib diisi", Toast.LENGTH_SHORT).show()
+                    val store = storeResponse.store
+                    binding.tvRejectedReason.text = store.approvalReason
+
+                    // Prefill basic fields
+                    binding.etStoreName.setText(store.storeName)
+                    binding.etStoreDescription.setText(store.storeDescription)
+                    binding.etStreet.setText(store.street)
+                    binding.etPostalCode.setText(store.postalCode)
+                    binding.etAddressDetail.setText(store.detail)
+
+                    viewModel.storeName.value = store.storeName
+                    viewModel.storeDescription.value = store.storeDescription
+                    viewModel.street.value = store.street
+                    viewModel.postalCode.value = store.postalCode.toIntOrNull() ?: 0
+                    viewModel.addressDetail.value = store.detail
+
+                    // Prefill bank info
+                    storeResponse.payment.firstOrNull()?.let { payment ->
+                        viewModel.bankName.value = payment.bankName
+                        viewModel.bankNumber.value = payment.bankNum.toIntOrNull() ?: 0
+                        val bankPosition = bankAdapter.findPositionByName(payment.bankName)
+                        binding.spinnerBankName.setSelection(bankPosition, false)
+                    }
+
+                    // Prefill couriers
+                    storeResponse.shipping.forEach { courier ->
+                        when (courier.courier) {
+                            "jne" -> binding.checkboxJne.isChecked = true
+                            "pos" -> binding.checkboxPos.isChecked = true
+                            "tiki" -> binding.checkboxTiki.isChecked = true
+                        }
+                    }
+
+                    // Prefill document URIs
+                    store.ktp.let { ktpUri ->
+                        viewModel.ktpUri = ktpUri.toUri()
+                        updateImagePreview(viewModel.ktpUri, binding.imgKtp, binding.layoutUploadKtp)
+                    }
+                    store.npwp.let { npwpUri ->
+                        viewModel.npwpUri = npwpUri.toUri()
+                        updateDocumentPreview(binding.layoutUploadNpwp)
+                    }
+                    store.nib.let { nibUri ->
+                        viewModel.nibUri = nibUri.toUri()
+                        updateDocumentPreview(binding.layoutUploadNib)
+                    }
+
+                    // Prefill spinner for store types
+                    preselectStoreType(store.storeTypeId)
+
+                    // Cache what we want to select later (after data arrives)
+                    wantedProvinceId    = store.provinceId
+                    wantedCityId        = store.cityId
+                    wantedSubdistrictId = store.subdistrict
+                    wantedBankName      = storeResponse.payment.firstOrNull()?.bankName
+
+                    // Cache what we want to select later (after data arrives)
+                    wantedProvinceId    = store.provinceId
+                    wantedCityId        = store.cityId
+                    wantedSubdistrictId = store.subdistrict
+                    wantedBankName      = storeResponse.payment.firstOrNull()?.bankName
+
+                    // Mark restoring flow on
+                    isRestoringSelections = true
+
+                    // Try to apply immediately (if adapters already have data), otherwise
+                    // observers below will apply when data is ready.
+                    tryApplyProvince()
+                    tryApplyCity()
+                    tryApplySubdistrict()
+                    tryApplyBank()
+
+                    validateRequiredFields()
+                }
+            }
+
+            binding.btnRegister.setOnClickListener {
+                doUpdateStoreProfile()
+            }
+        } else {
+            binding.btnRegister.setOnClickListener {
+                if (viewModel.validateForm()){
+                    PopUpDialog.showConfirmDialog(
+                        context = this,
+                        title = "Apakah anda yakin ingin mendaftar toko?",
+                        message = "Pastikan data yang dimasukkan sudah benar",
+                        positiveText = "Ya",
+                        negativeText = "Tidak",
+                        onYesClicked = {
+                            viewModel.registerStore(this)
+                        }
+                    )
+                }
+                else {
+                    Toast.makeText(this, "Harap lengkapi semua field yang wajib diisi", Toast.LENGTH_SHORT).show()
+                }
             }
         }
+        validateRequiredFields()
+    }
 
-        Log.d(TAG, "onCreate: RegisterStoreActivity setup completed")
+    private fun preselectStoreType(storeTypeId: Int) {
+        // The adapter is created in setupStoreTypeSpinner(...)
+        val adapter = binding.spinnerStoreType.adapter ?: return
+        for (i in 0 until adapter.count) {
+            val item = adapter.getItem(i) as? StoreTypesItem
+            if (item?.id == storeTypeId) {
+                binding.spinnerStoreType.setSelection(i, false)
+                viewModel.storeTypeId.value = storeTypeId
+                validateRequiredFields()
+                break
+            }
+        }
+    }
+
+    private fun tryApplyProvince() {
+        if (provinceApplied) return
+        val target = wantedProvinceId ?: return
+        val count = provinceAdapter.count
+        for (i in 0 until count) {
+            if (provinceAdapter.getProvinceId(i) == target) {
+                binding.spinnerProvince.setSelection(i, false)
+                provinceApplied = true
+                maybeFinishRestoring()
+                return
+            }
+        }
+    }
+
+    private fun tryApplyCity() {
+        if (cityApplied) return
+        val target = wantedCityId ?: return
+        val count = cityAdapter.count
+        for (i in 0 until count) {
+            if (cityAdapter.getCityId(i) == target) {
+                binding.spinnerCity.setSelection(i, false)
+                cityApplied = true
+                maybeFinishRestoring()
+                return
+            }
+        }
+    }
+
+    private fun tryApplySubdistrict() {
+        if (subdistrictApplied) return
+        val target = wantedSubdistrictId ?: return
+        val count = subdistrictAdapter.count
+        for (i in 0 until count) {
+            if (subdistrictAdapter.getSubdistrictId(i) == target) {
+                binding.spinnerSubdistrict.setSelection(i, false)
+                subdistrictApplied = true
+                maybeFinishRestoring()
+                return
+            }
+        }
+    }
+
+    private fun tryApplyBank() {
+        if (bankApplied) return
+        val targetName = wantedBankName ?: return
+        val pos = bankAdapter.findPositionByName(targetName)
+        if (pos >= 0) {
+            binding.spinnerBankName.setSelection(pos, false)
+            viewModel.bankName.value = targetName
+            viewModel.selectedBankName = targetName
+            validateRequiredFields()
+            bankApplied = true
+        }
     }
 
     private fun setupHeader() {
@@ -158,30 +360,42 @@ class RegisterStoreActivity : AppCompatActivity() {
     }
 
     private fun validateRequiredFields() {
-        val isFormValid = !viewModel.storeName.value.isNullOrBlank() &&
+        val bankName = viewModel.bankName.value?.trim().orEmpty()
-                !viewModel.street.value.isNullOrBlank() &&
+        val bankSelected = bankName.isNotEmpty() && !bankName.equals("Pilih Bank", ignoreCase = true)
-                (viewModel.postalCode.value ?: 0) > 0 &&
-                !viewModel.subdistrict.value.isNullOrBlank() &&
-                !viewModel.bankName.value.isNullOrBlank() &&
-                (viewModel.bankNumber.value ?: 0) > 0 &&
-                (viewModel.provinceId.value ?: 0) > 0 &&
-                !viewModel.cityId.value.isNullOrBlank() &&
-                (viewModel.storeTypeId.value ?: 0) > 0 &&
-                viewModel.ktpUri != null &&
-                viewModel.nibUri != null &&
-                viewModel.npwpUri != null &&
-                viewModel.selectedCouriers.isNotEmpty() &&
-                !viewModel.accountName.value.isNullOrBlank()
 
-        binding.btnRegister.isEnabled = true
+        val provinceSelected    = viewModel.provinceId.value != null
-        if (isFormValid) {
+        val citySelected        = !viewModel.cityId.value.isNullOrBlank()
-            binding.btnRegister.setBackgroundResource(R.drawable.bg_button_active)
+        val subdistrictSelected = !viewModel.subdistrict.value.isNullOrBlank()
-            binding.btnRegister.setTextColor(ContextCompat.getColor(this, R.color.white))
-        } else {
-            binding.btnRegister.setBackgroundResource(R.drawable.bg_button_disabled)
-            binding.btnRegister.setTextColor(ContextCompat.getColor(this, R.color.black_300))
 
+        val currentStoreType = binding.spinnerStoreType.selectedItem as? StoreTypesItem
+        val storeTypeSelected = when {
+            currentStoreType != null -> currentStoreType.id != 0 &&
+                    !currentStoreType.name.equals("Pilih Jenis UMKM", true)
+            else -> (viewModel.storeTypeId.value ?: -1) > 0
         }
+
+        val isFormValid =
+            !viewModel.storeName.value.isNullOrBlank() &&
+                    !viewModel.street.value.isNullOrBlank() &&
+                    (viewModel.postalCode.value ?: 0) > 0 &&
+                    provinceSelected && citySelected && subdistrictSelected &&
+                    storeTypeSelected &&
+                    bankSelected &&
+                    (viewModel.bankNumber.value ?: 0) > 0 &&
+                    viewModel.ktpUri != null &&
+                    viewModel.nibUri != null &&
+                    viewModel.npwpUri != null &&
+                    viewModel.selectedCouriers.isNotEmpty() &&
+                    !viewModel.accountName.value.isNullOrBlank() &&
+                    binding.checkboxApprove.isChecked
+
+        binding.btnRegister.isEnabled = isFormValid
+        binding.btnRegister.setBackgroundResource(
+            if (isFormValid) R.drawable.bg_button_active else R.drawable.bg_button_disabled
+        )
+        binding.btnRegister.setTextColor(
+            ContextCompat.getColor(this, if (isFormValid) R.color.white else R.color.black_300)
+        )
     }
 
     private fun setupObservers() {
@@ -196,12 +410,10 @@ class RegisterStoreActivity : AppCompatActivity() {
                     binding.spinnerProvince.isEnabled = false
                 }
                 is Result.Success -> {
-                    Log.d(TAG, "setupObservers: Provinces loaded successfully: ${state.data.size} provinces")
                     binding.provinceProgressBar.visibility = View.GONE
                     binding.spinnerProvince.isEnabled = true
-
-                    // Update adapter with data
                     provinceAdapter.updateData(state.data)
+                    tryApplyProvince()
                 }
                 is Result.Error -> {
                     Log.e(TAG, "setupObservers: Error loading provinces: ${state.exception.message}")
@@ -220,12 +432,10 @@ class RegisterStoreActivity : AppCompatActivity() {
                     binding.spinnerCity.isEnabled = false
                 }
                 is Result.Success -> {
-                    Log.d(TAG, "setupObservers: Cities loaded successfully: ${state.data.size} cities")
                     binding.cityProgressBar.visibility = View.GONE
                     binding.spinnerCity.isEnabled = true
-
-                    // Update adapter with data
                     cityAdapter.updateData(state.data)
+                    tryApplyCity()
                 }
                 is Result.Error -> {
                     Log.e(TAG, "setupObservers: Error loading cities: ${state.exception.message}")
@@ -243,11 +453,20 @@ class RegisterStoreActivity : AppCompatActivity() {
                     binding.spinnerSubdistrict.isEnabled = false
                 }
                 is Result.Success -> {
-                    Log.d(TAG, "setupobservers: Subdistrict loaded successfullti: ${state.data.size} subdistrict")
                     binding.subdistrictProgressBar.visibility = View.GONE
                     binding.spinnerSubdistrict.isEnabled = true
-
                     subdistrictAdapter.updateData(state.data)
+
+                    // If you’re not restoring a specific subdistrict, select the first real item
+                    if (!isRestoringSelections && state.data.isNotEmpty()) {
+                        binding.spinnerSubdistrict.setSelection(0, false)
+                        val id0 = subdistrictAdapter.getSubdistrictId(0)
+                        viewModel.subdistrict.value = id0 ?: ""
+                        viewModel.selectedSubdistrict = id0
+                        validateRequiredFields()
+                    }
+
+                    tryApplySubdistrict()
                 }
                 is Result.Error -> {
                     Log.e(TAG, "setupObservers: Error loading subdistrict: ${state.exception.message}")
@@ -302,7 +521,7 @@ class RegisterStoreActivity : AppCompatActivity() {
         viewModel.errorMessage.observe(this) { errorMsg ->
             if (errorMsg.isNotEmpty()) {
                 Log.e(TAG, "setupStoreTypesObserver: Error loading store types: $errorMsg")
-                Toast.makeText(this, "Error loading store types: $errorMsg", Toast.LENGTH_SHORT).show()
+//                Toast.makeText(this, "Error loading store types: $errorMsg", Toast.LENGTH_SHORT).show()
             }
         }
 
@@ -322,6 +541,7 @@ class RegisterStoreActivity : AppCompatActivity() {
 
                 // Setup spinner with API data
                 setupStoreTypeSpinner(displayList)
+                tryApplyBank()
             } else {
                 Log.w(TAG, "setupStoreTypesObserver: Received empty store types list")
             }
@@ -366,17 +586,10 @@ class RegisterStoreActivity : AppCompatActivity() {
 
         // Set item selection listener
         binding.spinnerStoreType.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, pos: Int, id: Long) {
-                val selectedItem = adapter.getItem(position)
+                val item = (binding.spinnerStoreType.adapter.getItem(pos) as? StoreTypesItem)
-                Log.d(TAG, "Store type selected: position=$position, item=${selectedItem?.name}, id=${selectedItem?.id}")
+                if (item != null && item.id > 0) viewModel.storeTypeId.value = item.id
-
+                validateRequiredFields()
-                if (selectedItem != null && selectedItem.id > 0) {
-                    // Store the actual ID from the API, not just position
-                    viewModel.storeTypeId.value = selectedItem.id
-                    Log.d(TAG, "Set storeTypeId to ${selectedItem.id}")
-                } else {
-                    Log.d(TAG, "Default or null store type selected, not setting storeTypeId")
-                }
             }
 
             override fun onNothingSelected(parent: AdapterView<*>?) {
@@ -395,22 +608,12 @@ class RegisterStoreActivity : AppCompatActivity() {
         // Setup province spinner
         binding.spinnerProvince.adapter = provinceAdapter
         binding.spinnerProvince.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, pos: Int, id: Long) {
-                Log.d(TAG, "Province selected at position: $position")
+                provinceAdapter.getProvinceId(pos)?.let {
-                val provinceId = provinceAdapter.getProvinceId(position)
+                    viewModel.provinceId.value = it
-                if (provinceId != null) {
+                    viewModel.getCities(it)
-                    Log.d(TAG, "Setting province ID: $provinceId")
-                    viewModel.provinceId.value = provinceId
-                    Log.d(TAG, "Fetching cities for province ID: $provinceId")
-                    viewModel.getCities(provinceId)
-
-                    // Reset city selection when province changes
-                    Log.d(TAG, "Clearing city adapter for new province selection")
-                    cityAdapter.clear()
-                    binding.spinnerCity.setSelection(0)
-                } else {
-                    Log.e(TAG, "Invalid province ID for position: $position")
                 }
+                validateRequiredFields()
             }
 
             override fun onNothingSelected(parent: AdapterView<*>?) {
@@ -421,21 +624,13 @@ class RegisterStoreActivity : AppCompatActivity() {
         // Setup city spinner
         binding.spinnerCity.adapter = cityAdapter
         binding.spinnerCity.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+            override fun onItemSelected(p: AdapterView<*>?, v: View?, pos: Int, id: Long) {
-                Log.d(TAG, "City selected at position: $position")
+                cityAdapter.getCityId(pos)?.let {
-                val cityId = cityAdapter.getCityId(position)
+                    viewModel.cityId.value = it
-                if (cityId != null) {
+                    viewModel.getSubdistrict(it)
-                    Log.d(TAG, "Setting city ID: $cityId")
+                    viewModel.selectedCityId = it
-                    viewModel.cityId.value = cityId
-                    Log.d(TAG, "Fetching subdistrict for city ID: $cityId")
-                    viewModel.getSubdistrict(cityId)
-
-                    subdistrictAdapter.clear()
-                    binding.spinnerSubdistrict.setSelection(0)
-                    viewModel.selectedCityId = cityId
-                } else {
-                    Log.e(TAG, "Invalid city ID for position: $position")
                 }
+                validateRequiredFields()
             }
 
             override fun onNothingSelected(parent: AdapterView<*>?) {
@@ -446,16 +641,11 @@ class RegisterStoreActivity : AppCompatActivity() {
         //Setup Subdistrict spinner
         binding.spinnerSubdistrict.adapter = subdistrictAdapter
         binding.spinnerSubdistrict.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+            override fun onItemSelected(p: AdapterView<*>?, v: View?, pos: Int, id: Long) {
-                Log.d(TAG, "Subdistrict selected at position: $position")
+                val selectedId = subdistrictAdapter.getSubdistrictId(pos)
-                val subdistrictId = subdistrictAdapter.getSubdistrictId(position)
+                viewModel.subdistrict.value = selectedId ?: ""     // empty => not selected
-                if (subdistrictId != null) {
+                viewModel.selectedSubdistrict = selectedId
-                    Log.d(TAG, "Setting subdistrict ID: $subdistrictId")
+                validateRequiredFields()
-                    viewModel.subdistrict.value = subdistrictId
-                    viewModel.selectedSubdistrict = subdistrictId
-                } else {
-                    Log.e(TAG, "Invalid subdistrict ID for position: $position")
-                }
             }
 
             override fun onNothingSelected(parent: AdapterView<*>?) {
@@ -465,63 +655,31 @@ class RegisterStoreActivity : AppCompatActivity() {
 
         binding.spinnerBankName.adapter = bankAdapter
         binding.spinnerBankName.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(
+            override fun onItemSelected(p: AdapterView<*>?, v: View?, pos: Int, id: Long) {
-                parent: AdapterView<*>?,
+                val bankName = bankAdapter.getBankName(pos)
-                view: View?,
+                viewModel.bankName.value = bankName
-                position: Int,
+                viewModel.selectedBankName = bankName
-                id: Long
+                validateRequiredFields()
-            ) {
-                Log.d(TAG, "Bank selected at position: $position")
-                val bankName = bankAdapter.getBankName(position)
-                if (bankName != null) {
-                    Log.d(TAG, "Setting bank name: $bankName")
-                    viewModel.bankName.value = bankName
-                    viewModel.selectedBankName = bankName
-
-                    // Optional: Log the selected bank details
-                    val selectedBank = bankAdapter.getBankItem(position)
-                    selectedBank?.let {
-                        Log.d(TAG, "Selected bank: ${it.bankName} (Code: ${it.bankCode})")
-                    }
-
-                    // Hide progress bar if it was showing
-                    binding.bankNameProgressBar.visibility = View.GONE
-
-                } else {
-                    Log.e(TAG, "Invalid bank name for position: $position")
-                }
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                Log.d(TAG, "No bank selected")
-                viewModel.selectedBankName = null
             }
+            override fun onNothingSelected(parent: AdapterView<*>?) { /* no-op */ }
         }
+        tryApplyBank()
 
-        // Add initial hints to the spinners
+//        // Add initial hints to the spinners
-        if (provinceAdapter.isEmpty) {
+//        if (provinceAdapter.isEmpty)    provinceAdapter.add("Pilih Provinsi")
-            Log.d(TAG, "Adding default province hint")
+//        if (cityAdapter.isEmpty)        cityAdapter.add("Pilih Kabupaten/Kota")
-            provinceAdapter.add("Pilih Provinsi")
+//        if (subdistrictAdapter.isEmpty) subdistrictAdapter.add("Pilih Kecamatan")
-        }
+//        if (bankAdapter.isEmpty)        bankAdapter.add("Pilih Bank")
-
-        if (cityAdapter.isEmpty) {
-            Log.d(TAG, "Adding default city hint")
-            cityAdapter.add("Pilih Kabupaten/Kota")
-        }
-
-        if (subdistrictAdapter.isEmpty) {
-            Log.d(TAG, "Adding default kecamatan hint")
-            subdistrictAdapter.add("Pilih Kecamatan")
-        }
-
-        if (bankAdapter.isEmpty) {
-            Log.d(TAG, "Adding default bank hint")
-            bankAdapter.add("Pilih Bank")
-        }
 
         Log.d(TAG, "setupSpinners: Province and city spinners setup completed")
     }
 
+    private fun maybeFinishRestoring() {
+        if (provinceApplied && cityApplied && subdistrictApplied) {
+            isRestoringSelections = false
+        }
+    }
+
     private fun setupDocumentUploads() {
         Log.d(TAG, "setupDocumentUploads: Setting up document upload buttons")
 
@@ -649,18 +807,28 @@ class RegisterStoreActivity : AppCompatActivity() {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
             override fun afterTextChanged(s: Editable?) {
-                viewModel.storeName.value = s.toString()
+                if (viewModel.storeName.value != s.toString()) {
+                    viewModel.storeName.value = s.toString()
+                }
                 Log.d(TAG, "Store name updated: ${s.toString()}")
                 validateRequiredFields()
             }
         })
 
+        viewModel.storeName.observe(this) { value ->
+            if (binding.etStoreName.text.toString() != value) {
+                binding.etStoreName.setText(value)
+                binding.etStoreName.setSelection(value.length) // Set cursor to end
+            }
+        }
+
         binding.etStoreDescription.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
             override fun afterTextChanged(s: Editable?) {
                 viewModel.storeDescription.value = s.toString()
                 Log.d(TAG, "Store description updated: ${s.toString().take(20)}${if ((s?.length ?: 0) > 20) "..." else ""}")
+                validateRequiredFields()
             }
         })
 
@@ -668,53 +836,80 @@ class RegisterStoreActivity : AppCompatActivity() {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
             override fun afterTextChanged(s: Editable?) {
-                viewModel.street.value = s.toString()
+                if (viewModel.street.value != s.toString()) {
+                    viewModel.street.value = s.toString()
+                }
                 Log.d(TAG, "Street address updated: ${s.toString()}")
                 validateRequiredFields()
             }
         })
 
+        viewModel.street.observe(this) { value ->
+            if (binding.etStreet.text.toString() != value) {
+                binding.etStreet.setText(value)
+                binding.etStreet.setSelection(value.length)
+            }
+        }
+
         binding.etPostalCode.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
             override fun afterTextChanged(s: Editable?) {
-                try {
+                val newValue = s.toString().toIntOrNull() ?: 0
-                    viewModel.postalCode.value = s.toString().toInt()
+                if (viewModel.postalCode.value != newValue) {
-                    Log.d(TAG, "Postal code updated: ${s.toString()}")
+                    viewModel.postalCode.value = newValue
-                } catch (e: NumberFormatException) {
-                    // Handle invalid input
-                    Log.e(TAG, "Invalid postal code input: ${s.toString()}, error: $e")
-                    validateRequiredFields()
                 }
+                validateRequiredFields()
             }
         })
 
+        viewModel.postalCode.observe(this) { value ->
+            val currentText = binding.etPostalCode.text.toString()
+            val valueString = if (value == 0) "" else value.toString()
+            if (currentText != valueString) {
+                binding.etPostalCode.setText(valueString)
+                binding.etPostalCode.setSelection(valueString.length)
+            }
+        }
+
         binding.etAddressDetail.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
             override fun afterTextChanged(s: Editable?) {
-                viewModel.addressDetail.value = s.toString()
+                if (viewModel.addressDetail.value != s.toString()) {
+                    viewModel.addressDetail.value = s.toString()
+                }
                 Log.d(TAG, "Address detail updated: ${s.toString()}")
+                validateRequiredFields()
             }
         })
 
+        viewModel.addressDetail.observe(this) { value ->
+            if (binding.etAddressDetail.text.toString() != value) {
+                binding.etAddressDetail.setText(value)
+                binding.etAddressDetail.setSelection(value.length)
+            }
+        }
+
         binding.etBankNumber.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
             override fun afterTextChanged(s: Editable?) {
                 val input = s.toString()
-                if (input.isNotEmpty()) {
+                val newValue = if (input.isNotEmpty()) {
                     try {
-                        viewModel.bankNumber.value = input.toInt()
+                        input.toInt()
-                        Log.d(TAG, "Bank number updated: $input")
                     } catch (e: NumberFormatException) {
-                        // Handle invalid input if needed
                         Log.e(TAG, "Failed to parse bank number. Input: $input, Error: $e")
+                        0
                     }
                 } else {
-                    // Handle empty input - perhaps set to 0 or null depending on your requirements
+                    0
-                    viewModel.bankNumber.value = 0 // or 0
+                }
-                    Log.d(TAG, "Bank number set to default: 0")
+
+                if (viewModel.bankNumber.value != newValue) {
+                    viewModel.bankNumber.value = newValue
+                    Log.d(TAG, "Bank number updated: $newValue")
                 }
                 validateRequiredFields()
             }
@@ -744,16 +939,27 @@ class RegisterStoreActivity : AppCompatActivity() {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
             override fun afterTextChanged(s: Editable?) {
-                viewModel.accountName.value = s.toString()
+                if (viewModel.accountName.value != s.toString()) {
+                    viewModel.accountName.value = s.toString()
+                }
                 Log.d(TAG, "Account Name updated: ${s.toString()}")
                 validateRequiredFields()
             }
 
         })
 
+        viewModel.accountName.observe(this) { value ->
+            if (binding.etAccountName.text.toString() != value) {
+                binding.etAccountName.setText(value)
+                binding.etAccountName.setSelection(value.length)
+            }
+        }
+
         Log.d(TAG, "setupDataBinding: Text field data binding setup completed")
     }
 
+
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         Log.d(TAG, "onActivityResult: Request code: $requestCode, Result code: $resultCode")
@@ -848,6 +1054,133 @@ class RegisterStoreActivity : AppCompatActivity() {
         }
     }
 
+    private fun doUpdateStoreProfile() {
+        // --- Text parts ---
+        val nameBody: RequestBody        = (viewModel.storeName.value ?: "").toRequestBody("text/plain".toMediaTypeOrNull())
+        val typeBody: RequestBody        = ((viewModel.storeTypeId.value ?: 0).toString()).toRequestBody("text/plain".toMediaTypeOrNull())
+        val descBody: RequestBody        = (viewModel.storeDescription.value ?: "").toRequestBody("text/plain".toMediaTypeOrNull())
+        // NOTE: is_on_leave is NOT part of approval multipart; keep separate if needed
+
+        val latBody: RequestBody         = (viewModel.latitude.value ?: "").toRequestBody("text/plain".toMediaTypeOrNull())
+        val longBody: RequestBody        = (viewModel.longitude.value ?: "").toRequestBody("text/plain".toMediaTypeOrNull())
+        val provBody: RequestBody        = ((viewModel.provinceId.value ?: 0).toString()).toRequestBody("text/plain".toMediaTypeOrNull())
+        val cityBody: RequestBody        = (viewModel.cityId.value ?: "").toRequestBody("text/plain".toMediaTypeOrNull())
+        val subdistrictBody: RequestBody = (viewModel.selectedSubdistrict ?: viewModel.subdistrict.value ?: "").toRequestBody("text/plain".toMediaTypeOrNull())
+
+        // If you don't have village picker yet, send empty string or reuse subdistrict
+        val villageBody: RequestBody     = "".toRequestBody("text/plain".toMediaTypeOrNull())
+
+        val streetBody: RequestBody      = (viewModel.street.value ?: "").toRequestBody("text/plain".toMediaTypeOrNull())
+        val postalBody: RequestBody      = ((viewModel.postalCode.value ?: 0).toString()).toRequestBody("text/plain".toMediaTypeOrNull())
+        val detailBody: RequestBody      = (viewModel.addressDetail.value ?: "").toRequestBody("text/plain".toMediaTypeOrNull())
+
+        // You can read user phone from current store profile when reapply
+        val currentPhone = myStoreViewModel.myStoreProfile.value?.store?.userPhone ?: ""
+        val userPhoneBody: RequestBody   = currentPhone.toRequestBody("text/plain".toMediaTypeOrNull())
+
+        // --- Multipart images/docs (safe compress/copy) ---
+        val storeImgPart: MultipartBody.Part? = viewModel.storeImageUri?.let { uri ->
+            try {
+                val allowed = Regex("^(jpg|jpeg|png|webp)$", RegexOption.IGNORE_CASE)
+                if (!ImageUtils.isAllowedFileType(this, uri, allowed)) {
+                    Toast.makeText(this, "Format gambar tidak didukung", Toast.LENGTH_SHORT).show()
+                    null
+                } else {
+                    val compressed: File = ImageUtils.compressImage(
+                        context = this,
+                        uri = uri,
+                        filename = "storeimg",
+                        maxWidth = 1024,
+                        maxHeight = 1024,
+                        quality = 80
+                    )
+                    FileUtils.createMultipartFromFile("storeimg", compressed)
+                }
+            } catch (e: Exception) {
+                val rawFile = FileUtils.createTempFileFromUri(this, uri)
+                rawFile?.let { FileUtils.createMultipartFromFile("storeimg", it) }
+            }
+        }
+
+        val ktpPart: MultipartBody.Part? = viewModel.ktpUri?.let { uri ->
+            val file = FileUtils.createTempFileFromUri(this, uri)
+            file?.let { FileUtils.createMultipartFromFile("ktp", it) }
+        }
+
+        val npwpPart: MultipartBody.Part? = viewModel.npwpUri?.let { uri ->
+            val file = FileUtils.createTempFileFromUri(this, uri)
+            file?.let { FileUtils.createMultipartFromFile("npwp", it) }
+        }
+
+        val nibPart: MultipartBody.Part? = viewModel.nibUri?.let { uri ->
+            val file = FileUtils.createTempFileFromUri(this, uri)
+            file?.let { FileUtils.createMultipartFromFile("nib", it) }
+        }
+
+        // --- Couriers desired (sync to exactly this set) ---
+        val desiredCouriers = viewModel.selectedCouriers.toList()
+
+        // --- (Optional) Payment upsert from UI fields ---
+        // If you want to send the bank from the form during re-apply:
+        val paymentsToUpsert = buildList {
+            val bankName = viewModel.bankName.value
+            val bankNum  = viewModel.bankNumber.value?.toString()
+            val accName  = viewModel.accountName.value
+
+            if (!bankName.isNullOrBlank() && !bankNum.isNullOrBlank() && !accName.isNullOrBlank()) {
+                // If you want to update the first existing payment instead of adding new:
+                val existingId = myStoreViewModel.payment.value?.firstOrNull()?.id
+                add(
+                    PaymentUpdate(
+                        id = existingId,            // null => add; id!=null => update
+                        bankName = bankName,
+                        bankNum = bankNum,
+                        accountName = accName,
+                        qrisImage = null             // attach File if you have new QRIS to upload
+                    )
+                )
+            }
+        }
+
+        // --- Delete list (empty if none) ---
+        val paymentIdToDelete = emptyList<Int>()
+
+        // --- Fire the update ---
+        myStoreViewModel.updateStoreApproval(
+            storeName = nameBody,
+            description = descBody,
+            storeType = typeBody,
+            latitude = latBody,
+            longitude = longBody,
+            storeProvince = provBody,
+            storeCity = cityBody,
+            storeSubdistrict = subdistrictBody,
+            storeVillage = villageBody,
+            storeStreet = streetBody,
+            storePostalCode = postalBody,
+            storeAddressDetail = detailBody,
+            userPhone = userPhoneBody,
+            paymentsToUpdate = paymentsToUpsert,
+            paymentIdToDelete = paymentIdToDelete,
+            storeCourier = desiredCouriers,
+            storeImage = storeImgPart,
+            ktpImage = ktpPart,
+            npwpDocument = npwpPart,
+            nibDocument = nibPart
+        )
+
+        myStoreViewModel.updateStoreProfileResult.observe(this) {
+            Toast.makeText(this, "Pengajuan ulang berhasil dikirim", Toast.LENGTH_SHORT).show()
+            finish()
+        }
+        myStoreViewModel.errorMessage.observe(this) {
+            if (!it.isNullOrEmpty()) {
+                Toast.makeText(this, it, Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+
     companion object {
         private const val TAG = "RegisterStoreActivity"
     }

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/balance/BalanceTopUpActivity.kt

@@ -24,6 +24,7 @@ import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.response.store.profile.Payment
 import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
 import com.alya.ecommerce_serang.utils.ImageUtils.compressImage
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.SessionManager
 import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -374,14 +375,11 @@ class BalanceTopUpActivity : AppCompatActivity() {
 
                     // Show a dialog with the success message
                     runOnUiThread {
-                        AlertDialog.Builder(this@BalanceTopUpActivity)
+                        PopUpDialog.showConfirmDialog(
-                            .setTitle("Berhasil")
+                            context = this@BalanceTopUpActivity,
-                            .setMessage(successMessage)
+                            iconRes = R.drawable.checkmark__1_,
-                            .setPositiveButton("OK") { dialog, _ ->
+                            title = "Berhasil melakukan Top-Up"
-                                dialog.dismiss()
+                        )
-                                finish()
-                            }
-                            .show()
                     }
                 } else {
                     // Get more detailed error information
@@ -408,13 +406,12 @@ class BalanceTopUpActivity : AppCompatActivity() {
 
                     // Show a dialog with the error message
                     runOnUiThread {
-                        AlertDialog.Builder(this@BalanceTopUpActivity)
+
-                            .setTitle("Error Response")
+                        PopUpDialog.showConfirmDialog(
-                            .setMessage(errorMessage)
+                            context = this@BalanceTopUpActivity,
-                            .setPositiveButton("OK") { dialog, _ ->
+                            iconRes = R.drawable.ic_cancel,
-                                dialog.dismiss()
+                            title = "Gagal melakukan Top-Up"
-                            }
+                        )
-                            .show()
                     }
                 }
             } catch (e: Exception) {

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/product/DetailStoreProductActivity.kt

@@ -27,7 +27,8 @@ import com.alya.ecommerce_serang.data.repository.ProductRepository
 import com.alya.ecommerce_serang.data.repository.Result
 import com.alya.ecommerce_serang.databinding.ActivityDetailStoreProductBinding
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
-import com.alya.ecommerce_serang.utils.FileUtils.compressFile
+import com.alya.ecommerce_serang.utils.CompressionResult
+import com.alya.ecommerce_serang.utils.FileUtils.compressFileToMax1MB
 import com.alya.ecommerce_serang.utils.ImageUtils.compressImage
 import com.alya.ecommerce_serang.utils.SessionManager
 import com.alya.ecommerce_serang.utils.viewmodel.ProductViewModel
@@ -49,6 +50,11 @@ class DetailStoreProductActivity : AppCompatActivity() {
     private var productId: Int? = null
     private var hasImage: Boolean = false
 
+    private var TAG="DetailStoreProduct"
+
+    private var isEditing = false
+    private var hasExistingImage = false
+
     private val viewModel: ProductViewModel by viewModels {
         BaseViewModelFactory {
             sessionManager = SessionManager(this)
@@ -75,20 +81,32 @@ class DetailStoreProductActivity : AppCompatActivity() {
 
     private val sppirtLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
         if (uri != null && isValidFile(uri)) {
-            compressFile(this, uri).let { compressedFile ->
+            when (val result = compressFileToMax1MB(this, uri)) {
-                sppirtUri = compressedFile?.toUri()
+                is CompressionResult.Success -> {
-                binding.tvSppirtName.text = getFileName(sppirtUri!!)
+                    sppirtUri = result.file.toUri()
-                binding.switcherSppirt.showNext()
+                    binding.tvSppirtName.text = getFileName(sppirtUri!!)
+                    binding.switcherSppirt.showNext()
+                }
+                is CompressionResult.Error -> {
+                    Toast.makeText(this, result.reason, Toast.LENGTH_LONG).show()
+                    Log.e(TAG, "Compression failed: ${result.reason}")
+                }
             }
         }
     }
 
     private val halalLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
         if (uri != null && isValidFile(uri)) {
-            compressFile(this, uri).let { compressedFile ->
+            when (val result = compressFileToMax1MB(this, uri)) {
-                halalUri = compressedFile?.toUri()
+                is CompressionResult.Success -> {
-                binding.tvHalalName.text = getFileName(halalUri!!)
+                    halalUri = result.file.toUri()
-                binding.switcherHalal.showNext()
+                    binding.tvHalalName.text = getFileName(halalUri!!)
+                    binding.switcherHalal.showNext()
+                }
+                is CompressionResult.Error -> {
+                    Toast.makeText(this, result.reason, Toast.LENGTH_LONG).show()
+                    Log.e(TAG, "Compression failed: ${result.reason}")
+                }
             }
         }
     }
@@ -98,7 +116,7 @@ class DetailStoreProductActivity : AppCompatActivity() {
         binding = ActivityDetailStoreProductBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        val isEditing = intent.getBooleanExtra("is_editing", false)
+        isEditing = intent.getBooleanExtra("is_editing", false)
         productId = intent.getIntExtra("product_id", -1)
 
         binding.headerStoreProduct.headerTitle.text = if (isEditing) "Ubah Produk" else "Tambah Produk"
@@ -179,6 +197,7 @@ class DetailStoreProductActivity : AppCompatActivity() {
         binding.btnRemoveFoto.setOnClickListener {
             imageUri = null
             hasImage = false
+            hasExistingImage = false
             binding.switcherFotoProduk.showPrevious()
             validateForm()
         }
@@ -236,7 +255,9 @@ class DetailStoreProductActivity : AppCompatActivity() {
         } else product.image
         Glide.with(this).load(imageUrl).into(binding.ivPreviewFoto)
         binding.switcherFotoProduk.showNext()
+
         hasImage = true
+        hasExistingImage = true
 
         // SPPIRT
         product.sppirt?.let {
@@ -254,12 +275,12 @@ class DetailStoreProductActivity : AppCompatActivity() {
     }
 
     private fun togglePreOrderVisibility(isChecked: Boolean) {
-        Log.d("DEBUG", "togglePreOrderVisibility: $isChecked")
+        Log.d(TAG, "togglePreOrderVisibility: $isChecked")
         binding.layoutDurasi.visibility = if (isChecked) View.VISIBLE else View.GONE
     }
 
     private fun toggleWholesaleVisibility(isChecked: Boolean) {
-        Log.d("DEBUG", "toggleWholesaleVisibility: $isChecked")
+        Log.d(TAG, "toggleWholesaleVisibility: $isChecked")
         binding.layoutMinPesanGrosir.visibility = if (isChecked) View.VISIBLE else View.GONE
         binding.layoutHargaGrosir.visibility = if (isChecked) View.VISIBLE else View.GONE
     }
@@ -331,10 +352,18 @@ class DetailStoreProductActivity : AppCompatActivity() {
         val duration = binding.edtDurasi.text.toString().trim()
         val wholesaleMinItem = binding.edtMinPesanGrosir.text.toString().trim()
         val wholesalePrice = binding.edtHargaGrosir.text.toString().trim()
-        val category = binding.spinnerKategoriProduk.selectedItemPosition != -1
+        val categorySelected = binding.spinnerKategoriProduk.selectedItemPosition != -1
         val isPreOrderChecked = binding.switchIsPreOrder.isChecked
         val isWholesaleChecked = binding.switchIsWholesale.isChecked
 
+        val hasRequiredImage = if (isEditing) {
+            // In edit mode: allow existing server image OR newly picked image
+            hasImage || hasExistingImage
+        } else {
+            // In create mode: must have a picked image
+            hasImage
+        }
+
         val valid = name.isNotEmpty() &&
                 description.isNotEmpty() &&
                 price.isNotEmpty() &&
@@ -343,8 +372,8 @@ class DetailStoreProductActivity : AppCompatActivity() {
                 weight.isNotEmpty() &&
                 (!isPreOrderChecked || duration.isNotEmpty()) &&
                 (!isWholesaleChecked || (wholesaleMinItem.isNotEmpty() && wholesalePrice.isNotEmpty())) &&
-                category &&
+                categorySelected &&
-                hasImage
+                hasRequiredImage
 
         binding.btnSaveProduct.isEnabled = valid
         binding.btnSaveProduct.setTextColor(
@@ -387,8 +416,10 @@ class DetailStoreProductActivity : AppCompatActivity() {
         val sppirtFile = sppirtUri?.let { uriToNamedFile(it, this, "sppirt") }
         val halalFile = halalUri?.let { uriToNamedFile(it, this, "halal") }
 
-        Log.d("File URI", "SPPIRT URI: ${sppirtUri.toString()}")
+        Log.d(TAG, "SPPIRT URI: ${sppirtUri.toString()}")
-        Log.d("File URI", "Halal URI: ${halalUri.toString()}")
+        Log.d(TAG, "Halal URI: ${halalUri.toString()}")
+        logFileInfo("Sppirt Size", sppirtFile!!)
+        logFileInfo("Halal Size", halalFile!!)
 
         val imagePart = imageFile?.let { createPartFromFile("productimg", it) }
         val sppirtPart = sppirtFile?.let { createPartFromFile("sppirt", it) }
@@ -414,7 +445,7 @@ class DetailStoreProductActivity : AppCompatActivity() {
                     finish()
                 }
                 is Result.Error -> {
-                    Log.e("ProductDetailActivity", "Error: ${result.exception.message}")
+                    Log.e(TAG, "Error: ${result.exception.message}")
                     binding.btnSaveProduct.isEnabled = true
                 }
             }
@@ -492,7 +523,7 @@ class DetailStoreProductActivity : AppCompatActivity() {
                     finish()
                 }
                 is Result.Error -> {
-                    Log.e("ProductDetailActivity", "Error: ${result.exception.message}")
+                    Log.e(TAG, "Error: ${result.exception.message}")
                     binding.btnSaveProduct.isEnabled = true
                 }
             }
@@ -501,4 +532,10 @@ class DetailStoreProductActivity : AppCompatActivity() {
 
     private fun toRequestBody(value: String): RequestBody =
         RequestBody.create("text/plain".toMediaTypeOrNull(), value)
+
+    private fun logFileInfo(tag: String, file: File) {
+        val sizeKb = file.length() / 1024.0
+        val sizeMb = sizeKb / 1024.0
+        Log.d(TAG, "$tag → Name: ${file.name}, Size: ${"%.2f".format(sizeKb)} KB (${String.format("%.2f", sizeMb)} MB)")
+    }
 }

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/profile/DetailStoreProfileActivity.kt

@@ -29,9 +29,10 @@ import com.alya.ecommerce_serang.databinding.DialogStoreImageBinding
 import com.alya.ecommerce_serang.ui.profile.mystore.profile.address.DetailStoreAddressActivity
 import com.alya.ecommerce_serang.ui.profile.mystore.profile.payment_info.PaymentInfoActivity
 import com.alya.ecommerce_serang.ui.profile.mystore.profile.shipping_service.ShippingServiceActivity
-import com.alya.ecommerce_serang.utils.viewmodel.MyStoreViewModel
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.SessionManager
+import com.alya.ecommerce_serang.utils.viewmodel.MyStoreViewModel
 import com.bumptech.glide.Glide
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
@@ -39,7 +40,6 @@ import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.asRequestBody
 import java.io.File
 import java.io.FileOutputStream
-import kotlin.getValue
 
 class DetailStoreProfileActivity : AppCompatActivity() {
     private lateinit var binding: ActivityDetailStoreProfileBinding
@@ -91,10 +91,10 @@ class DetailStoreProfileActivity : AppCompatActivity() {
         viewModel.fetchStoreTypes()
 
         viewModel.myStoreProfile.observe(this) {
-            currentStore = it
+            currentStore = it?.store
             currentStoreLoaded = true
             if (storeTypesLoaded) setupStoreTypeSpinner(storeTypesList)
-            updateUI(it)
+            updateUI(it?.store)
         }
 
         viewModel.storeTypes.observe(this) {
@@ -244,12 +244,17 @@ class DetailStoreProfileActivity : AppCompatActivity() {
     }
 
     private fun confirmUpdate() {
-        AlertDialog.Builder(this)
+
-            .setTitle("Konfirmasi Perubahan")
+        PopUpDialog.showConfirmDialog(
-            .setMessage("Apakah Anda yakin ingin menyimpan perubahan profil toko Anda?")
+            context = this,
-            .setPositiveButton("Ya") { _, _ -> updateStoreProfile() }
+            title = "Apakah Anda yakin ingin menyimpan perubahan profil?",
-            .setNegativeButton("Batal", null)
+            message = "Pastikan data yang dimasukkan sudah benar",
-            .show()
+            positiveText = "Ya",
+            negativeText = "Tidak",
+            onYesClicked = {
+                updateStoreProfile()
+            }
+        )
     }
 
     private fun showImageOptions() {

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/profile/address/DetailStoreAddressActivity.kt

@@ -322,19 +322,6 @@ class DetailStoreAddressActivity : AppCompatActivity() {
                 villageId = oldAddress.villageId
             )
             viewModel.saveStoreAddress(oldAddress, newAddress)
-            // Save address
-//            viewModel.saveStoreAddress(
-//                provinceId = selectedProvinceId!!,
-//                provinceName = province?.provinceName ?: "",
-//                cityId = city.cityId,
-//                cityName = city.cityName,
-//                street = street,
-//                subdistrict = subdistrict,
-//                detail = detail,
-//                postalCode = postalCode,
-//                latitude = latitude,
-//                longitude = longitude
-//            )
         }
     }
 
@@ -360,11 +347,13 @@ class DetailStoreAddressActivity : AppCompatActivity() {
                 it.isEnabled = true
                 it.setBackgroundResource(R.drawable.bg_button_active)
                 it.setTextColor(getColor(R.color.white))
+                binding.btnSaveAddress.text = "Simpan Perubahan"
+
             } else {
                 it.isEnabled = false
                 it.setBackgroundResource(R.drawable.bg_button_disabled)
                 it.setTextColor(getColor(R.color.black_300))
-                Toast.makeText(this, "Periksa dan lenkapi alamat anda", Toast.LENGTH_SHORT).show()
+                binding.btnSaveAddress.text = "Lengkapi alamat anda"
             }
         }
     }

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsAdapter.kt

@@ -97,7 +97,7 @@ class SellsAdapter(
             val product = order.orderItems?.firstOrNull()
             tvSellsProductName.text = product?.productName
             tvSellsProductQty.text = "x${product?.quantity}"
-            tvSellsProductPrice.text = product?.price?.let { formatPrice(it.toInt()) }
+            tvSellsProductPrice.text = product?.price?.let { formatPrice(it.toDouble().toInt()) }
 
             val fullImageUrl = when (val img = product?.productImage) {
                 is String -> {
@@ -170,7 +170,7 @@ class SellsAdapter(
                     val product = order.orderItems?.firstOrNull()
                     tvSellsProductName.text = product?.productName
                     tvSellsProductQty.text = "x${product?.quantity}"
-                    tvSellsProductPrice.text = product?.price?.let { formatPrice(it.toInt()) }
+                    tvSellsProductPrice.text = product?.price?.let { formatPrice(it.toDouble().toInt()) }
 
                     val fullImageUrl = when (val img = product?.productImage) {
                         is String -> {
@@ -186,7 +186,7 @@ class SellsAdapter(
                         .into(ivSellsProduct)
 
                     tvSellsQty.text = "${order.orderItems?.size} produk"
-                    tvSellsPrice.text = order.totalAmount?.let { formatPrice(it.toInt()) }
+                    tvSellsPrice.text = order.totalAmount?.let { formatPrice(it.toDouble().toInt()) }
                 }
                 "paid" -> {
                     layoutOrders.visibility = View.GONE

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsFragment.kt

@@ -5,9 +5,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.viewpager2.widget.ViewPager2
 import com.alya.ecommerce_serang.R
+import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
+import com.alya.ecommerce_serang.data.repository.SellsRepository
 import com.alya.ecommerce_serang.databinding.FragmentSellsBinding
+import com.alya.ecommerce_serang.utils.BaseViewModelFactory
 import com.alya.ecommerce_serang.utils.SessionManager
+import com.alya.ecommerce_serang.utils.viewmodel.SellsViewModel
 import com.google.android.material.tabs.TabLayoutMediator
 
 class SellsFragment : Fragment() {
@@ -18,6 +24,13 @@ class SellsFragment : Fragment() {
 
     private lateinit var viewPagerAdapter: SellsViewPagerAdapter
 
+    private val sellsVm: SellsViewModel by activityViewModels {
+        BaseViewModelFactory {
+            val api = ApiConfig.getApiService(SessionManager(requireContext()))
+            SellsViewModel(SellsRepository(api))
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -53,8 +66,25 @@ class SellsFragment : Fragment() {
                 else -> "Tab $position"
             }
         }.attach()
+
+        statusPage()
     }
 
+    private fun statusPage(){
+        binding.viewPagerSells.registerOnPageChangeCallback(
+            object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    val status = viewPagerAdapter.sellsStatuses[position]
+                    sellsVm.updateStatus(status, forceRefresh = true)
+                }
+            }
+        )
+    }
+
+    override fun onResume() {
+        super.onResume()
+        statusPage()
+    }
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsListFragment.kt

@@ -83,11 +83,10 @@ class SellsListFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        loadSells()
         setupRecyclerView()
         observeSellsList()
         observePaymentConfirmation()
-        loadSells()
-//        getAllOrderCountsAndNavigate()
     }
 
     private fun setupRecyclerView() {
@@ -121,8 +120,8 @@ class SellsListFragment : Fragment() {
                     Log.d(TAG, "Data received: ${result.data?.size ?: 0} items")
 
                     if (result.data.isNullOrEmpty()) {
-                        binding.tvEmptyState.visibility = View.VISIBLE
                         binding.rvSells.visibility = View.GONE
+                        binding.tvEmptyState.visibility = View.VISIBLE
                         Log.d(TAG, "Showing empty state")
 
                     } else {
@@ -143,7 +142,7 @@ class SellsListFragment : Fragment() {
 
                     binding.progressBar.visibility = View.GONE
                     binding.tvEmptyState.visibility = View.VISIBLE
-                    Toast.makeText(requireContext(), result.message, Toast.LENGTH_SHORT).show()
+//                    Toast.makeText(requireContext(), result.message, Toast.LENGTH_SHORT).show()
                 }
                 is ViewState.Loading -> {
                     binding.progressBar.visibility = View.VISIBLE
@@ -211,6 +210,12 @@ class SellsListFragment : Fragment() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.getSellList(status)
+        observeSellsList()
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/SellsViewPagerAdapter.kt

@@ -9,7 +9,7 @@ class SellsViewPagerAdapter(
 ) : FragmentStateAdapter(fragmentActivity) {
 
     // Define all possible sells statuses - keeping your original list
-    private val sellsStatuses = listOf(
+    val sellsStatuses = listOf(
         "all",
         "unpaid",
         "paid",

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/payment/DetailPaymentActivity.kt

@@ -2,7 +2,6 @@ package com.alya.ecommerce_serang.ui.profile.mystore.sells.payment
 
 import android.app.Dialog
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.util.Log
@@ -16,6 +15,8 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.graphics.drawable.toDrawable
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.alya.ecommerce_serang.BuildConfig.BASE_URL
 import com.alya.ecommerce_serang.R
 import com.alya.ecommerce_serang.data.api.response.store.sells.Orders
@@ -26,6 +27,7 @@ import com.alya.ecommerce_serang.data.repository.SellsRepository
 import com.alya.ecommerce_serang.databinding.ActivityDetailPaymentBinding
 import com.alya.ecommerce_serang.ui.profile.mystore.sells.SellsProductAdapter
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
+import com.alya.ecommerce_serang.utils.PopUpDialog
 import com.alya.ecommerce_serang.utils.SessionManager
 import com.alya.ecommerce_serang.utils.viewmodel.AddressViewModel
 import com.alya.ecommerce_serang.utils.viewmodel.SellsViewModel
@@ -38,9 +40,6 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
 import java.util.TimeZone
-import androidx.core.graphics.drawable.toDrawable
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.alya.ecommerce_serang.ui.profile.mystore.sells.DetailSellsActivity
 
 class DetailPaymentActivity : AppCompatActivity() {
 
@@ -111,8 +110,18 @@ class DetailPaymentActivity : AppCompatActivity() {
 
         binding.btnConfirmPayment.setOnClickListener {
             sells?.orderId?.let {
-                viewModel.confirmPayment(it, "confirmed")
+
-                Toast.makeText(this, "Pembayaran dikonfirmasi", Toast.LENGTH_SHORT).show()
+                PopUpDialog.showConfirmDialog(
+                    context = this,
+                    title = "Apakah anda yakin?",
+                    message = "Pastikan data pembayaran sudah sesuai",
+                    positiveText = "Ya",
+                    negativeText = "Tidak",
+                    onYesClicked = {
+                        viewModel.confirmPayment(it, "confirmed")
+                        Toast.makeText(this, "Pembayaran dikonfirmasi", Toast.LENGTH_SHORT).show()
+                    }
+                )
             } ?: run {
                 Log.e("DetailPaymentActivity", "No order passed in intent")
             }
@@ -139,6 +148,7 @@ class DetailPaymentActivity : AppCompatActivity() {
             tvOrderSubtotal.text = formatPrice(sell.totalAmount.toString())
             tvOrderShipPrice.text = formatPrice(sell.shipmentPrice.toString())
             tvOrderPrice.text = formatPrice(sell.totalAmount.toString())
+            tvOrderDue.text = formatDueDate(sell.updatedAt.toString(), 2)
             tvOrderRecipient.text = sell.recipient ?: "-"
             tvOrderRecipientNum.text = sell.receiptNum?.toString() ?: "-"
 
@@ -201,6 +211,28 @@ class DetailPaymentActivity : AppCompatActivity() {
         }
     }
 
+    private fun formatDueDate(dateString: String, dueDay: Int): String {
+        return try {
+            val inputFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault())
+            inputFormat.timeZone = TimeZone.getTimeZone("UTC")
+
+            val outputFormat = SimpleDateFormat("dd MMM; HH.mm", Locale("id", "ID"))
+
+            val date = inputFormat.parse(dateString)
+
+            date?.let {
+                val calendar = Calendar.getInstance()
+                calendar.time = it
+                calendar.add(Calendar.DATE, dueDay)
+
+                outputFormat.format(calendar.time)
+            } ?: dateString
+        } catch (e: Exception) {
+            Log.e("DateFormatting", "Error formatting date: ${e.message}")
+            dateString
+        }
+    }
+
     private fun formatPrice(price: String): String {
         val priceDouble = price.toDoubleOrNull() ?: 0.0
         return String.format(Locale("id", "ID"), "Rp%,.0f", priceDouble)

app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/sells/shipment/DetailShipmentActivity.kt

@@ -14,7 +14,6 @@ import com.alya.ecommerce_serang.data.repository.AddressRepository
 import com.alya.ecommerce_serang.data.repository.SellsRepository
 import com.alya.ecommerce_serang.databinding.ActivityDetailShipmentBinding
 import com.alya.ecommerce_serang.ui.profile.mystore.sells.SellsProductAdapter
-import com.alya.ecommerce_serang.ui.profile.mystore.sells.payment.DetailPaymentActivity
 import com.alya.ecommerce_serang.utils.BaseViewModelFactory
 import com.alya.ecommerce_serang.utils.SessionManager
 import com.alya.ecommerce_serang.utils.viewmodel.AddressViewModel
@@ -24,7 +23,6 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
 import java.util.TimeZone
-import kotlin.getValue
 
 class DetailShipmentActivity : AppCompatActivity() {
 
@@ -106,6 +104,7 @@ class DetailShipmentActivity : AppCompatActivity() {
             tvOrderSubtotal.text = formatPrice(sell.totalAmount.toString())
             tvOrderShipPrice.text = formatPrice(sell.shipmentPrice.toString())
             tvOrderPrice.text = formatPrice(sell.totalAmount.toString())
+            tvOrderDue.text = formatDueDate(sell.updatedAt.toString(), 2)
             tvOrderRecipient.text = sell.recipient ?: "-"
             tvOrderRecipientNum.text = sell.receiptNum?.toString() ?: "-"
 
@@ -168,6 +167,28 @@ class DetailShipmentActivity : AppCompatActivity() {
         }
     }
 
+    private fun formatDueDate(dateString: String, dueDay: Int): String {
+        return try {
+            val inputFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault())
+            inputFormat.timeZone = TimeZone.getTimeZone("UTC")
+
+            val outputFormat = SimpleDateFormat("dd MMM; HH.mm", Locale("id", "ID"))
+
+            val date = inputFormat.parse(dateString)
+
+            date?.let {
+                val calendar = Calendar.getInstance()
+                calendar.time = it
+                calendar.add(Calendar.DATE, dueDay)
+
+                outputFormat.format(calendar.time)
+            } ?: dateString
+        } catch (e: Exception) {
+            Log.e("DateFormatting", "Error formatting date: ${e.message}")
+            dateString
+        }
+    }
+
     private fun formatPrice(price: String): String {
         val priceDouble = price.toDoubleOrNull() ?: 0.0
         return String.format(Locale("id", "ID"), "Rp%,.0f", priceDouble)

app/src/main/java/com/alya/ecommerce_serang/utils/BaseViewModelFactory.kt

@@ -1,10 +1,16 @@
 package com.alya.ecommerce_serang.utils
 
+import android.content.Context
+import android.os.Bundle
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.AbstractSavedStateViewModelFactory
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.savedstate.SavedStateRegistryOwner
+import com.alya.ecommerce_serang.data.api.retrofit.ApiConfig
+import com.alya.ecommerce_serang.data.repository.UserRepository
+import com.alya.ecommerce_serang.utils.viewmodel.RegisterStoreViewModel
 
 class BaseViewModelFactory<VM : ViewModel>(
     private val creator: () -> VM
@@ -29,4 +35,30 @@ class SavedStateViewModelFactory<VM : ViewModel>(
     ): T {
         return creator(handle) as T
     }
+}
+
+class RegisterStoreViewModelFactory(
+    private val owner: SavedStateRegistryOwner,
+    private val defaultArgs: Bundle? = null
+) : AbstractSavedStateViewModelFactory(owner, defaultArgs) {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(
+        key: String,
+        modelClass: Class<T>,
+        handle: SavedStateHandle
+    ): T {
+        return when {
+            modelClass.isAssignableFrom(RegisterStoreViewModel::class.java) -> {
+                // Create SessionManager and ApiService
+                val context = if (owner is Context) owner else (owner as Fragment).requireContext()
+                val sessionManager = SessionManager(context)
+                val apiService = ApiConfig.getApiService(sessionManager)
+                val repository = UserRepository(apiService)
+
+                RegisterStoreViewModel(repository, handle) as T
+            }
+            else -> throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}")
+        }
+    }
 }

app/src/main/java/com/alya/ecommerce_serang/utils/FileUtils.kt

@@ -1,12 +1,17 @@
 package com.alya.ecommerce_serang.utils
 
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Log
 import android.webkit.MimeTypeMap
+import com.tom_roush.pdfbox.pdmodel.PDDocument
+import com.tom_roush.pdfbox.rendering.PDFRenderer
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody.Companion.asRequestBody
+import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
@@ -135,4 +140,115 @@ object FileUtils {
             else -> "application/octet-stream"
         }
     }
+
+    // for Uri format
+//    fun compressFileToMax1MB(context: Context, uri: Uri): File? {
+//        val mimeType = context.contentResolver.getType(uri)
+//
+//        return if (mimeType?.startsWith("image/") == true) {
+//            // Handle images (jpg/png)
+//            compressImageToMax1MB(context, uri)
+//        } else if (mimeType == "application/pdf") {
+//            // Handle PDFs
+//            val file = createTempFileFromUri(context, uri, "pdf")
+//            return if (file != null && file.length() <= 1_048_576) {
+//                file
+//            } else {
+//                // 🚨 Without a PDF compression lib, you can only reject if > 1 MB
+//                null
+//            }
+//        } else {
+//            // Unsupported type
+//            null
+//        }
+//    }
+
+    fun compressFileToMax1MB(context: Context, uri: Uri): CompressionResult {
+        val mimeType = context.contentResolver.getType(uri) ?: return CompressionResult.Error("Tipe file tidak diketahui")
+
+        return if (mimeType.startsWith("image/")) {
+            val compressed = compressImageToMax1MB(context, uri)
+            if (compressed != null) {
+                CompressionResult.Success(compressed)
+            } else {
+                CompressionResult.Error("Ukuran gambar terlalu besar. Max 1MB.")
+            }
+        } else if (mimeType == "application/pdf") {
+            val file = createTempFileFromUri(context, uri, "pdf")
+            if (file == null) {
+                return CompressionResult.Error("Tidak bisa membaca file pdf")
+            }
+            if (file.length() <= 1_048_576) {
+                return CompressionResult.Success(file)
+            }
+            val compressed = compressPdfToMax1MB(context, file)
+            if (compressed != null) {
+                CompressionResult.Success(compressed)
+            } else {
+                CompressionResult.Error("Ukuran pdf terlalu besar. Max 1MB.")
+            }
+        } else {
+            CompressionResult.Error("Tipe file tidak didukung: $mimeType")
+        }
+    }
+
+    fun compressImageToMax1MB(context: Context, uri: Uri): File? {
+        val inputStream = context.contentResolver.openInputStream(uri) ?: return null
+        val originalBitmap = BitmapFactory.decodeStream(inputStream)
+
+        var quality = 100
+        var compressedFile: File
+        var outputStream: ByteArrayOutputStream
+
+        do {
+            outputStream = ByteArrayOutputStream()
+            originalBitmap.compress(Bitmap.CompressFormat.JPEG, quality, outputStream)
+
+            val compressedBytes = outputStream.toByteArray()
+            compressedFile = File(context.cacheDir, "compressed_${System.currentTimeMillis()}.jpg")
+            FileOutputStream(compressedFile).use { it.write(compressedBytes) }
+
+            quality -= 5
+        } while (compressedFile.length() > 1_048_576 && quality > 10)
+
+        return if (compressedFile.length() <= 1_048_576) compressedFile else null
+    }
+
+    fun compressPdfToMax1MB(context: Context, inputFile: File): File? {
+        return try {
+            val document = PDDocument.load(inputFile)
+            val renderer = PDFRenderer(document)
+
+            val compressedDoc = PDDocument()
+
+            for (pageIndex in 0 until document.numberOfPages) {
+                val bitmap = renderer.renderImageWithDPI(pageIndex, 72f) // low DPI → smaller size
+                val outPage = com.tom_roush.pdfbox.pdmodel.PDPage(
+                    com.tom_roush.pdfbox.pdmodel.common.PDRectangle(bitmap.width.toFloat(), bitmap.height.toFloat())
+                )
+                compressedDoc.addPage(outPage)
+
+                val pdImage = com.tom_roush.pdfbox.pdmodel.graphics.image.LosslessFactory.createFromImage(compressedDoc, bitmap)
+                val contentStream = com.tom_roush.pdfbox.pdmodel.PDPageContentStream(compressedDoc, outPage)
+                contentStream.drawImage(pdImage, 0f, 0f, bitmap.width.toFloat(), bitmap.height.toFloat())
+                contentStream.close()
+            }
+
+            val compressedFile = File(context.cacheDir, "compressed_${System.currentTimeMillis()}.pdf")
+            compressedDoc.save(compressedFile)
+            compressedDoc.close()
+            document.close()
+
+            // Check size
+            return if (compressedFile.length() <= 1_048_576) compressedFile else null
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+}
+
+sealed class CompressionResult {
+    data class Success(val file: File) : CompressionResult()
+    data class Error(val reason: String) : CompressionResult()
 }

app/src/main/java/com/alya/ecommerce_serang/utils/HorizontalMarginItemDecoration.kt

@@ -1,22 +0,0 @@
-package com.alya.ecommerce_serang.utils
-
-import android.content.Context
-import android.graphics.Rect
-import android.view.View
-import androidx.annotation.DimenRes
-import androidx.recyclerview.widget.RecyclerView
-
-class HorizontalMarginItemDecoration(context: Context, @DimenRes horizontalMarginInDp: Int) :
-    RecyclerView.ItemDecoration() {
-
-    private val horizontalMarginInPx: Int =
-        context.resources.getDimension(horizontalMarginInDp).toInt()
-
-    override fun getItemOffsets(
-        outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State
-    ) {
-        outRect.right = horizontalMarginInPx
-        outRect.left = horizontalMarginInPx
-    }
-
-}

app/src/main/java/com/alya/ecommerce_serang/utils/PopUpDialog.kt

@@ -0,0 +1,83 @@
+package com.alya.ecommerce_serang.utils
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import com.alya.ecommerce_serang.R
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+object PopUpDialog {
+    fun showConfirmDialog(
+        context: Context,
+        title: String ,
+        message: String? = null,
+        iconRes: Int? = null,
+        positiveText: String? = null,
+        negativeText: String? = null,
+        onYesClicked: (() -> Unit)? = null,
+        onNoClicked: (() -> Unit)? = null
+    ) {
+        val inflater = LayoutInflater.from(context)
+        val dialogView = inflater.inflate(R.layout.dialog_popup, null)
+
+        val iconView = dialogView.findViewById<ImageView>(R.id.dialogIcon)
+        val titleView = dialogView.findViewById<TextView>(R.id.dialogTitle)
+        val messageView = dialogView.findViewById<TextView>(R.id.dialogMessage)
+        val yesButton = dialogView.findViewById<MaterialButton>(R.id.btnYes)
+        val noButton = dialogView.findViewById<MaterialButton>(R.id.btnNo)
+
+        if (iconRes != null) {
+            iconView.setImageResource(iconRes)
+            iconView.visibility = View.VISIBLE
+        } else {
+            iconView.visibility = View.GONE
+        }
+
+        // Title
+        titleView.text = title
+
+        // Message
+        if (message.isNullOrEmpty()) {
+            messageView.visibility = View.GONE
+        } else {
+            messageView.text = message
+            messageView.visibility = View.VISIBLE
+        }
+
+        // Yes button (always visible, but customizable text)
+
+        if (positiveText.isNullOrEmpty()) {
+            yesButton.visibility = View.GONE
+        } else {
+            yesButton.text = positiveText
+            yesButton.visibility = View.VISIBLE
+        }
+
+        // No button (optional)
+        if (negativeText.isNullOrEmpty()) {
+            noButton.visibility = View.GONE
+        } else {
+            noButton.text = negativeText
+            noButton.visibility = View.VISIBLE
+        }
+
+        val dialog = MaterialAlertDialogBuilder(context, R.style.ThemeOverlay_MyApp_AlertDialog)
+            .setView(dialogView)
+            .create()
+
+        yesButton.setOnClickListener {
+            onYesClicked?.invoke()
+            dialog.dismiss()
+        }
+
+        noButton.setOnClickListener {
+            onNoClicked?.invoke()
+            dialog.dismiss()
+        }
+
+        dialog.show()
+    }
+}

app/src/main/java/com/alya/ecommerce_serang/utils/UriToFileConverter.kt

@@ -7,7 +7,6 @@ import android.provider.OpenableColumns
 import android.util.Log
 import java.io.File
 import java.io.FileOutputStream
-import java.io.IOException
 import java.io.InputStream
 import kotlin.random.Random
 
@@ -123,23 +122,4 @@ object UriToFileConverter {
             null
         }
     }
-
-    fun getFilePathFromUri(uri: Uri, context: Context): String? {
-        // For Media Gallery
-        val projection = arrayOf(MediaStore.Images.Media.DATA)
-        try {
-            val cursor = context.contentResolver.query(uri, projection, null, null, null)
-            cursor?.use {
-                if (it.moveToFirst()) {
-                    val columnIndex = it.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
-                    return it.getString(columnIndex)
-                }
-            }
-        } catch (e: Exception) {
-            Log.e(TAG, "Error getting file path from URI", e)
-        }
-
-        // If the above method fails, try direct conversion
-        return uri.path
-    }
 }

app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/MyStoreViewModel.kt

@@ -6,10 +6,13 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
+import com.alya.ecommerce_serang.data.api.dto.PaymentUpdate
 import com.alya.ecommerce_serang.data.api.dto.ProductsItem
 import com.alya.ecommerce_serang.data.api.dto.Store
 import com.alya.ecommerce_serang.data.api.response.auth.StoreTypesItem
 import com.alya.ecommerce_serang.data.api.response.store.StoreResponse
+import com.alya.ecommerce_serang.data.api.response.store.profile.Payment
+import com.alya.ecommerce_serang.data.api.response.store.profile.Shipping
 import com.alya.ecommerce_serang.data.api.response.store.profile.StoreDataResponse
 import com.alya.ecommerce_serang.data.repository.MyStoreRepository
 import com.alya.ecommerce_serang.data.repository.Result
@@ -17,18 +20,25 @@ import kotlinx.coroutines.launch
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import java.text.NumberFormat
 import java.util.Locale
 
 class MyStoreViewModel(private val repository: MyStoreRepository): ViewModel() {
     private var TAG = "MyStoreViewModel"
 
-    private val _myStoreProfile = MutableLiveData<Store?>()
+    private val _myStoreProfile = MutableLiveData<StoreResponse?>()
-    val myStoreProfile: LiveData<Store?> = _myStoreProfile
+    val myStoreProfile: LiveData<StoreResponse?> = _myStoreProfile
 
     private val _storeTypes = MutableLiveData<List<StoreTypesItem>>()
     val storeTypes: LiveData<List<StoreTypesItem>> = _storeTypes
 
+    private val _shipping = MutableLiveData<List<Shipping>>()
+    val shipping: LiveData<List<Shipping>> = _shipping
+
+    private val _payment = MutableLiveData<List<Payment>>()
+    val payment: LiveData<List<Payment>> = _payment
+
     private val _isLoadingType = MutableLiveData<Boolean>()
     val isLoadingType: LiveData<Boolean> = _isLoadingType
 
@@ -47,7 +57,12 @@ class MyStoreViewModel(private val repository: MyStoreRepository): ViewModel() {
     fun loadMyStore(){
         viewModelScope.launch {
             when (val result = repository.fetchMyStoreProfile()){
-                is Result.Success -> _myStoreProfile.postValue(result.data)
+                is Result.Success -> {
+                    val storeData = result.data
+                    _myStoreProfile.postValue(storeData)
+                    _shipping.postValue(storeData?.shipping)
+                    _payment.postValue(storeData?.payment)
+                }
                 is Result.Error -> _errorMessage.postValue(result.exception.message ?: "Unknown Error")
                 is Result.Loading -> null
             }
@@ -186,6 +201,80 @@ class MyStoreViewModel(private val repository: MyStoreRepository): ViewModel() {
         }
     }
 
-    private fun String.toRequestBody(): RequestBody =
+    private fun String.toPlain(): RequestBody =
-        RequestBody.create("text/plain".toMediaTypeOrNull(), this)
+        this.toRequestBody("text/plain".toMediaTypeOrNull())
+
+    fun updateStoreApproval(
+        storeName: RequestBody,
+        description: RequestBody,
+        storeType: RequestBody,
+        latitude: RequestBody,
+        longitude: RequestBody,
+        storeProvince: RequestBody,
+        storeCity: RequestBody,
+        storeSubdistrict: RequestBody,
+        storeVillage: RequestBody,
+        storeStreet: RequestBody,
+        storePostalCode: RequestBody,
+        storeAddressDetail: RequestBody,
+        userPhone: RequestBody,
+        paymentsToUpdate: List<PaymentUpdate> = emptyList(),
+        paymentIdToDelete: List<Int> = emptyList(),
+        storeCourier: List<String>? = null,
+        storeImage: MultipartBody.Part?,
+        ktpImage: MultipartBody.Part?,
+        npwpDocument: MultipartBody.Part?,
+        nibDocument: MultipartBody.Part?
+    ) {
+        viewModelScope.launch {
+            try {
+                val store = myStoreProfile.value
+
+                if (store == null) {
+                    _errorMessage.postValue("Data toko tidak tersedia")
+                    Log.e(TAG, "Store data is null")
+                    return@launch
+                }
+
+                val response = repository.updateStoreApproval(
+                    storeName = storeName,
+                    description = description,
+                    storeType = storeType,
+                    latitude = latitude,
+                    longitude = longitude,
+                    storeProvince = storeProvince,
+                    storeCity = storeCity,
+                    storeSubdistrict = storeSubdistrict,
+                    storeVillage = storeVillage,
+                    storeStreet = storeStreet,
+                    storePostalCode = storePostalCode,
+                    storeAddressDetail = storeAddressDetail,
+                    userPhone = userPhone,
+                    paymentsToUpdate = paymentsToUpdate,
+                    paymentIdToDelete = paymentIdToDelete,
+                    storeCourier = storeCourier,
+                    storeImage = storeImage,
+                    ktpImage = ktpImage,
+                    npwpDocument = npwpDocument,
+                    nibDocument = nibDocument
+                )
+
+                if (response != null) {
+                    if (response.isSuccessful) {
+                        _updateStoreProfileResult.postValue(response.body())
+                        Log.d(TAG, "Update successful: ${response.body()}")
+                    } else {
+                        _errorMessage.postValue("Gagal memperbarui profil")
+                        Log.e(TAG, "Update failed: ${response.errorBody()?.string()}")
+                    }
+                } else {
+                    _errorMessage.postValue("Terjadi kesalahan jaringan atau server")
+                    Log.e(TAG, "Repository returned null response")
+                }
+            } catch (e: Exception) {
+                _errorMessage.postValue(e.message ?: "Unexpected error")
+                Log.e(TAG, "Exception updating store profile", e)
+            }
+        }
+    }
 }

app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/ProfileViewModel.kt

@@ -8,6 +8,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.alya.ecommerce_serang.data.api.dto.UserProfile
+import com.alya.ecommerce_serang.data.api.response.auth.ChangePassResponse
 import com.alya.ecommerce_serang.data.api.response.auth.HasStoreResponse
 import com.alya.ecommerce_serang.data.api.response.customer.profile.EditProfileResponse
 import com.alya.ecommerce_serang.data.repository.Result
@@ -26,7 +27,7 @@ class ProfileViewModel(private val userRepository: UserRepository) : ViewModel()
 
     private val _checkStore = MutableLiveData<Boolean>()
     val checkStore: LiveData<Boolean> = _checkStore
-
+    val changePasswordResult = MutableLiveData<Result<ChangePassResponse>>()
     private val _logout = MutableLiveData<Boolean>()
     val logout : LiveData<Boolean> = _logout
 
@@ -110,6 +111,20 @@ class ProfileViewModel(private val userRepository: UserRepository) : ViewModel()
         }
     }
 
+    fun changePassword(currentPassword: String, newPassword: String) {
+        viewModelScope.launch {
+            try {
+                // Call the repository to change the password
+                val result = userRepository.changePassword(currentPassword, newPassword)
+
+                // Post the result (success or error) to LiveData
+                changePasswordResult.postValue(result)
+            } catch (e: Exception) {
+                // Handle any unexpected errors
+                changePasswordResult.postValue(Result.Error(e))
+            }
+        }
+    }
 
     companion object {
         private const val TAG = "ProfileViewModel"

app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/RegisterStoreViewModel.kt

@@ -5,6 +5,7 @@ import android.net.Uri
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.alya.ecommerce_serang.data.api.response.auth.RegisterStoreResponse
@@ -19,7 +20,8 @@ import com.alya.ecommerce_serang.utils.ImageUtils
 import kotlinx.coroutines.launch
 
 class RegisterStoreViewModel(
-    private val repository: UserRepository
+    private val repository: UserRepository,
+    private val savedStateHandle: SavedStateHandle
 ) : ViewModel() {
 
     // LiveData for UI state
@@ -56,20 +58,20 @@ class RegisterStoreViewModel(
     var selectedBankName: String? = null
 
     // Form fields
-    val storeName = MutableLiveData<String>()
+    val storeName: MutableLiveData<String> = savedStateHandle.getLiveData("storeName", "")
-    val storeDescription = MutableLiveData<String>()
+    val storeDescription: MutableLiveData<String> = savedStateHandle.getLiveData("storeDescription", "")
-    val storeTypeId = MutableLiveData<Int>()
+    val storeTypeId: MutableLiveData<Int> = savedStateHandle.getLiveData("storeTypeId", 0)
-    val latitude = MutableLiveData<String>()
+    val latitude: MutableLiveData<String> = savedStateHandle.getLiveData("latitude", "")
-    val longitude = MutableLiveData<String>()
+    val longitude: MutableLiveData<String> = savedStateHandle.getLiveData("longitude", "")
-    val street = MutableLiveData<String>()
+    val street: MutableLiveData<String> = savedStateHandle.getLiveData("street", "")
-    val subdistrict = MutableLiveData<String>()
+    val subdistrict: MutableLiveData<String> = savedStateHandle.getLiveData("subdistrict", "")
-    val cityId = MutableLiveData<String>()
+    val cityId: MutableLiveData<String> = savedStateHandle.getLiveData("cityId", "")
-    val provinceId = MutableLiveData<Int>()
+    val provinceId: MutableLiveData<Int> = savedStateHandle.getLiveData("provinceId", 0)
-    val postalCode = MutableLiveData<Int>()
+    val postalCode: MutableLiveData<Int> = savedStateHandle.getLiveData("postalCode", 0)
-    val addressDetail = MutableLiveData<String>()
+    val addressDetail: MutableLiveData<String> = savedStateHandle.getLiveData("addressDetail", "")
-    val bankName = MutableLiveData<String>()
+    val bankName: MutableLiveData<String> = savedStateHandle.getLiveData("bankName", "")
-    val bankNumber = MutableLiveData<Int>()
+    val bankNumber: MutableLiveData<Int> = savedStateHandle.getLiveData("bankNumber", 0)
-    val accountName = MutableLiveData<String>()
+    val accountName: MutableLiveData<String> = savedStateHandle.getLiveData("accountName", "")
 
     // Files
     var storeImageUri: Uri? = null
@@ -79,6 +81,15 @@ class RegisterStoreViewModel(
     var persetujuanUri: Uri? = null
     var qrisUri: Uri? = null
 
+    fun getFieldValue(key: String): String {
+        return savedStateHandle.get<String>(key) ?: ""
+    }
+
+    // Helper function to update any field
+    fun updateField(key: String, value: String) {
+        savedStateHandle[key] = value
+    }
+
     // Selected couriers
     val selectedCouriers = mutableListOf<String>()
 

app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/RegisterViewModel.kt

@@ -7,9 +7,11 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.alya.ecommerce_serang.data.api.dto.CreateAddressRequest
+import com.alya.ecommerce_serang.data.api.dto.FcmReq
 import com.alya.ecommerce_serang.data.api.dto.RegisterRequest
 import com.alya.ecommerce_serang.data.api.dto.ResetPassReq
 import com.alya.ecommerce_serang.data.api.dto.VerifRegisReq
+import com.alya.ecommerce_serang.data.api.response.auth.FcmTokenResponse
 import com.alya.ecommerce_serang.data.api.response.auth.LoginResponse
 import com.alya.ecommerce_serang.data.api.response.auth.OtpResponse
 import com.alya.ecommerce_serang.data.api.response.auth.RegisterResponse
@@ -388,6 +390,34 @@ class RegisterViewModel(private val repository: UserRepository, private val orde
 
     }
 
+    fun sendFcm(token: FcmReq) {
+        viewModelScope.launch {
+            _otpState.value = Result.Loading // Indicating API call in progress
+
+            try {
+                // Call the repository function to request OTP
+                val authenticatedApiService = getAuthenticatedApiService()
+                val authenticatedOrderRepo = UserRepository(authenticatedApiService)
+                val response: FcmTokenResponse = authenticatedOrderRepo.sendFcm(token)
+
+                // Log and store success message
+                Log.d("LoginViewModel", "OTP Response: ${response.message}")
+                _message.value = response.message ?: "berhasil" // Store the message for UI feedback
+
+                // Update state to indicate success
+                _otpState.value = Result.Success(Unit)
+
+            } catch (exception: Exception) {
+                // Handle any errors and update state
+                _otpState.value = Result.Error(exception)
+                _message.value = exception.localizedMessage ?: "Failed to request OTP"
+
+                // Log the error for debugging
+                Log.e("LoginViewModel", "OTP request failed for: $token", exception)
+            }
+        }
+    }
+
     companion object {
         private const val TAG = "RegisterViewModel"
     }

app/src/main/java/com/alya/ecommerce_serang/utils/viewmodel/SellsViewModel.kt

@@ -17,6 +17,9 @@ import com.alya.ecommerce_serang.ui.order.address.ViewState
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -52,6 +55,9 @@ class SellsViewModel(private val repository: SellsRepository) : ViewModel() {
     private val _error = MutableLiveData<String>()
     val error: LiveData<String> get() = _error
 
+    private val _selectedStatus = MutableStateFlow("all")
+    val selectedStatus: StateFlow<String> = _selectedStatus.asStateFlow()
+
     fun getSellList(status: String) {
         Log.d(TAG, "========== Starting getSellList ==========")
         Log.d(TAG, "Requested status: '$status'")
@@ -320,4 +326,40 @@ class SellsViewModel(private val repository: SellsRepository) : ViewModel() {
 
         Log.d(TAG, "========== refreshOrders method completed ==========")
     }
+
+    fun updateStatus(status: String, forceRefresh: Boolean = false) {
+        Log.d(TAG, "↪️  updateStatus(status = $status, forceRefresh = $forceRefresh)")
+
+        // No‑op guard (optional): skip if user re‑selects same tab and no refresh asked
+        if (_selectedStatus.value == status && !forceRefresh) {
+            Log.d(TAG, "🔸  Status unchanged & forceRefresh = false → skip update")
+            return
+        }
+
+        _selectedStatus.value = status
+        Log.d(TAG, "✅  _selectedStatus set to \"$status\"")
+
+        if (forceRefresh) {
+            Log.d(TAG, "🔄  forceRefresh = true → launching refresh()")
+            viewModelScope.launch { refresh(status) }
+        }
+    }
+
+    private suspend fun refresh(status: String) {
+        Log.d(TAG, "⏳  refresh(\"$status\") started")
+
+        try {
+            if (status == "all") {
+                Log.d(TAG, "🌐  Calling getAllOrdersCombined()")
+                getAllStatusCounts()                    // network → cache
+            } else {
+                Log.d(TAG, "🌐  repository.getOrderList(\"$status\")")
+                repository.getSellList(status)            // network → cache
+            }
+            Log.d(TAG, "✅  refresh(\"$status\") completed (repository updated)")
+            // Flow that watches DB/cache will emit automatically
+        } catch (e: Exception) {
+            Log.e(TAG, "❌  refresh(\"$status\") failed: ${e.message}", e)
+        }
+    }
 }

app/src/main/res/drawable/baseline_account_circle_100.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="100dp" android:tint="#489EC6" android:viewportHeight="24" android:viewportWidth="24" android:width="100dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,6c1.93,0 3.5,1.57 3.5,3.5S13.93,13 12,13s-3.5,-1.57 -3.5,-3.5S10.07,6 12,6zM12,20c-2.03,0 -4.43,-0.82 -6.14,-2.88C7.55,15.8 9.68,15 12,15s4.45,0.8 6.14,2.12C16.43,19.18 14.03,20 12,20z"/>
+    
+</vector>

app/src/main/res/drawable/baseline_circle_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#489EC6" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z"/>
+    
+</vector>

app/src/main/res/drawable/baseline_local_grocery_store_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#211E1E" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M7,18c-1.1,0 -1.99,0.9 -1.99,2S5.9,22 7,22s2,-0.9 2,-2 -0.9,-2 -2,-2zM1,2v2h2l3.6,7.59 -1.35,2.45c-0.16,0.28 -0.25,0.61 -0.25,0.96 0,1.1 0.9,2 2,2h12v-2L7.42,15c-0.14,0 -0.25,-0.11 -0.25,-0.25l0.03,-0.12 0.9,-1.63h7.45c0.75,0 1.41,-0.41 1.75,-1.03l3.58,-6.49c0.08,-0.14 0.12,-0.31 0.12,-0.48 0,-0.55 -0.45,-1 -1,-1L5.21,4l-0.94,-2L1,2zM17,18c-1.1,0 -1.99,0.9 -1.99,2s0.89,2 1.99,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    
+</vector>

app/src/main/res/drawable/baseline_payment_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#211E1E" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z"/>
+    
+</vector>

app/src/main/res/drawable/bg_button_active.xml

@@ -3,6 +3,6 @@
     android:shape="rectangle">
 
     <solid android:color="@color/blue_500" />
-    <corners android:radius="5dp" />
+    <corners android:radius="24dp" />
 
 </shape>

app/src/main/res/drawable/checkmark__1_.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="95dp" android:viewportHeight="101" android:viewportWidth="101" android:width="95dp">
+      
+    <path android:fillColor="#BAE0BD" android:pathData="M50.56,97.03C25.06,97.03 4.31,76.28 4.31,50.78C4.31,25.28 25.06,4.53 50.56,4.53C76.06,4.53 96.81,25.28 96.81,50.78C96.81,76.28 76.06,97.03 50.56,97.03Z"/>
+      
+    <path android:fillColor="#5E9C76" android:pathData="M50.56,5.78C75.31,5.78 95.56,26.03 95.56,50.78C95.56,75.53 75.31,95.78 50.56,95.78C25.81,95.78 5.56,75.53 5.56,50.78C5.56,26.03 25.81,5.78 50.56,5.78ZM50.56,3.28C24.31,3.28 3.06,24.53 3.06,50.78C3.06,77.03 24.31,98.28 50.56,98.28C76.81,98.28 98.06,77.03 98.06,50.78C98.06,24.53 76.81,3.28 50.56,3.28Z"/>
+      
+    <path android:fillColor="#00000000" android:pathData="M28.56,51.03L43.06,65.53L76.06,32.53" android:strokeColor="#ffffff" android:strokeWidth="7.5"/>
+    
+</vector>

app/src/main/res/drawable/ic_cancel.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="100dp"
+    android:height="100dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+  <path
+      android:pathData="M50,96.88C24.15,96.88 3.13,75.85 3.13,50C3.13,24.15 24.15,3.13 50,3.13C75.85,3.13 96.88,24.15 96.88,50C96.88,75.85 75.85,96.88 50,96.88Z"
+      android:fillColor="#F78F8F"/>
+  <path
+      android:pathData="M50,3.75C75.5,3.75 96.25,24.5 96.25,50C96.25,75.5 75.5,96.25 50,96.25C24.5,96.25 3.75,75.5 3.75,50C3.75,24.5 24.5,3.75 50,3.75ZM50,2.5C23.77,2.5 2.5,23.77 2.5,50C2.5,76.23 23.77,97.5 50,97.5C76.23,97.5 97.5,76.23 97.5,50C97.5,23.77 76.23,2.5 50,2.5Z"
+      android:fillColor="#C74343"/>
+  <path
+      android:pathData="M34.97,70.33L29.67,65.03L65.03,29.67L70.33,34.97L34.97,70.33Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M29.67,34.97L34.97,29.67L70.33,65.03L65.03,70.33L29.67,34.97Z"
+      android:fillColor="#ffffff"/>
+</vector>

app/src/main/res/drawable/logo_bisa_umkm.xml

@@ -0,0 +1,29 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+
+  <!-- Background circle for better splash screen appearance -->
+  <path
+      android:pathData="M54,54m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
+      android:fillColor="#ffff"/>
+
+  <!-- Main logo content scaled and centered -->
+  <group android:translateX="32" android:translateY="32" android:scaleX="0.7" android:scaleY="0.7">
+    <!-- Background rectangle -->
+    <path
+        android:pathData="M0,0h64v64h-64z"
+        android:fillColor="#489EC6"/>
+
+    <!-- Main logo shape -->
+    <path
+        android:pathData="M11.868,58C10.523,58 9.399,57.538 8.497,56.614C7.594,55.69 7.144,54.537 7.146,53.155V29.074C5.912,28.14 5.009,26.915 4.438,25.399C3.867,23.883 3.854,22.266 4.4,20.548L7.245,10.924C7.635,9.7 8.264,8.74 9.131,8.044C10.001,7.348 11.075,7 12.354,7H51.536C52.813,7 53.883,7.326 54.747,7.978C55.608,8.63 56.24,9.573 56.641,10.807L59.598,20.545C60.146,22.265 60.134,23.896 59.563,25.438C58.992,26.98 58.089,28.23 56.855,29.188V53.152C56.855,54.534 56.404,55.687 55.501,56.611C54.599,57.535 53.476,57.998 52.133,58H11.868ZM38.433,28C40.311,28 41.712,27.46 42.638,26.38C43.564,25.302 43.954,24.188 43.808,23.038L41.866,10H33.465V22.6C33.465,24.074 33.957,25.342 34.939,26.404C35.922,27.468 37.084,28 38.433,28ZM25.278,28C26.849,28 28.119,27.468 29.088,26.404C30.057,25.34 30.541,24.072 30.541,22.6V10H22.138L20.19,23.269C20.071,24.201 20.468,25.222 21.38,26.332C22.292,27.442 23.594,27.998 25.278,28ZM12.263,28C13.551,28 14.647,27.55 15.55,26.65C16.452,25.75 17.014,24.627 17.234,23.281L19.067,10H12.354C11.716,10 11.209,10.144 10.833,10.432C10.457,10.72 10.176,11.153 9.991,11.731L7.292,21.205C6.812,22.781 7.017,24.308 7.906,25.786C8.795,27.264 10.247,28.002 12.263,28ZM51.738,28C53.488,28 54.886,27.3 55.931,25.9C56.978,24.5 57.237,22.935 56.709,21.205L53.864,11.617C53.676,11.039 53.395,10.625 53.019,10.375C52.642,10.125 52.137,10 51.501,10H44.933L46.767,23.281C46.987,24.627 47.549,25.75 48.451,26.65C49.354,27.55 50.449,28 51.738,28Z"
+        android:fillColor="#ffffff"/>
+
+    <!-- Text elements -->
+    <path
+        android:pathData="M20.382,39V30.6H23.97C24.554,30.6 25.046,30.692 25.446,30.876C25.846,31.052 26.15,31.304 26.358,31.632C26.574,31.952 26.682,32.332 26.682,32.772C26.682,33.196 26.59,33.552 26.406,33.84C26.222,34.128 25.978,34.348 25.674,34.5C25.378,34.652 25.05,34.744 24.69,34.776L24.882,34.632C25.274,34.648 25.618,34.752 25.914,34.944C26.21,35.136 26.442,35.388 26.61,35.7C26.786,36.004 26.874,36.34 26.874,36.708C26.874,37.164 26.766,37.564 26.55,37.908C26.334,38.252 26.018,38.52 25.602,38.712C25.186,38.904 24.682,39 24.09,39H20.382ZM22.182,37.536H23.79C24.19,37.536 24.498,37.448 24.714,37.272C24.938,37.088 25.05,36.824 25.05,36.48C25.05,36.136 24.934,35.868 24.702,35.676C24.478,35.484 24.166,35.388 23.766,35.388H22.182V37.536ZM22.182,34.056H23.658C24.042,34.056 24.334,33.968 24.534,33.792C24.742,33.616 24.846,33.368 24.846,33.048C24.846,32.728 24.742,32.48 24.534,32.304C24.334,32.12 24.038,32.028 23.646,32.028H22.182V34.056ZM28.163,39V32.952H29.963V39H28.163ZM29.063,32.256C28.743,32.256 28.483,32.164 28.283,31.98C28.083,31.796 27.983,31.564 27.983,31.284C27.983,30.996 28.083,30.76 28.283,30.576C28.483,30.392 28.743,30.3 29.063,30.3C29.391,30.3 29.655,30.392 29.855,30.576C30.063,30.76 30.167,30.996 30.167,31.284C30.167,31.564 30.063,31.796 29.855,31.98C29.655,32.164 29.391,32.256 29.063,32.256ZM34.069,39.144C33.501,39.144 33.009,39.056 32.593,38.88C32.186,38.696 31.861,38.448 31.622,38.136C31.389,37.824 31.257,37.472 31.226,37.08H33.014C33.046,37.216 33.102,37.34 33.181,37.452C33.27,37.556 33.386,37.64 33.529,37.704C33.681,37.76 33.849,37.788 34.034,37.788C34.234,37.788 34.394,37.764 34.514,37.716C34.641,37.66 34.737,37.588 34.801,37.5C34.866,37.412 34.897,37.32 34.897,37.224C34.897,37.072 34.849,36.956 34.754,36.876C34.666,36.796 34.534,36.732 34.357,36.684C34.181,36.628 33.97,36.576 33.722,36.528C33.433,36.464 33.146,36.392 32.857,36.312C32.577,36.224 32.326,36.116 32.102,35.988C31.885,35.86 31.709,35.696 31.573,35.496C31.445,35.288 31.382,35.036 31.382,34.74C31.382,34.38 31.482,34.056 31.681,33.768C31.882,33.472 32.169,33.24 32.546,33.072C32.922,32.896 33.377,32.808 33.914,32.808C34.674,32.808 35.27,32.976 35.701,33.312C36.133,33.648 36.389,34.1 36.47,34.668H34.79C34.742,34.508 34.641,34.388 34.489,34.308C34.338,34.22 34.146,34.176 33.914,34.176C33.65,34.176 33.45,34.22 33.313,34.308C33.178,34.396 33.11,34.512 33.11,34.656C33.11,34.752 33.153,34.84 33.242,34.92C33.338,34.992 33.473,35.056 33.65,35.112C33.826,35.168 34.042,35.224 34.298,35.28C34.785,35.384 35.206,35.496 35.557,35.616C35.917,35.736 36.197,35.912 36.397,36.144C36.597,36.368 36.694,36.696 36.686,37.128C36.694,37.52 36.59,37.868 36.374,38.172C36.166,38.476 35.866,38.716 35.473,38.892C35.082,39.06 34.613,39.144 34.069,39.144ZM40.094,39.144C39.59,39.144 39.17,39.064 38.834,38.904C38.506,38.744 38.262,38.528 38.102,38.256C37.95,37.976 37.874,37.668 37.874,37.332C37.874,36.972 37.962,36.656 38.138,36.384C38.322,36.104 38.606,35.884 38.99,35.724C39.374,35.556 39.858,35.472 40.442,35.472H41.906C41.906,35.2 41.87,34.976 41.798,34.8C41.734,34.624 41.626,34.492 41.474,34.404C41.322,34.316 41.114,34.272 40.85,34.272C40.57,34.272 40.334,34.328 40.142,34.44C39.95,34.552 39.83,34.728 39.782,34.968H38.054C38.094,34.536 38.234,34.16 38.474,33.84C38.722,33.52 39.05,33.268 39.458,33.084C39.866,32.9 40.334,32.808 40.862,32.808C41.438,32.808 41.938,32.904 42.362,33.096C42.786,33.28 43.114,33.552 43.346,33.912C43.586,34.272 43.706,34.72 43.706,35.256V39H42.206L41.99,38.124C41.902,38.276 41.798,38.416 41.678,38.544C41.558,38.664 41.418,38.772 41.258,38.868C41.098,38.956 40.922,39.024 40.73,39.072C40.538,39.12 40.326,39.144 40.094,39.144ZM40.538,37.776C40.73,37.776 40.898,37.744 41.042,37.68C41.186,37.616 41.31,37.528 41.414,37.416C41.518,37.304 41.602,37.176 41.666,37.032C41.738,36.88 41.79,36.716 41.822,36.54V36.528H40.658C40.458,36.528 40.29,36.556 40.154,36.612C40.026,36.66 39.93,36.732 39.866,36.828C39.802,36.924 39.77,37.036 39.77,37.164C39.77,37.3 39.802,37.416 39.866,37.512C39.938,37.6 40.03,37.668 40.142,37.716C40.262,37.756 40.394,37.776 40.538,37.776ZM17.132,53.144C16.5,53.144 15.924,53.02 15.404,52.772C14.892,52.516 14.484,52.136 14.18,51.632C13.884,51.128 13.736,50.492 13.736,49.724V44.6H15.536V49.736C15.536,50.112 15.596,50.432 15.716,50.696C15.844,50.96 16.028,51.16 16.268,51.296C16.516,51.424 16.812,51.488 17.156,51.488C17.508,51.488 17.804,51.424 18.044,51.296C18.292,51.16 18.48,50.96 18.608,50.696C18.736,50.432 18.8,50.112 18.8,49.736V44.6H20.6V49.724C20.6,50.492 20.44,51.128 20.12,51.632C19.808,52.136 19.388,52.516 18.86,52.772C18.34,53.02 17.764,53.144 17.132,53.144ZM22.128,53V44.6H24.288L26.736,49.652L29.16,44.6H31.308V53H29.508V47.636L27.444,51.824H26.004L23.928,47.636V53H22.128ZM32.921,53V44.6H34.721V47.78L37.625,44.6H39.833L36.749,47.924L39.941,53H37.733L35.465,49.316L34.721,50.12V53H32.921ZM41.007,53V44.6H43.167L45.615,49.652L48.039,44.6H50.187V53H48.387V47.636L46.323,51.824H44.883L42.807,47.636V53H41.007Z"
+        android:fillColor="#489EC6"/>
+  </group>
+</vector>

app/src/main/res/drawable/logo_home.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/white" />
+    <!-- Logo with controlled size -->
+    <item
+        android:width="48dp"
+        android:height="48dp"
+        android:drawable="@drawable/logo_psb_only"
+        android:gravity="center" />
+</layer-list>

app/src/main/res/drawable/splash_drawable.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/white" />
+
+    <!-- Logo with controlled size -->
+    <item
+        android:width="120dp"
+        android:height="120dp"
+        android:drawable="@drawable/logo_psb_crop"
+        android:gravity="center" />
+</layer-list>

app/src/main/res/layout/activity_add_evidence_payment.xml

@@ -113,6 +113,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
+                android:visibility="gone"
                 android:text="Metode Pembayaran *"
                 android:fontFamily="@font/dmsans_semibold"
                 android:textSize="16sp" />
@@ -122,6 +123,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
+                android:visibility="gone"
                 android:background="@drawable/edit_text_background"
                 android:minHeight="50dp"
                 android:padding="12dp" />

app/src/main/res/layout/activity_category_products.xml

@@ -28,10 +28,10 @@
                 app:layout_collapseMode="parallax"
                 android:contentDescription="Category Header Image" />
 
-            <View
+<!--            <View-->
-                android:layout_width="match_parent"
+<!--                android:layout_width="match_parent"-->
-                android:layout_height="match_parent"
+<!--                android:layout_height="match_parent"-->
-                android:background="@color/blue_50" />
+<!--                android:background="@color/blue_50" />-->
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"

app/src/main/res/layout/activity_change_password.xml

@@ -0,0 +1,102 @@
+<?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:id="@+id/main"
+    android:fitsSystemWindows="true"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.profile.ChangePasswordActivity">
+
+    <include
+        android:id="@+id/header"
+        layout="@layout/header" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="32dp"
+        android:paddingVertical="16dp">
+
+        <!-- Password label-->
+        <TextView
+            android:id="@+id/tv_password_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/dmsans_medium"
+            android:text="Kata Sandi Lama"
+            android:textSize="18sp"
+            android:layout_marginVertical="8dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <!-- Password input -->
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/til_login_password"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            app:passwordToggleEnabled="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_password_label"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_login_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Masukkan kata sandi akun"
+                android:inputType="textPassword" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <!-- Password label-->
+        <TextView
+            android:id="@+id/tv_new_password_label"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/dmsans_medium"
+            android:text="Kata Sandi Baru"
+            android:textSize="18sp"
+            android:layout_marginVertical="8dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/til_login_password"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <!-- Password input -->
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/til_login_new_password"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            app:passwordToggleEnabled="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_new_password_label"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_login_new_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="Masukkan kata sandi baru"
+                android:inputType="textPassword" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <!-- Change Pass button -->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_change_pass"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="Ubah Kata Sandi"
+            app:cornerRadius="8dp"
+            android:layout_marginVertical="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/til_login_new_password" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>

app/src/main/res/layout/activity_checkout.xml

@@ -34,69 +34,50 @@
             android:orientation="vertical">
 
             <!-- Delivery Address Section -->
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/card_delivery_address"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="0dp"
+                android:layout_marginHorizontal="16dp"
-                android:layout_marginTop="0dp"
+                android:layout_marginTop="16dp"
-                app:cardElevation="0dp">
+                app:cardCornerRadius="12dp"
+                app:cardElevation="2dp"
+                app:cardBackgroundColor="@color/white"
+                app:strokeColor="#E0E0E0"
+                app:strokeWidth="1dp">
 
-                <LinearLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
+                    android:padding="20dp">
-                    android:padding="16dp"
-                    android:background="@color/white">
 
+                    <!-- Header Row -->
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:id="@+id/address_header"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal">
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
 
                         <ImageView
                             android:id="@+id/iv_location_icon"
                             android:layout_width="24dp"
                             android:layout_height="24dp"
                             android:src="@drawable/baseline_location_pin_24"
-                            android:layout_gravity="center_vertical"
+                            app:tint="@color/blue_300" />
-                            app:tint="#3D84FF" />
 
                         <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="Alamat Pengiriman"
-                            android:textSize="16sp"
-                            android:fontFamily="@font/dmsans_medium"
-                            android:layout_marginStart="8dp" />
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/tv_places_address"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="-"
-                        android:textColor="#5A5A5A"
-                        android:paddingHorizontal="8dp"
-                        android:paddingVertical="2dp"
-                        android:textSize="12sp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginStart="32dp" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_marginTop="8dp">
-
-                        <TextView
-                            android:id="@+id/tv_address"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:text="-"
+                            android:text="Alamat Pengiriman"
-                            android:textSize="14sp"
+                            android:textSize="16sp"
-                            android:layout_marginStart="32dp" />
+                            android:textColor="@android:color/black"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:layout_marginStart="12dp" />
 
                         <TextView
                             android:id="@+id/tv_change_address"
@@ -104,169 +85,441 @@
                             android:layout_height="wrap_content"
                             android:text="Pilih Alamat"
                             android:textColor="#3D84FF"
-                            android:textSize="14sp" />
+                            android:textSize="14sp"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:paddingHorizontal="8dp"
+                            android:paddingVertical="4dp" />
                     </LinearLayout>
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
 
-            <View
+                    <!-- Empty Address State -->
-                android:layout_width="match_parent"
+                    <LinearLayout
-                android:layout_height="8dp"
+                        android:id="@+id/container_empty_address"
-                android:background="@color/black_50" />
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:layout_marginTop="4dp"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        app:layout_constraintTop_toBottomOf="@id/address_header"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:text="Belum ada alamat dipilih"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:textColor="#757575"
+                            android:textSize="14sp"
+                            android:gravity="center" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:text="Pilih alamat pengiriman untuk melanjutkan"
+                            android:textColor="#BDBDBD"
+                            android:textSize="12sp"
+                            android:gravity="center" />
+                    </LinearLayout>
+
+                    <!-- Selected Address Content -->
+                    <LinearLayout
+                        android:id="@+id/container_address"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:layout_marginTop="4dp"
+                        android:visibility="gone"
+                        app:layout_constraintTop_toBottomOf="@id/address_header"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
+
+                        <!-- Address Label -->
+                        <TextView
+                            android:id="@+id/tv_places_address"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Rumah"
+                            android:textColor="#3D84FF"
+                            android:textSize="12sp"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:background="@drawable/bg_edit_text_background"
+                            android:paddingHorizontal="8dp"
+                            android:paddingVertical="4dp"
+                            tools:text="Rumah" />
+
+                        <!-- Full Address -->
+                        <TextView
+                            android:id="@+id/tv_address"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
+                            android:text="Jl. Raya Serang No. 123, Kecamatan Serang, Kabupaten Serang, Banten 42111"
+                            android:textSize="14sp"
+                            android:textColor="@android:color/black"
+                            android:lineSpacingExtra="2dp"
+                            tools:text="Jl. Raya Serang No. 123, Kecamatan Serang, Kabupaten Serang, Banten 42111" />
+                    </LinearLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>
+
 
             <!-- Product Items Section -->
-            <androidx.cardview.widget.CardView
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/card_product"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:cardElevation="0dp">
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="8dp"
+                app:cardBackgroundColor="@color/white"
+                app:strokeColor="#E0E0E0"
+                app:strokeWidth="1dp">
 
-                <LinearLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
+                    android:padding="20dp">
-                    android:background="@color/white"
-                    android:padding="16dp">
 
-                    <androidx.recyclerview.widget.RecyclerView
+                    <!-- Header Row -->
-                        android:id="@+id/rv_product_items"
+                    <LinearLayout
-                        android:layout_width="match_parent"
+                        android:id="@+id/product_header"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        tools:listitem="@layout/item_order_seller" />
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="8dp"
-                android:background="#F5F5F5" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="8dp"
-                android:background="@color/black_50" />
-
-            <!-- Shipping Method Section -->
-            <LinearLayout
-                android:id="@+id/layout_shipping_method"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:background="@color/white"
-                android:padding="16dp">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center_vertical">
-
-                    <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="Metode Pengiriman"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/tv_shipping_option"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="Opsi Pengiriman"
-                        android:textColor="#3D84FF"
-                        android:textSize="14sp" />
-                </LinearLayout>
-
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/card_shipment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:visibility="gone"
-                    app:cardCornerRadius="8dp"
-                    app:cardElevation="0dp"
-                    app:cardBackgroundColor="#F5F5F5">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        android:padding="12dp">
+                        android:gravity="center_vertical"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
 
-                        <RadioButton
+                        <ImageView
-                            android:id="@+id/rb_jne"
+                            android:layout_width="24dp"
-                            android:layout_width="wrap_content"
+                            android:layout_height="24dp"
-                            android:layout_height="wrap_content"
+                            android:src="@drawable/baseline_local_grocery_store_24"
-                            android:checked="true" />
+                            app:tint="@color/blue_300" />
 
-                        <LinearLayout
+                        <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
-                            android:orientation="vertical"
+                            android:text="Produk Pesanan"
-                            android:layout_marginStart="8dp">
+                            android:textSize="16sp"
+                            android:textColor="@android:color/black"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:layout_marginStart="12dp" />
+                    </LinearLayout>
 
-                            <TextView
+                    <!-- Empty Product State -->
-                                android:id="@+id/tv_courier_name"
+                    <LinearLayout
-                                android:layout_width="wrap_content"
+                        android:id="@+id/container_empty_products"
-                                android:layout_height="wrap_content"
+                        android:layout_width="0dp"
-                                android:text="JNE"
+                        android:layout_height="wrap_content"
-                                android:textSize="16sp"
+                        android:orientation="vertical"
-                                android:fontFamily="@font/dmsans_medium" />
+                        android:layout_marginTop="4dp"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:visibility="visible"
+                        app:layout_constraintTop_toBottomOf="@id/product_header"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
 
-                            <TextView
-                                android:id="@+id/tv_delivery_estimate"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="3 - 4 hari kerja"
-                                android:textSize="14sp"
-                                android:textColor="#757575" />
-                        </LinearLayout>
 
                         <TextView
-                            android:id="@+id/tv_shipping_price"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Rp15.000"
+                            android:layout_marginTop="4dp"
-                            android:textSize="16sp"
+                            android:text="Tidak ada produk"
                             android:fontFamily="@font/dmsans_medium"
-                            android:layout_gravity="center_vertical" />
+                            android:textColor="#757575"
+                            android:textSize="14sp"
+                            android:gravity="center" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:text="Keranjang belanja kosong"
+                            android:textColor="#BDBDBD"
+                            android:textSize="12sp"
+                            android:gravity="center" />
                     </LinearLayout>
-                </androidx.cardview.widget.CardView>
-            </LinearLayout>
 
-            <View
+                    <!-- Products RecyclerView -->
-                android:layout_width="match_parent"
+                    <androidx.recyclerview.widget.RecyclerView
-                android:layout_height="8dp"
+                        android:id="@+id/rv_product_items"
-                android:background="@color/black_50" />
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:visibility="gone"
+                        app:layout_constraintTop_toBottomOf="@id/product_header"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        tools:listitem="@layout/item_order_seller" />
 
-            <!-- Payment Method Section -->
+                </androidx.constraintlayout.widget.ConstraintLayout>
-            <LinearLayout
+            </com.google.android.material.card.MaterialCardView>
-                android:id="@+id/layout_payment_method"
+
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/card_shipping_method"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
+                android:layout_marginHorizontal="16dp"
-                android:background="@color/white"
+                android:layout_marginTop="8dp"
-                android:padding="16dp">
+                app:cardBackgroundColor="@color/white"
+                app:strokeColor="#E0E0E0"
+                app:strokeWidth="1dp">
 
-                <TextView
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="Metode Pembayaran"
+                    android:padding="20dp">
-                    android:textSize="14sp"
-                    android:layout_marginBottom="8dp" />
 
-                <androidx.recyclerview.widget.RecyclerView
+                    <!-- Header Row -->
-                    android:id="@+id/rv_payment_info"
+                    <LinearLayout
+                        android:id="@+id/shipping_header"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="Metode Pengiriman"
+                            android:textSize="16sp"
+                            android:textColor="@android:color/black"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:layout_marginStart="12dp" />
+
+                        <TextView
+                            android:id="@+id/tv_shipping_option"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Pilih"
+                            android:textColor="#3D84FF"
+                            android:textSize="14sp"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:paddingHorizontal="8dp"
+                            android:paddingVertical="4dp" />
+                    </LinearLayout>
+
+                    <!-- Empty Shipping State -->
+                    <LinearLayout
+                        android:id="@+id/container_empty_shipping"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:layout_marginTop="4dp"
+                        android:gravity="center"
+                        android:padding="12dp"
+                        app:layout_constraintTop_toBottomOf="@id/shipping_header"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:text="Belum ada metode pengiriman"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:textColor="#757575"
+                            android:textSize="14sp"
+                            android:gravity="center" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:text="Pilih alamat terlebih dahulu"
+                            android:textColor="#BDBDBD"
+                            android:textSize="12sp"
+                            android:gravity="center" />
+                    </LinearLayout>
+
+                    <!-- Selected Shipping Content -->
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/card_shipment"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:visibility="gone"
+                        app:cardCornerRadius="8dp"
+                        app:cardElevation="0dp"
+                        app:cardBackgroundColor="#F5F5F5"
+                        app:layout_constraintTop_toBottomOf="@id/shipping_header"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:padding="12dp">
+
+                            <RadioButton
+                                android:id="@+id/rb_jne"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:checked="true" />
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:orientation="vertical"
+                                android:layout_marginStart="8dp">
+
+                                <TextView
+                                    android:id="@+id/tv_courier_name"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="JNE"
+                                    android:textSize="16sp"
+                                    android:fontFamily="@font/dmsans_medium" />
+
+                                <TextView
+                                    android:id="@+id/tv_delivery_estimate"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="3 - 4 hari kerja"
+                                    android:textSize="14sp"
+                                    android:textColor="#757575" />
+                            </LinearLayout>
+
+                            <TextView
+                                android:id="@+id/tv_shipping_price"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="Rp15.000"
+                                android:textSize="16sp"
+                                android:fontFamily="@font/dmsans_medium"
+                                android:layout_gravity="center_vertical" />
+                        </LinearLayout>
+                    </androidx.cardview.widget.CardView>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+
+            <!-- Payment Method Section -->
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/card_payment_method"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="8dp"
+                app:cardBackgroundColor="@color/white"
+                app:strokeColor="#E0E0E0"
+                app:strokeWidth="1dp">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    tools:listitem="@layout/item_payment_method" />
+                    android:padding="20dp">
-            </LinearLayout>
+
+                    <!-- Header Row -->
+                    <LinearLayout
+                        android:id="@+id/payment_header"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
+
+                        <ImageView
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:src="@drawable/baseline_payment_24"
+                            app:tint="@color/blue_300" />
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="Metode Pembayaran"
+                            android:textSize="16sp"
+                            android:textColor="@android:color/black"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:layout_marginStart="12dp" />
+
+                        <TextView
+                            android:id="@+id/tv_payment_option"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Pilih"
+                            android:textColor="#3D84FF"
+                            android:textSize="14sp"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:background="?attr/selectableItemBackgroundBorderless"
+                            android:paddingHorizontal="8dp"
+                            android:paddingVertical="4dp"
+                            android:visibility="gone" />
+                    </LinearLayout>
+
+                    <!-- Empty Payment State -->
+                    <LinearLayout
+                        android:id="@+id/container_empty_payment"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:layout_marginTop="4dp"
+                        android:gravity="center"
+                        android:padding="12dp"
+                        app:layout_constraintTop_toBottomOf="@id/payment_header"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:text="Belum ada metode pembayaran"
+                            android:fontFamily="@font/dmsans_medium"
+                            android:textColor="#757575"
+                            android:textSize="14sp"
+                            android:gravity="center" />
+
+                        <TextView
+                            android:id="@+id/tvEmptyPayment"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:text="Pilih alamat terlebih dahulu"
+                            android:textColor="#BDBDBD"
+                            android:textSize="12sp"
+                            android:gravity="center" />
+                    </LinearLayout>
+
+                    <!-- Payment Methods RecyclerView -->
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_payment_info"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:visibility="gone"
+                        app:layout_constraintTop_toBottomOf="@id/payment_header"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        tools:listitem="@layout/item_payment_method" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="8dp"
+                android:layout_marginVertical="8dp"
                 android:background="@color/black_50" />
 
             <!-- Price Summary Section -->
@@ -294,7 +547,7 @@
                         android:id="@+id/tv_item_total"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="Rp65.000"
+                        android:text="Rp0"
                         android:textSize="14sp" />
                 </LinearLayout>
 
@@ -315,7 +568,7 @@
                         android:id="@+id/tv_shipping_fee"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="Rp15.000"
+                        android:text="Rp0"
                         android:textSize="14sp" />
                 </LinearLayout>
 
@@ -342,8 +595,8 @@
                         android:id="@+id/tv_total"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="Rp75.000"
+                        android:text="Rp0"
-                        android:textColor="#3D84FF"
+                        android:textColor="@color/blue_400"
                         android:textSize="16sp"
                         android:fontFamily="@font/dmsans_bold" />
                 </LinearLayout>
@@ -379,7 +632,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Rp75.000"
-                android:textColor="#3D84FF"
+                android:textColor="@color/blue_400"
                 android:textSize="18sp"
                 android:fontFamily="@font/dmsans_bold" />
         </LinearLayout>
@@ -392,7 +645,7 @@
             android:textAllCaps="false"
             android:paddingHorizontal="32dp"
             app:cornerRadius="8dp"
-            android:backgroundTint="#3D84FF" />
+            android:backgroundTint="@color/blue_500" />
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_detail_product.xml

@@ -14,7 +14,6 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -32,8 +31,9 @@
             <ImageView
                 android:id="@+id/ivProductImage"
                 android:layout_width="match_parent"
-                android:layout_height="200dp"
+                android:layout_height="360dp"
                 android:scaleType="centerCrop"
+                android:layout_marginTop="4dp"
                 android:contentDescription="@string/product_image"
                 tools:src="@drawable/placeholder_image" />
 
@@ -167,7 +167,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="@color/soft_gray"
-                            android:textSize="14sp"
+                            android:textSize="12sp"
                             tools:text="@string/item_sold" />
 
                         <View
@@ -186,7 +186,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
-                            android:textSize="14sp"
+                            android:textSize="12sp"
                             tools:text="4.5" />
                     </LinearLayout>
                 </LinearLayout>
@@ -231,6 +231,18 @@
                             android:textSize="14sp" />
                     </LinearLayout>
 
+                    <TextView
+                        android:id="@+id/empty_review"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Belum ada ulasan"
+                        android:textSize="12sp"
+                        android:textColor="@color/black_200"
+                        android:gravity="center"
+                        android:visibility="gone"
+                        android:fontFamily="@font/dmsans_mediumitalic"
+                        android:layout_marginTop="8dp"/>
+
                     <!-- RecyclerView for Reviews -->
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/recyclerViewReviews"
@@ -284,7 +296,7 @@
                                 android:layout_weight="1"
                                 android:text="@string/berat_produk"
                                 android:fontFamily="@font/dmsans_semibold"
-                                android:textSize="14sp" />
+                                android:textSize="12sp" />
 
                             <TextView
                                 android:id="@+id/tvWeight"
@@ -292,7 +304,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:textColor="@color/blue_500"
-                                android:textSize="14sp"
+                                android:textSize="12sp"
                                 tools:text="200 gram" />
                         </TableRow>
 
@@ -307,7 +319,7 @@
                                 android:layout_weight="1"
                                 android:text="@string/stock_product"
                                 android:fontFamily="@font/dmsans_semibold"
-                                android:textSize="14sp" />
+                                android:textSize="12sp" />
 
                             <TextView
                                 android:id="@+id/tvStock"
@@ -315,7 +327,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:textColor="@color/blue_500"
-                                android:textSize="14sp"
+                                android:textSize="12sp"
                                 tools:text="100 buah" />
                         </TableRow>
 
@@ -347,7 +359,7 @@
                         android:text="@string/deskripsi_produk"
                         android:textColor="@color/black"
                         android:textSize="16sp"
-                        android:layout_marginTop="8dp"
+                        android:layout_marginTop="16dp"
                         android:textStyle="bold" />
 
                     <TextView
@@ -356,7 +368,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:textColor="@color/black"
-                        android:textSize="14sp"
+                        android:textSize="12sp"
                         tools:text="Terbuat dari tepung dan ikan tenggiri asli Serang Banten. Tahan selama 25 hari." />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
@@ -385,6 +397,13 @@
                     android:orientation="horizontal"
                     android:padding="16dp">
 
+                    <ProgressBar
+                        android:id="@+id/progress_bar_detail_store"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        android:layout_gravity="center"/>
+
                     <de.hdodenhof.circleimageview.CircleImageView
                         android:id="@+id/ivSellerImage"
                         android:layout_width="48dp"
@@ -411,8 +430,9 @@
                             android:id="@+id/tvSellerLocation"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:fontFamily="@font/dmsans_semibold"
+                            android:fontFamily="@font/dmsans_regular"
-                            android:textSize="14sp"
+                            android:textColor="@color/black_300"
+                            android:textSize="12sp"
                             tools:text="Jakarta Selatan" />
 
                         <RatingBar
@@ -431,7 +451,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="2dp"
-                            android:textSize="14sp"
+                            android:textSize="12sp"
                             android:textStyle="bold"
                             tools:text="5.0" />
                     </LinearLayout>
@@ -477,6 +497,18 @@
                             android:textSize="14sp" />
                     </LinearLayout>
 
+                    <TextView
+                        android:id="@+id/empty_other_products"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Belum ada produk lainnya"
+                        android:textSize="12sp"
+                        android:textColor="@color/black_200"
+                        android:gravity="center"
+                        android:visibility="gone"
+                        android:fontFamily="@font/dmsans_mediumitalic"
+                        android:layout_marginTop="8dp"/>
+
                     <!-- RecyclerView for Other Products -->
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/recyclerViewOtherProducts"
@@ -543,6 +575,7 @@
                 android:insetBottom="0dp"
                 android:text="@string/add_to_cart"
                 android:textColor="@color/blue_500"
+                android:textSize="14sp"
                 app:cornerRadius="4dp"
                 app:icon="@drawable/baseline_add_24"
                 app:iconGravity="textStart"
@@ -560,6 +593,7 @@
                 android:insetTop="0dp"
                 android:insetBottom="0dp"
                 android:text="@string/beli_sekarang"
+                android:textSize="14sp"
                 android:textColor="@color/white"
                 app:cornerRadius="4dp" />
         </LinearLayout>

app/src/main/res/layout/activity_detail_profile.xml

@@ -62,7 +62,7 @@
                 android:id="@+id/profile_image"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:src="@drawable/baseline_account_circle_24"
+                android:src="@drawable/baseline_account_circle_100"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -87,6 +87,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Ubah Profil"
+                style="@style/button.large.active.medium"
                 android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@id/profile_image"
                 app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/activity_detail_store_product.xml

@@ -371,6 +371,7 @@
                     android:background="@drawable/bg_text_field"
                     android:hint="Isi stok produk di sini"
                     android:padding="8dp"
+                    android:inputType="number"
                     style="@style/body_small" />
 
             </LinearLayout>
@@ -413,6 +414,7 @@
                     android:hint="Isi minimum pemesanan produk di sini"
                     android:padding="8dp"
                     style="@style/body_small"
+                    android:inputType="number"
                     android:layout_marginTop="10dp" />
 
             </LinearLayout>
@@ -711,6 +713,7 @@
                     android:background="@drawable/bg_text_field"
                     android:hint="Isi minimum produk untuk mendapatkan harga grosir di sini"
                     android:padding="8dp"
+                    android:inputType="number"
                     style="@style/body_small" />
 
             </LinearLayout>

app/src/main/res/layout/activity_edit_profile_cust.xml

@@ -61,7 +61,7 @@
                 android:id="@+id/profile_image"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:src="@drawable/baseline_account_circle_24"
+                android:src="@drawable/baseline_account_circle_100"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -188,6 +188,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Simpan"
+        style="@style/button.large.active.medium"
         android:layout_marginTop="32dp"
         android:layout_marginHorizontal="16dp"
         android:layout_marginBottom="16dp"