diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
commit | e457d4c9097cb3f2e1c6305609cfacff1c5c38c2 (patch) | |
tree | 9d6410b554b68aca6aa49539e045e9db5d703cbf /OpenKeychain/src/main/res/layout | |
parent | 9a3a032d99064cd16ca065a214d8f7fd09d54088 (diff) | |
parent | 40751bceb586d12da671966c1ad5661223819c5b (diff) | |
download | open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.gz open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.bz2 open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
12 files changed, 161 insertions, 83 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity_old.xml b/OpenKeychain/src/main/res/layout/decrypt_activity_old.xml new file mode 100644 index 000000000..15216af32 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_activity_old.xml @@ -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_old"/> + + <include layout="@layout/drawer_list" /> + +</android.support.v4.widget.FixedDrawerLayout> diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml index f62cf615c..1fa6ea848 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml @@ -8,17 +8,71 @@ <include layout="@layout/notify_area" /> - <android.support.v4.view.ViewPager - android:id="@+id/decrypt_pager" + <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:paddingTop="4dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> - <android.support.v4.view.PagerTabStrip - android:id="@+id/decrypt_pager_tab_strip" + <TextView + style="@style/SectionHeader" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="top" - android:textColor="@color/emphasis" /> - </android.support.v4.view.ViewPager> + 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>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_content_old.xml b/OpenKeychain/src/main/res/layout/decrypt_content_old.xml new file mode 100644 index 000000000..f62cf615c --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_content_old.xml @@ -0,0 +1,24 @@ +<?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" /> + + <android.support.v4.view.ViewPager + android:id="@+id/decrypt_pager" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <android.support.v4.view.PagerTabStrip + android:id="@+id/decrypt_pager_tab_strip" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:textColor="@color/emphasis" /> + </android.support.v4.view.ViewPager> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml new file mode 100644 index 000000000..0380787db --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml @@ -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>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml new file mode 100644 index 000000000..e08ecb39e --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml @@ -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>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index 3b4eba3ef..5e9189fd3 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -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" /> diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml index 34f6eadda..5bf652780 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml @@ -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" /> diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml index ee87b8a7e..809f00204 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml @@ -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" /> diff --git a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml index 62e7d740c..46ec736ca 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml @@ -11,12 +11,12 @@ android:orientation="horizontal"> <AutoCompleteTextView - android:id="@+id/import_server_query" + android:id="@+id/cloud_import_server_query" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="top|left" - android:hint="@string/hint_keyserver_search_hint" + android:hint="@string/hint_cloud_search_hint" android:imeOptions="actionSearch" android:inputType="textNoSuggestions" android:singleLine="true" @@ -26,7 +26,7 @@ android:layout_gravity="center_vertical" /> <ImageButton - android:id="@+id/import_server_search" + android:id="@+id/cloud_import_server_search" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" @@ -43,7 +43,7 @@ android:background="?android:attr/listDivider" /> <ImageButton - android:id="@+id/import_server_config_button" + android:id="@+id/cloud_import_server_config_button" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" @@ -53,24 +53,5 @@ </LinearLayout> - <LinearLayout - android:id="@+id/import_server_config" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <Spinner - android:id="@+id/import_server_spinner" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml deleted file mode 100644 index c70236e07..000000000 --- a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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="wrap_content" - android:orientation="horizontal"> - - <EditText - android:id="@+id/import_keybase_query" - android:layout_marginLeft="8dp" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="top|left" - android:hint="@string/hint_keybase_search_hint" - android:imeOptions="actionSearch" - android:inputType="textNoSuggestions" - android:singleLine="true" - android:lines="1" - android:maxLines="1" - android:minLines="1" - android:layout_gravity="center_vertical" /> - - <ImageButton - android:id="@+id/import_keybase_search" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="8dp" - android:src="@drawable/ic_action_search" - android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml index 773250dc6..74de77172 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml @@ -30,6 +30,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingRight="8dp" + android:paddingTop="2dp" + android:gravity="top|center" android:clickable="false" android:focusable="false" android:focusableInTouchMode="false" /> diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml index baf7111af..33866f746 100644 --- a/OpenKeychain/src/main/res/layout/key_server_preference.xml +++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml @@ -12,7 +12,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" > - <RelativeLayout + <LinearLayout android:layout_width="0dip" android:layout_height="wrap_content" android:layout_marginBottom="6sp" @@ -21,6 +21,7 @@ android:layout_marginTop="6sp" android:layout_weight="1" android:background="@android:drawable/menuitem_background" + android:orientation="vertical" android:focusable="true" > <TextView @@ -35,20 +36,26 @@ android:id="@+id/summary" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignLeft="@android:id/title" - android:layout_below="@android:id/title" - android:maxLines="2" android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - + </LinearLayout> + <Button + android:id="@+id/rotate" + android:layout_width="wrap_content" + android:layout_height="31dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4dip" + android:layout_marginRight="6dip" + android:text="rotate" + android:textColor="#ffffffff" + android:textStyle="bold" + android:background="@drawable/button_rounded_blue" + /> <ImageButton android:id="@+id/add" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_margin="10dp" - android:layout_marginLeft="4dip" - android:layout_marginRight="6dip" android:src="@drawable/plus" android:background="@drawable/button_rounded_green"/> </LinearLayout> |