diff options
| author | Matthew Wong <wongma@protonmail.ch> | 2015-07-16 03:16:25 -0400 |
|---|---|---|
| committer | Matthew Wong <wongma@protonmail.ch> | 2015-07-16 03:16:25 -0400 |
| commit | 61ae170f6cef761407216dcf545ebb80410ca023 (patch) | |
| tree | 3fee90efdc0a76e6b9ae818d8ed9679ee8b6fdf0 /app/src/main/res | |
| parent | d03ab8ee3c9585e862435b621edd2360232be083 (diff) | |
Make the generated public key viewer a dialog instead of fragment and add a "preference" that opens the dialog.
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/fragment_show_ssh_key.xml | 22 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/xml/preference.xml | 3 |
3 files changed, 6 insertions, 24 deletions
diff --git a/app/src/main/res/layout/fragment_show_ssh_key.xml b/app/src/main/res/layout/fragment_show_ssh_key.xml index 6590a98f..e81ae8c4 100644 --- a/app/src/main/res/layout/fragment_show_ssh_key.xml +++ b/app/src/main/res/layout/fragment_show_ssh_key.xml @@ -24,27 +24,5 @@ android:text="@string/ssh_keygen_tip" android:textAppearance="?android:attr/textAppearanceMedium"/> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:layout_marginRight="16dp" - android:layout_marginTop="8dp" - android:orientation="horizontal"> - - <Button - android:id="@+id/copy_public_key" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ssh_keygen_copy" - android:onClick="copy" /> - - <Button - android:id="@+id/ok_ssh_key" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/dialog_ok"/> - </LinearLayout> - </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e746419d..5f97cf51 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -96,8 +96,9 @@ <string name="pref_git_username_title">Username</string> <string name="pref_git_username_hint">username</string> <string name="pref_edit_server_info">Edit git server settings</string> - <string name="pref_ssh_title">Import ssh-key</string> - <string name="pref_ssh_keygen_title">Generate ssh-key</string> + <string name="pref_ssh_title">Import SSH key</string> + <string name="pref_ssh_keygen_title">Generate SSH key pair</string> + <string name="pref_ssh_see_key_title">View generated public SSH key</string> <string name="pref_git_delete_repo">Delete repository</string> <string name="pref_dialog_delete_title">Clear repository</string> <string name="pref_dialog_delete_msg">Do you want to delete the current password store directory? This will not clear your configuration.</string> diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index e8772616..67217c9d 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -11,6 +11,9 @@ android:key="ssh_keygen" android:title="@string/pref_ssh_keygen_title" /> <Preference + android:key="ssh_see_key" + android:title="@string/pref_ssh_see_key_title" /> + <Preference android:key="git_delete_repo" android:summary="Deletes local repository" android:title="@string/pref_git_delete_repo" /> |