cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move linked ids into identities card

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-26 22:00:18 +02:00
parent 2e65e63b96
commit d050c1d03c
7 changed files with 83 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenKeychain/src/main/res/layout/identities_card.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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="wrap_content"
android:orientation="vertical">
@@ -11,23 +12,47 @@
android:layout_height="wrap_content"
android:text="@string/section_user_ids" />
<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" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:id="@+id/view_key_lid_divider"
android:background="?android:attr/listDivider"
android:visibility="gone"
tools:visibility="visible"
/>
<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" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<LinearLayout
android:id="@+id/view_key_card_user_ids_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left|start"
android:orientation="vertical">
android:gravity="right|end"
android:orientation="horizontal"
style="?buttonBarStyle">
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<Button
android:id="@+id/view_key_card_linked_ids_add"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_linked_add_identity"
android:textColor="@color/card_view_button" />
<Button
android:id="@+id/view_key_card_user_ids_edit"
@@ -36,6 +61,7 @@
android:layout_height="wrap_content"
android:text="@string/key_view_action_edit"
android:textColor="@color/card_view_button" />
</LinearLayout>
</LinearLayout>

50
OpenKeychain/src/main/res/layout/linked_identities_card.xml
View File

@@ -1,50 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<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="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_empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:gravity="center"
android:text="@string/linked_empty" />
<LinearLayout
android:id="@+id/view_key_card_linked_ids_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left|start"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<Button
android:id="@+id/view_key_card_linked_ids_add"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_linked_add_identity"
android:textColor="@color/card_view_button" />
</LinearLayout>
</LinearLayout>

12
OpenKeychain/src/main/res/layout/view_key_fragment.xml
View File

@@ -40,18 +40,6 @@
</android.support.v7.widget.CardView>
<org.sufficientlysecure.keychain.ui.keyview.view.LinkedIdentitiesCardView
android:id="@+id/card_linked_ids"
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"
tools:visibility="visible" />
<org.sufficientlysecure.keychain.ui.keyview.view.IdentitiesCardView
android:id="@+id/card_identities"
android:layout_width="match_parent"