From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 18 Aug 2015 15:48:10 +0000 (+0200)
Subject: reverted back to light colored login
X-Git-Tag: oc-android-1.8~42^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/da897150457d7ae3a2fc9d3792da965efa1b0d34?hp=--cc

reverted back to light colored login
---

da897150457d7ae3a2fc9d3792da965efa1b0d34
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f36d2489..fc701a94 100644
--- 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 30eee6c4..14590e5b 100644
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 895aabbf..1a5784fc 100644
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 04c8f8c4..3e96a135 100644
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 36d1ab20..9680855a 100644
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
index 00000000..188d693a
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
index 00000000..a921888c
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 6eb7943c..08177e7b 100644
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 c5e9d0b4..c7b3d383 100644
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 6e1321e4..ad1b519f 100644
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 e5024472..c46df6b8 100644
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 b1b28b2a..628515df 100644
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 3f401317..dc007ee6 100644
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 0dcada81..745227fb 100644
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 b90a5980..a0eec1ff 100644
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 6e03d54c..6fe6ef64 100644
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
index c33cdb31..00000000
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 1ffec0df..1fec70bc 100644
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
index c33cdb31..00000000
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 d5d6ab0f..2fcc1d0b 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -64,7 +64,6 @@
 				    android:layout_height="wrap_content"
 				    android:layout_gravity="center_horizontal"
 					android:layout_marginBottom="10dp"
-            		android:onClick="onRefreshClick"
 				    android:text="@string/auth_check_server"
 				    android:visibility="gone"
                     android:contentDescription="@string/auth_check_server"/>
@@ -94,7 +93,7 @@
 						android:inputType="textUri"
 						android:drawablePadding="5dp"
 						android:paddingRight="55dp"
-						android:textColor="@color/login_text_color"
+						android:textColor="@color/primary"
 						android:textColorHint="@color/login_text_hint_color"
 						android:contentDescription="@string/auth_host_address"
 						>
@@ -136,7 +135,7 @@
 					android:checked="false"
 					android:onClick="onCheckClick"
 					android:text="@string/oauth_check_onoff"
-					android:textColor="@color/login_text_color"
+					android:textColor="@color/primary"
 					android:textColorHint="@color/login_text_hint_color"
 					android:textAppearance="?android:attr/textAppearanceSmall"
                     android:contentDescription="@string/oauth_check_onoff"
@@ -151,7 +150,7 @@
 					android:text="@string/oauth2_url_endpoint_auth"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:textColor="@color/login_text_color"
+					android:textColor="@color/primary"
 					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 				</EditText>            
@@ -165,7 +164,7 @@
 					android:text="@string/oauth2_url_endpoint_access"
 					android:singleLine="true"
 					android:inputType="textUri"
-					android:textColor="@color/login_text_color"
+					android:textColor="@color/primary"
 					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 					<requestFocus />
@@ -178,7 +177,7 @@
 					android:ems="10"
 					android:hint="@string/auth_username"
 					android:inputType="textNoSuggestions"
-					android:textColor="@color/login_text_color"
+					android:textColor="@color/primary"
 					android:textColorHint="@color/login_text_hint_color"
 					android:contentDescription="@string/auth_username"
 					/>
@@ -191,9 +190,8 @@
 					android:hint="@string/auth_password"
 					android:inputType="textPassword"
 					android:drawablePadding="5dp"
-					android:textColor="@color/login_text_color"
+					android:textColor="@color/primary"
 					android:textColorHint="@color/login_text_hint_color"
-					android:contentDescription="@string/auth_password"
 					/>
 		        
 				<TextView
@@ -222,13 +220,13 @@
 		android:layout_alignParentBottom="true"
         android:orientation="vertical" >
         
-		<Button
+		<android.support.v7.widget.AppCompatButton
 		    android:id="@+id/buttonOK"
+			android:theme="@style/Button.Primary"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_gravity="center_horizontal"
 		    android:enabled="false"
-		    android:onClick="onOkClick"
 		    android:text="@string/setup_btn_connect"
             android:contentDescription="@string/setup_btn_connect"/>
 		
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 127187e8..0789c599 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -50,7 +50,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="10dp"
-            android:onClick="onRefreshClick"
             android:text="@string/auth_check_server"
             android:visibility="gone"
             android:contentDescription="@string/auth_check_server"/>
@@ -82,7 +81,7 @@
 				android:inputType="textUri"
 				android:drawablePadding="5dp"
 				android:paddingRight="55dp"
-                android:textColor="@color/login_text_color"
+                android:textColor="@color/primary"
                 android:textColorHint="@color/login_text_hint_color"
 				android:contentDescription="@string/auth_host_address"
                 >
@@ -125,7 +124,7 @@
             android:onClick="onCheckClick"
             android:text="@string/oauth_check_onoff"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/oauth_check_onoff"
             />
@@ -136,7 +135,7 @@
             android:layout_height="wrap_content"
             android:ems="10"
 			android:enabled="false"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
             android:text="@string/oauth2_url_endpoint_auth"
             android:singleLine="true"
@@ -153,7 +152,7 @@
             android:text="@string/oauth2_url_endpoint_access"
             android:singleLine="true"
             android:inputType="textUri"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
             android:visibility="gone"/>
 
@@ -164,7 +163,7 @@
             android:ems="10"
             android:hint="@string/auth_username"
             android:inputType="textNoSuggestions"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
             android:contentDescription="@string/auth_username"
             />
@@ -177,7 +176,7 @@
 		    android:ems="10"
 		    android:hint="@string/auth_password"
 		    android:inputType="textPassword"
-            android:textColor="@color/login_text_color"
+            android:textColor="@color/primary"
             android:textColorHint="@color/login_text_hint_color"
 		    android:contentDescription="@string/auth_password"
             />
@@ -197,12 +196,12 @@
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/buttonOK"
-            style="@style/ownCloud.Button"
+            android:theme="@style/Button.Primary"
+            style="@style/Button.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:enabled="false"
-            android:onClick="onOkClick"
             android:text="@string/setup_btn_connect"
             android:contentDescription="@string/setup_btn_connect"/>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f755a1c5..809e645b 100644
--- 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 ed2180ea..76bdd9f8 100644
--- 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 e9b486b8..b5b67c8b 100644
--- 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 b7ec1c65..47985ce4 100644
--- 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;
     private EditText mPasswordInput;
     private View mOkButton;
+    private View mCenteredRefreshButton;
     private TextView mAuthStatusView;
 
     private int mAuthStatusText = 0, mAuthStatusIcon = 0;
@@ -250,6 +251,24 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         
         /// initialize general UI elements
         initOverallUi();
+
+        mOkButton = findViewById(R.id.buttonOK);
+        mOkButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                onOkClick();
+            }
+        });
+
+        mCenteredRefreshButton = findViewById(R.id.centeredRefreshButton);
+        mCenteredRefreshButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                checkOcServer();
+            }
+        });
         
         mOkButton = findViewById(R.id.buttonOK);
 
@@ -870,10 +889,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * is postponed until it is available.
      * 
      * IMPORTANT ENTRY POINT 4
-     * 
-     * @param view      OK button
      */
-    public void onOkClick(View view) {
+    public void onOkClick() {
         // this check should be unnecessary
         if (mServerInfo.mVersion == null || 
                 !mServerInfo.mVersion.isVersionValid()  || 
diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index 7f8ac9da..8ff505bc 100644
--- 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 442e7068..8c61cf9d 100644
--- 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);