reworked keyserver preferences with recyclerview
This commit is contained in:
Adithya Abraham Philip
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_add_white_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_add_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 127 B |
Binary file not shown.
|
After Width: | Height: | Size: 134 B |
BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_add_white_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_add_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 88 B |
Binary file not shown.
|
After Width: | Height: | Size: 101 B |
BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 97 B |
Binary file not shown.
|
After Width: | Height: | Size: 138 B |
BIN
OpenKeychain/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 97 B |
Binary file not shown.
|
After Width: | Height: | Size: 186 B |
BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
Normal file
BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 102 B |
@@ -1,94 +1,37 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout 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_height="match_parent">
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include
|
||||
android:id="@+id/toolbar_include"
|
||||
layout="@layout/toolbar_standalone" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_below="@id/toolbar_include"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:layout_marginLeft="6sp"
|
||||
android:layout_marginRight="6sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="@string/label_keyservers_title"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/text_layout"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||
android:orientation="horizontal">
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="6sp"
|
||||
android:layout_marginRight="6sp"
|
||||
android:layout_marginBottom="6sp"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:text="@string/label_keyserver_settings_hint"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="6sp"
|
||||
android:layout_marginLeft="16sp"
|
||||
android:layout_marginRight="6sp"
|
||||
android:layout_marginTop="6sp"
|
||||
android:layout_weight="1"
|
||||
android:background="@android:drawable/menuitem_background"
|
||||
android:orientation="vertical"
|
||||
android:focusable="true">
|
||||
<View
|
||||
style="@style/Divider"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:focusable="true"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||
<FrameLayout
|
||||
android:id="@+id/keyserver_settings_fragment_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/summary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
</LinearLayout>
|
||||
|
||||
<Button
|
||||
android:id="@+id/rotate"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="31dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="4dip"
|
||||
android:layout_marginRight="6dip"
|
||||
android:text="rotate"
|
||||
android:textColor="#ffffffff"
|
||||
android:textStyle="bold"
|
||||
android:background="@drawable/button_rounded_blue" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/add"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_margin="10dp"
|
||||
android:src="@drawable/plus"
|
||||
android:background="@drawable/button_rounded_green" />
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:id="@+id/separator"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="1dip"
|
||||
android:background="?android:attr/listDivider" />
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/editors"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" />
|
||||
</ScrollView>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/keyserver_recycler_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
46
OpenKeychain/src/main/res/layout/settings_keyserver_item.xml
Normal file
46
OpenKeychain/src/main/res/layout/settings_keyserver_item.xml
Normal file
@@ -0,0 +1,46 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/outer_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?listPreferredItemHeight">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/keyserver_layout"
|
||||
android:padding="6sp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toLeftOf="@+id/drag_handle"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/selected_keyserver_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/label_selected_keyserver_title"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/keyserver_tv"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/drag_handle"
|
||||
android:layout_width="?listPreferredItemHeight"
|
||||
android:layout_height="?listPreferredItemHeight"
|
||||
android:scaleType="center"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:src="@drawable/ic_reorder_grey_500_24dp" />
|
||||
|
||||
<View
|
||||
android:layout_alignParentBottom="true"
|
||||
style="@style/Divider"/>
|
||||
|
||||
</RelativeLayout>
|
||||
10
OpenKeychain/src/main/res/menu/keyserver_pref_menu.xml
Normal file
10
OpenKeychain/src/main/res/menu/keyserver_pref_menu.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_add_keyserver"
|
||||
android:title="@string/menu_search"
|
||||
android:icon="@drawable/ic_add_white_24dp"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -109,6 +109,8 @@
|
||||
<string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string>
|
||||
<string name="menu_export_log">"Export Log"</string>
|
||||
|
||||
<string name="menu_keyserver_add">"Add"</string>
|
||||
|
||||
<!-- label -->
|
||||
<string name="label_message">"Text"</string>
|
||||
<string name="label_file">"File"</string>
|
||||
@@ -153,13 +155,17 @@
|
||||
<string name="label_send_key">"Synchronize with the cloud"</string>
|
||||
<string name="label_fingerprint">"Fingerprint"</string>
|
||||
<string name="expiry_date_dialog_title">"Set expiry date"</string>
|
||||
<string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string>
|
||||
<string name="label_keyservers_title">"Keyservers"</string>
|
||||
<string name="label_keyserver_settings_hint">"Drag to change order, tap to edit/delete"</string>
|
||||
<string name="label_selected_keyserver_title">"Selected keyserver"</string>
|
||||
<string name="label_preferred">"preferred"</string>
|
||||
<string name="label_enable_compression">"Enable compression"</string>
|
||||
<string name="label_encrypt_filenames">"Encrypt filenames"</string>
|
||||
<string name="label_hidden_recipients">"Hide recipients"</string>
|
||||
|
||||
<string name="label_verify_keyserver">"Verify keyserver"</string>
|
||||
<string name="label_enter_keyserver_url">"Enter keyserver URL"</string>
|
||||
<string name="label_keyserver_dialog_delete">"Delete keyserver"</string>
|
||||
|
||||
<string name="pref_keyserver">"OpenPGP keyservers"</string>
|
||||
<string name="pref_keyserver_summary">"Search keys on selected OpenPGP keyservers (HKP protocol)"</string>
|
||||
@@ -672,12 +678,14 @@
|
||||
|
||||
<string name="view_key_fragment_no_system_contact">"<none>"</string>
|
||||
|
||||
<!-- Add keyserver -->
|
||||
<!-- Add/Edit keyserver -->
|
||||
<string name="add_keyserver_dialog_title">"Add keyserver"</string>
|
||||
<string name="edit_keyserver_dialog_title">"Edit keyserver"</string>
|
||||
<string name="add_keyserver_verified">"Keyserver verified!"</string>
|
||||
<string name="add_keyserver_without_verification">"Keyserver added without verification."</string>
|
||||
<string name="add_keyserver_invalid_url">"Invalid URL!"</string>
|
||||
<string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string>
|
||||
<string name="keyserver_deleted">"%s deleted"</string>
|
||||
|
||||
<!-- Navigation Drawer -->
|
||||
<string name="nav_keys">"Keys"</string>
|
||||
|
||||
@@ -26,4 +26,12 @@
|
||||
<item name="android:textColor">@color/white</item>
|
||||
</style>
|
||||
|
||||
<!-- This style is for use with our drag and drop RecyclerView since ItemDecoration did not
|
||||
move with the drag -->
|
||||
<style name="Divider">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">2dp</item>
|
||||
<item name="android:background">?android:attr/listDivider</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user