moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-17 06:15:15 -05:00
Code Issues Releases Wiki Activity

use new multi certify, layout fixes

Browse Source
This commit is contained in:
Dominik Schürmann 2014-10-04 23:32:25 +02:00
parent 0a264bad28
commit 4fcd58b9f8
3 changed files with 146 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
View File

@ -384,9 +384,9 @@ public class AddKeysActivity extends ActionBarActivity implements
} }
finish(); finish();
Intent certifyIntent = new Intent(); // TODO: certify Intent certifyIntent = new Intent(AddKeysActivity.this, MultiCertifyKeyActivity.class);
certifyIntent.putExtra(ImportKeyResult.EXTRA_RESULT, result); certifyIntent.putExtra(ImportKeyResult.EXTRA_RESULT, result);
certifyIntent.putExtra("key ids", result.getImportedMasterKeyIds()); // TODO: extra certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_KEY_IDS, result.getImportedMasterKeyIds());
startActivity(certifyIntent); startActivity(certifyIntent);
result.createNotify(AddKeysActivity.this).show(); result.createNotify(AddKeysActivity.this).show();

282
OpenKeychain/src/main/res/layout/add_keys_activity.xml
View File

@ -1,164 +1,168 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content_frame"
android:layout_marginLeft="@dimen/drawer_content_padding"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical">
<include layout="@layout/notify_area" />
<LinearLayout <LinearLayout
android:id="@+id/content_frame"
android:layout_marginLeft="@dimen/drawer_content_padding"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <include layout="@layout/notify_area" />
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/add_keys_section_secure_exchange" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:padding="0dp" android:paddingTop="4dp"
android:layout_margin="0dp"> android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical">
<TextView <TextView
android:paddingLeft="8dp" style="@style/SectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/add_keys_my_key"
android:paddingRight="8dp" />
<org.sufficientlysecure.keychain.ui.widget.ExchangeKeySpinner
android:id="@+id/add_keys_safeslinger_key_spinner"
android:minHeight="56dip"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" /> android:layout_marginTop="16dp"
android:text="@string/add_keys_section_secure_exchange" />
</LinearLayout> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:layout_margin="0dp">
<LinearLayout <TextView
android:id="@+id/add_keys_safeslinger" android:paddingLeft="8dp"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="wrap_content"
android:clickable="true" android:layout_gravity="center_vertical"
android:paddingRight="4dp" android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SelectableItem" android:text="@string/add_keys_my_key"
android:orientation="horizontal"> android:paddingRight="8dp" />
<org.sufficientlysecure.keychain.ui.widget.ExchangeKeySpinner
android:id="@+id/add_keys_safeslinger_key_spinner"
android:minHeight="56dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
</LinearLayout>
<LinearLayout
android:id="@+id/add_keys_safeslinger"
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/add_keys_start_exchange"
android:layout_weight="1"
android:gravity="center_vertical" />
<ImageView
android:id="@+id/add_keys_safeslinger_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_safeslinger"
android:layout_gravity="center_vertical" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:layout_marginBottom="8dp" />
<TextView <TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/add_keys_section_secure_add" />
<TextView
android:id="@+id/add_keys_qr_code"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dip" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:text="@string/add_keys_start_exchange" android:minHeight="?android:attr/listPreferredItemHeight"
android:layout_weight="1" android:clickable="true"
style="@style/SelectableItem"
android:text="@string/add_keys_qr_code"
android:drawableRight="@drawable/ic_action_qr_code"
android:drawablePadding="8dp"
android:gravity="center_vertical" /> android:gravity="center_vertical" />
<ImageView <View
android:id="@+id/add_keys_safeslinger_icon" android:id="@+id/view_key_action_certify_divider"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="1dip"
android:padding="8dp" android:background="?android:attr/listDivider" />
android:src="@drawable/ic_action_safeslinger"
android:layout_gravity="center_vertical" /> <TextView
android:id="@+id/add_keys_nfc"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:text="@string/add_keys_nfc"
android:drawableRight="@drawable/ic_action_nfc"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:layout_marginBottom="8dp" />
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/add_keys_section_import" />
<TextView
android:id="@+id/add_keys_search_cloud"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:text="@string/add_keys_cloud"
android:drawableRight="@drawable/ic_action_search"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:layout_marginBottom="8dp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:layout_marginBottom="8dp" />
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/add_keys_section_secure_add" />
<TextView
android:id="@+id/add_keys_qr_code"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:text="@string/add_keys_qr_code"
android:drawableRight="@drawable/ic_action_qr_code"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
<View
android:id="@+id/view_key_action_certify_divider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/add_keys_nfc"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:text="@string/add_keys_nfc"
android:drawableRight="@drawable/ic_action_nfc"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:layout_marginBottom="8dp" />
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/add_keys_section_import" />
<TextView
android:id="@+id/add_keys_search_cloud"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:text="@string/add_keys_cloud"
android:drawableRight="@drawable/ic_action_search"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:layout_marginBottom="8dp" />
</LinearLayout> </LinearLayout>
</ScrollView>
</LinearLayout>

2
OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
View File

@ -135,7 +135,7 @@
android:layout_weight="1" android:layout_weight="1"
android:text="@string/btn_next" android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account" android:drawableRight="@drawable/ic_action_play"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:clickable="true" android:clickable="true"