Merge pull request 'Mengubah daftar respon dari map ke jsarray' (#3) from pengembangan into main

Reviewed-on: #3

android/src/main/java/BluclasPlugin.kt

@@ -11,6 +11,7 @@ import app.tauri.annotation.InvokeArg
 import app.tauri.annotation.Permission
 import app.tauri.annotation.TauriPlugin
 import app.tauri.plugin.Invoke
+import app.tauri.plugin.JSArray
 import app.tauri.plugin.JSObject
 import app.tauri.plugin.Plugin
 import java.io.OutputStream
@@ -45,17 +46,17 @@ class BluclasPlugin(private val activity: Activity) : Plugin(activity) {
             return
         }
 
-        println("KOTLIN")
+        val daftarRes = JSArray()
-        val daftar_res = adapter.bondedDevices.map { i ->
+        adapter.bondedDevices.map { i ->
-            mapOf(
+            val res = JSObject()
-                "nama" to (i.name ?: "Unknown"),
+            res.put("nama", i.name ?: "Unknown")
-                "alamat" to i.address
+            res.put("alamat", i.address)
-            )
+            daftarRes.put(res)
         }
 
-        val objek_daftar_res = JSObject()
+        val objekDaftarRes = JSObject()
-        objek_daftar_res.put("data", daftar_res)
+        objekDaftarRes.put("data", daftarRes)
-        invoke.resolve(objek_daftar_res)
+        invoke.resolve(objekDaftarRes)
     }
 
     fun menghubungkanKoneksi(invoke: Invoke, alamat: String) {

src/commands.rs

@@ -7,14 +7,14 @@ use crate::Result;
 #[command]
 pub(crate) async fn daftar_perangkat<R: Runtime>(
     app: AppHandle<R>,
-) -> Result<Vec<SBluetoothClassicResponPerangkat>> {
+) -> Result<SBlueclasClassicResponDaftarPerangkat> {
     return app.bluclas().daftar_perangkat();
 }
 
 #[command]
 pub(crate) async fn kirim<R: Runtime>(
     app: AppHandle<R>,
-    payload: SBluetoothClassicMuatanKirim,
+    payload: SBlueclasClassicMuatanKirim,
 ) -> Result<()> {
     return app.bluclas().kirim(payload);
 }

src/desktop.rs

@@ -14,16 +14,11 @@ pub fn init<R: Runtime, C: DeserializeOwned>(
 pub struct Bluclas<R: Runtime>(AppHandle<R>);
 
 impl<R: Runtime> Bluclas<R> {
-    pub fn daftar_perangkat(&self) -> crate::Result<Vec<SBluetoothClassicResponPerangkat>> {
+    pub fn daftar_perangkat(&self) -> crate::Result<SBlueclasClassicResponDaftarPerangkat> {
-        let daftar_res: Vec<SBluetoothClassicResponPerangkat> =
+        return Ok(SBlueclasClassicResponDaftarPerangkat { data: vec![] });
-            vec![SBluetoothClassicResponPerangkat {
-                nama: String::new(),
-                alamat: String::new(),
-            }];
-        return Ok(daftar_res);
     }
 
-    pub fn kirim(&self, _: SBluetoothClassicMuatanKirim) -> crate::Result<()> {
+    pub fn kirim(&self, _: SBlueclasClassicMuatanKirim) -> crate::Result<()> {
         return Ok(());
     }
 }

src/mobile.rs

@@ -25,14 +25,14 @@ pub fn init<R: Runtime, C: DeserializeOwned>(
 pub struct Bluclas<R: Runtime>(PluginHandle<R>);
 
 impl<R: Runtime> Bluclas<R> {
-    pub fn daftar_perangkat(&self) -> crate::Result<Vec<SBluetoothClassicResponPerangkat>> {
+    pub fn daftar_perangkat(&self) -> crate::Result<SBlueclasClassicResponDaftarPerangkat> {
         return self
             .0
             .run_mobile_plugin("daftarPerangkat", ())
             .map_err(Into::into);
     }
 
-    pub fn kirim(&self, payload: SBluetoothClassicMuatanKirim) -> crate::Result<()> {
+    pub fn kirim(&self, payload: SBlueclasClassicMuatanKirim) -> crate::Result<()> {
         return self
             .0
             .run_mobile_plugin("kirim", payload)

src/models.rs

@@ -2,14 +2,20 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SBluetoothClassicResponPerangkat {
+pub struct SDaftarPerangkatBlueclasClassicResponDaftarPerangkat {
     pub nama: String,
     pub alamat: String,
 }
 
+#[derive(Debug, Clone, Default, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SBlueclasClassicResponDaftarPerangkat {
+    pub data: Vec<SDaftarPerangkatBlueclasClassicResponDaftarPerangkat>,
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SBluetoothClassicMuatanKirim {
+pub struct SBlueclasClassicMuatanKirim {
     pub alamat: String,
     pub data: Vec<u8>,
 }