From ec3f770a374b58da73826c03285fa047697d0b71 Mon Sep 17 00:00:00 2001
From: Kundan Kumar <34396777+guy34code@users.noreply.github.com>
Date: Tue, 26 Mar 2019 23:00:27 +0530
Subject: [PATCH 1/7] Update activity_main.xml

---
 app/src/main/res/layout/activity_main.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index de7dd6f..0498c1d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,11 +31,13 @@
         android:id="@+id/files"
         android:layout_width="@dimen/margin_178dp"
         android:layout_height="@dimen/margin_205dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="@dimen/margin_32dp"
         android:layout_marginEnd="@dimen/margin_16dp"
         android:contentDescription="@string/files"
         android:onClick="startFiles"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/camera"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:srcCompat="@drawable/folder" />
 
@@ -56,12 +58,13 @@
         android:id="@+id/rcvdImages"
         android:layout_width="@dimen/margin_178dp"
         android:layout_height="@dimen/margin_205dp"
-        android:layout_marginBottom="@dimen/margin_8dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="@dimen/margin_32dp"
         android:layout_marginEnd="@dimen/margin_16dp"
         android:contentDescription="@string/received_images"
         android:onClick="seeRcvdPhotos"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/friends"
         app:layout_constraintTop_toBottomOf="@+id/files_label"
         app:srcCompat="@drawable/images_icon" />
 

From 7c904b32a40a2bf2022fe6fc3d4f6f5b4189c4e4 Mon Sep 17 00:00:00 2001
From: Kundan Kumar <34396777+guy34code@users.noreply.github.com>
Date: Wed, 27 Mar 2019 19:13:03 +0530
Subject: [PATCH 2/7] Use @dimen/margin_8dp instead

---
 app/src/main/res/layout/activity_main.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0498c1d..9ae1113 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,7 +31,7 @@
         android:id="@+id/files"
         android:layout_width="@dimen/margin_178dp"
         android:layout_height="@dimen/margin_205dp"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="@dimen/margin_8dp"
         android:layout_marginTop="@dimen/margin_32dp"
         android:layout_marginEnd="@dimen/margin_16dp"
         android:contentDescription="@string/files"
@@ -58,7 +58,7 @@
         android:id="@+id/rcvdImages"
         android:layout_width="@dimen/margin_178dp"
         android:layout_height="@dimen/margin_205dp"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="@dimen/margin_8dp"
         android:layout_marginTop="@dimen/margin_32dp"
         android:layout_marginEnd="@dimen/margin_16dp"
         android:contentDescription="@string/received_images"

From 63c6fb23b21c2dbefcca096d24b4859fe7db7864 Mon Sep 17 00:00:00 2001
From: Kundan Kumar <34396777+guy34code@users.noreply.github.com>
Date: Thu, 28 Mar 2019 01:58:14 +0530
Subject: [PATCH 3/7] Redefined "Register" under settings activity tab

---
 app/src/main/res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba0aaab..53ffdb3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="app_name">npChat</string>
     <string name="scan">Scan</string>
     <string name="action_settings">Settings</string>
-    <string name="register">Register</string>
+
     <string name="publish">Publish</string>
     <string name="advertise">Advertise</string>
     <string name="cancel">Cancel</string>
@@ -42,6 +42,7 @@
 
     <!--settings activity-->
     <string name="change_photo">Change Photo</string>
+    <string name="register">Register</string>
 
     <!--sign up activity-->
     <string name="email_label">Email:</string>

From eff5375710d856bd508567117414ef760a42992e Mon Sep 17 00:00:00 2001
From: Kundan Kumar <34396777+guy34code@users.noreply.github.com>
Date: Thu, 28 Mar 2019 01:59:18 +0530
Subject: [PATCH 4/7] Added Register Button

---
 app/src/main/res/layout/activity_settings.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 0def1b0..7980592 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -40,4 +40,19 @@
         app:layout_constraintTop_toBottomOf="@id/profilePhoto"
         />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+    <Button
+        android:id="@+id/register"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rounded_button"
+        android:onClick="register"
+        android:layout_marginTop="@dimen/margin_10dp"
+        android:text="@string/register"
+        android:padding="@dimen/margin_10dp"
+        android:textColor="@color/white"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/changePhotoButton"
+        />
+
+</android.support.constraint.ConstraintLayout>

From ce223ed3389cf9b3659ee60a2780083512676dc1 Mon Sep 17 00:00:00 2001
From: Kundan Kumar <34396777+guy34code@users.noreply.github.com>
Date: Thu, 28 Mar 2019 02:00:52 +0530
Subject: [PATCH 5/7] Added Register Button under Settings

---
 .../main/java/memphis/myapplication/SettingsActivity.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/memphis/myapplication/SettingsActivity.java b/app/src/main/java/memphis/myapplication/SettingsActivity.java
index a9a375d..44e3131 100644
--- a/app/src/main/java/memphis/myapplication/SettingsActivity.java
+++ b/app/src/main/java/memphis/myapplication/SettingsActivity.java
@@ -50,6 +50,13 @@ public void changePhoto(View view) {
         startActivityForResult(intent, PICK_PHOTO);
     }
 
+    // register
+    public void register(View view) {
+        // open up photos directory
+        Intent i = new Intent(this,LoginActivity.class);
+        startActivity(i);
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode,
                                  Intent resultData) {

From 745cf9230951b6e30e41fe221711e537a75c7374 Mon Sep 17 00:00:00 2001
From: Kundan Kumar <34396777+guy34code@users.noreply.github.com>
Date: Thu, 28 Mar 2019 02:14:17 +0530
Subject: [PATCH 6/7] Delete strings.xml

---
 app/src/main/res/values/strings.xml | 52 -----------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 app/src/main/res/values/strings.xml

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
deleted file mode 100644
index 53ffdb3..0000000
--- a/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<resources>
-
-    <string name="app_name">npChat</string>
-    <string name="scan">Scan</string>
-    <string name="action_settings">Settings</string>
-
-    <string name="publish">Publish</string>
-    <string name="advertise">Advertise</string>
-    <string name="cancel">Cancel</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-    <string name="share_photo">Share Photo?</string>
-    <string name="send_photo">Send Photo</string>
-    <string name="camera">Camera</string>
-    <string name="received_images">See Photos</string>
-    <string name="friends">Friends</string>
-    <string name="files">Files</string>
-    <string name="friends_title">Friends</string>
-    <string name="no_friends">You currently haven\'t added any friends.</string>
-
-    <!--add friend activity-->
-    <string name="display_qr">Display QR</string>
-    <string name="scan_qr">Scan QR</string>
-    <string name="view_friends">View Friends</string>
-
-    <!--file activity-->
-    <string name="share_files">Share Files</string>
-    <string name="scan_file_qr">Scan File QR</string>
-    <string name="display_file_qr">Display File QR</string>
-    <string name="browse_rcvd">Browse RCVD</string>
-
-    <!--login activity-->
-    <string name="login_btn">Register</string>
-    <string name="username_label">Username:</string>
-    <string name="password_label">Password:</string>
-
-    <!--qr exchange activity-->
-    <string name="qr_me">QR Me</string>
-
-    <!--select recepient activity-->
-    <string name="send">Send</string>
-
-    <!--settings activity-->
-    <string name="change_photo">Change Photo</string>
-    <string name="register">Register</string>
-
-    <!--sign up activity-->
-    <string name="email_label">Email:</string>
-    <string name="confirm_password_label">Confirm\nPassword:</string>
-    <string name="submit">Submit</string>
-    <string name="no_photos">No Photos</string>
-</resources>

From 882c5bcc963396581db69e88d8fec51bea361c43 Mon Sep 17 00:00:00 2001
From: Kundan Kumar <34396777+guy34code@users.noreply.github.com>
Date: Thu, 28 Mar 2019 02:20:54 +0530
Subject: [PATCH 7/7] Create strings.xml

---
 app/src/main/res/values/strings.xml | 52 +++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 app/src/main/res/values/strings.xml

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..53ffdb3
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,52 @@
+<resources>
+
+    <string name="app_name">npChat</string>
+    <string name="scan">Scan</string>
+    <string name="action_settings">Settings</string>
+
+    <string name="publish">Publish</string>
+    <string name="advertise">Advertise</string>
+    <string name="cancel">Cancel</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="share_photo">Share Photo?</string>
+    <string name="send_photo">Send Photo</string>
+    <string name="camera">Camera</string>
+    <string name="received_images">See Photos</string>
+    <string name="friends">Friends</string>
+    <string name="files">Files</string>
+    <string name="friends_title">Friends</string>
+    <string name="no_friends">You currently haven\'t added any friends.</string>
+
+    <!--add friend activity-->
+    <string name="display_qr">Display QR</string>
+    <string name="scan_qr">Scan QR</string>
+    <string name="view_friends">View Friends</string>
+
+    <!--file activity-->
+    <string name="share_files">Share Files</string>
+    <string name="scan_file_qr">Scan File QR</string>
+    <string name="display_file_qr">Display File QR</string>
+    <string name="browse_rcvd">Browse RCVD</string>
+
+    <!--login activity-->
+    <string name="login_btn">Register</string>
+    <string name="username_label">Username:</string>
+    <string name="password_label">Password:</string>
+
+    <!--qr exchange activity-->
+    <string name="qr_me">QR Me</string>
+
+    <!--select recepient activity-->
+    <string name="send">Send</string>
+
+    <!--settings activity-->
+    <string name="change_photo">Change Photo</string>
+    <string name="register">Register</string>
+
+    <!--sign up activity-->
+    <string name="email_label">Email:</string>
+    <string name="confirm_password_label">Confirm\nPassword:</string>
+    <string name="submit">Submit</string>
+    <string name="no_photos">No Photos</string>
+</resources>