moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity

Fix layouts

Browse Source
This commit is contained in:
Dominik Schürmann 2014-04-01 15:04:54 +02:00
parent 866d2d28cc
commit ef562b5e20
11 changed files with 100 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
View File

@ -26,6 +26,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.beardedhen.androidbootstrap.BootstrapButton; import com.beardedhen.androidbootstrap.BootstrapButton;

13
OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
View File

@ -4,8 +4,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="10dp" android:paddingRight="16dp"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/decrypt_signature_include" /> <include layout="@layout/decrypt_signature_include" />
@ -46,13 +46,13 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:padding="4dp">
<TextView <TextView
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/section_decrypt_verify" android:text="@string/section_decrypt_verify"
android:layout_above="@+id/decrypt_file_action_decrypt" android:layout_above="@+id/decrypt_file_action_decrypt"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
@ -61,8 +61,9 @@
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/decrypt_file_action_decrypt" android:id="@+id/decrypt_file_action_decrypt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:text="@string/btn_decrypt_verify" android:text="@string/btn_decrypt_verify"
bootstrapbutton:bb_icon_left="fa-unlock" bootstrapbutton:bb_icon_left="fa-unlock"
bootstrapbutton:bb_type="info" bootstrapbutton:bb_type="info"

19
OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml
View File

@ -9,8 +9,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="10dp" android:paddingRight="16dp"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/decrypt_signature_include" /> <include layout="@layout/decrypt_signature_include" />
@ -35,15 +35,16 @@
android:id="@+id/decrypt_buttons" android:id="@+id/decrypt_buttons"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:padding="4dp">
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_decrypt" android:id="@+id/action_decrypt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="4dp"
android:text="@string/btn_decrypt_verify" android:text="@string/btn_decrypt_verify"
bootstrapbutton:bb_icon_left="fa-unlock" bootstrapbutton:bb_icon_left="fa-unlock"
bootstrapbutton:bb_type="info" /> bootstrapbutton:bb_type="info" />
@ -51,9 +52,11 @@
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_decrypt_from_clipboard" android:id="@+id/action_decrypt_from_clipboard"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:layout_marginLeft="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="4dp"
android:text="@string/btn_decrypt_verify_clipboard" android:text="@string/btn_decrypt_verify_clipboard"
bootstrapbutton:bb_icon_left="fa-unlock" bootstrapbutton:bb_icon_left="fa-unlock"
bootstrapbutton:bb_type="info" /> bootstrapbutton:bb_type="info" />

13
OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
View File

@ -2,11 +2,13 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="4dp"> android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingRight="16dp"
android:paddingLeft="16dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -34,7 +36,7 @@
android:layout_gravity="right" android:layout_gravity="right"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:text="Alice" android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
@ -44,7 +46,7 @@
android:layout_gravity="right" android:layout_gravity="right"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:text="alice@example.com" android:text=""
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -52,8 +54,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:paddingBottom="3dip">
<TextView <TextView
android:id="@+id/label_selectPublicKeys" android:id="@+id/label_selectPublicKeys"

13
OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
View File

@ -5,8 +5,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="10dp" android:paddingRight="16dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
@ -51,13 +51,13 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:padding="4dp">
<TextView <TextView
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/section_encrypt_and_or_sign" android:text="@string/section_encrypt_and_or_sign"
android:layout_above="@+id/action_encrypt_file" android:layout_above="@+id/action_encrypt_file"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
@ -66,8 +66,9 @@
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_encrypt_file" android:id="@+id/action_encrypt_file"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:text="@string/btn_encrypt_file" android:text="@string/btn_encrypt_file"
bootstrapbutton:bb_icon_left="fa-lock" bootstrapbutton:bb_icon_left="fa-lock"
bootstrapbutton:bb_type="info" bootstrapbutton:bb_type="info"

20
OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml
View File

@ -9,8 +9,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="10dp" android:paddingRight="16dp"
android:orientation="vertical"> android:orientation="vertical">
<EditText <EditText
@ -26,20 +26,20 @@
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:text="@string/section_encrypt_and_or_sign" /> android:text="@string/section_encrypt_and_or_sign" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:padding="4dp">
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_encrypt_share" android:id="@+id/action_encrypt_share"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="4dp" android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/btn_share" android:text="@string/btn_share"
bootstrapbutton:bb_icon_left="fa-share-square" bootstrapbutton:bb_icon_left="fa-share-square"
@ -48,8 +48,10 @@
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_encrypt_clipboard" android:id="@+id/action_encrypt_clipboard"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="4dp" android:layout_marginLeft="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/btn_clipboard" android:text="@string/btn_clipboard"
bootstrapbutton:bb_icon_left="fa-clipboard" bootstrapbutton:bb_icon_left="fa-clipboard"

9
OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
View File

@ -3,7 +3,10 @@
android:id="@+id/modeSymmetric" android:id="@+id/modeSymmetric"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingRight="16dp"
android:paddingLeft="16dp"
android:stretchColumns="1"> android:stretchColumns="1">
<TableRow> <TableRow>
@ -13,7 +16,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingRight="10dip" android:paddingRight="8dp"
android:text="@string/label_passphrase" android:text="@string/label_passphrase"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
@ -31,7 +34,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingRight="10dip" android:paddingRight="8dp"
android:text="@string/label_passphrase_again" android:text="@string/label_passphrase_again"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />

1
OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent" >

82
OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml
View File

@ -1,56 +1,50 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/content_frame" android:id="@+id/content_frame"
android:layout_marginLeft="@dimen/drawer_content_padding" android:layout_marginLeft="@dimen/drawer_content_padding"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true"> android:layout_centerHorizontal="true">
<FrameLayout <FrameLayout
android:id="@+id/import_navigation_fragment" android:id="@+id/import_navigation_fragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp"/> android:paddingRight="4dp" />
<LinearLayout <LinearLayout
android:id="@+id/import_footer" android:id="@+id/import_footer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="10dp" android:paddingLeft="16dp"
android:paddingRight="10dp"> android:paddingRight="16dp">
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/import_import" android:id="@+id/import_import"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="4dp" android:layout_marginTop="4dp"
android:text="@string/import_import" android:layout_marginBottom="4dp"
bootstrapbutton:bb_icon_left="fa-download" android:text="@string/import_import"
bootstrapbutton:bb_type="info"/> bootstrapbutton:bb_icon_left="fa-download"
bootstrapbutton:bb_type="info" />
<!-- <com.beardedhen.androidbootstrap.BootstrapButton -->
<!-- android:id="@+id/import_sign_and_upload" -->
<!-- android:layout_width="match_parent" -->
<!-- android:layout_height="60dp" -->
<!-- android:padding="4dp" -->
<!-- android:text="@string/import_sign_and_upload" -->
<!-- bootstrapbutton:bb_type="info" /> -->
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/import_keys_list_container" android:id="@+id/import_keys_list_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_above="@+id/import_footer" android:layout_above="@+id/import_footer"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/import_navigation_fragment" android:layout_below="@+id/import_navigation_fragment"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp"/> android:paddingRight="4dp" />
</RelativeLayout> </RelativeLayout>

6
OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
View File

@ -21,15 +21,15 @@
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:text="@string/section_actions" /> android:text="@string/section_actions" />
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_certify" android:id="@+id/action_certify"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:text="@string/key_view_action_certify" android:text="@string/key_view_action_certify"
bootstrapbutton:bb_icon_left="fa-pencil" bootstrapbutton:bb_icon_left="fa-pencil"
bootstrapbutton:bb_type="info" /> bootstrapbutton:bb_type="info" />

20
OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
View File

@ -226,16 +226,15 @@
style="@style/SectionHeader" style="@style/SectionHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:text="@string/section_actions" /> android:text="@string/section_actions" />
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_edit" android:id="@+id/action_edit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="4dp"
android:text="@string/key_view_action_edit" android:text="@string/key_view_action_edit"
bootstrapbutton:bb_icon_left="fa-key" bootstrapbutton:bb_icon_left="fa-key"
bootstrapbutton:bb_type="info" bootstrapbutton:bb_type="info"
@ -244,20 +243,19 @@
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_encrypt" android:id="@+id/action_encrypt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="4dp"
android:text="@string/key_view_action_encrypt" android:text="@string/key_view_action_encrypt"
bootstrapbutton:bb_icon_left="fa-lock" bootstrapbutton:bb_icon_left="fa-lock"
bootstrapbutton:bb_type="info" /> bootstrapbutton:bb_type="info" />
<com.beardedhen.androidbootstrap.BootstrapButton <com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_certify" android:id="@+id/action_certify"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="50dp"
android:padding="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="4dp"
android:text="@string/key_view_action_certify" android:text="@string/key_view_action_certify"
bootstrapbutton:bb_icon_left="fa-pencil" bootstrapbutton:bb_icon_left="fa-pencil"
bootstrapbutton:bb_type="info" /> bootstrapbutton:bb_type="info" />