From ab7b90ca81a003ce8a53e0091068663819e6b90f Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Tue, 26 Feb 2019 09:23:16 +0900
Subject: [PATCH] Contact fixes

---
 .../adapter/AgentListV2RvAdapter.java         |  26 +++-
 .../agentsV2/gateway/AgentListV2Gateway.java  |  18 +--
 .../agentsV2/model/AgentInfoModel.java        |   8 +-
 .../view/AgentListV2ItemViewHolder.java       |  43 ++++--
 .../res/layout/activity_agent_list_v2.xml     |   1 +
 .../main/res/layout/agent_info_item_view.xml  | 130 +++++++++++-------
 6 files changed, 145 insertions(+), 81 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/adapter/AgentListV2RvAdapter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/adapter/AgentListV2RvAdapter.java
index 58496832..e9ec6353 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/adapter/AgentListV2RvAdapter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/adapter/AgentListV2RvAdapter.java
@@ -35,12 +35,32 @@ public class AgentListV2RvAdapter extends RecyclerView.Adapter<AgentListV2ItemVi
         holder.setHeader(agentInfoModel.getTitle());
         holder.setLabel1(agentInfoModel.getAddress());
         holder.setLabel2(agentInfoModel.getLanguage());
-        holder.setContact(agentInfoModel.getContactNumber());
-        holder.getAgent_info_txt_label_contact().setOnClickListener(new View.OnClickListener() {
+        String contact1=null;
+        String contact2 =null;
+        try {
+            contact1 = agentInfoModel.getContactNumber().get(0);
+            contact2 = agentInfoModel.getContactNumber().get(1);
+
+        }
+        catch (IndexOutOfBoundsException e)
+        {
+
+        }
+
+        holder.setContact1(contact1);
+        holder.setContact2(contact2);
+        holder.getAgent_info_txt_label_contact1().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(agentV2ActionListener!=null)
+                    agentV2ActionListener.onContactViewClicked(data.get(holder.getAdapterPosition()).getContactNumber().get(0));
+            }
+        });
+        holder.getAgent_info_txt_label_contact2().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if(agentV2ActionListener!=null)
-                    agentV2ActionListener.onContactViewClicked(data.get(holder.getAdapterPosition()).getContactNumber());
+                    agentV2ActionListener.onContactViewClicked(data.get(holder.getAdapterPosition()).getContactNumber().get(1));
             }
         });
     }
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/gateway/AgentListV2Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/gateway/AgentListV2Gateway.java
index 97af4209..b1ce5099 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/gateway/AgentListV2Gateway.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/gateway/AgentListV2Gateway.java
@@ -31,43 +31,43 @@ public class AgentListV2Gateway extends PrivilegedGateway implements AgentListV2
             "    {\n" +
             "      \"title\": \"Dongdaemun CIS Branch\",\n" +
             "      \"address\": \"2nd floor, 281, Changgyeonggunag-ro Jongno-gu, Seoul\\n(Upper floor of Dongdaemun Mart)\",\n" +
-            "      \"contactNumber\": \"02 2138 6429\\n010-3015-6864\",\n" +
+            "      \"contactNumber\": [\"02 2138 6429\",\"010-3015-6864\"],\n" +
             "      \"language\": \"서울 중구 을지로 42길 5 2층 \"\n" +
             "    },\n" +
             "    {\n" +
             "      \"title\": \"Dongdaemun Branch\",\n" +
             "      \"address\": \"315, Jong-ro Jongno-gu, Seoul \\n(Dongdaemun Station - Exit 3)\",\n" +
-            "      \"contactNumber\": \"02 763 5559\",\n" +
+            "      \"contactNumber\": [\"02 763 5559\"],\n" +
             "      \"language\": \"서울시 종로구 종로 315 \"\n" +
             "    },\n" +
             "    {\n" +
             "      \"title\": \"Ansan Branch\",\n" +
-            "      \"address\": \"2nd floor,  455,  Jungang-daero, Danwon-gu, Ansan -si, Gyeonggi-do \\n(Entrance of Asian Street)\",\n" +
-            "      \"contactNumber\": \"0313626740\",\n" +
+            "      \"address\": \"2nd floor, 455, Jungang-daero, Danwon-gu, Ansan -si, Gyeonggi-do \\n(Entrance of Asian Street)\",\n" +
+            "      \"contactNumber\": [\"0313626740\"],\n" +
             "      \"language\": \"경기도 안산시 단원구 중앙대로 455 2층\"\n" +
             "    },\n" +
             "    {\n" +
             "      \"title\": \"Hwaseong Branch\",\n" +
             "      \"address\": \"1101-1, 3.1 Manse-ro Hyangnam-eup, Hwaseong-si, Gyeonggi-do \\n(Baran Market Place)\",\n" +
-            "      \"contactNumber\": \"031 354 0450\",\n" +
+            "      \"contactNumber\": [\"031 354 0450\"],\n" +
             "      \"language\": \"경기도 화성시 향남읍 3.1만세로 1101-1\"\n" +
             "    },\n" +
             "    {\n" +
             "      \"title\": \"Gimhae Branch\",\n" +
             "      \"address\": \"84, Garak-ro, Gimhae-si, Gyeongsangnam-do,\\n(Opposite to Top Mart)\",\n" +
-            "      \"contactNumber\": \"055 329 5559\",\n" +
+            "      \"contactNumber\": [\"055 329 5559\"],\n" +
             "      \"language\": \"경상남도 김해시 가락로 84 \"\n" +
             "    },\n" +
             "    {\n" +
             "      \"title\": \"Songu-ri Branch\",\n" +
-            "      \"address\": \"91, Solmoru-ro, Soheul-eup, Pocheon-si, Gyeonggi-do,  Korea\\nNext to Nonghyub Bank) \",\n" +
-            "      \"contactNumber\": \"031 541 1856\",\n" +
+            "      \"address\": \"91, Solmoru-ro, Soheul-eup, Pocheon-si, Gyeonggi-do, Korea\\nNext to Nonghyub Bank) \",\n" +
+            "      \"contactNumber\": [\"031 541 1856\"],\n" +
             "      \"language\": \"경기도 포천시 소흘읍 솔모루로 91\"\n" +
             "    },\n" +
             "    {\n" +
             "      \"title\": \"Hyehwa Branch\",\n" +
             "      \"address\": \"281, Changgyeonggung-ro, Jongno-gu, Seoul Hyehwa Rotary\\n(Right across from Catholic Church) \",\n" +
-            "      \"contactNumber\": \"02 2138 6429\\n010 2970 6864 \",\n" +
+            "      \"contactNumber\": [\"02 2138 6429\",\"010 2970 6864\"],\n" +
             "      \"language\": \"서울특별시 종로구 창경궁로 281 \"\n" +
             "    }\n" +
             "  ]\n" +
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/model/AgentInfoModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/model/AgentInfoModel.java
index e3980e83..ec65cfca 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/model/AgentInfoModel.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/model/AgentInfoModel.java
@@ -3,6 +3,8 @@ package com.gmeremit.online.gmeremittance_native.agentsV2.model;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
+import java.util.List;
+
 public class AgentInfoModel {
 
     @SerializedName("title")
@@ -15,7 +17,7 @@ public class AgentInfoModel {
 
     @SerializedName("contactNumber")
     @Expose
-    private String contactNumber;
+    private List<String> contactNumber;
 
     @SerializedName("language")
     @Expose
@@ -37,11 +39,11 @@ public class AgentInfoModel {
         this.address = address;
     }
 
-    public String getContactNumber() {
+    public List<String> getContactNumber() {
         return contactNumber;
     }
 
-    public void setContactNumber(String contactNumber) {
+    public void setContactNumber(List<String> contactNumber) {
         this.contactNumber = contactNumber;
     }
 
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/view/AgentListV2ItemViewHolder.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/view/AgentListV2ItemViewHolder.java
index bd3b4031..baca6420 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/view/AgentListV2ItemViewHolder.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/view/AgentListV2ItemViewHolder.java
@@ -23,19 +23,18 @@ public class AgentListV2ItemViewHolder extends RecyclerView.ViewHolder {
     TextView agent_info_txt_label_2;
 
 
-    @BindView(R.id.agent_info_txt_label_contact)
-    TextView agent_info_txt_label_contact;
+    @BindView(R.id.agent_info_txt_label_contact1)
+    TextView agent_info_txt_label_contact1;
 
 
-    @BindView(R.id.agent_info_txt_label_map)
-    TextView agent_info_txt_label_map;
+    @BindView(R.id.agent_info_txt_label_contact2)
+    TextView agent_info_txt_label_contact2;
 
-    @BindView(R.id.agent_info_txt_label_contact_container)
-    View agent_info_txt_label_contact_container;
+
+//    @BindView(R.id.agent_info_txt_label_map)
+//    TextView agent_info_txt_label_map;
 
 
-    @BindView(R.id.agent_info_txt_label_map_container)
-    View agent_info_txt_label_map_container;
 
 
     public AgentListV2ItemViewHolder(View itemView) {
@@ -60,16 +59,30 @@ public class AgentListV2ItemViewHolder extends RecyclerView.ViewHolder {
         else
             this.agent_info_txt_label_2.setText(label2);
     }
-    public void setContact (String contact)
+    public void setContact1 (String contact)
     {
-        this.agent_info_txt_label_contact.setText(contact);
+        if(contact==null||contact.length()<1)
+        {
+            this.agent_info_txt_label_contact1.setVisibility(View.GONE);
+            return;
+        }
+        this.agent_info_txt_label_contact1.setText(contact);
     }
-
-    public View getAgent_info_txt_label_contact() {
-        return agent_info_txt_label_contact_container;
+    public void setContact2 (String contact)
+    {
+        if(contact==null||contact.length()<1)
+        {
+            this.agent_info_txt_label_contact2.setVisibility(View.GONE);
+            return;
+        }
+        this.agent_info_txt_label_contact2.setText(contact);
     }
 
-    public View getAgent_info_txt_label_map() {
-        return agent_info_txt_label_map_container;
+    public View getAgent_info_txt_label_contact1() {
+        return agent_info_txt_label_contact1;
     }
+    public View getAgent_info_txt_label_contact2() {
+        return agent_info_txt_label_contact2;
+    }
+
 }
diff --git a/app/src/main/res/layout/activity_agent_list_v2.xml b/app/src/main/res/layout/activity_agent_list_v2.xml
index af831248..005fd340 100644
--- a/app/src/main/res/layout/activity_agent_list_v2.xml
+++ b/app/src/main/res/layout/activity_agent_list_v2.xml
@@ -9,6 +9,7 @@
     android:orientation="vertical">
     <include layout="@layout/layout_sendmoney_toolbar"/>
 <android.support.v7.widget.RecyclerView
+    android:clipToPadding="false"
     android:paddingTop="5dp"
     android:background="@color/background_gray"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/agent_info_item_view.xml b/app/src/main/res/layout/agent_info_item_view.xml
index a6f128e0..2d29aac8 100644
--- a/app/src/main/res/layout/agent_info_item_view.xml
+++ b/app/src/main/res/layout/agent_info_item_view.xml
@@ -56,62 +56,90 @@
         android:layout_marginTop="6dp"
         android:background="@color/gray" />
 
-    <LinearLayout
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:id="@+id/agent_info_txt_label_contact1"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="1">
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:drawableLeft="@drawable/ic_support_phone"
+        android:drawablePadding="8dp"
+        android:gravity="start"
+        android:paddingBottom="8dp"
+        android:paddingTop="8dp"
+        android:text=""
+        android:textColor="@color/darkgray"
+        android:textSize="14sp" />
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+        android:id="@+id/agent_info_txt_label_contact2"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:drawableLeft="@drawable/ic_support_phone"
+        android:drawablePadding="8dp"
+        android:gravity="start"
+        android:paddingBottom="8dp"
+        android:paddingTop="8dp"
+        android:text=""
+        android:textColor="@color/darkgray"
+        android:textSize="14sp" />
+
+    <!--<LinearLayout-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:orientation="horizontal"-->
+        <!--android:weightSum="1">-->
 
-        <FrameLayout
-            android:id="@+id/agent_info_txt_label_contact_container"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
+        <!--<FrameLayout-->
+            <!--android:id="@+id/agent_info_txt_label_contact_container"-->
+            <!--android:layout_width="0dp"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_weight="1">-->
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/agent_info_txt_label_contact"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_horizontal"
-                android:drawableLeft="@drawable/ic_support_phone"
-                android:drawablePadding="8dp"
-                android:gravity="start"
-                android:paddingBottom="8dp"
-                android:paddingTop="8dp"
-                android:text="091283232"
-                android:textColor="@color/darkgray"
-                android:textSize="14sp" />
-        </FrameLayout>
+            <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:id="@+id/agent_info_txt_label_contact"-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="match_parent"-->
+                <!--android:layout_gravity="center_horizontal"-->
+                <!--android:drawableLeft="@drawable/ic_support_phone"-->
+                <!--android:drawablePadding="8dp"-->
+                <!--android:gravity="start"-->
+                <!--android:paddingBottom="8dp"-->
+                <!--android:paddingTop="8dp"-->
+                <!--android:text="091283232"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp" />-->
+        <!--</FrameLayout>-->
 
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="2dp"
-            android:layout_marginTop="2dp"
-            android:background="@color/gray"
-            android:visibility="gone" />
+        <!--<View-->
+            <!--android:layout_width="1dp"-->
+            <!--android:layout_height="match_parent"-->
+            <!--android:layout_marginBottom="2dp"-->
+            <!--android:layout_marginTop="2dp"-->
+            <!--android:background="@color/gray"-->
+            <!--android:visibility="gone" />-->
 
-        <FrameLayout
-            android:id="@+id/agent_info_txt_label_map_container"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:visibility="gone">
+        <!--<FrameLayout-->
+            <!--android:id="@+id/agent_info_txt_label_map_container"-->
+            <!--android:layout_width="0dp"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_weight="1"-->
+            <!--android:visibility="gone">-->
 
-            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                android:id="@+id/agent_info_txt_label_map"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:drawableLeft="@drawable/ic_agent_location"
-                android:drawablePadding="8dp"
-                android:maxLines="2"
-                android:paddingBottom="8dp"
-                android:paddingTop="8dp"
-                android:text="View on Map"
-                android:textColor="@color/darkgray"
-                android:textSize="14sp" />
-        </FrameLayout>
+            <!--<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView-->
+                <!--android:id="@+id/agent_info_txt_label_map"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_gravity="center_horizontal"-->
+                <!--android:drawableLeft="@drawable/ic_agent_location"-->
+                <!--android:drawablePadding="8dp"-->
+                <!--android:maxLines="2"-->
+                <!--android:paddingBottom="8dp"-->
+                <!--android:paddingTop="8dp"-->
+                <!--android:text="View on Map"-->
+                <!--android:textColor="@color/darkgray"-->
+                <!--android:textSize="14sp" />-->
+        <!--</FrameLayout>-->
 
-    </LinearLayout>
+    <!--</LinearLayout>-->
 </LinearLayout>
\ No newline at end of file