Replace if's with switches

Required changing some local variable names to prevent the same
`view` variable being declared multiple times. Otherwise it should
be a verbatim change from if statements to switch statements.
This commit is contained in:
Peter Serwylo 2016-12-05 22:54:58 +11:00
parent a00534c7c7
commit ccf763199f

View File

@ -185,30 +185,31 @@ public class AppDetailsRecyclerViewAdapter
@Override @Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
LayoutInflater inflater = LayoutInflater.from(parent.getContext()); LayoutInflater inflater = LayoutInflater.from(parent.getContext());
if (viewType == VIEWTYPE_HEADER) { switch (viewType) {
View view = inflater.inflate(R.layout.app_details2_header, parent, false); case VIEWTYPE_HEADER:
return new HeaderViewHolder(view); View header = inflater.inflate(R.layout.app_details2_header, parent, false);
} else if (viewType == VIEWTYPE_SCREENSHOTS) { return new HeaderViewHolder(header);
View view = inflater.inflate(R.layout.app_details2_screenshots, parent, false); case VIEWTYPE_SCREENSHOTS:
return new ScreenShotsViewHolder(view); View screenshots = inflater.inflate(R.layout.app_details2_screenshots, parent, false);
} else if (viewType == VIEWTYPE_WHATS_NEW) { return new ScreenShotsViewHolder(screenshots);
View view = inflater.inflate(R.layout.app_details2_whatsnew, parent, false); case VIEWTYPE_WHATS_NEW:
return new WhatsNewViewHolder(view); View whatsNew = inflater.inflate(R.layout.app_details2_whatsnew, parent, false);
} else if (viewType == VIEWTYPE_DONATE) { return new WhatsNewViewHolder(whatsNew);
View view = inflater.inflate(R.layout.app_details2_donate, parent, false); case VIEWTYPE_DONATE:
return new DonateViewHolder(view); View donate = inflater.inflate(R.layout.app_details2_donate, parent, false);
} else if (viewType == VIEWTYPE_LINKS) { return new DonateViewHolder(donate);
View view = inflater.inflate(R.layout.app_details2_links, parent, false); case VIEWTYPE_LINKS:
return new LinksViewHolder(view); View links = inflater.inflate(R.layout.app_details2_links, parent, false);
} else if (viewType == VIEWTYPE_PERMISSIONS) { return new LinksViewHolder(links);
View view = inflater.inflate(R.layout.app_details2_links, parent, false); case VIEWTYPE_PERMISSIONS:
return new PermissionsViewHolder(view); View permissions = inflater.inflate(R.layout.app_details2_links, parent, false);
} else if (viewType == VIEWTYPE_VERSIONS) { return new PermissionsViewHolder(permissions);
View view = inflater.inflate(R.layout.app_details2_links, parent, false); case VIEWTYPE_VERSIONS:
return new VersionsViewHolder(view); View versions = inflater.inflate(R.layout.app_details2_links, parent, false);
} else if (viewType == VIEWTYPE_VERSION) { return new VersionsViewHolder(versions);
View view = inflater.inflate(R.layout.apklistitem, parent, false); case VIEWTYPE_VERSION:
return new VersionViewHolder(view); View version = inflater.inflate(R.layout.apklistitem, parent, false);
return new VersionViewHolder(version);
} }
return null; return null;
} }
@ -216,25 +217,34 @@ public class AppDetailsRecyclerViewAdapter
@Override @Override
public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) {
int viewType = getItemViewType(position); int viewType = getItemViewType(position);
if (viewType == VIEWTYPE_HEADER) { switch (viewType) {
HeaderViewHolder header = (HeaderViewHolder) holder; case VIEWTYPE_HEADER:
headerView = header; HeaderViewHolder header = (HeaderViewHolder) holder;
header.bindModel(); headerView = header;
} else if (viewType == VIEWTYPE_SCREENSHOTS) { header.bindModel();
((ScreenShotsViewHolder) holder).bindModel(); break;
} else if (viewType == VIEWTYPE_WHATS_NEW) { case VIEWTYPE_SCREENSHOTS:
((WhatsNewViewHolder) holder).bindModel(); ((ScreenShotsViewHolder) holder).bindModel();
} else if (viewType == VIEWTYPE_DONATE) { break;
((DonateViewHolder) holder).bindModel(); case VIEWTYPE_WHATS_NEW:
} else if (viewType == VIEWTYPE_LINKS) { ((WhatsNewViewHolder) holder).bindModel();
((LinksViewHolder) holder).bindModel(); break;
} else if (viewType == VIEWTYPE_PERMISSIONS) { case VIEWTYPE_DONATE:
((PermissionsViewHolder) holder).bindModel(); ((DonateViewHolder) holder).bindModel();
} else if (viewType == VIEWTYPE_VERSIONS) { break;
((VersionsViewHolder) holder).bindModel(); case VIEWTYPE_LINKS:
} else if (viewType == VIEWTYPE_VERSION) { ((LinksViewHolder) holder).bindModel();
final Apk apk = (Apk) items.get(position); break;
((VersionViewHolder) holder).bindModel(apk); case VIEWTYPE_PERMISSIONS:
((PermissionsViewHolder) holder).bindModel();
break;
case VIEWTYPE_VERSIONS:
((VersionsViewHolder) holder).bindModel();
break;
case VIEWTYPE_VERSION:
final Apk apk = (Apk) items.get(position);
((VersionViewHolder) holder).bindModel(apk);
break;
} }
} }