cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on new Import activity

Browse Source
This commit is contained in:
Dominik Schürmann
2013-09-19 02:02:51 +02:00
parent 4c461c1b44
commit 3c4cb1c2d3
20 changed files with 655 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenPGP-Keychain/res/layout/file_dialog.xml
View File

@@ -31,13 +31,20 @@
android:id="@+id/input"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"
android:gravity="top|left"
android:inputType="textMultiLine|textUri"
android:lines="2"
android:maxLines="6"
android:minLines="2"
android:scrollbars="vertical" />
<ImageButton
android:id="@+id/btn_browse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:contentDescription="@string/filemanager_titleOpen"
android:src="@drawable/ic_menu_filebrowser" />
</LinearLayout>

56
OpenPGP-Keychain/res/layout/import_keys.xml
View File

@@ -4,8 +4,17 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true" >
<FrameLayout
android:id="@+id/import_navigation_fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:paddingLeft="4dp"
android:paddingRight="4dp" />
<LinearLayout
android:id="@+id/import_from_qr_code_footer"
android:id="@+id/import_footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
@@ -14,50 +23,29 @@
android:paddingRight="10dp" >
<Button
android:id="@+id/import_from_qr_code_import"
android:id="@+id/import_import"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="importOnClick"
android:text="@string/import_from_qr_code_import" />
android:text="@string/import_import" />
<Button
android:id="@+id/import_from_qr_code_import_sign_and_upload"
android:id="@+id/import_sign_and_upload"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="signAndUploadOnClick"
android:text="@string/import_from_qr_code_import_sign_and_upload" />
<Button
android:id="@+id/import_from_qr_code_finish"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="finishOnClick"
android:text="@string/import_from_qr_code_finish" />
android:text="@string/import_sign_and_upload" />
</LinearLayout>
<ScrollView
<FrameLayout
android:id="@+id/import_keys_list_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/import_from_qr_code_footer"
android:fillViewport="true" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="12dp"
android:paddingRight="12dp" >
<LinearLayout
android:id="@+id/import_keys_list_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="vertical"
android:paddingLeft="4dp"
android:paddingRight="4dp" >
</LinearLayout>
</LinearLayout>
</ScrollView>
android:layout_above="@+id/import_footer"
android:layout_alignParentLeft="true"
android:layout_below="@+id/import_navigation_fragment"
android:orientation="vertical"
android:paddingLeft="4dp"
android:paddingRight="4dp" />
</RelativeLayout>

27
OpenPGP-Keychain/res/layout/import_keys_file_fragment.xml Normal file
View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<EditText
android:id="@+id/import_keys_file_input"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="top|left"
android:inputType="textMultiLine|textUri"
android:lines="2"
android:maxLines="6"
android:minLines="2"
android:scrollbars="vertical" />
<ImageButton
android:id="@+id/import_keys_file_browse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:contentDescription="@string/filemanager_titleOpen"
android:src="@drawable/ic_menu_filebrowser" />
</LinearLayout>

8
OpenPGP-Keychain/res/layout/import_keys_keyserver_fragment.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
</LinearLayout>

13
OpenPGP-Keychain/res/layout/import_keys_nfc_fragment.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:id="@+id/import_nfc_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/menu_importFromNfc" />
</LinearLayout>

13
OpenPGP-Keychain/res/layout/import_keys_qr_code_fragment.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<Button
android:id="@+id/import_qrcode_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/menu_importFromQrCode" />
</LinearLayout>

7
OpenPGP-Keychain/res/values/arrays.xml
View File

@@ -49,4 +49,11 @@
<item>@string/key_size_2048</item>
<item>@string/key_size_4096</item>
</string-array>
<string-array name="import_action_list">
<item>@string/menu_importFromFile</item>
<item>@string/menu_keyServer</item>
<item>@string/menu_importFromQrCode</item>
<item>@string/menu_importFromNfc</item>
</string-array>
</resources>

8
OpenPGP-Keychain/res/values/strings.xml
View File

@@ -346,10 +346,10 @@
<string name="help_tab_about">About</string>
<string name="help_about_version">Version:</string>
<!-- Import from QR Code -->
<string name="import_from_qr_code_import">Import key(s) (only locally)</string>
<string name="import_from_qr_code_import_sign_and_upload">Import, Sign, and upload key(s)</string>
<string name="import_from_qr_code_finish">Finish</string>
<!-- Import -->
<string name="import_import">Import key(s) (only locally)</string>
<string name="import_sign_and_upload">Import, Sign, and upload key(s)</string>
<string name="import_finish">Finish</string>
<!-- Intent labels -->
<string name="intent_decrypt_file">OpenPGP: Decrypt File</string>