projects / pub / Android / ownCloud.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed typo in strings.xml
[pub/Android/ownCloud.git] / res / layout / account_setup.xml
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 2258304..e3321f9 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -17,24 +17,22 @@
   You should have received a copy of the GNU General Public License\r
   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 -->\r
   You should have received a copy of the GNU General Public License\r
   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 -->\r
-\r
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r
     android:layout_gravity="center"\r
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"\r
     android:layout_width="match_parent"\r
     android:layout_height="match_parent"\r
     android:layout_gravity="center"\r
-       android:padding="8dip"\r
     android:fillViewport="true"\r
     android:fillViewport="true"\r
-    android:orientation="vertical"\r
+    android:orientation="vertical" \r
+    android:id="@+id/scroll"\r
     >\r
 \r
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
     >\r
 \r
     <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
-               android:layout_margin="8dip"\r
+        android:background="@color/login_background_color"\r
         android:gravity="center"\r
         android:gravity="center"\r
-        android:orientation="vertical" \r
-        android:focusable="true"\r
-        >\r
+        android:orientation="vertical"\r
+        android:padding="8dp" >\r
 \r
         <ImageView\r
             android:id="@+id/imageView1"\r
 \r
         <ImageView\r
             android:id="@+id/imageView1"\r
@@ -42,34 +40,62 @@
             android:layout_height="wrap_content"\r
             android:layout_marginBottom="10dp"\r
             android:layout_marginTop="10dp"\r
             android:layout_height="wrap_content"\r
             android:layout_marginBottom="10dp"\r
             android:layout_marginTop="10dp"\r
+            android:background="@color/login_logo_background_color"\r
             android:src="@drawable/logo" />\r
 \r
             android:src="@drawable/logo" />\r
 \r
-        <FrameLayout\r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content" >\r
-\r
-            <EditText\r
-                android:id="@+id/hostUrlInput"\r
-                android:layout_width="match_parent"\r
-                android:layout_height="wrap_content"\r
-                android:ems="10"\r
-                android:hint="@string/auth_host_url"\r
-                android:inputType="textUri" >\r
-\r
-                <requestFocus />\r
-            </EditText>\r
-\r
-            <ImageView\r
-                android:id="@+id/refreshButton"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:layout_gravity="right|center_vertical"\r
-                android:src="@drawable/ic_action_refresh_black"\r
+        <Button\r
+            android:id="@+id/centeredRefreshButton"\r
+            android:layout_width="wrap_content"\r
+            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
+        \r
+        <TextView\r
+            android:id="@+id/instructions_message"\r
+            android:layout_width="wrap_content"\r
+            android:layout_height="wrap_content"\r
+            android:layout_gravity="fill_horizontal"\r
+            android:text="@string/auth_expired_basic_auth_toast"\r
+            android:visibility="gone"\r
+            android:layout_marginBottom="10dp" />\r
+\r
+           <FrameLayout \r
+               android:id="@+id/hostUrlFrame"\r
+                       android:layout_width="match_parent"\r
+                       android:layout_height="wrap_content"\r
+            android:layout_marginBottom="10dp"\r
+               >\r
+                       <EditText\r
+                               android:id="@+id/hostUrlInput"\r
+                               android:layout_width="match_parent"\r
+                               android:layout_height="wrap_content"\r
+                               android:layout_gravity="bottom"\r
+                               android:hint="@string/auth_host_url"\r
+                               android:inputType="textUri"\r
+                               android:drawablePadding="5dp"\r
+                               android:paddingRight="55dp"\r
+                               >\r
+                               <requestFocus />\r
+                       </EditText>\r
+                       <ImageButton\r
+                           android:id="@+id/embeddedRefreshButton"\r
+                           android:layout_width="48dp"\r
+                           android:layout_height="48dp"\r
+                           android:layout_gravity="center_vertical|right"\r
+                           android:layout_marginRight="5dp"\r
+                           android:padding="0dp"\r
+                           android:scaleType="fitCenter"\r
+                           android:src="@drawable/ic_action_refresh_black"\r
                android:onClick="onRefreshClick"\r
                android:onClick="onRefreshClick"\r
-                android:visibility="invisible" />\r
-        </FrameLayout>\r
+                               android:visibility="gone"\r
+                               android:background="@android:color/transparent"\r
+                           />\r
+               </FrameLayout>\r
 \r
 \r
-        <TextView\r
+               <TextView\r
             android:id="@+id/server_status_text"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:id="@+id/server_status_text"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
@@ -87,16 +113,17 @@
             android:onClick="onCheckClick"\r
             android:text="@string/oauth_check_onoff"\r
             android:textAppearance="?android:attr/textAppearanceSmall"\r
             android:onClick="onCheckClick"\r
             android:text="@string/oauth_check_onoff"\r
             android:textAppearance="?android:attr/textAppearanceSmall"\r
-            android:visibility="gone" />\r
+            />\r
 \r
         <EditText\r
             android:id="@+id/oAuthEntryPoint_1"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
 \r
         <EditText\r
             android:id="@+id/oAuthEntryPoint_1"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
-            android:inputType="textUri"\r
-            android:singleLine="true"\r
+                       android:enabled="false"\r
             android:text="@string/oauth2_url_endpoint_auth"\r
             android:text="@string/oauth2_url_endpoint_auth"\r
+            android:singleLine="true"\r
+            android:inputType="textUri"\r
             android:visibility="gone" >\r
         </EditText>\r
 \r
             android:visibility="gone" >\r
         </EditText>\r
 \r
@@ -105,9 +132,10 @@
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
             android:layout_width="match_parent"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
-            android:inputType="textUri"\r
-            android:singleLine="true"\r
+                       android:enabled="false"\r
             android:text="@string/oauth2_url_endpoint_access"\r
             android:text="@string/oauth2_url_endpoint_access"\r
+            android:singleLine="true"\r
+            android:inputType="textUri"\r
             android:visibility="gone" />\r
 \r
         <EditText\r
             android:visibility="gone" />\r
 \r
         <EditText\r
@@ -116,30 +144,19 @@
             android:layout_height="wrap_content"\r
             android:ems="10"\r
             android:hint="@string/auth_username"\r
             android:layout_height="wrap_content"\r
             android:ems="10"\r
             android:hint="@string/auth_username"\r
-            android:inputType="textNoSuggestions" />\r
-\r
-        <FrameLayout\r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content" >\r
-\r
-            <EditText\r
-                android:id="@+id/account_password"\r
-                android:layout_width="match_parent"\r
-                android:layout_height="wrap_content"\r
-                android:ems="10"\r
-                android:hint="@string/auth_password"\r
-                android:inputType="textPassword" />\r
-\r
-            <ImageView\r
-                android:id="@+id/viewPasswordButton"\r
-                android:layout_width="wrap_content"\r
-                android:layout_height="wrap_content"\r
-                android:layout_gravity="right|center_vertical"\r
-                android:onClick="onViewPasswordClick"\r
-                android:src="@android:drawable/ic_menu_view"\r
-                android:visibility="invisible" />\r
-        </FrameLayout>\r
-\r
+            android:inputType="textNoSuggestions" \r
+                       />\r
+\r
+               <EditText\r
+                   android:id="@+id/account_password"\r
+                   android:layout_width="match_parent"\r
+                   android:layout_height="wrap_content"\r
+                   android:drawablePadding="5dp"\r
+                   android:ems="10"\r
+                   android:hint="@string/auth_password"\r
+                   android:inputType="textPassword" \r
+            />\r
+        \r
         <TextView\r
             android:id="@+id/auth_status_text"\r
             android:layout_width="match_parent"\r
         <TextView\r
             android:id="@+id/auth_status_text"\r
             android:layout_width="match_parent"\r
@@ -157,20 +174,19 @@
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:onClick="onOkClick"\r
             android:layout_gravity="center_horizontal"\r
             android:enabled="false"\r
             android:onClick="onOkClick"\r
-            android:text="@string/setup_btn_connect"\r
-            android:textColor="@android:color/black" />\r
+            android:text="@string/setup_btn_connect" />\r
 \r
         <Button\r
 \r
         <Button\r
-            android:id="@+id/account_register"\r
+            android:id="@+id/welcome_link"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:background="@android:color/transparent"\r
             android:layout_width="wrap_content"\r
             android:layout_height="wrap_content"\r
             android:background="@android:color/transparent"\r
-            android:textColor="#0000FF" \r
             android:onClick="onRegisterClick"\r
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
             android:onClick="onRegisterClick"\r
             android:paddingBottom="5dp"\r
             android:paddingTop="5dp"\r
             android:text="@string/auth_register"\r
-            />\r
+            android:textColor="#0000FF"/>\r
+\r
     </LinearLayout>\r
 \r
 </ScrollView>
\ No newline at end of file
     </LinearLayout>\r
 \r
 </ScrollView>
\ No newline at end of file
ownCloud Android App