Put decrypt result in toolbar, some ui fixes for decrypt
@ -41,6 +41,8 @@ python copy OpenKeychain navigation grey chevron_left 24
|
||||
python copy OpenKeychain navigation grey chevron_right 24
|
||||
python copy OpenKeychain social grey person 48
|
||||
python copy OpenKeychain communication grey email 24
|
||||
python copy OpenKeychain social black share 24
|
||||
python copy OpenKeychain content black content_copy 24
|
||||
|
||||
# navigation drawer sections
|
||||
python copy OpenKeychain communication black vpn_key 24
|
||||
|
@ -79,17 +79,18 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
mResultLayout = (LinearLayout) view.findViewById(R.id.result_main_layout);
|
||||
// NOTE: These views are inside the activity!
|
||||
mResultLayout = (LinearLayout) getActivity().findViewById(R.id.result_main_layout);
|
||||
mResultLayout.setVisibility(View.GONE);
|
||||
|
||||
mEncryptionIcon = (ImageView) view.findViewById(R.id.result_encryption_icon);
|
||||
mEncryptionText = (TextView) view.findViewById(R.id.result_encryption_text);
|
||||
mSignatureIcon = (ImageView) view.findViewById(R.id.result_signature_icon);
|
||||
mSignatureText = (TextView) view.findViewById(R.id.result_signature_text);
|
||||
mSignatureLayout = view.findViewById(R.id.result_signature_layout);
|
||||
mSignatureName = (TextView) view.findViewById(R.id.result_signature_name);
|
||||
mSignatureEmail = (TextView) view.findViewById(R.id.result_signature_email);
|
||||
mSignatureAction = (TextView) view.findViewById(R.id.result_signature_action);
|
||||
mEncryptionIcon = (ImageView) getActivity().findViewById(R.id.result_encryption_icon);
|
||||
mEncryptionText = (TextView) getActivity().findViewById(R.id.result_encryption_text);
|
||||
mSignatureIcon = (ImageView) getActivity().findViewById(R.id.result_signature_icon);
|
||||
mSignatureText = (TextView) getActivity().findViewById(R.id.result_signature_text);
|
||||
mSignatureLayout = getActivity().findViewById(R.id.result_signature_layout);
|
||||
mSignatureName = (TextView) getActivity().findViewById(R.id.result_signature_name);
|
||||
mSignatureEmail = (TextView) getActivity().findViewById(R.id.result_signature_email);
|
||||
mSignatureAction = (TextView) getActivity().findViewById(R.id.result_signature_action);
|
||||
|
||||
}
|
||||
|
||||
|
@ -97,9 +97,9 @@ public class DecryptTextFragment extends DecryptFragment {
|
||||
/**
|
||||
* Create Intent Chooser but exclude decrypt activites
|
||||
*/
|
||||
private Intent sendWithChooserExcludingEncrypt(String text) {
|
||||
private Intent sendWithChooserExcludingDecrypt(String text) {
|
||||
Intent prototype = createSendIntent(text);
|
||||
String title = getString(R.string.title_share_file);
|
||||
String title = getString(R.string.title_share_message);
|
||||
|
||||
// we don't want to decrypt the decrypted, no inception ;)
|
||||
String[] blacklist = new String[]{
|
||||
@ -147,7 +147,7 @@ public class DecryptTextFragment extends DecryptFragment {
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case R.id.decrypt_share: {
|
||||
startActivity(sendWithChooserExcludingEncrypt(mText.getText().toString()));
|
||||
startActivity(sendWithChooserExcludingDecrypt(mText.getText().toString()));
|
||||
break;
|
||||
}
|
||||
case R.id.decrypt_copy: {
|
||||
|
After Width: | Height: | Size: 284 B |
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png
Normal file
After Width: | Height: | Size: 499 B |
After Width: | Height: | Size: 214 B |
BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png
Normal file
After Width: | Height: | Size: 355 B |
After Width: | Height: | Size: 304 B |
BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png
Normal file
After Width: | Height: | Size: 614 B |
After Width: | Height: | Size: 397 B |
After Width: | Height: | Size: 804 B |
After Width: | Height: | Size: 480 B |
After Width: | Height: | Size: 1.0 KiB |
@ -5,7 +5,7 @@
|
||||
|
||||
<include
|
||||
android:id="@+id/toolbar_include"
|
||||
layout="@layout/toolbar_standalone_white" />
|
||||
layout="@layout/toolbar_result_decrypt" />
|
||||
|
||||
<!--
|
||||
fitsSystemWindows and layout_marginTop from
|
||||
|
@ -4,7 +4,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include layout="@layout/decrypt_result_include" />
|
||||
<!--<include layout="@layout/decrypt_result_include" />-->
|
||||
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
|
145
OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml
Normal file
@ -0,0 +1,145 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/toolbar_include"
|
||||
android:elevation="4dp"
|
||||
android:background="@color/white"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<include
|
||||
android:id="@+id/toolbar_inner_layout"
|
||||
layout="@layout/toolbar_inner_layout_white" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_below="@id/toolbar"
|
||||
android:id="@+id/result_main_layout"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
tools:showIn="@layout/decrypt_text_fragment">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="16dp"
|
||||
android:paddingRight="16dp"
|
||||
android:paddingTop="4dp"
|
||||
android:paddingBottom="4dp"
|
||||
android:animateLayoutChanges="true">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/result_encryption_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/status_lock_open_24dp"
|
||||
android:layout_gravity="center_vertical" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result_encryption_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
tools:text="Encryption status text" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/result_signature_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/status_signature_unverified_cutout_24dp"
|
||||
android:layout_gravity="center_vertical" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result_signature_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
tools:text="Signature status text" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/result_signature_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?android:attr/listPreferredItemHeight"
|
||||
android:clickable="true"
|
||||
android:paddingLeft="4dp"
|
||||
android:paddingRight="4dp"
|
||||
android:background="?android:selectableItemBackground"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:paddingRight="4dp"
|
||||
android:paddingLeft="4dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result_signature_name"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
tools:text="Alice" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result_signature_email"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
tools:text="alice@example.com" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="1dip"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="right"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:background="?android:attr/listDivider" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/result_signature_action"
|
||||
android:paddingLeft="8dp"
|
||||
android:paddingRight="8dp"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:text="Show"
|
||||
android:drawableRight="@drawable/ic_vpn_key_grey_24dp"
|
||||
android:drawablePadding="8dp"
|
||||
android:gravity="center_vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dip"
|
||||
android:background="?android:attr/listDivider" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
@ -5,13 +5,13 @@
|
||||
<item
|
||||
android:id="@+id/decrypt_copy"
|
||||
android:title="@string/btn_copy_decrypted_text"
|
||||
android:icon="@drawable/ic_action_encrypt_copy_24dp"
|
||||
android:icon="@drawable/ic_content_copy_black_24dp"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item
|
||||
android:id="@+id/decrypt_share"
|
||||
android:title="@string/btn_share_decrypted_text"
|
||||
android:icon="@drawable/ic_action_encrypt_share_24dp"
|
||||
android:icon="@drawable/ic_share_black_24dp"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
</menu>
|