From 771d8a9415831b5d6fe9cebf574fbf7e5eacd373 Mon Sep 17 00:00:00 2001
From: Mohamed Zenadi <mohamed@zenadi.com>
Date: Sun, 19 Apr 2015 20:27:30 +0200
Subject: Add a Sync command that calls Pull then Push

Fixes #78
---
 app/src/main/res/menu/main_menu.xml    | 36 ++++++++++++++++++++++++++++++++++
 app/src/main/res/menu/pwdstore.xml     | 34 --------------------------------
 app/src/main/res/values-cs/strings.xml |  3 +++
 app/src/main/res/values/strings.xml    |  3 +++
 4 files changed, 42 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/res/menu/main_menu.xml
 delete mode 100644 app/src/main/res/menu/pwdstore.xml

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

diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
new file mode 100644
index 00000000..6f391460
--- /dev/null
+++ b/app/src/main/res/menu/main_menu.xml
@@ -0,0 +1,36 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:pwstore="http://schemas.android.com/apk/res-auto"
+    tools:context=".pwdstore" >
+
+    <item android:id="@+id/action_search"
+          android:title="@string/action_search"
+          android:icon="@drawable/ic_action_search"
+          pwstore:showAsAction="ifRoom|collapseActionView"
+          pwstore:actionViewClass="android.support.v7.widget.SearchView" />
+
+    <item android:id="@+id/menu_add_password"
+        android:icon="@drawable/ic_action_new"
+        pwstore:showAsAction="ifRoom"
+        android:title="New password"/>
+
+    <!--<item android:id="@+id/menu_add_category"-->
+        <!--android:title="New category"/>-->
+
+    <item android:id="@+id/git_sync"
+        android:title="@string/git_sync"/>
+    <item android:id="@+id/git_pull"
+        android:title="@string/git_pull"/>
+    <item android:id="@+id/git_push"
+        android:title="@string/git_push"/>
+
+    <item android:id="@+id/refresh"
+        android:title="Refresh list"
+        pwstore:showAsAction="never"
+        android:icon="@drawable/ic_action_refresh"/>
+
+    <item android:id="@+id/user_pref"
+        android:title="Settings"
+        android:orderInCategory="100"/>
+</menu>
+
diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
deleted file mode 100644
index 220bd49b..00000000
--- a/app/src/main/res/menu/pwdstore.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:pwstore="http://schemas.android.com/apk/res-auto"
-    tools:context=".pwdstore" >
-
-    <item android:id="@+id/action_search"
-          android:title="@string/action_search"
-          android:icon="@drawable/ic_action_search"
-          pwstore:showAsAction="ifRoom|collapseActionView"
-          pwstore:actionViewClass="android.support.v7.widget.SearchView" />
-
-    <item android:id="@+id/menu_add_password"
-        android:icon="@drawable/ic_action_new"
-        pwstore:showAsAction="ifRoom"
-        android:title="New password"/>
-
-    <!--<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/refresh"
-        android:title="Refresh list"
-        pwstore:showAsAction="never"
-        android:icon="@drawable/ic_action_refresh"/>
-
-    <item android:id="@+id/user_pref"
-        android:title="Settings"
-        android:orderInCategory="100"/>
-</menu>
-
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index c1dc6ae0..f789b8a9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -121,5 +121,8 @@
     <string name="dialog_negative">Ne... později</string>
     <string name="dialog_oops">Ajaj...</string>
     <string name="dialog_cancel">Zrušit</string>
+    <string name="git_sync">Syncronize repository</string>
+    <string name="git_pull">Pull from remote</string>
+    <string name="git_push">Push to remote</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8cf8d140..b6793849 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -122,5 +122,8 @@
     <string name="dialog_negative">Nah... later</string>
     <string name="dialog_oops">Oops...</string>
     <string name="dialog_cancel">Cancel</string>
+    <string name="git_sync">Syncronize repository</string>
+    <string name="git_pull">Pull from remote</string>
+    <string name="git_push">Push to remote</string>
 
 </resources>
-- 
cgit v1.2.3