X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/bbfb414695f57029033d01bf4d26e2c9dcef54a5..e4947377e1db354182fa403c25ecd9cfe353d09f:/res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4ad01054..15b989ee 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -21,37 +21,64 @@
 	<style name="Animations" />
 
 	<!-- General ownCloud app style -->
-	<style name="Theme.ownCloud" parent="style/Theme.AppCompat.Light.DarkActionBar">
+	<style name="Theme.ownCloud" parent="Theme.AppCompat.Light.DarkActionBar">
     	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
-    	<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
 		<item name="colorPrimary">@color/primary</item>
 		<item name="colorPrimaryDark">@color/primary_dark</item>
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
-		<item name="colorButtonNormal">@color/background_color</item>
-		<item name="colorControlActivated">@color/primary_dark</item>
-		<item name="colorControlHighlight">@color/color_accent</item>
+		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 	</style>
 
 	<!-- seperate action bar style for activities without an action bar -->
-	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light.DarkActionBar">
-		<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+	<style name="Theme.ownCloud.noActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
 		<item name="windowNoTitle">true</item>
 		<item name="windowActionBar">false</item>
 		<item name="colorPrimary">@color/primary</item>
 		<item name="colorPrimaryDark">@color/primary_dark</item>
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
-		<item name="colorButtonNormal">@color/background_color</item>
-		<item name="colorControlActivated">@color/primary_dark</item>
-		<item name="colorControlHighlight">@color/color_accent</item>
+		<item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
     </style>
 
+	<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar">
+		<item name="colorAccent">@color/white</item>
+	</style>
+
+	<style name="ownCloud.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+		<item name="colorAccent">@color/color_accent</item>
+		<item name="android:textColorPrimary">@color/primary</item>
+	</style>
+
+	<style name="ownCloud.Dialog" parent="Theme.AppCompat.Light.Dialog">
+		<item name="colorAccent">@color/color_accent</item>
+	</style>
+
+	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
+		<item name="colorAccent">@color/color_accent</item>
+		<item name="android:textColorPrimary">@color/primary</item>
+		<item name="android:windowFrame">@color/transparent</item>
+		<item name="android:windowBackground">@color/transparent</item>
+		<item name="android:windowTitleBackgroundStyle">@drawable/process_dialog_background</item>
+	</style>
+
 	<style name="ownCloud.Button" parent="Widget.AppCompat.Button">
 		<item name="colorButtonNormal">@color/primary</item>
-		<item name="colorControlActivated">@color/primary_dark</item>
-		<item name="colorControlHighlight">@color/color_accent</item>
+	</style>
+
+	<style name="Button" parent="Base.Widget.AppCompat.Button">
+		<item name="colorButtonNormal">@color/secondary_button_color</item>
+		<item name="android:textColor">@color/color_accent</item>
+	</style>
+
+	<style name="Button.Primary" parent="Button">
+		<item name="colorButtonNormal">@color/primary_button_color</item>
+		<item name="android:textColor">@color/white</item>
+	</style>
+
+	<style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
+		<item name="android:textColor">@color/color_accent</item>
 	</style>
 
 	<!-- separat translucent action bar style -->
@@ -80,6 +107,7 @@
 
 	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.AppCompat">
         <item name="android:windowFullscreen">true</item>
+		<item name="colorAccent">@color/color_accent</item>
     </style>
 	
 	
@@ -102,6 +130,11 @@
 		<item name="buttonBarStyle">@style/Theme.ownCloud.Dialog.ButtonBar</item>
 	</style>
 
+	<style name="menu_labels_style">
+		<item name="android:background">@drawable/fab_label_background</item>
+		<item name="android:textColor">@color/fab_white</item>
+	</style>
+
 	<!-- Button Bar hack due to Lollipop bug:
 		https://code.google.com/p/android/issues/detail?id=78302
 	fix see: