Merge branch 'improves_toots' into develop
This commit is contained in:
commit
4027fa75af
|
@ -58,6 +58,7 @@ import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache;
|
||||||
import com.nostra13.universalimageloader.core.DisplayImageOptions;
|
import com.nostra13.universalimageloader.core.DisplayImageOptions;
|
||||||
import com.nostra13.universalimageloader.core.ImageLoader;
|
import com.nostra13.universalimageloader.core.ImageLoader;
|
||||||
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
|
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
|
||||||
|
import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
|
||||||
import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer;
|
import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer;
|
||||||
|
|
||||||
import org.json.JSONArray;
|
import org.json.JSONArray;
|
||||||
|
@ -111,7 +112,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
|
||||||
private List<Status> statuses;
|
private List<Status> statuses;
|
||||||
private LayoutInflater layoutInflater;
|
private LayoutInflater layoutInflater;
|
||||||
private ImageLoader imageLoader;
|
private ImageLoader imageLoader;
|
||||||
private DisplayImageOptions options;
|
private DisplayImageOptions options, optionsAttachment;
|
||||||
private ViewHolder holder;
|
private ViewHolder holder;
|
||||||
private boolean isOnWifi;
|
private boolean isOnWifi;
|
||||||
private int translator;
|
private int translator;
|
||||||
|
@ -194,9 +195,10 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
|
||||||
.build();
|
.build();
|
||||||
if( !imageLoader.isInited())
|
if( !imageLoader.isInited())
|
||||||
imageLoader.init(configImg);
|
imageLoader.init(configImg);
|
||||||
options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
|
options = new DisplayImageOptions.Builder().displayer(new RoundedBitmapDisplayer(10)).cacheInMemory(false)
|
||||||
|
.cacheOnDisk(true).resetViewBeforeLoading(true).build();
|
||||||
|
optionsAttachment = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
|
||||||
.cacheOnDisk(true).resetViewBeforeLoading(true).build();
|
.cacheOnDisk(true).resetViewBeforeLoading(true).build();
|
||||||
|
|
||||||
if (convertView == null) {
|
if (convertView == null) {
|
||||||
convertView = layoutInflater.inflate(R.layout.drawer_status, parent, false);
|
convertView = layoutInflater.inflate(R.layout.drawer_status, parent, false);
|
||||||
holder = new ViewHolder();
|
holder = new ViewHolder();
|
||||||
|
@ -1154,7 +1156,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
|
||||||
if( url == null || url.trim().equals(""))
|
if( url == null || url.trim().equals(""))
|
||||||
url = attachment.getUrl();
|
url = attachment.getUrl();
|
||||||
if( !url.trim().contains("missing.png"))
|
if( !url.trim().contains("missing.png"))
|
||||||
imageLoader.displayImage(url, imageView, options);
|
imageLoader.displayImage(url, imageView, optionsAttachment);
|
||||||
final int finalPosition = position;
|
final int finalPosition = position;
|
||||||
imageView.setOnClickListener(new View.OnClickListener() {
|
imageView.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -828,7 +828,6 @@ public class Helper {
|
||||||
if( currentSubmenu == null)
|
if( currentSubmenu == null)
|
||||||
continue;
|
continue;
|
||||||
final MenuItem item = currentSubmenu.add("@" + account.getAcct());
|
final MenuItem item = currentSubmenu.add("@" + account.getAcct());
|
||||||
//final MenuItem item = mainMenu.addSubMenu("@" + account.getAcct()).add("@" + account.getAcct());
|
|
||||||
ImageLoader imageLoader;
|
ImageLoader imageLoader;
|
||||||
DisplayImageOptions options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
|
DisplayImageOptions options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
|
||||||
.cacheOnDisk(true).resetViewBeforeLoading(true).build();
|
.cacheOnDisk(true).resetViewBeforeLoading(true).build();
|
||||||
|
|
Loading…
Reference in New Issue