From f887dfbfed33dbca1a7a57379a907e9611342418 Mon Sep 17 00:00:00 2001 From: nisargkolhe Date: Sat, 28 Jan 2017 13:50:02 -0500 Subject: [PATCH 1/3] Fixed back button on UserProfileActivity --- .../activities/UserProfileActivity.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java b/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java index 93d6e4c..363b59b 100644 --- a/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java +++ b/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java @@ -18,6 +18,7 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; @@ -25,13 +26,6 @@ import android.widget.ProgressBar; import android.widget.TextView; -import io.easycourse.www.easycourse.EasyCourse; -import io.easycourse.www.easycourse.R; -import io.easycourse.www.easycourse.models.main.Language; -import io.easycourse.www.easycourse.models.main.User; -import io.easycourse.www.easycourse.utils.BitmapUtils; -import io.easycourse.www.easycourse.utils.SocketIO; -import io.easycourse.www.easycourse.utils.asyntasks.CompressImageTask; import com.squareup.picasso.Picasso; import org.json.JSONException; @@ -40,6 +34,13 @@ import butterknife.BindView; import butterknife.ButterKnife; import de.hdodenhof.circleimageview.CircleImageView; +import io.easycourse.www.easycourse.EasyCourse; +import io.easycourse.www.easycourse.R; +import io.easycourse.www.easycourse.models.main.Language; +import io.easycourse.www.easycourse.models.main.User; +import io.easycourse.www.easycourse.utils.BitmapUtils; +import io.easycourse.www.easycourse.utils.SocketIO; +import io.easycourse.www.easycourse.utils.asyntasks.CompressImageTask; import io.realm.Realm; import io.socket.client.Ack; @@ -368,4 +369,13 @@ public void run() { }; thread.start(); } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; + } + return false; + } } \ No newline at end of file From 1e2e0e4fd113f95809e2ebfa0b8f86f909a52f0e Mon Sep 17 00:00:00 2001 From: nisargkolhe Date: Sat, 28 Jan 2017 15:25:17 -0500 Subject: [PATCH 2/3] Added email to UserProfileActivity --- .../activities/UserProfileActivity.java | 9 +++++ .../main/res/layout/activity_userprofile.xml | 34 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java b/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java index 363b59b..33eb1d0 100644 --- a/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java +++ b/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java @@ -23,6 +23,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageButton; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; @@ -58,6 +59,10 @@ public class UserProfileActivity extends AppCompatActivity { Toolbar toolbar; @BindView(R.id.textViewUsername) TextView textViewUsername; + @BindView(R.id.textViewEmail) + TextView textViewEmail; + @BindView(R.id.emailContainerLinearLayout) + LinearLayout emailContainer; @BindView(R.id.editTextUsername) EditText editTextUsername; @BindView(R.id.saveChangesButton) @@ -135,6 +140,10 @@ public void onImageLoadFailed(Picasso picasso, Uri uri, Exception exception) { } textViewUsername.setText(user.getUsername()); editTextUsername.setText(user.getUsername()); + if(user.getEmail() != null){ + emailContainer.setVisibility(View.VISIBLE); + textViewEmail.setText(user.getEmail()); + } } // languageLabel.setText("Chosen language(s):"); diff --git a/app/src/main/res/layout/activity_userprofile.xml b/app/src/main/res/layout/activity_userprofile.xml index 1c8fdfb..a70545a 100644 --- a/app/src/main/res/layout/activity_userprofile.xml +++ b/app/src/main/res/layout/activity_userprofile.xml @@ -105,6 +105,40 @@ + + + + + + + + + + + + + Date: Sun, 19 Feb 2017 12:58:54 -0500 Subject: [PATCH 3/3] Merged develop --- .idea/misc.xml | 2 +- .../easycourse/activities/BaseActivity.java | 1 - .../activities/UserProfileActivity.java | 23 ++++--------------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index f8cc316..45c2291 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -40,7 +40,7 @@ - + diff --git a/app/src/main/java/io/easycourse/www/easycourse/activities/BaseActivity.java b/app/src/main/java/io/easycourse/www/easycourse/activities/BaseActivity.java index 95f5a64..f85973d 100644 --- a/app/src/main/java/io/easycourse/www/easycourse/activities/BaseActivity.java +++ b/app/src/main/java/io/easycourse/www/easycourse/activities/BaseActivity.java @@ -3,7 +3,6 @@ import android.os.Bundle; import android.support.v7.app.AppCompatActivity; -import butterknife.ButterKnife; import io.easycourse.www.easycourse.EasyCourse; import io.easycourse.www.easycourse.models.main.User; import io.easycourse.www.easycourse.utils.SocketIO; diff --git a/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java b/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java index 99e7843..db0718e 100644 --- a/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java +++ b/app/src/main/java/io/easycourse/www/easycourse/activities/UserProfileActivity.java @@ -15,10 +15,9 @@ import android.support.design.widget.Snackbar; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; -import android.view.KeyEvent; +import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; @@ -35,22 +34,10 @@ import butterknife.BindView; import butterknife.ButterKnife; import de.hdodenhof.circleimageview.CircleImageView; -import io.easycourse.www.easycourse.EasyCourse; import io.easycourse.www.easycourse.R; import io.easycourse.www.easycourse.models.main.Language; -import io.easycourse.www.easycourse.models.main.User; import io.easycourse.www.easycourse.utils.BitmapUtils; -import io.easycourse.www.easycourse.utils.SocketIO; import io.easycourse.www.easycourse.utils.asyntasks.CompressImageTask; - -import com.squareup.picasso.Picasso; - -import org.json.JSONException; -import org.json.JSONObject; - -import butterknife.BindView; -import butterknife.ButterKnife; -import de.hdodenhof.circleimageview.CircleImageView; import io.realm.Realm; import io.socket.client.Ack; @@ -149,11 +136,11 @@ public void onImageLoadFailed(Picasso picasso, Uri uri, Exception exception) { } else { avatarImage.setImageResource(R.drawable.ic_account_circle_black_48dp); } - textViewUsername.setText(user.getUsername()); - editTextUsername.setText(user.getUsername()); - if(user.getEmail() != null){ + textViewUsername.setText(currentUser.getUsername()); + editTextUsername.setText(currentUser.getUsername()); + if(currentUser.getEmail() != null){ emailContainer.setVisibility(View.VISIBLE); - textViewEmail.setText(user.getEmail()); + textViewEmail.setText(currentUser.getEmail()); } }