diff options
author | Tom Willemsen | 2012-08-08 23:32:42 +0200 |
---|---|---|
committer | Tom Willemsen | 2012-08-08 23:32:42 +0200 |
commit | ee4a5927ab1cb28402a7daaf0911375919f4863f (patch) | |
tree | 2f89084b1b5e41e4408a73eef9e924d8e49085fb /src/ryuslash | |
parent | d525b27d4492990867ca410d866629760e63925f (diff) | |
download | dvdroid-ee4a5927ab1cb28402a7daaf0911375919f4863f.tar.gz dvdroid-ee4a5927ab1cb28402a7daaf0911375919f4863f.zip |
Show collection, not wishlist
* src/ryuslash/org/dvdroid/DVDDataSource.java (getListFromCursor):
(getWatchList):
(getCollection): New functions.
(getWishList): Use `getListFromCursor' to retrieve data.
* src/ryuslash/org/dvdroid/DVDroidActivity.java (getData): New
function.
(onActivityResult):
(onCreate): Use `getData' instead of `datasource.getWishlist'.
Diffstat (limited to 'src/ryuslash')
-rw-r--r-- | src/ryuslash/org/dvdroid/DVDDataSource.java | 32 | ||||
-rw-r--r-- | src/ryuslash/org/dvdroid/DVDroidActivity.java | 9 |
2 files changed, 35 insertions, 6 deletions
diff --git a/src/ryuslash/org/dvdroid/DVDDataSource.java b/src/ryuslash/org/dvdroid/DVDDataSource.java index 6658c8d..b9fe166 100644 --- a/src/ryuslash/org/dvdroid/DVDDataSource.java +++ b/src/ryuslash/org/dvdroid/DVDDataSource.java @@ -65,24 +65,48 @@ public class DVDDataSource SQLiteHelper.COLUMN_ID + " = " + id, null); } - public List<DVD> getWishlist() + public List<DVD> getListFromCursor(Cursor cursor) { List<DVD> dvds = new ArrayList<DVD>(); - Cursor cursor = database.query(SQLiteHelper.TABLE_DVD, - allColumns, "wishlist = 1", null, - null, null, "title"); cursor.moveToFirst(); + while(!cursor.isAfterLast()) { DVD dvd = cursorToDVD(cursor); + dvds.add(dvd); cursor.moveToNext(); } cursor.close(); + return dvds; } + public List<DVD> getWishList() + { + Cursor cursor = database.query(SQLiteHelper.TABLE_DVD, + allColumns, "wishlist = 1", null, + null, null, "title"); + return getListFromCursor(cursor); + } + + public List<DVD> getWatchList() + { + Cursor cursor = database.query(SQLiteHelper.TABLE_DVD, + allColumns, "watched = 0", null, + null, null, "title"); + return getListFromCursor(cursor); + } + + public List<DVD> getCollection() + { + Cursor cursor = database.query(SQLiteHelper.TABLE_DVD, + allColumns, "wishlist = 0", null, + null, null, "title"); + return getListFromCursor(cursor); + } + private DVD cursorToDVD(Cursor cursor) { DVD dvd = new DVD(); diff --git a/src/ryuslash/org/dvdroid/DVDroidActivity.java b/src/ryuslash/org/dvdroid/DVDroidActivity.java index e510a7b..533bc62 100644 --- a/src/ryuslash/org/dvdroid/DVDroidActivity.java +++ b/src/ryuslash/org/dvdroid/DVDroidActivity.java @@ -18,6 +18,11 @@ public class DVDroidActivity extends ListActivity { private DVDDataSource datasource; + private List<DVD> getData() + { + return datasource.getCollection(); + } + @Override protected void onActivityResult(int requestCode, int resultCode, @@ -27,7 +32,7 @@ public class DVDroidActivity extends ListActivity datasource.open(); ArrayAdapter<DVD> adapter = (ArrayAdapter<DVD>)getListAdapter(); - List<DVD> dvds = datasource.getWishlist(); + List<DVD> dvds = getData(); adapter.clear(); adapter.addAll(dvds); @@ -44,7 +49,7 @@ public class DVDroidActivity extends ListActivity datasource = new DVDDataSource(this); datasource.open(); - List<DVD> values = datasource.getWishlist(); + List<DVD> values = getData(); ArrayAdapter<DVD> adapter = new ArrayAdapter<DVD>(this, |