Material Buttons (draft)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d711c83..fc701a9 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -133,7 +133,7 @@
         <activity
             android:name=".authentication.AuthenticatorActivity"
             android:exported="true"
         <activity
             android:name=".authentication.AuthenticatorActivity"
             android:exported="true"

-            android:theme="@style/Theme.ownCloud.noActionBar" 
+            android:theme="@style/Theme.ownCloud.noActionBar"

             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index d806476..127187e 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -43,8 +43,9 @@
             android:src="@drawable/logo"\r
             android:contentDescription="@string/app_name"/>\r
 \r
             android:src="@drawable/logo"\r
             android:contentDescription="@string/app_name"/>\r
 \r

-        <Button\r
+        <android.support.v7.widget.AppCompatButton\r

             android:id="@+id/centeredRefreshButton"\r
             android:id="@+id/centeredRefreshButton"\r

+            style="@style/ownCloud.Button"\r

             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r


@@ -194,8 +195,9 @@
             android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/auth_unauthorized"/>\r
 \r
             android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/auth_unauthorized"/>\r
 \r

-        <Button\r
+        <android.support.v7.widget.AppCompatButton\r

             android:id="@+id/buttonOK"\r
             android:id="@+id/buttonOK"\r

+            style="@style/ownCloud.Button"\r

             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r

diff --git a/res/layout/files_folder_picker.xml b/res/layout/files_folder_picker.xml
index d9e4b1f..4fbec4a 100644 (file)
--- a/res/layout/files_folder_picker.xml
+++ b/res/layout/files_folder_picker.xml
@@ -46,15 +46,17 @@
         android:gravity="center"
         android:orientation="horizontal" >
 
         android:gravity="center"
         android:orientation="horizontal" >
 

-        <Button
+        <android.support.v7.widget.AppCompatButton

             android:id="@+id/folder_picker_btn_cancel"
             android:id="@+id/folder_picker_btn_cancel"

+            style="@style/ownCloud.Button"

             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 

-               <Button
+        <android.support.v7.widget.AppCompatButton

                    android:id="@+id/folder_picker_btn_choose"
                    android:id="@+id/folder_picker_btn_choose"

+            style="@style/ownCloud.Button"

                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"

diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index e684397..f20c5f3 100644 (file)
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -48,15 +48,17 @@
         android:gravity="center"
         android:orientation="horizontal" >
 
         android:gravity="center"
         android:orientation="horizontal" >
 

-               <Button
+        <android.support.v7.widget.AppCompatButton

                    android:id="@+id/ok"
                    android:id="@+id/ok"

+            style="@style/ownCloud.Button"

                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:text="@string/common_ok" />
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:text="@string/common_ok" />

-               
-        <Button
+
+        <android.support.v7.widget.AppCompatButton

             android:id="@+id/cancel"
             android:id="@+id/cancel"

+            style="@style/ownCloud.Button"

             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"

diff --git a/res/layout/log_send_file.xml b/res/layout/log_send_file.xml
index 756a2ed..4f90772 100644 (file)
--- a/res/layout/log_send_file.xml
+++ b/res/layout/log_send_file.xml
@@ -45,16 +45,30 @@
         </LinearLayout>
     </ScrollView>
 
         </LinearLayout>
     </ScrollView>
 

-    <Button
+    <LinearLayout
+        android:id="@+id/historyButtonBar"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+    <android.support.v7.widget.AppCompatButton

         android:id="@+id/deleteLogHistoryButton"
         android:id="@+id/deleteLogHistoryButton"

-        android:layout_width="match_parent"
-        android:layout_height="50dp"
+        style="@style/ownCloud.Button"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"

         android:text="@string/prefs_log_delete_history_button" />
 
         android:text="@string/prefs_log_delete_history_button" />
 

-    <Button
+    <android.support.v7.widget.AppCompatButton

         android:id="@+id/sendLogHistoryButton"
         android:id="@+id/sendLogHistoryButton"

-        android:layout_width="match_parent"
-       android:layout_height="50dp"
+        style="@style/ownCloud.Button"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"

         android:text="@string/log_send_history_button" />
 
         android:text="@string/log_send_history_button" />
 

+    </LinearLayout>
+

 </LinearLayout>
\ No newline at end of file
 </LinearLayout>
\ No newline at end of file

diff --git a/res/layout/passcodelock.xml b/res/layout/passcodelock.xml
index b70af8b..f3a0d01 100644 (file)
--- a/res/layout/passcodelock.xml
+++ b/res/layout/passcodelock.xml
@@ -79,8 +79,9 @@
             />
     </LinearLayout>
 
             />
     </LinearLayout>
 

-    <Button
+    <android.support.v7.widget.AppCompatButton

         android:id="@+id/cancel"
         android:id="@+id/cancel"

+        style="@style/ownCloud.Button"

         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/common_cancel" />
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/common_cancel" />

diff --git a/res/layout/ssl_untrusted_cert_layout.xml b/res/layout/ssl_untrusted_cert_layout.xml
index 813d677..2342a8a 100644 (file)
--- a/res/layout/ssl_untrusted_cert_layout.xml
+++ b/res/layout/ssl_untrusted_cert_layout.xml
@@ -21,6 +21,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center"

+       android:layout_margin="16dp"

     android:orientation="vertical" >
 
        <TextView
     android:orientation="vertical" >
 
        <TextView


@@ -28,8 +29,8 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="0"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_weight="0"

+               android:paddingBottom="16dp"

                android:text="@string/ssl_validator_header"
                android:text="@string/ssl_validator_header"

-               android:padding="5dp"

                android:textAppearance="?android:attr/textAppearanceMedium"
                 />
     
                android:textAppearance="?android:attr/textAppearanceMedium"
                 />
     


@@ -422,7 +423,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
                android:layout_weight="0"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
                android:layout_weight="0"

-               android:padding="5dp"
+               android:paddingTop="16dp"

         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
         >


@@ -431,25 +432,27 @@
        <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
        <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

-               android:layout_weight="0"

         android:gravity="center" >
 
         android:gravity="center" >
 

-        <Button
+               <android.support.v7.widget.AppCompatButton

             android:id="@+id/cancel"
             android:id="@+id/cancel"

+                       style="@style/ownCloud.Button"

             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 

-        <Button
+               <android.support.v7.widget.AppCompatButton

             android:id="@+id/details_btn"
             android:id="@+id/details_btn"

+                       style="@style/ownCloud.Button"

             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/ssl_validator_btn_details_see" />
 
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/ssl_validator_btn_details_see" />
 

-        <Button
+               <android.support.v7.widget.AppCompatButton

             android:id="@+id/ok"
             android:id="@+id/ok"

+                       style="@style/ownCloud.Button"

             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"

diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index f3153b3..4c6fb4f 100644 (file)
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -408,22 +408,25 @@
         android:layout_height="wrap_content"
         android:gravity="center" >
 
         android:layout_height="wrap_content"
         android:gravity="center" >
 

-        <Button
+               <android.support.v7.widget.AppCompatButton

             android:id="@+id/cancel"
             android:id="@+id/cancel"

+                       style="@style/ownCloud.Button"

             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 

-        <Button
+               <android.support.v7.widget.AppCompatButton

             android:id="@+id/details_btn"
             android:id="@+id/details_btn"

+                       style="@style/ownCloud.Button"

             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/ssl_validator_btn_details_see" />
 
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/ssl_validator_btn_details_see" />
 

-        <Button
+               <android.support.v7.widget.AppCompatButton

             android:id="@+id/ok"
             android:id="@+id/ok"

+                       style="@style/ownCloud.Button"

             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"

diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index 42bdcdd..95a3fb2 100644 (file)
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -36,15 +36,17 @@
         android:gravity="center"\r
         android:orientation="horizontal" >\r
 \r
         android:gravity="center"\r
         android:orientation="horizontal" >\r
 \r

-        <Button\r
+        <android.support.v7.widget.AppCompatButton\r

             android:id="@+id/upload_files_btn_cancel"\r
             android:id="@+id/upload_files_btn_cancel"\r

+            style="@style/ownCloud.Button"\r

             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_weight="1"\r
             android:text="@string/common_cancel" />\r
 \r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:layout_weight="1"\r
             android:text="@string/common_cancel" />\r
 \r

-               <Button\r
+        <android.support.v7.widget.AppCompatButton\r

                    android:id="@+id/upload_files_btn_upload"\r
                    android:id="@+id/upload_files_btn_upload"\r

+            style="@style/ownCloud.Button"\r

                    android:layout_width="wrap_content"\r
                    android:layout_height="wrap_content"\r
                    android:layout_weight="1"\r
                    android:layout_width="wrap_content"\r
                    android:layout_height="wrap_content"\r
                    android:layout_weight="1"\r

diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 0210e17..2ba4a0b 100644 (file)
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -52,16 +52,18 @@
            android:layout_alignParentBottom="true"
            android:orientation="horizontal" >
 
            android:layout_alignParentBottom="true"
            android:orientation="horizontal" >
 

-               <Button
+               <android.support.v7.widget.AppCompatButton

                    android:id="@+id/uploader_new_folder"
                    android:id="@+id/uploader_new_folder"

+                       style="@style/ownCloud.Button"

                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"
                    android:layout_weight="1"
                    android:text="@string/uploader_btn_new_folder_text" />
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"
                    android:layout_weight="1"
                    android:text="@string/uploader_btn_new_folder_text" />

-               
-               <Button
+
+               <android.support.v7.widget.AppCompatButton

                    android:id="@+id/uploader_choose_folder"
                    android:id="@+id/uploader_choose_folder"

+                       style="@style/ownCloud.Button"

                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"

diff --git a/res/values/styles.xml b/res/values/styles.xml
index d95dfaf..4ad0105 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,6 +29,9 @@
                <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="colorPrimaryDark">@color/primary_dark</item>
                <item name="colorAccent">@color/color_accent</item>
                <item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</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>
 
        <!-- seperate action bar style for activities without an action bar -->


@@ -40,8 +43,17 @@
                <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="colorPrimaryDark">@color/primary_dark</item>
                <item name="colorAccent">@color/color_accent</item>
                <item name="android:alertDialogTheme">@style/Theme.ownCloud.Dialog</item>

+               <item name="colorButtonNormal">@color/background_color</item>
+               <item name="colorControlActivated">@color/primary_dark</item>
+               <item name="colorControlHighlight">@color/color_accent</item>

     </style>
 
     </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>
+

        <!-- separat translucent action bar style -->
        <style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
                <item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>
        <!-- separat translucent action bar style -->
        <style name="Theme.ownCloud.Overlay" parent="style/Theme.ownCloud">
                <item name="android:actionBarStyle">@style/Theme.ownCloud.Overlay.ActionBar</item>