Add option to use hex colors, int colors (Color.RED) or color resources

soyangel · Sep 2, 2014 · 314183d · 314183d
1 parent 2d1c0d4
commit 314183d
Show file tree

Hide file tree

Showing 15 changed files with 251 additions and 135 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,30 @@
-.gradle
-/local.properties
-/.idea/workspace.xml
+# Built application files
+/*/build/
+# Built application files
+build/
+
+# Crashlytics configuations
+com_crashlytics_export_strings.xml
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Gradle generated files
+.gradle/
+
+# Signing files
+.signing/
+gradle.properties
+
+# User-specific configurations
+.idea/*
+*.iml
+
+# OS-specific files
 .DS_Store
-/build
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/libraries/appcompat_v7_19_1_0.xml b/.idea/libraries/appcompat_v7_19_1_0.xml
diff --git a/.idea/libraries/support_v4_19_1_0.xml b/.idea/libraries/support_v4_19_1_0.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,5 +21,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:19.+'
+    compile 'com.android.support:appcompat-v7:20.0.0'
+    compile 'com.android.support:support-v4:20.0.0'
 }