From 42f1abfa76f06ee6d0a0e3bd5cc13b4afb1922a4 Mon Sep 17 00:00:00 2001
From: Zeapo <mohamed@zenadi.com>
Date: Fri, 8 Aug 2014 18:46:35 +0100
Subject: more refactoring and ability to pull from server

---
 app/src/main/res/layout/activity_git_clone.xml | 2 +-
 app/src/main/res/menu/git_clone.xml            | 2 +-
 app/src/main/res/menu/pwdstore.xml             | 7 ++++++-
 app/src/main/res/xml/preference.xml            | 6 ++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'app/src/main/res')

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
-- 
cgit v1.2.3