moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 16:38:50 -05:00
Code Issues Releases Wiki Activity

Remove table layout, use hint text for edit fields

Browse Source
This commit is contained in:
Dominik Schürmann 2014-09-07 17:27:25 +02:00
parent 1f477c8059
commit c026dac8fc
2 changed files with 66 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
OpenKeychain/src/main/res/layout/passphrase_dialog.xml
View File

@ -1,57 +1,53 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:id="@+id/input">
<EditText
android:id="@+id/passphrase_passphrase"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:layout_marginTop="8dp"
android:paddingRight="16dp" android:layout_marginBottom="8dp"
android:orientation="horizontal" android:imeOptions="actionDone"
android:id="@+id/input"> android:inputType="textPassword"
android:hint="@string/label_passphrase"
android:ems="10"
android:layout_gravity="center_horizontal" />
<TextView </LinearLayout>
android:id="@+id/passphrase_label_passphrase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="4dp"
android:text="@string/label_passphrase" />
<EditText <LinearLayout
android:id="@+id/passphrase_passphrase" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:orientation="horizontal"
android:imeOptions="actionDone" android:id="@+id/progress"
android:inputType="textPassword" android:visibility="gone">
android:padding="4dp" />
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="horizontal"
android:id="@+id/progress"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="4dp"
android:text="@string/label_unlock"
/>
<ProgressBar <ProgressBar
style="?android:attr/progressBarStyleSmall" style="?android:attr/progressBarStyle"
android:layout_width="match_parent" android:layout_gravity="center_horizontal"
android:layout_height="match_parent" android:layout_width="wrap_content"
/> android:layout_height="wrap_content" />
<TextView
style="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:padding="4dp"
android:text="@string/label_unlock"
android:layout_gravity="center_vertical" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

64
OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp">
android:stretchColumns="1">
<CheckBox <CheckBox
android:id="@+id/passphrase_no_passphrase" android:id="@+id/passphrase_no_passphrase"
@ -12,41 +12,27 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_no_passphrase" /> android:text="@string/label_no_passphrase" />
<TableRow android:layout_marginBottom="5dip"> <EditText
android:id="@+id/passphrase_passphrase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:imeOptions="actionNext"
android:inputType="textPassword"
android:hint="@string/label_passphrase"
android:ems="10"
android:layout_gravity="center_horizontal" />
<TextView <EditText
android:id="@+id/passphrase_label_passphrase" android:id="@+id/passphrase_passphrase_again"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_marginBottom="8dp"
android:padding="4dp" android:imeOptions="actionDone"
android:text="@string/label_passphrase" /> android:inputType="textPassword"
android:hint="@string/label_passphrase_again"
android:ems="10"
android:layout_gravity="center_horizontal" />
<EditText </LinearLayout>
android:id="@+id/passphrase_passphrase"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:padding="4dp" />
</TableRow>
<TableRow android:layout_marginBottom="10dip">
<TextView
android:id="@+id/passphrase_label_passphrase_again"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="4dp"
android:text="@string/label_passphrase_again" />
<EditText
android:id="@+id/passphrase_passphrase_again"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionDone"
android:inputType="textPassword"
android:padding="4dp" />
</TableRow>
</TableLayout>