From ebeaf8a5296c39eb7b3c3b8117c2b8886fe99422 Mon Sep 17 00:00:00 2001
From: Alexander Martinz <eviscerationls@gmail.com>
Date: Wed, 4 May 2016 12:06:05 +0200
Subject: [PATCH] cleanup resources

 * move material_colors file to sample
 * create own styles file for api 19 to not crash on apis below 19
 * remove unneeded target api attributes
 * use #ffffff instead of color reference for vector drawables
   as we generate pngs out of it on older apis
 * remove application tag from library manifest file, to prevent
   weird behavior when merging manifests

Change-Id: Ief8794e095b991f04c641ffb6919994a30391cd1
Signed-off-by: Alexander Martinz <eviscerationls@gmail.com>
---
 .../src/main/res/values/material_colors.xml           |  0
 library/src/main/AndroidManifest.xml                  | 11 +----------
 library/src/main/res/drawable-v21/done_to_next.xml    |  4 +---
 library/src/main/res/drawable-v21/next_to_done.xml    |  4 +---
 library/src/main/res/drawable/done.xml                |  4 ++--
 library/src/main/res/drawable/next.xml                |  4 ++--
 library/src/main/res/values-v19/styles.xml            |  9 +++++++++
 library/src/main/res/values/styles.xml                |  5 ++---
 8 files changed, 18 insertions(+), 23 deletions(-)
 rename {library => app}/src/main/res/values/material_colors.xml (100%)
 create mode 100644 library/src/main/res/values-v19/styles.xml

diff --git a/library/src/main/res/values/material_colors.xml b/app/src/main/res/values/material_colors.xml
similarity index 100%
rename from library/src/main/res/values/material_colors.xml
rename to app/src/main/res/values/material_colors.xml
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 33f81e2..9981820 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,10 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.miz.introactivity">
-
-    <application
-        android:allowBackup="true"
-        android:supportsRtl="true">
-
-    </application>
-
-</manifest>
+<manifest package="com.miz.introactivity" />
diff --git a/library/src/main/res/drawable-v21/done_to_next.xml b/library/src/main/res/drawable-v21/done_to_next.xml
index 2c4137b..53fce86 100644
--- a/library/src/main/res/drawable-v21/done_to_next.xml
+++ b/library/src/main/res/drawable-v21/done_to_next.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animated-vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="21"
     android:drawable="@drawable/done">
 
     <target
         android:name="done"
         android:animation="@anim/done_to_next" />
 
-</animated-vector>
\ No newline at end of file
+</animated-vector>
diff --git a/library/src/main/res/drawable-v21/next_to_done.xml b/library/src/main/res/drawable-v21/next_to_done.xml
index b0a2941..30c2c86 100644
--- a/library/src/main/res/drawable-v21/next_to_done.xml
+++ b/library/src/main/res/drawable-v21/next_to_done.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animated-vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:targetApi="21"
     android:drawable="@drawable/next">
 
     <target
         android:name="next"
         android:animation="@anim/next_to_done" />
 
-</animated-vector>
\ No newline at end of file
+</animated-vector>
diff --git a/library/src/main/res/drawable/done.xml b/library/src/main/res/drawable/done.xml
index e909b83..39a6e25 100644
--- a/library/src/main/res/drawable/done.xml
+++ b/library/src/main/res/drawable/done.xml
@@ -9,9 +9,9 @@
 
         <path
             android:name="done"
-            android:fillColor="@android:color/white"
+            android:fillColor="#ffffff"
             android:pathData="M18 32.34L9.66 24l-2.83 2.83L18 38l24-24-2.83-2.83z" />
 
     </group>
 
-</vector>
\ No newline at end of file
+</vector>
diff --git a/library/src/main/res/drawable/next.xml b/library/src/main/res/drawable/next.xml
index 4788e2d..2ba3538 100644
--- a/library/src/main/res/drawable/next.xml
+++ b/library/src/main/res/drawable/next.xml
@@ -9,9 +9,9 @@
 
         <path
             android:name="next"
-            android:fillColor="@android:color/white"
+            android:fillColor="#ffffff"
             android:pathData="M24 8l-2.83 2.83L32.34 22H8v4h24.34L21.17 37.17 24 40l16-16z" />
 
     </group>
 
-</vector>
\ No newline at end of file
+</vector>
diff --git a/library/src/main/res/values-v19/styles.xml b/library/src/main/res/values-v19/styles.xml
new file mode 100644
index 0000000..27880b3
--- /dev/null
+++ b/library/src/main/res/values-v19/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="IntroActivity.Theme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowBackground">@null</item>
+        <item name="android:windowTranslucentStatus">true</item>
+    </style>
+
+</resources>
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index b1098e1..65b1cf9 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="IntroActivity.Theme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowBackground">@null</item>
-        <item name="android:windowTranslucentStatus" tools:targetApi="19">true</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>