diff options
Diffstat (limited to 'org_apg/res/layout')
| -rw-r--r-- | org_apg/res/layout/create_key.xml | 89 | ||||
| -rw-r--r-- | org_apg/res/layout/edit_key.xml | 76 | ||||
| -rw-r--r-- | org_apg/res/layout/edit_key_key_item.xml | 97 | ||||
| -rw-r--r-- | org_apg/res/layout/edit_key_section.xml | 41 | ||||
| -rw-r--r-- | org_apg/res/layout/edit_key_user_id_item.xml | 86 | ||||
| -rw-r--r-- | org_apg/res/layout/pass_phrase.xml | 37 | ||||
| -rw-r--r-- | org_apg/res/layout/passphrase.xml | 61 |
7 files changed, 244 insertions, 243 deletions
diff --git a/org_apg/res/layout/create_key.xml b/org_apg/res/layout/create_key.xml index d8ccc73ec..235d33f88 100644 --- a/org_apg/res/layout/create_key.xml +++ b/org_apg/res/layout/create_key.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> +<!-- + Copyright (C) 2010 Thialfihar <thi@thialfihar.org> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,51 +15,59 @@ limitations under the License. --> -<ScrollView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="fill_parent" - android:layout_width="fill_parent"> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" > - <TableLayout - android:layout_height="fill_parent" - android:layout_width="fill_parent" - android:stretchColumns="1" - android:layout_marginRight="?android:attr/scrollbarSize" - android:paddingLeft="6dip"> + <TableLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:stretchColumns="1" > - <TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/keyCreationElGamalInfo" /> - <TextView android:id="@+id/label_algorithm" - android:text="@string/label_algorithm" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip"/> + <TableRow> - <Spinner - android:id="@+id/algorithm" - android:layout_width="fill_parent" - android:layout_height="wrap_content"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/label_algorithm" /> - </TableRow> + <Spinner + android:id="@+id/create_key_algorithm" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:padding="4dp" /> + </TableRow> - <TableRow> + <TableRow> - <TextView android:id="@+id/label_size" - android:text="@string/label_keySize" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/label_keySize" /> - <EditText android:id="@+id/size" - android:text="1024" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:gravity="right" - android:numeric="integer"/> - </TableRow> + <EditText + android:id="@+id/create_key_size" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="right" + android:numeric="integer" + android:padding="4dp" + android:text="1024" /> + </TableRow> + </TableLayout> + <!-- </LinearLayout> --> - </TableLayout> - -</ScrollView> +</ScrollView>
\ No newline at end of file diff --git a/org_apg/res/layout/edit_key.xml b/org_apg/res/layout/edit_key.xml index de004f0b5..3ab5f1c52 100644 --- a/org_apg/res/layout/edit_key.xml +++ b/org_apg/res/layout/edit_key.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> +<!-- + Copyright (C) 2010 Thialfihar <thi@thialfihar.org> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,52 +15,45 @@ limitations under the License. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:paddingTop="5dip" - android:fillViewport="true"> + android:fillViewport="true" + android:orientation="vertical" > - <ScrollView + <LinearLayout android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1"> + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp" > + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="4dp" + android:text="@string/label_passPhrase" /> + + <CheckBox + android:id="@+id/edit_key_no_passphrase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_noPassPhrase" /> + + <Button + android:id="@+id/edit_key_btn_change_pass_phrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="4dp" + android:text="@string/btn_setPassPhrase" /> <LinearLayout - android:id="@+id/container" + android:id="@+id/edit_key_container" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:layout_marginRight="?android:attr/scrollbarSize"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <View - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1"/> - - <Button - android:id="@+id/btn_change_pass_phrase" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="2" - android:text="@string/btn_setPassPhrase"/> - - <View - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1"/> - - </LinearLayout> - + android:layout_height="wrap_content" + android:orientation="vertical" > </LinearLayout> + </LinearLayout> - </ScrollView> - -</LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/org_apg/res/layout/edit_key_key_item.xml b/org_apg/res/layout/edit_key_key_item.xml index 850879f64..cf816c797 100644 --- a/org_apg/res/layout/edit_key_key_item.xml +++ b/org_apg/res/layout/edit_key_key_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> +<!-- + Copyright (C) 2010 Thialfihar <thi@thialfihar.org> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,130 +15,120 @@ limitations under the License. --> -<org.apg.ui.widget.KeyEditor - xmlns:android="http://schemas.android.com/apk/res/android" +<org.apg.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="5dip"> - - <View - android:id="@+id/separator" - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider"/> + android:orientation="vertical" > <LinearLayout - android:layout_height="wrap_content" android:layout_width="fill_parent" - android:orientation="horizontal"> + android:layout_height="wrap_content" + android:orientation="horizontal" > <TableLayout - android:layout_height="wrap_content" android:layout_width="0dip" + android:layout_height="wrap_content" android:layout_weight="1" - android:layout_marginLeft="16dip" - android:stretchColumns="1"> + android:stretchColumns="1" > <TableRow> <TextView - android:id="@+id/label_keyId" - android:text="@string/label_keyId" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip"/> + android:id="@+id/label_keyId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_keyId" /> <TextView android:id="@+id/keyId" - android:text="00000000 00000000" - android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_height="wrap_content" android:paddingRight="5dip" - android:typeface="monospace"/> - + android:text="00000000 00000000" + android:typeface="monospace" /> </TableRow> <TableRow> <TextView android:id="@+id/label_algorithm" - android:text="@string/label_algorithm" - android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingRight="10dip"/> + android:paddingRight="10dip" + android:text="@string/label_algorithm" /> <TextView android:id="@+id/algorithm" - android:text="Name" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingRight="5dip"/> - + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="Name" /> </TableRow> <TableRow> <TextView android:id="@+id/label_creation" - android:text="@string/label_creation" - android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingRight="10dip"/> + android:paddingRight="10dip" + android:text="@string/label_creation" /> <TextView android:id="@+id/creation" android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - + android:layout_height="wrap_content" /> </TableRow> <TableRow> <TextView android:id="@+id/label_expiry" - android:text="@string/label_expiry" - android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingRight="10dip"/> + android:paddingRight="10dip" + android:text="@string/label_expiry" /> <Button android:id="@+id/expiry" android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - + android:layout_height="wrap_content" /> </TableRow> <TableRow> <TextView android:id="@+id/label_usage" - android:text="@string/label_usage" - android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingRight="10dip"/> + android:paddingRight="10dip" + android:text="@string/label_usage" /> <Spinner android:id="@+id/usage" android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - + android:layout_height="wrap_content" /> </TableRow> - </TableLayout> <ImageButton android:id="@+id/delete" + style="@style/MinusButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/MinusButton" - android:layout_gravity="center_vertical"/> - + android:layout_gravity="center_vertical" /> </LinearLayout> -</org.apg.ui.widget.KeyEditor> + <View + android:id="@+id/separator" + android:layout_width="fill_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + +</org.apg.ui.widget.KeyEditor>
\ No newline at end of file diff --git a/org_apg/res/layout/edit_key_section.xml b/org_apg/res/layout/edit_key_section.xml index d14748d4b..333d0b753 100644 --- a/org_apg/res/layout/edit_key_section.xml +++ b/org_apg/res/layout/edit_key_section.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> +<!-- + Copyright (C) 2010 Thialfihar <thi@thialfihar.org> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,53 +15,43 @@ limitations under the License. --> -<org.apg.ui.widget.SectionView - xmlns:android="http://schemas.android.com/apk/res/android" +<org.apg.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider"/> + android:orientation="vertical" > <LinearLayout android:id="@+id/header" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginLeft="14dip" - android:layout_marginTop="2dip" - android:layout_marginBottom="2dip" - android:orientation="horizontal" - android:gravity="center_vertical" + android:clickable="true" android:focusable="true" - android:clickable="true"> + android:gravity="center_vertical" + android:orientation="horizontal" > <TextView android:id="@+id/title" - android:text="Section Name" + style="@style/SectionHeader" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true" android:ellipsize="marquee" - android:fadingEdge="horizontal"/> + android:fadingEdge="horizontal" + android:singleLine="true" + android:text="Section Name" /> <ImageView + style="@style/PlusButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:duplicateParentState="true" - style="@style/PlusButton"/> - + android:duplicateParentState="true" /> </LinearLayout> <LinearLayout android:id="@+id/editors" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingBottom="6dip" - android:orientation="vertical"/> + android:orientation="vertical" + android:paddingBottom="6dip" /> -</org.apg.ui.widget.SectionView> +</org.apg.ui.widget.SectionView>
\ No newline at end of file diff --git a/org_apg/res/layout/edit_key_user_id_item.xml b/org_apg/res/layout/edit_key_user_id_item.xml index 6e7b552dd..1961cf109 100644 --- a/org_apg/res/layout/edit_key_user_id_item.xml +++ b/org_apg/res/layout/edit_key_user_id_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> +<!-- + Copyright (C) 2010 Thialfihar <thi@thialfihar.org> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,102 +15,93 @@ limitations under the License. --> -<org.apg.ui.widget.UserIdEditor - xmlns:android="http://schemas.android.com/apk/res/android" +<org.apg.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="5dip"> - - <View - android:id="@+id/separator" - android:layout_width="fill_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider"/> + android:orientation="vertical" > <RadioButton android:id="@+id/isMainUserId" - android:text="@string/label_mainUserId" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_marginLeft="20dip"/> + android:layout_height="wrap_content" + android:text="@string/label_mainUserId" /> <LinearLayout - android:layout_height="wrap_content" android:layout_width="fill_parent" - android:orientation="horizontal"> + android:layout_height="wrap_content" + android:orientation="horizontal" > <TableLayout - android:layout_height="wrap_content" android:layout_width="0dip" - android:layout_weight="1" - android:layout_marginLeft="16dip"> + android:layout_height="wrap_content" + android:layout_weight="1" > <TableRow> <TextView android:id="@+id/label_name" - android:text="@string/label_name" - android:layout_gravity="center_vertical" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingRight="5dip"/> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="5dip" + android:text="@string/label_name" /> <EditText android:id="@+id/name" - android:layout_weight="1" - android:layout_height="wrap_content" android:layout_width="fill_parent" - android:inputType="textPersonName|textCapWords"/> - + android:layout_height="wrap_content" + android:layout_weight="1" + android:inputType="textPersonName|textCapWords" /> </TableRow> <TableRow> <TextView android:id="@+id/label_email" - android:text="@string/label_email" - android:layout_gravity="center_vertical" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingRight="5dip"/> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="5dip" + android:text="@string/label_email" /> <EditText android:id="@+id/email" - android:layout_weight="1" - android:layout_height="wrap_content" android:layout_width="fill_parent" - android:inputType="textEmailAddress"/> - + android:layout_height="wrap_content" + android:layout_weight="1" + android:inputType="textEmailAddress" /> </TableRow> <TableRow> <TextView android:id="@+id/label_comment" - android:text="@string/label_comment" - android:layout_gravity="center_vertical" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:paddingRight="5dip"/> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="5dip" + android:text="@string/label_comment" /> <EditText android:id="@+id/comment" - android:layout_weight="1" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_width="fill_parent"/> - + android:layout_weight="1" /> </TableRow> - </TableLayout> <ImageButton android:id="@+id/delete" + style="@style/MinusButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/MinusButton" - android:layout_gravity="center_vertical"/> - + android:layout_gravity="center_vertical" /> </LinearLayout> -</org.apg.ui.widget.UserIdEditor> + <View + android:id="@+id/separator" + android:layout_width="fill_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + +</org.apg.ui.widget.UserIdEditor>
\ No newline at end of file diff --git a/org_apg/res/layout/pass_phrase.xml b/org_apg/res/layout/pass_phrase.xml deleted file mode 100644 index d66ffca07..000000000 --- a/org_apg/res/layout/pass_phrase.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="5dip" - android:paddingRight="5dip"> - - <EditText - android:id="@+id/passPhrase" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:inputType="textPassword"/> - - <EditText - android:id="@+id/passPhraseAgain" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:inputType="textPassword"/> - -</LinearLayout> diff --git a/org_apg/res/layout/passphrase.xml b/org_apg/res/layout/passphrase.xml new file mode 100644 index 000000000..73a085588 --- /dev/null +++ b/org_apg/res/layout/passphrase.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2010 Thialfihar <thi@thialfihar.org> + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:stretchColumns="1" > + + <TableRow> + + <TextView + 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 + android:id="@+id/passphrase_passphrase" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" + android:padding="4dp" /> + </TableRow> + + <TableRow> + + <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_passPhraseAgain" /> + + <EditText + android:id="@+id/passphrase_passphrase_again" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" + android:padding="4dp" /> + </TableRow> + +</TableLayout>
\ No newline at end of file |