chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Add gestion of avatar and header

Browse source
This commit is contained in:
daycode 2017-05-01 15:23:34 +02:00
commit c7e4d17aaf
3 changed files with 66 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java
View file

@ -44,6 +44,8 @@ import android.widget.ProgressBar;
import com.keylesspalace.tusky.entity.Account; import com.keylesspalace.tusky.entity.Account;
import com.keylesspalace.tusky.entity.Profile; import com.keylesspalace.tusky.entity.Profile;
import com.pkmmte.view.CircularImageView;
import com.squareup.picasso.Picasso;
import com.theartofdev.edmodo.cropper.CropImage; import com.theartofdev.edmodo.cropper.CropImage;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -141,7 +143,7 @@ public class EditProfileActivity extends BaseActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
avatarPreview.setImageBitmap(null); avatarPreview.setImageBitmap(null);
avatarPreview.setVisibility(View.GONE); avatarPreview.setVisibility(View.INVISIBLE);
avatarBase64 = null; avatarBase64 = null;
} }
}); });
@ -149,7 +151,7 @@ public class EditProfileActivity extends BaseActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
headerPreview.setImageBitmap(null); headerPreview.setImageBitmap(null);
headerPreview.setVisibility(View.GONE); headerPreview.setVisibility(View.INVISIBLE);
headerBase64 = null; headerBase64 = null;
} }
}); });
@ -164,8 +166,20 @@ public class EditProfileActivity extends BaseActivity {
Account me = response.body(); Account me = response.body();
priorDisplayName = me.getDisplayName(); priorDisplayName = me.getDisplayName();
priorNote = me.note.toString(); 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); displayNameEditText.setText(priorDisplayName);
noteEditText.setText(priorNote); 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 @Override
@ -340,12 +354,10 @@ public class EditProfileActivity extends BaseActivity {
switch (currentlyPicking) { switch (currentlyPicking) {
case AVATAR: { case AVATAR: {
avatarProgress.setVisibility(View.GONE); avatarProgress.setVisibility(View.GONE);
avatarPreview.setVisibility(View.GONE);
break; break;
} }
case HEADER: { case HEADER: {
headerProgress.setVisibility(View.GONE); headerProgress.setVisibility(View.GONE);
headerPreview.setVisibility(View.GONE);
break; break;
} }
} }

8
app/src/main/res/drawable/round_button.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#66000000" />
<size
android:width="80dp"
android:height="80dp"/>
</shape>

90
app/src/main/res/layout/activity_edit_profile.xml
View file

@ -19,32 +19,15 @@
android:background="?attr/toolbar_background_color" android:background="?attr/toolbar_background_color"
android:elevation="4dp" /> android:elevation="4dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_header"
android:labelFor="@+id/edit_profile_header"
android:visibility="gone"/>
<ImageButton
android:layout_width="match_parent"
android:layout_height="125dp"
android:id="@id/edit_profile_header"
app:srcCompat="@drawable/ic_add_a_photo_32dp"
android:text="@string/action_photo_pick"
android:textColor="@color/text_color_primary_dark" />
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:paddingLeft="16dp">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="125dp" android:layout_height="200dp"
android:id="@+id/edit_profile_header_preview" android:id="@+id/edit_profile_header_preview"
android:contentDescription="@null" android:contentDescription="@null" />
android:visibility="gone" />
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -54,39 +37,34 @@
android:indeterminate="true" android:indeterminate="true"
android:visibility="gone" /> android:visibility="gone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_header"
android:labelFor="@+id/edit_profile_header"
android:visibility="gone"/>
<ImageButton
android:layout_width="match_parent"
android:layout_height="200dp"
android:id="@id/edit_profile_header"
app:srcCompat="@drawable/ic_add_a_photo_32dp"
android:text="@string/action_photo_pick"
android:textColor="@color/text_color_primary_dark"
android:background="#66000000"/>
</RelativeLayout> </RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_avatar"
android:labelFor="@+id/edit_profile_avatar"
android:layout_marginLeft="16dp"
android:visibility="gone"/>
<ImageButton
android:layout_width="80dp"
android:layout_height="80dp"
android:id="@id/edit_profile_avatar"
app:srcCompat="@drawable/ic_add_a_photo_32dp"
android:text="@string/action_photo_pick"
android:textColor="@color/text_color_primary_dark"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="-40dp"
android:elevation="10dp"/>
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp"> android:paddingLeft="16dp"
android:layout_marginTop="-40dp">
<ImageView <com.pkmmte.view.CircularImageView
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:id="@+id/edit_profile_avatar_preview" android:id="@+id/edit_profile_avatar_preview"
android:contentDescription="@null" android:contentDescription="@null" />
android:visibility="gone" />
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -96,13 +74,29 @@
android:indeterminate="true" android:indeterminate="true"
android:visibility="gone" /> android:visibility="gone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_avatar"
android:labelFor="@+id/edit_profile_avatar"
android:visibility="gone"/>
<ImageButton
android:layout_width="80dp"
android:layout_height="80dp"
android:id="@id/edit_profile_avatar"
app:srcCompat="@drawable/ic_add_a_photo_32dp"
android:text="@string/action_photo_pick"
android:textColor="@color/text_color_primary_dark"
android:elevation="4dp"
android:background="@drawable/round_button"/>
</RelativeLayout> </RelativeLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/layout_edit_profile_display_name" android:id="@+id/layout_edit_profile_display_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp"> android:layout_marginTop="30dp">
<EditText <EditText
android:layout_width="match_parent" android:layout_width="match_parent"
@ -119,7 +113,7 @@
android:id="@+id/layout_edit_profile_note" android:id="@+id/layout_edit_profile_note"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp"> android:layout_marginTop="30dp">
<EditText <EditText
android:layout_width="match_parent" android:layout_width="match_parent"