diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_fragment.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_fragment.xml | 193 |
1 files changed, 123 insertions, 70 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index 8c1023427..5bf36f564 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -1,95 +1,148 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:card_view="http://schemas.android.com/apk/res-auto" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:card_view="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="16dp"> + + <android.support.v7.widget.CardView + android:id="@+id/card_linked_ids" + android:transitionName="card_linked_ids" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" + tools:visibility="visible" + card_view:cardBackgroundColor="@android:color/white" + card_view:cardElevation="2dp" + card_view:cardUseCompatPadding="true" + card_view:cardCornerRadius="4dp"> + + <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + style="@style/CardViewHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/section_linked_identities" /> + + <org.sufficientlysecure.keychain.ui.widget.FixedListView + android:id="@+id/view_key_linked_ids" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" /> + + <TextView + android:id="@+id/view_key_linked_ids_expander" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:gravity="center_vertical" + android:drawableTop="@drawable/divider" + android:drawableRight="@drawable/ic_expand_more_black_24dp" + android:drawableEnd="@drawable/ic_expand_more_black_24dp" + android:drawablePadding="3dp" + android:clickable="true" + android:text="@string/linked_ids_more_unknown" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:background="?android:selectableItemBackground" + android:visibility="gone" + tools:visibility="visible" + /> - <LinearLayout + </LinearLayout> + + </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView + android:id="@+id/card_view" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingLeft="16dp" - android:paddingRight="16dp"> - - <android.support.v7.widget.CardView - android:id="@+id/card_view" - android:layout_gravity="center" + android:layout_gravity="center" + card_view:cardBackgroundColor="?attr/colorCardViewBackground" + card_view:cardCornerRadius="4dp" + card_view:cardElevation="2dp" + card_view:cardUseCompatPadding="true"> + + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - card_view:cardBackgroundColor="?attr/colorCardViewBackground" - card_view:cardElevation="2dp" - card_view:cardUseCompatPadding="true" - card_view:cardCornerRadius="4dp"> + android:orientation="vertical"> - <LinearLayout + <TextView + style="@style/CardViewHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/section_user_ids" /> + + <org.sufficientlysecure.keychain.ui.widget.FixedListView + android:id="@+id/view_key_user_ids" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:layout_marginBottom="4dp" /> - <TextView - style="@style/CardViewHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/section_user_ids"/> + </LinearLayout> - <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/view_key_user_ids" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp"/> - </LinearLayout> - </android.support.v7.widget.CardView> + </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView + android:id="@+id/linked_system_contact_card" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:visibility="gone" + card_view:cardBackgroundColor="?attr/colorCardViewBackground" + card_view:cardCornerRadius="4dp" + card_view:cardElevation="2dp" + card_view:cardUseCompatPadding="true"> - <android.support.v7.widget.CardView - android:id="@+id/linked_system_contact_card" - android:layout_gravity="center" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="gone" - card_view:cardBackgroundColor="?attr/colorCardViewBackground" - card_view:cardElevation="2dp" - card_view:cardUseCompatPadding="true" - card_view:cardCornerRadius="4dp"> + android:orientation="vertical"> + + <TextView + style="@style/CardViewHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/section_linked_system_contact" /> <LinearLayout + android:id='@+id/system_contact_layout' android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:background="?android:selectableItemBackground" + android:clickable="true" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/system_contact_picture" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_margin="6dp" + android:scaleType="centerCrop" + android:src="@drawable/ic_person_grey_48dp" /> <TextView - style="@style/CardViewHeader" + android:id="@+id/system_contact_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/section_linked_system_contact"/> - - <LinearLayout - android:id='@+id/system_contact_layout' - android:clickable="true" - android:background="?android:selectableItemBackground" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/system_contact_picture" - android:layout_margin="6dp" - android:layout_width="48dp" - android:layout_height="48dp" - android:scaleType="centerCrop" - android:src="@drawable/ic_person_grey_48dp"/> - - <TextView - android:id="@+id/system_contact_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/view_key_fragment_no_system_contact"/> - </LinearLayout> + android:layout_gravity="center_vertical" + android:text="@string/view_key_fragment_no_system_contact" + android:textAppearance="?android:attr/textAppearanceMedium" /> </LinearLayout> - </android.support.v7.widget.CardView> - </LinearLayout> + </LinearLayout> + + </android.support.v7.widget.CardView> -</ScrollView> +</LinearLayout> |