diff options
| author | Zeapo <mohamed@zenadi.com> | 2014-08-08 18:46:35 +0100 |
|---|---|---|
| committer | Zeapo <mohamed@zenadi.com> | 2014-08-08 18:46:35 +0100 |
| commit | 42f1abfa76f06ee6d0a0e3bd5cc13b4afb1922a4 (patch) | |
| tree | e52d5f06b8ce3107c3accdb1321cbba34b026166 /app/src/main/res | |
| parent | 9db42440fb61f7e3b18f36532117f2247392dfe1 (diff) | |
more refactoring and ability to pull from server
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/menu/git_clone.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/menu/pwdstore.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/xml/preference.xml | 6 |
4 files changed, 14 insertions, 3 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index 8c0a3336..d4ccbc8a 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -6,7 +6,7 @@ android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" - tools:context="com.zeapo.pwdstore.GitClone"> + tools:context="com.zeapo.pwdstore.GitHandler"> <LinearLayout android:orientation="vertical" diff --git a/app/src/main/res/menu/git_clone.xml b/app/src/main/res/menu/git_clone.xml index 2227d87d..88a18d2c 100644 --- a/app/src/main/res/menu/git_clone.xml +++ b/app/src/main/res/menu/git_clone.xml @@ -1,6 +1,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - tools:context="com.zeapo.pwdstore.GitClone" > + tools:context="com.zeapo.pwdstore.GitHandler" > <item android:id="@+id/action_settings" android:title="@string/action_settings" android:orderInCategory="100" diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml index 0458ace5..facca6c4 100644 --- a/app/src/main/res/menu/pwdstore.xml +++ b/app/src/main/res/menu/pwdstore.xml @@ -7,8 +7,13 @@ <!--<item android:id="@+id/menu_add_category"--> <!--android:title="New category"/>--> + <item android:id="@+id/git_pull" + android:title="Pull from remote"/> + <item android:id="@+id/git_push" + android:title="Push to remote"/> + <item android:id="@+id/referesh" - android:title="Refresh" + android:title="Refresh list" android:showAsAction="ifRoom" android:icon="@android:drawable/ic_popup_sync"/> diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index d73dd5ec..45497dbe 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <PreferenceCategory android:title="Git"> + <EditTextPreference android:title="Server" + android:key="git_remote_server"/> + <EditTextPreference android:title="Username" + android:key="git_remote_username"/> + </PreferenceCategory> <PreferenceCategory android:title="Crypto"> <org.openintents.openpgp.util.OpenPgpListPreference |