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

use FlexibleAdapter for new KeyChoiceAdapter

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-06-27 19:26:09 +02:00
parent dbc1e5f523
commit 9ea36286dc
7 changed files with 247 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/layout/api_remote_deduplicate.xml
View File

@@ -101,7 +101,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/duplicate_key_list"
tools:listitem="@layout/duplicate_key_item"
tools:listitem="@layout/key_choice_item"
tools:layout_height="100dp"
/>

34
OpenKeychain/src/main/res/layout/duplicate_key_item.xml → OpenKeychain/src/main/res/layout/key_choice_item.xml
View File

@@ -8,30 +8,42 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
android:id="@+id/key_list_item_icon"
tools:tint="@color/md_grey_600"
tools:src="@drawable/apps_k9"
<RadioButton
android:id="@+id/radio_keychoice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:clickable="false"
/>
<CheckBox
android:id="@+id/checkbox_keychoice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
android:clickable="false"
tools:visibility="gone"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:layout_marginStart="12dp"
android:layout_marginLeft="12dp"
>
<TextView
android:id="@+id/key_list_item_name"
android:id="@+id/text_keychoice_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="@string/label_main_user_id"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/key_list_item_creation"
android:id="@+id/text_keychoice_creation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"