Bläddra i källkod

fix buttons and their font weight (to be bold)

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 6 år sedan
förälder
incheckning
de583ca3dc

+ 4 - 3
src/main/res/layout-land/account_setup.xml

@@ -60,7 +60,6 @@
 
                 <com.google.android.material.button.MaterialButton
 					android:id="@+id/centeredRefreshButton"
-					style="@style/ownCloud.Button"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_horizontal"
@@ -68,7 +67,8 @@
 					android:theme="@style/Button"
 					android:text="@string/auth_check_server"
 					android:visibility="gone"
-					android:contentDescription="@string/auth_check_server"/>
+					android:contentDescription="@string/auth_check_server"
+                    app:cornerRadius="@dimen/button_corner_radius"/>
 
 				<TextView
                     android:id="@+id/instructions_message"
@@ -292,7 +292,8 @@
 			android:enabled="false"
 			android:text="@string/setup_btn_connect"
 			android:contentDescription="@string/setup_btn_connect"
-			android:visibility="gone"/>
+			android:visibility="visible"
+            app:cornerRadius="@dimen/button_corner_radius"/>
 	</LinearLayout>
 
 </RelativeLayout>

+ 4 - 3
src/main/res/layout/account_setup.xml

@@ -52,7 +52,6 @@
 
             <com.google.android.material.button.MaterialButton
             android:id="@+id/centeredRefreshButton"
-            style="@style/ownCloud.Button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -60,7 +59,8 @@
             android:theme="@style/Button"
             android:text="@string/auth_check_server"
             android:visibility="gone"
-            android:contentDescription="@string/auth_check_server"/>
+            android:contentDescription="@string/auth_check_server"
+            app:cornerRadius="@dimen/button_corner_radius"/>
 
         <TextView
             android:id="@+id/instructions_message"
@@ -273,7 +273,8 @@
             android:enabled="false"
             android:text="@string/setup_btn_connect"
             android:contentDescription="@string/setup_btn_connect"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            app:cornerRadius="@dimen/button_corner_radius"/>
         </LinearLayout>
 
     </LinearLayout>

+ 0 - 2
src/main/res/layout/share_file_layout.xml

@@ -124,7 +124,6 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/addUserButton"
-                style="@style/ownCloud.Button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
@@ -336,7 +335,6 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/shareViaLinkGetLinkButton"
-                    style="@style/ownCloud.Button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"

+ 21 - 5
src/main/res/values/styles.xml

@@ -38,12 +38,14 @@
 		<item name="colorPrimary">#424242</item>
 		<item name="colorPrimaryDark">#212121</item>
 		<item name="colorAccent">#757575</item>
+        <item name="android:textAllCaps">false</item>
 	</style>
 
 	<style name="FallbackDatePickerDialogTheme" parent="Theme.MaterialComponents.Light.Dialog">
 		<item name="colorPrimary">#424242</item>
 		<item name="colorPrimaryDark">#212121</item>
 		<item name="colorAccent">#757575</item>
+        <item name="android:textAllCaps">false</item>
 	</style>
 
 	<style name="FallbackTheming.Dialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
@@ -86,13 +88,21 @@
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:textColorPrimary">@color/primary</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:buttonStyle">@style/nextcloudButtonStyle</item>
 	</style>
 
 	<style name="ownCloud.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="searchViewStyle">@style/ownCloud.SearchView</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:buttonStyle">@style/nextcloudButtonStyle</item>
 	</style>
 
+    <style name="nextcloudButtonStyle" parent="Widget.MaterialComponents.Button">
+        <item name="fontFamily">@font/nunito_bold</item>
+    </style>
+
 	<style name="ProgressDialogTheme" parent="ownCloud.Dialog">
 		<item name="colorAccent">@color/color_accent</item>
 		<item name="android:textColorPrimary">@color/primary</item>
@@ -110,24 +120,23 @@
 		<!--<item name="suggestionRowLayout">...</item>-->
 	</style>
 
-	<style name="ownCloud.Button" parent="Widget.MaterialComponents.Button.UnelevatedButton">
-		<item name="colorButtonNormal">@color/primary</item>
-	</style>
-
 	<style name="Button" parent="Widget.MaterialComponents.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>
+        <item name="fontFamily">@font/nunito_bold</item>
 	</style>
 
     <style name="OutlinedButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="colorAccent">@color/transparent</item>
         <item name="android:textColor">@color/primary_dark</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="fontFamily">@font/nunito_bold</item>
     </style>
 
 	<style name="Button.Primary" parent="Button">
 		<item name="colorButtonNormal">@color/primary_button_background_color</item>
 		<item name="android:textColor">@color/primary_button_text_color</item>
-        <item name="fontFamily">@font/nunito_bold</item>
 	</style>
 
 	<style name="Button.Login" parent="Button">
@@ -138,14 +147,20 @@
 
 	<style name="Button.Borderless" parent="Widget.MaterialComponents.Button.TextButton">
 		<item name="android:textColor">@drawable/borderless_btn</item>
+        <item name="fontFamily">@font/nunito_bold</item>
+        <item name="android:textAllCaps">false</item>
 	</style>
 
 	<style name="Button.Borderless.Destructive" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="fontFamily">@font/nunito_bold</item>
 		<item name="android:textColor">@color/highlight_textColor_Warning</item>
+        <item name="android:textAllCaps">false</item>
 	</style>
 
 	<style name="Button.Borderless.Login" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="fontFamily">@font/nunito_bold</item>
 		<item name="android:textColor">@color/white</item>
+        <item name="android:textAllCaps">false</item>
 	</style>
 
 	<!-- separat translucent action bar style -->
@@ -237,6 +252,7 @@
 		<item name="android:layout_weight">1</item>
 		<!-- setting a fixed width as follows results in narrow buttons with line breaks, but of course this is not a solution -->
 		<!-- <item name="android:width">100dp</item> -->
+        <item name="android:textAllCaps">false</item>
 	</style>
 
     <style name="PassCodeStyle">