mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-07 01:35:00 -05:00
more layout fixes
This commit is contained in:
parent
803a1e9481
commit
7617e9be2d
@ -10,7 +10,9 @@
|
|||||||
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:layout_margin="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
|
android:layout_marginRight="4dp"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
android:text="@string/api_settings_select_key"
|
android:text="@string/api_settings_select_key"
|
||||||
bootstrapbutton:bb_icon_left="fa-key"
|
bootstrapbutton:bb_icon_left="fa-key"
|
||||||
bootstrapbutton:bb_size="default"
|
bootstrapbutton:bb_size="default"
|
||||||
@ -19,6 +21,9 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="4dp"
|
||||||
|
android:layout_marginLeft="4dp"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:paddingLeft="16dp" >
|
android:paddingLeft="16dp" >
|
||||||
|
|
||||||
|
@ -1,61 +1,68 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView 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:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent" >
|
||||||
android:orientation="vertical"
|
|
||||||
android:padding="16dp" >
|
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
style="@style/SectionHeader"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="4dp"
|
|
||||||
android:text="@string/section_signing_key" />
|
|
||||||
|
|
||||||
<fragment
|
|
||||||
android:id="@+id/sign_key_select_key_fragment"
|
|
||||||
android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginLeft="16dp"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginRight="16dp"
|
||||||
tools:layout="@layout/select_secret_key_layout_fragment" />
|
android:orientation="vertical" >
|
||||||
|
|
||||||
<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_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
android:layout_marginTop="14dp"
|
android:layout_marginTop="14dp"
|
||||||
android:text="@string/section_upload_key" />
|
android:text="@string/section_signing_key" />
|
||||||
|
|
||||||
<CheckBox
|
<fragment
|
||||||
android:id="@+id/sign_key_upload_checkbox"
|
android:id="@+id/sign_key_select_key_fragment"
|
||||||
android:layout_width="wrap_content"
|
android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
android:checked="false"
|
android:layout_marginTop="4dp"
|
||||||
android:text="@string/label_send_key" />
|
tools:layout="@layout/select_secret_key_layout_fragment" />
|
||||||
|
|
||||||
<Spinner
|
<TextView
|
||||||
android:id="@+id/sign_key_keyserver"
|
style="@style/SectionHeader"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="14dp"
|
||||||
android:enabled="false" />
|
android:text="@string/section_upload_key" />
|
||||||
|
|
||||||
<com.beardedhen.androidbootstrap.BootstrapButton
|
<CheckBox
|
||||||
android:id="@+id/sign_key_sign_button"
|
android:id="@+id/sign_key_upload_checkbox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="60dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="4dp"
|
android:layout_marginBottom="4dp"
|
||||||
android:layout_marginTop="14dp"
|
android:layout_marginTop="4dp"
|
||||||
android:text="@string/btn_sign"
|
android:checked="false"
|
||||||
bootstrapbutton:bb_icon_left="fa-pencil"
|
android:text="@string/label_send_key" />
|
||||||
bootstrapbutton:bb_type="info" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
<Spinner
|
||||||
|
android:id="@+id/sign_key_keyserver"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="4dp"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:enabled="false" />
|
||||||
|
|
||||||
|
<com.beardedhen.androidbootstrap.BootstrapButton
|
||||||
|
android:id="@+id/sign_key_sign_button"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="60dp"
|
||||||
|
android:layout_marginBottom="4dp"
|
||||||
|
android:layout_marginTop="14dp"
|
||||||
|
android:text="@string/btn_sign"
|
||||||
|
bootstrapbutton:bb_icon_left="fa-pencil"
|
||||||
|
bootstrapbutton:bb_type="info" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
@ -6,7 +6,6 @@
|
|||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginRight="?android:attr/scrollbarSize"
|
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:paddingLeft="16dp"
|
android:paddingLeft="16dp"
|
||||||
android:paddingRight="16dp" >
|
android:paddingRight="16dp" >
|
||||||
|
Loading…
Reference in New Issue
Block a user