diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-31 15:24:56 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-31 15:24:56 +0100 |
| commit | 122705c24e04541fbdd015a4e00ef59d0c746fad (patch) | |
| tree | 91986dfa95d8aaf7cd10914b2325ca2c734dc490 /OpenKeychain/src/main/res | |
| parent | 373a3fc3f52bd95fc6b5a57f666d438bdc3c0964 (diff) | |
| download | open-keychain-122705c24e04541fbdd015a4e00ef59d0c746fad.tar.gz open-keychain-122705c24e04541fbdd015a4e00ef59d0c746fad.tar.bz2 open-keychain-122705c24e04541fbdd015a4e00ef59d0c746fad.zip | |
Improve linked identity handling
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_fragment.xml | 30 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/menu/key_view.xml | 5 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
3 files changed, 32 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index 64bfe08b5..aa3a8e8da 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -40,6 +40,14 @@ android:layout_marginBottom="4dp" /> <TextView + android:id="@+id/view_key_linked_ids_empty" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:gravity="center" + android:text="@string/linked_empty" /> + + <TextView android:id="@+id/view_key_linked_ids_expander" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -58,6 +66,28 @@ android:visibility="gone" tools:visibility="visible" /> + <LinearLayout + android:id="@+id/view_key_card_linked_ids_buttons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="left|start" + android:orientation="vertical"> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <Button + android:id="@+id/view_key_card_linked_ids_add" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/menu_linked_add_identity" + android:textColor="@color/card_view_button" /> + + </LinearLayout> + </LinearLayout> </android.support.v7.widget.CardView> diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index cf519d117..88cc0950c 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -36,9 +36,4 @@ android:visible="false" app:showAsAction="never" /> - <item - android:id="@+id/menu_key_view_add_linked_identity" - android:title="@string/menu_linked_add_identity" - app:showAsAction="never" /> - </menu> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index e18884008..6b2f7073b 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1680,7 +1680,8 @@ <string name="linked_error_network">"Network error!"</string> <string name="linked_error_http">"Communication error: %s"</string> <string name="linked_webview_title_github">"GitHub Authorization"</string> - <string name="linked_gist_description">"OpenKeychain API Tests"</string> + <string name="linked_gist_description">"OpenKeychain Linked Identity"</string> + <string name="linked_empty">Link your key to Github, Twitter or other websites!</string> <string name="snack_btn_overwrite">"Overwrite"</string> <string name="backup_code_explanation">"The backup will be secured with a backup code. Write it down before you proceed!"</string> <string name="backup_code_enter">"Please enter the backup code:"</string> |