Certify design
This commit is contained in:
Dominik Schürmann
parent
1ec10ec894
commit
280899410f
|
|
@ -426,7 +426,12 @@
|
|||
<activity
|
||||
android:name=".ui.MultiCertifyKeyActivity"
|
||||
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
||||
android:label="@string/title_certify_key" />
|
||||
android:label="@string/title_certify_key"
|
||||
android:parentActivityName=".ui.AddKeysActivity">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value=".ui.KeyListActivity" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name=".ui.ImportKeysActivity"
|
||||
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ import android.view.ViewGroup;
|
|||
import android.widget.CheckBox;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.ListView;
|
||||
import android.widget.ScrollView;
|
||||
|
||||
import org.sufficientlysecure.keychain.Constants;
|
||||
import org.sufficientlysecure.keychain.R;
|
||||
|
|
@ -72,7 +71,6 @@ public class MultiCertifyKeyFragment extends LoaderFragment
|
|||
private FragmentActivity mActivity;
|
||||
|
||||
private CheckBox mUploadKeyCheckbox;
|
||||
private ScrollView mScrollView;
|
||||
ListView mUserIds;
|
||||
|
||||
private CertifyKeySpinner mCertifyKeySpinner;
|
||||
|
|
@ -146,7 +144,6 @@ public class MultiCertifyKeyFragment extends LoaderFragment
|
|||
|
||||
mCertifyKeySpinner = (CertifyKeySpinner) view.findViewById(R.id.certify_key_spinner);
|
||||
mUploadKeyCheckbox = (CheckBox) view.findViewById(R.id.sign_key_upload_checkbox);
|
||||
mScrollView = (ScrollView) view.findViewById(R.id.certify_scroll_view);
|
||||
mUserIds = (ListView) view.findViewById(R.id.view_key_user_ids);
|
||||
|
||||
// make certify image gray, like action icons
|
||||
|
|
@ -170,7 +167,6 @@ public class MultiCertifyKeyFragment extends LoaderFragment
|
|||
if (mSignMasterKeyId == Constants.key.none) {
|
||||
Notify.showNotify(mActivity, getString(R.string.select_key_to_certify),
|
||||
Notify.Style.ERROR);
|
||||
scrollUp();
|
||||
} else {
|
||||
initiateCertifying();
|
||||
}
|
||||
|
|
@ -190,14 +186,6 @@ public class MultiCertifyKeyFragment extends LoaderFragment
|
|||
return root;
|
||||
}
|
||||
|
||||
private void scrollUp() {
|
||||
mScrollView.post(new Runnable() {
|
||||
public void run() {
|
||||
mScrollView.fullScroll(ScrollView.FOCUS_UP);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
|
||||
Uri uri = UserIds.buildUserIdsUri();
|
||||
|
|
|
|||
|
|
@ -1,115 +1,132 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/certify_scroll_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="16dp"
|
||||
android:paddingRight="16dp"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="16dp"
|
||||
android:paddingRight="16dp"
|
||||
android:orientation="vertical">
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
style="@style/SectionHeader"
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="14dp"
|
||||
android:text="@string/section_uids_to_certify" />
|
||||
|
||||
<org.sufficientlysecure.keychain.ui.widget.FixedListView
|
||||
android:id="@+id/view_key_user_ids"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
android:id="@+id/imageView"
|
||||
android:src="@drawable/ic_action_person"
|
||||
android:layout_gravity="center_vertical" />
|
||||
|
||||
<TextView
|
||||
style="@style/SectionHeader"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="14dp"
|
||||
android:text="@string/section_certify"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginRight="8dp"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="@string/certify_text"
|
||||
android:id="@+id/textView"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/label_my_key"
|
||||
android:paddingLeft="8dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="@string/add_keys_my_key"
|
||||
android:paddingRight="8dp"
|
||||
android:gravity="center_vertical"/>
|
||||
|
||||
<org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
|
||||
android:id="@+id/certify_key_spinner"
|
||||
android:minHeight="56dip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/sign_key_upload_checkbox"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:layout_marginTop="4dp"
|
||||
android:checked="false"
|
||||
android:text="@string/label_send_key" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dip"
|
||||
android:background="?android:attr/listDivider"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/certify_key_certify_button"
|
||||
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_view_action_certify"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical" />
|
||||
|
||||
<!-- separate ImageView required for recoloring -->
|
||||
<ImageView
|
||||
android:id="@+id/certify_key_action_certify_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/status_signature_verified_cutout"
|
||||
android:layout_gravity="center_vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dip"
|
||||
android:background="?android:attr/listDivider"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
<TextView
|
||||
style="@style/SectionHeader"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/section_uids_to_certify" />
|
||||
|
||||
</LinearLayout>
|
||||
<org.sufficientlysecure.keychain.ui.widget.FixedListView
|
||||
android:id="@+id/view_key_user_ids"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<TextView
|
||||
style="@style/SectionHeader"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="14dp"
|
||||
android:text="@string/section_certify"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/label_my_key"
|
||||
android:paddingLeft="8dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="@string/add_keys_my_key"
|
||||
android:paddingRight="8dp"
|
||||
android:gravity="center_vertical" />
|
||||
|
||||
<org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
|
||||
android:id="@+id/certify_key_spinner"
|
||||
android:minHeight="56dip"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/sign_key_upload_checkbox"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:checked="false"
|
||||
android:text="@string/label_send_key" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dip"
|
||||
android:background="?android:attr/listDivider" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/certify_key_certify_button"
|
||||
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_view_action_certify"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical" />
|
||||
|
||||
<!-- separate ImageView required for recoloring -->
|
||||
<ImageView
|
||||
android:id="@+id/certify_key_action_certify_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/status_signature_verified_cutout"
|
||||
android:layout_gravity="center_vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dip"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:background="?android:attr/listDivider" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
|
@ -135,7 +135,7 @@
|
|||
<string name="label_name">"Name"</string>
|
||||
<string name="label_comment">"Comment"</string>
|
||||
<string name="label_email">"Email"</string>
|
||||
<string name="label_send_key">"Synchronize key with public keyservers"</string>
|
||||
<string name="label_send_key">"Synchronize with public keyservers"</string>
|
||||
<string name="label_fingerprint">"Fingerprint"</string>
|
||||
<string name="expiry_date_dialog_title">"Set expiry date"</string>
|
||||
<string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string>
|
||||
|
|
@ -276,8 +276,8 @@
|
|||
<string name="decrypt_result_decrypted_and_signature_certified">"Successfully decrypted and valid signature (certified)"</string>
|
||||
|
||||
<!-- Add keys -->
|
||||
<string name="add_keys_section_secure_exchange">"Secure Exchange"</string>
|
||||
<string name="add_keys_section_secure_add">"Secure Add"</string>
|
||||
<string name="add_keys_section_secure_exchange">"Exchange"</string>
|
||||
<string name="add_keys_section_secure_add">"Add"</string>
|
||||
<string name="add_keys_my_key">"My key:"</string>
|
||||
<string name="add_keys_start_exchange">"Start exchange"</string>
|
||||
<string name="add_keys_qr_code">"Scan QR Code"</string>
|
||||
|
|
@ -942,7 +942,8 @@
|
|||
<string name="unknown_uid">"<unknown>"</string>
|
||||
<string name="empty_certs">"No certificates for this key"</string>
|
||||
<string name="certs_text">"Only validated self-certificates and validated certificates created with your keys are displayed here."</string>
|
||||
<string name="section_uids_to_certify">"Identities to certify"</string>
|
||||
<string name="section_uids_to_certify">"Identities"</string>
|
||||
<string name="certify_text">"Are the selected identities corresponding to the persons you are exchanging keys with?\nDeselect any unknown to you."</string>
|
||||
<string name="label_revocation">"Revocation Reason"</string>
|
||||
<string name="label_verify_status">"Verification Status"</string>
|
||||
<string name="label_cert_type">"Type"</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue