replaced login icon, reworked login now using card views

build.gradle

@@ -38,6 +38,7 @@ dependencies {
     compile "com.android.support:design:${supportLibraryVersion}"
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
+    compile "com.android.support:cardview-v7:${supportLibraryVersion}"
     compile 'com.getbase:floatingactionbutton:1.10.1'
 
 

res/layout-land/account_setup.xml

@@ -3,7 +3,8 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
+  Copyright (C) 2015-2016 ownCloud Inc.
+  Copyright (C) 2016 Nextcloud
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -20,8 +21,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/login_background_color"
-	android:padding="8dip"
+    android:background="@color/primary"
+	android:padding="@dimen/standard_padding"
     >
 
     <LinearLayout
@@ -30,14 +31,13 @@
         android:layout_above="@+id/bottom_block"
         android:layout_alignParentTop="true"
         android:orientation="horizontal" >
-        
+
 		<ImageView
 			android:id="@+id/thumbnail"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:layout_gravity="center"
-			android:background="@color/login_logo_background_color"
 			android:src="@drawable/logo"
             android:contentDescription="@string/app_name"
 			/>
@@ -49,7 +49,14 @@
 		    android:id="@+id/scroll"
 		    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"
@@ -84,23 +91,32 @@
 	        		android:id="@+id/hostUrlFrame"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginBottom="0dp"
-			        >
-					<EditText
-						android:id="@+id/hostUrlInput"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_gravity="bottom"
-						android:hint="@string/auth_host_url"
-						android:inputType="textUri"
-						android:drawablePadding="5dp"
-						android:paddingRight="55dp"
-						android:textColor="@color/login_text_color"
-						android:textColorHint="@color/login_text_hint_color"
-						android:contentDescription="@string/auth_host_address"
-						>
-						<requestFocus />
-					</EditText>
+					android:layout_marginBottom="0dp">
+
+                    <android.support.design.widget.TextInputLayout
+                        android:id="@+id/input_layout_hostUrl"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <EditText
+                            android:id="@+id/hostUrlInput"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="bottom"
+                            android:contentDescription="@string/auth_host_address"
+                            android:drawablePadding="5dp"
+                            android:hint="@string/auth_host_url"
+                            android:inputType="textUri"
+                            android:paddingRight="55dp"
+                            android:textColor="@color/login_text_color"
+                            android:textColorHint="@color/login_text_hint_color"
+                            >
+
+                            <requestFocus/>
+                        </EditText>
+
+                    </android.support.design.widget.TextInputLayout>
+
 					<ImageButton
 					    android:id="@+id/embeddedRefreshButton"
 					    android:layout_width="wrap_content"
@@ -140,21 +156,32 @@
 					android:textAppearance="?android:attr/textAppearanceSmall"
                     android:contentDescription="@string/oauth_check_onoff"
 					/>
-		
-				<EditText
-					android:id="@+id/oAuthEntryPoint_1"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:ems="10"
-					android:enabled="false"
-					android:text="@string/oauth2_url_endpoint_auth"
-					android:singleLine="true"
-					android:inputType="textUri"
-					android:textColor="@color/login_text_color"
-					android:textColorHint="@color/login_text_hint_color"
-					android:visibility="gone">
-				</EditText>            
-				
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/input_layout_oAuthEntryPoint_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <EditText
+                        android:id="@+id/oAuthEntryPoint_1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:enabled="false"
+                        android:inputType="textUri"
+                        android:singleLine="true"
+                        android:text="@string/oauth2_url_endpoint_auth"
+                        android:textColor="@color/login_text_color"
+                        android:textColorHint="@color/login_text_hint_color"
+                        android:visibility="gone"/>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/input_layout_oAuthEntryPoint_2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
 				<EditText
 					android:id="@+id/oAuthEntryPoint_2"
 					android:layout_width="match_parent"
@@ -168,8 +195,15 @@
 					android:textColorHint="@color/login_text_hint_color"
 					android:visibility="gone">
 					<requestFocus />
-				</EditText>            
-		
+				</EditText>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/input_layout_account_username"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
 				<EditText
 					android:id="@+id/account_username"
 					android:layout_width="match_parent"
@@ -179,20 +213,27 @@
 					android:inputType="textNoSuggestions"
 					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"
-					android:contentDescription="@string/auth_username"
-					/>
-		
-				<EditText
-				    android:id="@+id/account_password"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:ems="10"
-					android:hint="@string/auth_password"
-					android:inputType="textPassword"
-					android:drawablePadding="5dp"
-					android:textColor="@color/login_text_color"
-					android:textColorHint="@color/login_text_hint_color"
-					/>
+					android:contentDescription="@string/auth_username"/>
+
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.design.widget.TextInputLayout
+                    android:id="@+id/input_layout_account_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <EditText
+                        android:id="@+id/account_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:drawablePadding="5dp"
+                        android:ems="10"
+                        android:hint="@string/auth_password"
+                        android:inputType="textPassword"
+                        android:textColor="@color/login_text_color"
+                        android:textColorHint="@color/login_text_hint_color"/>
+
+                </android.support.design.widget.TextInputLayout>
 		        
 				<TextView
 					android:id="@+id/auth_status_text"
@@ -207,7 +248,7 @@
 					/>
 
 			</LinearLayout>
-		
+		    </android.support.v7.widget.CardView>
 		</ScrollView>
 						           
 	</LinearLayout>
@@ -217,7 +258,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
-        android:orientation="vertical" >
+        android:orientation="vertical"
+        android:paddingTop="@dimen/standard_half_padding">
         
 		<android.support.v7.widget.AppCompatButton
 		    android:id="@+id/buttonOK"
@@ -242,7 +284,6 @@
 				android:layout_gravity="center_horizontal"
 				android:background="@android:color/transparent"
 				android:onClick="onRegisterClick"
-				android:paddingBottom="5dp"
 				android:paddingTop="5dp"
 				android:text="@string/auth_register"
 				android:textColor="@color/login_text_color"

res/layout/account_setup.xml

@@ -3,7 +3,8 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
+  Copyright (C) 2015-2016 ownCloud Inc.
+  Copyright (C) 2016 Nextcloud
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -18,6 +19,7 @@
   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"
@@ -28,21 +30,34 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/login_background_color"
+        android:layout_height="wrap_content"
+        android:background="@color/primary"
         android:gravity="center"
         android:orientation="vertical"
-        android:padding="8dp" >
+        android:padding="@dimen/standard_padding" >
 
-        <ImageView
-            android:id="@+id/thumbnail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/login_logo_background_color"
-            android:src="@drawable/logo"
-            android:contentDescription="@string/app_name"/>
+		<ImageView
+			android:id="@+id/thumbnail"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/standard_padding"
+			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">
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/centeredRefreshButton"
@@ -71,24 +86,32 @@
 	        android:id="@+id/hostUrlFrame"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-            android:layout_marginBottom="0dp"
-	        >
-			<EditText
-				android:id="@+id/hostUrlInput"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="bottom"
-				android:hint="@string/auth_host_url"
-				android:inputType="textUri"
-				android:drawablePadding="5dp"
-				android:paddingRight="55dp"
-                android:textColor="@color/login_text_color"
-                android:textColorHint="@color/login_text_hint_color"
-				android:contentDescription="@string/auth_host_address"
-                >
-				<requestFocus />
-			</EditText>
-			<ImageButton
+            android:layout_marginBottom="0dp">
+
+            <android.support.design.widget.TextInputLayout
+                android:id="@+id/input_layout_hostUrl"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText
+                    android:id="@+id/hostUrlInput"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:contentDescription="@string/auth_host_address"
+                    android:drawablePadding="5dp"
+                    android:hint="@string/auth_host_url"
+                    android:inputType="textUri"
+                    android:paddingRight="55dp"
+                    android:textColor="@color/login_text_color"
+                    android:textColorHint="@color/login_text_hint_color">
+
+                    <requestFocus/>
+                </EditText>
+
+            </android.support.design.widget.TextInputLayout>
+
+            <ImageButton
 			    android:id="@+id/embeddedRefreshButton"
 			    android:layout_width="wrap_content"
 			    android:layout_height="wrap_content"
@@ -128,58 +151,83 @@
             android:contentDescription="@string/oauth_check_onoff"
             />
 
-        <EditText
-            android:id="@+id/oAuthEntryPoint_1"
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/input_layout_oAuthEntryPoint_1"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-			android:enabled="false"
-            android:textColor="@color/login_text_color"
-            android:textColorHint="@color/login_text_hint_color"
-            android:text="@string/oauth2_url_endpoint_auth"
-            android:singleLine="true"
-            android:inputType="textUri"
-            android:visibility="gone">
-        </EditText>
-
-        <EditText
-            android:id="@+id/oAuthEntryPoint_2"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/oAuthEntryPoint_1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:enabled="false"
+                android:inputType="textUri"
+                android:singleLine="true"
+                android:text="@string/oauth2_url_endpoint_auth"
+                android:textColor="@color/login_text_color"
+                android:textColorHint="@color/login_text_hint_color"
+                android:visibility="gone" />
+
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/input_layout_oAuthEntryPoint_2"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-			android:enabled="false"
-            android:text="@string/oauth2_url_endpoint_access"
-            android:singleLine="true"
-            android:inputType="textUri"
-            android:textColor="@color/login_text_color"
-            android:textColorHint="@color/login_text_hint_color"
-            android:visibility="gone"/>
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/oAuthEntryPoint_2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:enabled="false"
+                android:inputType="textUri"
+                android:singleLine="true"
+                android:text="@string/oauth2_url_endpoint_access"
+                android:textColor="@color/login_text_color"
+                android:textColorHint="@color/login_text_hint_color"
+                android:visibility="gone"/>
 
-        <EditText
-            android:id="@+id/account_username"
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/input_layout_account_username"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:hint="@string/auth_username"
-            android:inputType="textNoSuggestions"
-            android:textColor="@color/login_text_color"
-            android:textColorHint="@color/login_text_hint_color"
-            android:contentDescription="@string/auth_username"
-            />
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/account_username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/auth_username"
+                android:ems="10"
+                android:hint="@string/auth_username"
+                android:inputType="textNoSuggestions"
+                android:textColor="@color/login_text_color"
+                android:textColorHint="@color/login_text_hint_color"/>
+
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:id="@+id/input_layout_account_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/account_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/auth_password"
+                android:drawablePadding="5dp"
+                android:ems="10"
+                android:hint="@string/auth_password"
+                android:inputType="textPassword"
+                android:textColor="@color/login_text_color"
+                android:textColorHint="@color/login_text_hint_color"
+                />
+        </android.support.design.widget.TextInputLayout>
 
-		<EditText
-		    android:id="@+id/account_password"
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:drawablePadding="5dp"
-		    android:ems="10"
-		    android:hint="@string/auth_password"
-		    android:inputType="textPassword"
-            android:textColor="@color/login_text_color"
-            android:textColorHint="@color/login_text_hint_color"
-		    android:contentDescription="@string/auth_password"
-            />
-        
         <TextView
             android:id="@+id/auth_status_text"
             android:layout_width="match_parent"
@@ -221,6 +269,8 @@
                 android:contentDescription="@string/auth_register"/>
             
         </LinearLayout>
+        </LinearLayout>
+		</android.support.v7.widget.CardView>
 
     </LinearLayout>