Explorar o código

PoC for Matzerial3 theming

Resolves #10641

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger %!s(int64=2) %!d(string=hai) anos
pai
achega
0308ace17f

+ 0 - 1
app/src/main/res/layout/file_details_fragment.xml

@@ -185,7 +185,6 @@
         android:background="@color/bg_default"
         app:tabGravity="center"
         app:tabMode="fixed"
-        app:tabTextAppearance="@style/AppTabTextAppearance"
         app:tabTextColor="@color/text_color"
         app:tabInlineLabel="true" />
 

+ 2 - 0
app/src/main/res/values/dims.xml

@@ -140,4 +140,6 @@
     <dimen name="minimum_size_for_touchable_area">48dp</dimen>
     <dimen name="dialog_elevation">24dp</dimen>
     <dimen name="default_login_width">400dp</dimen>
+    <dimen name="dialogBorderRadius">24dp</dimen>
+
 </resources>

+ 26 - 30
app/src/main/res/values/styles.xml

@@ -19,7 +19,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- General ownCloud app style -->
-    <style name="BaseTheme.ownCloud" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="BaseTheme.ownCloud" parent="Theme.Material3.DayNight">
         <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
         <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppTheme.PopupMenu</item>
@@ -38,11 +38,12 @@
         <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
         <item name="android:navigationBarColor">@color/bg_default</item>
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
+        <item name="dialogCornerRadius">@dimen/dialogBorderRadius</item>
     </style>
 
     <style name="Theme.ownCloud" parent="BaseTheme.ownCloud" />
 
-    <style name="FallbackThemingThemeBase" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="FallbackThemingThemeBase" parent="Theme.Material3.DayNight">
         <item name="actionModeBackground">@color/action_mode_background</item>
         <item name="android:alertDialogTheme">@style/FallbackTheming.Dialog</item>
         <item name="android:textAllCaps">false</item>
@@ -55,16 +56,17 @@
         <item name="android:datePickerDialogTheme">@style/FallbackDatePickerDialogTheme</item>
         <item name="android:navigationBarColor">@color/bg_default</item>
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
+        <item name="dialogCornerRadius">@dimen/dialogBorderRadius</item>
     </style>
 
     <style name="FallbackThemingTheme" parent="FallbackThemingThemeBase" />
 
-    <style name="Widget.App.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="Widget.App.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox">
         <item name="materialThemeOverlay">@style/ThemeOverlay.App.TextInputLayout</item>
         <item name="hintTextColor">?attr/colorOnSurface</item>
     </style>
 
-    <style name="ThemeOverlay.App.TextInputLayout" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
+    <style name="ThemeOverlay.App.TextInputLayout" parent="ThemeOverlay.Material3.TextInputEditText.OutlinedBox">
         <item name="colorPrimary">@color/text_color</item>
         <item name="colorOnSurface">@color/text_color</item>
         <item name="colorError">@color/hwSecurityRed</item>
@@ -75,7 +77,7 @@
         <item name="colorError">@color/primary</item>
     </style>
 
-    <style name="FallbackDatePickerDialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog">
+    <style name="FallbackDatePickerDialogTheme" parent="Theme.Material3.DayNight.Dialog">
         <item name="colorPrimary">@color/bg_default</item>
         <item name="colorAccent">@color/bg_fallback_highlight</item>
         <item name="android:textAllCaps">false</item>
@@ -89,7 +91,7 @@
         <item name="android:datePickerMode">calendar</item>
     </style>
 
-    <style name="FallbackTheming.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
+    <style name="FallbackTheming.Dialog" parent="Theme.Material3.DayNight.Dialog">
         <item name="colorPrimary">#424242</item>
         <item name="colorPrimaryDark">#212121</item>
         <item name="colorAccent">#757575</item>
@@ -105,7 +107,7 @@
     </style>
 
     <!-- separate action bar style for activities without an action bar -->
-    <style name="BaseTheme.ownCloud.Toolbar" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="BaseTheme.ownCloud.Toolbar" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="actionModeBackground">@color/action_mode_background</item>
         <item name="alertDialogTheme">@style/ownCloud.AlertDialog</item>
         <item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>
@@ -149,7 +151,7 @@
 
     <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase" />
 
-    <style name="ownCloud.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+    <style name="ownCloud.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
         <item name="colorAccent">@color/color_accent</item>
         <item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
@@ -157,7 +159,7 @@
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
     </style>
 
-    <style name="ownCloud.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog">
+    <style name="ownCloud.Dialog" parent="Theme.Material3.DayNight.Dialog">
         <item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
@@ -179,7 +181,7 @@
         <!--<item name="suggestionRowLayout">...</item>-->
     </style>
 
-    <style name="Button" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+    <style name="Button" parent="Widget.Material3.Button.UnelevatedButton">
         <item name="colorButtonNormal">@color/secondary_button_background_color</item>
         <item name="android:textColor">@color/secondary_button_text_color</item>
         <item name="android:textAllCaps">false</item>
@@ -187,7 +189,7 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="OutlinedButton" parent="Widget.Material3.Button.OutlinedButton">
         <item name="colorAccent">@color/transparent</item>
         <item name="android:textColor">@color/primary_dark</item>
         <item name="android:textAllCaps">false</item>
@@ -195,7 +197,7 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="OutlineLoginButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="OutlineLoginButton" parent="Widget.Material3.Button.OutlinedButton">
         <item name="colorAccent">@color/transparent</item>
         <item name="android:textColor">@color/fg_inverse</item>
         <item name="android:textAllCaps">false</item>
@@ -217,21 +219,21 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="Button.Borderless" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Button.Borderless" parent="Widget.Material3.Button.TextButton">
         <item name="android:textColor">@drawable/borderless_btn</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:typeface">sans</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="Button.Borderless.Destructive" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Button.Borderless.Destructive" parent="Widget.Material3.Button.TextButton">
         <item name="android:textColor">@color/highlight_textColor_Warning</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:typeface">sans</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="Button.Borderless.Login" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Button.Borderless.Login" parent="Widget.Material3.Button.TextButton">
         <item name="android:textColor">@color/fg_inverse</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:typeface">sans</item>
@@ -260,7 +262,7 @@
     </style>
 
     <!-- ACTION BAR STYLES -->
-    <style name="Theme.ownCloud.Overlay.ActionBar" parent="@style/Widget.MaterialComponents.Toolbar">
+    <style name="Theme.ownCloud.Overlay.ActionBar" parent="@style/Widget.Material3.Toolbar">
         <item name="android:background">@color/color_transparent</item>
         <item name="android:windowActionBarOverlay">true</item>
         <!-- Support library compatibility -->
@@ -276,7 +278,7 @@
         <item name="android:textColorHint">@color/secondary_text_color</item>
     </style>
 
-    <style name="Theme.ownCloud.Fullscreen" parent="@style/Theme.MaterialComponents.DayNight">
+    <style name="Theme.ownCloud.Fullscreen" parent="@style/Theme.Material3.DayNight">
         <item name="android:windowFullscreen">true</item>
         <item name="colorAccent">@color/color_accent</item>
     </style>
@@ -292,7 +294,7 @@
     </style>
 
     <!-- Dialogs -->
-    <style name="Theme.ownCloud.Dialog" parent="@style/Theme.MaterialComponents.DayNight.Dialog.Alert">
+    <style name="Theme.ownCloud.Dialog" parent="@style/Theme.Material3.DayNight.Dialog.Alert">
         <item name="windowNoTitle">false</item>
         <item name="colorAccent">@color/color_accent</item>
         <item name="android:windowBackground">@color/bg_default</item>
@@ -339,7 +341,7 @@
 
     <style name="NextcloudTextAppearanceMedium" parent="@style/TextAppearance.AppCompat.Medium"></style>
 
-    <style name="Widget.App.Login.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="Widget.App.Login.TextInputLayout" parent="Widget.Material3.TextInputLayout.OutlinedBox">
         <item name="materialThemeOverlay">@style/ThemeOverlay.App.Login.TextInputLayout</item>
         <item name="shapeAppearance">@style/ShapeAppearance.MaterialComponents.SmallComponent</item>
         <item name="hintTextColor">?attr/colorOnSurface</item>
@@ -354,7 +356,7 @@
         <item name="editTextStyle">@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox</item>
     </style>
 
-    <style name="TextInputLayoutLogin" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="TextInputLayoutLogin" parent="Widget.Material3.TextInputLayout.OutlinedBox">
         <item name="boxStrokeColor">@color/white</item>
         <item name="boxStrokeErrorColor">@color/white</item>
         <item name="hintTextAppearance">@style/HintTextLogin</item>
@@ -370,13 +372,7 @@
         <item name="android:textColor">@color/white</item>
     </style>
 
-    <style name="AppTabTextAppearance" parent="@style/TextAppearance.Design.Tab">
-        <item name="android:textSize">16sp</item>
-        <item name="textAllCaps">false</item>
-        <item name="android:textColor">@color/text_color</item>
-    </style>
-
-    <style name="ThemeOverlay.AppTheme.PopupMenu" parent="ThemeOverlay.MaterialComponents.Dark">
+    <style name="ThemeOverlay.AppTheme.PopupMenu" parent="ThemeOverlay.Material3.Dark">
         <!-- popup menu background - NEVER "android:background" !!! in themes -->
         <item name="android:colorBackground">@color/bg_default</item>
         <!-- popup menu item text color -->
@@ -387,7 +383,7 @@
         <item name="android:textColor">@color/menu_item_text_color</item>
     </style>
 
-    <style name="Theme.ToolbarWithDisabled" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
+    <style name="Theme.ToolbarWithDisabled" parent="@style/ThemeOverlay.Material3.Dark.ActionBar">
         <item name="android:textColor">@color/menu_item_text_color</item>
     </style>
 
@@ -419,7 +415,7 @@
         <item name="android:layout_gravity">center_vertical</item>
     </style>
 
-    <style name="Widget.AppTheme.Button.IconButton" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Widget.AppTheme.Button.IconButton" parent="Widget.Material3.Button.TextButton">
         <item name="android:minWidth">0dp</item>
         <item name="android:insetLeft">0dp</item>
         <item name="android:insetTop">0dp</item>
@@ -435,7 +431,7 @@
         <item name="hwSecuritySurfaceColor">@color/primary</item>
     </style>
 
-    <style name="Nextcloud.Material.TextButton" parent="Widget.MaterialComponents.Button.TextButton.Icon">
+    <style name="Nextcloud.Material.TextButton" parent="Widget.Material3.Button.TextButton.Icon">
         <item name="android:typeface">sans</item>
         <item name="android:textStyle">bold</item>
     </style>