moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 19:22:14 -05:00
Code Issues Releases Wiki Activity

Button text for decrypt

Browse Source
This commit is contained in:
Dominik Schürmann 2014-09-24 01:37:00 +02:00
parent 7f2640711e
commit 42a7cd5eb0
2 changed files with 79 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
OpenKeychain/src/main/res/layout/decrypt_content.xml
View File

@ -21,7 +21,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="Files" /> android:text="@string/section_decrypt_files" />
<TextView <TextView
@ -34,7 +34,7 @@
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" style="@style/SelectableItem"
android:text="Decrypt files" android:text="@string/btn_decrypt_files"
android:drawableRight="@drawable/ic_action_collection" android:drawableRight="@drawable/ic_action_collection"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:gravity="center_vertical" /> android:gravity="center_vertical" />
@ -50,22 +50,82 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:text="Text" /> android:text="@string/section_decrypt_text" />
<TextView <!--<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="@string/btn_decrypt_clipboard"-->
<!--android:drawableRight="@drawable/ic_action_paste"-->
<!--android:drawablePadding="8dp"-->
<!--android:gravity="center_vertical" />-->
<!--<TextView-->
<!--android:paddingLeft="8dp"-->
<!--android:paddingRight="8dp"-->
<!--android:textAppearance="?android:attr/textAppearanceSmall"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:clickable="true"-->
<!--style="@style/SelectableItem"-->
<!--android:text="@string/btn_decrypt_clipboard"-->
<!--android:drawablePadding="8dp"-->
<!--android:gravity="center_vertical" />-->
<LinearLayout
android:id="@+id/decrypt_from_clipboard" android:id="@+id/decrypt_from_clipboard"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="?android:attr/listPreferredItemHeight"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
android:paddingRight="4dp"
style="@style/SelectableItem" style="@style/SelectableItem"
android:text="Decrypt from clipboard" android:orientation="horizontal">
android:drawableRight="@drawable/ic_action_paste"
android:drawablePadding="8dp" <LinearLayout
android:gravity="center_vertical" /> android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="true"
android:paddingRight="4dp"
android:gravity="center_vertical"
style="@style/SelectableItem"
android:orientation="vertical">
<TextView
android:paddingLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/btn_decrypt_clipboard" />
<TextView
android:paddingLeft="8dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/tertiary_text_light"
android:text="@string/btn_decrypt_and_verify"
android:gravity="center_vertical" />
</LinearLayout>
<ImageView
android:id="@+id/view_key_action_certify_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_action_paste"
android:layout_gravity="center_vertical" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
@ -75,4 +135,5 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -51,6 +51,8 @@
<string name="section_key_server">"Keyserver"</string> <string name="section_key_server">"Keyserver"</string>
<string name="section_fingerprint">"Fingerprint"</string> <string name="section_fingerprint">"Fingerprint"</string>
<string name="section_key_to_certify">"Key to be certified"</string> <string name="section_key_to_certify">"Key to be certified"</string>
<string name="section_decrypt_files">"Files"</string>
<string name="section_decrypt_text">"Text"</string>
<!-- button --> <!-- button -->
<string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string> <string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string>
@ -71,6 +73,9 @@
<string name="btn_create_key">"Create key"</string> <string name="btn_create_key">"Create key"</string>
<string name="btn_add_files">"Add file(s)"</string> <string name="btn_add_files">"Add file(s)"</string>
<string name="btn_add_share_decrypted_text">"Share decrypted text"</string> <string name="btn_add_share_decrypted_text">"Share decrypted text"</string>
<string name="btn_decrypt_clipboard">"Decrypt from clipboard"</string>
<string name="btn_decrypt_and_verify">"and verify signatures"</string>
<string name="btn_decrypt_files">"Decrypt files"</string>
<!-- menu --> <!-- menu -->
<string name="menu_preferences">"Settings"</string> <string name="menu_preferences">"Settings"</string>