Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

app/src/main/res/values-v23/styles.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <!-- Customize your theme here. -->
+    <!--<item name="actionBarSize">@dimen/action_bar_height</item>-->
+    <item name="colorPrimary">@color/C000000</item>
+    <item name="colorPrimaryDark">@color/CFFFFFF</item>
+    <item name="colorAccent">@color/C000000</item>
+    <item name="android:textColorPrimary">@color/C000000</item>
+    <item name="android:windowBackground">@color/CFFFFFF</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowTranslucentStatus">true</item>
+    <item name="android:windowTranslucentNavigation">true</item>
+    <!--Status Bar 글자색깔-->
+    <item name="android:windowLightStatusBar">true</item> <!-- API 23 -->
+
+    <!--<item name="android:windowFullscreen">true</item>-->
+    <!--<item name="android:fontFamily">@font/font_droid_sans</item>--> <!-- Toast 에 적용이 안된다. -->
+    <item name="customSwitchStyle">@style/OnOffSwitch</item>
+  </style>
+</resources>

app/src/main/res/values/styles.xml

@@ -23,8 +23,6 @@
     <item name="android:windowContentOverlay">@null</item>
     <item name="android:windowTranslucentStatus">true</item>
     <item name="android:windowTranslucentNavigation">true</item>
-    <!--Status Bar 글자색깔-->
-    <item name="android:windowLightStatusBar">true</item>
 
     <!--<item name="android:windowFullscreen">true</item>-->
     <!--<item name="android:fontFamily">@font/font_droid_sans</item>--> <!-- Toast 에 적용이 안된다. -->