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

use MaterialChipsInput for encryption recipients

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-06-27 23:51:16 +02:00
parent 387ec6ed96
commit febe9cbe92
6 changed files with 97 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
View File

@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingRight="16dp"
android:paddingLeft="16dp">
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:layout_margin="0dp">
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:background="?android:attr/editTextBackground">
<ViewAnimator
android:layout_width="wrap_content"
@@ -21,9 +22,9 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:paddingBottom="12dp"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out">
android:outAnimation="@anim/fade_out"
>
<ImageView
android:layout_width="wrap_content"
@@ -37,23 +38,33 @@
</ViewAnimator>
<org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
<com.pchmn.materialchips.ChipsInput
android:id="@+id/recipient_list"
android:layout_width="match_parent"
android:hint="@string/label_to"
android:minHeight="56dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
app:hint="@string/label_to"
app:chip_hasAvatarIcon="false"
app:maxRows="2"
app:chip_detailed_backgroundColor="@color/colorChipViewBackground"
/>
</LinearLayout>
<FrameLayout
android:id="@+id/anchor_dropdown_encrypt"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:padding="0dp"
android:layout_margin="0dp">
android:background="?android:attr/editTextBackground">
<ViewAnimator
android:layout_width="wrap_content"
@@ -81,19 +92,18 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp"
android:layout_margin="0dp"
style="@android:style/Widget.EditText">
android:layout_height="wrap_content">
<TextView
android:paddingLeft="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/md_black_1000"
android:text="@string/label_asymmetric_from"
android:paddingRight="8dp"/>
android:paddingLeft="8dp"
android:paddingRight="8dp"
/>
<org.sufficientlysecure.keychain.ui.widget.KeySpinner
android:id="@+id/sign_key_spinner"