notice list and detail mock added, event handling

app/src/main/java/com/swifttech/remit/android/features/kyc/newCustomer/view/KYCV3Activity.java

@@ -211,7 +211,6 @@ public class KYCV3Activity extends BaseActivity implements KYCV3PresenterInterfa
         return customerDetailFragment;
     }
 
-
     @Override
     public void onKYCFormSubmittedSuccessfully() {
         Intent returnIntent = new Intent();

app/src/main/java/com/swifttech/remit/android/features/notice/gateway/NoticeGateway.java

@@ -2,9 +2,15 @@ package com.swifttech.remit.android.features.notice.gateway;
 
 import com.google.gson.JsonObject;
 import com.swifttech.remit.android.base.PrivilegedGateway;
+import com.swifttech.remit.android.features.notice.model.NoticeDTO;
+import com.swifttech.remit.android.features.notice.model.NoticeDetailDTO;
 import com.swifttech.remit.android.features.notice.presenter.NoticeGatewayInterface;
+import com.swifttech.remit.android.features.notice.view.NoticeActivity;
 import com.swifttech.remit.android.utils.https.HttpClientV2;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;
 
@@ -24,4 +30,67 @@ public class NoticeGateway extends PrivilegedGateway implements NoticeGatewayInt
         jsonObject.addProperty("rowId",noticeId);
         return HttpClientV2.getInstance().getNoticeDetail(auth,jsonObject);
     }
+
+    @Override
+    public List<NoticeDTO> mockNoticeList() {
+        List<NoticeDTO> noticeList=new ArrayList<>();
+
+        NoticeDTO noticeDTO0=new NoticeDTO();
+        noticeDTO0.setRowId("0");
+        noticeDTO0.setTitle("Title 1");
+        noticeDTO0.setCreateDate("2077/01/01");
+        noticeDTO0.setIsRead("0");
+        noticeDTO0.setType("1");
+        noticeDTO0.setExtra("12");
+        noticeList.add(noticeDTO0);
+
+        NoticeDTO noticeDTO1=new NoticeDTO();
+        noticeDTO1.setRowId("1");
+        noticeDTO1.setTitle("Title 2");
+        noticeDTO1.setCreateDate("2077/01/02");
+        noticeDTO1.setIsRead("1");
+        noticeDTO1.setType("0");
+        noticeList.add(noticeDTO1);
+
+
+        NoticeDTO noticeDTO2=new NoticeDTO();
+        noticeDTO2.setRowId("2");
+        noticeDTO2.setTitle("Title 3");
+        noticeDTO2.setCreateDate("2077/01/02");
+        noticeDTO2.setIsRead("0");
+        noticeDTO2.setType("1");
+        noticeDTO2.setExtra("13");
+        noticeList.add(noticeDTO2);
+
+
+        NoticeDTO noticeDTO3=new NoticeDTO();
+        noticeDTO3.setRowId("3");
+        noticeDTO3.setTitle("Title 4");
+        noticeDTO3.setCreateDate("2077/01/03");
+        noticeDTO3.setIsRead("1");
+        noticeDTO3.setType("1");
+        noticeDTO3.setExtra("14");
+        noticeList.add(noticeDTO3);
+
+
+        NoticeDTO noticeDTO4=new NoticeDTO();
+        noticeDTO4.setRowId("4");
+        noticeDTO4.setTitle("Title 5");
+        noticeDTO4.setCreateDate("2077/01/04");
+        noticeDTO4.setIsRead("1");
+        noticeDTO4.setType("0");
+        noticeList.add(noticeDTO4);
+
+        return noticeList;
+    }
+
+    @Override
+    public NoticeDetailDTO mockNoticeDetail() {
+        NoticeDetailDTO noticeDetailDTO=new NoticeDetailDTO();
+        noticeDetailDTO.setTitle("Title 1");
+        noticeDetailDTO.setBody("This is Detail body of Title 1");
+        noticeDetailDTO.setCreateDate("2077/01/01");
+        noticeDetailDTO.setImageURL("https://p18cdn4static.sharpschool.com/UserFiles/Servers/Server_414551/Image/News/District%20News/Title%201.jpg");
+        return noticeDetailDTO;
+    }
 }

app/src/main/java/com/swifttech/remit/android/features/notice/model/NoticeDTO.java

@@ -61,4 +61,20 @@ public class NoticeDTO {
     public void setIsRead(String isRead) {
         this.isRead = isRead;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
 }

app/src/main/java/com/swifttech/remit/android/features/notice/presenter/NoticeGatewayInterface.java

@@ -3,6 +3,10 @@ package com.swifttech.remit.android.features.notice.presenter;
 
 
 import com.swifttech.remit.android.base.PrivilegedGatewayInterface;
+import com.swifttech.remit.android.features.notice.model.NoticeDTO;
+import com.swifttech.remit.android.features.notice.model.NoticeDetailDTO;
+
+import java.util.List;
 
 import io.reactivex.Observable;
 import okhttp3.ResponseBody;
@@ -13,5 +17,9 @@ public interface NoticeGatewayInterface extends PrivilegedGatewayInterface {
 
         Observable<ResponseBody> getNoticeDetail(String auth, String noticeId);
 
+        List<NoticeDTO> mockNoticeList();
+        NoticeDetailDTO mockNoticeDetail();
+
+
 
 }

app/src/main/java/com/swifttech/remit/android/features/notice/presenter/NoticeViewModel.java

@@ -105,7 +105,9 @@ public class NoticeViewModel extends BaseViewModel implements NoticePresenterInt
 
         @Override
         public void onFailed(String message) {
-            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
+            view.lazyInitViews();
+            sortNoticeList(gateway.mockNoticeList());
+//            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, alertType -> view.exitView());
         }
 
         @Override
@@ -155,7 +157,9 @@ public class NoticeViewModel extends BaseViewModel implements NoticePresenterInt
 
         @Override
         public void onFailed(String message) {
-            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
+            noticeDetailLiveData.setValue(gateway.mockNoticeDetail());
+            view.showDetailScreen();
+//            view.showPopUpMessage(message, CustomAlertDialog.AlertType.FAILED, null);
         }
 
         @Override

app/src/main/java/com/swifttech/remit/android/features/notice/view/NoticeListingFragment.java

@@ -1,5 +1,6 @@
 package com.swifttech.remit.android.features.notice.view;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +16,7 @@ import com.swifttech.remit.android.common.customwidgets.LineDividerItemDecoratio
 import com.swifttech.remit.android.features.notice.adapter.NoticeListingRVAdapter;
 import com.swifttech.remit.android.features.notice.model.NoticeDTO;
 import com.swifttech.remit.android.features.notice.presenter.NoticeViewModel;
+import com.swifttech.remit.android.features.sendmoney.view.SendMoneyV2TransactionCompleteActivity;
 
 import java.util.List;
 
@@ -67,6 +69,15 @@ public class NoticeListingFragment extends BaseFragment implements  NoticeListin
 
     @Override
     public void onNoticeClicked(NoticeDTO itemModel) {
-        ViewModelProviders.of(getActivity()).get(NoticeViewModel.class).fetchNoticeDetail(itemModel);
+        if(itemModel.getType().equals("0")){
+            ViewModelProviders.of(getActivity()).get(NoticeViewModel.class).fetchNoticeDetail(itemModel);
+        }else if(itemModel.getType().equals("1")){
+            Intent startReceiptActivity = new Intent(getActivity(), SendMoneyV2TransactionCompleteActivity.class);
+            startReceiptActivity.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SEND_MONEY_TID_BUNDLE_KEY, itemModel.getExtra());
+            startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY, true);
+            startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SHOULD_UPDATE_BALANCE_UPON_RETURN, true);
+            startActivity(startReceiptActivity);
+        }
     }
 }

app/src/main/java/com/swifttech/remit/android/utils/https/ApiEndpoints.java

@@ -283,7 +283,7 @@ public interface ApiEndpoints {
     Observable<ResponseBody> getNoticeList(@Header("Authorization") String token,@Body() JsonObject jsonObject);
 
 
-    @GET(API_URL.GET_NOTICE_DETAIL)
+    @POST(API_URL.GET_NOTICE_DETAIL)
     @Headers("Content-Type: application/json")
     Observable<ResponseBody> getNoticeDetail(@Header("Authorization") String token,@Body() JsonObject jsonObject);