From 2d1a9f7a44154035b5a47b0a9843c365dadcb62c Mon Sep 17 00:00:00 2001
From: shanavas <shanavas.m2@gmail.com>
Date: Thu, 27 Apr 2017 19:12:50 +0300
Subject: Make git username and email configurable (#289)

* Gather git config data and save in preferences

* Align text box properly

* Apply git configs from settings

* Validate email address
---
 app/src/main/res/layout/activity_git_config.xml | 94 +++++++++++++++++++++++++
 app/src/main/res/values/strings.xml             | 14 +++-
 app/src/main/res/xml/preference.xml             |  3 +
 3 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/layout/activity_git_config.xml

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

diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml
new file mode 100644
index 00000000..2955809b
--- /dev/null
+++ b/app/src/main/res/layout/activity_git_config.xml
@@ -0,0 +1,94 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.zeapo.pwdstore.git.GitActivity"
+    android:background="@android:color/white">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/git_config"
+            android:textStyle="bold"
+            style="@android:style/TextAppearance.Large"
+            android:gravity="left"
+            android:paddingBottom="6dp"
+            android:textColor="@color/blue_grey_500"
+            android:background="@drawable/bottom_line"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/git_user_name"
+                android:id="@+id/label_git_user_name"
+                android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
+                android:paddingBottom="8dp"
+                android:layout_alignParentStart="true" />
+
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/git_user_name_hint"
+                android:id="@+id/git_user_name"
+                android:layout_marginLeft="8dp"
+                android:layout_toEndOf="@+id/label_git_user_name"
+                android:layout_toRightOf="@+id/label_git_user_name"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:inputType="textWebEmailAddress"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/git_user_email"
+                android:id="@+id/label_git_user_email"
+                android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
+                android:paddingBottom="8dp"
+                android:layout_alignParentStart="true" />
+
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/git_user_email_hint"
+                android:id="@+id/git_user_email"
+                android:layout_marginLeft="35dp"
+                android:layout_toEndOf="@+id/label_git_user_email"
+                android:layout_toRightOf="@+id/label_git_user_email"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:inputType="textWebEmailAddress"/>
+        </RelativeLayout>
+
+        <Button
+            android:id="@+id/save_button"
+            android:text="Save"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:onClick="applyGitConfigs"/>
+    </LinearLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1bc6d9cc..a02c1b76 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,7 +13,8 @@
     <string name="dialog_delete">Delete directory</string>
     <string name="dialog_do_not_delete">Cancel</string>
     <string name="title_activity_git_clone">Repository information</string>
-    
+    <string name="title_activity_git_config">Git Configurations</string>
+
     <!-- Password Store -->
     <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or any synchronization operation.</string>
 	<string name="store_git">/store/.git</string>
@@ -55,7 +56,7 @@
     <string name="passphrase_dialog_title">Authenticate</string>
     <string name="passphrase_dialog_text">Please provide the passphrase for your SSH key. Leave it empty if there is no passphrase.</string>
     <string name="password_dialog_text">Please provide the password for this repository</string>
-    
+
     <!-- Clone fragment -->
     <string name="clone_fragment_text">Welcome to Password Store\n\n In this screen you can either create a new repository or clone your git repository onto your device.</string>
     <string name="clone">Clone from server</string>
@@ -78,6 +79,14 @@
 
     <string name="warn_malformed_url_port">When using custom ports, provide an absolute path (starts with "/")</string>
 
+    <!-- Git Config fragment -->
+    <string name="git_config">Git config</string>
+    <string name="git_user_name">Username</string>
+    <string name="git_user_name_hint">User name</string>
+    <string name="git_user_email">Email</string>
+    <string name="git_user_email_hint">email</string>
+    <string name="invalid_email_dialog_text">Please enter a valid email address</string>
+
     <!-- PGP Handler -->
     <string name="title_activity_pgp_handler">PgpHandler</string>
     <string name="crypto_name_hint">name</string>
@@ -97,6 +106,7 @@
     <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_edit_git_config">Edit git config</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>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 0471e71d..67c33f8c 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -4,6 +4,9 @@
         <Preference
             android:key="git_server_info"
             android:title="@string/pref_edit_server_info" />
+        <Preference
+            android:key="git_config"
+            android:title="@string/pref_edit_git_config" />
         <Preference
             android:key="ssh_key"
             android:title="@string/pref_ssh_title" />
-- 
cgit v1.2.3