-Change layout after scan

app/build.gradle

@@ -44,6 +44,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "com.google.android.material:material:1.1.0"
 
     //GMS Play Service

app/src/main/AndroidManifest.xml

@@ -35,10 +35,12 @@
         </activity>
         <activity
             android:name=".ui.ScanActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
         <activity
             android:name=".ui.scanresult.ScanResultActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
         <activity
             android:name=".ui.login.ErrorLoginActivity"
             android:screenOrientation="portrait"

app/src/main/java/com/fusi24/rfid/BaseApplication.java

@@ -0,0 +1,62 @@
+package com.fusi24.rfid;
+
+import android.app.Application;
+import android.content.Context;
+
+import com.fusi24.rfid.data.entity.DataDetail;
+import com.fusi24.rfid.data.entity.DataEntryPermit;
+import com.fusi24.rfid.data.entity.DataSite;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class BaseApplication extends Application {
+
+    private List<DataSite> siteList;
+    private List<DataEntryPermit> entryPermitList;
+    private List<DataDetail> dataStatusScanList;
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+    }
+
+    public List<DataSite> getSiteList() {
+        if (siteList == null) {
+            siteList = new ArrayList<>();
+        }
+        return siteList;
+    }
+
+    public void setObjectDetailList(List<DataSite> siteList) {
+        this.siteList = siteList;
+    }
+
+    public List<DataEntryPermit> getEntryPermitList() {
+        if (entryPermitList == null) {
+            entryPermitList = new ArrayList<>();
+        }
+        return entryPermitList;
+    }
+
+    public void setEntryPermitList(List<DataEntryPermit> entryPermitList) {
+        this.entryPermitList = entryPermitList;
+    }
+
+    public List<DataDetail> getDataStatusScanList() {
+        if (dataStatusScanList == null) {
+            dataStatusScanList = new ArrayList<>();
+        }
+        return dataStatusScanList;
+    }
+
+    public void setDataStatusScanList(List<DataDetail> dataStatusScanList) {
+        this.dataStatusScanList = dataStatusScanList;
+    }
+
+}

app/src/main/java/com/fusi24/rfid/data/SessionManager.java

@@ -12,6 +12,7 @@ public class SessionManager {
     private static final String USER_EMAIL              = "user_email";
     private static final String USER_TELEPHONE          = "user_telephone";
     private static final String USER_RFID_NUMBER        = "user_rfid_number";
+    private static final String GATE                    = "gate";
 
     private final SharedPreferences preferences;
 
@@ -99,6 +100,16 @@ public class SessionManager {
         editor.apply();
     }
 
+    public String getGate() {
+        return preferences.getString(GATE, "");
+    }
+
+    public void setGate(String gate) {
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putString(GATE, gate);
+        editor.apply();
+    }
+
     public void clearData() {
         SharedPreferences.Editor editor = preferences.edit();
         editor.remove(IS_LOGIN);
@@ -109,6 +120,7 @@ public class SessionManager {
         editor.remove(USER_EMAIL);
         editor.remove(USER_TELEPHONE);
         editor.remove(USER_RFID_NUMBER);
+        editor.remove(GATE);
         editor.apply();
     }
 }

app/src/main/java/com/fusi24/rfid/ui/ScanActivity.java

@@ -5,9 +5,12 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 
+import com.fusi24.rfid.R;
 import com.fusi24.rfid.config.Constant;
 import com.fusi24.rfid.databinding.ActivityScanBinding;
 import com.fusi24.rfid.ui.scanresult.ScanResultActivity;
@@ -34,6 +37,19 @@ public class ScanActivity extends LFScanProcessing {
         binding = ActivityScanBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
         setContentView(view);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        TextView toolbarTitle = findViewById(R.id.toolbar_text);
+
+        if(toolbarTitle !=null && toolbar !=null) {
+            toolbarTitle.setText(getString(R.string.app_name));
+            setSupportActionBar(toolbar);
+        }
+
+        if (getSupportActionBar() != null){
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+        }
+
         initView();
         initSound();
     }
@@ -46,12 +62,26 @@ public class ScanActivity extends LFScanProcessing {
             checkTypeName = getIntent().getExtras().getString(CHECK_TYPE_NAME);
         }
 
+        setStatusScan();
         locationClient = LocationServices.getFusedLocationProviderClient(this);
         getLocation();
         binding.toggleScan.setOnCheckedChangeListener((buttonView, isChecked) -> statusScanner());
     }
 
-    public void statusScanner(){
+    private void setStatusScan(){
+        switch (Integer.parseInt(idCheckType)){
+            case 649 :
+                binding.tvStatusScan.setBackground(getDrawable(R.drawable.bg_green));
+                break;
+            case 650 :
+            default:
+                binding.tvStatusScan.setBackground(getDrawable(R.drawable.bg_blue));
+                break;
+        }
+        binding.tvStatusScan.setText(checkTypeName);
+    }
+
+    private void statusScanner(){
         if(binding.toggleScan.isChecked()){
             onStart();
         } else

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

@@ -107,6 +107,7 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
     }
 
     private void initView(){
+        binding.refresh.setRefreshing(false);
         ActivityCompat.requestPermissions(this, Constant.PERMISSIONS_RFID, 1000);
 
         entryPermitList = new ArrayList<>();
@@ -169,6 +170,8 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
             startActivity(intent);
         });
 
+        binding.refresh.setOnRefreshListener(this::loadingData);
+
     }
 
     @Override
@@ -179,12 +182,15 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
 
     @Override
     public void showDataPermit(List<DataEntryPermit> dataEntryPermitList) {
+        entryPermitList.clear();
         entryPermitList.addAll(dataEntryPermitList);
         setDataPermit();
     }
 
     @Override
     public void showDataStatusScan(List<DataDetail> dataStatusScanList) {
+        binding.refresh.setRefreshing(false);
+        statusScanList.clear();
         statusScanList.addAll(dataStatusScanList);
         scanAdapter.updateDetailList(statusScanList);
         scanAdapter.notifyDataSetChanged();
@@ -204,7 +210,8 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
 
     @Override
     public void showError(Throwable e) {
-        Toast.makeText(HomeActivity.this, "Failed get data", Toast.LENGTH_SHORT).show();
+        binding.refresh.setRefreshing(false);
+        Toast.makeText(HomeActivity.this, "Failed get data, try refresh again", Toast.LENGTH_SHORT).show();
         Timber.i("DEVELOPER : %s", e.getMessage());
     }
 

app/src/main/java/com/fusi24/rfid/ui/scanresult/ScanResultActivity.java

@@ -4,8 +4,10 @@ import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -17,7 +19,7 @@ import com.fusi24.rfid.base.BaseActivity;
 import com.fusi24.rfid.config.Constant;
 import com.fusi24.rfid.data.entity.DataProblems;
 import com.fusi24.rfid.data.entity.DataResultRfid;
-import com.fusi24.rfid.databinding.ActivityScanResultBinding;
+import com.fusi24.rfid.databinding.ActivityScanResultNewBinding;
 import com.fusi24.rfid.ui.home.HomeActivity;
 
 import java.util.ArrayList;
@@ -37,15 +39,27 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     private ScanResultAdapter adapter;
     private List<DataProblems> problemsList;
     private String dataUrl, numberRfid, numberRfidTemp, idPermit, idDevice, idCheckType, checkTypeName, longLat;
-    private ActivityScanResultBinding binding;
+    private ActivityScanResultNewBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        binding = ActivityScanResultBinding.inflate(getLayoutInflater());
+        binding = ActivityScanResultNewBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
         setContentView(view);
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        TextView toolbarTitle = findViewById(R.id.toolbar_text);
+
+        if(toolbarTitle !=null && toolbar !=null) {
+            toolbarTitle.setText(getString(R.string.app_name));
+            setSupportActionBar(toolbar);
+        }
+
+        if (getSupportActionBar() != null){
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+        }
+
         presenter = new ScanResultPresenter(
                 getManager(), getAndroidScheduler(), getProcessScheduler());
         presenter.attachView(this);
@@ -74,12 +88,13 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
 
         initView();
         loadingdata();
+        setStatusScan();
         initEvent();
     }
 
     @SuppressLint("SetTextI18n")
     private void initView() {
-        binding.tvRfidNumber.setText("Nomor RFID : " + numberRfid);
+        binding.tvRfidNumber.setText(numberRfid);
 
         problemsList = new ArrayList<>();
         adapter = new ScanResultAdapter(this);
@@ -107,6 +122,19 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
         binding.btnScanAgain.setOnClickListener(v -> finish());
     }
 
+    private void setStatusScan(){
+        switch (Integer.parseInt(idCheckType)){
+            case 649 :
+                binding.tvStatusScan.setBackground(getDrawable(R.drawable.bg_green));
+                break;
+            case 650 :
+            default:
+                binding.tvStatusScan.setBackground(getDrawable(R.drawable.bg_blue));
+                break;
+        }
+        binding.tvStatusScan.setText(checkTypeName);
+    }
+
     @Override
     public void showDataRfid(DataResultRfid dataResultRfid) {
 

app/src/main/res/drawable/bg_blue.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="@color/colorBlueDark" />
+    <corners android:radius="15dp"/>
+</shape>

app/src/main/res/drawable/bg_blue_no_rad.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="@color/colorBlueDark" />
+</shape>

app/src/main/res/drawable/bg_red.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <solid android:color="@color/colorRedDark" />
+    <corners android:radius="15dp"/>
+</shape>

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

@@ -8,239 +8,253 @@
 
     <include layout="@layout/default_toolbar"/>
 
-    <RelativeLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <LinearLayout
-            android:id="@+id/ll_rfid_user"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="24dp"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/refresh"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                android:layout_width="230dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="2dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/label_number_rfid" />
-
-            <TextView
-                android:id="@+id/tv_rfid_gun_id"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_weight="1"
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                tools:text="RFID-AN70-N650" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_rfid_card"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_rfid_user"
-            android:orientation="horizontal">
-            <TextView
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                android:layout_width="230dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="2dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/label_number_rfid_card" />
-
-            <TextView
-                android:id="@+id/tv_rfid_card_number"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginStart="12dp"
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                tools:text="0009449244" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_employee"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_rfid_card"
-            android:orientation="horizontal">
-            <TextView
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                android:layout_width="230dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="2dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/label_employee_name" />
-
-            <TextView
-                android:id="@+id/tv_employee_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginStart="12dp"
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                tools:text="Deddy Corbuzier" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_gate"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_employee"
-            android:orientation="horizontal">
-            <TextView
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                android:layout_width="230dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="2dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/label_gate" />
-
-            <TextView
-                android:id="@+id/tv_gate_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginStart="12dp"
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                tools:text="Crown Palace" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_site"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_gate"
-            android:orientation="horizontal">
-            <TextView
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                android:layout_width="230dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="2dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/label_site" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_site"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginStart="12dp"
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                tools:listitem="@layout/row_site"
-                tools:itemCount="3"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_permit"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_site"
-            android:orientation="horizontal">
-            <TextView
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="2dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/label_entry_ermit" />
-
-            <androidx.appcompat.widget.AppCompatSpinner
-                android:id="@+id/spinner_permit"
-                android:layout_width="165dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                style="@style/spinner_style" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_status_scan"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_permit"
-            android:orientation="horizontal">
-            <TextView
-                android:textSize="14sp"
-                android:textColor="@color/colorBlack"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="2dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:text="@string/label_scan_status" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_status_scan"
-                android:layout_width="175dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                tools:listitem="@layout/row_status_scan"
-                tools:itemCount="2"/>
-
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/btn_scan"
-            style="@style/ButtonCommon"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_status_scan"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentEnd="true"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginEnd="16dp"
-            android:text="@string/label_btn_scan" />
-
-    </RelativeLayout>
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:id="@+id/ll_rfid_user"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="24dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        android:layout_width="230dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="2dp"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="2dp"
+                        android:layout_weight="1"
+                        android:textStyle="bold"
+                        android:text="@string/label_number_rfid" />
+
+                    <TextView
+                        android:id="@+id/tv_rfid_gun_id"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="12dp"
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        tools:text="RFID-AN70-N650" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_rfid_card"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/ll_rfid_user"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        android:layout_width="230dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="2dp"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="2dp"
+                        android:layout_weight="1"
+                        android:textStyle="bold"
+                        android:text="@string/label_number_rfid_card" />
+
+                    <TextView
+                        android:id="@+id/tv_rfid_card_number"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="12dp"
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        tools:text="0009449244" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_employee"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/ll_rfid_card"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        android:layout_width="230dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="2dp"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="2dp"
+                        android:layout_weight="1"
+                        android:textStyle="bold"
+                        android:text="@string/label_employee_name" />
+
+                    <TextView
+                        android:id="@+id/tv_employee_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="12dp"
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        tools:text="Deddy Corbuzier" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_gate"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/ll_employee"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        android:layout_width="230dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="2dp"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="2dp"
+                        android:layout_weight="1"
+                        android:textStyle="bold"
+                        android:text="@string/label_gate" />
+
+                    <TextView
+                        android:id="@+id/tv_gate_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="12dp"
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        android:text="@string/label_strip"
+                        tools:text="Crown Palace" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_site"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/ll_gate"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        android:layout_width="230dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="2dp"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="2dp"
+                        android:layout_weight="1"
+                        android:textStyle="bold"
+                        android:text="@string/label_site" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_site"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="12dp"
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        tools:listitem="@layout/row_site"
+                        tools:itemCount="3"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_permit"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/ll_site"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="2dp"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="2dp"
+                        android:layout_weight="1"
+                        android:textStyle="bold"
+                        android:text="@string/label_entry_ermit" />
+
+                    <androidx.appcompat.widget.AppCompatSpinner
+                        android:id="@+id/spinner_permit"
+                        android:layout_width="165dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginEnd="12dp"
+                        style="@style/spinner_style" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_status_scan"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/ll_permit"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:textSize="14sp"
+                        android:textColor="@color/colorBlack"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="2dp"
+                        android:layout_marginLeft="2dp"
+                        android:layout_marginRight="2dp"
+                        android:layout_weight="1"
+                        android:textStyle="bold"
+                        android:text="@string/label_scan_status" />
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_status_scan"
+                        android:layout_width="175dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginEnd="12dp"
+                        tools:listitem="@layout/row_status_scan"
+                        tools:itemCount="2"/>
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/btn_scan"
+                    style="@style/ButtonCommon"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/ll_status_scan"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="24dp"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/label_btn_scan" />
+
+            </RelativeLayout>
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </LinearLayout>

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

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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=".MainActivity">
-
-    <ImageView
-        android:id="@+id/iv_logo_hse"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="0dp"
-        android:src="@drawable/logo_hse_autimation" />
-
-    <TextView
-        android:id="@+id/tv_title_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/iv_logo_hse"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="16dp"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:gravity="center"
-        style="@style/HeaderText"
-        android:text="@string/label_header_app"/>
-
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/spinner_site"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/tv_title_label"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="0dp"
-        style="@style/spinner_style" />
-
-    <androidx.appcompat.widget.AppCompatSpinner
-        android:id="@+id/spinner_permit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/spinner_site"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="0dp"
-        style="@style/spinner_style" />
-
-    <Button
-        android:id="@+id/btn_scan"
-        style="@style/ButtonCommon"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/spinner_permit"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="16dp"
-        android:text="@string/label_btn_scan" />
-
-    <TextView
-        android:id="@+id/tv_company_label"
-        style="@style/BottomText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:text="@string/label_company_app" />
-
-    <TextView
-        android:id="@+id/tv_bebas"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        tools:text="bebas"/>
-
-</RelativeLayout>

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

@@ -1,37 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
+    android:orientation="vertical"
     tools:context=".ui.ScanActivity">
 
-    <androidx.appcompat.widget.AppCompatToggleButton
-        android:id="@+id/toggle_scan"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/ToggleCommon"
-        android:checked="true"
-        android:textOff="@string/label_scanner_off"
-        android:textOn="@string/label_scanner_on"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"/>
+    <include layout="@layout/default_toolbar"/>
 
-    <TextView
-        android:id="@+id/tv_title_label"
-        style="@style/BodyText"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="0dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginBottom="0dp"
-        android:gravity="center"
-        android:text="@string/label_info_scan" />
+        android:layout_height="wrap_content">
 
-</RelativeLayout>
+        <TextView
+            android:id="@+id/tv_status_scan"
+            android:layout_width="160dp"
+            android:layout_height="35dp"
+            android:gravity="center"
+            style="@style/TextAppearance.AppCompat.Body2"
+            android:textColor="@color/colorWhite"
+            android:background="@drawable/bg_blue"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            tools:text="Check Out Karyawan"/>
+
+        <TextView
+            android:id="@+id/tv_title_label"
+            style="@style/BodyText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="0dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginBottom="0dp"
+            android:gravity="center"
+            android:text="@string/label_info_scan" />
+
+        <androidx.appcompat.widget.AppCompatToggleButton
+            android:id="@+id/toggle_scan"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/ToggleCommon"
+            android:checked="true"
+            android:textOff="@string/label_scanner_off"
+            android:textOn="@string/label_scanner_on"
+            android:layout_alignParentBottom="true"
+            android:layout_margin="16dp" />
+
+    </RelativeLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    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"
+    android:orientation="vertical"
+    tools:context=".ui.scanresult.ScanResultActivity">
+
+    <include layout="@layout/default_toolbar"/>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv_status_scan"
+                style="@style/CommonText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
+                android:gravity="center"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:background="@drawable/bg_blue_no_rad"
+                tools:text="Check Out Karyawan" />
+
+            <LinearLayout
+                android:id="@+id/ll_profile_bio"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv_status_scan"
+                android:layout_margin="16dp"
+                android:orientation="vertical"
+                android:padding="12dp"
+                android:background="@drawable/bg_green">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    tools:ignore="UselessParent">
+
+                    <ImageView
+                        android:id="@+id/iv_profile_image"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginEnd="0dp"
+                        android:src="@drawable/ic_profile_default"
+                        android:contentDescription="@string/cd_image" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/tv_rfid_number"
+                            style="@style/CommonText"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:gravity="start"
+                            tools:text="0009449244" />
+
+                        <TextView
+                            android:id="@+id/tv_profile_name"
+                            style="@style/CommonText"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:gravity="start"
+                            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:layout_marginStart="8dp"
+                            android:gravity="start"
+                            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:layout_marginStart="8dp"
+                            android:gravity="start"
+                            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:layout_marginStart="8dp"
+                            android:gravity="start"
+                            tools:text="PT. Berau Coal Energy" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </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"
+                tools:itemCount="2"/>
+
+            <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>
+
+</LinearLayout>

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

@@ -37,7 +37,7 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:fontFamily="@font/shadeerah"
-            android:layout_gravity="center"/>
+            android:layout_gravity="start"/>
 
     </androidx.appcompat.widget.Toolbar>
 

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

@@ -4,5 +4,7 @@
     android:id="@+id/tv_common"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:textColor="@color/colorBlack"
     android:orientation="vertical"
+    android:text="@string/label_strip"
     tools:text="BMO 1" />

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

@@ -6,6 +6,7 @@
 
     <color name="colorRedDark">#C51616</color>
     <color name="colorGreenDark">#19771D</color>
+    <color name="colorBlueDark">#195677</color>
 
     <color name="backgroundInner">#FFFFFF</color>
     <color name="backgroundOuter">#F5F5F5</color>

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

@@ -33,5 +33,6 @@
     <string name="label_site">Site</string>
     <string name="label_entry_ermit">Izin Masuk</string>
     <string name="label_scan_status">Status Scan</string>
+    <string name="label_strip">-</string>
 
 </resources>