Compare commits

2 Commits

Author SHA1 Message Date
ed60528049 add account name 2025-08-12 00:44:35 +07:00
a9c2f9c103 fix validation file upliad 2025-08-11 22:47:00 +07:00
15 changed files with 191 additions and 241 deletions

View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DeviceTable">
<option name="columnSorters">
<list>
<ColumnSorterState>
<option name="column" value="Name" />
<option name="order" value="ASCENDING" />
</ColumnSorterState>
</list>
</option>
</component>
</project>

View File

@ -124,4 +124,7 @@ dependencies {
implementation(platform("com.google.firebase:firebase-bom:33.13.0")) implementation(platform("com.google.firebase:firebase-bom:33.13.0"))
implementation("com.google.firebase:firebase-analytics") implementation("com.google.firebase:firebase-analytics")
implementation("com.google.firebase:firebase-messaging-ktx") implementation("com.google.firebase:firebase-messaging-ktx")
} }

View File

@ -29,9 +29,6 @@
android:theme="@style/Theme.Ecommerce_serang" android:theme="@style/Theme.Ecommerce_serang"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
tools:targetApi="31"> tools:targetApi="31">
<activity
android:name=".ui.profile.mystore.StoreSuspendedActivity"
android:exported="false" />
<activity <activity
android:name=".ui.profile.mystore.StoreOnReviewActivity" android:name=".ui.profile.mystore.StoreOnReviewActivity"
android:exported="false" /> android:exported="false" />
@ -90,6 +87,7 @@
<!-- android:enabled="true"--> <!-- android:enabled="true"-->
<!-- android:exported="false"--> <!-- android:exported="false"-->
<!-- android:foregroundServiceType="dataSync" />--> <!-- android:foregroundServiceType="dataSync" />-->
<activity <activity
android:name=".ui.profile.mystore.chat.ChatStoreActivity" android:name=".ui.profile.mystore.chat.ChatStoreActivity"
android:exported="false" android:exported="false"

View File

@ -278,6 +278,11 @@ class UserRepository(private val apiService: ApiService) {
val requestFile = compressedFile.asRequestBody(mimeType.toMediaTypeOrNull()) val requestFile = compressedFile.asRequestBody(mimeType.toMediaTypeOrNull())
Log.d(TAG, "$formName compressed size: ${compressedFile.length() / 1024} KB") Log.d(TAG, "$formName compressed size: ${compressedFile.length() / 1024} KB")
val compressedSizeMB = compressedFile.length().toDouble() / (1024 * 1024)
if (compressedSizeMB > 1) {
throw IllegalArgumentException("$formName lebih dari 1 MB setelah kompresi")
}
MultipartBody.Part.createFormData(formName, compressedFile.name, requestFile) MultipartBody.Part.createFormData(formName, compressedFile.name, requestFile)
} else { } else {
throw IllegalArgumentException("$formName harus berupa file gambar (JPEG, JPG, atau PNG)") throw IllegalArgumentException("$formName harus berupa file gambar (JPEG, JPG, atau PNG)")

View File

@ -25,7 +25,6 @@ import com.alya.ecommerce_serang.ui.order.address.AddressActivity
import com.alya.ecommerce_serang.ui.order.history.HistoryActivity 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.MyStoreActivity
import com.alya.ecommerce_serang.ui.profile.mystore.StoreOnReviewActivity 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.BaseViewModelFactory
import com.alya.ecommerce_serang.utils.SessionManager import com.alya.ecommerce_serang.utils.SessionManager
import com.alya.ecommerce_serang.utils.viewmodel.MyStoreViewModel import com.alya.ecommerce_serang.utils.viewmodel.MyStoreViewModel
@ -74,11 +73,13 @@ class ProfileFragment : Fragment() {
observeUserProfile() observeUserProfile()
observeStoreStatus()
viewModel.loadUserProfile() viewModel.loadUserProfile()
viewModel.checkStoreUser() viewModel.checkStoreUser()
val hasStore = viewModel.checkStore.value
Log.d("Profile Fragment", "Check store $hasStore")
binding.tvBukaToko.text = if (hasStore == true) "Toko Saya" else "Buka Toko"
binding.cardBukaToko.setOnClickListener{ binding.cardBukaToko.setOnClickListener{
// if (hasStore == true) startActivity(Intent(requireContext(), MyStoreActivity::class.java)) // if (hasStore == true) startActivity(Intent(requireContext(), MyStoreActivity::class.java))
// else startActivity(Intent(requireContext(), RegisterStoreActivity::class.java)) // else startActivity(Intent(requireContext(), RegisterStoreActivity::class.java))
@ -87,11 +88,8 @@ class ProfileFragment : Fragment() {
myStoreViewModel.myStoreProfile.observe(viewLifecycleOwner) { store -> myStoreViewModel.myStoreProfile.observe(viewLifecycleOwner) { store ->
store?.let { store?.let {
when (store.storeStatus) { when (store.storeStatus) {
"process" -> startActivity(Intent(requireContext(), StoreOnReviewActivity::class.java))
"active" -> startActivity(Intent(requireContext(), MyStoreActivity::class.java)) "active" -> startActivity(Intent(requireContext(), MyStoreActivity::class.java))
"inactive" -> startActivity(Intent(requireContext(), MyStoreActivity::class.java)) else -> startActivity(Intent(requireContext(), StoreOnReviewActivity::class.java))
"suspended" -> startActivity(Intent(requireContext(), StoreSuspendedActivity::class.java))
else -> startActivity(Intent(requireContext(), RegisterStoreActivity::class.java))
} }
} ?: run { } ?: run {
Toast.makeText(requireContext(), "Gagal memuat data toko", Toast.LENGTH_SHORT).show() Toast.makeText(requireContext(), "Gagal memuat data toko", Toast.LENGTH_SHORT).show()
@ -134,12 +132,6 @@ class ProfileFragment : Fragment() {
} }
} }
private fun observeStoreStatus() {
viewModel.checkStore.observe(viewLifecycleOwner) { hasStore ->
binding.tvBukaToko.text = if (hasStore) "Toko Saya" else "Buka Toko"
}
}
private fun updateUI(user: UserProfile) = with(binding){ private fun updateUI(user: UserProfile) = with(binding){
val fullImageUrl = when (val img = user.image) { val fullImageUrl = when (val img = user.image) {
is String -> { is String -> {

View File

@ -1,6 +1,5 @@
package com.alya.ecommerce_serang.ui.profile.mystore package com.alya.ecommerce_serang.ui.profile.mystore
import android.Manifest
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.net.Uri import android.net.Uri
@ -20,7 +19,6 @@ import android.widget.Toast
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.toDrawable import androidx.core.graphics.drawable.toDrawable
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
@ -101,8 +99,12 @@ class RegisterStoreActivity : AppCompatActivity() {
setupObservers() setupObservers()
Log.d(TAG, "onCreate: Observers setup completed") Log.d(TAG, "onCreate: Observers setup completed")
setupMap() viewModel.latitude.value = "-6.2088"
Log.d(TAG, "onCreate: Map setup completed") viewModel.longitude.value = "106.8456"
Log.d(TAG, "Location permission granted, setting default location")
// Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show()
Log.d(TAG, "Default location set - Lat: ${viewModel.latitude.value}, Long: ${viewModel.longitude.value}")
// Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show()
setupDocumentUploads() setupDocumentUploads()
Log.d(TAG, "onCreate: Document uploads setup completed") Log.d(TAG, "onCreate: Document uploads setup completed")
@ -161,16 +163,17 @@ class RegisterStoreActivity : AppCompatActivity() {
viewModel.ktpUri != null && viewModel.ktpUri != null &&
viewModel.nibUri != null && viewModel.nibUri != null &&
viewModel.npwpUri != null && viewModel.npwpUri != null &&
viewModel.selectedCouriers.isNotEmpty() viewModel.selectedCouriers.isNotEmpty() &&
!viewModel.accountName.value.isNullOrBlank()
binding.btnRegister.isEnabled = isFormValid
binding.btnRegister.isEnabled = true
if (isFormValid) { if (isFormValid) {
binding.btnRegister.setBackgroundResource(R.drawable.bg_button_active) binding.btnRegister.setBackgroundResource(R.drawable.bg_button_active)
binding.btnRegister.setTextColor(ContextCompat.getColor(this, R.color.white)) binding.btnRegister.setTextColor(ContextCompat.getColor(this, R.color.white))
} else { } else {
binding.btnRegister.setBackgroundResource(R.drawable.bg_button_disabled) binding.btnRegister.setBackgroundResource(R.drawable.bg_button_disabled)
binding.btnRegister.setTextColor(ContextCompat.getColor(this, R.color.black_300)) binding.btnRegister.setTextColor(ContextCompat.getColor(this, R.color.black_300))
} }
} }
@ -500,44 +503,44 @@ class RegisterStoreActivity : AppCompatActivity() {
validateRequiredFields() validateRequiredFields()
} }
private fun setupMap() { // private fun setupMap() {
Log.d(TAG, "setupMap: Setting up map container") // Log.d(TAG, "setupMap: Setting up map container")
// This would typically integrate with Google Maps SDK // // This would typically integrate with Google Maps SDK
// For simplicity, we're just using a placeholder // // For simplicity, we're just using a placeholder
binding.mapContainer.setOnClickListener { // binding.mapContainer.setOnClickListener {
Log.d(TAG, "Map container clicked, checking location permission") // Log.d(TAG, "Map container clicked, checking location permission")
// Request location permission if not granted // // Request location permission if not granted
if (ContextCompat.checkSelfPermission( // if (ContextCompat.checkSelfPermission(
this, // this,
Manifest.permission.ACCESS_FINE_LOCATION // Manifest.permission.ACCESS_FINE_LOCATION
) != PackageManager.PERMISSION_GRANTED // ) != PackageManager.PERMISSION_GRANTED
) { // ) {
Log.d(TAG, "Location permission not granted, requesting permission") // Log.d(TAG, "Location permission not granted, requesting permission")
ActivityCompat.requestPermissions( // ActivityCompat.requestPermissions(
this, // this,
arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), // arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
LOCATION_PERMISSION_REQUEST // LOCATION_PERMISSION_REQUEST
) // )
viewModel.latitude.value = "-6.2088" // viewModel.latitude.value = "-6.2088"
viewModel.longitude.value = "106.8456" // viewModel.longitude.value = "106.8456"
Log.d(TAG, "Location permission granted, setting default location") // Log.d(TAG, "Location permission granted, setting default location")
Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show() // Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show()
Log.d(TAG, "Default location set - Lat: ${viewModel.latitude.value}, Long: ${viewModel.longitude.value}") // Log.d(TAG, "Default location set - Lat: ${viewModel.latitude.value}, Long: ${viewModel.longitude.value}")
Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show() // Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show()
} else { // } else {
Log.d(TAG, "Location permission already granted, setting location") // Log.d(TAG, "Location permission already granted, setting location")
// Show map selection UI // // Show map selection UI
// This would typically launch Maps UI for location selection // // This would typically launch Maps UI for location selection
// For now, we'll just set some dummy coordinates // // For now, we'll just set some dummy coordinates
viewModel.latitude.value = "-6.2088" // viewModel.latitude.value = "-6.2088"
viewModel.longitude.value = "106.8456" // viewModel.longitude.value = "106.8456"
Log.d(TAG, "Location set - Lat: ${viewModel.latitude.value}, Long: ${viewModel.longitude.value}") // Log.d(TAG, "Location set - Lat: ${viewModel.latitude.value}, Long: ${viewModel.longitude.value}")
Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show() // Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show()
} // }
} // }
//
Log.d(TAG, "setupMap: Map container setup completed") // Log.d(TAG, "setupMap: Map container setup completed")
} // }
private fun setupDataBinding() { private fun setupDataBinding() {
Log.d(TAG, "setupDataBinding: Setting up two-way data binding for text fields") Log.d(TAG, "setupDataBinding: Setting up two-way data binding for text fields")
@ -638,6 +641,17 @@ class RegisterStoreActivity : AppCompatActivity() {
} }
}) })
binding.etAccountName.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.accountName.value = s.toString()
Log.d(TAG, "Account Name updated: ${s.toString()}")
validateRequiredFields()
}
})
Log.d(TAG, "setupDataBinding: Text field data binding setup completed") Log.d(TAG, "setupDataBinding: Text field data binding setup completed")
} }

View File

@ -1,26 +0,0 @@
package com.alya.ecommerce_serang.ui.profile.mystore
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import com.alya.ecommerce_serang.R
import com.alya.ecommerce_serang.databinding.ActivityStoreSuspendedBinding
class StoreSuspendedActivity : AppCompatActivity() {
private lateinit var binding: ActivityStoreSuspendedBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityStoreSuspendedBinding.inflate(layoutInflater)
setContentView(binding.root)
binding.header.headerTitle.text = "Toko Dinonaktifkan"
binding.header.headerLeftIcon.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
finish()
}
}
}

View File

@ -27,8 +27,6 @@ import com.alya.ecommerce_serang.data.repository.ProductRepository
import com.alya.ecommerce_serang.data.repository.Result import com.alya.ecommerce_serang.data.repository.Result
import com.alya.ecommerce_serang.databinding.ActivityDetailStoreProductBinding import com.alya.ecommerce_serang.databinding.ActivityDetailStoreProductBinding
import com.alya.ecommerce_serang.utils.BaseViewModelFactory import com.alya.ecommerce_serang.utils.BaseViewModelFactory
import com.alya.ecommerce_serang.utils.FileUtils.compressFile
import com.alya.ecommerce_serang.utils.ImageUtils.compressImage
import com.alya.ecommerce_serang.utils.SessionManager import com.alya.ecommerce_serang.utils.SessionManager
import com.alya.ecommerce_serang.utils.viewmodel.ProductViewModel import com.alya.ecommerce_serang.utils.viewmodel.ProductViewModel
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
@ -42,7 +40,7 @@ class DetailStoreProductActivity : AppCompatActivity() {
private lateinit var binding: ActivityDetailStoreProductBinding private lateinit var binding: ActivityDetailStoreProductBinding
private lateinit var sessionManager: SessionManager private lateinit var sessionManager: SessionManager
private var categoryList: List<CategoryItem> = emptyList() private lateinit var categoryList: List<CategoryItem>
private var imageUri: Uri? = null private var imageUri: Uri? = null
private var sppirtUri: Uri? = null private var sppirtUri: Uri? = null
private var halalUri: Uri? = null private var halalUri: Uri? = null
@ -62,10 +60,7 @@ class DetailStoreProductActivity : AppCompatActivity() {
if (result.resultCode == Activity.RESULT_OK) { if (result.resultCode == Activity.RESULT_OK) {
imageUri = result.data?.data imageUri = result.data?.data
imageUri?.let { imageUri?.let {
compressImage(this, it, "productimg").let { compressedImageFile -> binding.ivPreviewFoto.setImageURI(it)
binding.ivPreviewFoto.setImageURI(Uri.fromFile(compressedImageFile))
imageUri = Uri.fromFile(compressedImageFile)
}
binding.switcherFotoProduk.showNext() binding.switcherFotoProduk.showNext()
hasImage = true hasImage = true
} }
@ -75,23 +70,19 @@ class DetailStoreProductActivity : AppCompatActivity() {
private val sppirtLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri -> private val sppirtLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
if (uri != null && isValidFile(uri)) { if (uri != null && isValidFile(uri)) {
compressFile(this, uri).let { compressedFile -> sppirtUri = uri
sppirtUri = compressedFile?.toUri() binding.tvSppirtName.text = getFileName(uri)
binding.tvSppirtName.text = getFileName(sppirtUri!!)
binding.switcherSppirt.showNext() binding.switcherSppirt.showNext()
} }
} }
}
private val halalLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri -> private val halalLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
if (uri != null && isValidFile(uri)) { if (uri != null && isValidFile(uri)) {
compressFile(this, uri).let { compressedFile -> halalUri = uri
halalUri = compressedFile?.toUri() binding.tvHalalName.text = getFileName(uri)
binding.tvHalalName.text = getFileName(halalUri!!)
binding.switcherHalal.showNext() binding.switcherHalal.showNext()
} }
} }
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)

View File

@ -8,46 +8,13 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.MultipartBody import okhttp3.MultipartBody
import okhttp3.RequestBody.Companion.asRequestBody import okhttp3.RequestBody.Companion.asRequestBody
import java.io.File import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream import java.io.FileOutputStream
import java.util.zip.GZIPOutputStream
object FileUtils { object FileUtils {
private const val TAG = "FileUtils" private const val TAG = "FileUtils"
/** /**
* Compress a file to GZIP format to reduce its size to below 1MB * Creates a temporary file from a URI in the app's cache directory
* @param context The context
* @param uri The URI of the file to compress
* @param maxSize The target size limit in bytes (1MB = 1048576 bytes)
* @return The compressed file, or null if compression failed
*/
fun compressFile(context: Context, uri: Uri, maxSize: Long = 1048576L): File? {
try {
// Create a temporary file for compressed content
val originalFile = createTempFileFromUri(context, uri, "compressed")
val compressedFile = File(context.cacheDir, "compressed_${System.currentTimeMillis()}.gz")
// Compress the original file into the GZIP file
compressToGZIP(originalFile, compressedFile)
// Check if the compressed file is larger than the allowed size
if (compressedFile.length() <= maxSize) {
Log.d(TAG, "Compression successful. Compressed file size: ${compressedFile.length()} bytes.")
return compressedFile
} else {
// If the file is still too large, you can handle it by reducing quality or adjusting compression logic
Log.e(TAG, "Compressed file exceeds the size limit. Size: ${compressedFile.length()} bytes.")
return null
}
} catch (e: Exception) {
Log.e(TAG, "Error during file compression: ${e.message}", e)
return null
}
}
/**
* Creates a temporary file from the URI in the app's cache directory.
*/ */
fun createTempFileFromUri(context: Context, uri: Uri, prefix: String = "temp"): File? { fun createTempFileFromUri(context: Context, uri: Uri, prefix: String = "temp"): File? {
try { try {
@ -74,23 +41,6 @@ object FileUtils {
} }
} }
/**
* Compress the input file into a GZIP file.
*/
private fun compressToGZIP(inputFile: File?, outputFile: File) {
FileInputStream(inputFile).use { inputStream ->
FileOutputStream(outputFile).use { fileOutputStream ->
GZIPOutputStream(fileOutputStream).use { gzipOutputStream ->
val buffer = ByteArray(1024)
var bytesRead: Int
while (inputStream.read(buffer).also { bytesRead = it } != -1) {
gzipOutputStream.write(buffer, 0, bytesRead)
}
}
}
}
}
/** /**
* Gets the file extension from a URI using ContentResolver * Gets the file extension from a URI using ContentResolver
*/ */

View File

@ -47,15 +47,15 @@ class ProfileViewModel(private val userRepository: UserRepository) : ViewModel()
val response: HasStoreResponse = userRepository.checkStore() val response: HasStoreResponse = userRepository.checkStore()
// Log and store success message // Log and store success message
Log.d("ProfileViewModel", "Has store: ${response.hasStore}") Log.d("RegisterViewModel", "OTP Response: ${response.hasStore}")
_checkStore.postValue(response.hasStore) // Store the message for UI feedback _checkStore.value = response.hasStore // Store the message for UI feedback
} catch (exception: Exception) { } catch (exception: Exception) {
// Handle any errors and update state // Handle any errors and update state
_checkStore.postValue(false) _checkStore.value = false
// Log the error for debugging // Log the error for debugging
Log.e(":ProfileViewModel", "Error:", exception) Log.e("RegisterViewModel", "Error:", exception)
} }
} }
} }

View File

@ -72,47 +72,89 @@ class RegisterStoreViewModel(
val selectedCouriers = mutableListOf<String>() val selectedCouriers = mutableListOf<String>()
fun registerStore(context: Context) { fun registerStore(context: Context) {
Log.d(TAG, "Starting registerStore()")
val allowedFileTypes = Regex("^(jpeg|jpg|png|pdf)$", RegexOption.IGNORE_CASE) val allowedFileTypes = Regex("^(jpeg|jpg|png|pdf)$", RegexOption.IGNORE_CASE)
// Check each file if present fun logFileInfo(label: String, uri: Uri?) {
if (uri == null) {
Log.d(TAG, "$label URI: null")
return
}
Log.d(TAG, "$label URI: $uri")
try {
val fileSizeBytes = context.contentResolver.openFileDescriptor(uri, "r")?.use {
it.statSize
} ?: -1
Log.d(TAG, "$label original size: ${fileSizeBytes / 1024} KB")
} catch (e: Exception) {
Log.e(TAG, "Error getting size for $label", e)
}
}
// Log all file info before validation
logFileInfo("Store Image", storeImageUri)
logFileInfo("KTP", ktpUri)
logFileInfo("NPWP", npwpUri)
logFileInfo("NIB", nibUri)
logFileInfo("Persetujuan", persetujuanUri)
logFileInfo("QRIS", qrisUri)
// Check file types
if (storeImageUri != null && !ImageUtils.isAllowedFileType(context, storeImageUri, allowedFileTypes)) { if (storeImageUri != null && !ImageUtils.isAllowedFileType(context, storeImageUri, allowedFileTypes)) {
_errorMessage.value = "Foto toko harus berupa file JPEG, JPG, atau PNG" _errorMessage.value = "Foto toko harus berupa file JPEG, JPG, atau PNG"
Log.e(TAG, _errorMessage.value ?: "Invalid file type for store image")
_registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type")) _registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type"))
return return
} }
if (ktpUri != null && !ImageUtils.isAllowedFileType(context, ktpUri, allowedFileTypes)) { if (ktpUri != null && !ImageUtils.isAllowedFileType(context, ktpUri, allowedFileTypes)) {
_errorMessage.value = "KTP harus berupa file JPEG, JPG, atau PNG" _errorMessage.value = "KTP harus berupa file JPEG, JPG, atau PNG"
Log.e(TAG, _errorMessage.value ?: "Invalid file type for KTP")
_registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type")) _registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type"))
return return
} }
if (npwpUri != null && !ImageUtils.isAllowedFileType(context, npwpUri, allowedFileTypes)) { if (npwpUri != null && !ImageUtils.isAllowedFileType(context, npwpUri, allowedFileTypes)) {
_errorMessage.value = "NPWP harus berupa file JPEG, JPG, PNG, atau PDF" _errorMessage.value = "NPWP harus berupa file JPEG, JPG, PNG, atau PDF"
Log.e(TAG, _errorMessage.value ?: "Invalid file type for NPWP")
_registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type")) _registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type"))
return return
} }
if (nibUri != null && !ImageUtils.isAllowedFileType(context, nibUri, allowedFileTypes)) { if (nibUri != null && !ImageUtils.isAllowedFileType(context, nibUri, allowedFileTypes)) {
_errorMessage.value = "NIB harus berupa file JPEG, JPG, PNG, atau PDF" _errorMessage.value = "NIB harus berupa file JPEG, JPG, PNG, atau PDF"
Log.e(TAG, _errorMessage.value ?: "Invalid file type for NIB")
_registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type")) _registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type"))
return return
} }
if (persetujuanUri != null && !ImageUtils.isAllowedFileType(context, persetujuanUri, allowedFileTypes)) { if (persetujuanUri != null && !ImageUtils.isAllowedFileType(context, persetujuanUri, allowedFileTypes)) {
_errorMessage.value = "Persetujuan harus berupa file JPEG, JPG, PNG, atau PDF" _errorMessage.value = "Persetujuan harus berupa file JPEG, JPG, PNG, atau PDF"
Log.e(TAG, _errorMessage.value ?: "Invalid file type for Persetujuan")
_registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type")) _registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type"))
return return
} }
if (qrisUri != null && !ImageUtils.isAllowedFileType(context, qrisUri, allowedFileTypes)) { if (qrisUri != null && !ImageUtils.isAllowedFileType(context, qrisUri, allowedFileTypes)) {
_errorMessage.value = "QRIS harus berupa file JPEG, JPG, PNG, atau PDF" _errorMessage.value = "QRIS harus berupa file JPEG, JPG, PNG, atau PDF"
Log.e(TAG, _errorMessage.value ?: "Invalid file type for QRIS")
_registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type")) _registerState.value = Result.Error(Exception(_errorMessage.value ?: "Invalid file type"))
return return
} }
Log.d(TAG, "File type checks passed. Starting repository.registerStoreUser() call.")
viewModelScope.launch { viewModelScope.launch {
try { try {
_registerState.value = Result.Loading _registerState.value = Result.Loading
Log.d(TAG, "Register store request payload: " +
"storeName=${storeName.value}, storeTypeId=${storeTypeId.value}, " +
"lat=${latitude.value}, long=${longitude.value}, " +
"street=${street.value}, subdistrict=${subdistrict.value}, " +
"cityId=${cityId.value}, provinceId=${provinceId.value}, postalCode=${postalCode.value}, " +
"bankName=${bankName.value}, bankNum=${bankNumber.value}, accountName=${accountName.value}, " +
"selectedCouriers=$selectedCouriers")
val result = repository.registerStoreUser( val result = repository.registerStoreUser(
context = context, context = context,
@ -139,25 +181,15 @@ class RegisterStoreViewModel(
accountName = accountName.value ?: "" accountName = accountName.value ?: ""
) )
Log.d(TAG, "Repository returned result: $result")
_registerState.value = result _registerState.value = result
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG, "Exception during registerStore", e)
_registerState.value = Result.Error(e) _registerState.value = Result.Error(e)
} }
} }
} }
// // Helper function to convert Uri to File
// private fun getFileFromUri(context: Context, uri: Uri): File {
// val inputStream = context.contentResolver.openInputStream(uri)
// val tempFile = File(context.cacheDir, "temp_file_${System.currentTimeMillis()}")
// inputStream?.use { input ->
// tempFile.outputStream().use { output ->
// input.copyTo(output)
// }
// }
// return tempFile
// }
fun validateForm(): Boolean { fun validateForm(): Boolean {
// Implement form validation logic // Implement form validation logic
return !(storeName.value.isNullOrEmpty() || return !(storeName.value.isNullOrEmpty() ||
@ -174,8 +206,6 @@ class RegisterStoreViewModel(
nibUri == null) nibUri == null)
} }
// Function to fetch store types // Function to fetch store types
fun fetchStoreTypes() { fun fetchStoreTypes() {
_isLoadingType.value = true _isLoadingType.value = true

View File

@ -583,6 +583,48 @@
</LinearLayout> </LinearLayout>
<!-- Nama Pemilik Rekening -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginBottom="24dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="12. Nama Pemilik Rekening"
style="@style/body_medium"
android:layout_marginEnd="4dp"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="*"
style="@style/body_medium"
android:textColor="@color/red_required"
android:layout_gravity="end"/>
</LinearLayout>
<EditText
android:id="@+id/et_account_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_text_field"
android:hint="Isi nama pemilik rekening"
android:padding="8dp"
style="@style/body_small"
android:layout_marginTop="10dp"/>
</LinearLayout>
<!-- Kurir --> <!-- Kurir -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -598,7 +640,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="12. Pilih Kurir Pengiriman" android:text="13. Pilih Kurir Pengiriman"
style="@style/body_medium" style="@style/body_medium"
android:layout_marginEnd="4dp"/> android:layout_marginEnd="4dp"/>
@ -651,7 +693,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="13. Foto Profil Toko" android:text="14. Foto Profil Toko"
style="@style/body_medium" style="@style/body_medium"
android:layout_marginEnd="4dp"/> android:layout_marginEnd="4dp"/>
@ -707,7 +749,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="14. Dokumen KTP" android:text="15. Dokumen KTP"
style="@style/body_medium" style="@style/body_medium"
android:layout_marginEnd="4dp"/> android:layout_marginEnd="4dp"/>
@ -774,7 +816,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="15. Dokumen NIB" android:text="16. Dokumen NIB"
style="@style/body_medium" style="@style/body_medium"
android:layout_marginEnd="4dp"/> android:layout_marginEnd="4dp"/>
@ -841,7 +883,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="16. Dokumen NPWP" android:text="17. Dokumen NPWP"
style="@style/body_medium" style="@style/body_medium"
android:layout_marginEnd="4dp"/> android:layout_marginEnd="4dp"/>
@ -896,7 +938,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -916,12 +959,14 @@
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/map_container" android:id="@+id/map_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="200dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@android:color/darker_gray"> android:background="@android:color/darker_gray"
android:visibility="gone">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -933,7 +978,7 @@
<Button <Button
android:id="@+id/btn_register" android:id="@+id/btn_register"
style="@style/button.large.disabled.long" style="@style/button.large.disabled.long"
android:enabled="false" android:enabled="true"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:text="Daftar" /> android:text="Daftar" />

View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.profile.mystore.StoreSuspendedActivity"
android:orientation="vertical"
android:fitsSystemWindows="true">
<include
android:id="@+id/header"
layout="@layout/header" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:padding="16dp">
<ImageView
android:layout_width="200dp"
android:layout_height="200dp"
android:src="@drawable/ic_settings"
app:tint="@color/blue_500"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Toko Anda telah dinonaktifkan oleh Admin. Harap hubungi Admin untuk melakukan reaktivasi."
style="@style/body_large"
android:fontFamily="@font/dmsans_extrabold"
android:textAlignment="center" />
</LinearLayout>
</LinearLayout>

View File

@ -1,5 +1,5 @@
[versions] [versions]
agp = "8.12.0" agp = "8.9.2"
glide = "4.16.0" glide = "4.16.0"
gson = "2.11.0" gson = "2.11.0"
hiltAndroid = "2.56.2" # Updated from 2.44 for better compatibility hiltAndroid = "2.56.2" # Updated from 2.44 for better compatibility

View File

@ -1,6 +1,6 @@
#Wed Oct 16 14:37:43 ICT 2024 #Wed Oct 16 14:37:43 ICT 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists