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

Some changes to app list adapters

Browse Source 
* Only change compact layout stuff when really needed
* No need to use StringBuilders in some cases
* No need to keep setting status and license to "" when in compact
This commit is contained in:
Daniel Martí 2013-11-02 12:32:54 +01:00
parent 154b0bda45
commit 533c16af0a
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/org/fdroid/fdroid/views/AppListAdapter.java
View File

@ -20,6 +20,7 @@ abstract public class AppListAdapter extends BaseAdapter {
private List<DB.App> items = new ArrayList<DB.App>();
private Context mContext;
private List<Boolean> compacts = new ArrayList<Boolean>();
public AppListAdapter(Context context) {
mContext = context;
@ -31,10 +32,12 @@ abstract public class AppListAdapter extends BaseAdapter {
public void addItem(DB.App app) {
items.add(app);
compacts.add(null);
}
public void clear() {
items.clear();
compacts.clear();
}
@Override
@ -68,29 +71,32 @@ abstract public class AppListAdapter extends BaseAdapter {
TextView status = (TextView) convertView.findViewById(R.id.status);
TextView license = (TextView) convertView.findViewById(R.id.license);
ImageView icon = (ImageView) convertView.findViewById(R.id.icon);
LinearLayout iconContainer = (LinearLayout)convertView.findViewById(R.id.status_icons);
ImageView iconInstalled = (ImageView) convertView.findViewById(R.id.icon_status_installed);
ImageView iconUpdates = (ImageView) convertView.findViewById(R.id.icon_status_has_updates);
name.setText(app.name);
summary.setText(app.summary);
layoutSummary(summary);
Boolean storedCompact = compacts.get(position);
if (storedCompact == null || compact != storedCompact) {
int visibleOnCompact = compact ? View.VISIBLE : View.GONE;
int notVisibleOnCompact = compact ? View.GONE : View.VISIBLE;
LinearLayout iconContainer = (LinearLayout)convertView.findViewById(R.id.status_icons);
iconContainer.setVisibility(visibleOnCompact);
status.setVisibility(notVisibleOnCompact);
license.setVisibility(notVisibleOnCompact);
compacts.set(position, compact);
layoutSummary(summary);
}
ImageLoader.getInstance().displayImage(app.iconUrl, icon);
int visibleOnCompact = compact ? View.VISIBLE : View.GONE;
int notVisibleOnCompact = compact ? View.GONE : View.VISIBLE;
iconContainer.setVisibility(visibleOnCompact);
status.setVisibility(notVisibleOnCompact);
license.setVisibility(notVisibleOnCompact);
if (!compact) {
status.setText(getVersionInfo(app));
license.setText(app.license);
} else {
status.setText("");
license.setText("");
ImageView iconInstalled = (ImageView) convertView.findViewById(R.id.icon_status_installed);
ImageView iconUpdates = (ImageView) convertView.findViewById(R.id.icon_status_has_updates);
iconInstalled.setImageResource(R.drawable.ic_cab_done_holo_dark);
iconUpdates.setImageResource(R.drawable.ic_menu_refresh);
@ -150,23 +156,18 @@ abstract public class AppListAdapter extends BaseAdapter {
}
private String getVersionInfo(DB.App app) {
StringBuilder version = new StringBuilder();
if (app.installedVersion != null) {
version.append(app.installedVersion);
if (app.toUpdate) {
version.append(" -> ");
version.append(app.curApk.version);
return app.installedVersion + " -> " + app.curApk.version;
}
return app.installedVersion;
} else {
int numav = app.apks.size();
String numVersions;
if (numav == 1)
numVersions = mContext.getString(R.string.n_version_available);
else
numVersions = mContext.getString(R.string.n_versions_available);
version.append(String.format(numVersions, numav));
if (numav == 1) {
return mContext.getString(R.string.n_version_available, numav);
}
return mContext.getString(R.string.n_versions_available, numav);
}
return version.toString();
}
}

17
src/org/fdroid/fdroid/views/AppListFragmentPageAdapter.java
View File

@ -24,15 +24,13 @@ public class AppListFragmentPageAdapter extends FragmentPagerAdapter {
@Override
public Fragment getItem(int i) {
Fragment fragment = null;
if ( i == 0 ) {
fragment = new AvailableAppsFragment();
} else if ( i == 1 ) {
fragment = new InstalledAppsFragment();
} else if ( i == 2 ) {
fragment = new CanUpdateAppsFragment();
return new AvailableAppsFragment();
}
return fragment;
if ( i == 1 ) {
return new InstalledAppsFragment();
}
return new CanUpdateAppsFragment();
}
@Override
@ -47,9 +45,8 @@ public class AppListFragmentPageAdapter extends FragmentPagerAdapter {
case 1:
return parent.getString(R.string.tab_installed);
case 2:
String updates = parent.getString(R.string.tab_updates);
updates += " (" + parent.getManager().getCanUpdateAdapter().getCount() + ")";
return updates;
return parent.getString(R.string.tab_updates) + " ("
+ parent.getManager().getCanUpdateAdapter().getCount() + ")";
default:
return "";
}