diff options
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml | 126 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml (renamed from OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml | 105 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
5 files changed, 129 insertions, 107 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java index 5483d16b8..25edc7a02 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java @@ -80,7 +80,7 @@ public class ViewKeyTrustFragment extends LoaderFragment implements @Override public View onCreateView(LayoutInflater inflater, ViewGroup superContainer, Bundle savedInstanceState) { View root = super.onCreateView(inflater, superContainer, savedInstanceState); - View view = inflater.inflate(R.layout.view_key_trust_fragment, getContainer()); + View view = inflater.inflate(R.layout.view_key_adv_keybase_fragment, getContainer()); mInflater = inflater; mTrustReadout = (TextView) view.findViewById(R.id.view_key_trust_readout); @@ -299,7 +299,7 @@ public class ViewKeyTrustFragment extends LoaderFragment implements int rowNumber = 1; for (CharSequence s : result.mProofs) { - TableRow row = (TableRow) mInflater.inflate(R.layout.view_key_keybase_proof, null); + TableRow row = (TableRow) mInflater.inflate(R.layout.view_key_adv_keybase_proof, null); TextView number = (TextView) row.findViewById(R.id.proof_number); TextView text = (TextView) row.findViewById(R.id.proof_text); number.setText(Integer.toString(rowNumber++) + ". "); diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml new file mode 100644 index 000000000..a29c9fbee --- /dev/null +++ b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml @@ -0,0 +1,126 @@ +<?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="match_parent" + android:orientation="vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@color/holo_gray_bright" + android:padding="8dp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/key_trust_header_text" + android:gravity="center_horizontal" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="beforeDescendants" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="8dp" + android:text="@string/section_should_you_trust" + android:layout_weight="1" /> + + <TextView + android:id="@+id/view_key_trust_readout" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="14dp" + android:layout_marginLeft="8dp" + android:layout_weight="1" + style="?android:attr/textAppearanceMedium" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="14dp" + android:text="@string/section_cloud_evidence" + android:layout_weight="1" /> + + <LinearLayout + android:id="@+id/view_key_trust_search_cloud" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:clickable="true" + android:paddingRight="4dp" + style="@style/SelectableItem" + android:orientation="horizontal"> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="match_parent" + android:text="@string/key_trust_start_cloud_search" + android:layout_weight="1" + android:gravity="center_vertical" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_search_cloud" + android:layout_gravity="center_vertical" /> + + </LinearLayout> + + + <TextView + android:id="@+id/view_key_trust_cloud_narrative" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="14dp" + android:layout_marginBottom="14dp" + android:layout_marginLeft="8dp" + android:layout_weight="1" + style="?android:attr/textAppearanceMedium" /> + + <TableLayout + android:id="@+id/view_key_proof_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <TextView + android:id="@+id/view_key_proof_verify_header" + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="16dp" + android:text="@string/section_proof_details" + android:layout_weight="1" /> + + <TextView + android:id="@+id/view_key_proof_verify_detail" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="14dp" + android:layout_marginLeft="8dp" + android:layout_weight="1" + style="?android:attr/textAppearanceMedium" /> + + + </LinearLayout> + + </ScrollView> +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml index 0ffd151c1..0ffd151c1 100644 --- a/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml diff --git a/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml deleted file mode 100644 index f97401271..000000000 --- a/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml +++ /dev/null @@ -1,105 +0,0 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:focusable="true" - android:focusableInTouchMode="true" - android:descendantFocusability="beforeDescendants" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp"> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginTop="8dp" - android:text="@string/section_should_you_trust" - android:layout_weight="1" /> - - <TextView - android:id="@+id/view_key_trust_readout" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginTop="14dp" - android:layout_marginLeft="8dp" - android:layout_weight="1" - style="?android:attr/textAppearanceMedium"/> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginTop="14dp" - android:text="@string/section_cloud_evidence" - android:layout_weight="1" /> - - <LinearLayout - android:id="@+id/view_key_trust_search_cloud" - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:clickable="true" - android:paddingRight="4dp" - style="@style/SelectableItem" - android:orientation="horizontal"> - - <TextView - android:paddingLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="0dip" - android:layout_height="match_parent" - android:text="@string/key_trust_start_cloud_search" - android:layout_weight="1" - android:gravity="center_vertical" /> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="8dp" - android:src="@drawable/ic_action_search_cloud" - android:layout_gravity="center_vertical" /> - - </LinearLayout> - - - <TextView - android:id="@+id/view_key_trust_cloud_narrative" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginTop="14dp" - android:layout_marginBottom="14dp" - android:layout_marginLeft="8dp" - android:layout_weight="1" - style="?android:attr/textAppearanceMedium" /> - - <TableLayout - android:id="@+id/view_key_proof_list" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <TextView - android:id="@+id/view_key_proof_verify_header" - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginTop="16dp" - android:text="@string/section_proof_details" - android:layout_weight="1" /> - - <TextView - android:id="@+id/view_key_proof_verify_detail" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginTop="14dp" - android:layout_marginLeft="8dp" - android:layout_weight="1" - style="?android:attr/textAppearanceMedium"/> - - - </LinearLayout> - -</ScrollView> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f43b4e623..bf83150b3 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -564,6 +564,7 @@ <string name="key_trust_no_cloud_evidence">"No evidence from the cloud on this key’s trustworthiness."</string> <string name="key_trust_start_cloud_search">"Start search"</string> <string name="key_trust_results_prefix">"Keybase.io offers “proofs” which assert that the owner of this key: "</string> + <string name="key_trust_header_text">"Note: Keybase.io proofs are an experimental feature of OpenKeychain. We encourage you to scan QR Codes or exchange keys via NFC in addition to verifying them."</string> <!-- keybase proof stuff --> <string name="keybase_narrative_twitter">"Posts to Twitter as"</string> |