Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

fix avatars

This commit is contained in:
tom79 2019-08-01 09:42:05 +02:00
parent 8e257e55a4
commit a2dbc8c810
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
View File

@ -930,7 +930,7 @@ public abstract class BaseMainActivity extends BaseActivity
drawer.openDrawer(GravityCompat.START);
}
});
Helper.loadPictureIcon(BaseMainActivity.this, account.getAvatar(),iconbar);
Helper.loadPictureIcon(BaseMainActivity.this, account,iconbar);
headerLayout = navigationView.getHeaderView(0);
final ImageView menuMore = headerLayout.findViewById(R.id.header_option_menu);

2
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -2010,7 +2010,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if (status.getReblog() != null) {
Helper.loadGiF(context, accountForUrl, holder.status_account_profile_boost);
Helper.loadGiF(context, status.getAccount().getAvatar(), holder.status_account_profile_boost_by);
Helper.loadGiF(context, status.getAccount(), holder.status_account_profile_boost_by);
holder.status_account_profile_boost.setVisibility(View.VISIBLE);
holder.status_account_profile_boost_by.setVisibility(View.VISIBLE);
holder.status_account_profile.setVisibility(View.GONE);

15
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -1620,13 +1620,10 @@ public class Helper {
/**
* Load the profile picture at the place of hamburger icon
* @param activity Activity The current activity
* @param url String the url of the profile picture
* @param account Account for the profile picture
*/
public static void loadPictureIcon(final Activity activity, String url, final ImageView imageView){
if( url.startsWith("/") ){
url = Helper.getLiveInstanceWithProtocol(activity) + url;
}
loadGiF(activity,url, imageView);
public static void loadPictureIcon(final Activity activity, Account account, final ImageView imageView){
loadGiF(activity,account, imageView);
}
@ -2019,11 +2016,7 @@ public class Helper {
account.makeAccountNameEmoji(activity, ((BaseMainActivity)activity), account);
username.setText(String.format("@%s",account.getUsername() + "@" + account.getInstance()));
displayedName.setText(account.getdisplayNameSpan(), TextView.BufferType.SPANNABLE);
String url = account.getAvatar();
if( url.startsWith("/") ){
url = Helper.getLiveInstanceWithProtocol(activity) + account.getAvatar();
}
loadGiF(activity, url, profilePicture);
loadGiF(activity, account, profilePicture);
String urlHeader = account.getHeader();
if( urlHeader.startsWith("/") ){
urlHeader = Helper.getLiveInstanceWithProtocol(activity) + account.getHeader();