V:2.0.0.0.

First deply - first content product.

Author: fernandonitz

TALLER2/src/main/java/com/example/fernandon/android_client/TALLER2/adapters/AmistadesListAdapter.java

@@ -1,5 +1,8 @@
 package com.example.fernandon.android_client.TALLER2.adapters;
 
+import android.graphics.Bitmap;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -50,9 +53,19 @@ public AmistadesViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     @Override
     public void onBindViewHolder(AmistadesViewHolder holder, int position) {
         final Amistad amistad = mAmistades.get(position);
-        holder.mPicture.setImageBitmap(amistad.getPicture());
-        holder.mName.setText(amistad.getName());
 
+        Bitmap originalBitmap = amistad.getPicture();
+        if (originalBitmap.getWidth() > originalBitmap.getHeight()){
+            originalBitmap = Bitmap.createBitmap(originalBitmap, 0, 0, originalBitmap.getHeight(), originalBitmap.getHeight());
+        }else if (originalBitmap.getWidth() < originalBitmap.getHeight()) {
+            originalBitmap = Bitmap.createBitmap(originalBitmap, 0, 0, originalBitmap.getWidth(), originalBitmap.getWidth());
+        }
+        RoundedBitmapDrawable roundedDrawable = RoundedBitmapDrawableFactory.create(
+                holder.mView.getContext().getResources(), originalBitmap);
+        roundedDrawable.setCornerRadius(originalBitmap.getHeight());
+
+        holder.mPicture.setImageDrawable(roundedDrawable);
+        holder.mName.setText(amistad.getName());
 
         holder.mView.setOnClickListener(new View.OnClickListener() {
             @Override

TALLER2/src/main/java/com/example/fernandon/android_client/TALLER2/adapters/HistoriasListAdapter.java

@@ -1,5 +1,8 @@
 package com.example.fernandon.android_client.TALLER2.adapters;
 
+import android.graphics.Bitmap;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,11 +33,13 @@ public static class HistoriasViewHolder extends RecyclerView.ViewHolder {
         private final TextView mDescripcion;
         private final TextView mUbicacion;
         private final TextView mFecha;
+        private final ImageView mPictureUser;
 
 
         HistoriasViewHolder(View itemView) {
             super(itemView);
             mView = itemView;
+            mPictureUser = (ImageView) itemView.findViewById(R.id.imgUsuarioHistoria);
             mPicture = (ImageView) itemView.findViewById(R.id.imageHistoria);
             mTitulo = (TextView) itemView.findViewById(R.id.textTitulo);
             mDescripcion = (TextView) itemView.findViewById(R.id.textDescripcion);
@@ -60,8 +65,18 @@ public HistoriasListAdapter.HistoriasViewHolder onCreateViewHolder(ViewGroup par
     public void onBindViewHolder(HistoriasViewHolder holder, int position) {
         final Historia historia = mHistoria.get(position);
 
-        holder.mPicture.setImageBitmap(historia.getPicture());
+        Bitmap originalBitmap = historia.getPictureUsr();
+        if (originalBitmap.getWidth() > originalBitmap.getHeight()){
+            originalBitmap = Bitmap.createBitmap(originalBitmap, 0, 0, originalBitmap.getHeight(), originalBitmap.getHeight());
+        }else if (originalBitmap.getWidth() < originalBitmap.getHeight()) {
+            originalBitmap = Bitmap.createBitmap(originalBitmap, 0, 0, originalBitmap.getWidth(), originalBitmap.getWidth());
+        }
+        RoundedBitmapDrawable roundedDrawable = RoundedBitmapDrawableFactory.create(
+                holder.mView.getContext().getResources(), originalBitmap);
+        roundedDrawable.setCornerRadius(originalBitmap.getHeight());
 
+        holder.mPictureUser.setImageDrawable(roundedDrawable);
+        holder.mPicture.setImageBitmap(historia.getPicture());
         holder.mTitulo.setText(historia.getmTitulo());
         holder.mDescripcion.setText(historia.getDescription());
         holder.mFecha.setText(historia.getFecha());

TALLER2/src/main/java/com/example/fernandon/android_client/TALLER2/model/Historia.java

@@ -8,6 +8,7 @@ public class Historia {
     private String mFecha = "";
     private String mUbicacion = "";
     private Bitmap mPicture;
+    private Bitmap mPictureUser;
 
 
     public Historia(String titulo) {
@@ -22,6 +23,10 @@ public void setTitulo(String titulo) {
         this.mTitulo = titulo;
     }
 
+    public void setPictureUsr(Bitmap picture){ this.mPictureUser = picture;}
+
+    public Bitmap getPictureUsr() {return this.mPictureUser;}
+
     public String getDescription() {
         return mDescription;
     }

TALLER2/src/main/java/com/example/fernandon/android_client/TALLER2/services/MockAmistadesService.java

@@ -1,10 +1,9 @@
 package com.example.fernandon.android_client.TALLER2.services;
 
 import android.content.Context;
-
+import com.example.fernandon.android_client.TALLER2.R;
+import android.graphics.BitmapFactory;
 import com.example.fernandon.android_client.TALLER2.model.Amistad;
-import com.example.fernandon.android_client.TALLER2.services.AmistadesService;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,8 +22,8 @@ public void updateAmistadesData() {
         mAmistades = new ArrayList<>();
         Amistad c1 = new Amistad("Fernando Nitz");
         Amistad c2 = new Amistad("Manuel Ortiz");
-        //c1.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.pizzaprueba2));
-        //c2.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.images));
+        c1.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.ringo));
+        c2.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.markz));
         mAmistades.add(c1);
         mAmistades.add(c2);
     }

TALLER2/src/main/java/com/example/fernandon/android_client/TALLER2/services/MockHistoriasService.java

@@ -35,6 +35,9 @@ public void updateHistoriasData() {
         c1.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.river4));
         c2.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.river4));
 
+        c1.setPictureUsr(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.diego));
+        c2.setPictureUsr(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.elche));
+
         mHistorias.add(c1);
         mHistorias.add(c2);
     }

TALLER2/src/main/java/com/example/fernandon/android_client/TALLER2/services/MockNotificacionService.java

@@ -20,14 +20,14 @@ public MockNotificacionService(Context context) {
     public void updateNotificacionesData() {
 
         mNotificaciones = new ArrayList<>();
-        Notificacion c1 = new Notificacion("Emanuel");
-        Notificacion c2 = new Notificacion("Alejandro");
+        Notificacion c1 = new Notificacion("El Diegote");
+        Notificacion c2 = new Notificacion("Ringo");
 
         c1.setDescription("Emanuel te ha enviado una solicitud de amistad.");
         c2.setDescription("Alejandro ha comentado una foto en la que apareces.");
 
-        c1.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.river4));
-        c2.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.river4));
+        c1.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.diego));
+        c2.setPicture(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.ringo));
         mNotificaciones.add(c1);
         mNotificaciones.add(c2);
     }