JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
# 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
This commit is contained in:
Aran Zaiger 2016-07-08 00:16:47 +03:00
parent f7eb10433f
commit 6a37640637
6 changed files with 180 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,8 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
private final int MAX_ZOOM = 16, MIN_ZOOM = 9; private final int MAX_ZOOM = 16, MIN_ZOOM = 9;
public GmapFragment() {} public GmapFragment() {
}
public static GmapFragment newInstance(String param1, String param2) { 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>> { private class getMarkersFromNotes extends AsyncTask<List<Note>, MarkerOptions, List<MarkerOptions>> {
GoogleMap mMap; GoogleMap mMap;
// GmapFragment gmap; // GmapFragment gmap;
@ -201,7 +198,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
.title(n.getTitle()) .title(n.getTitle())
.position(new LatLng(n.getLat(), n.getLon())) .position(new LatLng(n.getLat(), n.getLon()))
.snippet(n.getBody()) .snippet(n.getBody())
.icon(BitmapDescriptorFactory.fromBitmap(Bitmap.createScaledBitmap(Utils.getBitmapFromURL(url),80,80,false))); .icon(BitmapDescriptorFactory.fromBitmap(Bitmap.createScaledBitmap(Utils.getBitmapFromURL(url), 80, 80, false)));
publishProgress(mo); publishProgress(mo);
// ); // );

40
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/HeavyWorker.java
View file

@ -7,39 +7,39 @@ import android.os.AsyncTask;
/** /**
* Created by aranza on 7/2/2016. * Created by aranza on 7/2/2016.
*/ */
public class HeavyWorker extends AsyncTask< String , Context , Void > { public class HeavyWorker extends AsyncTask<String, Context, Void> {
private ProgressDialog progressDialog ; private ProgressDialog progressDialog;
private Context targetCtx ; private Context targetCtx;
public HeavyWorker ( Context context ) { public HeavyWorker(Context context) {
this.targetCtx = context ; this.targetCtx = context;
progressDialog = new ProgressDialog ( targetCtx ) ; progressDialog = new ProgressDialog(targetCtx);
progressDialog.setCancelable ( false ) ; progressDialog.setCancelable(false);
progressDialog.setMessage ( "Retrieving data..." ) ; progressDialog.setMessage("Retrieving data...");
progressDialog.setTitle ( "Please wait" ) ; progressDialog.setTitle("Please wait");
progressDialog.setIndeterminate ( true ) ; progressDialog.setIndeterminate(true);
} }
@ Override @Override
protected void onPreExecute ( ) { protected void onPreExecute() {
progressDialog.show ( ) ; progressDialog.show();
} }
@ Override @Override
protected Void doInBackground ( String ... params ) { protected Void doInBackground(String... params) {
// Do Your WORK here // Do Your WORK here
// MainActivity ps = (MainActivity) targetCtx; // MainActivity ps = (MainActivity) targetCtx;
// ps.getAllNotes(); // ps.getAllNotes();
return null ; return null;
} }
@ Override @Override
protected void onPostExecute ( Void result ) { protected void onPostExecute(Void result) {
if(progressDialog != null && progressDialog.isShowing()){ if (progressDialog != null && progressDialog.isShowing()) {
progressDialog.dismiss ( ) ; progressDialog.dismiss();
} }
} }
} }

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

@ -15,6 +15,7 @@ import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.android.volley.Response; import com.android.volley.Response;
import com.android.volley.VolleyError; import com.android.volley.VolleyError;
@ -80,12 +81,13 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
Log.d(TAG, "user: " + username); Log.d(TAG, "user: " + username);
Log.d(TAG, "pwd: " + password); Log.d(TAG, "pwd: " + password);
if(TextUtils.isEmpty(username) || !isUsernameValid(username) || TextUtils.isEmpty(password) || !isPasswordValid(password)) { if (TextUtils.isEmpty(username) || !isUsernameValid(username) || TextUtils.isEmpty(password) || !isPasswordValid(password)) {
return false; return false;
} else{ } else {
return true; return true;
} }
} }
private void attemptLogin() { private void attemptLogin() {
Utils.showLoadingDialog(this, "Connecting", "Authenticating data"); Utils.showLoadingDialog(this, "Connecting", "Authenticating data");
mPasswordView.setError(null); mPasswordView.setError(null);
@ -134,11 +136,11 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
likedNotes += User.LIKED_NOTES_DELIMETER; likedNotes += User.LIKED_NOTES_DELIMETER;
} }
} }
editor.putString("UserData", id+User.ATTARS_DELIMETER+username+User.ATTARS_DELIMETER+password+User.ATTARS_DELIMETER+email+User.ATTARS_DELIMETER+avatar+User.ATTARS_DELIMETER+likedNotes); editor.putString("UserData", id + User.ATTARS_DELIMETER + username + User.ATTARS_DELIMETER + password + User.ATTARS_DELIMETER + email + User.ATTARS_DELIMETER + avatar + User.ATTARS_DELIMETER + likedNotes);
editor.commit(); editor.commit();
Intent personalSpaceActivity = new Intent(LoginActivity.this, MainActivity.class); Intent personalSpaceActivity = new Intent(LoginActivity.this, MainActivity.class);
Bundle loginUserBundle = new Bundle(); Bundle loginUserBundle = new Bundle();
loginUserBundle.putString("UserData", id+User.ATTARS_DELIMETER+username+User.ATTARS_DELIMETER+password+User.ATTARS_DELIMETER+email+User.ATTARS_DELIMETER+avatar+User.ATTARS_DELIMETER+likedNotes); loginUserBundle.putString("UserData", id + User.ATTARS_DELIMETER + username + User.ATTARS_DELIMETER + password + User.ATTARS_DELIMETER + email + User.ATTARS_DELIMETER + avatar + User.ATTARS_DELIMETER + likedNotes);
personalSpaceActivity.putExtras(loginUserBundle); personalSpaceActivity.putExtras(loginUserBundle);
Utils.dismissLoadingDialog(); Utils.dismissLoadingDialog();
startActivity(personalSpaceActivity); startActivity(personalSpaceActivity);
@ -162,7 +164,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
@Override @Override
public void onErrorResponse(VolleyError error) { public void onErrorResponse(VolleyError error) {
Utils.dismissLoadingDialog(); Utils.dismissLoadingDialog();
Toast.makeText(self , "Username Or Password Incorrect", Toast.LENGTH_LONG).show(); Toast.makeText(self, "Username Or Password Incorrect", Toast.LENGTH_LONG).show();
//Clean texts //Clean texts
self.mUsernameView.getText().clear(); self.mUsernameView.getText().clear();
self.mPasswordView.getText().clear(); self.mPasswordView.getText().clear();

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

@ -3,9 +3,11 @@ package com.android_app.matan.ara.sagi.thesocialnotework;
/** /**
* Created by aran on 5/26/16. * Created by aran on 5/26/16.
*/ */
import com.android.volley.toolbox.ImageLoader.ImageCache;
import android.graphics.Bitmap; import com.android.volley.toolbox.ImageLoader.ImageCache;
import android.support.v4.util.LruCache;
import android.graphics.Bitmap;
import android.support.v4.util.LruCache;
/** /**
* A class to extend the LruCache class - for better image caching * A class to extend the LruCache class - for better image caching

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

@ -10,13 +10,16 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.Toast; import android.widget.Toast;
import com.android.volley.Response; import com.android.volley.Response;
import com.android.volley.VolleyError; import com.android.volley.VolleyError;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class RegisterActivity extends AppCompatActivity implements View.OnClickListener{ public class RegisterActivity extends AppCompatActivity implements View.OnClickListener {
private EditText mUsernameView; private EditText mUsernameView;
private EditText mPasswordView; private EditText mPasswordView;
@ -58,11 +61,13 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
private boolean isUsernameValid(String username) { private boolean isUsernameValid(String username) {
return !TextUtils.isEmpty(username) && username.length() > 0; return !TextUtils.isEmpty(username) && username.length() > 0;
} }
private boolean isPasswordValid(String password) { private boolean isPasswordValid(String password) {
return !TextUtils.isEmpty(password) && password.length() > 3; return !TextUtils.isEmpty(password) && password.length() > 3;
} }
private boolean isEmailValid(String email) { private boolean isEmailValid(String email) {
if(TextUtils.isEmpty(email)) if (TextUtils.isEmpty(email))
return false; return false;
String expression = "^[\\w\\.-]+@([\\w\\-]+\\.)+[A-Z]{2,4}$"; String expression = "^[\\w\\.-]+@([\\w\\-]+\\.)+[A-Z]{2,4}$";
Pattern pattern = Pattern.compile(expression, Pattern.CASE_INSENSITIVE); Pattern pattern = Pattern.compile(expression, Pattern.CASE_INSENSITIVE);
@ -91,7 +96,7 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
} catch (Exception e) { } catch (Exception e) {
Log.d(TAG, e.toString()); Log.d(TAG, e.toString());
} }
Log.d(TAG,"JSON: "+tempJson.toString()); Log.d(TAG, "JSON: " + tempJson.toString());
VolleyUtilSingleton.getInstance(RegisterActivity.this).post(BASE_URL + REG_PATH, tempJson, onRegisterSuccess, onRegisterError); VolleyUtilSingleton.getInstance(RegisterActivity.this).post(BASE_URL + REG_PATH, tempJson, onRegisterSuccess, onRegisterError);
} else { } else {
Utils.dismissLoadingDialog(); Utils.dismissLoadingDialog();
@ -103,19 +108,19 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
Response.Listener<JSONObject> onRegisterSuccess = new Response.Listener<JSONObject>() { Response.Listener<JSONObject> onRegisterSuccess = new Response.Listener<JSONObject>() {
@Override @Override
public void onResponse(JSONObject response) { public void onResponse(JSONObject response) {
Log.d(TAG,"response: "+ response.toString()); Log.d(TAG, "response: " + response.toString());
Utils.dismissLoadingDialog(); Utils.dismissLoadingDialog();
try { try {
if(response.getString("message").equals("created")) { if (response.getString("message").equals("created")) {
Log.d(TAG, "onRegisterSuccess => user created"); // TODO: REMOVE console Log.d(TAG, "onRegisterSuccess => user created"); // TODO: REMOVE console
Intent loginActivity = new Intent(RegisterActivity.this, LoginActivity.class); Intent loginActivity = new Intent(RegisterActivity.this, LoginActivity.class);
Toast.makeText(self, "You are now a social notework member - You May Login...", Toast.LENGTH_LONG).show(); Toast.makeText(self, "You are now a social notework member - You May Login...", Toast.LENGTH_LONG).show();
startActivity(loginActivity); startActivity(loginActivity);
} else { } else {
Toast.makeText(self , "Username is already taken. maybe: " + mUsernameView.getText().toString()+"_666 ? :)", Toast.LENGTH_LONG).show(); Toast.makeText(self, "Username is already taken. maybe: " + mUsernameView.getText().toString() + "_666 ? :)", Toast.LENGTH_LONG).show();
Log.d(TAG, "Cannot create user, " + response.getString("message")); Log.d(TAG, "Cannot create user, " + response.getString("message"));
} }
}catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "onRegisterSuccess:" + e.getMessage()); Log.e(TAG, "onRegisterSuccess:" + e.getMessage());
} }
@ -126,14 +131,14 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
@Override @Override
public void onErrorResponse(VolleyError error) { public void onErrorResponse(VolleyError error) {
Utils.dismissLoadingDialog(); Utils.dismissLoadingDialog();
Toast.makeText(self , "Username is already taken. maybe: " + mUsernameView.getText().toString()+"_666 ? :)", Toast.LENGTH_LONG).show(); Toast.makeText(self, "Username is already taken. maybe: " + mUsernameView.getText().toString() + "_666 ? :)", Toast.LENGTH_LONG).show();
Log.d(TAG, "onRegisterError: msg: " + error.getMessage()); Log.d(TAG, "onRegisterError: msg: " + error.getMessage());
} }
}; };
@Override @Override
public void onClick(View view) { public void onClick(View view) {
switch(view.getId()){ switch (view.getId()) {
case R.id.ra_register_button: case R.id.ra_register_button:
attemptRegister(); attemptRegister();
break; break;
@ -143,7 +148,7 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
} }
} }
private void returnToLogin(){ private void returnToLogin() {
Intent i = new Intent(RegisterActivity.this, LoginActivity.class); Intent i = new Intent(RegisterActivity.this, LoginActivity.class);
startActivity(i); startActivity(i);
finish(); finish();

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

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