From da1e95241db7c4377058c1abff9115ca3557c81a Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Fri, 10 Jun 2016 05:43:56 +0200
Subject: Restyle password entry activity

---
 app/src/main/res/layout/activity_pgp_handler.xml |  1 -
 app/src/main/res/layout/decrypt_layout.xml       | 26 ++++++++++++++----------
 app/src/main/res/layout/encrypt_layout.xml       |  2 --
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml
index b5dfba53..3c79b37d 100644
--- a/app/src/main/res/layout/activity_pgp_handler.xml
+++ b/app/src/main/res/layout/activity_pgp_handler.xml
@@ -13,7 +13,6 @@
     <GridLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/rectangle"
         android:orientation="horizontal">
 
         <TextView
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index b86005c2..6c8fc1ff 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -10,35 +10,44 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:padding="16dp"
         android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/rectangle"
             android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/holo_blue_light"
+                android:textColor="@color/grey_500"
                 android:text="CATEGORY HERE"
                 android:id="@+id/crypto_password_category"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"/>
+                android:textSize="18dp"
+                android:textIsSelectable="false"
+                android:layout_marginLeft="16dp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/holo_orange_dark"
+                android:textColor="@color/accent"
                 android:textStyle="bold"
                 android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
                 android:text="PASSWORD FILE NAME HERE"
                 android:id="@+id/crypto_password_file"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"/>
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:textSize="24dp" />
         </LinearLayout>
 
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@drawable/divider"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp" />
+
         <ProgressBar
             style="?android:attr/progressBarStyleLarge"
             android:layout_width="wrap_content"
@@ -61,12 +70,7 @@
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/rectangle"
             android:layout_marginTop="@dimen/activity_vertical_margin"
-            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:visibility="invisible">
 
             <GridLayout
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index 84fe99c3..1ee8e3c9 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -10,7 +10,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/rectangle"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin">
@@ -40,7 +39,6 @@
         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"
-- 
cgit v1.2.3