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

Improve linked identity handling

Browse Source
This commit is contained in:
Dominik Schürmann
2015-12-31 15:24:56 +01:00
parent 373a3fc3f5
commit 122705c24e
5 changed files with 117 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenKeychain/src/main/res/layout/view_key_fragment.xml
View File

@@ -39,6 +39,14 @@
android:layout_height="wrap_content"
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"
@@ -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>

5
OpenKeychain/src/main/res/menu/key_view.xml
View File

@@ -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>

3
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -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>