Browse Source

make sure dialog button text is not allCaps and title is standard material colored

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 5 years ago
parent
commit
8585e44d4b
2 changed files with 3 additions and 3 deletions
  1. 1 0
      src/main/res/values-v21/styles.xml
  2. 2 3
      src/main/res/values/styles.xml

+ 1 - 0
src/main/res/values-v21/styles.xml

@@ -53,6 +53,7 @@
         <item name="colorAccent">#757575</item>
         <item name="colorAccent">#757575</item>
         <item name="windowNoTitle">false</item>
         <item name="windowNoTitle">false</item>
         <item name="android:windowBackground">@color/bg_default</item>
         <item name="android:windowBackground">@color/bg_default</item>
+        <item name="android:textAllCaps">false</item>
     </style>
     </style>
 
 
     <style name="Theme.ownCloud.ToolbarBase" parent="BaseTheme.ownCloud.Toolbar">
     <style name="Theme.ownCloud.ToolbarBase" parent="BaseTheme.ownCloud.Toolbar">

+ 2 - 3
src/main/res/values/styles.xml

@@ -72,6 +72,7 @@
 		<item name="colorAccent">#757575</item>
 		<item name="colorAccent">#757575</item>
 		<item name="windowNoTitle">false</item>
 		<item name="windowNoTitle">false</item>
         <item name="android:windowBackground">@color/bg_default</item>
         <item name="android:windowBackground">@color/bg_default</item>
+        <item name="android:textAllCaps">false</item>
 	</style>
 	</style>
 
 
 	<!-- separate action bar style for activities without an action bar -->
 	<!-- separate action bar style for activities without an action bar -->
@@ -108,21 +109,18 @@
 
 
 	<style name="ownCloud.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
 	<style name="ownCloud.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="colorAccent">@color/color_accent</item>
-		<item name="android:textColorPrimary">@color/primary</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:windowBackground">@color/bg_default</item>
         <item name="android:windowBackground">@color/bg_default</item>
     </style>
     </style>
 
 
 	<style name="ownCloud.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
 	<style name="ownCloud.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
-		<item name="colorAccent">@color/color_accent</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textAllCaps">false</item>
 	</style>
 	</style>
 
 
 	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
 	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="colorAccent">@color/color_accent</item>
-		<item name="android:textColorPrimary">@color/primary</item>
 		<item name="android:windowFrame">@color/transparent</item>
 		<item name="android:windowFrame">@color/transparent</item>
 		<item name="android:windowBackground">@color/transparent</item>
 		<item name="android:windowBackground">@color/transparent</item>
 		<item name="android:windowTitleBackgroundStyle">@drawable/process_dialog_background</item>
 		<item name="android:windowTitleBackgroundStyle">@drawable/process_dialog_background</item>
@@ -230,6 +228,7 @@
 		<item name="windowNoTitle">false</item>
 		<item name="windowNoTitle">false</item>
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="colorAccent">@color/color_accent</item>
         <item name="android:windowBackground">@color/bg_default</item>
         <item name="android:windowBackground">@color/bg_default</item>
+        <item name="android:textAllCaps">false</item>
     </style>
     </style>
 
 
 	<style name="Theme.ownCloud.Dialog.NoTitle" parent="@style/Theme.ownCloud.Dialog">
 	<style name="Theme.ownCloud.Dialog.NoTitle" parent="@style/Theme.ownCloud.Dialog">