changes

songdehuai · Jul 10, 2017 · 86feaf3 · 86feaf3
1 parent 511e038
commit 86feaf3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 58 deletions.
diff --git 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
diff --git a/app/src/main/res/layout/view_card.xml b/app/src/main/res/layout/view_card.xml
@@ -2,23 +2,24 @@
 <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"
         />
 
     <View
         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>
diff --git 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
@@ -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>