feat:

- move provider feature to new package
- refactor Location data class

app/src/main/java/com/jmnetwork/e_jartas/model/GeneralClass.kt

@@ -0,0 +1,29 @@
+package com.jmnetwork.e_jartas.model
+
+import com.google.gson.annotations.SerializedName
+
+
+class Location : ArrayList<LocationItem>()
+class Additional : ArrayList<AdditionalItem>()
+
+data class DefaultResponse(
+    @SerializedName("message") val message: String,
+    @SerializedName("status") val status: String
+)
+
+data class LocationItem(
+    @SerializedName("lat") val lat: String,
+    @SerializedName("lng") val lng: String
+)
+
+data class AdditionalItem(
+    @SerializedName("id") val id: Int,
+    @SerializedName("parameter") val parameter: String,
+    @SerializedName("value") val value: String
+)
+
+data class TotalData(
+    @SerializedName("total_data") val totalData: Int,
+    @SerializedName("total_panjang_km") val totalPanjangKm: Int,
+    @SerializedName("total_panjang_meter") val totalPanjangMeter: Int
+)

app/src/main/java/com/jmnetwork/e_jartas/model/ProviderModel.kt

@@ -1,7 +1,6 @@
 package com.jmnetwork.e_jartas.model
 
 import com.google.gson.annotations.SerializedName
-import org.json.JSONObject
 
 data class ProviderResponse(
     @SerializedName("current_page") val currentPage: String,
@@ -28,4 +27,4 @@ data class ProviderRequest(
     @SerializedName("additional") val additional: Additional,
     @SerializedName("alamat") val alamat: String,
     @SerializedName("provider") val provider: String
-)
+)

app/src/main/java/com/jmnetwork/e_jartas/model/RuasJalanModel.kt

@@ -22,7 +22,7 @@ data class RuasJalanData(
     @SerializedName("idruas_jalan") val idRuasJalan: Int,
     @SerializedName("kecamatan") val kecamatan: String,
     @SerializedName("lastupdate") val lastUpdate: String,
-    @SerializedName("latlong") val latLong: String?,
+    @SerializedName("latlong") val latLong: Location,
     @SerializedName("nama_ruas_jalan") val namaRuasJalan: String,
     @SerializedName("no_ruas") val noRuas: String,
     @SerializedName("oleh") val oleh: Int,
@@ -41,12 +41,10 @@ data class RuasJalanRequest(
     @SerializedName("status") val status: String,
     @SerializedName("tipe") val tipe: String,
     @SerializedName("fungsi") val fungsi: String,
-    @SerializedName("latlong") val latLong: List<Location>,
+    @SerializedName("latlong") val latLong: Location,
     @SerializedName("additional") val additional: List<JSONObject>
 ) {
     fun toRuasJalanData(idadmin: Int, data: RuasJalanRequest): RuasJalanData {
-        val latLong = Gson().toJson(data.latLong)
-
         return RuasJalanData(
             additional = data.additional.toString(),
             createdDate = "",
@@ -55,7 +53,7 @@ data class RuasJalanRequest(
             idRuasJalan = data.idRuasJalan,
             kecamatan = data.kecamatan,
             lastUpdate = "",
-            latLong = latLong,
+            latLong = data.latLong,
             namaRuasJalan = data.namaRuasJalan,
             noRuas = data.noRuas,
             oleh = idadmin,
@@ -65,8 +63,3 @@ data class RuasJalanRequest(
         )
     }
 }
-
-data class Location(
-    @SerializedName("lat") val lat: String,
-    @SerializedName("lng") val lng: String
-)

app/src/main/java/com/jmnetwork/e_jartas/repository/ManajemenJalanRepositoryImpl.kt

@@ -4,11 +4,14 @@ import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 import com.jmnetwork.e_jartas.model.DefaultResponse
+import com.jmnetwork.e_jartas.model.Location
 import com.jmnetwork.e_jartas.model.RuasJalanRequest
 import com.jmnetwork.e_jartas.model.RuasJalanResponse
 import com.jmnetwork.e_jartas.model.SpinnerResponse
 import com.jmnetwork.e_jartas.utils.CustomHandler
+import com.jmnetwork.e_jartas.utils.LocationDeserializer
 import okhttp3.ResponseBody
 import org.json.JSONObject
 import retrofit2.Call
@@ -54,8 +57,9 @@ class ManajemenJalanRepositoryImpl : ManajemenJalanRepository {
         apiService.getAllData(limit, page, "ruas_jalan", tokenAuth).enqueue(object : retrofit2.Callback<ResponseBody> {
             override fun onResponse(call: Call<ResponseBody>, response: Response<ResponseBody>) {
                 if (response.isSuccessful) {
+                    val gson = GsonBuilder().registerTypeAdapter(Location::class.java, LocationDeserializer()).create()
                     val responseString = response.body()?.string()
-                    val data = Gson().fromJson(responseString, RuasJalanResponse::class.java)
+                    val data = gson.fromJson(responseString, RuasJalanResponse::class.java)
                     ruasJalanData.postValue(data)
                 } else {
                     val errorBody = response.errorBody()?.string()

app/src/main/java/com/jmnetwork/e_jartas/utils/Deserializer.kt

@@ -6,6 +6,8 @@ import com.google.gson.JsonElement
 import com.google.gson.JsonParser
 import com.jmnetwork.e_jartas.model.Additional
 import com.jmnetwork.e_jartas.model.AdditionalItem
+import com.jmnetwork.e_jartas.model.Location
+import com.jmnetwork.e_jartas.model.LocationItem
 import java.lang.reflect.Type
 
 class AdditionalDeserializer : JsonDeserializer<Additional> {
@@ -23,4 +25,21 @@ class AdditionalDeserializer : JsonDeserializer<Additional> {
         }
         return additional
     }
+}
+
+class LocationDeserializer : JsonDeserializer<Location> {
+    override fun deserialize(json: JsonElement?, typeOfT: Type?, context: JsonDeserializationContext?): Location {
+        val location = Location()
+        // Check if json is not null and is a JSON array string
+        if (json != null && json.isJsonPrimitive) {
+            val jsonString = json.asString
+            // Parse the string-escaped JSON into a list of LocationItems
+            val jsonArray = JsonParser.parseString(jsonString).asJsonArray
+            jsonArray.forEach { it ->
+                val item = context?.deserialize<LocationItem>(it, LocationItem::class.java)
+                item?.let { location.add(it) }
+            }
+        }
+        return location
+    }
 }

app/src/main/java/com/jmnetwork/e_jartas/utils/Utils.kt

@@ -1,7 +1,7 @@
 package com.jmnetwork.e_jartas.utils
 
 import com.google.android.gms.maps.model.LatLng
-import org.json.JSONArray
+import com.jmnetwork.e_jartas.model.Location
 
 class Utils {
     fun capitalizeFirstCharacter(input: String): String {
@@ -12,12 +12,12 @@ class Utils {
         }
     }
 
-    fun latLongConverter(latLong: String): LatLng? {
+    fun latLongConverter(latLong: Location): LatLng? {
         if (latLong.isEmpty()) return null
 
-        val rawLatLng = JSONArray(latLong).getJSONObject(0)
-        val lat = rawLatLng.getString("lat").toDouble()
-        val lng = rawLatLng.getString("lng").toDouble()
+        val rawLatLng = latLong[0]
+        val lat = rawLatLng.lat.toDouble()
+        val lng = rawLatLng.lng.toDouble()
         return LatLng(lat, lng)
     }
 }

app/src/main/java/com/jmnetwork/e_jartas/view/manajemenJalan/AddRuasJalanFragment.kt

@@ -31,6 +31,7 @@ import com.google.android.gms.maps.model.MarkerOptions
 import com.jmnetwork.e_jartas.R
 import com.jmnetwork.e_jartas.databinding.FormRuasJalanBinding
 import com.jmnetwork.e_jartas.model.Location
+import com.jmnetwork.e_jartas.model.LocationItem
 import com.jmnetwork.e_jartas.view.MainActivity
 import com.jmnetwork.e_jartas.viewModel.ManajemenJalanViewModel
 import com.jmnetwork.e_jartas.viewModel.ViewModelFactory
@@ -146,10 +147,9 @@ class AddRuasJalanFragment : Fragment(), OnMapReadyCallback {
                 val inputTipe = spinnerTipe.selectedItem.takeIf { it != null }?.toString().orEmpty()
                 val inputFungsi = spinnerFungsi.selectedItem.takeIf { it != null }?.toString().orEmpty()
 
-                val latlng = Location(
-                    latLng?.latitude.toString(),
-                    latLng?.longitude.toString()
-                )
+                val location = Location().apply {
+                    add(LocationItem(latLng?.latitude.toString(), latLng?.longitude.toString()))
+                }
 
                 val validate = viewModel.setRequestData(
                     0,
@@ -161,7 +161,7 @@ class AddRuasJalanFragment : Fragment(), OnMapReadyCallback {
                     inputStatus,
                     inputTipe,
                     inputFungsi,
-                    listOf(latlng),
+                    location,
                     emptyList()
                 )
                 btnRuasJalan.attachTextChangeAnimator()

app/src/main/java/com/jmnetwork/e_jartas/view/manajemenJalan/BottomSheetItemRuasJalan.kt

@@ -102,8 +102,7 @@ class BottomSheetItemRuasJalan : BottomSheetDialogFragment(), OnMapReadyCallback
 
     override fun onMapReady(googleMap: GoogleMap) {
         mMap = googleMap
-        val location = Utils().latLongConverter(ruasjalanData?.latLong ?: "")
-
+        val location = Utils().latLongConverter(ruasjalanData!!.latLong)
         if (location != null) {
             binding.ruasDetilMap.visibility = View.VISIBLE
             with(mMap) {

app/src/main/java/com/jmnetwork/e_jartas/view/manajemenJalan/EditRuasJalanFragment.kt

@@ -30,6 +30,7 @@ import com.google.android.gms.maps.model.MarkerOptions
 import com.jmnetwork.e_jartas.R
 import com.jmnetwork.e_jartas.databinding.FormRuasJalanBinding
 import com.jmnetwork.e_jartas.model.Location
+import com.jmnetwork.e_jartas.model.LocationItem
 import com.jmnetwork.e_jartas.utils.CustomHandler
 import com.jmnetwork.e_jartas.utils.Utils
 import com.jmnetwork.e_jartas.view.MainActivity
@@ -191,10 +192,9 @@ class EditRuasJalanFragment : Fragment(), OnMapReadyCallback {
                 val inputTipe = spinnerTipe.selectedItem.takeIf { it != null }?.toString().orEmpty()
                 val inputFungsi = spinnerFungsi.selectedItem.takeIf { it != null }?.toString().orEmpty()
 
-                val latlng = Location(
-                    latLng?.latitude.toString(),
-                    latLng?.longitude.toString()
-                )
+                val location = Location().apply {
+                    add(LocationItem(latLng?.latitude.toString(), latLng?.longitude.toString()))
+                }
 
                 val validate = viewModel.setRequestData(
                     idRuasJalan,
@@ -206,7 +206,7 @@ class EditRuasJalanFragment : Fragment(), OnMapReadyCallback {
                     inputStatus,
                     inputTipe,
                     inputFungsi,
-                    listOf(latlng),
+                    location,
                     emptyList()
                 )
                 btnRuasJalan.attachTextChangeAnimator()

app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/AddProviderFragment.kt → app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/provider/AddProviderFragment.kt

@@ -1,4 +1,4 @@
-package com.jmnetwork.e_jartas.view.manajemenTiang
+package com.jmnetwork.e_jartas.view.manajemenTiang.provider
 
 import android.content.Intent
 import android.os.Bundle

app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/BottomSheetItemProvider.kt → app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/provider/BottomSheetItemProvider.kt

@@ -1,4 +1,4 @@
-package com.jmnetwork.e_jartas.view.manajemenTiang
+package com.jmnetwork.e_jartas.view.manajemenTiang.provider
 
 import android.os.Bundle
 import android.view.LayoutInflater

app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/EditProviderFragment.kt → app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/provider/EditProviderFragment.kt

@@ -1,4 +1,4 @@
-package com.jmnetwork.e_jartas.view.manajemenTiang
+package com.jmnetwork.e_jartas.view.manajemenTiang.provider
 
 import android.content.Intent
 import android.os.Bundle

app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/ListProviderFragment.kt → app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/provider/ListProviderFragment.kt

@@ -1,4 +1,4 @@
-package com.jmnetwork.e_jartas.view.manajemenTiang
+package com.jmnetwork.e_jartas.view.manajemenTiang.provider
 
 import android.content.Intent
 import android.os.Bundle

app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/ProviderActivity.kt → app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/provider/ProviderActivity.kt

@@ -1,4 +1,4 @@
-package com.jmnetwork.e_jartas.view.manajemenTiang
+package com.jmnetwork.e_jartas.view.manajemenTiang.provider
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity

app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/ProviderAdapter.kt → app/src/main/java/com/jmnetwork/e_jartas/view/manajemenTiang/provider/ProviderAdapter.kt

@@ -1,4 +1,4 @@
-package com.jmnetwork.e_jartas.view.manajemenTiang
+package com.jmnetwork.e_jartas.view.manajemenTiang.provider
 
 import android.annotation.SuppressLint
 import android.graphics.Color

app/src/main/java/com/jmnetwork/e_jartas/viewModel/ManajemenJalanViewModel.kt

@@ -57,7 +57,7 @@ class ManajemenJalanViewModel(application: Application) : ViewModel() {
     }
 
     private var requestData: RuasJalanRequest = RuasJalanRequest(
-        0, "", "", "", "", "", "", "", "", emptyList(), emptyList()
+        0, "", "", "", "", "", "", "", "", Location(), emptyList()
     )
 
     private fun fetchSpinnerData(spinnerType: String, spinnerLiveData: MutableLiveData<SpinnerResponse>) {
@@ -76,7 +76,7 @@ class ManajemenJalanViewModel(application: Application) : ViewModel() {
         status: String,
         tipe: String,
         fungsi: String,
-        latlong: List<Location>,
+        latlong: Location,
         additional: List<JSONObject>
     ): String {
         val fields = listOf(