diff options
| author | zeapo <mohamed@zenadi.com> | 2014-12-04 21:43:27 +0100 |
|---|---|---|
| committer | zeapo <mohamed@zenadi.com> | 2014-12-04 21:43:27 +0100 |
| commit | d98a30ee4828eff9b1b8c28ca917322b502ac08c (patch) | |
| tree | c72d9cbd2de773579498af1c287ed87c577edbe6 /app/src/main/res | |
| parent | 173248e1bb96fd971027ac8a36fdc7e12825fe23 (diff) | |
Add the possibility to edit git server information
Also uses jgit 3.6
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/xml/preference.xml | 10 |
3 files changed, 9 insertions, 10 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index f26d6f8d..de3f0b0e 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -205,6 +205,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:onClick="cloneRepository"/> + <Button + android:id="@+id/save_button" + android:text="Save" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="saveConfiguration"/> </LinearLayout> </ScrollView> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05b8bbd4..5f0db2a8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -93,7 +93,8 @@ <string name="pref_remote_hint">path/to/repository</string> <string name="pref_git_username_title">Username</string> <string name="pref_git_username_hint">username</string> - <string name="pref_ssh_title">SSH Key</string> + <string name="pref_edit_server_info">Edit git server settings</string> + <string name="pref_ssh_title">Import ssh-key</string> <string name="pref_crypto_title">Crypto</string> <string name="pref_provider_title">Select OpenPGP Provider!</string> <string name="pref_provider_account_title">Set your OpenPGP account</string> diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index 7fe39daa..848a10ad 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -1,15 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:title="@string/pref_git_title"> - <EditTextPreference android:title= "@string/pref_server_title" - android:key="git_remote_server" android:hint="@string/pref_server_hint" - android:inputType="textUri" /> - <EditTextPreference android:title="@string/pref_remote_title" - android:key="git_remote_location" android:hint="@string/pref_remote_hint" - android:inputType="textUri" /> - <EditTextPreference android:title="@string/pref_git_username_title" - android:key="git_remote_username" android:hint="@string/pref_git_username_hint" - android:inputType="textPersonName" /> + <Preference android:title="@string/pref_edit_server_info" android:key="git_server_info"/> <Preference android:title="@string/pref_ssh_title" android:key="ssh_key" /> </PreferenceCategory> |