Rework FPicker to use AsyncTask. Also change spaces to tabs.
This commit is contained in:
parent
774ee7cf38
commit
e75f120cf7
1 changed files with 205 additions and 153 deletions
|
@ -5,6 +5,7 @@ import android.app.ListActivity;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
|
import android.os.AsyncTask;
|
||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
|
@ -12,6 +13,9 @@ import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.view.Window;
|
||||||
|
import android.view.WindowManager;
|
||||||
|
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
|
@ -37,175 +41,223 @@ public class FPicker extends Activity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
if ( sdk >= 21 )
|
if ( sdk >= 21 )
|
||||||
super.setTheme( 0x01030224 );
|
super.setTheme( 0x01030224 );
|
||||||
setContentView(R.layout.activity_fpicker);
|
|
||||||
String path = Environment.getExternalStorageDirectory().toString();
|
setContentView(R.layout.activity_fpicker);
|
||||||
currentDir = new File(path);
|
String path = Environment.getExternalStorageDirectory().toString();
|
||||||
((Button)findViewById( R.id.button_fpicker_select )).setOnClickListener(new View.OnClickListener(){
|
currentDir = new File(path);
|
||||||
@Override
|
((Button)findViewById( R.id.button_fpicker_select )).setOnClickListener(new View.OnClickListener()
|
||||||
public void onClick(View v) {
|
{
|
||||||
onFileClick(v);
|
@Override
|
||||||
}
|
public void onClick(View v)
|
||||||
});
|
{
|
||||||
fill(currentDir);
|
onFileClick(v);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
fill(currentDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void fill(File folder)
|
private void fill(File folder)
|
||||||
{
|
{
|
||||||
File[]dirs = folder.listFiles();
|
new Fill(folder).execute();
|
||||||
while( dirs == null )
|
}
|
||||||
{
|
|
||||||
folder = new File(folder.getParent());
|
private class Fill extends AsyncTask<Void, Void, List<Item>>
|
||||||
if( folder == null )
|
{
|
||||||
return;
|
File folder;
|
||||||
dirs = folder.listFiles();
|
|
||||||
}
|
public Fill(File f)
|
||||||
this.setTitle("Current Dir: "+folder.getName());
|
{
|
||||||
List<Item> dir = new ArrayList<Item>();
|
folder = f;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected List<Item> doInBackground(Void... voids)
|
||||||
|
{
|
||||||
|
File[] dirs = folder.listFiles();
|
||||||
|
List<Item> dir = new ArrayList<Item>();
|
||||||
|
|
||||||
|
while( dirs == null )
|
||||||
|
{
|
||||||
|
folder = new File(folder.getParent());
|
||||||
|
if( folder == null )
|
||||||
|
return dir;
|
||||||
|
dirs = folder.listFiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
for(File ff: dirs)
|
for(File ff: dirs)
|
||||||
{
|
{
|
||||||
Date lastModDate = new Date(ff.lastModified());
|
Date lastModDate = new Date(ff.lastModified());
|
||||||
DateFormat formater = DateFormat.getDateTimeInstance();
|
DateFormat formater = DateFormat.getDateTimeInstance();
|
||||||
String date_modify = formater.format(lastModDate);
|
String date_modify = formater.format(lastModDate);
|
||||||
if(ff.isDirectory()){
|
if(ff.isDirectory())
|
||||||
boolean isXashDir=false;
|
{
|
||||||
|
boolean isXashDir=false;
|
||||||
File[] fbuf = ff.listFiles();
|
File[] fbuf = ff.listFiles();
|
||||||
int buf = 0;
|
int buf = 0;
|
||||||
if(fbuf != null&&fbuf.length<20){
|
if(fbuf != null&&fbuf.length<20)
|
||||||
buf = fbuf.length;
|
{
|
||||||
for (File valves: fbuf) {
|
buf = fbuf.length;
|
||||||
if (valves.isDirectory()) {
|
for (File valves: fbuf)
|
||||||
if(valves.getName().contains("valve"))isXashDir=true;
|
{
|
||||||
}
|
if (valves.isDirectory() && valves.getName().contains("valve"))
|
||||||
}
|
isXashDir=true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String num_item = String.valueOf(buf);
|
||||||
|
if(buf == 0)
|
||||||
|
num_item = "Some items";
|
||||||
|
else
|
||||||
|
num_item +=" items";
|
||||||
|
if(isXashDir)
|
||||||
|
{
|
||||||
|
dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.ic_launcher));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.folder));
|
||||||
}
|
}
|
||||||
String num_item = String.valueOf(buf);
|
}
|
||||||
if(buf == 0) num_item = "Some items";
|
|
||||||
else num_item +=" items";
|
|
||||||
if(isXashDir){
|
|
||||||
dir.add(new Item(ff.getName(),num_item,date_modify,ff.getAbsolutePath(),R.drawable.ic_launcher));
|
|
||||||
|
|
||||||
}else {
|
|
||||||
dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.folder));
|
|
||||||
}}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Collections.sort(dir);
|
||||||
|
|
||||||
Collections.sort(dir);
|
if(folder.getName().length() > 1)
|
||||||
if(folder.getName().length()>1)
|
dir.add(0, new Item( "..", "Parent Directory", "", folder.getParent(), R.drawable.folder));
|
||||||
dir.add(0,new Item("..","Parent Directory","",folder.getParent(),R.drawable.folder));
|
|
||||||
adapter = new FileArrayAdapter(FPicker.this,R.layout.row,dir);
|
return dir;
|
||||||
delta = (ListView)findViewById(R.id.FileView);
|
}
|
||||||
delta.setAdapter(adapter);
|
|
||||||
delta.setOnItemClickListener(new AdapterView.OnItemClickListener( ){
|
protected void onPostExecute(List<Item> dir)
|
||||||
@Override
|
{
|
||||||
public void onItemClick(AdapterView<?> parent , View v, int position, long id) {
|
setTitle("Current Dir: "+folder.getName());
|
||||||
Item o = adapter.getItem(position);
|
|
||||||
currentDir = new File(o.getPath());
|
adapter = new FileArrayAdapter(FPicker.this,R.layout.row,dir);
|
||||||
fill(currentDir);
|
delta = (ListView)findViewById(R.id.FileView);
|
||||||
|
delta.setAdapter(adapter);
|
||||||
|
delta.setOnItemClickListener(new AdapterView.OnItemClickListener()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void onItemClick(AdapterView<?> parent , View v, int position, long id)
|
||||||
|
{
|
||||||
|
Item o = adapter.getItem(position);
|
||||||
|
currentDir = new File(o.getPath());
|
||||||
|
fill(currentDir);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
|
||||||
}
|
}
|
||||||
public void onFileClick(View v)
|
|
||||||
{
|
public void onFileClick(View v)
|
||||||
Toast.makeText(this, "Chosen path : " + currentDir, Toast.LENGTH_SHORT).show();
|
{
|
||||||
Intent intent = new Intent();
|
Toast.makeText(this, "Chosen path : " + currentDir, Toast.LENGTH_SHORT).show();
|
||||||
intent.putExtra("GetPath",currentDir.toString());
|
Intent intent = new Intent();
|
||||||
setResult(RESULT_OK, intent);
|
intent.putExtra("GetPath",currentDir.toString());
|
||||||
finish();
|
setResult(RESULT_OK, intent);
|
||||||
}
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
class FileArrayAdapter extends ArrayAdapter<Item> {
|
|
||||||
|
|
||||||
private Context c;
|
class FileArrayAdapter extends ArrayAdapter<Item>
|
||||||
private int id;
|
{
|
||||||
private List<Item>items;
|
private Context c;
|
||||||
|
private int id;
|
||||||
|
private List<Item>items;
|
||||||
|
|
||||||
public FileArrayAdapter(Context context, int textViewResourceId,
|
public FileArrayAdapter(Context context, int textViewResourceId, List<Item> objects)
|
||||||
List<Item> objects) {
|
{
|
||||||
super(context, textViewResourceId, objects);
|
super(context, textViewResourceId, objects);
|
||||||
c = context;
|
c = context;
|
||||||
id = textViewResourceId;
|
id = textViewResourceId;
|
||||||
items = objects;
|
items = objects;
|
||||||
}
|
}
|
||||||
public Item getItem(int i)
|
|
||||||
{
|
public Item getItem(int i)
|
||||||
return items.get(i);
|
{
|
||||||
}
|
return items.get(i);
|
||||||
@Override
|
}
|
||||||
public View getView(int position, View convertView, ViewGroup parent) {
|
|
||||||
View v = convertView;
|
@Override
|
||||||
if (v == null) {
|
public View getView(int position, View convertView, ViewGroup parent) {
|
||||||
LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
View v = convertView;
|
||||||
v = vi.inflate(id, null);
|
if (v == null)
|
||||||
}
|
{
|
||||||
|
LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
||||||
|
v = vi.inflate(id, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
final Item finstance = items.get(position);
|
||||||
|
if (finstance != null)
|
||||||
|
{
|
||||||
|
TextView filename = (TextView) v.findViewById(R.id.filename);
|
||||||
|
TextView fileitems = (TextView) v.findViewById(R.id.fileitems);
|
||||||
|
TextView filedate = (TextView) v.findViewById(R.id.filedate);
|
||||||
|
ImageView imageicon = (ImageView) v.findViewById(R.id.fd_Icon1);
|
||||||
|
|
||||||
|
Drawable image = c.getResources().getDrawable(finstance.getImage());
|
||||||
|
imageicon.setImageDrawable(image);
|
||||||
|
|
||||||
final Item finstance = items.get(position);
|
if(filename!=null)
|
||||||
if (finstance != null) {
|
filename.setText(finstance.getName());
|
||||||
TextView filename = (TextView) v.findViewById(R.id.filename);
|
if(fileitems!=null)
|
||||||
TextView fileitems = (TextView) v.findViewById(R.id.fileitems);
|
fileitems.setText(finstance.getData());
|
||||||
TextView filedate = (TextView) v.findViewById(R.id.filedate);
|
if(filedate!=null)
|
||||||
ImageView imageicon = (ImageView) v.findViewById(R.id.fd_Icon1);
|
filedate.setText(finstance.getDate());
|
||||||
|
}
|
||||||
|
return v;
|
||||||
Drawable image = c.getResources().getDrawable(finstance.getImage());
|
}
|
||||||
imageicon.setImageDrawable(image);
|
|
||||||
|
|
||||||
if(filename!=null)
|
|
||||||
filename.setText(finstance.getName());
|
|
||||||
if(fileitems!=null)
|
|
||||||
fileitems.setText(finstance.getData());
|
|
||||||
if(filedate!=null)
|
|
||||||
filedate.setText(finstance.getDate());
|
|
||||||
}
|
|
||||||
return v;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class Item implements Comparable<Item>{
|
class Item implements Comparable<Item>{
|
||||||
private String name;
|
private String name;
|
||||||
private String data;
|
private String data;
|
||||||
private String date;
|
private String date;
|
||||||
private String path;
|
private String path;
|
||||||
private int image;
|
private int image;
|
||||||
|
|
||||||
public Item(String n,String d, String dt, String p, int img)
|
public Item(String n,String d, String dt, String p, int img)
|
||||||
{
|
{
|
||||||
name = n;
|
name = n;
|
||||||
data = d;
|
data = d;
|
||||||
date = dt;
|
date = dt;
|
||||||
path = p;
|
path = p;
|
||||||
image = img;
|
image = img;
|
||||||
}
|
}
|
||||||
public String getName()
|
|
||||||
{
|
public String getName()
|
||||||
return name;
|
{
|
||||||
}
|
return name;
|
||||||
public String getData()
|
}
|
||||||
{
|
|
||||||
return data;
|
public String getData()
|
||||||
}
|
{
|
||||||
public String getDate()
|
return data;
|
||||||
{
|
|
||||||
return date;
|
|
||||||
}
|
|
||||||
public String getPath()
|
|
||||||
{
|
|
||||||
return path;
|
|
||||||
}
|
|
||||||
public int getImage() {
|
|
||||||
return image;
|
|
||||||
}
|
|
||||||
public int compareTo(Item o) {
|
|
||||||
if(this.name != null)
|
|
||||||
return this.name.toLowerCase().compareTo(o.getName().toLowerCase());
|
|
||||||
else
|
|
||||||
throw new IllegalArgumentException();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getDate()
|
||||||
|
{
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPath()
|
||||||
|
{
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getImage()
|
||||||
|
{
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int compareTo(Item o)
|
||||||
|
{
|
||||||
|
if(this.name != null)
|
||||||
|
return this.name.toLowerCase().compareTo(o.getName().toLowerCase());
|
||||||
|
else
|
||||||
|
throw new IllegalArgumentException();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue