Updated database with latest

Linted
AEFeinstein · Apr 23, 2015 · 48f2f0f · 48f2f0f
1 parent 8cf47a8
commit 48f2f0f
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 10 deletions.
diff --git a/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/fragments/CardViewFragment.java b/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/fragments/CardViewFragment.java
@@ -200,7 +200,7 @@ public void onStop() {
      *
      * @return An action describing this page view
      */
-    public Action getAppIndexAction() {
+    Action getAppIndexAction() {
 
         Thing object = new Thing.Builder()
                 .setType("http://schema.org/Thing")         /* Optional, any valid schema.org type */

diff --git a/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/fragments/FamiliarFragment.java b/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/fragments/FamiliarFragment.java
@@ -16,16 +16,11 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.gelakinetic.mtgfam.FamiliarActivity;
 import com.gelakinetic.mtgfam.R;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.concurrent.RejectedExecutionException;
 
 /**

diff --git a/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/helpers/AutocompleteCursorAdapter.java b/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/helpers/AutocompleteCursorAdapter.java
@@ -33,7 +33,6 @@
 import android.widget.AutoCompleteTextView;
 import android.widget.SimpleCursorAdapter;
 
-import com.gelakinetic.mtgfam.R;
 import com.gelakinetic.mtgfam.fragments.FamiliarFragment;
 import com.gelakinetic.mtgfam.helpers.database.CardDbAdapter;
 import com.gelakinetic.mtgfam.helpers.database.CardSearchProvider;

diff --git a/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/helpers/WishlistHelpers.java b/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/helpers/WishlistHelpers.java
@@ -375,7 +375,7 @@ public static class CompressedWishlistInfo {
 		 * @param card The MtgCard which will be the base for this object
 		 */
 		public CompressedWishlistInfo(MtgCard card) {
-			mInfo = new ArrayList<IndividualSetInfo>();
+			mInfo = new ArrayList<>();
 			mCard = card;
 			add(mCard);
 		}

diff --git a/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/helpers/database/CardDbAdapter.java b/MTGFamiliar/src/main/java/com/gelakinetic/mtgfam/helpers/database/CardDbAdapter.java
@@ -68,7 +68,7 @@ public class CardDbAdapter {
     public static final String DATABASE_NAME = "data";
     public static final String DATABASE_TABLE_CARDS = "cards";
     public static final String DATABASE_TABLE_SETS = "sets";
-    public static final int DATABASE_VERSION = 54;
+    public static final int DATABASE_VERSION = 55;
     public static final String KEY_ID = "_id";
     public static final String KEY_NAME = SearchManager.SUGGEST_COLUMN_TEXT_1; // "name";
     public static final String KEY_SET = "expansion";

diff --git a/MTGFamiliar/src/main/res/layout/activity_main.xml b/MTGFamiliar/src/main/res/layout/activity_main.xml
@@ -1,5 +1,4 @@
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"

diff --git a/MTGFamiliar/src/main/res/raw/datagz b/MTGFamiliar/src/main/res/raw/datagz