mirror of
https://github.com/shaulascr/ecommerce_serang.git
synced 2025-08-13 10:42:21 +00:00
Compare commits
2 Commits
screen-fea
...
gracia
Author | SHA1 | Date | |
---|---|---|---|
bad456f842 | |||
d08f5465d1 |
13
.idea/deviceManager.xml
generated
Normal file
13
.idea/deviceManager.xml
generated
Normal file
@ -0,0 +1,13 @@
|
||||
<?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>
|
@ -124,7 +124,4 @@ dependencies {
|
||||
implementation(platform("com.google.firebase:firebase-bom:33.13.0"))
|
||||
implementation("com.google.firebase:firebase-analytics")
|
||||
implementation("com.google.firebase:firebase-messaging-ktx")
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -29,6 +29,9 @@
|
||||
android:theme="@style/Theme.Ecommerce_serang"
|
||||
android:usesCleartextTraffic="true"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.StoreSuspendedActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.StoreOnReviewActivity"
|
||||
android:exported="false" />
|
||||
@ -82,12 +85,11 @@
|
||||
<!-- android:name="androidx.startup.InitializationProvider" -->
|
||||
<!-- android:authorities="${applicationId}.androidx-startup" -->
|
||||
<!-- tools:node="remove" /> -->
|
||||
<!-- <service-->
|
||||
<!-- android:name=".ui.notif.SimpleWebSocketService"-->
|
||||
<!-- android:enabled="true"-->
|
||||
<!-- android:exported="false"-->
|
||||
<!-- android:foregroundServiceType="dataSync" />-->
|
||||
|
||||
<!-- <service -->
|
||||
<!-- android:name=".ui.notif.SimpleWebSocketService" -->
|
||||
<!-- android:enabled="true" -->
|
||||
<!-- android:exported="false" -->
|
||||
<!-- android:foregroundServiceType="dataSync" /> -->
|
||||
<activity
|
||||
android:name=".ui.profile.mystore.chat.ChatStoreActivity"
|
||||
android:exported="false"
|
||||
|
@ -90,7 +90,7 @@ data class OrdersItem(
|
||||
val orderId: Int,
|
||||
|
||||
@field:SerializedName("city_id")
|
||||
val cityId: String,
|
||||
val cityId: Int,
|
||||
|
||||
var displayStatus: String? = null
|
||||
)
|
||||
|
@ -119,7 +119,7 @@ data class Orders(
|
||||
val orderId: Int,
|
||||
|
||||
@field:SerializedName("city_id")
|
||||
val cityId: String
|
||||
val cityId: Int
|
||||
)
|
||||
|
||||
data class OrderListItemsItem(
|
||||
|
@ -114,7 +114,7 @@ data class Store(
|
||||
val storeDescription: String,
|
||||
|
||||
@field:SerializedName("city_id")
|
||||
val cityId: String
|
||||
val cityId: Int
|
||||
)
|
||||
|
||||
data class ShippingItem(
|
||||
|
@ -35,7 +35,7 @@ data class Store(
|
||||
val detail: String,
|
||||
@SerializedName("is_store_location") val isStoreLocation: Boolean,
|
||||
@SerializedName("user_id") val userId: Int,
|
||||
@SerializedName("city_id") val cityId: String,
|
||||
@SerializedName("city_id") val cityId: Int,
|
||||
@SerializedName("province_id") val provinceId: Int,
|
||||
val phone: String?,
|
||||
val recipient: String?,
|
||||
|
@ -132,5 +132,5 @@ data class Orders(
|
||||
val username: String? = null,
|
||||
|
||||
@field:SerializedName("city_id")
|
||||
val cityId: String? = null
|
||||
val cityId: Int? = null
|
||||
)
|
@ -129,7 +129,7 @@ data class OrdersItem(
|
||||
val status: String? = null,
|
||||
|
||||
@field:SerializedName("city_id")
|
||||
val cityId: String? = null,
|
||||
val cityId: Int? = null,
|
||||
|
||||
var displayStatus: String? = null
|
||||
)
|
||||
|
@ -278,11 +278,6 @@ class UserRepository(private val apiService: ApiService) {
|
||||
val requestFile = compressedFile.asRequestBody(mimeType.toMediaTypeOrNull())
|
||||
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)
|
||||
} else {
|
||||
throw IllegalArgumentException("$formName harus berupa file gambar (JPEG, JPG, atau PNG)")
|
||||
|
@ -3,7 +3,6 @@ package com.alya.ecommerce_serang.ui.order.address
|
||||
import android.content.Context
|
||||
import android.util.Log
|
||||
import android.widget.ArrayAdapter
|
||||
import android.widget.Spinner
|
||||
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
|
||||
@ -98,75 +97,4 @@ class VillagesAdapter(
|
||||
fun getPostalCode(position: Int): String?{
|
||||
return villages.getOrNull(position)?.postalCode
|
||||
}
|
||||
}
|
||||
|
||||
class BankAdapter(
|
||||
context: Context,
|
||||
resource: Int = android.R.layout.simple_dropdown_item_1line
|
||||
) : ArrayAdapter<String>(context, resource, ArrayList()) {
|
||||
|
||||
data class BankItem(
|
||||
val bankName: String,
|
||||
val bankCode: String? = null,
|
||||
val description: String? = null
|
||||
)
|
||||
|
||||
private val banks = ArrayList<BankItem>()
|
||||
|
||||
init {
|
||||
loadHardcodedData()
|
||||
}
|
||||
|
||||
private fun loadHardcodedData() {
|
||||
val defaultBanks = listOf(
|
||||
BankItem("Bank Mandiri", "008", "PT Bank Mandiri (Persero) Tbk"),
|
||||
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)
|
||||
}
|
||||
|
||||
fun updateData(newBanks: List<BankItem>) {
|
||||
banks.clear()
|
||||
banks.addAll(newBanks)
|
||||
|
||||
clear()
|
||||
addAll(banks.map { it.bankName })
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
fun getBankName(position: Int): String? {
|
||||
return banks.getOrNull(position)?.bankName
|
||||
}
|
||||
|
||||
fun getBankItem(position: Int): BankItem? {
|
||||
return banks.getOrNull(position)
|
||||
}
|
||||
|
||||
fun getBankCode(position: Int): String? {
|
||||
return banks.getOrNull(position)?.bankCode
|
||||
}
|
||||
|
||||
fun findPositionByName(bankName: String): Int {
|
||||
return banks.indexOfFirst { it.bankName == bankName }
|
||||
}
|
||||
|
||||
fun setDefaultSelection(spinner: Spinner, defaultBankName: String) {
|
||||
val position = findPositionByName(defaultBankName)
|
||||
if (position >= 0) {
|
||||
spinner.setSelection(position)
|
||||
}
|
||||
}
|
||||
}
|
@ -32,7 +32,6 @@ import com.google.android.material.button.MaterialButton
|
||||
import com.google.android.material.textfield.TextInputLayout
|
||||
import com.google.gson.Gson
|
||||
import java.io.File
|
||||
import java.text.NumberFormat
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Calendar
|
||||
import java.util.Locale
|
||||
@ -89,8 +88,7 @@ class OrderHistoryAdapter(
|
||||
tvStoreName.text = storeName
|
||||
|
||||
// Set total amount
|
||||
tvTotalAmount.text = formatCurrency(order.totalAmount.toDouble())
|
||||
|
||||
tvTotalAmount.text = order.totalAmount
|
||||
|
||||
// Set item count
|
||||
val itemCount = order.orderItems.size
|
||||
@ -601,11 +599,6 @@ class OrderHistoryAdapter(
|
||||
}
|
||||
}
|
||||
|
||||
private fun formatCurrency(amount: Double): String {
|
||||
val formatter = NumberFormat.getCurrencyInstance(Locale("in", "ID"))
|
||||
return formatter.format(amount).replace(",00", "")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
@ -10,8 +10,6 @@ import com.alya.ecommerce_serang.BuildConfig.BASE_URL
|
||||
import com.alya.ecommerce_serang.R
|
||||
import com.alya.ecommerce_serang.data.api.response.customer.order.OrderItemsItem
|
||||
import com.bumptech.glide.Glide
|
||||
import java.text.NumberFormat
|
||||
import java.util.Locale
|
||||
|
||||
class OrderProductAdapter : RecyclerView.Adapter<OrderProductAdapter.ProductViewHolder>() {
|
||||
|
||||
@ -48,7 +46,7 @@ class OrderProductAdapter : RecyclerView.Adapter<OrderProductAdapter.ProductView
|
||||
tvQuantity.text = "${product.quantity} buah"
|
||||
|
||||
// Set price with currency format
|
||||
tvProductPrice.text = formatCurrency(product.price.toDouble())
|
||||
tvProductPrice.text = formatCurrency(product.price)
|
||||
|
||||
val fullImageUrl = when (val img = product.productImage) {
|
||||
is String -> {
|
||||
@ -67,9 +65,10 @@ class OrderProductAdapter : RecyclerView.Adapter<OrderProductAdapter.ProductView
|
||||
|
||||
|
||||
|
||||
private fun formatCurrency(amount: Double): String {
|
||||
val formatter = NumberFormat.getCurrencyInstance(Locale("in", "ID"))
|
||||
return formatter.format(amount).replace(",00", "")
|
||||
private fun formatCurrency(amount: Int): String {
|
||||
// In a real app, you would use NumberFormat for proper currency formatting
|
||||
// For simplicity, just return a basic formatted string
|
||||
return "Rp${amount}"
|
||||
}
|
||||
}
|
||||
}
|
@ -25,6 +25,7 @@ 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.StoreOnReviewActivity
|
||||
import com.alya.ecommerce_serang.ui.profile.mystore.StoreSuspendedActivity
|
||||
import com.alya.ecommerce_serang.utils.BaseViewModelFactory
|
||||
import com.alya.ecommerce_serang.utils.SessionManager
|
||||
import com.alya.ecommerce_serang.utils.viewmodel.MyStoreViewModel
|
||||
@ -73,13 +74,11 @@ class ProfileFragment : Fragment() {
|
||||
|
||||
observeUserProfile()
|
||||
|
||||
observeStoreStatus()
|
||||
|
||||
viewModel.loadUserProfile()
|
||||
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{
|
||||
// if (hasStore == true) startActivity(Intent(requireContext(), MyStoreActivity::class.java))
|
||||
// else startActivity(Intent(requireContext(), RegisterStoreActivity::class.java))
|
||||
@ -88,8 +87,11 @@ class ProfileFragment : Fragment() {
|
||||
myStoreViewModel.myStoreProfile.observe(viewLifecycleOwner) { store ->
|
||||
store?.let {
|
||||
when (store.storeStatus) {
|
||||
"process" -> startActivity(Intent(requireContext(), StoreOnReviewActivity::class.java))
|
||||
"active" -> startActivity(Intent(requireContext(), MyStoreActivity::class.java))
|
||||
else -> startActivity(Intent(requireContext(), StoreOnReviewActivity::class.java))
|
||||
"inactive" -> startActivity(Intent(requireContext(), MyStoreActivity::class.java))
|
||||
"suspended" -> startActivity(Intent(requireContext(), StoreSuspendedActivity::class.java))
|
||||
else -> startActivity(Intent(requireContext(), RegisterStoreActivity::class.java))
|
||||
}
|
||||
} ?: run {
|
||||
Toast.makeText(requireContext(), "Gagal memuat data toko", Toast.LENGTH_SHORT).show()
|
||||
@ -132,6 +134,12 @@ 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){
|
||||
val fullImageUrl = when (val img = user.image) {
|
||||
is String -> {
|
||||
|
@ -1,5 +1,6 @@
|
||||
package com.alya.ecommerce_serang.ui.profile.mystore
|
||||
|
||||
import android.Manifest
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.net.Uri
|
||||
@ -19,6 +20,7 @@ import android.widget.Toast
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import androidx.activity.viewModels
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.core.app.ActivityCompat
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.graphics.drawable.toDrawable
|
||||
import androidx.core.view.ViewCompat
|
||||
@ -30,10 +32,8 @@ 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.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.SessionManager
|
||||
import com.alya.ecommerce_serang.utils.viewmodel.RegisterStoreViewModel
|
||||
@ -45,9 +45,6 @@ class RegisterStoreActivity : AppCompatActivity() {
|
||||
|
||||
private lateinit var provinceAdapter: ProvinceAdapter
|
||||
private lateinit var cityAdapter: CityAdapter
|
||||
private lateinit var subdistrictAdapter: SubdsitrictAdapter
|
||||
private lateinit var bankAdapter: BankAdapter
|
||||
|
||||
// Request codes for file picking
|
||||
private val PICK_STORE_IMAGE_REQUEST = 1001
|
||||
private val PICK_KTP_REQUEST = 1002
|
||||
@ -91,8 +88,6 @@ class RegisterStoreActivity : AppCompatActivity() {
|
||||
|
||||
provinceAdapter = ProvinceAdapter(this)
|
||||
cityAdapter = CityAdapter(this)
|
||||
subdistrictAdapter = SubdsitrictAdapter(this)
|
||||
bankAdapter = BankAdapter(this)
|
||||
Log.d(TAG, "onCreate: Adapters initialized")
|
||||
|
||||
setupDataBinding()
|
||||
@ -106,12 +101,8 @@ class RegisterStoreActivity : AppCompatActivity() {
|
||||
setupObservers()
|
||||
Log.d(TAG, "onCreate: Observers setup completed")
|
||||
|
||||
viewModel.latitude.value = "-6.2088"
|
||||
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()
|
||||
setupMap()
|
||||
Log.d(TAG, "onCreate: Map setup completed")
|
||||
|
||||
setupDocumentUploads()
|
||||
Log.d(TAG, "onCreate: Document uploads setup completed")
|
||||
@ -170,17 +161,16 @@ class RegisterStoreActivity : AppCompatActivity() {
|
||||
viewModel.ktpUri != null &&
|
||||
viewModel.nibUri != null &&
|
||||
viewModel.npwpUri != null &&
|
||||
viewModel.selectedCouriers.isNotEmpty() &&
|
||||
!viewModel.accountName.value.isNullOrBlank()
|
||||
viewModel.selectedCouriers.isNotEmpty()
|
||||
|
||||
binding.btnRegister.isEnabled = isFormValid
|
||||
|
||||
binding.btnRegister.isEnabled = true
|
||||
if (isFormValid) {
|
||||
binding.btnRegister.setBackgroundResource(R.drawable.bg_button_active)
|
||||
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))
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -235,28 +225,6 @@ class RegisterStoreActivity : AppCompatActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
viewModel.subdistrictState.observe(this) { state ->
|
||||
when (state) {
|
||||
is Result.Loading -> {
|
||||
Log.d(TAG, "setupobservers: Loading Subdistrict...")
|
||||
binding.subdistrictProgressBar.visibility = View.VISIBLE
|
||||
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)
|
||||
}
|
||||
is Result.Error -> {
|
||||
Log.e(TAG, "setupObservers: Error loading subdistrict: ${state.exception.message}")
|
||||
binding.subdistrictProgressBar.visibility = View.GONE
|
||||
binding.spinnerCity.isEnabled = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Observe registration state
|
||||
viewModel.registerState.observe(this) { result ->
|
||||
when (result) {
|
||||
@ -427,11 +395,6 @@ class RegisterStoreActivity : AppCompatActivity() {
|
||||
if (cityId != null) {
|
||||
Log.d(TAG, "Setting city ID: $cityId")
|
||||
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")
|
||||
@ -443,61 +406,6 @@ 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) {
|
||||
Log.d(TAG, "Subdistrict selected at position: $position")
|
||||
val subdistrictId = subdistrictAdapter.getSubdistrictId(position)
|
||||
if (subdistrictId != null) {
|
||||
Log.d(TAG, "Setting subdistrict ID: $subdistrictId")
|
||||
viewModel.subdistrict.value = subdistrictId
|
||||
viewModel.selectedSubdistrict = subdistrictId
|
||||
} else {
|
||||
Log.e(TAG, "Invalid subdistrict ID for position: $position")
|
||||
}
|
||||
}
|
||||
|
||||
override fun onNothingSelected(parent: AdapterView<*>?) {
|
||||
Log.d(TAG, "No city selected")
|
||||
}
|
||||
}
|
||||
|
||||
binding.spinnerBankName.adapter = bankAdapter
|
||||
binding.spinnerBankName.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
|
||||
override fun onItemSelected(
|
||||
parent: AdapterView<*>?,
|
||||
view: View?,
|
||||
position: Int,
|
||||
id: Long
|
||||
) {
|
||||
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.storeTypeProgressBar.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
|
||||
}
|
||||
}
|
||||
|
||||
// Add initial hints to the spinners
|
||||
if (provinceAdapter.isEmpty) {
|
||||
Log.d(TAG, "Adding default province hint")
|
||||
@ -509,16 +417,6 @@ class RegisterStoreActivity : AppCompatActivity() {
|
||||
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")
|
||||
}
|
||||
|
||||
@ -602,44 +500,44 @@ class RegisterStoreActivity : AppCompatActivity() {
|
||||
validateRequiredFields()
|
||||
}
|
||||
|
||||
// private fun setupMap() {
|
||||
// Log.d(TAG, "setupMap: Setting up map container")
|
||||
// // This would typically integrate with Google Maps SDK
|
||||
// // For simplicity, we're just using a placeholder
|
||||
// binding.mapContainer.setOnClickListener {
|
||||
// Log.d(TAG, "Map container clicked, checking location permission")
|
||||
// // Request location permission if not granted
|
||||
// if (ContextCompat.checkSelfPermission(
|
||||
// this,
|
||||
// Manifest.permission.ACCESS_FINE_LOCATION
|
||||
// ) != PackageManager.PERMISSION_GRANTED
|
||||
// ) {
|
||||
// Log.d(TAG, "Location permission not granted, requesting permission")
|
||||
// ActivityCompat.requestPermissions(
|
||||
// this,
|
||||
// arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
|
||||
// LOCATION_PERMISSION_REQUEST
|
||||
// )
|
||||
// viewModel.latitude.value = "-6.2088"
|
||||
// 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()
|
||||
// } else {
|
||||
// Log.d(TAG, "Location permission already granted, setting location")
|
||||
// // Show map selection UI
|
||||
// // This would typically launch Maps UI for location selection
|
||||
// // For now, we'll just set some dummy coordinates
|
||||
// viewModel.latitude.value = "-6.2088"
|
||||
// viewModel.longitude.value = "106.8456"
|
||||
// Log.d(TAG, "Location set - Lat: ${viewModel.latitude.value}, Long: ${viewModel.longitude.value}")
|
||||
// Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show()
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// Log.d(TAG, "setupMap: Map container setup completed")
|
||||
// }
|
||||
private fun setupMap() {
|
||||
Log.d(TAG, "setupMap: Setting up map container")
|
||||
// This would typically integrate with Google Maps SDK
|
||||
// For simplicity, we're just using a placeholder
|
||||
binding.mapContainer.setOnClickListener {
|
||||
Log.d(TAG, "Map container clicked, checking location permission")
|
||||
// Request location permission if not granted
|
||||
if (ContextCompat.checkSelfPermission(
|
||||
this,
|
||||
Manifest.permission.ACCESS_FINE_LOCATION
|
||||
) != PackageManager.PERMISSION_GRANTED
|
||||
) {
|
||||
Log.d(TAG, "Location permission not granted, requesting permission")
|
||||
ActivityCompat.requestPermissions(
|
||||
this,
|
||||
arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
|
||||
LOCATION_PERMISSION_REQUEST
|
||||
)
|
||||
viewModel.latitude.value = "-6.2088"
|
||||
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()
|
||||
} else {
|
||||
Log.d(TAG, "Location permission already granted, setting location")
|
||||
// Show map selection UI
|
||||
// This would typically launch Maps UI for location selection
|
||||
// For now, we'll just set some dummy coordinates
|
||||
viewModel.latitude.value = "-6.2088"
|
||||
viewModel.longitude.value = "106.8456"
|
||||
Log.d(TAG, "Location set - Lat: ${viewModel.latitude.value}, Long: ${viewModel.longitude.value}")
|
||||
Toast.makeText(this, "Lokasi dipilih", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
|
||||
Log.d(TAG, "setupMap: Map container setup completed")
|
||||
}
|
||||
|
||||
private fun setupDataBinding() {
|
||||
Log.d(TAG, "setupDataBinding: Setting up two-way data binding for text fields")
|
||||
@ -719,36 +617,25 @@ class RegisterStoreActivity : AppCompatActivity() {
|
||||
validateRequiredFields()
|
||||
}
|
||||
})
|
||||
//
|
||||
// binding.etSubdistrict.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.subdistrict.value = s.toString()
|
||||
// Log.d(TAG, "Subdistrict updated: ${s.toString()}")
|
||||
// validateRequiredFields()
|
||||
// }
|
||||
// })
|
||||
|
||||
// binding.etBankName.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.bankName.value = s.toString()
|
||||
// Log.d(TAG, "Bank name updated: ${s.toString()}")
|
||||
// validateRequiredFields()
|
||||
// }
|
||||
// })
|
||||
|
||||
binding.etAccountName.addTextChangedListener(object : TextWatcher {
|
||||
binding.etSubdistrict.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()}")
|
||||
viewModel.subdistrict.value = s.toString()
|
||||
Log.d(TAG, "Subdistrict updated: ${s.toString()}")
|
||||
validateRequiredFields()
|
||||
}
|
||||
})
|
||||
|
||||
binding.etBankName.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.bankName.value = s.toString()
|
||||
Log.d(TAG, "Bank name updated: ${s.toString()}")
|
||||
validateRequiredFields()
|
||||
}
|
||||
})
|
||||
|
||||
Log.d(TAG, "setupDataBinding: Text field data binding setup completed")
|
||||
|
@ -0,0 +1,26 @@
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
@ -27,6 +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.ImageUtils.compressImage
|
||||
import com.alya.ecommerce_serang.utils.SessionManager
|
||||
import com.alya.ecommerce_serang.utils.viewmodel.ProductViewModel
|
||||
import com.bumptech.glide.Glide
|
||||
@ -40,7 +42,7 @@ class DetailStoreProductActivity : AppCompatActivity() {
|
||||
|
||||
private lateinit var binding: ActivityDetailStoreProductBinding
|
||||
private lateinit var sessionManager: SessionManager
|
||||
private lateinit var categoryList: List<CategoryItem>
|
||||
private var categoryList: List<CategoryItem> = emptyList()
|
||||
private var imageUri: Uri? = null
|
||||
private var sppirtUri: Uri? = null
|
||||
private var halalUri: Uri? = null
|
||||
@ -60,7 +62,10 @@ class DetailStoreProductActivity : AppCompatActivity() {
|
||||
if (result.resultCode == Activity.RESULT_OK) {
|
||||
imageUri = result.data?.data
|
||||
imageUri?.let {
|
||||
binding.ivPreviewFoto.setImageURI(it)
|
||||
compressImage(this, it, "productimg").let { compressedImageFile ->
|
||||
binding.ivPreviewFoto.setImageURI(Uri.fromFile(compressedImageFile))
|
||||
imageUri = Uri.fromFile(compressedImageFile)
|
||||
}
|
||||
binding.switcherFotoProduk.showNext()
|
||||
hasImage = true
|
||||
}
|
||||
@ -70,17 +75,21 @@ class DetailStoreProductActivity : AppCompatActivity() {
|
||||
|
||||
private val sppirtLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
|
||||
if (uri != null && isValidFile(uri)) {
|
||||
sppirtUri = uri
|
||||
binding.tvSppirtName.text = getFileName(uri)
|
||||
binding.switcherSppirt.showNext()
|
||||
compressFile(this, uri).let { compressedFile ->
|
||||
sppirtUri = compressedFile?.toUri()
|
||||
binding.tvSppirtName.text = getFileName(sppirtUri!!)
|
||||
binding.switcherSppirt.showNext()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private val halalLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
|
||||
if (uri != null && isValidFile(uri)) {
|
||||
halalUri = uri
|
||||
binding.tvHalalName.text = getFileName(uri)
|
||||
binding.switcherHalal.showNext()
|
||||
compressFile(this, uri).let { compressedFile ->
|
||||
halalUri = compressedFile?.toUri()
|
||||
binding.tvHalalName.text = getFileName(halalUri!!)
|
||||
binding.switcherHalal.showNext()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -8,13 +8,46 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
|
||||
import okhttp3.MultipartBody
|
||||
import okhttp3.RequestBody.Companion.asRequestBody
|
||||
import java.io.File
|
||||
import java.io.FileInputStream
|
||||
import java.io.FileOutputStream
|
||||
import java.util.zip.GZIPOutputStream
|
||||
|
||||
object FileUtils {
|
||||
private const val TAG = "FileUtils"
|
||||
|
||||
/**
|
||||
* Creates a temporary file from a URI in the app's cache directory
|
||||
* Compress a file to GZIP format to reduce its size to below 1MB
|
||||
* @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? {
|
||||
try {
|
||||
@ -41,6 +74,23 @@ 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
|
||||
*/
|
||||
|
@ -47,15 +47,15 @@ class ProfileViewModel(private val userRepository: UserRepository) : ViewModel()
|
||||
val response: HasStoreResponse = userRepository.checkStore()
|
||||
|
||||
// Log and store success message
|
||||
Log.d("RegisterViewModel", "OTP Response: ${response.hasStore}")
|
||||
_checkStore.value = response.hasStore // Store the message for UI feedback
|
||||
Log.d("ProfileViewModel", "Has store: ${response.hasStore}")
|
||||
_checkStore.postValue(response.hasStore) // Store the message for UI feedback
|
||||
|
||||
} catch (exception: Exception) {
|
||||
// Handle any errors and update state
|
||||
_checkStore.value = false
|
||||
_checkStore.postValue(false)
|
||||
|
||||
// Log the error for debugging
|
||||
Log.e("RegisterViewModel", "Error:", exception)
|
||||
Log.e(":ProfileViewModel", "Error:", exception)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -11,8 +11,6 @@ import com.alya.ecommerce_serang.data.api.response.auth.RegisterStoreResponse
|
||||
import com.alya.ecommerce_serang.data.api.response.auth.StoreTypesItem
|
||||
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
|
||||
import com.alya.ecommerce_serang.data.api.response.customer.order.VillagesItem
|
||||
import com.alya.ecommerce_serang.data.repository.Result
|
||||
import com.alya.ecommerce_serang.data.repository.UserRepository
|
||||
import com.alya.ecommerce_serang.utils.ImageUtils
|
||||
@ -43,17 +41,8 @@ class RegisterStoreViewModel(
|
||||
private val _citiesState = MutableLiveData<Result<List<CitiesItem>>>()
|
||||
val citiesState: LiveData<Result<List<CitiesItem>>> = _citiesState
|
||||
|
||||
private val _subdistrictState = MutableLiveData<Result<List<SubdistrictsItem>>>()
|
||||
val subdistrictState: LiveData<Result<List<SubdistrictsItem>>> = _subdistrictState
|
||||
|
||||
private val _villagesState = MutableLiveData<Result<List<VillagesItem>>>()
|
||||
val villagesState: LiveData<Result<List<VillagesItem>>> = _villagesState
|
||||
|
||||
var selectedProvinceId: Int? = null
|
||||
var selectedCityId: String? = null
|
||||
var selectedSubdistrict: String? = null
|
||||
var selectedVillages: String? = null
|
||||
var selectedBankName: String? = null
|
||||
|
||||
// Form fields
|
||||
val storeName = MutableLiveData<String>()
|
||||
@ -83,89 +72,47 @@ class RegisterStoreViewModel(
|
||||
val selectedCouriers = mutableListOf<String>()
|
||||
|
||||
fun registerStore(context: Context) {
|
||||
Log.d(TAG, "Starting registerStore()")
|
||||
|
||||
val allowedFileTypes = Regex("^(jpeg|jpg|png|pdf)$", RegexOption.IGNORE_CASE)
|
||||
|
||||
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
|
||||
// Check each file if present
|
||||
if (storeImageUri != null && !ImageUtils.isAllowedFileType(context, storeImageUri, allowedFileTypes)) {
|
||||
_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"))
|
||||
return
|
||||
}
|
||||
|
||||
if (ktpUri != null && !ImageUtils.isAllowedFileType(context, ktpUri, allowedFileTypes)) {
|
||||
_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"))
|
||||
return
|
||||
}
|
||||
|
||||
if (npwpUri != null && !ImageUtils.isAllowedFileType(context, npwpUri, allowedFileTypes)) {
|
||||
_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"))
|
||||
return
|
||||
}
|
||||
|
||||
if (nibUri != null && !ImageUtils.isAllowedFileType(context, nibUri, allowedFileTypes)) {
|
||||
_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"))
|
||||
return
|
||||
}
|
||||
|
||||
if (persetujuanUri != null && !ImageUtils.isAllowedFileType(context, persetujuanUri, allowedFileTypes)) {
|
||||
_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"))
|
||||
return
|
||||
}
|
||||
|
||||
if (qrisUri != null && !ImageUtils.isAllowedFileType(context, qrisUri, allowedFileTypes)) {
|
||||
_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"))
|
||||
return
|
||||
}
|
||||
|
||||
Log.d(TAG, "File type checks passed. Starting repository.registerStoreUser() call.")
|
||||
|
||||
viewModelScope.launch {
|
||||
try {
|
||||
_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(
|
||||
context = context,
|
||||
@ -192,15 +139,25 @@ class RegisterStoreViewModel(
|
||||
accountName = accountName.value ?: ""
|
||||
)
|
||||
|
||||
Log.d(TAG, "Repository returned result: $result")
|
||||
_registerState.value = result
|
||||
} catch (e: Exception) {
|
||||
Log.e(TAG, "Exception during registerStore", 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 {
|
||||
// Implement form validation logic
|
||||
return !(storeName.value.isNullOrEmpty() ||
|
||||
@ -217,6 +174,8 @@ class RegisterStoreViewModel(
|
||||
nibUri == null)
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Function to fetch store types
|
||||
fun fetchStoreTypes() {
|
||||
_isLoadingType.value = true
|
||||
@ -276,52 +235,6 @@ class RegisterStoreViewModel(
|
||||
}
|
||||
}
|
||||
|
||||
fun getSubdistrict(cityId: String) {
|
||||
_subdistrictState.value = Result.Loading
|
||||
viewModelScope.launch {
|
||||
try {
|
||||
|
||||
selectedSubdistrict = cityId
|
||||
val result = repository.getListSubdistrict(cityId)
|
||||
result?.let {
|
||||
_subdistrictState.postValue(Result.Success(it.subdistricts))
|
||||
Log.d(TAG, "Cities loaded for province $cityId: ${it.subdistricts.size}")
|
||||
} ?: run {
|
||||
_subdistrictState.postValue(Result.Error(Exception("Failed to load cities")))
|
||||
Log.e(TAG, "City result was null for province $cityId")
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
_subdistrictState.postValue(Result.Error(Exception(e.message ?: "Error loading cities")))
|
||||
Log.e(TAG, "Error fetching cities for province $cityId", e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun getVillages(subdistrictId: String) {
|
||||
_villagesState.value = Result.Loading
|
||||
viewModelScope.launch {
|
||||
try {
|
||||
|
||||
selectedVillages = subdistrictId
|
||||
val result = repository.getListVillages(subdistrictId)
|
||||
result?.let {
|
||||
_villagesState.postValue(Result.Success(it.villages))
|
||||
Log.d(TAG, "Cities loaded for province $subdistrictId: ${it.villages.size}")
|
||||
} ?: run {
|
||||
_villagesState.postValue(Result.Error(Exception("Failed to load cities")))
|
||||
Log.e(TAG, "City result was null for province $subdistrictId")
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
_villagesState.postValue(Result.Error(Exception(e.message ?: "Error loading cities")))
|
||||
Log.e(TAG, "Error fetching cities for province $subdistrictId", e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun isBankSelected(): Boolean {
|
||||
return !selectedBankName.isNullOrEmpty()
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val TAG = "RegisterStoreUserViewModel"
|
||||
}
|
||||
|
@ -347,57 +347,41 @@
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="vertical"
|
||||
android:layout_marginBottom="24dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="6. Kecamatan"
|
||||
style="@style/body_medium"
|
||||
android:layout_marginEnd="4dp"/>
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="6. Kecamatan"
|
||||
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_subdistrict"
|
||||
android:layout_width="match_parent"
|
||||
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>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:background="@drawable/bg_text_field"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginTop="10dp">
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/spinner_subdistrict"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/bg_text_field"
|
||||
android:hint="Isi kecamatan tempat toko Anda di sini"
|
||||
android:padding="8dp"
|
||||
style="@style/body_small"
|
||||
android:background="@null"/>
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/subdistrict_progress_bar"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:padding="4dp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<!-- Chevron Down Icon -->
|
||||
<ImageView
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:src="@drawable/ic_down"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:contentDescription="Chevron Down" />
|
||||
android:layout_marginTop="10dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -519,8 +503,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginBottom="24dp"
|
||||
android:visibility="gone">
|
||||
android:layout_marginBottom="24dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@ -557,74 +540,6 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Nama Bank-->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginBottom="24dp">
|
||||
|
||||
<!-- Label Jenis UMKM -->
|
||||
<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="10. Bank"
|
||||
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>
|
||||
|
||||
<!-- Spinner Dropdown dengan Chevron -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:background="@drawable/bg_text_field"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginTop="10dp">
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/spinner_bank_name"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:padding="8dp"
|
||||
style="@style/body_small"
|
||||
android:background="@null"/>
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/bank_name_progress_bar"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:padding="4dp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<!-- Chevron Down Icon -->
|
||||
<ImageView
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:src="@drawable/ic_down"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:contentDescription="Chevron Down" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Nomor Rekening -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@ -668,48 +583,6 @@
|
||||
|
||||
</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 -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@ -725,7 +598,7 @@
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="13. Pilih Kurir Pengiriman"
|
||||
android:text="12. Pilih Kurir Pengiriman"
|
||||
style="@style/body_medium"
|
||||
android:layout_marginEnd="4dp"/>
|
||||
|
||||
@ -778,7 +651,7 @@
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="14. Foto Profil Toko"
|
||||
android:text="13. Foto Profil Toko"
|
||||
style="@style/body_medium"
|
||||
android:layout_marginEnd="4dp"/>
|
||||
|
||||
@ -834,7 +707,7 @@
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="15. Dokumen KTP"
|
||||
android:text="14. Dokumen KTP"
|
||||
style="@style/body_medium"
|
||||
android:layout_marginEnd="4dp"/>
|
||||
|
||||
@ -901,7 +774,7 @@
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="16. Dokumen NIB"
|
||||
android:text="15. Dokumen NIB"
|
||||
style="@style/body_medium"
|
||||
android:layout_marginEnd="4dp"/>
|
||||
|
||||
@ -968,7 +841,7 @@
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="17. Dokumen NPWP"
|
||||
android:text="16. Dokumen NPWP"
|
||||
style="@style/body_medium"
|
||||
android:layout_marginEnd="4dp"/>
|
||||
|
||||
@ -1023,8 +896,7 @@
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:visibility="gone">
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
@ -1044,26 +916,12 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/checkbox_approve"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Saya telah membaca dan menyetujui Syarat dan Ketentuan aplikasi" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/map_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="200dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="@android:color/darker_gray"
|
||||
android:visibility="gone">
|
||||
android:background="@android:color/darker_gray">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
@ -1075,7 +933,7 @@
|
||||
<Button
|
||||
android:id="@+id/btn_register"
|
||||
style="@style/button.large.disabled.long"
|
||||
android:enabled="true"
|
||||
android:enabled="false"
|
||||
android:layout_marginTop="24dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:text="Daftar" />
|
||||
|
39
app/src/main/res/layout/activity_store_suspended.xml
Normal file
39
app/src/main/res/layout/activity_store_suspended.xml
Normal file
@ -0,0 +1,39 @@
|
||||
<?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>
|
@ -146,30 +146,5 @@
|
||||
<string name="typing">User is typing...</string>
|
||||
<string name="buka_toko_desc">Mohon untuk melengkapi formulir pendaftaran ini agar dapat mengakses fitur penjual pada aplikasi.</string>
|
||||
|
||||
<!-- List Bank -->
|
||||
<string-array name="bank_name_array">
|
||||
<item>Allo Bank Indonesia</item>
|
||||
<item>Bank Digital BCA</item>
|
||||
<item>Bank Central Asia (BCA)</item>
|
||||
<item>Bank BCA Syariah</item>
|
||||
<item>Bank Jago</item>
|
||||
<item>Bank Mandiri </item>
|
||||
<item>Bank Kb Bukopi</item>
|
||||
<item>Bank Jabar Banten Syariah</item>
|
||||
<item> Bank Mandiri Taspen</item>
|
||||
<item>Bank Maybank Indonesia </item>
|
||||
<item>Bank Negara Indonesia (BNI)</item>
|
||||
<item>Bank Permata</item>
|
||||
<item>Bank Rakyat Indonesia (BRI)</item>
|
||||
<item>Bank Saqu Indonesia</item>
|
||||
<item>Bank Seabank Indonesia</item>
|
||||
<item>Bank Sinarmas </item>
|
||||
<item>Bank Syariah Indonesia (BSI)</item>
|
||||
<item>Bank Tabungan Negara (BTN)</item>
|
||||
<item>Bank UOB Indonesia</item>
|
||||
<item>BPD Jawa Barat dan Banten</item>
|
||||
<item>Super Bank Indonesia</item>
|
||||
|
||||
</string-array>
|
||||
|
||||
</resources>
|
@ -1,5 +1,5 @@
|
||||
[versions]
|
||||
agp = "8.9.2"
|
||||
agp = "8.12.0"
|
||||
glide = "4.16.0"
|
||||
gson = "2.11.0"
|
||||
hiltAndroid = "2.56.2" # Updated from 2.44 for better compatibility
|
||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Wed Oct 16 14:37:43 ICT 2024
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
Reference in New Issue
Block a user