-change to MVP pattern

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

@@ -2,9 +2,13 @@ package com.fusi24.rfid.data;
 
 import com.fusi24.rfid.data.api.RestService;
 import com.fusi24.rfid.data.entity.DataAuth;
+import com.fusi24.rfid.data.entity.DataDetail;
+import com.fusi24.rfid.data.entity.DataEntryPermit;
 import com.fusi24.rfid.data.entity.DataResultRfid;
 import com.fusi24.rfid.data.entity.DataUser;
 
+import java.util.List;
+
 import io.reactivex.Observable;
 
 public class DataManager {
@@ -19,6 +23,14 @@ public class DataManager {
         return restService.userLogin(dataAuth);
     }
 
+    public Observable<List<DataEntryPermit>> getEntryPermit() {
+        return restService.getEntryPermit();
+    }
+
+    public Observable<List<DataDetail>> getStatusScan(String code) {
+        return restService.getLookUp(code);
+    }
+
     public Observable<DataResultRfid> checkRfidCard(String numberRfid, Integer permitId, String rfidDeviceId, Integer checkTypeId, String longLat, String[] expand) {
         return restService.checkRfidCard(numberRfid, permitId, rfidDeviceId, checkTypeId, longLat, expand);
     }

app/src/main/java/com/fusi24/rfid/data/api/RestService.java

@@ -23,15 +23,15 @@ public interface RestService {
     @POST(Constant.BEATS_ENDPOINT + "/api/mobile/login/rfid")
     Observable<DataUser> userLogin(@Body DataAuth dataAuth);
 
+    @GET(Constant.SID2_ENDPOINT + "/api/entryPermit")
+    Observable<List<DataEntryPermit>> getEntryPermit();
+
     @GET(Constant.BEATS2_ENDPOINT + "/api/lookup")
-    Call<List<DataDetail>> getLookUp(@Query("filter[parent.code]") String code);
+    Observable<List<DataDetail>> getLookUp(@Query("filter[parent.code]") String code);
 
     @GET(Constant.BEATS2_ENDPOINT + "/api/location")
     Call<List<DataSite>> getDataSite(@Query("filter[type.id]") Integer typeId);
 
-    @GET(Constant.SID2_ENDPOINT + "/api/entryPermit")
-    Call<List<DataEntryPermit>> getEntryPermit();
-
     @GET(Constant.SID2_ENDPOINT + Constant.RFID_ENDPOINT + "/permit/check/{number_rfid}")
     Observable<DataResultRfid> checkRfidCard(@Path("number_rfid") String numberRfid,
                                              @Query("entryPermitId") Integer permitId,

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

@@ -24,29 +24,23 @@ import com.fusi24.rfid.SplashScreenActivity;
 import com.fusi24.rfid.adapter.StatusScanAdapter;
 import com.fusi24.rfid.base.BaseActivity;
 import com.fusi24.rfid.config.Constant;
-import com.fusi24.rfid.data.api.RestService;
-import com.fusi24.rfid.data.api.RestServiceFactory;
 import com.fusi24.rfid.data.entity.DataDetail;
 import com.fusi24.rfid.data.entity.DataEntryPermit;
 import com.fusi24.rfid.databinding.ActivityHomeBinding;
 import com.fusi24.rfid.ui.ScanActivity;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
 import timber.log.Timber;
 
-public class HomeActivity extends BaseActivity implements StatusScanAdapter.OnItemSelected {
+public class HomeActivity extends BaseActivity implements HomeView, StatusScanAdapter.OnItemSelected {
 
     private DataEntryPermit dataEntryPermit;
     private List<DataEntryPermit> entryPermitList;
     private List<DataDetail> statusScanList;
     private ActivityHomeBinding binding;
+    private HomePresenter presenter;
     private StatusScanAdapter adapter;
     private Integer idCheckType = null;
     private String idDevice, checkTypeName;
@@ -70,10 +64,11 @@ public class HomeActivity extends BaseActivity implements StatusScanAdapter.OnIt
             getSupportActionBar().setDisplayShowTitleEnabled(false);
         }
 
+        presenter = new HomePresenter(getManager(), getAndroidScheduler(), getProcessScheduler());
+        presenter.attachView(this);
+
         initView();
         loadingData();
-        getDataPermit();
-        getDataStatusScan();
     }
 
     @Override
@@ -129,6 +124,9 @@ public class HomeActivity extends BaseActivity implements StatusScanAdapter.OnIt
         //TODO STILL HARDCODE
         binding.tvGateName.setText("Suzuran");
         binding.tvSiteName.setText("BMO 1");
+
+        presenter.getEntryPermit();
+        presenter.getStatusScan();
     }
 
     private void initEvent(){
@@ -167,45 +165,23 @@ public class HomeActivity extends BaseActivity implements StatusScanAdapter.OnIt
 
     }
 
-    private void getDataPermit() {
-        RestService restService = RestServiceFactory.create(Constant.JWT_TOKEN);
-        Call<List<DataEntryPermit>> call = restService.getEntryPermit();
-        call.enqueue(new Callback<List<DataEntryPermit>>() {
-            @Override
-            public void onResponse(@NotNull Call<List<DataEntryPermit>> call, @NotNull Response<List<DataEntryPermit>> response) {
-                if (response.body() != null) {
-                    entryPermitList.addAll(response.body());
-                    setDataPermit();
-                }
-            }
-
-            @Override
-            public void onFailure(@NotNull Call<List<DataEntryPermit>> call, @NotNull Throwable t) {
-                Toast.makeText(HomeActivity.this, "Failed to get data permit", Toast.LENGTH_SHORT).show();
-                Timber.i("DEVELOPER : %s", t.getMessage());
-            }
-        });
+    @Override
+    public void onSelected(DataDetail detail) {
+        idCheckType = detail.getId();
+        checkTypeName = detail.getName();
     }
 
-    private void getDataStatusScan(){
-        RestService restService = RestServiceFactory.create(Constant.JWT_TOKEN);
-        Call<List<DataDetail>> call = restService.getLookUp("BeSCAN_CHECK_TYPE");
-        call.enqueue(new Callback<List<DataDetail>>() {
-            @Override
-            public void onResponse(@NotNull Call<List<DataDetail>> call, @NotNull Response<List<DataDetail>> response) {
-                if (response.body() != null){
-                    statusScanList.addAll(response.body());
-                    adapter.updateDetailList(statusScanList);
-                    adapter.notifyDataSetChanged();
-                }
-            }
+    @Override
+    public void showDataPermit(List<DataEntryPermit> dataEntryPermitList) {
+        entryPermitList.addAll(dataEntryPermitList);
+        setDataPermit();
+    }
 
-            @Override
-            public void onFailure(@NotNull Call<List<DataDetail>> call, @NotNull Throwable t) {
-                Toast.makeText(HomeActivity.this, "Failed to get data status Scan", Toast.LENGTH_SHORT).show();
-                Timber.i("DEVELOPER : %s", t.getMessage());
-            }
-        });
+    @Override
+    public void showDataStatusScan(List<DataDetail> dataStatusScanList) {
+        statusScanList.addAll(dataStatusScanList);
+        adapter.updateDetailList(statusScanList);
+        adapter.notifyDataSetChanged();
     }
 
     private void setDataPermit(){
@@ -214,14 +190,15 @@ public class HomeActivity extends BaseActivity implements StatusScanAdapter.OnIt
     }
 
     @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        binding = null;
+    public void showError(Throwable e) {
+        Toast.makeText(HomeActivity.this, "Failed get data", Toast.LENGTH_SHORT).show();
+        Timber.i("DEVELOPER : %s", e.getMessage());
     }
 
     @Override
-    public void onSelected(DataDetail detail) {
-        idCheckType = detail.getId();
-        checkTypeName = detail.getName();
+    protected void onDestroy() {
+        super.onDestroy();
+        presenter.detachView();
+        binding = null;
     }
 }

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

@@ -0,0 +1,50 @@
+package com.fusi24.rfid.ui.home;
+
+import com.fusi24.rfid.base.BasePresenter;
+import com.fusi24.rfid.data.DataManager;
+
+import io.reactivex.Scheduler;
+
+class HomePresenter extends BasePresenter<HomeView> {
+
+    private DataManager manager;
+    private Scheduler androidScheduler;
+    private Scheduler processScheduler;
+
+    HomePresenter(DataManager manager, Scheduler androidScheduler, Scheduler processScheduler) {
+        this.manager = manager;
+        this.androidScheduler = androidScheduler;
+        this.processScheduler = processScheduler;
+    }
+
+    void getEntryPermit() {
+        disposable.add(manager.getEntryPermit()
+                .observeOn(androidScheduler)
+                .subscribeOn(processScheduler)
+                .subscribe(result -> {
+                    if (isViewAttached()) {
+                        getView().showDataPermit(result);
+                    }
+                }, throwable -> {
+                    if (isViewAttached()) {
+                        getView().showError(throwable);
+                    }
+                }));
+    }
+
+    void getStatusScan() {
+        disposable.add(manager.getStatusScan("BeSCAN_CHECK_TYPE")
+                .observeOn(androidScheduler)
+                .subscribeOn(processScheduler)
+                .subscribe(result -> {
+                    if (isViewAttached()) {
+                        getView().showDataStatusScan(result);
+                    }
+                }, throwable -> {
+                    if (isViewAttached()) {
+                        getView().showError(throwable);
+                    }
+                }));
+    }
+
+}

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

@@ -0,0 +1,15 @@
+package com.fusi24.rfid.ui.home;
+
+import com.fusi24.rfid.base.BaseView;
+import com.fusi24.rfid.data.entity.DataDetail;
+import com.fusi24.rfid.data.entity.DataEntryPermit;
+import com.fusi24.rfid.data.entity.DataResultRfid;
+
+import java.util.List;
+
+public interface HomeView extends BaseView {
+
+    void showDataPermit(List<DataEntryPermit> dataEntryPermitList);
+    void showDataStatusScan(List<DataDetail> dataStatusScanList);
+
+}