From 86feaf3da759c065e162f5be29af097272494712 Mon Sep 17 00:00:00 2001
From: teddywilson <teddy@roof.io>
Date: Mon, 10 Jul 2017 14:44:51 -0400
Subject: [PATCH] changes

---
 .../fragments/ViewFragment.java               |  1 -
 .../spurceexampleapp/util/ColorUtils.java     | 43 -------------------
 app/src/main/res/layout/view_card.xml         |  9 ++--
 app/src/main/res/layout/view_fragment.xml     |  4 +-
 app/src/main/res/values/colors.xml            |  8 ----
 5 files changed, 7 insertions(+), 58 deletions(-)
 delete mode 100644 app/src/main/java/com/willowtreeapps/spurceexampleapp/util/ColorUtils.java

diff --git a/app/src/main/java/com/willowtreeapps/spurceexampleapp/fragments/ViewFragment.java b/app/src/main/java/com/willowtreeapps/spurceexampleapp/fragments/ViewFragment.java
index dabd061..a4b2c1f 100644
--- a/app/src/main/java/com/willowtreeapps/spurceexampleapp/fragments/ViewFragment.java
+++ b/app/src/main/java/com/willowtreeapps/spurceexampleapp/fragments/ViewFragment.java
@@ -35,7 +35,6 @@
 import android.widget.GridLayout;
 
 import com.willowtreeapps.spurceexampleapp.R;
-import com.willowtreeapps.spurceexampleapp.util.ColorUtils;
 import com.willowtreeapps.spurceexampleapp.widgets.CardLayout;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/willowtreeapps/spurceexampleapp/util/ColorUtils.java b/app/src/main/java/com/willowtreeapps/spurceexampleapp/util/ColorUtils.java
deleted file mode 100644
index d24d4e1..0000000
--- a/app/src/main/java/com/willowtreeapps/spurceexampleapp/util/ColorUtils.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.willowtreeapps.spurceexampleapp.util;
-
-import android.content.Context;
-import android.support.v4.content.ContextCompat;
-
-import com.willowtreeapps.spurceexampleapp.R;
-
-import java.util.Random;
-
-/**
- * Created by teddywilson on 7/10/17.
- */
-
-public class ColorUtils {
-
-    public static final int ICON_COLOR_COUNT = 6;
-
-    public static int randomIconColor(Context context) {
-        int val = (int) (Math.random() * 5);
-        switch (val) {
-            case 0:
-                return ContextCompat.getColor(context, R.color.icon_color_1);
-
-            case 1:
-                return ContextCompat.getColor(context, R.color.icon_color_2);
-
-            case 2:
-                return ContextCompat.getColor(context, R.color.icon_color_3);
-
-            case 3:
-                return ContextCompat.getColor(context, R.color.icon_color_4);
-
-            case 4:
-                return ContextCompat.getColor(context, R.color.icon_color_5);
-
-            case 5:
-                return ContextCompat.getColor(context, R.color.icon_color_6);
-
-        }
-        throw new RuntimeException("Invalid color value");
-    }
-
-}
diff --git a/app/src/main/res/layout/view_card.xml b/app/src/main/res/layout/view_card.xml
index 9a1c429..25bbf70 100644
--- a/app/src/main/res/layout/view_card.xml
+++ b/app/src/main/res/layout/view_card.xml
@@ -2,15 +2,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="10dp"
+    android:padding="8dp"
     android:background="@color/white">
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="10dp"
+        android:layout_height="8dp"
         android:background="@color/fake_paragraphs"
         android:layout_alignParentBottom="true"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="8dp"
+        android:alpha="0.5"
         android:id="@+id/fake_paragraph"
         />
 
@@ -18,7 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@id/fake_paragraph"
-        android:background="@color/spruceViewColor"
+        android:background="@color/square_background"
         />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_fragment.xml b/app/src/main/res/layout/view_fragment.xml
index 8757c2c..5bc9a85 100644
--- a/app/src/main/res/layout/view_fragment.xml
+++ b/app/src/main/res/layout/view_fragment.xml
@@ -43,8 +43,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clickable="true"
-            android:columnCount="4"
-            android:rowCount="6"/>
+            android:columnCount="6"
+            android:rowCount="7"/>
 
     </FrameLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cde8900..6c8f832 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,12 +34,4 @@
     <color name="fake_paragraphs">#D9E1E2</color>
     <color name="square_background">#DBE9F9</color>
 
-    <!-- Dev -->
-    <color name="icon_color_1">#abe8dc</color>
-    <color name="icon_color_2">#b8dcf2</color>
-    <color name="icon_color_3">#f7c2ba</color>
-    <color name="icon_color_4">#f5d1ad</color>
-    <color name="icon_color_5">#faeba6</color>
-    <color name="icon_color_6">#b5edcc</color>
-
 </resources>