Merge remote-tracking branch 'origin/master'

Neamar · Dec 8, 2015 · f4aa7b8 · f4aa7b8
2 parents 23a46ea + 122f323
commit f4aa7b8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -156,4 +156,4 @@
         </receiver>
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
@@ -3,18 +3,35 @@
 
     <style name="BaseThemeLight" parent="@android:style/Theme.Material.Light.NoActionBar">
         <item name="android:colorPrimary">@color/kiss_green</item>
-        <item name="android:colorPrimaryDark">@android:color/transparent</item>
+        <item name="android:colorPrimaryDark">@color/kiss_green</item>
         <item name="android:colorAccent">@color/kiss_green</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="BaseThemeDark" parent="@android:style/Theme.Material.NoActionBar">
         <item name="android:colorPrimary">@color/kiss_green</item>
-        <item name="android:colorPrimaryDark">@android:color/transparent</item>
+        <item name="android:colorPrimaryDark">@color/kiss_green</item>
         <item name="android:colorAccent">@color/kiss_green</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
+    <style name="AppThemeTransparent" parent="AppThemeLight">
+        <item name="resultColor">#f8f8f8</item>
+        <item name="listBackgroundColor">@android:color/transparent</item>
+        <item name="dividerDrawable">@drawable/list_separator_transparent</item>
+        <item name="android:colorPrimaryDark">@android:color/transparent</item>
+    </style>
+
+    <style name="AppThemeSemiTransparent" parent="AppThemeLight">
+        <item name="listBackgroundColor">@color/kiss_background_light_transparent</item>
+        <item name="android:colorPrimaryDark">@color/kiss_green_semitransparent</item>
+    </style>
+
+    <style name="AppThemeSemiTransparentDark" parent="AppThemeDark">
+        <item name="listBackgroundColor">@color/kiss_background_dark_transparent</item>
+        <item name="android:colorPrimaryDark">@color/kiss_green_semitransparent</item>
+    </style>
+
     <style name="SettingTheme" parent="AppThemeLight">
         <item name="android:windowBackground">@color/kiss_background</item>
         <item name="android:textColorSecondary">#7f7f7f</item>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -9,4 +9,5 @@
     <color name="kiss_divider_dark">#434343</color>
     <color name="kiss_background_light_transparent">#88FFFFFF</color>
     <color name="kiss_background_dark_transparent">#88222222</color>
+    <color name="kiss_green_semitransparent">#884caf50</color>
 </resources>