diff options
Diffstat (limited to 'org_apg/res/layout')
-rw-r--r-- | org_apg/res/layout/edit_key.xml | 42 | ||||
-rw-r--r-- | org_apg/res/layout/encrypt.xml | 545 | ||||
-rw-r--r-- | org_apg/res/layout/key_list.xml | 26 |
3 files changed, 312 insertions, 301 deletions
diff --git a/org_apg/res/layout/edit_key.xml b/org_apg/res/layout/edit_key.xml index 88be75d86..c93899bdf 100644 --- a/org_apg/res/layout/edit_key.xml +++ b/org_apg/res/layout/edit_key.xml @@ -62,26 +62,26 @@ </ScrollView> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - style="@android:style/ButtonBar"> - - <Button - android:id="@+id/btn_save" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_weight="1" - android:text="@string/btn_save"/> - - <Button - android:id="@+id/btn_discard" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_weight="1" - android:text="@string/btn_doNotSave"/> - - </LinearLayout> +<!-- <LinearLayout --> +<!-- android:layout_width="fill_parent" --> +<!-- android:layout_height="wrap_content" --> +<!-- android:orientation="horizontal" --> +<!-- style="@android:style/ButtonBar"> --> + +<!-- <Button --> +<!-- android:id="@+id/btn_save" --> +<!-- android:layout_width="0dip" --> +<!-- android:layout_height="fill_parent" --> +<!-- android:layout_weight="1" --> +<!-- android:text="@string/btn_save"/> --> + +<!-- <Button --> +<!-- android:id="@+id/btn_discard" --> +<!-- android:layout_width="0dip" --> +<!-- android:layout_height="fill_parent" --> +<!-- android:layout_weight="1" --> +<!-- android:text="@string/btn_doNotSave"/> --> + +<!-- </LinearLayout> --> </LinearLayout> diff --git a/org_apg/res/layout/encrypt.xml b/org_apg/res/layout/encrypt.xml index 0862e4475..0b653a78b 100644 --- a/org_apg/res/layout/encrypt.xml +++ b/org_apg/res/layout/encrypt.xml @@ -1,348 +1,345 @@ <?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" +<!-- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" --> +<!-- android:layout_width="fill_parent" --> +<!-- android:layout_height="fill_parent" --> +<!-- android:orientation="vertical" --> +<!-- android:paddingTop="5dip" > --> + +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" - android:paddingTop="5dip" > + android:layout_margin="10dip" + android:fillViewport="true" > - <ScrollView + <LinearLayout android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - android:fillViewport="true" - android:padding="10dip" > + android:layout_height="fill_parent" + android:orientation="vertical" > <LinearLayout android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_marginLeft="5dip" - android:orientation="vertical" > + android:layout_height="wrap_content" + android:orientation="horizontal" > - <LinearLayout - android:layout_width="fill_parent" + <ImageView + android:id="@+id/sourcePrevious" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_previous" /> + + <TextView + android:id="@+id/sourceLabel" + android:layout_width="0dip" + android:layout_height="fill_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical" + android:text="@string/label_message" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <ImageView + android:id="@+id/sourceNext" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:src="@drawable/ic_next" /> + </LinearLayout> - <ImageView - android:id="@+id/sourcePrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_previous" /> + <ViewFlipper + android:id="@+id/source" + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_weight="1" > - <TextView - android:id="@+id/sourceLabel" - android:layout_width="0dip" + <LinearLayout + android:id="@+id/sourceMessage" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <EditText + android:id="@+id/message" + android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_weight="1" - android:gravity="center_horizontal|center_vertical" - android:text="@string/label_message" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ImageView - android:id="@+id/sourceNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_next" /> + android:gravity="top" + android:inputType="text|textCapSentences|textMultiLine|textLongMessage" /> </LinearLayout> - <ViewFlipper - android:id="@+id/source" + <LinearLayout + android:id="@+id/sourceFile" android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" > + android:layout_height="fill_parent" + android:orientation="vertical" > <LinearLayout - android:id="@+id/sourceMessage" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > + android:layout_height="wrap_content" + android:orientation="horizontal" > <EditText - android:id="@+id/message" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:gravity="top" - android:inputType="text|textCapSentences|textMultiLine|textLongMessage" /> + android:id="@+id/filename" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" /> + + <ImageButton + android:id="@+id/btn_browse" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_launcher_folder_small" /> </LinearLayout> <LinearLayout - android:id="@+id/sourceFile" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > + android:layout_height="wrap_content" + android:orientation="horizontal" > - <LinearLayout - android:layout_width="fill_parent" + <TextView + android:id="@+id/label_fileCompression" + android:layout_width="0dip" android:layout_height="wrap_content" - android:orientation="horizontal" > - - <EditText - android:id="@+id/filename" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" /> - - <ImageButton - android:id="@+id/btn_browse" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_launcher_folder_small" /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:paddingRight="10dip" + android:text="@string/label_fileCompression" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <Spinner + android:id="@+id/fileCompression" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" > - - <TextView - android:id="@+id/label_fileCompression" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:paddingRight="10dip" - android:text="@string/label_fileCompression" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:layout_gravity="center_vertical" /> + </LinearLayout> - <Spinner - android:id="@+id/fileCompression" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> - </LinearLayout> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > - <LinearLayout - android:layout_width="fill_parent" + <TextView + android:id="@+id/label_deleteAfterEncryption" + android:layout_width="0dip" android:layout_height="wrap_content" - android:orientation="horizontal" > - - <TextView - android:id="@+id/label_deleteAfterEncryption" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:paddingRight="10dip" - android:text="@string/label_deleteAfterEncryption" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <CheckBox - android:id="@+id/deleteAfterEncryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> - </LinearLayout> - - <LinearLayout - android:layout_width="fill_parent" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:paddingRight="10dip" + android:text="@string/label_deleteAfterEncryption" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <CheckBox + android:id="@+id/deleteAfterEncryption" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:layout_gravity="center_vertical" /> + </LinearLayout> - <TextView - android:id="@+id/label_asciiArmour" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:paddingRight="10dip" - android:text="@string/label_asciiArmour" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > - <CheckBox - android:id="@+id/asciiArmour" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> - </LinearLayout> + <TextView + android:id="@+id/label_asciiArmour" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:paddingRight="10dip" + android:text="@string/label_asciiArmour" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <CheckBox + android:id="@+id/asciiArmour" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" /> </LinearLayout> - </ViewFlipper> + </LinearLayout> + </ViewFlipper> - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:layout_marginBottom="5dip" - android:background="?android:attr/listDivider" /> + <View + android:layout_width="fill_parent" + android:layout_height="1dip" + android:layout_marginBottom="5dip" + android:background="?android:attr/listDivider" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > - <ImageView - android:id="@+id/modePrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_previous" /> + <ImageView + android:id="@+id/modePrevious" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_previous" /> + + <TextView + android:id="@+id/modeLabel" + android:layout_width="0dip" + android:layout_height="fill_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical" + android:text="@string/label_asymmetric" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <ImageView + android:id="@+id/modeNext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_next" /> + </LinearLayout> - <TextView - android:id="@+id/modeLabel" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_weight="1" - android:gravity="center_horizontal|center_vertical" - android:text="@string/label_asymmetric" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ImageView - android:id="@+id/modeNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_next" /> - </LinearLayout> + <ViewFlipper + android:id="@+id/mode" + android:layout_width="fill_parent" + android:layout_height="wrap_content" > - <ViewFlipper - android:id="@+id/mode" + <LinearLayout + android:id="@+id/modeAsymmetric" android:layout_width="fill_parent" - android:layout_height="wrap_content" > + android:layout_height="wrap_content" + android:orientation="vertical" > <LinearLayout - android:id="@+id/modeAsymmetric" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="horizontal" > - <LinearLayout - android:layout_width="fill_parent" + <TextView + android:id="@+id/label_sign" + android:layout_width="0dip" android:layout_height="wrap_content" - android:orientation="horizontal" > - - <TextView - android:id="@+id/label_sign" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:text="@string/label_sign" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:orientation="vertical" - android:paddingRight="5dip" > - - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:text="Main User Id" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:text="Main User Id Rest" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - - <CheckBox - android:id="@+id/sign" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> - </LinearLayout> + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="@string/label_sign" + android:textAppearance="?android:attr/textAppearanceMedium" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="3dip" > + android:layout_gravity="center_vertical" + android:orientation="vertical" + android:paddingRight="5dip" > <TextView - android:id="@+id/label_selectPublicKeys" - android:layout_width="0dip" + android:id="@+id/mainUserId" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:text="@string/label_selectPublicKeys" + android:layout_gravity="right" + android:text="Main User Id" android:textAppearance="?android:attr/textAppearanceMedium" /> - <Button - android:id="@+id/btn_selectEncryptKeys" + <TextView + android:id="@+id/mainUserIdRest" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/btn_selectEncryptKeys" /> + android:layout_gravity="right" + android:text="Main User Id Rest" + android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> + + <CheckBox + android:id="@+id/sign" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" /> </LinearLayout> - <TableLayout - android:id="@+id/modeSymmetric" + <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:stretchColumns="1" > + android:orientation="horizontal" + android:paddingBottom="3dip" > - <TableRow> + <TextView + android:id="@+id/label_selectPublicKeys" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="@string/label_selectPublicKeys" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <Button + android:id="@+id/btn_selectEncryptKeys" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/btn_selectEncryptKeys" /> + </LinearLayout> + </LinearLayout> - <TextView - android:id="@+id/label_passPhrase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_passPhrase" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <TableLayout + android:id="@+id/modeSymmetric" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:stretchColumns="1" > - <EditText - android:id="@+id/passPhrase" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" /> - </TableRow> + <TableRow> - <TableRow> + <TextView + android:id="@+id/label_passPhrase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_passPhrase" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView - android:id="@+id/label_passPhraseAgain" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_passPhraseAgain" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <EditText + android:id="@+id/passPhrase" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" /> + </TableRow> - <EditText - android:id="@+id/passPhraseAgain" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" /> - </TableRow> - </TableLayout> - </ViewFlipper> + <TableRow> - <View - android:layout_width="fill_parent" - android:layout_height="1dip" - android:layout_marginBottom="5dip" - android:background="?android:attr/listDivider" /> - </LinearLayout> - </ScrollView> + <TextView + android:id="@+id/label_passPhraseAgain" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_passPhraseAgain" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <LinearLayout - style="@android:style/ButtonBar" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <Button - android:id="@+id/btn_encryptToClipboard" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_weight="1" - android:text="@string/btn_encryptToClipboard" /> - - <Button - android:id="@+id/btn_encrypt" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_weight="1" - android:text="@string/btn_encrypt" /> + <EditText + android:id="@+id/passPhraseAgain" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" /> + </TableRow> + </TableLayout> + </ViewFlipper> + + <View + android:layout_width="fill_parent" + android:layout_height="1dip" + android:layout_marginBottom="5dip" + android:background="?android:attr/listDivider" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</ScrollView> <!-- <LinearLayout --> +<!-- style="@android:style/ButtonBar" --> +<!-- android:layout_width="fill_parent" --> +<!-- android:layout_height="wrap_content" --> +<!-- android:orientation="horizontal" > --> + +<!-- <Button --> +<!-- android:id="@+id/btn_encryptToClipboard" --> +<!-- android:layout_width="0dip" --> +<!-- android:layout_height="fill_parent" --> +<!-- android:layout_weight="1" --> +<!-- android:text="@string/btn_encryptToClipboard" /> --> + +<!-- <Button --> +<!-- android:id="@+id/btn_encrypt" --> +<!-- android:layout_width="0dip" --> +<!-- android:layout_height="fill_parent" --> +<!-- android:layout_weight="1" --> +<!-- android:text="@string/btn_encrypt" /> --> +<!-- </LinearLayout> --> + +<!-- </LinearLayout> --> diff --git a/org_apg/res/layout/key_list.xml b/org_apg/res/layout/key_list.xml index ac07801ab..ef43632e6 100644 --- a/org_apg/res/layout/key_list.xml +++ b/org_apg/res/layout/key_list.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,18 +15,31 @@ limitations under the License. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical"> + android:orientation="vertical" > - <include android:id="@+id/layout_filter" layout="@layout/filter_info"/> + <include + android:id="@+id/layout_filter" + layout="@layout/filter_info" /> <ExpandableListView android:id="@+id/list" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:isScrollContainer="true"/> + android:layout_weight="1" + android:isScrollContainer="true" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="90dp" + android:layout_weight="1" + android:background="@drawable/abs__ab_bottom_solid_light_holo" + android:paddingBottom="3dp" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:paddingTop="3dp" + android:text="@string/listInformation" /> </LinearLayout>
\ No newline at end of file |