Эх сурвалжийг харах

align login button styles for 1st run and prevent possible NPE

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 6 жил өмнө
parent
commit
33690c51b9

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -411,7 +411,6 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
      */
     private void initControls() {
         mCancelBtn = findViewById(R.id.folder_picker_btn_cancel);
-        mCancelBtn.setOnClickListener(this);
         mChooseBtn = findViewById(R.id.folder_picker_btn_choose);
 
         if (mChooseBtn != null) {
@@ -421,6 +420,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
 
         if (mCancelBtn != null) {
             mCancelBtn.setTextColor(ThemeUtils.primaryColor(this, true));
+            mCancelBtn.setOnClickListener(this);
         }
     }
 

+ 1 - 1
src/main/res/layout/first_run_activity.xml

@@ -79,7 +79,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/signup"
-                android:theme="@style/Button.Primary"
+                android:theme="@style/OutlineLogindButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"

+ 1 - 1
src/main/res/values/dims.xml

@@ -140,6 +140,6 @@
     <dimen name="bottom_sheet_text_size">16sp</dimen>
     <dimen name="permission_dialog_text_size">18sp</dimen>
     <dimen name="permission_dialog_text_padding">56dp</dimen>
-    <dimen name="button_corner_radius">120dp</dimen>
+    <dimen name="button_corner_radius">24dp</dimen>
     <integer name="media_grid_width">4</integer>
 </resources>

+ 8 - 0
src/main/res/values/styles.xml

@@ -134,6 +134,14 @@
         <item name="fontFamily">@font/nunito_bold</item>
     </style>
 
+    <style name="OutlineLogindButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="colorAccent">@color/transparent</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="fontFamily">@font/nunito_bold</item>
+        <item name="strokeColor">@color/white</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>