-Fixing String and sorting site by id

app/src/main/java/com/fusi24/rfid/ui/home/HomeActivity.java

@@ -23,6 +23,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.annimon.stream.Stream;
 import com.fusi24.rfid.BuildConfig;
 import com.fusi24.rfid.R;
 import com.fusi24.rfid.SplashScreenActivity;
@@ -33,6 +34,7 @@ import com.fusi24.rfid.config.Constant;
 import com.fusi24.rfid.data.entity.DataDetail;
 import com.fusi24.rfid.data.entity.DataDevice;
 import com.fusi24.rfid.data.entity.DataEntryPermit;
+import com.fusi24.rfid.data.entity.DataSite;
 import com.fusi24.rfid.databinding.ActivityHomeBinding;
 import com.fusi24.rfid.ui.ScanActivity;
 
@@ -207,7 +209,7 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
     @Override
     public void showDataDevice(List<DataDevice> dataDevices) {
         binding.tvGateName.setText(dataDevices.get(0).getGate().getName());
-        siteAdapter.updateSiteList(dataDevices.get(0).getGate().getSites());
+        siteAdapter.updateSiteList(Stream.of(dataDevices.get(0).getGate().getSites()).sortBy(DataSite::getId).toList());
         siteAdapter.notifyDataSetChanged();
     }
 

app/src/main/res/layout/activity_scan_result.xml

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.scanresult.ScanResultActivity">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/tv_rfid_number"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        tools:text="@string/app_name" />
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/iv_profile_image"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_below="@+id/tv_rfid_number"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginTop="16dp"
-        android:src="@drawable/ic_profile_default"/>
-
-    <LinearLayout
-        android:id="@+id/ll_profile_bio"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:layout_below="@id/iv_profile_image"
-        android:orientation="vertical"
-        android:padding="12dp"
-        android:background="@drawable/bg_green">
-
-        <TextView
-            android:id="@+id/tv_profile_name"
-            style="@style/CommonText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            tools:text="HADYAN EL AUFAR" />
-
-        <TextView
-            android:id="@+id/tv_structural_position"
-            style="@style/CommonText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            tools:text="IT System Development Specialist" />
-
-        <TextView
-            android:id="@+id/tv_functional_position"
-            style="@style/CommonText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            tools:text="Engineer/Specialist" />
-
-        <TextView
-            android:id="@+id/tv_company_name"
-            style="@style/CommonText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            tools:text="PT. Berau Coal Energy" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/ll_profile_status"
-        android:layout_width="160dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/ll_profile_bio"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="16dp"
-        android:layout_marginStart="100dp"
-        android:layout_marginEnd="100dp"
-        android:background="@color/colorPrimary">
-
-        <TextView
-            android:id="@+id/tv_profile_status"
-            style="@style/CommonText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:gravity="center"
-            tools:text="PASSED" />
-
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_document_problem"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:layout_below="@+id/ll_profile_status"
-        tools:listitem="@layout/row_document" />
-
-        <Button
-            android:id="@+id/btn_home"
-            style="@style/ButtonCommon"
-            android:layout_width="120dp"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/rv_document_problem"
-            android:layout_alignParentStart="true"
-            android:layout_margin="16dp"
-            android:text="@string/label_home" />
-
-        <Button
-            android:id="@+id/btn_scan_again"
-            style="@style/ButtonCommon"
-            android:layout_width="120dp"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/rv_document_problem"
-            android:layout_alignParentEnd="true"
-            android:layout_margin="16dp"
-            android:text="@string/label_scan_other" />
-    </RelativeLayout>
-
-</ScrollView>

app/src/main/res/values/strings.xml

@@ -25,7 +25,7 @@
     <string name="error_security">You do not have read/write permission to the serialport.</string>
     <string name="error_unknown">The serial port can not be opened for an unknown reason.</string>
     <string name="error_scan_id">Mohon maaf sistem sedang sibuk</string>
-    <string name="error_only_security">Oops……… \n sepertinya anda bukan Security</string>
+    <string name="error_only_security">Oops……… \n anda gagal login</string>
     <string name="label_number_rfid">Nomor RFID Gun</string>
     <string name="label_number_rfid_card">Nomor RFID Card</string>
     <string name="label_employee_name">Nama Karyawan</string>