added temp (10sec) password visibility and extra content

3 files changed, 107 insertions, 43 deletions

diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml
index 5095b32c..4fe6c529 100644
--- a/app/src/main/res/layout/activity_pgp_handler.xml
+++ b/app/src/main/res/layout/activity_pgp_handler.xml
@@ -1,4 +1,4 @@
-<RelativeLayout 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="match_parent"
     android:layout_height="match_parent"
@@ -6,58 +6,90 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.zeapo.pwdstore.crypto.PgpHandler">
+    tools:context="com.zeapo.pwdstore.crypto.PgpHandler"
+    android:orientation="vertical"
+    android:background="#eee">
+
+    <GridLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rectangle"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/holo_orange_dark"
+            android:text="Large Text"
+            android:id="@+id/crypto_password_file"
+            android:layout_gravity="center_vertical"
+            android:layout_column="0"/>
+
+        <ImageButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_column="2"
+            android:src="@android:drawable/ic_input_get"
+            android:background="@android:drawable/screen_background_light_transparent"
+            android:layout_gravity="center_vertical"
+            android:onClick="decrypt"/>
+
+    </GridLayout>
 
     <LinearLayout
+        android:id="@+id/crypto_password_show_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="wrap_content"
+        android:visibility="invisible"
+        android:orientation="vertical"
+        android:background="@drawable/rectangle">
 
         <GridLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
+            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:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Large Text"
-                android:id="@+id/crypto_account_name"
-                android:layout_row="0"
-                android:layout_column="0" />
-
-            <Button
-                android:layout_width="wrap_content"
+                android:textStyle="bold"
+                android:text="Password: "/>
+            <TextView
+                android:id="@+id/crypto_password_show"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Change account"
-                android:id="@+id/button"
-                android:layout_row="0"
-                android:layout_column="2" />
+                android:typeface="monospace"
+                android:layout_column="2"/>
         </GridLayout>
 
-        <View
-            android:layout_width="fill_parent"
-            android:layout_marginBottom="4dp"
-            android:layout_height="1dp"
-            android:background="@android:color/darker_gray"/>
-
-        <TextView
+        <ProgressBar
+            android:id="@+id/pbLoading"
+            android:visibility="invisible"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="New Text"
-            android:id="@+id/crypto_handler_name"/>
+            android:layout_height="2dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            style="?android:attr/progressBarStyleHorizontal"/>
+    </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/crypto_extra_show_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rectangle"
+        android:orientation="vertical"
+        android:visibility="invisible">
 
-        <Button
-            android:layout_width="match_parent"
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Select Key-id"
-            android:onClick="getKeyID"/>
+            android:textStyle="bold"
+            android:text="Extra content: "/>
 
-        <Button
+        <TextView
+            android:id="@+id/crypto_extra_show"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Show password"
-            android:onClick="decrypt"/>
-        </LinearLayout>
-</RelativeLayout>
+            android:typeface="monospace"/>
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml
index 0060cb78..66c5dedb 100644
--- a/app/src/main/res/layout/activity_pwdstore.xml
+++ b/app/src/main/res/layout/activity_pwdstore.xml
@@ -1,4 +1,4 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -7,12 +7,42 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:background="#eee"
-    tools:context=".pwdstore">
+    tools:context=".pwdstore"
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/main_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"></LinearLayout>
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_row="0"></LinearLayout>
 
-</RelativeLayout>
+    <GridLayout
+        android:id="@+id/bottom_layout"
+        android:orientation="horizontal"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_row="2">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/holo_orange_dark"
+            android:layout_gravity="center_vertical"
+            android:text="Large Text"
+            android:id="@+id/crypto_password_file"
+            android:background="#fff"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"/>
+
+        <ImageButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@android:drawable/ic_input_add"
+            android:background="@drawable/rectangle"
+            android:layout_gravity="center_vertical"
+            android:onClick="createPassword"
+            android:layout_column="2"/>
+
+    </GridLayout>
+
+</GridLayout>
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index 85f576e8..f8d656fd 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -13,11 +13,13 @@
         android:layout_height="wrap_content"
         android:padding="8dp"
         android:textStyle="bold"
+        android:layout_gravity="center_vertical"
         />
     <TextView
         android:id="@+id/label"
         android:text="FILE_NAME"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:padding="8dp"/>
 </GridLayout>