X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/dde5e5575cd7358ebed3390ca384e78bf9e3d17b..244f3bd4e4d4dcb09be4eede2750cf2bd7670321:/res/values/styles.xml?ds=sidebyside

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4ad01054..54e52257 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -21,7 +21,7 @@
 	<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>
@@ -29,13 +29,14 @@
 		<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="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 		<item name="colorButtonNormal">@color/background_color</item>
 		<item name="colorControlActivated">@color/primary_dark</item>
 		<item name="colorControlHighlight">@color/color_accent</item>
 	</style>
 
 	<!-- seperate action bar style for activities without an action bar -->
-	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.AppCompat.Light.DarkActionBar">
+	<style name="Theme.ownCloud.noActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
 		<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
 		<item name="windowNoTitle">true</item>
 		<item name="windowActionBar">false</item>
@@ -43,15 +44,47 @@
 		<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="alertDialogTheme">@style/ownCloud.AlertDialog</item>
 		<item name="colorButtonNormal">@color/background_color</item>
 		<item name="colorControlActivated">@color/primary_dark</item>
 		<item name="colorControlHighlight">@color/color_accent</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" />
+
+	<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 -->