nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-23 12:51:16 +00:00
Code Releases Activity

Improvements on FolderAdapter.

Browse source 
Hide views when empty to preserve screen space.
Made use of the ViewHolder pattern for additional efficiency.
This commit is contained in:
George Venios 2015-08-03 00:23:05 +01:00
parent 2522b70a89
commit ebf885a4bb
1 changed files with 52 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/main/java/com/nutomic/syncthingandroid/util/FoldersAdapter.java
View file

@ -1,6 +1,7 @@
package com.nutomic.syncthingandroid.util; package com.nutomic.syncthingandroid.util;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -15,6 +16,10 @@ import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static com.nutomic.syncthingandroid.syncthing.RestApi.readableFileSize;
/** /**
* Generates item views for folder items. * Generates item views for folder items.
*/ */
@ -22,6 +27,7 @@ public class FoldersAdapter extends ArrayAdapter<RestApi.Folder>
implements RestApi.OnReceiveModelListener { implements RestApi.OnReceiveModelListener {
private HashMap<String, RestApi.Model> mModels = new HashMap<>(); private HashMap<String, RestApi.Model> mModels = new HashMap<>();
private LayoutInflater inflater;
private final static Comparator<RestApi.Folder> COMPARATOR = new Comparator<RestApi.Folder>() { private final static Comparator<RestApi.Folder> COMPARATOR = new Comparator<RestApi.Folder>() {
@Override @Override
@ -32,46 +38,53 @@ public class FoldersAdapter extends ArrayAdapter<RestApi.Folder>
public FoldersAdapter(Context context) { public FoldersAdapter(Context context) {
super(context, R.layout.item_folder_list); super(context, R.layout.item_folder_list);
inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
} }
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder viewHolder;
if (convertView == null) { if (convertView == null) {
LayoutInflater inflater = (LayoutInflater) getContext()
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = inflater.inflate(R.layout.item_folder_list, parent, false); convertView = inflater.inflate(R.layout.item_folder_list, parent, false);
}
TextView id = (TextView) convertView.findViewById(R.id.id); viewHolder = new ViewHolder();
TextView state = (TextView) convertView.findViewById(R.id.state); viewHolder.id = (TextView) convertView.findViewById(R.id.id);
TextView directory = (TextView) convertView.findViewById(R.id.directory); viewHolder.state = (TextView) convertView.findViewById(R.id.state);
TextView items = (TextView) convertView.findViewById(R.id.items); viewHolder.directory = (TextView) convertView.findViewById(R.id.directory);
TextView size = (TextView) convertView.findViewById(R.id.size); viewHolder.items = (TextView) convertView.findViewById(R.id.items);
TextView invalid = (TextView) convertView.findViewById(R.id.invalid); viewHolder.size = (TextView) convertView.findViewById(R.id.size);
viewHolder.invalid = (TextView) convertView.findViewById(R.id.invalid);
convertView.setTag(viewHolder);
} else {
viewHolder = (ViewHolder) convertView.getTag();
}
RestApi.Folder folder = getItem(position); RestApi.Folder folder = getItem(position);
RestApi.Model model = mModels.get(folder.id); RestApi.Model model = mModels.get(folder.id);
id.setText(folder.id); viewHolder.id.setText(folder.id);
state.setTextColor(getContext().getResources().getColor(R.color.text_green)); viewHolder.state.setTextColor(getContext().getResources().getColor(R.color.text_green));
directory.setText((folder.path)); viewHolder.directory.setText((folder.path));
if (model != null) { if (model != null) {
int percentage = (model.globalBytes != 0) int percentage = (model.globalBytes != 0)
? (int) Math.floor(100 * model.inSyncBytes / model.globalBytes) ? (int) Math.floor(100 * model.inSyncBytes / model.globalBytes)
: 100; : 100;
state.setText(getContext().getString(R.string.folder_progress_format, viewHolder.state.setText(getContext().getString(R.string.folder_progress_format,
RestApi.getLocalizedState(getContext(), model.state), RestApi.getLocalizedState(getContext(), model.state),
percentage)); percentage));
items.setText(getContext() viewHolder.items.setVisibility(VISIBLE);
viewHolder.items.setText(getContext()
.getString(R.string.files, model.inSyncFiles, model.globalFiles)); .getString(R.string.files, model.inSyncFiles, model.globalFiles));
size.setText(RestApi.readableFileSize(getContext(), model.inSyncBytes) + " / " + viewHolder.size.setVisibility(VISIBLE);
RestApi.readableFileSize(getContext(), model.globalBytes)); viewHolder.size.setText(readableFileSize(getContext(), model.inSyncBytes) + " / " +
if (folder.invalid.equals("")) { readableFileSize(getContext(), model.globalBytes));
invalid.setText(model.invalid); if (TextUtils.isEmpty(folder.invalid)) {
invalid.setVisibility((model.invalid.equals("")) ? View.GONE : View.VISIBLE); setTextOrHide(viewHolder.invalid, model.invalid);
} }
} else { } else {
invalid.setText(folder.invalid); viewHolder.items.setVisibility(GONE);
invalid.setVisibility((folder.invalid.equals("")) ? View.GONE : View.VISIBLE); viewHolder.size.setVisibility(GONE);
setTextOrHide(viewHolder.invalid, folder.invalid);
} }
return convertView; return convertView;
@ -113,4 +126,22 @@ public class FoldersAdapter extends ArrayAdapter<RestApi.Folder>
notifyDataSetChanged(); notifyDataSetChanged();
} }
private void setTextOrHide(TextView view, String text) {
boolean isEmpty = TextUtils.isEmpty(text);
if (isEmpty) {
view.setVisibility(GONE);
} else {
view.setText(text);
view.setVisibility(VISIBLE);
}
}
private static class ViewHolder {
TextView id;
TextView state;
TextView directory;
TextView items;
TextView size;
TextView invalid;
}
} }