Before migrating coordinator layout to child fragments in transaction history fragment

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/DomesticTransactionHistoryTypeFragmentV2.java

@@ -0,0 +1,39 @@
+package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
+
+import butterknife.ButterKnife;
+
+public class DomesticTransactionHistoryTypeFragmentV2 extends BaseFragment {
+
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_domestic_transaction_history_type_v2, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ButterKnife.bind(this, view);
+        init();
+        performDefaultAction(savedInstanceState);
+    }
+
+    private void init() {
+
+    }
+
+    private void performDefaultAction(Bundle savedInstance) {
+
+
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/InternationalTransactionHistoryTypeFragmentV2.java

@@ -0,0 +1,173 @@
+package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewPager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
+import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyV2TransactionCompleteActivity;
+import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter.TransactionHistoryRVAdapter;
+import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter.TransactionHistoryViewPagerAdapter;
+import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryItemModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class InternationalTransactionHistoryTypeFragmentV2 extends BaseFragment implements TransactionHistoryRVAdapter.TransactionItemClickListener, ViewPager.OnPageChangeListener {
+
+    @BindView(R.id.internationaltxnTypeViewPager)
+    ViewPager internationalTypeViewPager;
+
+    @BindView(R.id.internationalTransactionTabLayout)
+    TabLayout tabLayout;
+
+    @BindView(R.id.searchEditText)
+    EditText searchEditText;
+
+
+
+    @BindView(R.id.iv_calendar)
+    View ivCalendar;
+
+
+    @BindView(R.id.dateContainer)
+    View dateContainer;
+
+    @BindView(R.id.tv_to_date)
+    TextView toDateTv;
+
+    @BindView(R.id.tv_from_date)
+    TextView fromDateTv;
+
+    List<Fragment> fragments;
+
+    private TransactionFragmentV2 currentFragment;
+
+
+
+    private TransactionFragmentV2 allTransactionFragment;
+    private TransactionFragmentV2 deliveredTransactionFragment;
+    private TransactionFragmentV2 sentTransactionFragment;
+    private TransactionHistoryViewPagerAdapter transactionHistoryViewPagerAdapter;
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_international_transaction_history_type_v2, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ButterKnife.bind(this, view);
+        init();
+        performDefaultAction(savedInstanceState);
+    }
+
+    private void init() {
+            setupViewPager();
+        setUpTabLayout();
+
+    }
+
+    private void setUpTabLayout() {
+        try {
+            tabLayout.getTabAt(0).setCustomView(R.layout.tab_tran_history1);
+            tabLayout.getTabAt(1).setCustomView(R.layout.tab_tran_history2);
+            tabLayout.getTabAt(2).setCustomView(R.layout.tab_tran_history3);
+
+        } catch (NullPointerException e) {
+
+        }
+
+    }
+
+    private void setupViewPager() {
+
+        fragments = new ArrayList<>();
+        transactionHistoryViewPagerAdapter = new TransactionHistoryViewPagerAdapter(getChildFragmentManager());
+
+        allTransactionFragment = new TransactionFragmentV2();
+        deliveredTransactionFragment = new TransactionFragmentV2();
+        sentTransactionFragment = new TransactionFragmentV2();
+
+        allTransactionFragment.setTransactionListener(this);
+        deliveredTransactionFragment.setTransactionListener(this);
+        sentTransactionFragment.setTransactionListener(this);
+
+        allTransactionFragment.setType(TransactionHistoryActivityV2.TransactionHistoryViewType.ALL);
+        deliveredTransactionFragment.setType(TransactionHistoryActivityV2.TransactionHistoryViewType.DELIVERED);
+        sentTransactionFragment.setType(TransactionHistoryActivityV2.TransactionHistoryViewType.SENT);
+
+        fragments.add(allTransactionFragment);
+        fragments.add(sentTransactionFragment);
+        fragments.add(deliveredTransactionFragment);
+
+        transactionHistoryViewPagerAdapter.addFragments(fragments);
+
+        internationalTypeViewPager.addOnPageChangeListener(this);
+
+        internationalTypeViewPager.setOffscreenPageLimit(3);
+
+        internationalTypeViewPager.setAdapter(transactionHistoryViewPagerAdapter);
+
+
+        tabLayout.setupWithViewPager(internationalTypeViewPager);
+    }
+
+    private void performDefaultAction(Bundle savedInstance) {
+
+
+    }
+
+    @Override
+    public void navigateToChangeTransactionScreen(TransactionHistoryItemModel itemModel) {
+        Intent startReceiptActivity = new Intent(getActivity(), SendMoneyV2TransactionCompleteActivity.class);
+        startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SEND_MONEY_TID_BUNDLE_KEY, itemModel.getTranId());
+        startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SEND_MONEY_CONTROL_NO_BUNDLE_KEY, itemModel.getControlNo());
+        startActivity(startReceiptActivity);
+    }
+
+    @Override
+    public void navigateToViewTransactionScreen(TransactionHistoryItemModel itemModel) {
+        Intent startReceiptActivity = new Intent(getActivity(), SendMoneyV2TransactionCompleteActivity.class);
+        startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SEND_MONEY_TID_BUNDLE_KEY, itemModel.getTranId());
+        startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY, true);
+        startActivity(startReceiptActivity);
+    }
+
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        try {
+            searchEditText.setText("");
+            currentFragment = (TransactionFragmentV2) fragments.get(position);
+        } catch (NullPointerException | IndexOutOfBoundsException e) {
+            Log.d("FManager", e.getMessage());
+        }
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int i) {
+
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/view/TransactionHistoryActivityV2.java

@@ -1,22 +1,16 @@
 package com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
-import android.os.Bundle;
 import android.support.v4.view.ViewPager;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
 import android.view.View;
-import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
 import com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView;
-import com.gmeremit.online.gmeremittance_native.registerV2.view.RegisterV2Activity;
 import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyV2TransactionCompleteActivity;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.TransactionHistoryV2ActionListener;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.adapter.TransactionHistoryRVAdapter;
@@ -25,17 +19,9 @@ import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.gateway.Tra
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.model.TransactionHistoryItemModel;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2Presenter;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2PresenterInterface;
-import com.gmeremit.online.gmeremittance_native.utils.Utils;
-import com.leavjenn.smoothdaterangepicker.date.SmoothDateRangePickerFragment;
-import com.tsongkha.spinnerdatepicker.DatePicker;
-import com.tsongkha.spinnerdatepicker.DateRangePickerDialog;
-import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
-import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -52,36 +38,23 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
     @BindView(R.id.transactionHistoryViewPager)
     ViewPager transactionViewPager;
 
-    @BindView(R.id.searchEditText)
-    EditText searchEditText;
 
     @BindView(R.id.iv_back)
     ImageView ivBack;
 
-    @BindView(R.id.iv_calendar)
-    View ivCalendar;
 
     @BindView(R.id.iv_cancel)
     View ivCancel;
 
-    @BindView(R.id.dateContainer)
-    View dateContainer;
 
-    @BindView(R.id.tv_to_date)
-    TextView toDateTv;
-
-    @BindView(R.id.tv_from_date)
-    TextView fromDateTv;
 
     private TransactionHistoryViewPagerAdapter transactionHistoryViewPagerAdapter;
-    private TransactionFragmentV2 allTransactionFragment;
-    private TransactionFragmentV2 deliveredTransactionFragment;
-    private TransactionFragmentV2 sentTransactionFragment;
+
     private TransactionHistoryV2PresenterInterface presenter;
-    private TransactionFragmentV2 currentFragment;
     List<Fragment> fragments;
 
-    private SearchEdittextTextChangeListener searchTextChangeListener;
+
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -97,7 +70,6 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
         toolbarTitle.setText(getString(R.string.transaction_report_title_text));
         setupViewPager();
         setUpTabLayout();
-        searchTextChangeListener = new SearchEdittextTextChangeListener();
         ivCancel.setVisibility(View.INVISIBLE);
 
     }
@@ -113,9 +85,9 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
     private void setUpTabLayout() {
         try {
-            transactionTabLayout.getTabAt(0).setCustomView(R.layout.tab_tran_history1);
-            transactionTabLayout.getTabAt(1).setCustomView(R.layout.tab_tran_history2);
-            transactionTabLayout.getTabAt(2).setCustomView(R.layout.tab_tran_history3);
+            transactionTabLayout.getTabAt(0).setCustomView(R.layout.tab_tran_history1_international);
+            transactionTabLayout.getTabAt(1).setCustomView(R.layout.tab_tran_history2_domestic);
+//            transactionTabLayout.getTabAt(2).setCustomView(R.layout.tab_tran_history3);
 
         } catch (NullPointerException e) {
 
@@ -129,21 +101,13 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
         fragments = new ArrayList<>();
 
-        allTransactionFragment = new TransactionFragmentV2();
-        deliveredTransactionFragment = new TransactionFragmentV2();
-        sentTransactionFragment = new TransactionFragmentV2();
 
-        allTransactionFragment.setTransactionListener(this);
-        deliveredTransactionFragment.setTransactionListener(this);
-        sentTransactionFragment.setTransactionListener(this);
 
-        allTransactionFragment.setType(TransactionHistoryViewType.ALL);
-        deliveredTransactionFragment.setType(TransactionHistoryViewType.DELIVERED);
-        sentTransactionFragment.setType(TransactionHistoryViewType.SENT);
 
-        fragments.add(allTransactionFragment);
-        fragments.add(sentTransactionFragment);
-        fragments.add(deliveredTransactionFragment);
+
+        fragments.add(new DomesticTransactionHistoryTypeFragmentV2());
+        fragments.add(new InternationalTransactionHistoryTypeFragmentV2());
+//        fragments.add(deliveredTransactionFragment);
 
 
         transactionHistoryViewPagerAdapter.addFragments(fragments);
@@ -157,23 +121,20 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
         transactionTabLayout.setupWithViewPager(transactionViewPager);
 
-        currentFragment = allTransactionFragment;
+
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        registerTextWatcher(true);
         ivBack.setOnClickListener(this);
-        ivCalendar.setOnClickListener(this);
+
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        registerTextWatcher(false);
         ivBack.setOnClickListener(null);
-        ivCalendar.setOnClickListener(null);
 
     }
 
@@ -184,12 +145,7 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
     @Override
     public void onPageSelected(int position) {
-        try {
-            searchEditText.setText("");
-            currentFragment = (TransactionFragmentV2) fragments.get(position);
-        } catch (NullPointerException | IndexOutOfBoundsException e) {
-            Log.d("FManager", e.getMessage());
-        }
+
     }
 
     @Override
@@ -197,53 +153,53 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
 
     }
 
-    private void promptCalendarPicker() {
-        new SpinnerDateRangePickerDialogBuilder()
-                .context(TransactionHistoryActivityV2.this)
-                .spinnerTheme(R.style.NumberPickerStyle)
-                .showTitle(true)
-                .showDaySpinner(true)
-                .defaultDate(1990, 0, 1)
-                .setCurrentDateAsMaxDate()
-                .minDate(2017,9,10)
-                .dialogTheme(R.style.DatePickerTheme)
-                .setTitle(getString(R.string.filter_by_date_text))
-                .setFromTitle(getString(R.string.from_text)+" :")
-                .setToTitle(getString(R.string.to_text)+" :")
-                .setPositiveButtonText(getString(R.string.ok_text))
-                .setNegativeButtonText(getString(R.string.cancel_text))
-                .callback(new DateRangePickerDialog.OnRangeDateSetListener() {
-                    private String startDate="";
-                    private String endDate="";
-                    @Override
-                    public void onFromDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
-                        startDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear+1) + "-" + Integer.toString(dayOfMonth);
-                        fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate));
-                    }
-
-                    @Override
-                    public void onToDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
-                        endDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear+1) + "-" + Integer.toString(dayOfMonth);
-                        toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate));
-                    }
-
-                    @Override
-                    public void onInvalidRangeSelected() {
-                        showToastMessage(getString(R.string.invalid_date_range_selected));
-                    }
-
-                    @Override
-                    public void onDateRangeReceivedSucess() {
-                        if(dateContainer.getVisibility()!= View.VISIBLE) {
-                            dateContainer.setVisibility(View.VISIBLE);
-                        }
-                        presenter.getTransactionHistory(startDate,endDate);
-                    }
-                })
-                .build()
-                .show();
-
-    }
+//    private void promptCalendarPicker() {
+//        new SpinnerDateRangePickerDialogBuilder()
+//                .context(TransactionHistoryActivityV2.this)
+//                .spinnerTheme(R.style.NumberPickerStyle)
+//                .showTitle(true)
+//                .showDaySpinner(true)
+//                .defaultDate(1990, 0, 1)
+//                .setCurrentDateAsMaxDate()
+//                .minDate(2017,9,10)
+//                .dialogTheme(R.style.DatePickerTheme)
+//                .setTitle(getString(R.string.filter_by_date_text))
+//                .setFromTitle(getString(R.string.from_text)+" :")
+//                .setToTitle(getString(R.string.to_text)+" :")
+//                .setPositiveButtonText(getString(R.string.ok_text))
+//                .setNegativeButtonText(getString(R.string.cancel_text))
+//                .callback(new DateRangePickerDialog.OnRangeDateSetListener() {
+//                    private String startDate="";
+//                    private String endDate="";
+//                    @Override
+//                    public void onFromDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
+//                        startDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear+1) + "-" + Integer.toString(dayOfMonth);
+//                        fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate));
+//                    }
+//
+//                    @Override
+//                    public void onToDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
+//                        endDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear+1) + "-" + Integer.toString(dayOfMonth);
+//                        toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate));
+//                    }
+//
+//                    @Override
+//                    public void onInvalidRangeSelected() {
+//                        showToastMessage(getString(R.string.invalid_date_range_selected));
+//                    }
+//
+//                    @Override
+//                    public void onDateRangeReceivedSucess() {
+//                        if(dateContainer.getVisibility()!= View.VISIBLE) {
+//                            dateContainer.setVisibility(View.VISIBLE);
+//                        }
+//                        presenter.getTransactionHistory(startDate,endDate);
+//                    }
+//                })
+//                .build()
+//                .show();
+//
+//    }
 
 
     @Override
@@ -267,14 +223,7 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
         return this.presenter;
     }
 
-    private void registerTextWatcher(boolean action) {
-        if (action) {
-            searchEditText.addTextChangedListener(searchTextChangeListener);
-        } else {
-            searchEditText.removeTextChangedListener(searchTextChangeListener);
 
-        }
-    }
 
     @Override
     public void onClick(View v) {
@@ -282,31 +231,12 @@ public class TransactionHistoryActivityV2 extends BaseActivity implements Transa
             case R.id.iv_back:
                 onBackPressed();
                 break;
-            case R.id.iv_calendar:
-                promptCalendarPicker();
-                break;
-        }
-    }
-
-
-    public class SearchEdittextTextChangeListener implements TextWatcher {
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
         }
+    }
 
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
 
-        }
 
-        @Override
-        public void afterTextChanged(Editable s) {
-            if (currentFragment != null)
-                currentFragment.searchForText(s.toString());
-        }
-    }
 
     public enum TransactionHistoryViewType {
         ALL, SENT, DELIVERED

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

@@ -28,47 +28,6 @@
 
                 <include layout="@layout/layout_sendmoney_toolbar" />
 
-                <LinearLayout
-                    android:id="@+id/searchViewContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/send_money_bg_grey"
-                    android:focusableInTouchMode="true"
-                    android:orientation="horizontal"
-                    android:padding="@dimen/_16sdp">
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/ic_search_icon"
-                        android:contentDescription="Search Icon" />
-
-                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
-                        android:id="@+id/searchEditText"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="@dimen/_11sdp"
-                        android:layout_marginStart="@dimen/_11sdp"
-                        android:layout_weight="1"
-                        android:background="@null"
-                        android:gravity="center_vertical"
-                        android:hint="@string/search_with_controlno_text"
-                        android:imeActionLabel="Done"
-                        android:imeOptions="actionDone"
-                        android:inputType="text"
-                        android:maxLength="20"
-                        android:textColor="@android:color/black"
-                        android:textSize="@dimen/_10ssp"/>
-
-                    <ImageView
-                        android:id="@+id/iv_calendar"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_calendar" />
-
-
-                </LinearLayout>
 
             </LinearLayout>
 
@@ -109,76 +68,19 @@
                 app:tabPaddingStart="0dp"
                 app:tabSelectedTextColor="@color/colorAccent" />
 
-                <LinearLayout
-                    android:id="@+id/dateContainer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:orientation="horizontal"
-                    android:paddingBottom="@dimen/_3sdp"
-                    android:paddingTop="@dimen/_3sdp"
-                    android:visibility="gone">
-
-                    <TextView
-                        android:id="@+id/tv_from_date"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/_6sdp"
-                        android:layout_marginLeft="@dimen/_6sdp"
-                        android:layout_marginRight="@dimen/_6sdp"
-                        android:layout_marginStart="@dimen/_6sdp"
-                        android:gravity="center"
-                        android:padding="@dimen/_2sdp"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/_6sdp"
-                        android:layout_marginLeft="@dimen/_6sdp"
-                        android:layout_marginRight="@dimen/_6sdp"
-                        android:layout_marginStart="@dimen/_6sdp"
-                        android:gravity="center"
-                        android:padding="@dimen/_2sdp"
-                        android:text="-"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp" />
-
-                    <TextView
-                        android:id="@+id/tv_to_date"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="@dimen/_6sdp"
-                        android:layout_marginLeft="@dimen/_6sdp"
-                        android:layout_marginRight="@dimen/_6sdp"
-                        android:layout_marginStart="@dimen/_6sdp"
-                        android:gravity="center"
-                        android:padding="@dimen/_2sdp"
-                        android:textColor="@color/darkgray"
-                        android:textSize="@dimen/_11ssp" />
-
-
-
-                </LinearLayout>
             </LinearLayout>
         </android.support.v7.widget.Toolbar>
     </android.support.design.widget.AppBarLayout>
 
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:orientation="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
 
         <android.support.v4.view.ViewPager
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:id="@+id/transactionHistoryViewPager"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    </LinearLayout>
 
 
 </android.support.design.widget.CoordinatorLayout>

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

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout   xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:clickable="true"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:id="@+id/searchViewContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/send_money_bg_grey"
+        android:focusableInTouchMode="true"
+        android:orientation="horizontal"
+        android:padding="@dimen/_16sdp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/ic_search_icon"
+            android:contentDescription="Search Icon" />
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+            android:id="@+id/searchEditText"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/_11sdp"
+            android:layout_marginStart="@dimen/_11sdp"
+            android:layout_weight="1"
+            android:background="@null"
+            android:gravity="center_vertical"
+            android:hint="@string/search_with_controlno_text"
+            android:imeActionLabel="Done"
+            android:imeOptions="actionDone"
+            android:inputType="text"
+            android:maxLength="20"
+            android:textColor="@android:color/black"
+            android:textSize="@dimen/_10ssp"/>
+
+        <ImageView
+            android:id="@+id/iv_calendar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_calendar" />
+
+
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/dateContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/_3sdp"
+        android:paddingTop="@dimen/_3sdp"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/tv_from_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/_6sdp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:layout_marginRight="@dimen/_6sdp"
+            android:layout_marginStart="@dimen/_6sdp"
+            android:gravity="center"
+            android:padding="@dimen/_2sdp"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/_6sdp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:layout_marginRight="@dimen/_6sdp"
+            android:layout_marginStart="@dimen/_6sdp"
+            android:gravity="center"
+            android:padding="@dimen/_2sdp"
+            android:text="-"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp" />
+
+        <TextView
+            android:id="@+id/tv_to_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/_6sdp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:layout_marginRight="@dimen/_6sdp"
+            android:layout_marginStart="@dimen/_6sdp"
+            android:gravity="center"
+            android:padding="@dimen/_2sdp"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp" />
+
+
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/transactionHistoryRv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layoutManager="android.support.v7.widget.LinearLayoutManager" >
+
+        </android.support.v7.widget.RecyclerView>
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+            android:paddingTop="50dp"
+            android:id="@+id/noTransactionFoundTextView"
+            android:visibility="invisible"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:background="@null"
+            android:enabled="false"
+            android:gravity="center"
+            android:hint="@string/no_transaction_found_text"
+            android:imeActionLabel="Done"
+            android:imeOptions="actionDone"
+            android:inputType="text"
+            android:textColor="@android:color/black"
+            android:textSize="14sp"
+            />
+    </FrameLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout   xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:clickable="true"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:id="@+id/searchViewContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/send_money_bg_grey"
+        android:focusableInTouchMode="true"
+        android:orientation="horizontal"
+        android:padding="@dimen/_16sdp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/ic_search_icon"
+            android:contentDescription="Search Icon" />
+
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+            android:id="@+id/searchEditText"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/_11sdp"
+            android:layout_marginStart="@dimen/_11sdp"
+            android:layout_weight="1"
+            android:background="@null"
+            android:gravity="center_vertical"
+            android:hint="@string/search_with_controlno_text"
+            android:imeActionLabel="Done"
+            android:imeOptions="actionDone"
+            android:inputType="text"
+            android:maxLength="20"
+            android:textColor="@android:color/black"
+            android:textSize="@dimen/_10ssp"/>
+
+        <ImageView
+            android:id="@+id/iv_calendar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_calendar" />
+
+
+    </LinearLayout>
+    <android.support.design.widget.TabLayout
+        android:id="@+id/internationalTransactionTabLayout"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:layout_gravity="bottom"
+        android:background="@color/white"
+        app:tabIndicatorColor="@color/colorAccent"
+        app:tabIndicatorHeight="3dp"
+        app:tabMode="fixed"
+
+        app:tabPaddingBottom="0dp"
+        app:tabPaddingEnd="0dp"
+        app:tabPaddingStart="0dp"
+        app:tabSelectedTextColor="@color/colorAccent" />
+    <LinearLayout
+        android:id="@+id/dateContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/_3sdp"
+        android:paddingTop="@dimen/_3sdp"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/tv_from_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/_6sdp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:layout_marginRight="@dimen/_6sdp"
+            android:layout_marginStart="@dimen/_6sdp"
+            android:gravity="center"
+            android:padding="@dimen/_2sdp"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/_6sdp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:layout_marginRight="@dimen/_6sdp"
+            android:layout_marginStart="@dimen/_6sdp"
+            android:gravity="center"
+            android:padding="@dimen/_2sdp"
+            android:text="-"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp" />
+
+        <TextView
+            android:id="@+id/tv_to_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/_6sdp"
+            android:layout_marginLeft="@dimen/_6sdp"
+            android:layout_marginRight="@dimen/_6sdp"
+            android:layout_marginStart="@dimen/_6sdp"
+            android:gravity="center"
+            android:padding="@dimen/_2sdp"
+            android:textColor="@color/darkgray"
+            android:textSize="@dimen/_11ssp" />
+
+
+
+    </LinearLayout>
+
+
+    <com.gmeremit.online.gmeremittance_native.customwidgets.SwipeDisabledViewPager
+        android:id="@+id/internationaltxnTypeViewPager"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </com.gmeremit.online.gmeremittance_native.customwidgets.SwipeDisabledViewPager>
+
+</LinearLayout>

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

@@ -0,0 +1,11 @@
+<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView android:gravity="center"
+    android:text="International"
+    android:textSize="17sp"
+    android:textColor="@color/colorAccent"
+    app:txtfontName="@string/semibold"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+</com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView>

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

@@ -0,0 +1,11 @@
+<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView android:gravity="center"
+    android:text="Domestic"
+    android:textSize="17sp"
+    android:textColor="@color/colorAccent"
+    app:txtfontName="@string/semibold"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+</com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView>

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

@@ -0,0 +1,11 @@
+<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView android:gravity="center"
+    android:text="Domestic"
+    android:textSize="17sp"
+    android:textColor="@color/colorAccent"
+    app:txtfontName="@string/semibold"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+</com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView>