Bumped to 1.0.4

Enforced colors
yxljl1314 · Nov 2, 2014 · 6909c02 · 6909c02
1 parent 0a60af0
commit 6909c02
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 /.idea/workspace.xml
 .DS_Store
 /build
+.idea/
diff --git a/.idea/libraries/cardview_v7_21_0_0.xml b/.idea/libraries/cardview_v7_21_0_0.xml
diff --git a/.idea/libraries/materiallist_1_0_0.xml b/.idea/libraries/materiallist_1_0_0.xml
diff --git a/MaterialList.iml b/MaterialList.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.dexafree" external.system.module.version="1.0.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.dexafree" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

diff --git a/app/app.iml b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.dexafree" external.system.module.version="1.0.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.dexafree" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -81,12 +81,11 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="cardview-v7-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
-    <orderEntry type="library" exported="" name="materiallist-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
+    <orderEntry type="module" module-name="materialList" exported="" />
   </component>
 </module>
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,7 +21,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    //compile project(':materialList')
-    compile 'com.github.dexafree:materiallist:1.0.0'
+    compile project(':materialList')
+    //compile 'com.github.dexafree:materiallist:1.0.0'
     compile 'com.android.support:appcompat-v7:21.0.0'
 }
diff --git a/materialList/build.gradle b/materialList/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.dexafree.materialList"
         minSdkVersion 9
         targetSdkVersion 21
-        versionCode 3
-        versionName "1.0.1"
+        versionCode 4
+        versionName "1.0.3"
     }
     buildTypes {
         release {

diff --git a/materialList/materialList.iml b/materialList/materialList.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.dexafree" external.system.module.version="1.0.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.dexafree" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>

diff --git a/materialList/src/main/res/layout/material_basic_image_buttons_card_layout.xml b/materialList/src/main/res/layout/material_basic_image_buttons_card_layout.xml
@@ -31,7 +31,7 @@
                 android:paddingRight="16dp"
                 android:paddingBottom="8dp"
                 android:textSize="@dimen/title_size"
-                android:textColor="@color/grey_title"
+                android:textColor="@color/black_button"
                 tools:text="El Pooch"/>
 
             <TextView

diff --git a/materialList/src/main/res/layout/material_small_image_card.xml b/materialList/src/main/res/layout/material_small_image_card.xml
@@ -20,6 +20,7 @@
                 android:padding="@dimen/big_padding"
                 android:textSize="@dimen/title_size"
                 android:id="@+id/titleTextView"
+                android:textColor="@color/black_button"
                 tools:text="Title"/>
 
             <ImageView
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ @@
     /.idea/workspace.xml
     .DS_Store
     /build
+    .idea/