ui improvements and fixed a slight bug due to ui

1 files changed, 83 insertions, 94 deletions

diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index 3abfd7d6..1b89b0df 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -1,127 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.zeapo.pwdstore.crypto.PgpHandler"
     android:background="#eee">
 
-    <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        tools:context="com.zeapo.pwdstore.crypto.PgpHandler">
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rectangle"
+        android:orientation="horizontal"
+        android:layout_row="1"
+        android:layout_column="0">
+
+        <TextView
+            android:id="@+id/crypto_password_category"
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/rectangle"
-            android:orientation="horizontal"
-            android:layout_row="1"
-            android:layout_column="0">
-
-            <TextView
-                android:id="@+id/crypto_password_category"
-                android:layout_gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textStyle="bold"
-                android:textColor="@android:color/holo_blue_dark"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="CATEGORY/"/>
+            android:textStyle="bold"
+            android:textColor="@android:color/holo_blue_dark"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="CATEGORY/"/>
 
-            <EditText
-                android:layout_gravity="center_vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/crypto_password_file_edit"
-                android:hint="@string/crypto_name_hint"
-                android:textColor="@android:color/holo_orange_dark"/>
+        <EditText
+            android:layout_gravity="center_vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/crypto_password_file_edit"
+            android:hint="@string/crypto_name_hint"
+            android:textColor="@android:color/holo_orange_dark"/>
 
-        </LinearLayout>
+    </LinearLayout>
 
 
+    <ScrollView android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        android:layout_marginBottom="@dimen/activity_vertical_margin"
+        android:background="@drawable/rectangle"
+        android:layout_weight="1">
         <LinearLayout
             android:id="@+id/crypto_container"
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:background="@drawable/rectangle"
             android:layout_height="wrap_content"
-            android:layout_row="2"
-            android:layout_column="0">
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin">
 
             <LinearLayout
-                android:id="@+id/crypto_password_edit_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textStyle="bold"
-                        android:text="@string/crypto_pass_label"/>
-                    <EditText
-                        android:id="@+id/crypto_password_edit"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:typeface="monospace"/>
-                </LinearLayout>
-
+                android:orientation="horizontal">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
                     android:textStyle="bold"
-                    android:text="@string/crypto_extra_label"/>
-
+                    android:text="@string/crypto_pass_label"/>
                 <EditText
-                    android:id="@+id/crypto_extra_edit"
-                    android:layout_width="match_parent"
+                    android:id="@+id/crypto_password_edit"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:visibility="visible"
                     android:typeface="monospace"/>
             </LinearLayout>
-        </LinearLayout>
 
-        <RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_row="3"
-            android:layout_column="0">
-            <ImageButton
-                android:layout_height="wrap_content"
+            <TextView
                 android:layout_width="wrap_content"
-                android:src="@drawable/ico_check"
-                android:background="@drawable/oval"
-                android:id="@+id/crypto_confirm_add"
-                android:onClick="handleClick"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true" />
-
-            <ImageButton
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:src="@drawable/ico_cancel"
-                android:background="@drawable/oval"
-                android:id="@+id/crypto_cancel_add"
-                android:onClick="handleClick"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true" />
-        </RelativeLayout>
+                android:layout_marginTop="8dp"
+                android:textStyle="bold"
+                android:text="@string/crypto_extra_label"/>
+
+            <EditText
+                android:id="@+id/crypto_extra_edit"
+                android:layout_width="match_parent"
+                android:layout_height="fill_parent"
+                android:enabled="true"
+                android:visibility="visible"
+                android:typeface="monospace"/>
+        </LinearLayout>
 
-    </GridLayout>
-</ScrollView>
+    </ScrollView>
 
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0">
+        <ImageButton
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:src="@drawable/ico_check"
+            android:background="@drawable/oval"
+            android:id="@+id/crypto_confirm_add"
+            android:onClick="handleClick"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true" />
+
+        <ImageButton
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:src="@drawable/ico_cancel"
+            android:background="@drawable/oval"
+            android:id="@+id/crypto_cancel_add"
+            android:onClick="handleClick"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+    </RelativeLayout>
+
+
+</LinearLayout>
\ No newline at end of file