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

linked: order selection dialog alphabetically

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-01 14:07:04 +02:00
parent 676b393542
commit 19c9fcc2c9
1 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
OpenKeychain/src/main/res/layout/linked_select_fragment.xml
View File

@@ -32,11 +32,6 @@
android:text="@string/linked_select_2" android:text="@string/linked_select_2"
android:layout_weight="1" /> android:layout_weight="1" />
<org.sufficientlysecure.keychain.ui.widget.FixedListView
android:id="@+id/view_key_user_ids"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dip" android:layout_height="1dip"
@@ -44,7 +39,7 @@
android:background="?android:attr/listDivider" /> android:background="?android:attr/listDivider" />
<LinearLayout <LinearLayout
android:id="@+id/linked_create_https_button" android:id="@+id/linked_create_github_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
@@ -53,12 +48,12 @@
<!-- separate ImageView required for recoloring --> <!-- separate ImageView required for recoloring -->
<ImageView <ImageView
android:id="@+id/certify_key_action_certify_image"
android:layout_width="60dip" android:layout_width="60dip"
android:layout_height="60dip" android:layout_height="60dip"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/linked_https" android:src="@drawable/linked_github"
android:layout_gravity="center_vertical" /> android:layout_gravity="center"
/>
<TextView <TextView
android:paddingLeft="8dp" android:paddingLeft="8dp"
@@ -66,7 +61,42 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/linked_title_https" android:text="@string/linked_title_github"
android:layout_weight="1"
android:gravity="center_vertical" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginBottom="4dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:id="@+id/linked_create_twitter_button"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<!-- separate ImageView required for recoloring -->
<ImageView
android:layout_width="60dip"
android:layout_height="60dip"
android:padding="8dp"
android:src="@drawable/linked_twitter"
android:layout_gravity="center"
/>
<TextView
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dip"
android:layout_height="match_parent"
android:text="@string/linked_title_twitter"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" /> android:gravity="center_vertical" />
@@ -116,7 +146,7 @@
android:background="?android:attr/listDivider" /> android:background="?android:attr/listDivider" />
<LinearLayout <LinearLayout
android:id="@+id/linked_create_twitter_button" android:id="@+id/linked_create_https_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true" android:clickable="true"
@@ -125,12 +155,12 @@
<!-- separate ImageView required for recoloring --> <!-- separate ImageView required for recoloring -->
<ImageView <ImageView
android:id="@+id/certify_key_action_certify_image"
android:layout_width="60dip" android:layout_width="60dip"
android:layout_height="60dip" android:layout_height="60dip"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/linked_twitter" android:src="@drawable/linked_https"
android:layout_gravity="center" android:layout_gravity="center_vertical" />
/>
<TextView <TextView
android:paddingLeft="8dp" android:paddingLeft="8dp"
@@ -138,42 +168,7 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/linked_title_twitter" android:text="@string/linked_title_https"
android:layout_weight="1"
android:gravity="center_vertical" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginBottom="4dp"
android:background="?android:attr/listDivider" />
<LinearLayout
android:id="@+id/linked_create_github_button"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<!-- separate ImageView required for recoloring -->
<ImageView
android:layout_width="60dip"
android:layout_height="60dip"
android:padding="8dp"
android:src="@drawable/linked_github"
android:layout_gravity="center"
/>
<TextView
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dip"
android:layout_height="match_parent"
android:text="@string/linked_title_github"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" /> android:gravity="center_vertical" />