Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract functionality to show correct expand/collapse icon

Browse Source 
This was not updating the versions expand icon correctly when the user
clicked on it. It was working when they scrolled away and returned to
the versions list. Now it works for both.
This commit is contained in:
Peter Serwylo 2017-03-15 13:05:51 +11:00
parent b72c418f11
commit c65029ae8d
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
View File

@ -6,6 +6,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.DrawableRes;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewCompat;
@ -578,6 +579,16 @@ public class AppDetailsRecyclerViewAdapter
headerView = (TextView) view.findViewById(R.id.information); headerView = (TextView) view.findViewById(R.id.information);
contentView = (LinearLayout) view.findViewById(R.id.ll_content); contentView = (LinearLayout) view.findViewById(R.id.ll_content);
} }
protected abstract @DrawableRes int getIcon();
/**
* Depending on whether we are expanded or not, update the icon which indicates whether the
* user can expand/collapse this item.
*/
protected void updateExpandableItem(boolean isExpanded) {
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, getIcon(), 0, isExpanded ? R.drawable.ic_expand_less_grey600 : R.drawable.ic_expand_more_grey600, 0);
}
} }
private class VersionsViewHolder extends ExpandableLinearLayoutViewHolder { private class VersionsViewHolder extends ExpandableLinearLayoutViewHolder {
@ -591,10 +602,15 @@ public class AppDetailsRecyclerViewAdapter
@Override @Override
public void onClick(View v) { public void onClick(View v) {
setShowVersions(!showVersions); setShowVersions(!showVersions);
updateExpandableItem(showVersions);
} }
}); });
headerView.setText(R.string.versions); headerView.setText(R.string.versions);
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, R.drawable.ic_access_time_24dp_grey600, 0, showVersions ? R.drawable.ic_expand_less_grey600 : R.drawable.ic_expand_more_grey600, 0); updateExpandableItem(showVersions);
}
protected @DrawableRes int getIcon() {
return R.drawable.ic_access_time_24dp_grey600;
} }
} }
@ -610,16 +626,20 @@ public class AppDetailsRecyclerViewAdapter
public void onClick(View v) { public void onClick(View v) {
boolean shouldBeVisible = contentView.getVisibility() != View.VISIBLE; boolean shouldBeVisible = contentView.getVisibility() != View.VISIBLE;
contentView.setVisibility(shouldBeVisible ? View.VISIBLE : View.GONE); contentView.setVisibility(shouldBeVisible ? View.VISIBLE : View.GONE);
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, R.drawable.ic_lock_24dp_grey600, 0, shouldBeVisible ? R.drawable.ic_expand_less_grey600 : R.drawable.ic_expand_more_grey600, 0); updateExpandableItem(shouldBeVisible);
} }
}); });
headerView.setText(R.string.permissions); headerView.setText(R.string.permissions);
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, R.drawable.ic_lock_24dp_grey600, 0, R.drawable.ic_expand_more_grey600, 0); updateExpandableItem(false);
contentView.removeAllViews(); contentView.removeAllViews();
AppDiff appDiff = new AppDiff(context.getPackageManager(), versions.get(0)); AppDiff appDiff = new AppDiff(context.getPackageManager(), versions.get(0));
AppSecurityPermissions perms = new AppSecurityPermissions(context, appDiff.pkgInfo); AppSecurityPermissions perms = new AppSecurityPermissions(context, appDiff.pkgInfo);
contentView.addView(perms.getPermissionsView(AppSecurityPermissions.WHICH_ALL)); contentView.addView(perms.getPermissionsView(AppSecurityPermissions.WHICH_ALL));
} }
protected @DrawableRes int getIcon() {
return R.drawable.ic_lock_24dp_grey600;
}
} }
private class LinksViewHolder extends ExpandableLinearLayoutViewHolder { private class LinksViewHolder extends ExpandableLinearLayoutViewHolder {
@ -634,11 +654,11 @@ public class AppDetailsRecyclerViewAdapter
public void onClick(View v) { public void onClick(View v) {
boolean shouldBeVisible = contentView.getVisibility() != View.VISIBLE; boolean shouldBeVisible = contentView.getVisibility() != View.VISIBLE;
contentView.setVisibility(shouldBeVisible ? View.VISIBLE : View.GONE); contentView.setVisibility(shouldBeVisible ? View.VISIBLE : View.GONE);
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, R.drawable.ic_website, 0, shouldBeVisible ? R.drawable.ic_expand_less_grey600 : R.drawable.ic_expand_more_grey600, 0); updateExpandableItem(shouldBeVisible);
} }
}); });
headerView.setText(R.string.links); headerView.setText(R.string.links);
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, R.drawable.ic_website, 0, R.drawable.ic_expand_more_grey600, 0); updateExpandableItem(false);
contentView.removeAllViews(); contentView.removeAllViews();
// Source button // Source button
@ -668,6 +688,10 @@ public class AppDetailsRecyclerViewAdapter
addLinkItemView(contentView, R.string.menu_email, R.drawable.ic_email, emailUrl); addLinkItemView(contentView, R.string.menu_email, R.drawable.ic_email, emailUrl);
} }
} }
protected @DrawableRes int getIcon() {
return R.drawable.ic_website;
}
} }
private class VersionViewHolder extends RecyclerView.ViewHolder { private class VersionViewHolder extends RecyclerView.ViewHolder {