projects / pub / Android / ownCloud.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Review of login view layout optimizing the adaption to different screen sizes
[pub/Android/ownCloud.git] / res / layout-land / account_setup.xml
diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index ce78ace..f6a0280 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -17,222 +17,179 @@
   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
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
-    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"\r
-    android:layout_width="fill_parent"\r
-    android:layout_height="fill_parent"\r
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
+    android:layout_width="match_parent"\r
+    android:layout_height="match_parent"\r
+    android:gravity="center|fill" \r
+       android:padding="16dip"\r
     android:focusable="true"\r
-    android:gravity="center|fill"\r
-    android:orientation="vertical" >\r
+    >\r
 \r
-    <FrameLayout\r
+    <LinearLayout\r
         android:layout_width="match_parent"\r
         android:layout_height="wrap_content"\r
-        android:layout_gravity="center"\r
-        android:layout_marginLeft="16dip"\r
-        android:layout_marginRight="16dip"\r
-        android:layout_weight="1" >\r
-\r
-        <LinearLayout\r
-            android:layout_width="match_parent"\r
-            android:layout_height="match_parent" >\r
-\r
-            <ImageView\r
-                android:id="@+id/imageView1"\r
-                android:layout_width="match_parent"\r
-                android:layout_height="match_parent"\r
-                android:layout_margin="7dp"\r
-                android:layout_weight="1"\r
-                android:src="@drawable/owncloud_logo" />\r
-\r
-            <LinearLayout\r
-                android:id="@+id/LinearLayout1"\r
-                android:layout_width="match_parent"\r
-                android:layout_height="wrap_content"\r
-                android:layout_gravity="center"\r
-                android:layout_weight="1"\r
-                android:orientation="vertical" >\r
-\r
-                <FrameLayout\r
-                    android:layout_width="match_parent"\r
-                    android:layout_height="wrap_content"\r
-                    android:layout_weight="1" >\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="textNoSuggestions">\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
-                       android:onClick="onRefreshClick"\r
-                        android:visibility="invisible" />\r
-                </FrameLayout>\r
-\r
-                <LinearLayout\r
-                    android:layout_width="match_parent"\r
-                    android:layout_height="50dp"\r
-                    android:layout_weight="1" >\r
-\r
-                    <ImageView\r
-                        android:id="@+id/action_indicator"\r
-                        android:layout_width="wrap_content"\r
-                        android:layout_height="wrap_content"\r
-                        android:layout_marginLeft="5dp"\r
-                        android:layout_marginRight="5dp"\r
-                        android:src="@android:drawable/stat_notify_sync"\r
-                        android:visibility="invisible" />\r
-\r
-                    <TextView\r
-                        android:id="@+id/status_text"\r
-                        android:layout_width="wrap_content"\r
-                        android:layout_height="wrap_content"\r
-                        android:text="TextView"\r
-                        android:visibility="invisible" />\r
-                </LinearLayout>\r
-\r
-                <CheckBox\r
-                    android:id="@+id/oauth_onOff_check"\r
-                    android:layout_width="wrap_content"\r
-                    android:layout_height="wrap_content"\r
-                    android:checked="false"\r
-                    android:onClick="onCheckClick"\r
-                    android:text="@string/oauth_check_onoff"\r
-                    android:textAppearance="?android:attr/textAppearanceSmall" />\r
-\r
-                <TextView\r
-                    android:id="@+id/textView2"\r
-                    android:layout_width="wrap_content"\r
-                    android:layout_height="0dp"\r
-                    android:layout_weight="1"\r
-                    android:text="@string/auth_login_details"\r
-                    android:textAppearance="?android:attr/textAppearanceSmall" />\r
-\r
-                   <EditText\r
-                       android:id="@+id/oAuthEntryPoint_1"\r
-                       android:layout_width="match_parent"\r
-                       android:layout_height="wrap_content"\r
-                       android:layout_weight="1"\r
-                       android:ems="10"\r
-                       android:enabled="false"\r
-                       android:text="@string/oauth2_url_endpoint_auth"\r
-                       android:singleLine="true"\r
-                       android:visibility="gone" >\r
-       \r
-                       <requestFocus />\r
-                   </EditText>            \r
-       \r
-                   <EditText\r
-                       android:id="@+id/oAuthEntryPoint_2"\r
-                       android:layout_width="match_parent"\r
-                       android:layout_height="wrap_content"\r
-                       android:layout_weight="1"\r
-                       android:ems="10"\r
-                       android:enabled="false"\r
-                       android:text="@string/oauth2_url_endpoint_access"\r
-                       android:singleLine="true"\r
-                       android:visibility="gone" >\r
-       \r
-                       <requestFocus />\r
-                   </EditText>            \r
-       \r
-                <EditText\r
-                    android:id="@+id/account_username"\r
-                    android:layout_width="match_parent"\r
-                    android:layout_height="0dp"\r
-                    android:layout_weight="1"\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
-                    android:layout_weight="1" >\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:src="@android:drawable/ic_menu_view"\r
-                                               android:onClick="onViewPasswordClick"\r
-                        android:visibility="invisible" />\r
-                </FrameLayout>\r
-                \r
-                   <TextView\r
-                       android:id="@+id/auth_status_text"\r
-                       android:layout_width="match_parent"\r
-                       android:layout_height="wrap_content"\r
-                       android:layout_weight="1" \r
-                       android:text="@string/text_placeholder"\r
-                       android:layout_marginLeft="5dp"\r
-                       android:layout_marginRight="5dp"\r
-                                       android:drawableLeft="@android:drawable/stat_notify_sync"\r
-                               android:drawablePadding="5dip"\r
-                               android:visibility="invisible"                \r
-                       />\r
-                \r
-            </LinearLayout>\r
-            \r
-        </LinearLayout>\r
-    </FrameLayout>\r
-\r
-    <RelativeLayout\r
-        android:layout_width="match_parent"\r
-        android:layout_height="wrap_content"\r
-        android:layout_alignParentBottom="true" >\r
-\r
-        <LinearLayout\r
-            android:id="@+id/buttons_layout"        \r
-            android:layout_width="match_parent"\r
-            android:layout_height="wrap_content"\r
-            android:weightSum="1">\r
-\r
-            <Button\r
-                android:id="@+id/buttonOK"\r
-                android:layout_width="match_parent"\r
-                android:layout_height="wrap_content"\r
-                android:layout_weight=".5"\r
-                android:layout_marginLeft="16dip"\r
-                       android:layout_marginRight="16dip"\r
-                android:enabled="false"\r
-                android:onClick="onOkClick"\r
-                android:text="@string/setup_btn_connect"\r
-                android:textColor="@android:color/black" />\r
-            \r
-        </LinearLayout>\r
+               android:layout_alignParentTop="true"\r
+               android:layout_above="@+id/buttonOK"\r
+               android:orientation="horizontal" \r
+        >\r
         \r
-               <Button\r
-                       android:id="@+id/account_register"\r
+       <ImageView\r
+               android:id="@+id/imageView1"\r
+               android:layout_width="0dp"\r
+               android:layout_height="wrap_content"\r
+               android:layout_weight="1"\r
+               android:layout_gravity="center"\r
+               android:src="@drawable/logo" \r
+               />\r
+       \r
+       <LinearLayout\r
+               android:id="@+id/LinearLayout1"\r
+               android:layout_width="0dp"\r
+               android:layout_height="wrap_content"\r
+               android:layout_weight="1"\r
+               android:layout_gravity="center"\r
+               android:orientation="vertical" \r
+               >\r
+\r
+               <FrameLayout\r
+                       android:layout_width="match_parent"\r
+                       android:layout_height="wrap_content"\r
+               >\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
+                               android:onClick="onRefreshClick"\r
+                               android:visibility="invisible" />\r
+                       \r
+               </FrameLayout>\r
+\r
+               <TextView\r
+                       android:id="@+id/server_status_text"\r
+                       android:layout_width="match_parent"\r
+                       android:layout_height="wrap_content"\r
+                       android:layout_marginBottom="10dp"\r
+                       android:drawableLeft="@android:drawable/stat_notify_sync"\r
+                       android:drawablePadding="5dp"\r
+                       android:gravity="center_vertical"\r
+                       android:text="@string/auth_testing_connection" />\r
+             \r
+               <CheckBox\r
+                       android:id="@+id/oauth_onOff_check"\r
                        android:layout_width="wrap_content"\r
                        android:layout_height="wrap_content"\r
-                       android:layout_below="@id/buttons_layout"\r
-                       android:layout_centerHorizontal="true"\r
-                       android:onClick="onRegisterClick"\r
-                       android:paddingTop="10dp"\r
-                       android:paddingBottom="10dp"\r
-                       android:textColor="#0000FF"\r
-                       android:background="@android:color/transparent" />\r
-                       <!-- android:text="@string/app_name @string/auth_register" /-->\r
-        \r
-    </RelativeLayout>\r
+                       android:checked="false"\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
+                       android:enabled="false"\r
+                       android:text="@string/oauth2_url_endpoint_auth"\r
+                       android:singleLine="true"\r
+                       android:inputType="textUri"\r
+                       android:visibility="gone" >\r
+                       <requestFocus />\r
+               </EditText>            \r
+               \r
+               <EditText\r
+                       android:id="@+id/oAuthEntryPoint_2"\r
+                       android:layout_width="match_parent"\r
+                       android:layout_height="wrap_content"\r
+                       android:ems="10"\r
+                       android:enabled="false"\r
+                       android:text="@string/oauth2_url_endpoint_access"\r
+                       android:singleLine="true"\r
+                       android:inputType="textUri"\r
+                       android:visibility="gone" >\r
+                       <requestFocus />\r
+               </EditText>            \r
+\r
+               <EditText\r
+                       android:id="@+id/account_username"\r
+                       android:layout_width="match_parent"\r
+                       android:layout_height="wrap_content"\r
+                       android:ems="10"\r
+                       android:hint="@string/auth_username"\r
+                       android:inputType="textNoSuggestions" />\r
 \r
-</LinearLayout>\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:src="@android:drawable/ic_menu_view"\r
+                               android:onClick="onViewPasswordClick"\r
+                               android:visibility="invisible" />\r
+               </FrameLayout>\r
+     \r
+               <TextView\r
+                       android:id="@+id/auth_status_text"\r
+                       android:layout_width="match_parent"\r
+                       android:layout_height="wrap_content"\r
+                       android:gravity="center_vertical"\r
+                       android:text="@string/auth_unauthorized"\r
+                       android:drawableLeft="@android:drawable/stat_notify_sync"\r
+                       android:drawablePadding="5dip"\r
+                       />\r
+                  \r
+       </LinearLayout>\r
+       </LinearLayout>\r
+       \r
+       <Button\r
+               android:id="@id/buttonOK"\r
+               android:layout_width="match_parent"\r
+               android:layout_height="wrap_content"\r
+               android:layout_above="@id/account_register"\r
+               android:layout_centerHorizontal="true"\r
+               android:enabled="false"\r
+               android:onClick="onOkClick"\r
+               android:text="@string/setup_btn_connect"\r
+               />\r
+\r
+       <Button\r
+               android:id="@+id/account_register"\r
+               android:layout_width="match_parent"\r
+               android:layout_height="wrap_content"\r
+               android:layout_alignParentBottom="true"\r
+               android:layout_marginTop="10dp"\r
+               android:layout_centerHorizontal="true"\r
+               android:onClick="onRegisterClick"\r
+               android:textColor="#0000FF"\r
+               android:background="@android:color/transparent"\r
+               android:text="@string/auth_register" \r
+               />\r
+       \r
+</RelativeLayout>\r
ownCloud Android App