diff --git a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java
index f0313f94..ddb53808 100644
--- a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java
@@ -38,11 +38,14 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
+import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ProgressBar;
import com.keylesspalace.tusky.entity.Account;
import com.keylesspalace.tusky.entity.Profile;
+import com.pkmmte.view.CircularImageView;
+import com.squareup.picasso.Picasso;
import com.theartofdev.edmodo.cropper.CropImage;
import java.io.ByteArrayOutputStream;
@@ -73,14 +76,14 @@ public class EditProfileActivity extends BaseActivity {
HEADER
}
- @BindView(R.id.edit_profile_display_name) EditText displayNameEditText;
- @BindView(R.id.edit_profile_note) EditText noteEditText;
- @BindView(R.id.edit_profile_avatar) Button avatarButton;
- @BindView(R.id.edit_profile_avatar_preview) ImageView avatarPreview;
- @BindView(R.id.edit_profile_avatar_progress) ProgressBar avatarProgress;
- @BindView(R.id.edit_profile_header) Button headerButton;
+ @BindView(R.id.edit_profile_header) ImageButton headerButton;
@BindView(R.id.edit_profile_header_preview) ImageView headerPreview;
@BindView(R.id.edit_profile_header_progress) ProgressBar headerProgress;
+ @BindView(R.id.edit_profile_avatar) ImageButton avatarButton;
+ @BindView(R.id.edit_profile_avatar_preview) ImageView avatarPreview;
+ @BindView(R.id.edit_profile_avatar_progress) ProgressBar avatarProgress;
+ @BindView(R.id.edit_profile_display_name) EditText displayNameEditText;
+ @BindView(R.id.edit_profile_note) EditText noteEditText;
@BindView(R.id.edit_profile_save_progress) ProgressBar saveProgress;
private String priorDisplayName;
@@ -100,7 +103,7 @@ public class EditProfileActivity extends BaseActivity {
setSupportActionBar(toolbar);
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
- actionBar.setTitle(null);
+ actionBar.setTitle(getString(R.string.title_edit_profile));
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setDisplayShowHomeEnabled(true);
}
@@ -121,6 +124,8 @@ public class EditProfileActivity extends BaseActivity {
headerBase64 = null;
}
+
+
avatarButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -138,7 +143,7 @@ public class EditProfileActivity extends BaseActivity {
@Override
public void onClick(View v) {
avatarPreview.setImageBitmap(null);
- avatarPreview.setVisibility(View.GONE);
+ avatarPreview.setVisibility(View.INVISIBLE);
avatarBase64 = null;
}
});
@@ -146,7 +151,7 @@ public class EditProfileActivity extends BaseActivity {
@Override
public void onClick(View v) {
headerPreview.setImageBitmap(null);
- headerPreview.setVisibility(View.GONE);
+ headerPreview.setVisibility(View.INVISIBLE);
headerBase64 = null;
}
});
@@ -161,8 +166,20 @@ public class EditProfileActivity extends BaseActivity {
Account me = response.body();
priorDisplayName = me.getDisplayName();
priorNote = me.note.toString();
+ CircularImageView avatar = (CircularImageView) findViewById(R.id.edit_profile_avatar_preview);
+ ImageView header = (ImageView) findViewById(R.id.edit_profile_header_preview);
+
displayNameEditText.setText(priorDisplayName);
noteEditText.setText(priorNote);
+ Picasso.with(avatar.getContext())
+ .load(me.avatar)
+ .placeholder(R.drawable.avatar_default)
+ .error(R.drawable.avatar_error)
+ .into(avatar);
+ Picasso.with(header.getContext())
+ .load(me.header)
+ .placeholder(R.drawable.account_header_missing)
+ .into(header);
}
@Override
@@ -337,12 +354,10 @@ public class EditProfileActivity extends BaseActivity {
switch (currentlyPicking) {
case AVATAR: {
avatarProgress.setVisibility(View.GONE);
- avatarPreview.setVisibility(View.GONE);
break;
}
case HEADER: {
headerProgress.setVisibility(View.GONE);
- headerPreview.setVisibility(View.GONE);
break;
}
}
diff --git a/app/src/main/res/drawable/ic_add_a_photo_32dp.xml b/app/src/main/res/drawable/ic_add_a_photo_32dp.xml
new file mode 100644
index 00000000..172c5ace
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_a_photo_32dp.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_check_32dp.xml b/app/src/main/res/drawable/ic_check_32dp.xml
new file mode 100644
index 00000000..d6672246
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_32dp.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/app/src/main/res/drawable/round_button.xml b/app/src/main/res/drawable/round_button.xml
new file mode 100644
index 00000000..cdcac515
--- /dev/null
+++ b/app/src/main/res/drawable/round_button.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
index 4f224a72..cf83cb16 100644
--- a/app/src/main/res/layout/activity_edit_profile.xml
+++ b/app/src/main/res/layout/activity_edit_profile.xml
@@ -1,5 +1,7 @@
-
-
+
-
-
-
+
-
+ android:id="@+id/edit_profile_header_progress"
+ android:layout_centerInParent="true"
+ android:indeterminate="true"
+ android:visibility="gone" />
-
+ android:text="@string/label_header"
+ android:labelFor="@+id/edit_profile_header"
+ android:visibility="gone"/>
-
+
+
+ android:paddingLeft="16dp"
+ android:layout_marginTop="-40dp">
-
+ android:contentDescription="@null" />
-
-
-
-
+ android:text="@string/label_avatar"
+ android:labelFor="@+id/edit_profile_avatar"
+ android:visibility="gone"/>
-
-
-
+ android:textColor="@color/text_color_primary_dark"
+ android:elevation="4dp"
+ android:background="@drawable/round_button"/>
+
-
-
-
+ android:layout_marginTop="30dp">
-
+ android:id="@+id/edit_profile_display_name"
+ android:hint="@string/hint_display_name"
+ android:maxLength="30"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp" />
-
+
+
+
+
+
+
+
diff --git a/app/src/main/res/menu/edit_profile_toolbar.xml b/app/src/main/res/menu/edit_profile_toolbar.xml
index c49471b5..49a91392 100644
--- a/app/src/main/res/menu/edit_profile_toolbar.xml
+++ b/app/src/main/res/menu/edit_profile_toolbar.xml
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5baad85c..e90d5fb5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
Muted users
Blocked users
Follow Requests
+ Edit your profile
\@%s
%s boosted