cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodable characters)

Browse Source
This commit is contained in:
Dominik Schürmann
2014-09-15 10:19:55 +02:00
parent 88bbce831c
commit 53bc417f8f
19 changed files with 549 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/res/layout-large/decrypt_activity.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.widget.FixedDrawerLayout
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/drawer_list" />
</android.support.v4.widget.FixedDrawerLayout>
<include layout="@layout/decrypt_content" />
</FrameLayout>

11
OpenKeychain/src/main/res/layout/decrypt_activity.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/decrypt_content"/>
<include layout="@layout/drawer_list" />
</android.support.v4.widget.FixedDrawerLayout>

78
OpenKeychain/src/main/res/layout/decrypt_content.xml Normal file
View File

@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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_height="match_parent"
android:orientation="vertical">
<include layout="@layout/notify_area" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="4dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical">
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Files" />
<TextView
android:id="@+id/decrypt_files"
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="Decrypt files"
android:drawableRight="@drawable/ic_action_collection"
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="Text" />
<TextView
android:id="@+id/decrypt_from_clipboard"
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="Decrypt from clipboard"
android:drawableRight="@drawable/ic_action_paste"
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>

14
OpenKeychain/src/main/res/layout/decrypt_files_activity.xml Normal file
View File

@@ -0,0 +1,14 @@
<?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">
<include layout="@layout/notify_area" />
<FrameLayout
android:id="@+id/decrypt_files_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

14
OpenKeychain/src/main/res/layout/decrypt_text_activity.xml Normal file
View File

@@ -0,0 +1,14 @@
<?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">
<include layout="@layout/notify_area" />
<FrameLayout
android:id="@+id/decrypt_text_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

23
OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml → OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
View File

@@ -25,24 +25,25 @@
android:paddingRight="16dp"
android:orientation="vertical">
<EditText
android:id="@+id/message"
<TextView
android:id="@+id/decrypt_text_plaintext"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="0dip"
android:gravity="top"
android:hint="@string/decrypt_content_edit_text_hint"
android:inputType="text|textCapSentences|textMultiLine|textLongMessage|textNoSuggestions"
android:hint=""
android:scrollHorizontally="true"
android:layout_weight="1" />
android:layout_weight="1"
android:textIsSelectable="true" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<LinearLayout
android:id="@+id/action_decrypt"
android:id="@+id/action_encrypt_share_plaintext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
@@ -57,7 +58,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:text="@string/btn_decrypt_verify_message"
android:text="Share plaintext"
android:drawableRight="@drawable/ic_action_share"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_weight="1" />
@@ -70,11 +73,11 @@
android:background="?android:attr/listDivider" />
<ImageButton
android:id="@+id/action_decrypt_from_clipboard"
android:id="@+id/action_copy_plaintext"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_paste"
android:src="@drawable/ic_action_copy"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />

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

@@ -16,7 +16,7 @@
android:orientation="vertical" />
<fragment
android:id="@+id/certify_key_fragment"
android:id="@+id/encrypt_file_fragment"
android:name="org.sufficientlysecure.keychain.ui.EncryptFileFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />

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

@@ -16,7 +16,7 @@
android:orientation="vertical" />
<fragment
android:id="@+id/certify_key_fragment"
android:id="@+id/encrypt_text_fragment"
android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />

1
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -521,7 +521,6 @@
<!-- hints -->
<string name="encrypt_content_edit_text_hint">"Type text"</string>
<string name="decrypt_content_edit_text_hint">"Enter ciphertext here to decrypt and/or verify…"</string>
<!-- certs -->
<string name="cert_default">"default"</string>