WebSVN – SmartDukaan – Diff – /trunk/ProfitMandiAndroid/app/src/main/java/com/saholic/profittill/main/MainActivity.java

         listParent.add(new ExpandableNavigationItem(getString(R.string.About_Us)));
         listDataChild.put(getString(R.string.Deals), new ArrayList<String>());
         listDataChild.put(getString(R.string.Search), new ArrayList<String>());
-        listDataChild.put(getString(R.string.Stores), Arrays.asList(mPlanetTitles));
         /*listDataChild.put(getString(R.string.Help), Arrays.asList(mHelpTitle));*/
+        listDataChild.put(getString(R.string.Stores), Arrays.asList(mPlanetTitles));
         listDataChild.put(getString(R.string.Contact_Us), new ArrayList<String>());
         listDataChild.put(getString(R.string.Tutorials), new ArrayList<String>());
         listDataChild.put(getString(R.string.About_Us), new ArrayList<String>());
         customAdapter = new ExpandableNavigationAdapter(this, listParent, listDataChild);
         // enable ActionBar app icon to behave as action to toggle nav drawer
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
         //mDrawerList.setOnItemClickListener(new ExpandableListViewClick());
-        mDrawerList.setOnGroupClickListener(new ExpandableListViewGroupClick());
+        //mDrawerList.setOnGroupClickListener(new ExpandableListViewGroupClick());
         mDrawerList.setOnChildClickListener(new ExpandableListViewChildClick());
+        mDrawerList.setOnGroupExpandListener(new ExpandableGroupExpandListener());
         mDrawerToggle = new ActionBarDrawerToggle(this, /* host Activity */
                 mDrawerLayout, /* DrawerLayout object */
-                R.drawable.menubutton, /* nav drawer image to replace 'Up' caret */
+                R.drawable.menu_button_2, /* nav drawer image to replace 'Up' caret */
                 R.string.drawer_open, /* "open drawer" description for accessibility */
                 R.string.drawer_close /* "close drawer" description for accessibility */
         ) {
             public void onDrawerClosed(View view) {
                 if(titleVisible!=0) {
+        }
+    }
-    /**
-     * Slide menu item click listener
-     * */
-/*
-    private class SlideMenuClickListener implements
+    private class ExpandableGroupExpandListener implements ExpandableListView.OnGroupExpandListener{
-            ListView.OnItemClickListener {
         @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position,
+        public void onGroupExpand(int groupPosition) {
-                                long id) {
-            // display view for selected nav drawer item
+            int len = customAdapter.getGroupCount();
-            displayView(position);
-        }
-    }
-*/
-    private class ExpandableListViewGroupClick implements ExpandableListView.OnGroupClickListener {
-        @Override
-        public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
-            int index = parent.getFlatListPosition(ExpandableListView.getPackedPositionForGroup(groupPosition));
+            int index = mDrawerList.getFlatListPosition(ExpandableListView.getPackedPositionForGroup(groupPosition));
-            parent.setItemChecked(index, true);
+            mDrawerList.setItemChecked(index, true);
             String parentTitle = ((ExpandableNavigationItem) customAdapter.getGroup(groupPosition)).getTitle();
-            Log.d("Parent Title","Parent Title" + parentTitle);
+            Log.d("Group Pos in child View", "" + groupPosition);
-            if (!(parentTitle.equalsIgnoreCase(getString(R.string.Stores)))) {
+            if(!(parentTitle.equalsIgnoreCase(getString(R.string.Stores)))) {
-                Log.d("Parent Title","In if condition" + parentTitle);
                 mDrawerLayout.closeDrawer(navDrawerView);
                 mDrawerList.collapseGroup(2);
+            }
             if(groupPosition!=2){
                 displayView(groupPosition);
+            }
             setActionBarTitlte(parentTitle);
-            return false;
+            for (int i = 0; i < len; i++) {
+                if(i!=2) {
+                    mDrawerList.collapseGroup(i);
+                }
+            }
+        }
+    }
-    private class ExpandableListViewChildClick implements ExpandableListView.OnChildClickListener {
+    private class ExpandableListViewChildClick implements ExpandableListView.OnChildClickListener {
         @Override
         public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
             int index = parent.getFlatListPosition(ExpandableListView.getPackedPositionForChild(groupPosition, childPosition));
             parent.setItemChecked(index, true);
-            Log.d("Child Pos", "" + childPosition);
             mDrawerLayout.closeDrawer(navDrawerView);
             displayChildView(childPosition);
             return false;
+        }
+    }
                 args.putString("key", apiData.getString("affiliate.url.redirect","")+"?user_id="+userData.getString("id","")+"&store_id="+UtilityFunctions.getNewStoreId(UtilityFunctions.generateStoreMap(apiData.getString("stores.code","amazon=1,flipkart=2,snapdeal=3,spice=4,shopclues=5,")),ProfitTillConstants.FLIPKART));
                 fragment = new DealsHomeFragment();
                 fragment.setArguments(args);
                 break;
             case 2:
+                t.send(new HitBuilders.EventBuilder()
+                        .setCategory("Menu")
+                        .setAction("Paytm ")
+                        .setLabel("Paytm Clicked")
+                        .build());
+                new Analytics(ProfitTillConstants.ANALYTICS_URL,
+                        AnalyticsUtility.getAnalyticsRequest(MainActivity.this,userData.getString("id",""),"Menu","Paytm","Paytm Clicked"),
+                        AnalyticsJsonResponse.getAnalyticsRequestInstance(),
+                        AnalyticsErrorResponse.getAnalyitcsResponseInstance()).anlyticsRequest(MainActivity.this);
+                args.putString("key", apiData.getString("affiliate.url.redirect","")+"?user_id="+userData.getString("id","")+"&store_id="+UtilityFunctions.getNewStoreId(UtilityFunctions.generateStoreMap(apiData.getString("stores.code","amazon=1,flipkart=2,snapdeal=3,spice=4,shopclues=5,")),ProfitTillConstants.PAYTM));
+                //args.putString("key","https://paytm.com");
+                fragment = new DealsHomeFragment();
+                fragment.setArguments(args);
+                break;
+            case 3:
                 JSONObject propsSaholic = new JSONObject();
                 try {
                     mixpanel.identify(userData.getString("id",null));
                     propsSaholic.put("Screen", "Saholic");
                     mixpanel.track("Saholic", propsSaholic);
                         AnalyticsErrorResponse.getAnalyitcsResponseInstance()).anlyticsRequest(MainActivity.this);
                 args.putString("key", apiData.getString("saholic.autologin.url","")+"?user_id="+userData.getString("id",""));
                 fragment = new DealsHomeFragment();
                 fragment.setArguments(args);
                 break;
-            case 3:
+            case 4:
                 JSONObject propsShopclues = new JSONObject();
                 try {
                     mixpanel.identify(userData.getString("id",null));
                     propsShopclues.put("Screen", "Shopclues");
                     mixpanel.track("Shopclues", propsShopclues);
                     cookieManager1.setCookie(url, "shopcluesActive=true");
+                }
                 fragment = new DealsHomeFragment();
                 fragment.setArguments(args);
                 break;
-            case 4:
+            case 5:
                 JSONObject propsSnapdeal = new JSONObject();
                 try {
                     mixpanel.identify(userData.getString("id",null));
                     propsSnapdeal.put("Screen", "Snapdeal");
                     mixpanel.track("Snapdeal", propsSnapdeal);
             getSupportActionBar().setCustomView(R.layout.actionbardeals);
+        }
         if (parentTitle.equalsIgnoreCase("Visit Other Stores")) {
             getSupportActionBar().setCustomView(R.layout.actionbarprofittill);
+        }
-        if (parentTitle.equals("About Us")) {
+        if (parentTitle.equals("FAQ")) {
             getSupportActionBar().setCustomView(R.layout.actionbaraboutus);
+        }
         if (parentTitle.equals("Contact Us")) {
             getSupportActionBar().setCustomView(R.layout.actionbarcontactus);
+        }

Subversion Repositories SmartDukaan

(root)/trunk/ProfitMandiAndroid/app/src/main/java/com/saholic/profittill/main/MainActivity.java – Rev 16310 → 16453