From 652eae7b3bc691b7a6ad6ee98e050725af1d4298 Mon Sep 17 00:00:00 2001
From: Issei Aoki <i.greenwood.dev@gmail.com>
Date: Sun, 10 Apr 2016 23:06:16 +0900
Subject: [PATCH] Update sample

---
 .../res/drawable-v21/ic_done_black_24dp.xml     |  2 +-
 .../ic_photo_library_black_24dp.xml             |  2 +-
 .../drawable-v21/ic_rotate_left_black_24dp.xml  |  2 +-
 .../drawable-v21/ic_rotate_right_black_24dp.xml |  2 +-
 .../main/res/drawable/ic_done_black_24dp.xml    |  2 +-
 .../drawable/ic_photo_library_black_24dp.xml    |  2 +-
 .../res/drawable/ic_rotate_left_black_24dp.xml  |  2 +-
 .../res/drawable/ic_rotate_right_black_24dp.xml |  2 +-
 .../src/main/res/layout/activity_result.xml     |  7 ++-----
 .../src/main/res/layout/fragment_main.xml       | 17 +++++++----------
 .../src/main/res/values/colors.xml              | 14 ++++++++------
 .../src/main/res/values/styles.xml              |  9 +++++----
 12 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/simplecropview-sample/src/main/res/drawable-v21/ic_done_black_24dp.xml b/simplecropview-sample/src/main/res/drawable-v21/ic_done_black_24dp.xml
index 445db9b..7806fab 100644
--- a/simplecropview-sample/src/main/res/drawable-v21/ic_done_black_24dp.xml
+++ b/simplecropview-sample/src/main/res/drawable-v21/ic_done_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#1c1c1c" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+    <path android:fillColor="#FFFFFB" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/simplecropview-sample/src/main/res/drawable-v21/ic_photo_library_black_24dp.xml b/simplecropview-sample/src/main/res/drawable-v21/ic_photo_library_black_24dp.xml
index a546580..9fd600a 100644
--- a/simplecropview-sample/src/main/res/drawable-v21/ic_photo_library_black_24dp.xml
+++ b/simplecropview-sample/src/main/res/drawable-v21/ic_photo_library_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#1c1c1c" android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
+    <path android:fillColor="#FFFFFB" android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
 </vector>
diff --git a/simplecropview-sample/src/main/res/drawable-v21/ic_rotate_left_black_24dp.xml b/simplecropview-sample/src/main/res/drawable-v21/ic_rotate_left_black_24dp.xml
index 7282f34..cbd156b 100644
--- a/simplecropview-sample/src/main/res/drawable-v21/ic_rotate_left_black_24dp.xml
+++ b/simplecropview-sample/src/main/res/drawable-v21/ic_rotate_left_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#1c1c1c" android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
+    <path android:fillColor="#FFFFFB" android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
 </vector>
diff --git a/simplecropview-sample/src/main/res/drawable-v21/ic_rotate_right_black_24dp.xml b/simplecropview-sample/src/main/res/drawable-v21/ic_rotate_right_black_24dp.xml
index 2c53f3a..53e98a8 100644
--- a/simplecropview-sample/src/main/res/drawable-v21/ic_rotate_right_black_24dp.xml
+++ b/simplecropview-sample/src/main/res/drawable-v21/ic_rotate_right_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#1c1c1c" android:pathData="M15.55,5.55L11,1v3.07C7.06,4.56 4,7.92 4,12s3.05,7.44 7,7.93v-2.02c-2.84,-0.48 -5,-2.94 -5,-5.91s2.16,-5.43 5,-5.91L11,10l4.55,-4.45zM19.93,11c-0.17,-1.39 -0.72,-2.73 -1.62,-3.89l-1.42,1.42c0.54,0.75 0.88,1.6 1.02,2.47h2.02zM13,17.9v2.02c1.39,-0.17 2.74,-0.71 3.9,-1.61l-1.44,-1.44c-0.75,0.54 -1.59,0.89 -2.46,1.03zM16.89,15.48l1.42,1.41c0.9,-1.16 1.45,-2.5 1.62,-3.89h-2.02c-0.14,0.87 -0.48,1.72 -1.02,2.48z"/>
+    <path android:fillColor="#FFFFFB" android:pathData="M15.55,5.55L11,1v3.07C7.06,4.56 4,7.92 4,12s3.05,7.44 7,7.93v-2.02c-2.84,-0.48 -5,-2.94 -5,-5.91s2.16,-5.43 5,-5.91L11,10l4.55,-4.45zM19.93,11c-0.17,-1.39 -0.72,-2.73 -1.62,-3.89l-1.42,1.42c0.54,0.75 0.88,1.6 1.02,2.47h2.02zM13,17.9v2.02c1.39,-0.17 2.74,-0.71 3.9,-1.61l-1.44,-1.44c-0.75,0.54 -1.59,0.89 -2.46,1.03zM16.89,15.48l1.42,1.41c0.9,-1.16 1.45,-2.5 1.62,-3.89h-2.02c-0.14,0.87 -0.48,1.72 -1.02,2.48z"/>
 </vector>
diff --git a/simplecropview-sample/src/main/res/drawable/ic_done_black_24dp.xml b/simplecropview-sample/src/main/res/drawable/ic_done_black_24dp.xml
index 445db9b..7806fab 100644
--- a/simplecropview-sample/src/main/res/drawable/ic_done_black_24dp.xml
+++ b/simplecropview-sample/src/main/res/drawable/ic_done_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#1c1c1c" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+    <path android:fillColor="#FFFFFB" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/simplecropview-sample/src/main/res/drawable/ic_photo_library_black_24dp.xml b/simplecropview-sample/src/main/res/drawable/ic_photo_library_black_24dp.xml
index a546580..9fd600a 100644
--- a/simplecropview-sample/src/main/res/drawable/ic_photo_library_black_24dp.xml
+++ b/simplecropview-sample/src/main/res/drawable/ic_photo_library_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#1c1c1c" android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
+    <path android:fillColor="#FFFFFB" android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
 </vector>
diff --git a/simplecropview-sample/src/main/res/drawable/ic_rotate_left_black_24dp.xml b/simplecropview-sample/src/main/res/drawable/ic_rotate_left_black_24dp.xml
index 7282f34..cbd156b 100644
--- a/simplecropview-sample/src/main/res/drawable/ic_rotate_left_black_24dp.xml
+++ b/simplecropview-sample/src/main/res/drawable/ic_rotate_left_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#1c1c1c" android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
+    <path android:fillColor="#FFFFFB" android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
 </vector>
diff --git a/simplecropview-sample/src/main/res/drawable/ic_rotate_right_black_24dp.xml b/simplecropview-sample/src/main/res/drawable/ic_rotate_right_black_24dp.xml
index 2c53f3a..53e98a8 100644
--- a/simplecropview-sample/src/main/res/drawable/ic_rotate_right_black_24dp.xml
+++ b/simplecropview-sample/src/main/res/drawable/ic_rotate_right_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#1c1c1c" android:pathData="M15.55,5.55L11,1v3.07C7.06,4.56 4,7.92 4,12s3.05,7.44 7,7.93v-2.02c-2.84,-0.48 -5,-2.94 -5,-5.91s2.16,-5.43 5,-5.91L11,10l4.55,-4.45zM19.93,11c-0.17,-1.39 -0.72,-2.73 -1.62,-3.89l-1.42,1.42c0.54,0.75 0.88,1.6 1.02,2.47h2.02zM13,17.9v2.02c1.39,-0.17 2.74,-0.71 3.9,-1.61l-1.44,-1.44c-0.75,0.54 -1.59,0.89 -2.46,1.03zM16.89,15.48l1.42,1.41c0.9,-1.16 1.45,-2.5 1.62,-3.89h-2.02c-0.14,0.87 -0.48,1.72 -1.02,2.48z"/>
+    <path android:fillColor="#FFFFFB" android:pathData="M15.55,5.55L11,1v3.07C7.06,4.56 4,7.92 4,12s3.05,7.44 7,7.93v-2.02c-2.84,-0.48 -5,-2.94 -5,-5.91s2.16,-5.43 5,-5.91L11,10l4.55,-4.45zM19.93,11c-0.17,-1.39 -0.72,-2.73 -1.62,-3.89l-1.42,1.42c0.54,0.75 0.88,1.6 1.02,2.47h2.02zM13,17.9v2.02c1.39,-0.17 2.74,-0.71 3.9,-1.61l-1.44,-1.44c-0.75,0.54 -1.59,0.89 -2.46,1.03zM16.89,15.48l1.42,1.41c0.9,-1.16 1.45,-2.5 1.62,-3.89h-2.02c-0.14,0.87 -0.48,1.72 -1.02,2.48z"/>
 </vector>
diff --git a/simplecropview-sample/src/main/res/layout/activity_result.xml b/simplecropview-sample/src/main/res/layout/activity_result.xml
index ebcfe28..0d4f100 100644
--- a/simplecropview-sample/src/main/res/layout/activity_result.xml
+++ b/simplecropview-sample/src/main/res/layout/activity_result.xml
@@ -7,7 +7,8 @@
     <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="64dp">
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/colorPrimary">
         <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -22,10 +23,6 @@
 
     </android.support.v7.widget.Toolbar>
 
-    <View android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:background="@color/colorAccent"/>
-
     <ImageView
             android:id="@+id/result_image"
             android:layout_width="match_parent"
diff --git a/simplecropview-sample/src/main/res/layout/fragment_main.xml b/simplecropview-sample/src/main/res/layout/fragment_main.xml
index cd841cb..9b06019 100644
--- a/simplecropview-sample/src/main/res/layout/fragment_main.xml
+++ b/simplecropview-sample/src/main/res/layout/fragment_main.xml
@@ -8,7 +8,8 @@
     <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize">
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/colorPrimary">
         <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -23,10 +24,6 @@
         </RelativeLayout>
     </android.support.v7.widget.Toolbar>
 
-    <View android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:background="@color/colorAccent"/>
-
     <com.isseiaoki.simplecropview.CropImageView
             android:id="@+id/cropImageView"
             android:layout_weight="1"
@@ -37,7 +34,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             custom:scv_crop_mode="fit_image"
-            custom:scv_background_color="@color/colorPrimary"
+            custom:scv_background_color="@color/windowBackground"
             custom:scv_handle_color="@color/colorAccent"
             custom:scv_guide_color="@color/colorAccent"
             custom:scv_overlay_color="@color/overlay"
@@ -55,13 +52,13 @@
           android:layout_height="1dp"
           android:layout_marginLeft="8dp"
           android:layout_marginRight="8dp"
-          android:background="@color/colorAccent"/>
+          android:background="@color/divider"/>
 
     <HorizontalScrollView
             android:id="@+id/tab_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
+            android:background="@color/windowBackground"
             android:scrollbars="none">
 
         <LinearLayout
@@ -176,7 +173,7 @@
           android:layout_height="1dp"
           android:layout_marginLeft="8dp"
           android:layout_marginRight="8dp"
-          android:background="@color/colorAccent"/>
+          android:background="@color/divider"/>
 
     <RelativeLayout
             android:layout_width="match_parent"
@@ -184,7 +181,7 @@
             android:orientation="horizontal"
             android:layout_alignBottom="@id/cropImageView"
             android:layout_centerHorizontal="true"
-            android:background="@color/colorPrimary"
+            android:background="@color/windowBackground"
             >
 
         <ImageButton
diff --git a/simplecropview-sample/src/main/res/values/colors.xml b/simplecropview-sample/src/main/res/values/colors.xml
index ad68a6c..9dc18a7 100644
--- a/simplecropview-sample/src/main/res/values/colors.xml
+++ b/simplecropview-sample/src/main/res/values/colors.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#FFFFFB</color>
-    <color name="colorPrimaryDark">#1C1C1C</color>
-    <color name="colorAccent">#86C166</color>
-    <color name="colorButtonNormal">#1C1C1C</color>
-    <color name="textColorPrimary">#1C1C1C</color>
-    <color name="textColorPrimaryInverse">#FFFFFB</color>
+    <color name="colorPrimary">#5DAC81</color>
+    <color name="colorPrimaryDark">#4F916D</color>
+    <color name="colorAccent">#5DAC81</color>
+    <color name="windowBackground">#1C1C1C</color>
+    <color name="colorButtonNormal">#FFFFFB</color>
+    <color name="textColorPrimary">#FFFFFB</color>
+    <color name="textColorPrimaryInverse">#1C1C1C</color>
     <color name="overlay">#AA1C1C1C</color>
+    <color name="divider">#333333</color>
 </resources>
\ No newline at end of file
diff --git a/simplecropview-sample/src/main/res/values/styles.xml b/simplecropview-sample/src/main/res/values/styles.xml
index f5fbbd2..3d65996 100644
--- a/simplecropview-sample/src/main/res/values/styles.xml
+++ b/simplecropview-sample/src/main/res/values/styles.xml
@@ -1,27 +1,28 @@
 <resources>
 
-    <style name="AppTheme.Light.NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme.Light.NoActionBar" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="android:textColorSecondary">@color/colorPrimaryDark</item>
         <item name="android:colorBackground">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorButtonNormal">@color/colorButtonNormal</item>
+        <item name="android:windowBackground">@color/windowBackground</item>
         <item name="android:textAppearanceButton">@style/AppTheme.Button.Borderless</item>
         <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
     </style>
 
     <style name="AppTheme.Button.Borderless" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
-        <item name="android:textColor">@color/colorPrimaryDark</item>
+        <item name="android:textColor">@color/textColorPrimary</item>
         <item name="android:minHeight">@dimen/button_height</item>
         <item name="android:textSize">@dimen/text_size_s</item>
         <item name="android:gravity">center_vertical|center_horizontal</item>
     </style>
 
     <style name="TextAppearance.Small" parent="TextAppearance.AppCompat.Small">
-        <item name="android:textColor">@color/colorPrimaryDark</item>
-        <item name="android:textSize">@dimen/text_size_s</item>
+        <item name="android:textColor">@color/textColorPrimary</item>
+        <item name="android:textSize">@dimen/text_size_m</item>
         <item name="android:gravity">center_horizontal|center_vertical</item>
     </style>