feat: added suggestted playlist items to be added on eve notification

zeseeit · zeseeit · commit 1a3ea5c43ca9 · 2017-02-18T20:35:48.000+05:30
diff --git a/app/src/main/java/any/audio/Activity/EveWisherThemedActivity.java b/app/src/main/java/any/audio/Activity/EveWisherThemedActivity.java
@@ -1,23 +1,43 @@
 package any.audio.Activity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayout;
+import android.util.Log;
 import android.view.View;
 import android.view.Window;
+import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.squareup.picasso.Picasso;
 
+import java.util.ArrayList;
+
+import any.audio.Adapters.EveRecommendationGridAdapter;
 import any.audio.Managers.FontManager;
+import any.audio.Models.PlaylistItem;
 import any.audio.R;
+import any.audio.SharedPreferences.SharedPrefrenceUtils;
+import any.audio.helpers.QueueManager;
+import any.audio.helpers.Segmentor;
 
 public class EveWisherThemedActivity extends AppCompatActivity {
 
+    String mTitleBuffer;
+    String mArtistBuffer;
+    String mVideoIdBuffer;
+    String mYoutubeIdBuffer;
+
     TextView eveTitle;
     TextView eveMessage;
-    ImageView evePic;
+    TextView eveSuggestionAddToQueueBtn;
+    GridView gridLayout;
     TextView cancelEveDialog;
+    private EveRecommendationGridAdapter gridLayoutAdapter;
+    private ArrayList<PlaylistItem> items;
 
 
     @Override
@@ -30,21 +50,67 @@ protected void onCreate(Bundle savedInstanceState) {
         Bundle bundle = getIntent().getExtras();
         String eve_msg = bundle.getString("message");
         String title = bundle.getString("title");
-
+        collectSuggestions(bundle);
         eveTitle = (TextView) findViewById(R.id.eveCaption);
         eveMessage = (TextView) findViewById(R.id.eveMessage);
+        eveSuggestionAddToQueueBtn = (TextView) findViewById(R.id.eveAddToQueue);
         cancelEveDialog = (TextView) findViewById(R.id.cancelEveDialog);
-
+        gridLayout = (GridView) findViewById(R.id.eveSuggestionsGrid);
+        gridLayout.setNumColumns(SharedPrefrenceUtils.getInstance(this).getCols());
         eveMessage.setText(eve_msg);
         eveTitle.setText(title);
         cancelEveDialog.setTypeface(FontManager.getInstance(this).getTypeFace(FontManager.FONT_MATERIAL));
+
         cancelEveDialog.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 finish();
             }
         });
 
+        eveSuggestionAddToQueueBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                appendQueueItems();
+                Toast.makeText(EveWisherThemedActivity.this,"Added Items To Your Queue",Toast.LENGTH_SHORT).show();
+                startActivity(new Intent(EveWisherThemedActivity.this,AnyAudioActivity.class));
+
+                finish();
+            }
+        });
+
+        gridLayoutAdapter = EveRecommendationGridAdapter.getInstance(this);
+        gridLayoutAdapter.setSuggestionsList(items);
+        gridLayout.setAdapter(gridLayoutAdapter);
+
+    }
+
+    private void appendQueueItems() {
+
+        for(PlaylistItem i:items){
+            QueueManager.getInstance(this).pushQueueItem(i,false);
+        }
+
+    }
+
+    private void collectSuggestions(Bundle bundle) {
+
+        items = new ArrayList<>();
+
+        try {
+
+            ArrayList<String> videoTitlesBuffer = new Segmentor().getParts(mTitleBuffer = bundle.getString("vtlts"), '#');
+            ArrayList<String> videoIds = new Segmentor().getParts(mVideoIdBuffer = bundle.getString("vids"), '#');
+            ArrayList<String> yids = new Segmentor().getParts(mYoutubeIdBuffer = bundle.getString("yids"), '#');
+            ArrayList<String> uploaders = new Segmentor().getParts(mArtistBuffer = bundle.getString("uploaders"), '#');
+
+            for (int i = 0; i < videoIds.size(); i++) {
+                items.add(new PlaylistItem(videoIds.get(i), yids.get(i), videoTitlesBuffer.get(i), uploaders.get(i)));
+            }
+
+        }catch (Exception e){
+            Log.d(EveWisherThemedActivity.class.getSimpleName(),"Data Error");
+        }
 
     }
 }
diff --git a/app/src/main/java/any/audio/Adapters/EveRecommendationGridAdapter.java b/app/src/main/java/any/audio/Adapters/EveRecommendationGridAdapter.java
@@ -1,12 +1,23 @@
 package any.audio.Adapters;
 
 import android.content.Context;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
 
 import java.util.ArrayList;
 
+import any.audio.Models.EveSuggestionsItemModel;
+import any.audio.Models.PlaylistItem;
+import any.audio.R;
+import any.audio.SharedPreferences.SharedPrefrenceUtils;
+
 /**
  * Created by Ankit on 2/16/2017.
  */
@@ -16,21 +27,23 @@ public class EveRecommendationGridAdapter extends BaseAdapter {
     private static Context context;
 
     private static EveRecommendationGridAdapter mInstance;
-
+    private ArrayList<EveSuggestionsItemModel> suggestionsItemModels;
     public EveRecommendationGridAdapter(Context context) {
         this.context = context;
+        suggestionsItemModels = new ArrayList<>();
     }
 
     public static EveRecommendationGridAdapter getInstance(Context context) {
         if (mInstance == null) {
             mInstance = new EveRecommendationGridAdapter(context);
+
         }
         return mInstance;
     }
 
     @Override
     public int getCount() {
-        return 0;
+        return suggestionsItemModels.size();
     }
 
     @Override
@@ -44,8 +57,67 @@ public long getItemId(int i) {
     }
 
     @Override
-    public View getView(int i, View view, ViewGroup viewGroup) {
-        return null;
+    public View getView(int position, View convertView, ViewGroup container) {
+
+        EveSuggestionsViewHolder viewHolder=null;
+
+        if(convertView==null){
+
+            viewHolder = new EveSuggestionsViewHolder();
+            convertView = LayoutInflater.from(context).inflate(R.layout.eve_recommendation_item_layout,container,false);
+            viewHolder.thumbnail = (SimpleDraweeView) convertView.findViewById(R.id.eveItemThumbnail);
+            viewHolder.title = (TextView) convertView.findViewById(R.id.eve_suggestion_item_title);
+            viewHolder.artist = (TextView) convertView.findViewById(R.id.eve_suggestion_item_artist);
+            viewHolder.wrapper = (RelativeLayout) convertView.findViewById(R.id.eve_card_top_wrapper);
+            // size fixations
+
+            int widthPx = (int) SharedPrefrenceUtils.getInstance(context).getScreenWidthPx();
+            int thumbnailHeight = (int) (0.56*widthPx);
+            LinearLayout.LayoutParams thumbnailParams = new LinearLayout.LayoutParams(widthPx,thumbnailHeight);
+            viewHolder.wrapper.setLayoutParams(thumbnailParams);
+
+            convertView.setTag(viewHolder);
+
+        }else{
+            viewHolder = (EveSuggestionsViewHolder) convertView.getTag();
+        }
+
+        bindViewData(viewHolder,suggestionsItemModels.get(position));
+
+        return convertView;
+    }
+
+    private void bindViewData(EveSuggestionsViewHolder viewHolder,EveSuggestionsItemModel data) {
+
+        viewHolder.title.setText(data.title);
+        viewHolder.artist.setText(data.artist);
+        viewHolder.thumbnail.setImageURI(data.thumbnailUrl);
+
+    }
+
+    public void setSuggestionsList(ArrayList<PlaylistItem> items) {
+
+        for(PlaylistItem item:items){
+            suggestionsItemModels.add(new EveSuggestionsItemModel(item.getTitle(),item.getUploader(),getImageUrl(item.getYoutubeId())));
+        }
+
+        notifyDataSetChanged();
+
+    }
+
+
+    private String getImageUrl(String vid) {
+        //return "https://i.ytimg.com/vi/kVgKfScL5yk/hqdefault.jpg";
+        return "https://i.ytimg.com/vi/" + vid + "/hqdefault.jpg";  // additional query params => ?custom=true&w=240&h=256
+    }
+
+
+    public static class EveSuggestionsViewHolder{
+        public TextView title;
+        public TextView artist;
+        public SimpleDraweeView thumbnail;
+        public RelativeLayout wrapper;
+
     }
 
 }
diff --git a/app/src/main/java/any/audio/helpers/AnyAudioPushHandler.java b/app/src/main/java/any/audio/helpers/AnyAudioPushHandler.java
@@ -100,9 +100,19 @@ private void handleEveWisher(Map<String, String> data) {
 
         String eveMessage = data.get("message");
         String title = data.get("title");
+
+        String sgTitles = data.get("vtlts");
+        String sgVids = data.get("vids");
+        String sgYids = data.get("yids");
+        String sgUploaders = data.get("uploaders");
+
         Intent eveWishIntent = new Intent(context, EveWisherThemedActivity.class);
         eveWishIntent.putExtra("message", eveMessage);
         eveWishIntent.putExtra("title", title);
+        eveWishIntent.putExtra("vtlts",sgTitles);
+        eveWishIntent.putExtra("vids",sgVids);
+        eveWishIntent.putExtra("yids",sgYids);
+        eveWishIntent.putExtra("uploaders",sgUploaders);
         eveWishIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         showNotification("AnyAudio", "Wishes For You", eveWishIntent);
 
diff --git a/app/src/main/res/layout/eve_recommendation_item_layout.xml b/app/src/main/res/layout/eve_recommendation_item_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:layout_width="240dp"
+<RelativeLayout android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     xmlns:fresco="http://schemas.android.com/apk/res-auto"
     android:visibility="visible"
@@ -13,12 +13,12 @@
         android:orientation="vertical">
 
         <RelativeLayout
-            android:id="@+id/explore_card_top_wrapper"
+            android:id="@+id/eve_card_top_wrapper"
             android:layout_width="match_parent"
             android:layout_height="135dp">
 
             <com.facebook.drawee.view.SimpleDraweeView
-                android:id="@+id/explore_item_thumbnail"
+                android:id="@+id/eveItemThumbnail"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 fresco:placeholderImage="@drawable/ok_btn_bg"
@@ -34,28 +34,32 @@
             android:layout_below="@+id/explore_card_top_wrapper">
 
             <TextView
-                android:id="@+id/explore_item_title"
+                android:id="@+id/eve_suggestion_item_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_toLeftOf="@+id/explore_item_popup_btn"
                 android:maxLines="1"
                 android:paddingLeft="14dp"
-                android:paddingTop="14dp"
+                android:paddingRight="14dp"
+                android:paddingTop="10dp"
+                android:ellipsize="end"
                 android:text="The Weekend - Party"
                 android:textColor="@color/AnyAudioGrey224"
                 android:textSize="14sp"
                 android:textStyle="bold" />
 
             <TextView
-                android:id="@+id/explore_item_uploader"
+                android:id="@+id/eve_suggestion_item_artist"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/explore_item_title"
+                android:layout_below="@+id/eve_suggestion_item_title"
                 android:layout_toLeftOf="@+id/explore_item_download_btn"
                 android:maxLines="1"
                 android:paddingLeft="14dp"
+                android:paddingRight="14dp"
+                android:ellipsize="end"
                 android:paddingTop="2dp"
-                android:text="The Weekend - Party test"
+                android:text="Artist"
                 android:textColor="@color/AnyAudioGrey189"
                 android:textSize="12sp" />
 
diff --git a/app/src/main/res/layout/eve_wishing_dialog.xml b/app/src/main/res/layout/eve_wishing_dialog.xml
@@ -36,11 +36,12 @@
             android:layout_below="@+id/eveCaption"
             android:layout_width="36dp"
             android:layout_height="3dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginBottom="4dp"
             android:layout_gravity="center_horizontal"
             android:background="@drawable/explore_text_under_tip"/>
 
     </RelativeLayout>
+
     <TextView
         android:layout_centerHorizontal="true"
         android:gravity="center_horizontal"
@@ -50,17 +51,23 @@
         android:id="@+id/eveMessage"
         android:paddingRight="48dp"
         android:paddingLeft="48dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="4dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
 
-    <android.support.v7.widget.GridLayout
+    <GridView
         android:id="@+id/eveSuggestionsGrid"
+        android:layout_margin="8dp"
         android:layout_below="@+id/eveMessage"
         android:layout_above="@+id/eveAddToQueue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:stretchMode="columnWidth"
+        android:verticalSpacing="20dp"
+        android:gravity="center"
+        android:horizontalSpacing="20dp"
         />
 
     <TextView
diff --git a/eveTest.txt b/eveTest.txt
@@ -0,0 +1,10 @@
+#???? ???? ????? ??? ???????? ????  Lasar Fasar Holi Me  Kallu Ji  Bhojpuri Hot Holi Songs 2016 new#? ????? ?? ????  Ae Saloni Ke Papa  Ghare Ayili Mayariya  Kallu Ji  Bhojpuri Devi Geet 2016 new#kallu bhojpuri song sa man ke#Lalten Phir Jari  BHOJPURI HOT SONG   KALLU   BALMA BIHARWALA 2
+
+
+#fSRuZ3BpdmokPCIkODw1OyQuIiRrZiQ8IiR1b0NZe21OaTgvdSQuIiR2a3ZuZyQ8IiTgpK_gpY7gpJ7gpYIi4KSY4KWN4KSe4KSmIuCkruClgOCko-CkvuClgiLgpLTgpYDgpLAi4KSs4KWB4KSc4KSX4KSy4KWB4KSx4KWAIuCkqOClgOCkqOClgCIvIk5jdWN0IkhjdWN0IkpxbmsiT2ciLyJNY25udyJMayIvIkRqcWxyd3RrIkpxdiJKcW5rIlVxcGl1IjQyMzgicGd5JH8=#fSRuZ3BpdmokPCIkNzw1OSQuIiRrZiQ8IiRwd1N1R2ZzVFFwMiQuIiR2a3ZuZyQ8IiTgpJIi4KS64KS04KWN4KSq4KWCIuCkl-CliSLgpKzgpYDgpKzgpYAiLyJDZyJVY25xcGsiTWciUmNyYyIvIklqY3RnIkN7a25rIk9je2N0a3tjIi8iTWNubnciTGsiLyJEanFscnd0ayJGZ3hrIklnZ3YiNDIzOCJwZ3kkfw==#fSRuZ3BpdmokPCIkNDw0MiQuIiRrZiQ8IiRGTlEzW0NTNXFYVyQuIiR2a3ZuZyQ8IiRtY25udyJkanFscnd0ayJ1cXBpInVjIm9jcCJtZyR_#fSRuZ3BpdmokPCIkNDw0OyQuIiRrZiQ8IiRcVXRDanFHXG5ZTyQuIiR2a3ZuZyQ8IiROY252Z3AiUmprdCJMY3RrIi8iREpRTFJXVEsiSlFWIlVRUEkifiJNQ05OVyJ-IkRDTk9DIkRLSkNUWUNOQyI0JH8=
+
+
+
+#smAWykLg6-s#nuQsEdqROn0#DLO1YAQ3oVU#ZSrAhoEZlWM
+
+#Wave Music#Wave Music#Saurav Mishra#Worldwide Records Bhojpuri
