reverted back to light colored login

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f36d248..fc701a9 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -133,7 +133,7 @@
         <activity
             android:name=".authentication.AuthenticatorActivity"
             android:exported="true"
-            android:theme="@style/Theme.ownCloud.noActionBar.Login"
+            android:theme="@style/Theme.ownCloud.noActionBar"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

diff --git a/res/drawable-hdpi/common_error.png b/res/drawable-hdpi/common_error.png
index 30eee6c..14590e5 100644 (file)
Binary files a/res/drawable-hdpi/common_error.png and b/res/drawable-hdpi/common_error.png differ

diff --git a/res/drawable-hdpi/ic_lock.png b/res/drawable-hdpi/ic_lock.png
index 895aabb..1a5784f 100644 (file)
Binary files a/res/drawable-hdpi/ic_lock.png and b/res/drawable-hdpi/ic_lock.png differ

diff --git a/res/drawable-hdpi/ic_lock_open.png b/res/drawable-hdpi/ic_lock_open.png
index 04c8f8c..3e96a13 100644 (file)
Binary files a/res/drawable-hdpi/ic_lock_open.png and b/res/drawable-hdpi/ic_lock_open.png differ

diff --git a/res/drawable-hdpi/ic_ok.png b/res/drawable-hdpi/ic_ok.png
index 36d1ab2..9680855 100644 (file)
Binary files a/res/drawable-hdpi/ic_ok.png and b/res/drawable-hdpi/ic_ok.png differ

diff --git a/res/drawable-hdpi/logo.png b/res/drawable-hdpi/logo.png
new file mode 100644 (file)
index 0000000..188d693
Binary files /dev/null and b/res/drawable-hdpi/logo.png differ

diff --git a/res/drawable-hdpi/no_network.png b/res/drawable-hdpi/no_network.png
new file mode 100644 (file)
index 0000000..a921888
Binary files /dev/null and b/res/drawable-hdpi/no_network.png differ

diff --git a/res/drawable-xhdpi/common_error.png b/res/drawable-xhdpi/common_error.png
index 6eb7943..08177e7 100644 (file)
Binary files a/res/drawable-xhdpi/common_error.png and b/res/drawable-xhdpi/common_error.png differ

diff --git a/res/drawable-xhdpi/ic_lock.png b/res/drawable-xhdpi/ic_lock.png
index c5e9d0b..c7b3d38 100644 (file)
Binary files a/res/drawable-xhdpi/ic_lock.png and b/res/drawable-xhdpi/ic_lock.png differ

diff --git a/res/drawable-xhdpi/ic_lock_open.png b/res/drawable-xhdpi/ic_lock_open.png
index 6e1321e..ad1b519 100644 (file)
Binary files a/res/drawable-xhdpi/ic_lock_open.png and b/res/drawable-xhdpi/ic_lock_open.png differ

diff --git a/res/drawable-xhdpi/ic_ok.png b/res/drawable-xhdpi/ic_ok.png
index e502447..c46df6b 100644 (file)
Binary files a/res/drawable-xhdpi/ic_ok.png and b/res/drawable-xhdpi/ic_ok.png differ

diff --git a/res/drawable-xhdpi/no_network.png b/res/drawable-xhdpi/no_network.png
index b1b28b2..628515d 100644 (file)
Binary files a/res/drawable-xhdpi/no_network.png and b/res/drawable-xhdpi/no_network.png differ

diff --git a/res/drawable-xxhdpi/common_error.png b/res/drawable-xxhdpi/common_error.png
index 3f40131..dc007ee 100644 (file)
Binary files a/res/drawable-xxhdpi/common_error.png and b/res/drawable-xxhdpi/common_error.png differ

diff --git a/res/drawable-xxhdpi/ic_lock.png b/res/drawable-xxhdpi/ic_lock.png
index 0dcada8..745227f 100644 (file)
Binary files a/res/drawable-xxhdpi/ic_lock.png and b/res/drawable-xxhdpi/ic_lock.png differ

diff --git a/res/drawable-xxhdpi/ic_lock_open.png b/res/drawable-xxhdpi/ic_lock_open.png
index b90a598..a0eec1f 100644 (file)
Binary files a/res/drawable-xxhdpi/ic_lock_open.png and b/res/drawable-xxhdpi/ic_lock_open.png differ

diff --git a/res/drawable-xxhdpi/ic_ok.png b/res/drawable-xxhdpi/ic_ok.png
index 6e03d54..6fe6ef6 100644 (file)
Binary files a/res/drawable-xxhdpi/ic_ok.png and b/res/drawable-xxhdpi/ic_ok.png differ

diff --git a/res/drawable-xxhdpi/logo.png b/res/drawable-xxhdpi/logo.png
deleted file mode 100644 (file)
index c33cdb3..0000000
Binary files a/res/drawable-xxhdpi/logo.png and /dev/null differ

diff --git a/res/drawable-xxhdpi/no_network.png b/res/drawable-xxhdpi/no_network.png
index 1ffec0d..1fec70b 100644 (file)
Binary files a/res/drawable-xxhdpi/no_network.png and b/res/drawable-xxhdpi/no_network.png differ

diff --git a/res/drawable-xxxhdpi/logo.png b/res/drawable-xxxhdpi/logo.png
deleted file mode 100644 (file)
index c33cdb3..0000000
Binary files a/res/drawable-xxxhdpi/logo.png and /dev/null differ

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index d5d6ab0..2fcc1d0 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -64,7 +64,6 @@
                                    android:layout_height="wrap_content"\r
                                    android:layout_gravity="center_horizontal"\r
                                        android:layout_marginBottom="10dp"\r
-                       android:onClick="onRefreshClick"\r
                                    android:text="@string/auth_check_server"\r
                                    android:visibility="gone"\r
                     android:contentDescription="@string/auth_check_server"/>\r
@@ -94,7 +93,7 @@
                                                android:inputType="textUri"\r
                                                android:drawablePadding="5dp"\r
                                                android:paddingRight="55dp"\r
-                                               android:textColor="@color/login_text_color"\r
+                                               android:textColor="@color/primary"\r
                                                android:textColorHint="@color/login_text_hint_color"\r
                                                android:contentDescription="@string/auth_host_address"\r
                                                >\r
@@ -136,7 +135,7 @@
                                        android:checked="false"\r
                                        android:onClick="onCheckClick"\r
                                        android:text="@string/oauth_check_onoff"\r
-                                       android:textColor="@color/login_text_color"\r
+                                       android:textColor="@color/primary"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        android:textAppearance="?android:attr/textAppearanceSmall"\r
                     android:contentDescription="@string/oauth_check_onoff"\r
@@ -151,7 +150,7 @@
                                        android:text="@string/oauth2_url_endpoint_auth"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
-                                       android:textColor="@color/login_text_color"\r
+                                       android:textColor="@color/primary"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        android:visibility="gone">\r
                                </EditText>            \r
@@ -165,7 +164,7 @@
                                        android:text="@string/oauth2_url_endpoint_access"\r
                                        android:singleLine="true"\r
                                        android:inputType="textUri"\r
-                                       android:textColor="@color/login_text_color"\r
+                                       android:textColor="@color/primary"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        android:visibility="gone">\r
                                        <requestFocus />\r
@@ -178,7 +177,7 @@
                                        android:ems="10"\r
                                        android:hint="@string/auth_username"\r
                                        android:inputType="textNoSuggestions"\r
-                                       android:textColor="@color/login_text_color"\r
+                                       android:textColor="@color/primary"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
                                        android:contentDescription="@string/auth_username"\r
                                        />\r
@@ -191,9 +190,8 @@
                                        android:hint="@string/auth_password"\r
                                        android:inputType="textPassword"\r
                                        android:drawablePadding="5dp"\r
-                                       android:textColor="@color/login_text_color"\r
+                                       android:textColor="@color/primary"\r
                                        android:textColorHint="@color/login_text_hint_color"\r
-                                       android:contentDescription="@string/auth_password"\r
                                        />\r
                        \r
                                <TextView\r
@@ -222,13 +220,13 @@
                android:layout_alignParentBottom="true"\r
         android:orientation="vertical" >\r
         \r
-               <Button\r
+               <android.support.v7.widget.AppCompatButton\r
                    android:id="@+id/buttonOK"\r
+                       android:theme="@style/Button.Primary"\r
                    android:layout_width="match_parent"\r
                    android:layout_height="wrap_content"\r
                    android:layout_gravity="center_horizontal"\r
                    android:enabled="false"\r
-                   android:onClick="onOkClick"\r
                    android:text="@string/setup_btn_connect"\r
             android:contentDescription="@string/setup_btn_connect"/>\r
                \r

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 127187e..0789c59 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -50,7 +50,6 @@
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r
             android:layout_marginBottom="10dp"\r
-            android:onClick="onRefreshClick"\r
             android:text="@string/auth_check_server"\r
             android:visibility="gone"\r
             android:contentDescription="@string/auth_check_server"/>\r
@@ -82,7 +81,7 @@
                                android:inputType="textUri"\r
                                android:drawablePadding="5dp"\r
                                android:paddingRight="55dp"\r
-                android:textColor="@color/login_text_color"\r
+                android:textColor="@color/primary"\r
                 android:textColorHint="@color/login_text_hint_color"\r
                                android:contentDescription="@string/auth_host_address"\r
                 >\r
@@ -125,7 +124,7 @@
             android:onClick="onCheckClick"\r
             android:text="@string/oauth_check_onoff"\r
             android:textAppearance="?android:attr/textAppearanceSmall"\r
-            android:textColor="@color/login_text_color"\r
+            android:textColor="@color/primary"\r
             android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/oauth_check_onoff"\r
             />\r
@@ -136,7 +135,7 @@
             android:layout_height="wrap_content"\r
             android:ems="10"\r
                        android:enabled="false"\r
-            android:textColor="@color/login_text_color"\r
+            android:textColor="@color/primary"\r
             android:textColorHint="@color/login_text_hint_color"\r
             android:text="@string/oauth2_url_endpoint_auth"\r
             android:singleLine="true"\r
@@ -153,7 +152,7 @@
             android:text="@string/oauth2_url_endpoint_access"\r
             android:singleLine="true"\r
             android:inputType="textUri"\r
-            android:textColor="@color/login_text_color"\r
+            android:textColor="@color/primary"\r
             android:textColorHint="@color/login_text_hint_color"\r
             android:visibility="gone"/>\r
 \r
@@ -164,7 +163,7 @@
             android:ems="10"\r
             android:hint="@string/auth_username"\r
             android:inputType="textNoSuggestions"\r
-            android:textColor="@color/login_text_color"\r
+            android:textColor="@color/primary"\r
             android:textColorHint="@color/login_text_hint_color"\r
             android:contentDescription="@string/auth_username"\r
             />\r
@@ -177,7 +176,7 @@
                    android:ems="10"\r
                    android:hint="@string/auth_password"\r
                    android:inputType="textPassword"\r
-            android:textColor="@color/login_text_color"\r
+            android:textColor="@color/primary"\r
             android:textColorHint="@color/login_text_hint_color"\r
                    android:contentDescription="@string/auth_password"\r
             />\r
@@ -197,12 +196,12 @@
 \r
         <android.support.v7.widget.AppCompatButton\r
             android:id="@+id/buttonOK"\r
-            style="@style/ownCloud.Button"\r
+            android:theme="@style/Button.Primary"\r
+            style="@style/Button.Primary"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
-            android:onClick="onOkClick"\r
             android:text="@string/setup_btn_connect"\r
             android:contentDescription="@string/setup_btn_connect"/>\r
 \r

diff --git a/res/values/colors.xml b/res/values/colors.xml
index f755a1c..809e645 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -31,8 +31,8 @@
     <color name="list_divider_background">#fff0f0f0</color>
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
-    <color name="login_text_color">@color/dark_background_text_color</color>
-    <color name="login_text_hint_color">#777777</color>
+    <color name="login_text_color">#757575</color>
+    <color name="login_text_hint_color">#757575</color>
     <color name="primary_button_color">@color/owncloud_blue_accent</color>
     <color name="secondary_button_color">#D6D7D7</color>
 

diff --git a/res/values/setup.xml b/res/values/setup.xml
index ed2180e..76bdd9f 100644 (file)
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -28,8 +28,8 @@
     
     
     <!-- Colors -->
-    <color name="login_background_color">#1D2D44</color>
-    <color name="login_logo_background_color">#1D2D44</color>
+    <color name="login_background_color">#FFFFFF</color>
+    <color name="login_logo_background_color">#FFFFFF</color>
     <color name="background_color">#F7F7F7</color>
     <color name="actionbar_start_color">#1D2D44</color>
     <color name="actionbar_end_color">#1D2D44</color>

diff --git a/res/values/styles.xml b/res/values/styles.xml
index e9b486b..b5b67c8 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -68,8 +68,16 @@
 
        <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>
+
+       <style name="Button" parent="Base.Widget.AppCompat.Button">
+               <item name="colorButtonNormal">@color/secondary_button_color</item>
+               <item name="android:textColor">@color/color_accent</item>
+       </style>
+
+       <style name="Button.Primary" parent="Button">
+               <item name="colorButtonNormal">@color/primary_button_color</item>
+               <item name="android:textColor">@color/white</item>
        </style>
 
        <style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index b7ec1c6..47985ce 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -176,6 +176,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private EditText mUsernameInput;\r
     private EditText mPasswordInput;\r
     private View mOkButton;\r
+    private View mCenteredRefreshButton;\r
     private TextView mAuthStatusView;\r
 \r
     private int mAuthStatusText = 0, mAuthStatusIcon = 0;\r
@@ -250,6 +251,24 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         \r
         /// initialize general UI elements\r
         initOverallUi();\r
+\r
+        mOkButton = findViewById(R.id.buttonOK);\r
+        mOkButton.setOnClickListener(new View.OnClickListener() {\r
+\r
+            @Override\r
+            public void onClick(View v) {\r
+                onOkClick();\r
+            }\r
+        });\r
+\r
+        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);\r
+        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {\r
+\r
+            @Override\r
+            public void onClick(View v) {\r
+                checkOcServer();\r
+            }\r
+        });\r
         \r
         mOkButton = findViewById(R.id.buttonOK);\r
 \r
@@ -870,10 +889,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * is postponed until it is available.\r
      * \r
      * IMPORTANT ENTRY POINT 4\r
-     * \r
-     * @param view      OK button\r
      */\r
-    public void onOkClick(View view) {\r
+    public void onOkClick() {\r
         // this check should be unnecessary\r
         if (mServerInfo.mVersion == null || \r
                 !mServerInfo.mVersion.isVersionValid()  || \r

diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index 7f8ac9d..8ff505b 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -201,7 +201,7 @@ public class Uploader extends FileActivity
         final AlertDialog.Builder builder = new Builder(this);
         switch (id) {
         case DIALOG_WAITING:
-            ProgressDialog pDialog = new ProgressDialog(this, R.style.ProgressDialogTheme);
+            ProgressDialog pDialog = new ProgressDialog(this);
             pDialog.setIndeterminate(false);
             pDialog.setCancelable(false);
             pDialog.setMessage(getResources().getString(R.string.uploader_info_uploading));

diff --git a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
index 442e706..8c61cf9 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
+++ b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
@@ -45,6 +45,7 @@ public class IndeterminateProgressDialog extends DialogFragment {
      */
     public static IndeterminateProgressDialog newInstance(int messageId, boolean cancelable) {
         IndeterminateProgressDialog fragment = new IndeterminateProgressDialog();
+        fragment.setStyle(DialogFragment.STYLE_NO_FRAME, R.style.ownCloud_AlertDialog);
         Bundle args = new Bundle();
         args.putInt(ARG_MESSAGE_ID, messageId);
         args.putBoolean(ARG_CANCELABLE, cancelable);