diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 01:58:36 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 01:58:36 +0100 |
commit | 1f324be24316175a111b9424a22fc5fcb6104e2b (patch) | |
tree | 5369bc47774cef2958783762ab177faefa4dc59a /OpenKeychain/src/main/res | |
parent | 8222315dbd1fe412ead71e0f12ba54b19705617c (diff) | |
download | open-keychain-1f324be24316175a111b9424a22fc5fcb6104e2b.tar.gz open-keychain-1f324be24316175a111b9424a22fc5fcb6104e2b.tar.bz2 open-keychain-1f324be24316175a111b9424a22fc5fcb6104e2b.zip |
do a TON of UI work
Diffstat (limited to 'OpenKeychain/src/main/res')
5 files changed, 216 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_id_item_dns.xml b/OpenKeychain/src/main/res/layout/linked_id_item_dns.xml new file mode 100644 index 000000000..36b40f30d --- /dev/null +++ b/OpenKeychain/src/main/res/layout/linked_id_item_dns.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:singleLine="true"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/linked_id_type_icon" + android:layout_marginLeft="14dp" + android:layout_marginStart="14dp" + android:src="@drawable/dns" + android:layout_gravity="center_vertical" /> + + <LinearLayout + android:orientation="vertical" + android:layout_gravity="center_vertical" + android:layout_width="0dip" + android:layout_marginLeft="8dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <TextView + android:id="@+id/linked_id_dns_fqdn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="www.example.com" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/user_id_item_comment" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/tertiary_text_light" + android:text="comment" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/user_id_item_certified_layout" + android:layout_width="22dp" + android:layout_height="wrap_content" + android:layout_marginRight="8dp" + android:layout_marginEnd="8dp" + android:layout_gravity="center_vertical" + android:orientation="vertical"> + + <ImageView + android:id="@+id/user_id_item_certified" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/status_signature_unverified_cutout_24px" + android:layout_gravity="center_horizontal" /> + + </LinearLayout> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/linked_id_item_unknown.xml b/OpenKeychain/src/main/res/layout/linked_id_item_unknown.xml new file mode 100644 index 000000000..dcd46884d --- /dev/null +++ b/OpenKeychain/src/main/res/layout/linked_id_item_unknown.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:singleLine="true"> + + <LinearLayout + android:orientation="vertical" + android:layout_gravity="center_vertical" + android:layout_width="0dip" + android:layout_marginLeft="8dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <TextView + android:id="@+id/linked_id_uri" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="uri" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/user_id_item_comment" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/tertiary_text_light" + android:text="unknown linked identity type" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/user_id_item_certified_layout" + android:layout_width="22dp" + android:layout_height="wrap_content" + android:layout_marginRight="8dp" + android:layout_marginEnd="8dp" + android:layout_gravity="center_vertical" + android:orientation="vertical"> + + <ImageView + android:id="@+id/user_id_item_certified" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/status_signature_unverified_cutout_24px" + android:layout_gravity="center_horizontal" /> + + </LinearLayout> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml new file mode 100644 index 000000000..c260a35d3 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView 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="match_parent" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <android.support.v7.widget.CardView + android:id="@+id/card_linked_ids" + android:transitionName="card_linked_ids" + android:layout_width="match_parent" + android:layout_height="wrap_content" + 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="wrap_content" + android:orientation="vertical"> + + <TextView + style="@style/CardViewHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Linked Identity" /> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <ImageView + android:minHeight="?android:attr/listPreferredItemHeight" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/linked_id_type_icon" + android:layout_marginLeft="14dp" + android:layout_marginStart="14dp" + android:src="@drawable/dns" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="14dp" + android:layout_marginStart="14dp" + android:text="This is a DNS linked identity~\nLorem ipsum\nmore text\neven more text\nyoooyoyo" + android:layout_gravity="center_vertical" /> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/back_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_arrow_back_white_24dp" + style="?android:attr/borderlessButtonStyle" /> + + <Space + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="View" + android:textColor="@color/link_text_material_light" + style="?android:attr/borderlessButtonStyle" + /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Verify" + android:textColor="@color/link_text_material_light" + style="?android:attr/borderlessButtonStyle" + /> + + </LinearLayout> + + </LinearLayout> + + </android.support.v7.widget.CardView> + +</ScrollView>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index 20d329a9e..3d9e4fde8 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -43,6 +43,7 @@ <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" diff --git a/OpenKeychain/src/main/res/transition/linked_id_card_trans.xml b/OpenKeychain/src/main/res/transition/linked_id_card_trans.xml new file mode 100644 index 000000000..8d6e75cee --- /dev/null +++ b/OpenKeychain/src/main/res/transition/linked_id_card_trans.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<transitionSet xmlns:android="http://schemas.android.com/apk/res/android"> + <changeBounds /> +</transitionSet>
\ No newline at end of file |