Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android

# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java

app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java

@@ -53,7 +53,8 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
     private final int MAX_ZOOM = 16, MIN_ZOOM = 9;
 
 
-    public GmapFragment() {}
+    public GmapFragment() {
+    }
 
 
     public static GmapFragment newInstance(String param1, String param2) {
@@ -159,10 +160,6 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
     };
 
 
-
-
-
-
     private class getMarkersFromNotes extends AsyncTask<List<Note>, MarkerOptions, List<MarkerOptions>> {
         GoogleMap mMap;
 //        GmapFragment gmap;

app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java

@@ -15,6 +15,7 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 
@@ -86,6 +87,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
             return true;
         }
     }
+
     private void attemptLogin() {
         Utils.showLoadingDialog(this, "Connecting", "Authenticating data");
         mPasswordView.setError(null);

app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LruBitmapCache.java

@@ -3,7 +3,9 @@ package com.android_app.matan.ara.sagi.thesocialnotework;
 /**
  * Created by aran on 5/26/16.
  */
+
 import com.android.volley.toolbox.ImageLoader.ImageCache;
+
 import android.graphics.Bitmap;
 import android.support.v4.util.LruCache;
 

app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/RegisterActivity.java

@@ -10,9 +10,12 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
+
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
+
 import org.json.JSONObject;
+
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -58,9 +61,11 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
     private boolean isUsernameValid(String username) {
         return !TextUtils.isEmpty(username) && username.length() > 0;
     }
+
     private boolean isPasswordValid(String password) {
         return !TextUtils.isEmpty(password) && password.length() > 3;
     }
+
     private boolean isEmailValid(String email) {
         if (TextUtils.isEmpty(email))
             return false;

app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java

@@ -30,8 +30,6 @@ public class Utils {
     public static ProgressDialog progress;
 
 
-
-
     public static Bitmap getBitmapFromURL(String imageUrl) {
 
         try {
@@ -74,7 +72,6 @@ public class Utils {
     }
 
 
-
     public static Note getNoteFromJsonObj(JSONObject noteObject, Date time) throws JSONException {
 //            List<Note> listOfNotes = new ArrayList<>();