From 373a3fc3f52bd95fc6b5a57f666d438bdc3c0964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 31 Dec 2015 14:13:43 +0100
Subject: Edit identities design

---
 .../main/res/layout/edit_identities_fragment.xml   | 115 +++++++++++----------
 1 file changed, 58 insertions(+), 57 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/edit_identities_fragment.xml b/OpenKeychain/src/main/res/layout/edit_identities_fragment.xml
index 7d8b9548f..e23ab7f81 100644
--- a/OpenKeychain/src/main/res/layout/edit_identities_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/edit_identities_fragment.xml
@@ -1,77 +1,78 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".ui.EditIdentitiesActivity">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="16dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="16dp">
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/view_key_card_user_ids"
+        android:layout_height="match_parent">
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            card_view:cardBackgroundColor="?attr/colorCardViewBackground"
-            card_view:cardCornerRadius="4dp"
-            card_view:cardElevation="2dp"
-            card_view:cardUseCompatPadding="true">
+            android:orientation="vertical"
+            android:paddingBottom="96dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="16dp">
 
-            <LinearLayout
+            <android.support.v7.widget.CardView
+                android:id="@+id/edit_identities_user_ids_card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_gravity="center"
+                card_view:cardBackgroundColor="?attr/colorCardViewBackground"
+                card_view:cardCornerRadius="4dp"
+                card_view:cardElevation="2dp"
+                card_view:cardUseCompatPadding="true">
 
-                <TextView
-                    style="@style/CardViewHeader"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/section_linked_identities" />
+                    android:orientation="vertical">
 
-                <org.sufficientlysecure.keychain.ui.widget.FixedListView
-                    android:id="@+id/edit_key_user_ids"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    <TextView
+                        style="@style/CardViewHeader"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/section_user_ids" />
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dip"
-                    android:background="?android:attr/listDivider" />
+                    <org.sufficientlysecure.keychain.ui.widget.FixedListView
+                        android:id="@+id/edit_identities_user_ids"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
-                <org.sufficientlysecure.keychain.ui.widget.FixedListView
-                    android:id="@+id/edit_key_user_ids_added"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dip"
+                        android:background="?android:attr/listDivider" />
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dip"
-                    android:background="?android:attr/listDivider" />
+                    <org.sufficientlysecure.keychain.ui.widget.FixedListView
+                        android:id="@+id/edit_identities_user_ids_added"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
-                <TextView
-                    android:id="@+id/edit_key_action_add_user_id"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:clickable="true"
-                    android:drawablePadding="8dp"
-                    android:drawableRight="@drawable/ic_person_add_grey_24dp"
-                    android:gravity="center_vertical"
-                    android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:text="@string/edit_key_action_add_identity"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
 
-            </LinearLayout>
+        </LinearLayout>
+
+    </ScrollView>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/edit_identities_add_user_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="24dp"
+        android:layout_marginRight="24dp"
+        android:src="@drawable/ic_add_white_24dp" />
 
-        </android.support.v7.widget.CardView>
+</RelativeLayout>
 
-    </LinearLayout>
 
-</ScrollView>
-- 
cgit v1.2.3