Merge pull request #45 from daeynasvistas/Imagens

Imagens

Author: daeynasvistas

.gitignore

@@ -38,3 +38,4 @@ captures/
 
 # Keystore files
 *.jks
+

.idea/caches/build_file_checksums.ser

@@ -12,6 +12,8 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.ProgressBar;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -202,7 +204,7 @@ private void onPhotosReturned(List<File> returnedPhotos) {
         // já há string ----
         String msg = encodedImage;
 
-        item.setType("3");
+        item.setType("2");
         item.setText(msg);
         data.add(item);
         mAdapter.addItem(data);
@@ -229,7 +231,7 @@ public void run() {
             });
 
             // IPG - Alteração -------------- Dinis
-            mSocket.emit("new message", room,msg, ID);
+            mSocket.emit("new message", room, msg, ID);
             //mSocket.emit("new message", room, text.getText() , ID);
         } catch (Exception e) {
             e.printStackTrace();
@@ -305,6 +307,10 @@ protected void onCreate(Bundle savedInstanceState) {
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
         mRecyclerView.setAdapter(mAdapter);
 
+// initiate progress bar and start button
+        final ProgressBar simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
+
+        simpleProgressBar.setVisibility(View.VISIBLE);
         // receber conversa do mongodb
         AsyncTask.execute(new Runnable() {
             List<ChatData> data = new ArrayList<ChatData>();
@@ -369,6 +375,8 @@ public void run() {
                     e.printStackTrace();
                 }
 // update do UI deve ser feito pelo UI
+
+                
                 Collections.reverse(data);
                 runOnUiThread(new Runnable() {
 
@@ -383,6 +391,7 @@ public void run() {
 
                                     // todo BUG "Invalid target position"
                                     mRecyclerView.smoothScrollToPosition(mRecyclerView.getAdapter().getItemCount() - 1);
+                                    simpleProgressBar.setVisibility(View.INVISIBLE);
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }
@@ -451,8 +460,15 @@ public void onClick(View view) {
                 EasyImage.openGallery(Conversation.this, 0);
             }
         });
-
-
+/*
+        findViewById(R.id.).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+               finish();
+               return;
+            }
+        });
+        */
 
 
         // --- Daey enviar localização

.idea/caches/gradle_models.ser

@@ -8,6 +8,7 @@
 import android.location.Address;
 import android.location.Geocoder;
 import android.location.Location;
+
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.util.Base64;
@@ -217,11 +218,11 @@ public static String getPictureString(List<File> returnedPhotos) {
         Bitmap bm = BitmapFactory.decodeFile(returnedPhotos.get(returnedPhotos.size()-1).toString());
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-        Bitmap converetdImage = getResizedBitmap(bm, 350);
-        Bitmap.createScaledBitmap(converetdImage, 350, 350, true);
+        Bitmap converetdImage = getResizedBitmap(bm, 250);
+        Bitmap.createScaledBitmap(converetdImage, 250, 250, true);
 
 
-        converetdImage.compress(Bitmap.CompressFormat.JPEG, 60, baos); //bm is the bitmap object
+        converetdImage.compress(Bitmap.CompressFormat.JPEG, 50, baos); //bm is the bitmap object
         byte[] b = baos.toByteArray();
 
         String encodedImage = "5_";