From 32f650e02ce4b98cbd1f38dbedb0f72eedf25dea Mon Sep 17 00:00:00 2001 From: ericaschulz Date: Tue, 28 Jun 2016 23:35:26 -0500 Subject: [PATCH 1/4] commit --- .idea/.name | 1 + .idea/compiler.xml | 22 ++ .idea/copyright/profiles_settings.xml | 3 + .idea/cursor-adapter-lab.iml | 9 + .idea/encodings.xml | 6 + .idea/misc.xml | 29 +++ .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 207 ++++++++++++++++++ starter-code/ShoppingListVer2/.idea/.name | 1 + .../ShoppingListVer2/.idea/compiler.xml | 22 ++ .../.idea/copyright/profiles_settings.xml | 3 + .../ShoppingListVer2/.idea/encodings.xml | 6 + .../ShoppingListVer2/.idea/gradle.xml | 23 ++ starter-code/ShoppingListVer2/.idea/misc.xml | 61 ++++++ .../ShoppingListVer2/.idea/modules.xml | 9 + .../.idea/runConfigurations.xml | 12 + starter-code/ShoppingListVer2/.idea/vcs.xml | 6 + .../shoppinglistver2/MainActivity.java | 30 ++- .../shoppinglistver2/setup/DBAssetHelper.java | 4 + .../setup/DatabaseHelper.java | 89 ++++++++ starter-code/ShoppingListVer2/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- 23 files changed, 553 insertions(+), 10 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/cursor-adapter-lab.iml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 starter-code/ShoppingListVer2/.idea/.name create mode 100644 starter-code/ShoppingListVer2/.idea/compiler.xml create mode 100644 starter-code/ShoppingListVer2/.idea/copyright/profiles_settings.xml create mode 100644 starter-code/ShoppingListVer2/.idea/encodings.xml create mode 100644 starter-code/ShoppingListVer2/.idea/gradle.xml create mode 100644 starter-code/ShoppingListVer2/.idea/misc.xml create mode 100644 starter-code/ShoppingListVer2/.idea/modules.xml create mode 100644 starter-code/ShoppingListVer2/.idea/runConfigurations.xml create mode 100644 starter-code/ShoppingListVer2/.idea/vcs.xml create mode 100644 starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..6479f23 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +cursor-adapter-lab \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/cursor-adapter-lab.iml b/.idea/cursor-adapter-lab.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/cursor-adapter-lab.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..aa9be47 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..776d645 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..b5d6642 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1467055730611 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/.idea/.name b/starter-code/ShoppingListVer2/.idea/.name new file mode 100644 index 0000000..0b8d2d1 --- /dev/null +++ b/starter-code/ShoppingListVer2/.idea/.name @@ -0,0 +1 @@ +ShoppingListVer2 \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/.idea/compiler.xml b/starter-code/ShoppingListVer2/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/starter-code/ShoppingListVer2/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/.idea/copyright/profiles_settings.xml b/starter-code/ShoppingListVer2/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/starter-code/ShoppingListVer2/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/.idea/encodings.xml b/starter-code/ShoppingListVer2/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/starter-code/ShoppingListVer2/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/.idea/gradle.xml b/starter-code/ShoppingListVer2/.idea/gradle.xml new file mode 100644 index 0000000..508b3d9 --- /dev/null +++ b/starter-code/ShoppingListVer2/.idea/gradle.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/.idea/misc.xml b/starter-code/ShoppingListVer2/.idea/misc.xml new file mode 100644 index 0000000..13e6014 --- /dev/null +++ b/starter-code/ShoppingListVer2/.idea/misc.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/.idea/modules.xml b/starter-code/ShoppingListVer2/.idea/modules.xml new file mode 100644 index 0000000..dc157e2 --- /dev/null +++ b/starter-code/ShoppingListVer2/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/.idea/runConfigurations.xml b/starter-code/ShoppingListVer2/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/starter-code/ShoppingListVer2/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/.idea/vcs.xml b/starter-code/ShoppingListVer2/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/starter-code/ShoppingListVer2/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java index beff131..60faeac 100644 --- a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java +++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java @@ -1,26 +1,42 @@ package ly.generalassemb.drewmahrt.shoppinglistver2; -import android.content.Context; -import android.database.Cursor; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CursorAdapter; +import android.support.v7.app.AppCompatActivity; import android.widget.ListView; -import android.widget.SimpleCursorAdapter; import ly.generalassemb.drewmahrt.shoppinglistver2.setup.DBAssetHelper; +import ly.generalassemb.drewmahrt.shoppinglistver2.setup.DatabaseHelper; public class MainActivity extends AppCompatActivity { + + ListView mListView; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + mListView = (ListView)findViewById(R.id.shopping_list_view); + //Ignore the two lines below, they are for setup DBAssetHelper dbSetup = new DBAssetHelper(MainActivity.this); dbSetup.getReadableDatabase(); + DatabaseHelper db = new DatabaseHelper(this); + db.seedList(); + + + + + + + + + + + + } + + } diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DBAssetHelper.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DBAssetHelper.java index beeea73..ab1f93a 100644 --- a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DBAssetHelper.java +++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DBAssetHelper.java @@ -12,7 +12,11 @@ public class DBAssetHelper extends SQLiteAssetHelper { private static final String DATABASE_NAME = "SHOPPING_DB"; private static final int DATABASE_VERSION = 7; + public DBAssetHelper(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); } + + + } diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java new file mode 100644 index 0000000..fbf4d70 --- /dev/null +++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java @@ -0,0 +1,89 @@ +package ly.generalassemb.drewmahrt.shoppinglistver2.setup; + +import android.content.ContentValues; +import android.content.Context; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; + +/** + * Created by ericaschulz on 6/28/16. + */ +public class DatabaseHelper extends SQLiteOpenHelper { + + public static final int DB_VERSION = 7; + public static final String DB_NAME = "SHOPPING_DB"; + public static final String CREATE_TABLE = "CREATE TABLE SHOPPING_LIST(id INT PRIMARY KEY, brand TEXT, item TEXT);"; + public static final String DROP_TABLE = "DROP TABLE IF EXISTS SHOPPING_LIST;"; + + + //public int id = id; + public String brand = "brand"; + public String item = "item"; + + public static final String shoppingList[] = {"id", "brand", "item"}; + + + public DatabaseHelper(Context context) { + super(context, DB_NAME, null, DB_VERSION); + } + + @Override + public void onCreate(SQLiteDatabase db) { + db.execSQL(CREATE_TABLE); + + } + + @Override + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + db.execSQL(DROP_TABLE); + onCreate(db); + + + } + + public void createShoppingList(int id, String brand, String item) { + SQLiteDatabase db = getReadableDatabase(); + ContentValues list = new ContentValues(); + list.put("id", id); + list.put("brand", brand); + list.put("item", item); + db.insert("SHOPPING_DB", null, list); + } + + public void seedList() { + createShoppingList(1, "Green Giant", "corn"); + createShoppingList(2, "Wonder", "bread"); + createShoppingList(3, "MinuteMaid", "orange juice"); + createShoppingList(4, "Bisquick", "pancakes"); + + + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/starter-code/ShoppingListVer2/build.gradle b/starter-code/ShoppingListVer2/build.gradle index e0b366a..aff4f41 100644 --- a/starter-code/ShoppingListVer2/build.gradle +++ b/starter-code/ShoppingListVer2/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/starter-code/ShoppingListVer2/gradle/wrapper/gradle-wrapper.properties b/starter-code/ShoppingListVer2/gradle/wrapper/gradle-wrapper.properties index f23df6e..d64e910 100644 --- a/starter-code/ShoppingListVer2/gradle/wrapper/gradle-wrapper.properties +++ b/starter-code/ShoppingListVer2/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:34:03 PDT 2015 +#Tue Jun 28 19:19:41 CDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip From 85ba316d724bf0d26a8e9a16c0b606d53ef46a80 Mon Sep 17 00:00:00 2001 From: ericaschulz Date: Wed, 29 Jun 2016 09:49:15 -0500 Subject: [PATCH 2/4] update --- .../setup/DatabaseHelper.java | 22 ++++++++++-- .../shoppinglistver2/setup/SHOPPING_LIST.java | 35 +++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/SHOPPING_LIST.java diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java index fbf4d70..48bdef6 100644 --- a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java +++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java @@ -2,6 +2,7 @@ import android.content.ContentValues; import android.content.Context; +import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; @@ -16,9 +17,6 @@ public class DatabaseHelper extends SQLiteOpenHelper { public static final String DROP_TABLE = "DROP TABLE IF EXISTS SHOPPING_LIST;"; - //public int id = id; - public String brand = "brand"; - public String item = "item"; public static final String shoppingList[] = {"id", "brand", "item"}; @@ -57,6 +55,24 @@ public void seedList() { createShoppingList(4, "Bisquick", "pancakes"); + } + public void getList(int id, String brand, String item) { + SQLiteDatabase db = getReadableDatabase(); + String[] projection = new String[]{"id","brand","item"}; + String selection = "id =?"; + String[] selectionArgs = new String[]{Integer.toString(id)}; + + Cursor c = db.query("SHOPPING_LIST",projection,selection,selectionArgs,null,null,null,null); + c.moveToFirst(); + + int itemID = Integer.parseInt(c.getString(c.getColumnIndex("id"))); + String itemBrand = c.getString(c.getColumnIndex("brand")); + String itemName = c.getString(c.getColumnIndex("item")); + + + + + } } diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/SHOPPING_LIST.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/SHOPPING_LIST.java new file mode 100644 index 0000000..8553eab --- /dev/null +++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/SHOPPING_LIST.java @@ -0,0 +1,35 @@ +package ly.generalassemb.drewmahrt.shoppinglistver2.setup; + +/** + * Created by ericaschulz on 6/29/16. + */ +public class SHOPPING_LIST { + + public int id; + public String brand; + public String item; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getItem() { + return item; + } + + public void setItem(String item) { + this.item = item; + } +} From 5d32c74ae4303f649aaa490c6cac80cb7b00dec3 Mon Sep 17 00:00:00 2001 From: ericaschulz Date: Wed, 29 Jun 2016 10:05:23 -0500 Subject: [PATCH 3/4] update --- .../drewmahrt/shoppinglistver2/MainActivity.java | 5 +++++ .../drewmahrt/shoppinglistver2/setup/DatabaseHelper.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java index 60faeac..15eff61 100644 --- a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java +++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java @@ -9,6 +9,9 @@ public class MainActivity extends AppCompatActivity { + + + ListView mListView; @Override @@ -36,6 +39,8 @@ protected void onCreate(Bundle savedInstanceState) { + + } diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java index 48bdef6..e82539c 100644 --- a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java +++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java @@ -65,10 +65,12 @@ public void getList(int id, String brand, String item) { Cursor c = db.query("SHOPPING_LIST",projection,selection,selectionArgs,null,null,null,null); c.moveToFirst(); - int itemID = Integer.parseInt(c.getString(c.getColumnIndex("id"))); + int itemId = Integer.parseInt(c.getString(c.getColumnIndex("id"))); String itemBrand = c.getString(c.getColumnIndex("brand")); String itemName = c.getString(c.getColumnIndex("item")); + //SHOPPING_LIST sList = new SHOPPING_LIST(itemId,itemBrand ,itemName); + From a25b1b9974fa5519a4f8edd8a4d0e696213a8f55 Mon Sep 17 00:00:00 2001 From: ericaschulz Date: Wed, 29 Jun 2016 15:13:22 -0500 Subject: [PATCH 4/4] update --- starter-code/ShoppingListVer2/.idea/misc.xml | 2 +- .../shoppinglistver2/MainActivity.java | 78 ++++++++++++- .../setup/DatabaseHelper.java | 107 ------------------ 3 files changed, 73 insertions(+), 114 deletions(-) delete mode 100644 starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java diff --git a/starter-code/ShoppingListVer2/.idea/misc.xml b/starter-code/ShoppingListVer2/.idea/misc.xml index 13e6014..8cdb7eb 100644 --- a/starter-code/ShoppingListVer2/.idea/misc.xml +++ b/starter-code/ShoppingListVer2/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java index 15eff61..c484311 100644 --- a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java +++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java @@ -1,32 +1,98 @@ package ly.generalassemb.drewmahrt.shoppinglistver2; +import android.content.Context; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.CursorAdapter; import android.widget.ListView; +import android.widget.TextView; + +import java.util.Locale; import ly.generalassemb.drewmahrt.shoppinglistver2.setup.DBAssetHelper; -import ly.generalassemb.drewmahrt.shoppinglistver2.setup.DatabaseHelper; public class MainActivity extends AppCompatActivity { + ListView mListView; - ListView mListView; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - mListView = (ListView)findViewById(R.id.shopping_list_view); + //Ignore the two lines below, they are for setup DBAssetHelper dbSetup = new DBAssetHelper(MainActivity.this); dbSetup.getReadableDatabase(); - DatabaseHelper db = new DatabaseHelper(this); - db.seedList(); + + String brands[] = { + "Colgate", + "Downy", + "Green Giant" + }; + String items[] = { + "toothpaste", + "fabric softener", + "frozen peas" + }; + Integer prices[] = { + 5, 4, 3 + }; + + SQLiteDatabase db; + db = openOrCreateDatabase("SHOPPING_LIST.db", + SQLiteDatabase.CREATE_IF_NECESSARY, + null); + + db.setVersion(7); + db.setLocale(Locale.getDefault()); + + String createTableSql = "CREATE TABLE IF NOT EXISTS list\n" + + " (_id INTEGER PRIMARY KEY AUTOINCREMENT,\n" + + " brand TEXT,\n" + + " item TEXT,\n" + + " price INTEGER);"; + + db.execSQL(createTableSql); + + Cursor mCursor = db.query("list", null, null, null, null, null, null, null); + + + mListView = (ListView) findViewById(R.id.shopping_list_view); + + CursorAdapter mCursorAdapter = new CursorAdapter(MainActivity.this, mCursor, 0) { + @Override + public View newView(Context context, Cursor Cursor, ViewGroup parent) { + return LayoutInflater.from(context).inflate(android.R.layout.simple_list_item_1, + parent, false); + } + + @Override + public void bindView(View view, Context context, Cursor Cursor) { + TextView txt = (TextView) view.findViewById(android.R.id.text1); + String rowData = Cursor.getString(Cursor.getColumnIndex("brand")) + + Cursor.getString(Cursor.getColumnIndex("item")); + txt.setText(rowData); + } + + + }; + + mListView.setAdapter(mCursorAdapter); + } + + + @@ -44,4 +110,4 @@ protected void onCreate(Bundle savedInstanceState) { } -} + diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java deleted file mode 100644 index e82539c..0000000 --- a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DatabaseHelper.java +++ /dev/null @@ -1,107 +0,0 @@ -package ly.generalassemb.drewmahrt.shoppinglistver2.setup; - -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; - -/** - * Created by ericaschulz on 6/28/16. - */ -public class DatabaseHelper extends SQLiteOpenHelper { - - public static final int DB_VERSION = 7; - public static final String DB_NAME = "SHOPPING_DB"; - public static final String CREATE_TABLE = "CREATE TABLE SHOPPING_LIST(id INT PRIMARY KEY, brand TEXT, item TEXT);"; - public static final String DROP_TABLE = "DROP TABLE IF EXISTS SHOPPING_LIST;"; - - - - public static final String shoppingList[] = {"id", "brand", "item"}; - - - public DatabaseHelper(Context context) { - super(context, DB_NAME, null, DB_VERSION); - } - - @Override - public void onCreate(SQLiteDatabase db) { - db.execSQL(CREATE_TABLE); - - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - db.execSQL(DROP_TABLE); - onCreate(db); - - - } - - public void createShoppingList(int id, String brand, String item) { - SQLiteDatabase db = getReadableDatabase(); - ContentValues list = new ContentValues(); - list.put("id", id); - list.put("brand", brand); - list.put("item", item); - db.insert("SHOPPING_DB", null, list); - } - - public void seedList() { - createShoppingList(1, "Green Giant", "corn"); - createShoppingList(2, "Wonder", "bread"); - createShoppingList(3, "MinuteMaid", "orange juice"); - createShoppingList(4, "Bisquick", "pancakes"); - - - } - public void getList(int id, String brand, String item) { - SQLiteDatabase db = getReadableDatabase(); - String[] projection = new String[]{"id","brand","item"}; - String selection = "id =?"; - String[] selectionArgs = new String[]{Integer.toString(id)}; - - Cursor c = db.query("SHOPPING_LIST",projection,selection,selectionArgs,null,null,null,null); - c.moveToFirst(); - - int itemId = Integer.parseInt(c.getString(c.getColumnIndex("id"))); - String itemBrand = c.getString(c.getColumnIndex("brand")); - String itemName = c.getString(c.getColumnIndex("item")); - - //SHOPPING_LIST sList = new SHOPPING_LIST(itemId,itemBrand ,itemName); - - - - - - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - -