Merge pull request #75 from nextcloud/loginLayout

Slight design optimizations for the login screen #22

AndroidManifest.xml

@@ -158,7 +158,7 @@
             android:name=".authentication.AuthenticatorActivity"
             android:exported="true"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.ownCloud.Toolbar" >
+            android:theme="@style/Theme.ownCloud.noActionBar.Login" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

res/layout-land/account_setup.xml

@@ -21,7 +21,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/primary"
 	android:padding="@dimen/standard_padding"
     >
 
@@ -50,13 +49,6 @@
 		    android:fillViewport="true"
 		    android:orientation="vertical" >
 
-            <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/card_view"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                card_view:cardBackgroundColor="@color/white"
-                card_view:cardCornerRadius="4dp">
-
 			<LinearLayout
 			    android:id="@+id/LinearLayout1"
 			    android:layout_width="match_parent"
@@ -125,7 +117,7 @@
 					    android:layout_marginRight="5dp"
 					    android:padding="0dp"
 					    android:scaleType="fitCenter"
-					    android:src="@drawable/ic_action_refresh_grey"
+					    android:src="@drawable/ic_action_refresh"
 					    android:visibility="gone"
 						android:background="@android:color/transparent"
                         android:contentDescription="@string/auth_refresh_button"
@@ -248,7 +240,6 @@
 					/>
 
 			</LinearLayout>
-		    </android.support.v7.widget.CardView>
 		</ScrollView>
 						           
 	</LinearLayout>
@@ -263,10 +254,11 @@
         
 		<android.support.v7.widget.AppCompatButton
 		    android:id="@+id/buttonOK"
-			android:theme="@style/Button.Primary"
-			style="@style/Button.Primary"
-		    android:layout_width="match_parent"
+			android:theme="@style/Button.Login"
+			style="@style/Button.Login"
+		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
+			android:padding="@dimen/standard_padding"
 		    android:layout_gravity="center_horizontal"
 		    android:enabled="false"
 		    android:text="@string/setup_btn_connect"
@@ -286,7 +278,7 @@
 				android:onClick="onRegisterClick"
 				android:paddingTop="5dp"
 				android:text="@string/auth_register"
-				android:textColor="@color/login_text_color"
+				android:textColor="@color/login_text_hint_color"
 				android:contentDescription="@string/auth_register"/>
 
 		</LinearLayout>

res/layout/account_setup.xml

@@ -19,7 +19,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
@@ -31,7 +30,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/primary"
         android:gravity="center"
         android:orientation="vertical"
         android:padding="@dimen/standard_padding" >
@@ -44,20 +42,12 @@
 			android:src="@drawable/logo"
 			android:contentDescription="@string/app_name"/>
 
-		<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
-			android:id="@+id/card_view"
-			android:layout_gravity="center"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-            card_view:cardBackgroundColor="@color/white"
-            card_view:cardCornerRadius="4dp">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:padding="8dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:padding="@dimen/standard_half_padding">
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/centeredRefreshButton"
@@ -104,7 +94,7 @@
                     android:inputType="textUri"
                     android:paddingRight="55dp"
                     android:textColor="@color/login_text_color"
-                    android:textColorHint="@color/login_text_hint_color">
+                    android:textColorHint="@color/login_text_color">
 
                     <requestFocus/>
                 </EditText>
@@ -119,7 +109,7 @@
 			    android:layout_marginRight="5dp"
 			    android:padding="0dp"
 			    android:scaleType="fitCenter"
-			    android:src="@drawable/ic_action_refresh_grey"
+			    android:src="@drawable/ic_action_refresh"
 				android:visibility="gone"
 				android:background="@android:color/transparent"
                 android:contentDescription="@string/auth_refresh_button"
@@ -147,7 +137,7 @@
             android:onClick="onCheckClick"
             android:text="@string/oauth_check_onoff"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/primary"
+            android:textColor="@color/white"
             android:contentDescription="@string/oauth_check_onoff"
             />
 
@@ -242,11 +232,12 @@
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/buttonOK"
-            android:theme="@style/Button.Primary"
-            style="@style/Button.Primary"
-            android:layout_width="match_parent"
+            android:theme="@style/Button.Login"
+            style="@style/Button.Login"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:padding="@dimen/standard_padding"
             android:enabled="false"
             android:text="@string/setup_btn_connect"
             android:contentDescription="@string/setup_btn_connect"/>
@@ -265,12 +256,11 @@
                 android:paddingBottom="5dp"
                 android:paddingTop="5dp"
                 android:text="@string/auth_register"
-                android:textColor="@color/login_text_color"
+                android:textColor="@color/login_text_hint_color"
                 android:contentDescription="@string/auth_register"/>
             
         </LinearLayout>
         </LinearLayout>
-		</android.support.v7.widget.CardView>
 
     </LinearLayout>
 

res/values/setup.xml

@@ -31,8 +31,8 @@
     
     
     <!-- Colors -->
-    <color name="login_text_color">#000000</color>
-    <color name="login_text_hint_color">#757575</color>
+    <color name="login_text_color">@color/white</color>
+    <color name="login_text_hint_color">#7fC0E3</color>
     <color name="login_background_color">#FFFFFF</color>
     <color name="login_logo_background_color">#FFFFFF</color>
     <color name="background_color">#FFFFFF</color>

res/values/styles.xml

@@ -51,7 +51,12 @@
 	</style>
 
 	<style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.Toolbar">
-
+		<item name="android:windowBackground">@color/primary</item>
+		<item name="colorControlNormal">@color/login_text_hint_color</item>
+		<item name="colorControlActivated">@color/white</item>
+		<item name="colorControlHighlight">@color/login_text_hint_color</item>
+		<item name="colorAccent">@color/login_text_hint_color</item>
+		<item name="android:textColorHint">@color/login_text_hint_color</item>
 	</style>
 
 	<style name="ownCloud.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
@@ -96,6 +101,11 @@
 		<item name="android:textColor">@color/primary_button_text_color</item>
 	</style>
 
+	<style name="Button.Login" parent="Button">
+		<item name="colorButtonNormal">@color/white</item>
+		<item name="android:textColor">@color/owncloud_blue</item>
+	</style>
+
 	<style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
 		<item name="android:textColor">@color/color_accent</item>
 	</style>

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -915,7 +915,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 !mServerInfo.mVersion.isVersionValid()  || 
                 mServerInfo.mBaseUrl == null || 
                 mServerInfo.mBaseUrl.length() == 0) {
-            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusIcon = R.drawable.ic_alert;
             mServerStatusText = R.string.auth_wtf_reenter_URL;
             showServerStatus();
             mOkButton.setEnabled(false);
@@ -1190,11 +1190,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param result    Result of a remote operation performed in this activity
      */
     private void updateServerStatusIconAndText(RemoteOperationResult result) {
-        mServerStatusIcon = R.drawable.common_error;    // the most common case in the switch below
+        mServerStatusIcon = R.drawable.ic_alert;    // the most common case in the switch below
 
         switch (result.getCode()) {
         case OK_SSL:
-            mServerStatusIcon = R.drawable.ic_lock;
+            mServerStatusIcon = R.drawable.ic_lock_white;
             mServerStatusText = R.string.auth_secure_connection;
             break;
 
@@ -1205,7 +1205,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mServerStatusIcon = R.drawable.ic_ok;
             } else {
                 mServerStatusText = R.string.auth_nossl_plain_ok_title;
-                mServerStatusIcon = R.drawable.ic_lock_open;
+                mServerStatusIcon = R.drawable.ic_lock_open_white;
             }
             break;
 
@@ -1255,7 +1255,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mServerStatusText = R.string.auth_unknown_error_title;
             break;
         case OK_REDIRECT_TO_NON_SECURE_CONNECTION:
-            mServerStatusIcon = R.drawable.ic_lock_open;
+            mServerStatusIcon = R.drawable.ic_lock_open_white;
             mServerStatusText = R.string.auth_redirect_non_secure_connection_title;
             break;
         default:
@@ -1271,11 +1271,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param result    Result of a remote operation performed in this activity
      */
     private void updateAuthStatusIconAndText(RemoteOperationResult result) {
-        mAuthStatusIcon = R.drawable.common_error;    // the most common case in the switch below
+        mAuthStatusIcon = R.drawable.ic_alert;    // the most common case in the switch below
 
         switch (result.getCode()) {
         case OK_SSL:
-            mAuthStatusIcon = R.drawable.ic_lock;
+            mAuthStatusIcon = R.drawable.ic_lock_white;
             mAuthStatusText = R.string.auth_secure_connection;
             break;
 
@@ -1286,7 +1286,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mAuthStatusIcon = R.drawable.ic_ok;
             } else {
                 mAuthStatusText = R.string.auth_nossl_plain_ok_title;
-                mAuthStatusIcon = R.drawable.ic_lock_open;
+                mAuthStatusIcon = R.drawable.ic_lock_open_white;
             }
             break;
 
@@ -1349,12 +1349,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
 
     private void updateStatusIconFailUserName(){
-        mAuthStatusIcon = R.drawable.common_error;
+        mAuthStatusIcon = R.drawable.ic_alert;
         mAuthStatusText = R.string.auth_fail_get_user_name;
     }
 
     private void updateServerStatusIconNoRegularAuth(){
-        mServerStatusIcon = R.drawable.common_error;
+        mServerStatusIcon = R.drawable.ic_alert;
         mServerStatusText = R.string.auth_can_not_auth_against_server;
     }