mirror of
https://github.com/shaulascr/ecommerce_serang.git
synced 2025-08-13 10:42:21 +00:00
store status, product fixed, file compression
This commit is contained in:
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(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")
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -29,6 +29,9 @@
|
|||||||
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" />
|
||||||
@ -82,12 +85,11 @@
|
|||||||
<!-- android:name="androidx.startup.InitializationProvider" -->
|
<!-- android:name="androidx.startup.InitializationProvider" -->
|
||||||
<!-- android:authorities="${applicationId}.androidx-startup" -->
|
<!-- android:authorities="${applicationId}.androidx-startup" -->
|
||||||
<!-- tools:node="remove" /> -->
|
<!-- tools:node="remove" /> -->
|
||||||
<!-- <service-->
|
<!-- <service -->
|
||||||
<!-- android:name=".ui.notif.SimpleWebSocketService"-->
|
<!-- android:name=".ui.notif.SimpleWebSocketService" -->
|
||||||
<!-- 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"
|
||||||
|
@ -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.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
|
||||||
@ -73,13 +74,11 @@ 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))
|
||||||
@ -88,8 +87,11 @@ 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))
|
||||||
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 {
|
} ?: run {
|
||||||
Toast.makeText(requireContext(), "Gagal memuat data toko", Toast.LENGTH_SHORT).show()
|
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){
|
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 -> {
|
||||||
|
@ -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.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
|
||||||
@ -40,7 +42,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 lateinit var categoryList: List<CategoryItem>
|
private var categoryList: List<CategoryItem> = emptyList()
|
||||||
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
|
||||||
@ -60,7 +62,10 @@ 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 {
|
||||||
binding.ivPreviewFoto.setImageURI(it)
|
compressImage(this, it, "productimg").let { compressedImageFile ->
|
||||||
|
binding.ivPreviewFoto.setImageURI(Uri.fromFile(compressedImageFile))
|
||||||
|
imageUri = Uri.fromFile(compressedImageFile)
|
||||||
|
}
|
||||||
binding.switcherFotoProduk.showNext()
|
binding.switcherFotoProduk.showNext()
|
||||||
hasImage = true
|
hasImage = true
|
||||||
}
|
}
|
||||||
@ -70,17 +75,21 @@ 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)) {
|
||||||
sppirtUri = uri
|
compressFile(this, uri).let { compressedFile ->
|
||||||
binding.tvSppirtName.text = getFileName(uri)
|
sppirtUri = compressedFile?.toUri()
|
||||||
binding.switcherSppirt.showNext()
|
binding.tvSppirtName.text = getFileName(sppirtUri!!)
|
||||||
|
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)) {
|
||||||
halalUri = uri
|
compressFile(this, uri).let { compressedFile ->
|
||||||
binding.tvHalalName.text = getFileName(uri)
|
halalUri = compressedFile?.toUri()
|
||||||
binding.switcherHalal.showNext()
|
binding.tvHalalName.text = getFileName(halalUri!!)
|
||||||
|
binding.switcherHalal.showNext()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,13 +8,46 @@ 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"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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? {
|
fun createTempFileFromUri(context: Context, uri: Uri, prefix: String = "temp"): File? {
|
||||||
try {
|
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
|
* 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()
|
val response: HasStoreResponse = userRepository.checkStore()
|
||||||
|
|
||||||
// Log and store success message
|
// Log and store success message
|
||||||
Log.d("RegisterViewModel", "OTP Response: ${response.hasStore}")
|
Log.d("ProfileViewModel", "Has store: ${response.hasStore}")
|
||||||
_checkStore.value = response.hasStore // Store the message for UI feedback
|
_checkStore.postValue(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.value = false
|
_checkStore.postValue(false)
|
||||||
|
|
||||||
// Log the error for debugging
|
// Log the error for debugging
|
||||||
Log.e("RegisterViewModel", "Error:", exception)
|
Log.e(":ProfileViewModel", "Error:", exception)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
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>
|
@ -1,5 +1,5 @@
|
|||||||
[versions]
|
[versions]
|
||||||
agp = "8.9.2"
|
agp = "8.12.0"
|
||||||
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
|
||||||
|
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
|
#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.11.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
Reference in New Issue
Block a user