Dash being seperated

app/src/main/AndroidManifest.xml

@@ -40,7 +40,6 @@
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.gmeremit.online.gmeremittance_native.fileprovider"
@@ -48,12 +47,9 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths">
-
-            </meta-data>
+                android:resource="@xml/file_paths"></meta-data>
         </provider>
 
-
         <activity
             android:name=".MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
@@ -510,16 +506,19 @@
             android:name=".kycV2.view.KYCFormV2Activity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar">
-            <!--<intent-filter>-->
-                <!--<action android:name="HOME" />-->
 
-                <!--<category android:name="android.intent.category.DEFAULT" />-->
-            <!--</intent-filter>-->
-            <!--<intent-filter>-->
-                <!--<action android:name="android.intent.action.MAIN" />-->
+            <!-- <intent-filter> -->
+            <!-- <action android:name="HOME" /> -->
+
 
-                <!--<category android:name="android.intent.category.LAUNCHER" />-->
-            <!--</intent-filter>-->
+            <!-- <category android:name="android.intent.category.DEFAULT" /> -->
+            <!-- </intent-filter> -->
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
+
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
         <activity
             android:name=".loginV2.view.LoginV2Activity"
@@ -531,11 +530,12 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden" />
-        <activity android:name=".resetpassV2.view.ResetPassV2Activity"
+        <activity
+            android:name=".resetpassV2.view.ResetPassV2Activity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden"
-            />
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity android:name=".homeV2.view.HomeActivityV2"></activity>
     </application>
 
 </manifest>

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/HomeParentViewContractV2.java

@@ -0,0 +1,15 @@
+package com.gmeremit.online.gmeremittance_native.homeV2;
+
+import com.gmeremit.online.gmeremittance_native.R;
+
+public interface HomeParentViewContractV2 {
+
+
+
+            void showSendMoneyView();
+            void showMobileRechargeView();
+            void showTodaysRateView();
+            void showTrackYourTransferView();
+            void showTransactionStatementView();
+            void showWalletToWalletView();
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/adapters/HomeMenuRvAdapter.java

@@ -1,4 +0,0 @@
-package com.gmeremit.online.gmeremittance_native.homeV2.adapters;
-
-public class HomeMenuRvAdapter {
-}

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/adapters/HomeMenuRvAdapterV2.java

@@ -0,0 +1,57 @@
+package com.gmeremit.online.gmeremittance_native.homeV2.adapters;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.homeV2.model.MenuItem;
+import com.gmeremit.online.gmeremittance_native.homeV2.view.HomeMenuItemViewHolderV2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HomeMenuRvAdapterV2 extends RecyclerView.Adapter<HomeMenuItemViewHolderV2> {
+
+    private final HomeMenuClickListenerV2 listener;
+    private  List<MenuItem> data;
+
+    public HomeMenuRvAdapterV2(HomeMenuClickListenerV2 listener) {
+        this.listener = listener;
+        this.data = new ArrayList<>();
+    }
+
+    @NonNull
+    @Override
+    public HomeMenuItemViewHolderV2 onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new HomeMenuItemViewHolderV2(LayoutInflater.from(parent.getContext()).inflate(R.layout.home_menu_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull HomeMenuItemViewHolderV2 holder, int position) {
+
+        MenuItem currentItem=data.get(holder.getAdapterPosition());
+        holder.setTitle(currentItem.getMenuTitle());
+        holder.setImageResource(currentItem.getImage());
+        holder.itemView.setOnClickListener(view->listener.onMenuItemClicked(currentItem));
+    }
+
+    @Override
+    public int getItemCount() {
+        return data.size();
+    }
+
+    public void setData(List<MenuItem> data)
+    {
+        if(data!=null&&data.size()>0) {
+            this.data = data;
+            notifyDataSetChanged();
+        }
+    }
+
+
+    public interface HomeMenuClickListenerV2 {
+        void onMenuItemClicked(MenuItem clickedItem);
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/model/MenuItem.java

@@ -0,0 +1,68 @@
+package com.gmeremit.online.gmeremittance_native.homeV2.model;
+
+
+/**
+ * Created by frantic on 12/13/17.
+ */
+public class MenuItem {
+    int autoid;
+    String menuTitle;
+    int image;
+    boolean favourite;
+    int position;
+    int id;
+
+    public MenuItem(String menuTitle, int image, int id) {
+        this.menuTitle = menuTitle;
+        this.image = image;
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getMenuTitle() {
+        return menuTitle;
+    }
+
+    public void setMenuTitle(String menuTitle) {
+        this.menuTitle = menuTitle;
+    }
+
+    public int getImage() {
+        return image;
+    }
+
+    public void setImage(int image) {
+        this.image = image;
+    }
+
+    public boolean isFavourite() {
+        return favourite;
+    }
+
+    public void setFavourite(boolean favourite) {
+        this.favourite = favourite;
+    }
+
+    public int getAutoid() {
+        return autoid;
+    }
+
+    public void setAutoid(int autoid) {
+        this.autoid = autoid;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public void setPosition(int position) {
+        this.position = position;
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java

@@ -0,0 +1,67 @@
+package com.gmeremit.online.gmeremittance_native.homeV2.view;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.gmeremit.online.gmeremittance_native.R;
+import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
+import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
+import com.gmeremit.online.gmeremittance_native.exchange_rate.view.ExchangeMethodV2Activity;
+import com.gmeremit.online.gmeremittance_native.homeV2.HomeParentViewContractV2;
+import com.gmeremit.online.gmeremittance_native.recipientV2.view.recipientlisting.RecipientListingV2Activity;
+import com.gmeremit.online.gmeremittance_native.track_transfer.view.TrackYourTransferActivity;
+import com.gmeremit.online.gmeremittance_native.transaction_statement.view.TransactionStatementActivity;
+import com.gmeremit.online.gmeremittance_native.utils.Constants;
+import com.gmeremit.online.gmeremittance_native.utils.Utils;
+
+public class HomeActivityV2 extends BaseActivity implements HomeParentViewContractV2{
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_home_v2);
+    }
+    @Override
+    public void showSendMoneyView() {
+        startActivity(new Intent(getApplicationContext(), RecipientListingV2Activity.class));
+    }
+
+    @Override
+    public void showMobileRechargeView() {
+        showFetaureComingSoon();
+    }
+
+    @Override
+    public void showTodaysRateView() {
+        startActivity(new Intent(this, ExchangeMethodV2Activity.class));
+
+    }
+
+    @Override
+    public void showTrackYourTransferView() {
+        startActivity(new Intent(this, TrackYourTransferActivity.class));
+
+    }
+
+    @Override
+    public void showTransactionStatementView() {
+        startActivity(new Intent(this, TransactionStatementActivity.class));
+
+    }
+
+    @Override
+    public void showWalletToWalletView() {
+        showFetaureComingSoon();
+    }
+
+
+    private void showFetaureComingSoon() {
+        CustomAlertDialog customAlertDialog = new CustomAlertDialog();
+        customAlertDialog.setAlertType(CustomAlertDialog.AlertType.ALERT);
+        customAlertDialog.setMessage("This feature is coming soon");
+        android.app.FragmentManager fragmentManager = getFragmentManager();
+        if (fragmentManager != null)
+            customAlertDialog.show(fragmentManager, "CustomProgressBar");
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java

@@ -11,15 +11,24 @@ import android.view.ViewGroup;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.home.adapters.MenuAdapter;
+import com.gmeremit.online.gmeremittance_native.home.model.Menu;
+import com.gmeremit.online.gmeremittance_native.homeV2.HomeParentViewContractV2;
+import com.gmeremit.online.gmeremittance_native.homeV2.adapters.HomeMenuRvAdapterV2;
+import com.gmeremit.online.gmeremittance_native.homeV2.model.MenuItem;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class HomeFragmentV2 extends BaseFragment {
+public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.HomeMenuClickListenerV2 {
 
     @BindView(R.id.menuRecyclerView)
     RecyclerView menuRecyclerView;
 
+    HomeMenuRvAdapterV2 homeMenuRvAdapterV2;
+
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_home_v2, container, false);
@@ -41,12 +50,59 @@ public class HomeFragmentV2 extends BaseFragment {
     }
 
     private void setupMenuRecyclerView() {
-        menuRecyclerView.setLayoutManager(new GridLayoutManager(getContext(), 2));
-
+        menuRecyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 2));
         menuRecyclerView.setNestedScrollingEnabled(false);
+        homeMenuRvAdapterV2=new HomeMenuRvAdapterV2(this);
+        menuRecyclerView.setAdapter(homeMenuRvAdapterV2);
+        homeMenuRvAdapterV2.setData(getMenuData());
+
+
+    }
+
+    private List<MenuItem> getMenuData() {
+
+            List<MenuItem> menuList = new ArrayList<>();
+            menuList.add(new MenuItem("Send Money", R.drawable.ic_menu_sendmoney, 1));
+            menuList.add(new MenuItem("Mobile Recharge", R.drawable.ic_menu_recharge, 2));
+            menuList.add(new MenuItem("Today’s Rate", R.drawable.ic_menu_exchange_rate, 3));
+            menuList.add(new MenuItem("Track Your Transfer", R.drawable.ic_menu_trackloc, 4));
+            menuList.add(new MenuItem("Transaction Statement", R.drawable.ic_menu_statement, 5));
+            menuList.add(new MenuItem("Wallet to Wallet Transfer", R.drawable.ic_menu_wallet, 6));
+            return menuList;
     }
 
     private void performDefaultAction(Bundle savedInstanceState) {
 
     }
+
+    @Override
+    public void onMenuItemClicked(MenuItem clickedItem) {
+        HomeParentViewContractV2 parentViewContractV2= (HomeParentViewContractV2) getActivity();
+        if(parentViewContractV2==null)
+            return;
+            switch (clickedItem.getId())
+            {
+                case 1:
+                    parentViewContractV2.showSendMoneyView();
+                    break;
+                case 2:
+                    parentViewContractV2.showMobileRechargeView();
+                    break;
+                case 3:
+                    parentViewContractV2.showTodaysRateView();
+                    break;
+                case 4:
+                    parentViewContractV2.showTrackYourTransferView();
+                    break;
+                case 5:
+                    parentViewContractV2.showTransactionStatementView();
+                    break;
+                case 6:
+                    parentViewContractV2.showWalletToWalletView();
+                    break;
+
+            }
+    }
+
+
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeMenuItemViewHolderV2.java

@@ -0,0 +1,37 @@
+package com.gmeremit.online.gmeremittance_native.homeV2.view;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.gmeremit.online.gmeremittance_native.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class HomeMenuItemViewHolderV2 extends RecyclerView.ViewHolder {
+
+    @BindView(R.id.fav)
+    ImageView fav;
+    @BindView(R.id.image)
+    ImageView imageView;
+    @BindView(R.id.title)
+    TextView titleView;
+
+    public HomeMenuItemViewHolderV2(final View itemView) {
+        super(itemView);
+        ButterKnife.bind(this,itemView);
+    }
+
+
+    public void setImageResource(int resourceID)
+    {
+       imageView.setImageResource(resourceID);
+    }
+
+    public void setTitle(String title)
+    {
+        titleView.setText(title);
+    }
+}

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

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_home"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context="com.gmeremit.online.gmeremittance_native.home.view.HomeActivity">
+
+        <LinearLayout
+            android:id="@+id/toolbarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="?actionBarSize"
+            android:background="@color/colorPrimary">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/iv_nav"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_home_nav_icon" />
+
+                <ImageView
+                    android:id="@+id/iv_home"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:src="@drawable/ic_gme_home_logo" />
+
+                <ImageView
+                    android:id="@+id/iv_help"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:layout_centerVertical="true"
+                    android:layout_toLeftOf="@id/iv_notification_layout"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_help" />
+
+                <RelativeLayout
+                    android:id="@+id/iv_notification_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true">
+
+                    <ImageView
+                        android:id="@+id/iv_notification"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:padding="10dp"
+                        android:src="@drawable/ic_home_notification_badge" />
+
+                    <View
+                        android:id="@+id/notification_alert"
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:layout_alignEnd="@+id/iv_notification"
+                        android:layout_alignRight="@+id/iv_notification"
+                        android:layout_alignTop="@+id/iv_notification"
+                        android:layout_marginEnd="8dp"
+                        android:layout_marginRight="8dp"
+                        android:layout_marginTop="15dp"
+                        android:background="@drawable/notification_dot"
+                        android:gravity="center"
+                        android:visibility="gone" />
+                </RelativeLayout>
+            </RelativeLayout>
+
+        </LinearLayout>
+
+
+        <FrameLayout
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/bottomBar"
+            android:layout_below="@id/toolbarLayout"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+        <android.support.design.widget.BottomNavigationView
+            android:id="@+id/navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="?android:attr/windowBackground"
+            android:foregroundGravity="center"
+            android:visibility="gone"
+            app:itemIconTint="@drawable/ic_nav_item_colorstate"
+            app:itemTextColor="@drawable/ic_nav_item_colorstate"
+            app:menu="@menu/navigation" />
+
+        <include
+            android:id="@+id/bottomBar"
+            layout="@layout/layout_bottom_tab_bar"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_alignParentBottom="true" />
+
+    </RelativeLayout>
+
+    <android.support.design.widget.NavigationView
+        android:id="@+id/nav_drawer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:layout_marginLeft="-64dp"
+        android:layout_marginStart="-64dp"
+        android:fitsSystemWindows="true">
+
+        <include layout="@layout/nav_drawer_fragment" />
+
+    </android.support.design.widget.NavigationView>
+
+</android.support.v4.widget.DrawerLayout>

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

@@ -16,7 +16,6 @@
             android:layout_height="wrap_content"
             android:visibility="gone"
             tools:visibility="gone"
-            android:elevation="16dp"
             android:background="@drawable/ic_rectangle_white_corners"
             android:padding="10dp">
             <RelativeLayout