From 4ac2efa36d1a80c3b697bdca26da38b56906e81a Mon Sep 17 00:00:00 2001
From: gr1nd3lw4ld <gr1nd3lw4ld07@gmail.com>
Date: Wed, 26 Jul 2023 23:24:11 +0530
Subject: [PATCH 1/5] updated gitignore

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8c42b28..5cbb1a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ captures/
 .idea/dictionaries
 .idea/libraries
 .idea/caches
-
+.idea
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.
 #*.jks
@@ -60,3 +60,6 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 fastlane/readme.md
+.gitignore
+
+visionppi/.idea

From 31f4b37dc7d7f3ca2868c4d92488b4e7179517c5 Mon Sep 17 00:00:00 2001
From: gr1nd3lw4ld <gr1nd3lw4ld07@gmail.com>
Date: Wed, 26 Jul 2023 23:39:43 +0530
Subject: [PATCH 2/5] added data augmentation techniques

---
 DataCollection/GenerateImages.py | 316 +++++++++++++++++++++++++++++++
 1 file changed, 316 insertions(+)

diff --git a/DataCollection/GenerateImages.py b/DataCollection/GenerateImages.py
index 9490164..b0fb864 100644
--- a/DataCollection/GenerateImages.py
+++ b/DataCollection/GenerateImages.py
@@ -11,6 +11,8 @@
 import random
 import glob
 import cv2
+from scipy.ndimage.interpolation import map_coordinates
+from scipy.ndimage.filters import gaussian_filter
 
 # Helper function to generate a mask for parallel light method
 def generate_parallel_light_mask(mask_size,
@@ -122,6 +124,74 @@ def _decay_value_radically_norm(x, centers, max_value, min_value, dev):
     
     return x_value
 
+def add_shadow(image, darkness_factor=0.5, x_offset=25, y_offset=25):
+    # Convert image to grayscale
+    gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
+    # Apply a binary threshold to create a mask of the image
+    ret, mask = cv2.threshold(gray, 0, 255, cv2.THRESH_BINARY_INV+cv2.THRESH_OTSU)
+    # Blur the mask to create a softer shadow effect
+    mask_blur = cv2.GaussianBlur(mask, (21, 21), 0)
+    # Create a copy of the original image and apply the mask to it
+    shadow = np.copy(image)
+    shadow[mask_blur>0] = (shadow[mask_blur>0]*darkness_factor).astype(np.uint8)
+    # Shift the shadow image by the specified x and y offsets
+    M = np.float32([[1, 0, x_offset], [0, 1, y_offset]])
+    shadow = cv2.warpAffine(shadow, M, (image.shape[1], image.shape[0]))
+    # Combine the original image and the shadow image using a bitwise OR operation
+    result = cv2.bitwise_or(image, shadow)
+    return result
+
+def add_glare(image, brightness_factor=0.5, x_offset=25, y_offset=25):
+    # Create a copy of the original image
+    glare = np.copy(image)
+    # Set the pixels in the top left corner of the image to white
+    glare[:100, :100, :] = [255, 255, 255]
+    # Blend the glare image with the original image using the specified brightness factor
+    glare = cv2.addWeighted(image, 1 - brightness_factor, glare, brightness_factor, 0)
+    # Shift the glare image by the specified x and y offsets
+    M = np.float32([[1, 0, x_offset], [0, 1, y_offset]])
+    glare = cv2.warpAffine(glare, M, (image.shape[1], image.shape[0]))
+    # Combine the original image and the glare image using a bitwise OR operation
+    result = cv2.bitwise_or(image, glare)
+    return result
+
+def add_fog(image, brightness=50, density=0.5):
+    # Convert the image to grayscale
+    gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
+    # Generate a mask with random noise
+    mask = np.zeros_like(gray)
+    h, w = mask.shape[:2]
+    noise = cv2.randu(mask, 0, 255)
+    mask = cv2.GaussianBlur(mask, (51, 51), 0)
+    mask = cv2.threshold(mask, 240, 255, cv2.THRESH_BINARY)[1]
+    # Blend the mask with the original image
+    mask = cv2.cvtColor(mask, cv2.COLOR_GRAY2BGR)
+    mask = np.float32(mask) / 255.0
+    result = ((1.0 - density) * image + density * (brightness * mask))
+    result = np.clip(result, 0, 255)
+    result = np.uint8(result)
+    return result
+
+def add_speckle_noise(image, mean=0, std=50):
+    # Generate random noise
+    h, w, c = image.shape
+    noise = np.random.normal(mean, std, size=(h, w, c))
+    # Add noise to the image
+    noisy_image = image + image * noise / 255.0
+    noisy_image = np.clip(noisy_image, 0, 255).astype(np.uint8)
+    return noisy_image
+
+def apply_local_distortion(image, distortion_intensity=0.5):
+    # Generate random noise with the same shape as the image
+    noise = np.random.normal(scale=distortion_intensity, size=image.shape)
+    # Add the noise to the image
+    distorted_image = image + noise
+    # Clip the pixel values to [0, 255] range
+    distorted_image = np.clip(distorted_image, 0, 255)
+    # Convert the image to uint8 format
+    distorted_image = distorted_image.astype(np.uint8)
+    return distorted_image
+
 # Allowing users to give input as command line arguments
 ap = argparse.ArgumentParser()
 
@@ -406,3 +476,249 @@ def _decay_value_radically_norm(x, centers, max_value, min_value, dev):
     savePath = output + str(i) + ".png"
     i += 1
     cv2.imwrite(savePath, frame)
+
+    # Augmentation by scaling images
+    height, width = image.shape[:2]
+    
+    # Scale the image by a factor of 0.5
+    scale = 0.5
+    resized = cv2.resize(image, (int(width*scale), int(height*scale)))
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, resized)
+
+    # Scale the image by a factor of 1.5
+    scale = 1.5
+    resized = cv2.resize(image, (int(width*scale), int(height*scale)))
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, resized)
+    
+    # Scale the image by a factor of 2
+    scale = 2
+    resized = cv2.resize(image, (int(width*scale), int(height*scale)))
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, resized)
+
+    # Augmentation by color channel swapping
+    # Swap Red and Blue channels
+    swapped = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, swapped)
+
+    # Swap Green and Blue channels
+    swapped = image[:, :, ::-1]
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, swapped)
+
+    # Swap Red and Green channels
+    swapped = image[:, ::-1, :]
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, swapped)
+
+    # Augmentation by adding random noise and blurring
+    # Add Gaussian noise to the image
+    mean = 0
+    variance = 50
+    noise = np.random.normal(mean, variance, image.shape)
+    noisy_image = np.clip(image + noise, 0, 255).astype(np.uint8)
+
+    # Apply Gaussian blur to the noisy image
+    ksize = (5, 5)
+    sigmaX = 5
+    blurred = cv2.GaussianBlur(noisy_image, ksize, sigmaX)
+
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, blurred)
+
+    # Add Salt-and-Pepper noise to the image
+    s_vs_p = 0.5
+    amount = 0.05
+    noisy_image = image.copy()
+    # Salt mode
+    num_salt = np.ceil(amount * image.size * s_vs_p)
+    coords = [np.random.randint(0, i - 1, int(num_salt)) for i in image.shape]
+    noisy_image[coords] = 255
+
+    # Pepper mode
+    num_pepper = np.ceil(amount * image.size * (1. - s_vs_p))
+    coords = [np.random.randint(0, i - 1, int(num_pepper)) for i in image.shape]
+    noisy_image[coords] = 0
+
+    # Apply Median blur to the noisy image
+    ksize = 5
+    blurred = cv2.medianBlur(noisy_image, ksize)
+
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, blurred)
+
+    # Augmentation by randomly rotating and zooming
+    # Randomly rotate the image by a random angle between -10 and 10 degrees
+    angle = np.random.uniform(-10, 10)
+    rotated = ndimage.rotate(image, angle, reshape=False)
+
+    # Randomly zoom the rotated image by a random factor between 0.9 and 1.1
+    zoom_factor = np.random.uniform(0.9, 1.1)
+    zoomed = ndimage.zoom(rotated, zoom_factor)
+
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, zoomed)
+
+        # Augmentation by randomly dropping color channels
+    channels = cv2.split(image)
+    num_channels = len(channels)
+
+    # Randomly drop one or more color channels
+    num_dropped = np.random.randint(1, num_channels + 1)
+    dropped_channels = np.random.choice(num_channels, num_dropped, replace=False)
+    for j in dropped_channels:
+        channels[j][:] = 0
+
+    # Merge the remaining channels
+    merged = cv2.merge(channels)
+
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, merged)
+
+    # Augmentation by cutout with random erasing
+    height, width, channels = image.shape
+
+    # Define the size and position of the cutout
+    cutout_size = int(min(height, width) * 0.2) # Cutout size is 20% of the smaller dimension
+    cutout_x = np.random.randint(0, width - cutout_size + 1)
+    cutout_y = np.random.randint(0, height - cutout_size + 1)
+
+    # Apply cutout to the image
+    cutout_image = np.copy(image)
+    cutout_image[cutout_y:cutout_y+cutout_size, cutout_x:cutout_x+cutout_size, :] = 0
+
+    # Define the size and position of the random erasing
+    erase_size = int(min(height, width) * 0.1) # Erase size is 10% of the smaller dimension
+    erase_x = np.random.randint(0, width - erase_size + 1)
+    erase_y = np.random.randint(0, height - erase_size + 1)
+
+    # Apply random erasing to the image
+    erase_image = np.copy(cutout_image)
+    erase_image[erase_y:erase_y+erase_size, erase_x:erase_x+erase_size, :] = np.random.randint(0, 256, (erase_size, erase_size, channels))
+
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, erase_image)
+
+    # Augmentation by geometric transformations
+    height, width, channels = image.shape
+
+    # Skew transformation
+    skew_x = np.random.randint(-int(width * 0.1), int(width * 0.1))
+    skew_y = np.random.randint(-int(height * 0.1), int(height * 0.1))
+    pts1 = np.float32([[0, 0], [width, 0], [0, height], [width, height]])
+    pts2 = np.float32([[0, 0], [width, 0], [skew_x, height+skew_y], [width+skew_x, height+skew_y]])
+    M = cv2.getPerspectiveTransform(pts1, pts2)
+    skew_image = cv2.warpPerspective(image, M, (width, height))
+
+    # Stretch transformation
+    stretch_x = np.random.uniform(0.8, 1.2)
+    stretch_y = np.random.uniform(0.8, 1.2)
+    stretch_image = cv2.resize(image, (int(width*stretch_x), int(height*stretch_y)))
+
+    # Twist transformation
+    twist_x = np.random.randint(-int(width * 0.1), int(width * 0.1))
+    twist_y = np.random.randint(-int(height * 0.1), int(height * 0.1))
+    M = cv2.getRotationMatrix2D((width/2, height/2), 15, 1)
+    M[0][2] += twist_x
+    M[1][2] += twist_y
+    twist_image = cv2.warpAffine(image, M, (width, height))
+
+    # Save the transformed images
+    savePath = output + str(i) + "_skew.png"
+    cv2.imwrite(savePath, skew_image)
+    i += 1
+    savePath = output + str(i) + "_stretch.png"
+    cv2.imwrite(savePath, stretch_image)
+    i += 1
+    savePath = output + str(i) + "_twist.png"
+    cv2.imwrite(savePath, twist_image)
+    i += 1
+
+    # Augmentation by local pixelization
+    height, width, channels = image.shape
+    pixel_size = int(min(height, width) * 0.1) # Size of each pixel is 10% of the smaller dimension
+    for y in range(0, height, pixel_size):
+        for x in range(0, width, pixel_size):
+            image[y:y+pixel_size, x:x+pixel_size, :] = np.mean(image[y:y+pixel_size, x:x+pixel_size, :], axis=(0,1), keepdims=True)
+
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, image)
+
+    
+    # Shadow Effect
+    shadow_image = add_shadow(image, darkness_factor=0.7, x_offset=50, y_offset=50)
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, shadow_image)
+
+    # Glare Effect
+    glare_image = add_glare(image, brightness_factor=0.7, x_offset=50, y_offset=50)
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, glare_image)
+
+    # Fog Effect
+    fog_image = add_fog(image, brightness=80, density=0.6)
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, fog_image)
+
+    # Speckle Noise
+    noisy_image = add_speckle_noise(image, mean=0, std=50)
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, noisy_image)
+
+    # Local Distortion
+    distorted_image  = apply_local_distortion(image, distortion_intensity=0.5)
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, distorted_image)
+
+    # Applying the Patch Gaussian augmentation
+    augmented_image = image.copy()
+    rows, cols, channels = augmented_image.shape
+    for _ in range(5):
+        # Generate random patch
+        patch_size = np.random.randint(20, 50)
+        x = np.random.randint(0, cols - patch_size)
+        y = np.random.randint(0, rows - patch_size)
+        patch = augmented_image[y:y+patch_size, x:x+patch_size].copy()
+
+        # Apply Gaussian blur to patch
+        patch = cv2.GaussianBlur(patch, (15, 15), 0)
+
+        # Blend patch into original image
+        alpha = np.random.uniform(0.3, 0.7)
+        augmented_image[y:y+patch_size, x:x+patch_size] = cv2.addWeighted(patch, alpha, augmented_image[y:y+patch_size, x:x+patch_size], 1-alpha, 0)
+    
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, augmented_image)
+
+    # Perspective cropping
+    height, width = image.shape[:2]
+    pts1 = np.float32([[0, 0], [width, 0], [0, height], [width, height]])
+    pt1 = 0.15*width
+    pt2 = 0.85*width
+    pts2 = np.float32([[pt1, 0], [pt2, 0], [0, height], [width, height]])
+    M = cv2.getPerspectiveTransform(pts1, pts2)
+    perspective = cv2.warpPerspective(image, M, (width, height))
+    savePath = output + str(i) + ".png"
+    i += 1
+    cv2.imwrite(savePath, perspective)
\ No newline at end of file

From 47ac0b77623978b91c82c7cc9c64176f2de526e3 Mon Sep 17 00:00:00 2001
From: gr1nd3lw4ld <gr1nd3lw4ld07@gmail.com>
Date: Wed, 26 Jul 2023 23:46:02 +0530
Subject: [PATCH 3/5] new ui

---
 visionppi/.idea/gradle.xml                    |   2 +-
 visionppi/.idea/misc.xml                      |  21 ++
 visionppi/app/build.gradle                    |  39 ++-
 visionppi/app/src/main/AndroidManifest.xml    |  19 +-
 .../java/org/mifos/visionppi/MainActivity.kt  |   8 +-
 .../java/org/mifos/visionppi/VisionPPI.kt     |   6 +-
 .../visionppi/adapters/ClientSearchAdapter.kt |  19 +-
 .../adapters/ObjectDetectionResultAdapter.kt  |  15 +-
 .../visionppi/adapters/QuestionAdapter.kt     |  14 +-
 .../visionppi/adapters/ResponseAdapter.kt     |  13 +-
 .../adapters/SelectedImageAdapter.kt          |  14 +-
 .../java/org/mifos/visionppi/models/User.kt   |   4 +-
 .../visionppi/models/mifoserror/Errors.kt     |  25 +-
 .../org/mifos/visionppi/objects/Client.kt     |  35 +-
 .../org/mifos/visionppi/ui/AboutActivity.kt   |   6 +-
 .../visionppi/ui/activities/LoginActivity.kt  |  24 +-
 .../client_profile/ClientProfileActivity.kt   |  37 +--
 .../computer_vision/ComputerVisionActivity.kt |  39 ++-
 .../mifos/visionppi/ui/home/MainActivity.kt   |  34 +-
 .../mifos/visionppi/ui/menu/MenuActivity.kt   | 108 ++++++
 .../mifos/visionppi/ui/menu/MenuMVPView.kt    |   8 +
 .../mifos/visionppi/ui/menu/MenuPresenter.kt  |  21 ++
 .../ui/new_survey/NewSurveyActivity.kt        |  21 +-
 .../ui/new_survey/PPIQuestionFragment.kt      |  22 +-
 .../ui/user_profile/UserProfileActivity.kt    |  53 ++-
 .../java/org/mifos/visionppi/utils/AuthKey.kt |   1 +
 .../java/org/mifos/visionppi/utils/Network.kt |   2 +-
 .../res/drawable/ic_baseline_analytics_24.xml |   5 +
 .../main/res/drawable/ic_baseline_menu_24.xml |   5 +
 .../res/drawable/ic_baseline_search_24.xml    |   5 +
 .../src/main/res/layout/activity_about.xml    |   4 +-
 .../src/main/res/layout/activity_login.xml    |   3 +-
 .../app/src/main/res/layout/activity_main.xml |  27 ++
 .../src/main/res/layout/activity_main2.xml    |   6 +-
 .../app/src/main/res/layout/activity_menu.xml | 307 ++++++++++++++++++
 .../main/res/layout/activity_new_survey.xml   |   1 +
 .../res/layout/activity_ppi_view_pager.xml    |   4 +-
 .../main/res/layout/activity_user_profile.xml |  38 ++-
 .../src/main/res/layout/image_grid_layout.xml |   3 +-
 .../main/res/layout/new_survey_toolbar.xml    |   1 +
 .../src/main/res/layout/ppi_response_row.xml  |   3 +-
 .../app/src/main/res/menu/bottom_nav_menu.xml |  13 +-
 .../main/res/navigation/mobile_navigation.xml |  12 +-
 visionppi/app/src/main/res/values/strings.xml |   3 +
 visionppi/build.gradle                        |   9 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 46 files changed, 844 insertions(+), 217 deletions(-)
 create mode 100644 visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt
 create mode 100644 visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt
 create mode 100644 visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt
 create mode 100644 visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml
 create mode 100644 visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml
 create mode 100644 visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml
 create mode 100644 visionppi/app/src/main/res/layout/activity_main.xml
 create mode 100644 visionppi/app/src/main/res/layout/activity_menu.xml

diff --git a/visionppi/.idea/gradle.xml b/visionppi/.idea/gradle.xml
index 3a6d748..6e5389e 100644
--- a/visionppi/.idea/gradle.xml
+++ b/visionppi/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/visionppi/.idea/misc.xml b/visionppi/.idea/misc.xml
index 568f17d..33453f4 100644
--- a/visionppi/.idea/misc.xml
+++ b/visionppi/.idea/misc.xml
@@ -3,6 +3,27 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_about.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_client_profile.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_computer_vision.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_login.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_main.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_main2.xml" value="0.264" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_menu.xml" value="0.176" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_new_survey.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_user_profile.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/client_search_row.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/content_main.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/image_grid_layout.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/new_survey_toolbar.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/object_detection_result.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/ppi_question_layout.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/ppi_response_row.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/toolbar.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/menu/bottom_nav_menu.xml" value="0.25" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/menu/bottom_nav_menu2.xml" value="0.24895833333333334" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/menu/options_menu.xml" value="0.25" />
         <entry key="..\:/Users/DELL/Desktop/from github/visionppi/app/src/main/res/layout/activity_about.xml" value="0.1" />
         <entry key="..\:/Users/DELL/Desktop/from github/visionppi/app/src/main/res/layout/activity_login.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_main2.xml" value="0.22395833333333334" />
diff --git a/visionppi/app/build.gradle b/visionppi/app/build.gradle
index 5698bbf..7286b13 100644
--- a/visionppi/app/build.gradle
+++ b/visionppi/app/build.gradle
@@ -1,21 +1,22 @@
 plugins {
     id "com.diffplug.spotless" version "5.1.2"
+    id 'com.android.application'
+    id 'com.google.firebase.crashlytics'
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-parcelize'
+apply plugin: "org.jetbrains.kotlin.kapt"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "org.mifos.visionppi"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         ndkVersion '21.1.6352462'
@@ -40,10 +41,6 @@ android {
         abortOnError false
     }
 
-    androidExtensions {
-        experimental = true
-    }
-
     dataBinding {
         enabled = true
     }
@@ -54,6 +51,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        viewBinding = true
+    }
 }
 
 spotless {
@@ -71,17 +71,25 @@ spotless {
 }
 
 dependencies {
+    // Import the BoM for the Firebase platform
+    implementation platform('com.google.firebase:firebase-bom:32.1.0')
 
+    // Add the dependencies for the Crashlytics and Analytics libraries
+    // When using the BoM, you don't specify versions in Firebase library dependencies
+    implementation 'com.google.firebase:firebase-crashlytics-ktx'
+    implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'androidx.navigation:navigation-fragment:2.1.0'
     implementation 'androidx.navigation:navigation-ui:2.1.0'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    implementation 'com.google.firebase:firebase-analytics:17.5.0'
     def lifecycle_version = "2.2.0"
     def kotlin_version="1.3.72"
-
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
@@ -125,9 +133,6 @@ dependencies {
     //Butter Knife
     implementation "com.jakewharton:butterknife:8.0.1"
     kapt "com.jakewharton:butterknife-compiler:8.0.1"
-    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
-        transitive = true
-    }
 
     implementation "org.jetbrains.anko:anko-commons:0.10.0"
 
@@ -154,3 +159,7 @@ dependencies {
 
 
 }
+
+kapt {
+    correctErrorTypes true
+}
\ No newline at end of file
diff --git a/visionppi/app/src/main/AndroidManifest.xml b/visionppi/app/src/main/AndroidManifest.xml
index c8a3a1d..675fc71 100644
--- a/visionppi/app/src/main/AndroidManifest.xml
+++ b/visionppi/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/title_activity_main"/>
         <activity
             android:name=".ui.activities.LoginActivity"
             android:configChanges="orientation|screenSize"
@@ -31,13 +31,14 @@
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.computer_vision.ComputerVisionActivity"
-            android:label="Computer Vision"></activity>
+            android:label="Computer Vision"/>
         <activity
             android:name=".ui.AboutActivity"
             android:label="@string/about"/>
         <activity
             android:name=".ui.activities.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -47,15 +48,21 @@
         <activity
             android:name=".ui.client_profile.ClientProfileActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".ui.new_survey.NewSurveyActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".ui.new_survey.NewPPISurveyActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar"/>
+
+        <activity
+            android:name=".ui.user_profile.UserProfileActivity"
+            android:label="User Profile"
+            android:theme="@style/AppTheme.NoActionBar"/>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt
index 5954b2f..7500b6f 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt
@@ -11,18 +11,20 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import kotlinx.android.synthetic.main.toolbar.*
+//import kotlinx.android.synthetic.main.toolbar.*
 import org.mifos.visionppi.api.local.PreferencesHelper
+import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.ui.AboutActivity
 import org.mifos.visionppi.ui.activities.LoginActivity
 import org.mifos.visionppi.utils.PrefManager
 
 class MainActivity : AppCompatActivity() {
-
+    private lateinit var binding: ToolbarBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ToolbarBinding.inflate(layoutInflater)
         setContentView(R.layout.activity_main2)
-        setSupportActionBar(appToolbar)
+        setSupportActionBar(binding.appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "OK"
         val navView: BottomNavigationView = findViewById(R.id.nav_view)
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt b/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt
index 75883e6..bf9e1d9 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDex
 import androidx.multidex.MultiDexApplication
-import com.crashlytics.android.Crashlytics
-import io.fabric.sdk.android.Fabric
+//import com.crashlytics.android.Crashlytics
+//import io.fabric.sdk.android.Fabric
 import java.util.Locale
 import org.mifos.visionppi.injection.component.ApplicationComponent
 import org.mifos.visionppi.injection.component.DaggerApplicationComponent
@@ -36,7 +36,7 @@ class VisionPPI : MultiDexApplication() {
     override fun onCreate() {
         super.onCreate()
         MultiDex.install(this)
-        Fabric.with(this, Crashlytics())
+//        Fabric.with(this, Crashlytics())
         instance = this
     }
 
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt
index d433606..4277c1d 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt
@@ -1,24 +1,20 @@
 package org.mifos.visionppi.adapters
 
 import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.client_search_row.view.client_account_no
-import kotlinx.android.synthetic.main.client_search_row.view.client_name
-import kotlinx.android.synthetic.main.client_search_row.view.client_search_row
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ClientSearchRowBinding
 import org.mifos.visionppi.objects.Client
+import android.view.LayoutInflater
 
 /**
  * Created by Apoorva M K on 01/07/19.
  */
 
 class ClientSearchAdapter(var clientList: List<Client>, var context: Context, private val listener: (Client) -> Unit) : RecyclerView.Adapter<ViewHolder>() {
-
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.clientName?.text = clientList[position].entityName
         holder.clientAccountNo?.text = "#".plus(clientList[position].entityAccountNo)
@@ -26,7 +22,8 @@ class ClientSearchAdapter(var clientList: List<Client>, var context: Context, pr
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(LayoutInflater.from(context).inflate(R.layout.client_search_row, parent, false))
+        val binding = ClientSearchRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding)
     }
 
     override fun getItemCount(): Int {
@@ -34,10 +31,10 @@ class ClientSearchAdapter(var clientList: List<Client>, var context: Context, pr
     }
 }
 
-class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-    val clientName: TextView? = view.client_name
-    val clientAccountNo: TextView? = view.client_account_no
-    private val linearLayout: LinearLayout? = view.client_search_row
+class ViewHolder(val binding: ClientSearchRowBinding) : RecyclerView.ViewHolder(binding.root) {
+    val clientName: TextView? = binding.clientName
+    val clientAccountNo: TextView? =  binding.clientAccountNo
+    private val linearLayout: LinearLayout? = binding.clientSearchRow
 
     fun setItem(item: Client, listener: (Client) -> Unit) {
         linearLayout?.setOnClickListener { listener(item) }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt
index dd1ab68..3ee4fa1 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt
@@ -3,14 +3,12 @@ package org.mifos.visionppi.adapters
 import android.content.Context
 import android.graphics.Bitmap
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.object_detection_result.view.imageObject
-import kotlinx.android.synthetic.main.object_detection_result.view.item1
-import org.mifos.visionppi.R
+
+import org.mifos.visionppi.databinding.ObjectDetectionResultBinding
 
 class ObjectDetectionResultAdapter(var result: List<List<String>>, var images: ArrayList<Bitmap?>, var context: Context) : RecyclerView.Adapter<ResultViewHolder>() {
 
@@ -23,7 +21,8 @@ class ObjectDetectionResultAdapter(var result: List<List<String>>, var images: A
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResultViewHolder {
-        return ResultViewHolder(LayoutInflater.from(context).inflate(R.layout.object_detection_result, parent, false))
+        val binding = ObjectDetectionResultBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ResultViewHolder(binding)
     }
 
     override fun getItemCount(): Int {
@@ -31,7 +30,7 @@ class ObjectDetectionResultAdapter(var result: List<List<String>>, var images: A
     }
 }
 
-class ResultViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-    val image: ImageView? = view.imageObject
-    val res1: TextView? = view.item1
+class ResultViewHolder(val binding: ObjectDetectionResultBinding) : RecyclerView.ViewHolder(binding.root) {
+    val image: ImageView? = binding.imageObject
+    val res1: TextView? = binding.item1
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt
index 2c823e0..62c4c40 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt
@@ -2,14 +2,11 @@ package org.mifos.visionppi.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.ppi_question_layout.view.question
-import kotlinx.android.synthetic.main.ppi_question_layout.view.responses
-import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.PpiQuestionLayoutBinding
 import org.mifos.visionppi.objects.Question
 import org.mifos.visionppi.objects.Response
 
@@ -22,7 +19,8 @@ class QuestionAdapter(var questionList: List<Question>, var context: Context, pr
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QuestionViewHolder {
-        return QuestionViewHolder(LayoutInflater.from(context).inflate(R.layout.ppi_question_layout, parent, false))
+        val binding = PpiQuestionLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return QuestionViewHolder(binding)
     }
 
     override fun getItemCount(): Int {
@@ -30,8 +28,8 @@ class QuestionAdapter(var questionList: List<Question>, var context: Context, pr
     }
 }
 
-class QuestionViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+class QuestionViewHolder(val binding: PpiQuestionLayoutBinding) : RecyclerView.ViewHolder(binding.root) {
 
-    val question: TextView? = view.question
-    val responseRecyclerView: RecyclerView? = view.responses
+    val question: TextView? = binding.question
+    val responseRecyclerView: RecyclerView? = binding.responses
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt
index 1d065cb..606d5cf 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt
@@ -2,19 +2,18 @@ package org.mifos.visionppi.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.ppi_response_row.view.response_btn
-import kotlinx.android.synthetic.main.ppi_response_row.view.response_score
+import org.mifos.visionppi.databinding.PpiResponseRowBinding
 import org.mifos.visionppi.objects.Response
 
 class ResponseAdapter(var responseList: List<Response>, var context: Context, private val responseClicked: (response: Response) -> Unit) : RecyclerView.Adapter<ResponseAdapter.ResponseViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResponseViewHolder {
-        return ResponseViewHolder(LayoutInflater.from(context).inflate(org.mifos.visionppi.R.layout.ppi_response_row, parent, false))
+        val binding = PpiResponseRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ResponseViewHolder(binding)
     }
 
     override fun getItemCount(): Int {
@@ -28,9 +27,9 @@ class ResponseAdapter(var responseList: List<Response>, var context: Context, pr
         holder.setItem(position, responseClicked)
     }
 
-    inner class ResponseViewHolder(var view: View) : RecyclerView.ViewHolder(view) {
-        var responseButton: RadioButton? = view.response_btn
-        var responseScore: TextView? = view.response_score
+    inner class ResponseViewHolder(val binding: PpiResponseRowBinding) : RecyclerView.ViewHolder(binding.root) {
+        var responseButton: RadioButton? = binding.responseBtn
+        var responseScore: TextView? = binding.responseScore
 
         fun setItem(position: Int, responseClicked: (response: Response) -> Unit) {
             responseButton?.setOnClickListener {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt
index cb3a01b..45e1a97 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt
@@ -3,19 +3,17 @@ package org.mifos.visionppi.adapters
 import android.content.Context
 import android.graphics.Bitmap
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.image_grid_layout.view.remove_button
-import kotlinx.android.synthetic.main.image_grid_layout.view.selected_image
-import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ImageGridLayoutBinding
 
 class SelectedImageAdapter(private val items: ArrayList<Bitmap?>, val context: Context, val removeImage: (position: Int) -> Unit) : RecyclerView.Adapter<SelectedImageAdapter.SelectedImageViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SelectedImageViewHolder {
-        return SelectedImageViewHolder(LayoutInflater.from(context).inflate(R.layout.image_grid_layout, parent, false))
+        val binding = ImageGridLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return SelectedImageViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: SelectedImageViewHolder, position: Int) {
@@ -27,9 +25,9 @@ class SelectedImageAdapter(private val items: ArrayList<Bitmap?>, val context: C
         return items.size
     }
 
-    inner class SelectedImageViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val selectedImageImageview: ImageView? = view.selected_image
-        private val removeButton: ImageButton? = view.remove_button
+    inner class SelectedImageViewHolder(val binding: ImageGridLayoutBinding) : RecyclerView.ViewHolder(binding.root) {
+        val selectedImageImageview: ImageView? = binding.selectedImage
+        private val removeButton: ImageButton? = binding.removeButton
         fun setItem(position: Int) {
             removeButton?.setOnClickListener { removeImage(position) }
         }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt b/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt
index c751835..433c364 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt
@@ -9,7 +9,9 @@ import org.mifos.visionppi.objects.Role
  */
 
 data class User(
-
+    var firstName: String,
+    var middleName: String,
+    var lastName: String,
     var userId: Long = 0,
     var isAuthenticated: Boolean = false,
     var username: String? = null,
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt b/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt
index 3ac1424..0c2ddcf 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt
@@ -1,7 +1,9 @@
 package org.mifos.visionppi.models.mifoserror
 
+import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parceler
 
 /**
  * @author HARSH-nith
@@ -14,4 +16,25 @@ data class Errors(
     var defaultUserMessage: String? = null,
     var userMessageGlobalisationCode: String? = null,
     var parameterName: String? = null
-) : Parcelable
+) : Parcelable {
+    constructor(parcel: Parcel) : this(
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString()) {
+    }
+
+    companion object : Parceler<Errors> {
+
+        override fun Errors.write(parcel: Parcel, flags: Int) {
+            parcel.writeString(developerMessage)
+            parcel.writeString(defaultUserMessage)
+            parcel.writeString(userMessageGlobalisationCode)
+            parcel.writeString(parameterName)
+        }
+
+        override fun create(parcel: Parcel): Errors {
+            return Errors(parcel)
+        }
+    }
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt b/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt
index e042313..6381b59 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt
@@ -1,7 +1,9 @@
 package org.mifos.visionppi.objects
 
+import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parceler
 
 /**
  * Created by Apoorva M K on 29/06/19.
@@ -19,4 +21,35 @@ data class Client constructor(
     var parentName: String?,
     var entityMobileNo: String?,
     var entityStatus: Status?
-) : Parcelable
+) : Parcelable {
+    constructor(parcel: Parcel) : this(
+            parcel.readValue(Int::class.java.classLoader) as? Int,
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readValue(Int::class.java.classLoader) as? Int,
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readParcelable(Status::class.java.classLoader)) {
+    }
+
+    companion object : Parceler<Client> {
+
+        override fun Client.write(parcel: Parcel, flags: Int) {
+            parcel.writeValue(entityId)
+            parcel.writeString(entityAccountNo)
+            parcel.writeString(entityExternalId)
+            parcel.writeString(entityName)
+            parcel.writeString(entityType)
+            parcel.writeValue(parentId)
+            parcel.writeString(parentName)
+            parcel.writeString(entityMobileNo)
+            parcel.writeParcelable(entityStatus, flags)
+        }
+
+        override fun create(parcel: Parcel): Client {
+            return Client(parcel)
+        }
+    }
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt
index 8457446..22a3a3c 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt
@@ -6,20 +6,22 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.android.synthetic.main.toolbar.*
 import org.mifos.visionppi.MainActivity
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ToolbarBinding
 
 class AboutActivity : AppCompatActivity() {
     var contributors = "https://github.com/openMF/ppi-vision/graphs/contributors"
     var gitHub = "https://github.com/openMF/ppi-vision"
     var twitter = "https://twitter.com/mifos"
     var license = "https://github.com/openMF/ppi-vision/blob/master/LICENSE"
+    private lateinit var binding: ToolbarBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ToolbarBinding.inflate(layoutInflater)
         setContentView(R.layout.activity_about)
 
-        setSupportActionBar(appToolbar)
+        setSupportActionBar(binding.appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "About Us"
 
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt
index 5f09457..c1abcd0 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt
@@ -8,10 +8,12 @@ import android.widget.Toast
 import butterknife.BindView
 import butterknife.ButterKnife
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.activity_login.til_password
-import kotlinx.android.synthetic.main.activity_login.til_username
+//import kotlinx.android.synthetic.main.activity_login.til_password
+//import kotlinx.android.synthetic.main.activity_login.til_username
 import org.mifos.visionppi.MainActivity
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ActivityLoginBinding
+import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.presenters.LoginPresenter
 import org.mifos.visionppi.ui.activities.base.BaseActivity
 import org.mifos.visionppi.ui.views.LoginView
@@ -32,11 +34,13 @@ class LoginActivity : BaseActivity(), LoginView {
     var llLogin: LinearLayout? = null
 
     private var userName: String? = null
-
+    private lateinit var binding: ActivityLoginBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ActivityLoginBinding.inflate(layoutInflater)
         activityComponent!!.inject(this)
-        setContentView(R.layout.activity_login)
+        val view = binding.root
+        setContentView(view)
         ButterKnife.bind(this)
         loginPresenter!!.attachView(this)
     }
@@ -80,27 +84,27 @@ class LoginActivity : BaseActivity(), LoginView {
     }
 
     override fun showUsernameError(error: String?) {
-        til_username.error = error
+        binding.tilUsername.error = error
     }
 
     override fun showPasswordError(error: String?) {
-        til_password.error = error
+        binding.tilPassword.error = error
     }
 
     override fun clearUsernameError() {
-        til_username.isErrorEnabled = false
+        binding.tilUsername.isErrorEnabled = false
     }
 
     override fun clearPasswordError() {
-        til_password.isErrorEnabled = false
+        binding.tilPassword.isErrorEnabled = false
     }
 
     /**
      * Called when Login Button is clicked, used for logging in the user
      */
     fun onLoginClicked(view: View) {
-        val username = til_username.editText?.editableText.toString()
-        val password = til_password.editText?.editableText.toString()
+        val username = binding.tilUsername.editText?.editableText.toString()
+        val password = binding.tilPassword.editText?.editableText.toString()
         if (Network.isConnected(this)) {
             loginPresenter?.login(username, password)
         } else {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
index 9b74b1a..4830465 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
@@ -4,15 +4,9 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.android.synthetic.main.activity_client_profile.accountNoValue
-import kotlinx.android.synthetic.main.activity_client_profile.clientIdValue
-import kotlinx.android.synthetic.main.activity_client_profile.clientNameValue
-import kotlinx.android.synthetic.main.activity_client_profile.clientTypeValue
-import kotlinx.android.synthetic.main.activity_client_profile.mobileNoValue
-import kotlinx.android.synthetic.main.activity_client_profile.new_survey_btn
-import kotlinx.android.synthetic.main.activity_client_profile.uname
-import kotlinx.android.synthetic.main.toolbar.appToolbar
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ActivityClientProfileBinding
+import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.objects.Client
 import org.mifos.visionppi.ui.new_survey.NewPPISurveyActivity
 
@@ -21,31 +15,36 @@ import org.mifos.visionppi.ui.new_survey.NewPPISurveyActivity
  */
 
 class ClientProfileActivity : AppCompatActivity(), ClientProfileMVPView {
-
+    private lateinit var toolBarBinding: ToolbarBinding
+    private lateinit var activityClientProfileBinding: ActivityClientProfileBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_client_profile)
-        val clientDetails = intent.getParcelableExtra("client") as Client
-        setClientDetails(clientDetails)
+        toolBarBinding = ToolbarBinding.inflate(layoutInflater)
+        activityClientProfileBinding=ActivityClientProfileBinding.inflate(layoutInflater)
+        val clientDetails = intent.getParcelableExtra("client") as Client?
+        if (clientDetails != null) {
+            setClientDetails(clientDetails)
+        }
 
-        setSupportActionBar(appToolbar)
+        setSupportActionBar(toolBarBinding.appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "Client Profile"
 
-        new_survey_btn.setOnClickListener {
+        activityClientProfileBinding.newSurveyBtn.setOnClickListener {
             val intent = Intent(applicationContext, NewPPISurveyActivity::class.java)
             startActivity(intent)
         }
     }
 
     override fun setClientDetails(client: Client) {
-        uname.text = client.entityName
-        clientIdValue.text = client.entityId.toString()
-        clientNameValue.text = client.entityName
-        accountNoValue.text = client.entityAccountNo
-        mobileNoValue.text = client.entityMobileNo
-        clientTypeValue.text = client.entityType
+        activityClientProfileBinding.uname.text = client?.entityName
+        activityClientProfileBinding.clientIdValue.text = client?.entityId.toString()
+        activityClientProfileBinding.clientNameValue.text = client?.entityName
+        activityClientProfileBinding.accountNoValue.text = client?.entityAccountNo
+        activityClientProfileBinding.mobileNoValue.text = client?.entityMobileNo
+        activityClientProfileBinding.clientTypeValue.text = client?.entityType
     }
 
     override fun showToastMessage(string: String) {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt
index 45fec0a..3fc6857 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt
@@ -23,18 +23,15 @@ import com.google.mlkit.vision.label.custom.CustomImageLabelerOptions
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
-import kotlinx.android.synthetic.main.activity_computer_vision.analyse
-import kotlinx.android.synthetic.main.activity_computer_vision.open_camera_btn
-import kotlinx.android.synthetic.main.activity_computer_vision.res_list
-import kotlinx.android.synthetic.main.activity_computer_vision.selected_images_list
-import kotlinx.android.synthetic.main.activity_computer_vision.upload_from_gallery_btn
-import kotlinx.android.synthetic.main.toolbar.*
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.ObjectDetectionResultAdapter
 import org.mifos.visionppi.adapters.SelectedImageAdapter
+import org.mifos.visionppi.databinding.ActivityComputerVisionBinding
+import org.mifos.visionppi.databinding.ToolbarBinding
 
 class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
-
+    private lateinit var toolBarBinding: ToolbarBinding
+    private lateinit var activityComputerVisionBinding: ActivityComputerVisionBinding
     private val images = ArrayList<Bitmap?>()
     private val pickFromGallery = 1
     private val cameraRequest = 2
@@ -56,26 +53,28 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_computer_vision)
+        toolBarBinding = ToolbarBinding.inflate(layoutInflater)
+        activityComputerVisionBinding = ActivityComputerVisionBinding.inflate(layoutInflater)
+        setSupportActionBar(toolBarBinding.appToolbar)
 
-        setSupportActionBar(appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "Analyse Images"
 
         actionBar?.setDisplayHomeAsUpEnabled(true)
         actionBar?.setDisplayShowHomeEnabled(true)
 
-        upload_from_gallery_btn.setOnClickListener {
+        activityComputerVisionBinding.uploadFromGalleryBtn.setOnClickListener {
             fetchFromGallery()
         }
 
-        open_camera_btn.setOnClickListener {
+        activityComputerVisionBinding.openCameraBtn.setOnClickListener {
             fetchFromCamera()
         }
 
-        selected_images_list.layoutManager = GridLayoutManager(this, 3)
-        selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+        activityComputerVisionBinding.selectedImagesList.layoutManager = GridLayoutManager(this, 3)
+        activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
 
-        analyse.setOnClickListener {
+        activityComputerVisionBinding.analyse.setOnClickListener {
             counter = 0
             imageNos = images.size
             if (images.isNotEmpty()) {
@@ -153,7 +152,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                 val activitySelectIMage = 1234
                 startActivityForResult(Intent.createChooser(intent, "Select Picture"), activitySelectIMage)
 
-                selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+                activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
             }
         } catch (e: Exception) {
             e.printStackTrace()
@@ -174,7 +173,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
     }
 
     override fun analyzeImages() {
-        res_list.adapter = null
+        activityComputerVisionBinding.resList.adapter = null
         for (image in images) {
             detect(image!!)
         }
@@ -199,7 +198,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                     ++counter
                     finalLabels.add(ll)
                     if (counter == imageNos) {
-                        res_list.adapter = ObjectDetectionResultAdapter(finalLabels, images, baseContext)
+                        activityComputerVisionBinding.resList.adapter = ObjectDetectionResultAdapter(finalLabels, images, baseContext)
                     }
                 }
                 .addOnFailureListener { e ->
@@ -220,7 +219,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                     val mImageUri: Uri = data.data!!
                     val bitmap = MediaStore.Images.Media.getBitmap(this.contentResolver, mImageUri)
                     images.add(bitmap)
-                    selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+                    activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
                 } else {
                     if (data?.clipData != null) {
                         val mClipData: ClipData = data.clipData!!
@@ -229,7 +228,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                             val uri: Uri = item.uri
                             val bitmap = MediaStore.Images.Media.getBitmap(this.contentResolver, uri)
                             images.add(bitmap)
-                            selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+                            activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
                         }
                     }
                 }
@@ -239,7 +238,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
         if (requestCode === cameraRequest && resultCode === Activity.RESULT_OK) {
             val photoCaptured = data?.extras?.get("data") as Bitmap
             images.add(photoCaptured)
-            selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+            activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
         }
     }
 
@@ -268,6 +267,6 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
 
     private fun imageRemove(position: Int) {
         images.removeAt(position)
-        selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+        activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
index 830d104..6962fb4 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
@@ -17,13 +17,12 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.android.synthetic.main.content_main.client_search_list
-import kotlinx.android.synthetic.main.content_main.search_btn
-import kotlinx.android.synthetic.main.content_main.search_query
 import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.uiThread
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.ClientSearchAdapter
+import org.mifos.visionppi.databinding.ActivityComputerVisionBinding
+import org.mifos.visionppi.databinding.ContentMainBinding
 import org.mifos.visionppi.objects.Client
 import org.mifos.visionppi.ui.client_profile.ClientProfileActivity
 
@@ -32,7 +31,7 @@ import org.mifos.visionppi.ui.client_profile.ClientProfileActivity
  */
 
 class MainActivity : Fragment(), MainMVPView {
-
+    private lateinit var contentMainBinding: ContentMainBinding
     lateinit var clientList: List<Client>
     var mMainPresenter: MainPresenter = MainPresenter()
 
@@ -43,14 +42,15 @@ class MainActivity : Fragment(), MainMVPView {
     ): View? {
         super.onCreate(savedInstanceState)
         val root = inflater.inflate(R.layout.content_main, container, false)
+        contentMainBinding=ContentMainBinding.inflate(layoutInflater)
         return root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        client_search_list.layoutManager = LinearLayoutManager(requireContext())
+        contentMainBinding.clientSearchList.layoutManager = LinearLayoutManager(requireContext())
 
-        search_query.setOnEditorActionListener(TextView.OnEditorActionListener { _, actionId, _ ->
+        contentMainBinding.searchQuery.setOnEditorActionListener(TextView.OnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                 performSearch()
                 return@OnEditorActionListener true
@@ -58,7 +58,7 @@ class MainActivity : Fragment(), MainMVPView {
             false
         })
 
-        search_query.addTextChangedListener(object : TextWatcher {
+        contentMainBinding.searchQuery.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(p0: Editable?) {
             }
 
@@ -67,31 +67,31 @@ class MainActivity : Fragment(), MainMVPView {
 
             override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
                 if (p0.toString().trim().isEmpty()) {
-                    search_btn.isEnabled = false
-                    search_btn.alpha = 0.5F
+                    contentMainBinding.searchBtn.isEnabled = false
+                    contentMainBinding.searchBtn.alpha = 0.5F
                 } else {
-                    search_btn.isEnabled = true
-                    search_btn.alpha = 1.0F
+                    contentMainBinding.searchBtn.isEnabled = true
+                    contentMainBinding.searchBtn.alpha = 1.0F
                 }
             }
         })
 
-        search_btn.setOnClickListener {
+        contentMainBinding.searchBtn.setOnClickListener {
             performSearch()
         }
     }
 
     private fun performSearch() {
         if (networkAvailable(requireActivity())) {
-            search_query.onEditorAction(EditorInfo.IME_ACTION_DONE)
+            contentMainBinding.searchQuery.onEditorAction(EditorInfo.IME_ACTION_DONE)
             println("Going in")
-            if (search_query.text.toString().isEmpty())
+            if (contentMainBinding.searchQuery.text.toString().isEmpty())
                 searchError()
             else {
                 println("going in deeper")
                 val inputMethodManager = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-                inputMethodManager.hideSoftInputFromWindow(search_btn.windowToken, 0)
-                search(search_query.text.toString())
+                inputMethodManager.hideSoftInputFromWindow(contentMainBinding.searchBtn.windowToken, 0)
+                search(contentMainBinding.searchQuery.text.toString())
             }
         } else {
             showToastMessage("Internet connection not available. Please check network settings")
@@ -152,7 +152,7 @@ class MainActivity : Fragment(), MainMVPView {
         if (clientList.isEmpty())
             searchUnsuccessful()
 
-        client_search_list.adapter =
+        contentMainBinding.clientSearchList.adapter =
                 ClientSearchAdapter(clientList, requireContext()) { item -> onClick(item) }
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt
new file mode 100644
index 0000000..58e3c78
--- /dev/null
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt
@@ -0,0 +1,108 @@
+package org.mifos.visionppi.ui.menu
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.Fragment
+import org.mifos.visionppi.R
+import org.mifos.visionppi.api.local.PreferencesHelper
+import org.mifos.visionppi.databinding.ActivityMenuBinding
+import org.mifos.visionppi.models.User
+import org.mifos.visionppi.ui.AboutActivity
+import org.mifos.visionppi.ui.activities.LoginActivity
+import org.mifos.visionppi.ui.user_profile.UserProfileActivity
+import org.mifos.visionppi.utils.PrefManager
+
+class MenuActivity : Fragment(), MenuMVPView {
+
+    lateinit var user: User
+    private lateinit var activityMenuBinding: ActivityMenuBinding
+    var mMenuPresenter: MenuPresenter = MenuPresenter()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        activityMenuBinding=ActivityMenuBinding.inflate(layoutInflater)
+        super.onCreate(savedInstanceState)
+        val shareButton = activityMenuBinding.shareButton
+        val editProfileButton = activityMenuBinding.editProfileButton
+        val aboutButton = activityMenuBinding.aboutButton
+        val logoutButton = activityMenuBinding.logoutButton
+
+        shareButton.setOnClickListener {
+            val shareIntent = Intent()
+            shareIntent.action = Intent.ACTION_SEND
+            shareIntent.putExtra(
+                    Intent.EXTRA_TEXT,
+                    getString(R.string.install_vision).toString() + "\n" + getString(R.string.download_link)
+            )
+            shareIntent.type = "text/plain"
+            startActivity(shareIntent)
+        }
+
+        editProfileButton.setOnClickListener {
+            val editIntent = Intent(requireContext(), UserProfileActivity::class.java)
+            startActivity(editIntent)
+        }
+
+        aboutButton.setOnClickListener{
+            val aboutIntent = Intent(requireContext(), AboutActivity::class.java)
+            startActivity(aboutIntent)
+        }
+
+        logoutButton.setOnClickListener{
+            showLogoutDialog()
+        }
+
+        return activityMenuBinding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        getUserDetails()
+    }
+
+    override fun getUserDetails() {
+        user = mMenuPresenter.fetchUserDetails(requireActivity(), requireContext())
+        setUserDetails()
+    }
+
+    override fun setUserDetails() {
+        activityMenuBinding.uname.text = user.username
+        activityMenuBinding.usernameValue.text = user.username
+        activityMenuBinding.userIdValue.text = user.userId.toString()
+        activityMenuBinding.officeNameValue.text = user.officeName
+        activityMenuBinding.officeIdValue.text = user.officeId.toString()
+        activityMenuBinding.staffIdValue.text = user.staffId.toString()
+        activityMenuBinding.staffDispNameValue.text = user.staffDisplayName
+    }
+
+    override fun showToastMessage(string: String) {
+        Toast.makeText(requireContext(), string, Toast.LENGTH_SHORT).show()
+    }
+
+    fun showLogoutDialog() {
+        val dialogBuilder = AlertDialog.Builder(requireContext())
+
+        dialogBuilder.setMessage("Are you sure you want to logout?")
+        dialogBuilder.setPositiveButton("Yes") { _, _ ->
+            val preferencesHelper = PreferencesHelper(requireContext())
+            preferencesHelper.clear()
+            val prefManager = PrefManager()
+            prefManager.clear(requireActivity(), requireContext())
+            val intent = Intent(requireContext().applicationContext, LoginActivity::class.java)
+            startActivity(intent)
+        }
+
+        dialogBuilder.setNegativeButton("No") { dialog, _ ->
+            dialog.dismiss()
+        }
+        val dialog = dialogBuilder.create()
+        dialog.show()
+    }
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt
new file mode 100644
index 0000000..7c295d7
--- /dev/null
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt
@@ -0,0 +1,8 @@
+package org.mifos.visionppi.ui.menu
+import org.mifos.visionppi.base.MVPView
+
+interface MenuMVPView : MVPView {
+    fun getUserDetails()
+
+    fun setUserDetails()
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt
new file mode 100644
index 0000000..d4d3e7c
--- /dev/null
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt
@@ -0,0 +1,21 @@
+package org.mifos.visionppi.ui.menu
+import android.app.Activity
+import android.content.Context
+import com.google.gson.Gson
+import org.mifos.visionppi.R
+import org.mifos.visionppi.base.BasePresenter
+import org.mifos.visionppi.models.User
+import org.mifos.visionppi.utils.PrefManager
+
+class MenuPresenter : BasePresenter<MenuMVPView>() {
+
+    private val gson: Gson = Gson()
+
+    fun fetchUserDetails(activity: Activity, context: Context): User {
+        val mPrefManager = PrefManager()
+        val sharedPref = activity.getSharedPreferences(context.getString(R.string.pref_file_name), Context.MODE_PRIVATE)
+        val userJsonString = sharedPref.getString(mPrefManager.userDetails, " ")
+
+        return gson.fromJson(userJsonString, User::class.java)
+    }
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt
index f1d3ba8..5e7c25e 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt
@@ -6,26 +6,29 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
-import kotlinx.android.synthetic.main.activity_new_survey.ppi_survey
-import kotlinx.android.synthetic.main.new_survey_toolbar.computer_vision
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.QuestionAdapter
+import org.mifos.visionppi.databinding.ActivityComputerVisionBinding
+import org.mifos.visionppi.databinding.ActivityNewSurveyBinding
+import org.mifos.visionppi.databinding.NewSurveyToolbarBinding
 import org.mifos.visionppi.objects.PPISurvey
 import org.mifos.visionppi.objects.Response
 import org.mifos.visionppi.ui.computer_vision.ComputerVisionActivity
 
 class NewSurveyActivity : AppCompatActivity(), NewSurveyMVPView {
-
+    private lateinit var newSurveyToolbarBinding: NewSurveyToolbarBinding
+    private lateinit var activityNewSurveyBinding: ActivityNewSurveyBinding
     private var mNewSurveyPresenter: NewSurveyPresenter = NewSurveyPresenter()
     lateinit var mPPISurvey: PPISurvey
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_new_survey)
-
+        newSurveyToolbarBinding=NewSurveyToolbarBinding.inflate(layoutInflater)
+        activityNewSurveyBinding=ActivityNewSurveyBinding.inflate(layoutInflater)
         getSurveyQuestions()
 
-        computer_vision.setOnClickListener {
+        newSurveyToolbarBinding.computerVision.setOnClickListener {
             val intent = Intent(applicationContext, ComputerVisionActivity::class.java)
             startActivity(intent)
         }
@@ -38,10 +41,10 @@ class NewSurveyActivity : AppCompatActivity(), NewSurveyMVPView {
 
     override fun renderSurvey(mPPISurvey: PPISurvey) {
         val snapHelper = PagerSnapHelper()
-        snapHelper.attachToRecyclerView(ppi_survey)
-        ppi_survey.layoutManager = LinearLayoutManager(this)
-        ppi_survey.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
-        ppi_survey.adapter = QuestionAdapter(mPPISurvey.questionDatas, applicationContext) { response: Response -> onResponseClicked(response) }
+        snapHelper.attachToRecyclerView(activityNewSurveyBinding.ppiSurvey)
+        activityNewSurveyBinding.ppiSurvey.layoutManager = LinearLayoutManager(this)
+        activityNewSurveyBinding.ppiSurvey.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
+        activityNewSurveyBinding.ppiSurvey.adapter = QuestionAdapter(mPPISurvey.questionDatas, applicationContext) { response: Response -> onResponseClicked(response) }
     }
 
     override fun showToastMessage(string: String) {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt
index bc1a3a6..bd3ffe0 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt
@@ -7,30 +7,30 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.android.synthetic.main.ppi_question_layout.view.question
-import kotlinx.android.synthetic.main.ppi_question_layout.view.res
-import kotlinx.android.synthetic.main.ppi_question_layout.view.responses
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.ResponseAdapter
+import org.mifos.visionppi.databinding.NewSurveyToolbarBinding
+import org.mifos.visionppi.databinding.PpiQuestionLayoutBinding
 import org.mifos.visionppi.objects.Question
 import org.mifos.visionppi.objects.Response
 import org.mifos.visionppi.ui.computer_vision.ComputerVisionActivity
 
 class PPIQuestionFragment(var questionData: Question, private val mContext: Context, private val responseClick: (response: Response) -> Unit) : Fragment() {
+    private lateinit var ppiQuestionLayoutBinding: PpiQuestionLayoutBinding
+    val list get() = ComputerVisionActivity.finalLabels
 
-    val list
-        get() = ComputerVisionActivity.finalLabels
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = inflater.inflate(R.layout.ppi_question_layout, container, false)
 
-        view.responses.adapter = ResponseAdapter(questionData.responseDatas, mContext, responseClick)
+        ppiQuestionLayoutBinding=PpiQuestionLayoutBinding.inflate(layoutInflater)
+        ppiQuestionLayoutBinding.responses.adapter = ResponseAdapter(questionData.responseDatas, mContext, responseClick)
+        val view = ppiQuestionLayoutBinding.root
         return view
     }
 
     override fun onResume() {
         super.onResume()
-        requireView().question.text = questionData.text
-        requireView().responses.layoutManager = LinearLayoutManager(context)
+        ppiQuestionLayoutBinding.question.text = questionData.text
+        ppiQuestionLayoutBinding.responses.layoutManager = LinearLayoutManager(context)
         if (!list.isNullOrEmpty()) {
             var s: String = ""
             var c: Int = 0
@@ -162,9 +162,9 @@ class PPIQuestionFragment(var questionData: Question, private val mContext: Cont
                 s = "There are $c telephones detected"
             }
 
-            requireView().res.text = s
+            ppiQuestionLayoutBinding.res.text = s
 
-            requireView().res.visibility = View.VISIBLE
+            ppiQuestionLayoutBinding.res.visibility = View.VISIBLE
         }
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt
index 6160d36..174f4df 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt
@@ -5,57 +5,54 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.activity_user_profile.office_id_value
-import kotlinx.android.synthetic.main.activity_user_profile.office_name_value
-import kotlinx.android.synthetic.main.activity_user_profile.staff_disp_name_value
-import kotlinx.android.synthetic.main.activity_user_profile.staff_id_value
-import kotlinx.android.synthetic.main.activity_user_profile.uname
-import kotlinx.android.synthetic.main.activity_user_profile.user_id_value
-import kotlinx.android.synthetic.main.activity_user_profile.username_value
+import androidx.navigation.findNavController
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.setupActionBarWithNavController
+import androidx.navigation.ui.setupWithNavController
+import com.google.android.material.bottomnavigation.BottomNavigationView
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ActivityUserProfileBinding
+import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.models.User
 
 /**
  * Created by Apoorva M K on 27/06/19.
  */
 
-class UserProfileActivity : Fragment(), UserProfileMVPView {
+class UserProfileActivity : AppCompatActivity(), UserProfileMVPView {
 
     lateinit var user: User
+    private lateinit var activityUserProfileBinding: ActivityUserProfileBinding
     var mUserProfilePresenter: UserProfilePresenter = UserProfilePresenter()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+    private lateinit var binding: ToolbarBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        return inflater.inflate(R.layout.activity_user_profile, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        binding = ToolbarBinding.inflate(layoutInflater)
+        activityUserProfileBinding=ActivityUserProfileBinding.inflate(layoutInflater)
+        setContentView(activityUserProfileBinding.root)
+        setSupportActionBar(binding.appToolbar)
         getUserDetails()
     }
 
     override fun getUserDetails() {
-        user = mUserProfilePresenter.fetchUserDetails(requireActivity(), requireContext())
+        user = mUserProfilePresenter.fetchUserDetails(this, this)
         setUserDetails()
     }
 
     override fun setUserDetails() {
 
-        uname.text = user.username
-        username_value.text = user.username
-        user_id_value.text = user.userId.toString()
-        office_name_value.text = user.officeName
-        office_id_value.text = user.officeId.toString()
-        staff_id_value.text = user.staffId.toString()
-        staff_disp_name_value.text = user.staffDisplayName
+        activityUserProfileBinding.uname.text = user.username
+        activityUserProfileBinding.usernameValue.text = user.username
+        activityUserProfileBinding.userIdValue.text = user.userId.toString()
+        activityUserProfileBinding.officeNameValue.text = user.officeName
+        activityUserProfileBinding.officeIdValue.text = user.officeId.toString()
+        activityUserProfileBinding.staffIdValue.text = user.staffId.toString()
+        activityUserProfileBinding.staffDispNameValue.text = user.staffDisplayName
     }
 
     override fun showToastMessage(string: String) {
-        Toast.makeText(requireContext(), string, Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, string, Toast.LENGTH_SHORT).show()
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt b/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt
index 9cc5e80..e48f885 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt
@@ -4,6 +4,7 @@ import khttp.structures.authorization.Authorization
 
 data class AuthKey(val authKey: String) : Authorization {
     override val header: Pair<String, String>
+
         get() {
             return "Authorization" to "Basic $authKey"
         }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt b/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt
index 9bb9d56..811fbfb 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt
@@ -17,7 +17,7 @@ object Network {
      */
     private fun getNetworkInfo(context: Context): NetworkInfo {
         val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        return cm.activeNetworkInfo
+        return cm.activeNetworkInfo!!
     }
 
     /**
diff --git a/visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml b/visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml
new file mode 100644
index 0000000..8fa1695
--- /dev/null
+++ b/visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-5h2v5zM13,17h-2v-3h2v3zM13,12h-2v-2h2v2zM17,17h-2L15,7h2v10z"/>
+</vector>
diff --git a/visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml b/visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml
new file mode 100644
index 0000000..543cee9
--- /dev/null
+++ b/visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml b/visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml
new file mode 100644
index 0000000..a5687c6
--- /dev/null
+++ b/visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/visionppi/app/src/main/res/layout/activity_about.xml b/visionppi/app/src/main/res/layout/activity_about.xml
index 2bd6698..21540ee 100644
--- a/visionppi/app/src/main/res/layout/activity_about.xml
+++ b/visionppi/app/src/main/res/layout/activity_about.xml
@@ -3,7 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@android:color/white"
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/visionppi/app/src/main/res/layout/activity_login.xml b/visionppi/app/src/main/res/layout/activity_login.xml
index d6bb329..61c0196 100644
--- a/visionppi/app/src/main/res/layout/activity_login.xml
+++ b/visionppi/app/src/main/res/layout/activity_login.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white"
     android:layout_height="match_parent"
diff --git a/visionppi/app/src/main/res/layout/activity_main.xml b/visionppi/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..fad45aa
--- /dev/null
+++ b/visionppi/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
+
+    <FrameLayout
+        android:id="@+id/frameLayout"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    </FrameLayout>
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottomNavigationView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/activity_main2.xml b/visionppi/app/src/main/res/layout/activity_main2.xml
index 185cf63..ed627a6 100644
--- a/visionppi/app/src/main/res/layout/activity_main2.xml
+++ b/visionppi/app/src/main/res/layout/activity_main2.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <include layout="@layout/toolbar" />
 
@@ -26,9 +28,11 @@
         android:layout_height="match_parent"
         app:defaultNavHost="true"
         app:layout_constraintBottom_toTopOf="@id/nav_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
         app:navGraph="@navigation/mobile_navigation" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/activity_menu.xml b/visionppi/app/src/main/res/layout/activity_menu.xml
new file mode 100644
index 0000000..edae1c4
--- /dev/null
+++ b/visionppi/app/src/main/res/layout/activity_menu.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:layout_height="225dp"
+        android:layout_width="match_parent">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            app:contentScrim="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:titleEnabled="false">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:gravity="center"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+                app:layout_collapseMode="parallax">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="User Profile"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+            </androidx.appcompat.widget.Toolbar>
+
+            <View
+                android:background="@drawable/background"
+                android:layout_gravity="bottom"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"/>
+
+            <LinearLayout
+                android:gravity="center"
+                android:layout_height="match_parent"
+                android:layout_marginTop="56dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                app:layout_collapseMode="parallax">
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:layout_width="match_parent"
+                    android:orientation="horizontal"
+                    app:layout_collapseMode="parallax">
+
+                    <ImageView
+                        android:id="@+id/profileImage"
+                        android:layout_height="84dp"
+                        android:src="@drawable/ic_wrapped_person_black_24dp"
+                        android:layout_width="84dp"
+                        android:visibility="visible" />
+
+                    <LinearLayout
+                        android:gravity="center_vertical|left"
+                        android:layout_height="match_parent"
+                        android:layout_margin="10dp"
+                        android:layout_width="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_collapseMode="parallax"
+                        >
+
+    <!--                    <TextView-->
+    <!--                        android:gravity="center"-->
+    <!--                        android:layout_width="wrap_content"-->
+    <!--                        android:layout_height="wrap_content"-->
+    <!--                        android:layout_marginLeft="@dimen/text_size"-->
+    <!--                        android:textSize="16sp"-->
+    <!--                        android:textColor="@android:color/black"-->
+    <!--                        android:layout_margin="10dp"-->
+    <!--                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"-->
+    <!--                        android:text="Firstname Middlename Lastname"-->
+    <!--                        android:id="@+id/name"/>-->
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="bottom"
+                            android:layout_margin="10dp"
+                            android:textSize="24sp"
+                            android:textColor="@android:color/black"
+                            android:layout_marginBottom="10dp"
+                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                            android:text="usernamegoeshere"
+                            android:id="@+id/uname"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:layout_width="match_parent"
+                    android:orientation="horizontal"
+                    app:layout_collapseMode="parallax">
+
+                    <Button
+                        android:id="@+id/editProfileButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="50dp"
+                        android:layout_weight="1"
+                        android:text="Edit Profile" />
+
+                    <Button
+                        android:id="@+id/shareButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="50dp"
+                        android:layout_weight="1"
+                        android:text="Share" />
+                </LinearLayout>
+            </LinearLayout>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/ncv_customer_details"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:id="@+id/ll_user_profile"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:orientation="vertical">
+
+            <androidx.cardview.widget.CardView
+                android:background="@color/white"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                app:cardElevation="4dp">
+
+                <LinearLayout
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:text="@string/username"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/username_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="User ID Value"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/user_id_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="Office"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/office_name_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="Office ID"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/office_id_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="Staff ID"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/staff_id_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="Staff Display Name"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/staff_disp_name_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="vertical"
+        android:layout_marginBottom="56dp">
+        <Button
+            android:id="@+id/aboutButton"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:text="About" />
+
+        <Button
+            android:id="@+id/logoutButton"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:text="Logout" />
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/activity_new_survey.xml b/visionppi/app/src/main/res/layout/activity_new_survey.xml
index 86f5fc7..1892a32 100644
--- a/visionppi/app/src/main/res/layout/activity_new_survey.xml
+++ b/visionppi/app/src/main/res/layout/activity_new_survey.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml b/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml
index f42e331..4756387 100644
--- a/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml
+++ b/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.viewpager.widget.ViewPager
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ppi_view_pager"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true"/>
diff --git a/visionppi/app/src/main/res/layout/activity_user_profile.xml b/visionppi/app/src/main/res/layout/activity_user_profile.xml
index 51145b0..afa752b 100644
--- a/visionppi/app/src/main/res/layout/activity_user_profile.xml
+++ b/visionppi/app/src/main/res/layout/activity_user_profile.xml
@@ -46,19 +46,19 @@
                     android:id="@+id/uname"/>
             </LinearLayout>
 
-            <View
-                android:background="@drawable/background"
-                android:layout_gravity="bottom"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"/>
-
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_height="?attr/actionBarSize"
                 android:layout_width="match_parent"
                 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                app:layout_collapseMode="pin"
-                app:title="User Details"/>
+                app:layout_collapseMode="pin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="Edit Profile"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+            </androidx.appcompat.widget.Toolbar>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -217,4 +217,26 @@
 
     </androidx.core.widget.NestedScrollView>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="vertical"
+        android:layout_margin="10dp">
+        <Button
+            android:id="@+id/saveButton"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:text="Save" />
+    </LinearLayout>
+
+<!--    <View-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        android:layout_gravity="bottom"-->
+<!--        android:background="@drawable/background"-->
+<!--        app:layout_anchor="@+id/app_bar_layout"-->
+<!--        app:layout_anchorGravity="center" />-->
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/image_grid_layout.xml b/visionppi/app/src/main/res/layout/image_grid_layout.xml
index 126dcdf..c6593e0 100644
--- a/visionppi/app/src/main/res/layout/image_grid_layout.xml
+++ b/visionppi/app/src/main/res/layout/image_grid_layout.xml
@@ -4,7 +4,8 @@
     android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="@dimen/foursp_margin">
+    android:padding="@dimen/foursp_margin"
+    >
 
     <ImageView
             android:layout_width="155dp"
diff --git a/visionppi/app/src/main/res/layout/new_survey_toolbar.xml b/visionppi/app/src/main/res/layout/new_survey_toolbar.xml
index 1fdaa81..b05929d 100644
--- a/visionppi/app/src/main/res/layout/new_survey_toolbar.xml
+++ b/visionppi/app/src/main/res/layout/new_survey_toolbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.Toolbar
         xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/blueDark">
diff --git a/visionppi/app/src/main/res/layout/ppi_response_row.xml b/visionppi/app/src/main/res/layout/ppi_response_row.xml
index 3b80cc2..dcf3fcd 100644
--- a/visionppi/app/src/main/res/layout/ppi_response_row.xml
+++ b/visionppi/app/src/main/res/layout/ppi_response_row.xml
@@ -3,7 +3,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="10dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+   >
 
     <LinearLayout
             android:orientation="horizontal"
diff --git a/visionppi/app/src/main/res/menu/bottom_nav_menu.xml b/visionppi/app/src/main/res/menu/bottom_nav_menu.xml
index 4f53998..3e2d9a3 100644
--- a/visionppi/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/visionppi/app/src/main/res/menu/bottom_nav_menu.xml
@@ -3,12 +3,17 @@
 
     <item
         android:id="@+id/navigation_home"
-        android:icon="@drawable/ic_home_black_24dp"
-        android:title="@string/title_home" />
+        android:icon="@drawable/ic_baseline_search_24"
+        android:title="@string/title_search" />
 
     <item
         android:id="@+id/navigation_dashboard"
-        android:icon="@drawable/ic_profile"
-        android:title="@string/title_dashboard" />
+        android:icon="@drawable/ic_baseline_analytics_24"
+        android:title="@string/title_analyze" />
+
+    <item
+        android:id="@+id/navigation_menu"
+        android:icon="@drawable/ic_baseline_menu_24"
+        android:title="@string/title_menu" />
 
 </menu>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/navigation/mobile_navigation.xml b/visionppi/app/src/main/res/navigation/mobile_navigation.xml
index b36e273..274534b 100644
--- a/visionppi/app/src/main/res/navigation/mobile_navigation.xml
+++ b/visionppi/app/src/main/res/navigation/mobile_navigation.xml
@@ -13,7 +13,13 @@
 
     <fragment
         android:id="@+id/navigation_dashboard"
-        android:name="org.mifos.visionppi.ui.user_profile.UserProfileActivity"
-        android:label="@string/title_dashboard"
-        tools:layout="@layout/activity_user_profile" />
+        android:name="org.mifos.visionppi.ui.home.MainActivity"
+        android:label="@string/title_analyze"
+        tools:layout="@layout/content_main" />
+
+    <fragment
+        android:id="@+id/navigation_menu"
+        android:name="org.mifos.visionppi.ui.menu.MenuActivity"
+        android:label="@string/title_menu"
+        tools:layout="@layout/activity_menu" />
 </navigation>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/values/strings.xml b/visionppi/app/src/main/res/values/strings.xml
index a16dabe..e066930 100644
--- a/visionppi/app/src/main/res/values/strings.xml
+++ b/visionppi/app/src/main/res/values/strings.xml
@@ -51,6 +51,9 @@
     <string name="object_detection_results">Object Detection Results</string>
     <string name="title_activity_main">MainActivity</string>
     <string name="title_home">Home</string>
+    <string name="title_search">Search</string>
+    <string name="title_analyze">Analyze</string>
+    <string name="title_menu">Menu</string>
     <string name="title_dashboard">Profile</string>
     <string name="medium_text">Placeholder</string>
     <string name="about_app">Vision PPI helps officers to fill PPI Surveys automatically with the help of photographs taken in a clients house.</string>
diff --git a/visionppi/build.gradle b/visionppi/build.gradle
index b1cf4c7..25b77f9 100644
--- a/visionppi/build.gradle
+++ b/visionppi/build.gradle
@@ -4,12 +4,13 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath 'io.fabric.tools:gradle:1.31.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.7.10"
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/visionppi/gradle/wrapper/gradle-wrapper.properties b/visionppi/gradle/wrapper/gradle-wrapper.properties
index 00bcd6b..083c7c5 100644
--- a/visionppi/gradle/wrapper/gradle-wrapper.properties
+++ b/visionppi/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

From a6864b2a04511fbbcb5c2dd1dd26490f796c3d0f Mon Sep 17 00:00:00 2001
From: gr1nd3lw4ld <gr1nd3lw4ld07@gmail.com>
Date: Wed, 26 Jul 2023 23:51:17 +0530
Subject: [PATCH 4/5] Revert "new ui"

---
 visionppi/.idea/gradle.xml                    |   2 +-
 visionppi/.idea/misc.xml                      |  21 --
 visionppi/app/build.gradle                    |  39 +--
 visionppi/app/src/main/AndroidManifest.xml    |  19 +-
 .../java/org/mifos/visionppi/MainActivity.kt  |   8 +-
 .../java/org/mifos/visionppi/VisionPPI.kt     |   6 +-
 .../visionppi/adapters/ClientSearchAdapter.kt |  19 +-
 .../adapters/ObjectDetectionResultAdapter.kt  |  15 +-
 .../visionppi/adapters/QuestionAdapter.kt     |  14 +-
 .../visionppi/adapters/ResponseAdapter.kt     |  13 +-
 .../adapters/SelectedImageAdapter.kt          |  14 +-
 .../java/org/mifos/visionppi/models/User.kt   |   4 +-
 .../visionppi/models/mifoserror/Errors.kt     |  25 +-
 .../org/mifos/visionppi/objects/Client.kt     |  35 +-
 .../org/mifos/visionppi/ui/AboutActivity.kt   |   6 +-
 .../visionppi/ui/activities/LoginActivity.kt  |  24 +-
 .../client_profile/ClientProfileActivity.kt   |  37 ++-
 .../computer_vision/ComputerVisionActivity.kt |  39 +--
 .../mifos/visionppi/ui/home/MainActivity.kt   |  34 +-
 .../mifos/visionppi/ui/menu/MenuActivity.kt   | 108 ------
 .../mifos/visionppi/ui/menu/MenuMVPView.kt    |   8 -
 .../mifos/visionppi/ui/menu/MenuPresenter.kt  |  21 --
 .../ui/new_survey/NewSurveyActivity.kt        |  21 +-
 .../ui/new_survey/PPIQuestionFragment.kt      |  22 +-
 .../ui/user_profile/UserProfileActivity.kt    |  53 +--
 .../java/org/mifos/visionppi/utils/AuthKey.kt |   1 -
 .../java/org/mifos/visionppi/utils/Network.kt |   2 +-
 .../res/drawable/ic_baseline_analytics_24.xml |   5 -
 .../main/res/drawable/ic_baseline_menu_24.xml |   5 -
 .../res/drawable/ic_baseline_search_24.xml    |   5 -
 .../src/main/res/layout/activity_about.xml    |   4 +-
 .../src/main/res/layout/activity_login.xml    |   3 +-
 .../app/src/main/res/layout/activity_main.xml |  27 --
 .../src/main/res/layout/activity_main2.xml    |   6 +-
 .../app/src/main/res/layout/activity_menu.xml | 307 ------------------
 .../main/res/layout/activity_new_survey.xml   |   1 -
 .../res/layout/activity_ppi_view_pager.xml    |   4 +-
 .../main/res/layout/activity_user_profile.xml |  38 +--
 .../src/main/res/layout/image_grid_layout.xml |   3 +-
 .../main/res/layout/new_survey_toolbar.xml    |   1 -
 .../src/main/res/layout/ppi_response_row.xml  |   3 +-
 .../app/src/main/res/menu/bottom_nav_menu.xml |  13 +-
 .../main/res/navigation/mobile_navigation.xml |  12 +-
 visionppi/app/src/main/res/values/strings.xml |   3 -
 visionppi/build.gradle                        |   9 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 46 files changed, 217 insertions(+), 844 deletions(-)
 delete mode 100644 visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt
 delete mode 100644 visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt
 delete mode 100644 visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt
 delete mode 100644 visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml
 delete mode 100644 visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml
 delete mode 100644 visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml
 delete mode 100644 visionppi/app/src/main/res/layout/activity_main.xml
 delete mode 100644 visionppi/app/src/main/res/layout/activity_menu.xml

diff --git a/visionppi/.idea/gradle.xml b/visionppi/.idea/gradle.xml
index 6e5389e..3a6d748 100644
--- a/visionppi/.idea/gradle.xml
+++ b/visionppi/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio default JDK" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/visionppi/.idea/misc.xml b/visionppi/.idea/misc.xml
index 33453f4..568f17d 100644
--- a/visionppi/.idea/misc.xml
+++ b/visionppi/.idea/misc.xml
@@ -3,27 +3,6 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_about.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_client_profile.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_computer_vision.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_login.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_main.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_main2.xml" value="0.264" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_menu.xml" value="0.176" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_new_survey.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_user_profile.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/client_search_row.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/content_main.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/image_grid_layout.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/new_survey_toolbar.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/object_detection_result.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/ppi_question_layout.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/ppi_response_row.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/toolbar.xml" value="0.24547101449275363" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/menu/bottom_nav_menu.xml" value="0.25" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/menu/bottom_nav_menu2.xml" value="0.24895833333333334" />
-        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/menu/options_menu.xml" value="0.25" />
         <entry key="..\:/Users/DELL/Desktop/from github/visionppi/app/src/main/res/layout/activity_about.xml" value="0.1" />
         <entry key="..\:/Users/DELL/Desktop/from github/visionppi/app/src/main/res/layout/activity_login.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_main2.xml" value="0.22395833333333334" />
diff --git a/visionppi/app/build.gradle b/visionppi/app/build.gradle
index 7286b13..5698bbf 100644
--- a/visionppi/app/build.gradle
+++ b/visionppi/app/build.gradle
@@ -1,22 +1,21 @@
 plugins {
     id "com.diffplug.spotless" version "5.1.2"
-    id 'com.android.application'
-    id 'com.google.firebase.crashlytics'
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'io.fabric'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
-apply plugin: "org.jetbrains.kotlin.kapt"
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "org.mifos.visionppi"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         ndkVersion '21.1.6352462'
@@ -41,6 +40,10 @@ android {
         abortOnError false
     }
 
+    androidExtensions {
+        experimental = true
+    }
+
     dataBinding {
         enabled = true
     }
@@ -51,9 +54,6 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    buildFeatures {
-        viewBinding = true
-    }
 }
 
 spotless {
@@ -71,25 +71,17 @@ spotless {
 }
 
 dependencies {
-    // Import the BoM for the Firebase platform
-    implementation platform('com.google.firebase:firebase-bom:32.1.0')
 
-    // Add the dependencies for the Crashlytics and Analytics libraries
-    // When using the BoM, you don't specify versions in Firebase library dependencies
-    implementation 'com.google.firebase:firebase-crashlytics-ktx'
-    implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'androidx.navigation:navigation-fragment:2.1.0'
     implementation 'androidx.navigation:navigation-ui:2.1.0'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
-    implementation 'com.google.firebase:firebase-analytics:17.5.0'
     def lifecycle_version = "2.2.0"
     def kotlin_version="1.3.72"
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
@@ -133,6 +125,9 @@ dependencies {
     //Butter Knife
     implementation "com.jakewharton:butterknife:8.0.1"
     kapt "com.jakewharton:butterknife-compiler:8.0.1"
+    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
+        transitive = true
+    }
 
     implementation "org.jetbrains.anko:anko-commons:0.10.0"
 
@@ -159,7 +154,3 @@ dependencies {
 
 
 }
-
-kapt {
-    correctErrorTypes true
-}
\ No newline at end of file
diff --git a/visionppi/app/src/main/AndroidManifest.xml b/visionppi/app/src/main/AndroidManifest.xml
index 675fc71..c8a3a1d 100644
--- a/visionppi/app/src/main/AndroidManifest.xml
+++ b/visionppi/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
-            android:label="@string/title_activity_main"/>
+            android:label="@string/title_activity_main"></activity>
         <activity
             android:name=".ui.activities.LoginActivity"
             android:configChanges="orientation|screenSize"
@@ -31,14 +31,13 @@
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.computer_vision.ComputerVisionActivity"
-            android:label="Computer Vision"/>
+            android:label="Computer Vision"></activity>
         <activity
             android:name=".ui.AboutActivity"
             android:label="@string/about"/>
         <activity
             android:name=".ui.activities.SplashActivity"
-            android:theme="@style/SplashTheme"
-            android:exported="true">
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -48,21 +47,15 @@
         <activity
             android:name=".ui.client_profile.ClientProfileActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar"></activity>
         <activity
             android:name=".ui.new_survey.NewSurveyActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar"></activity>
         <activity
             android:name=".ui.new_survey.NewPPISurveyActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"/>
-
-        <activity
-            android:name=".ui.user_profile.UserProfileActivity"
-            android:label="User Profile"
-            android:theme="@style/AppTheme.NoActionBar"/>
-
+            android:theme="@style/AppTheme.NoActionBar"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt
index 7500b6f..5954b2f 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt
@@ -11,20 +11,18 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.bottomnavigation.BottomNavigationView
-//import kotlinx.android.synthetic.main.toolbar.*
+import kotlinx.android.synthetic.main.toolbar.*
 import org.mifos.visionppi.api.local.PreferencesHelper
-import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.ui.AboutActivity
 import org.mifos.visionppi.ui.activities.LoginActivity
 import org.mifos.visionppi.utils.PrefManager
 
 class MainActivity : AppCompatActivity() {
-    private lateinit var binding: ToolbarBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ToolbarBinding.inflate(layoutInflater)
         setContentView(R.layout.activity_main2)
-        setSupportActionBar(binding.appToolbar)
+        setSupportActionBar(appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "OK"
         val navView: BottomNavigationView = findViewById(R.id.nav_view)
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt b/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt
index bf9e1d9..75883e6 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDex
 import androidx.multidex.MultiDexApplication
-//import com.crashlytics.android.Crashlytics
-//import io.fabric.sdk.android.Fabric
+import com.crashlytics.android.Crashlytics
+import io.fabric.sdk.android.Fabric
 import java.util.Locale
 import org.mifos.visionppi.injection.component.ApplicationComponent
 import org.mifos.visionppi.injection.component.DaggerApplicationComponent
@@ -36,7 +36,7 @@ class VisionPPI : MultiDexApplication() {
     override fun onCreate() {
         super.onCreate()
         MultiDex.install(this)
-//        Fabric.with(this, Crashlytics())
+        Fabric.with(this, Crashlytics())
         instance = this
     }
 
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt
index 4277c1d..d433606 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt
@@ -1,20 +1,24 @@
 package org.mifos.visionppi.adapters
 
 import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.synthetic.main.client_search_row.view.client_account_no
+import kotlinx.android.synthetic.main.client_search_row.view.client_name
+import kotlinx.android.synthetic.main.client_search_row.view.client_search_row
 import org.mifos.visionppi.R
-import org.mifos.visionppi.databinding.ClientSearchRowBinding
 import org.mifos.visionppi.objects.Client
-import android.view.LayoutInflater
 
 /**
  * Created by Apoorva M K on 01/07/19.
  */
 
 class ClientSearchAdapter(var clientList: List<Client>, var context: Context, private val listener: (Client) -> Unit) : RecyclerView.Adapter<ViewHolder>() {
+
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.clientName?.text = clientList[position].entityName
         holder.clientAccountNo?.text = "#".plus(clientList[position].entityAccountNo)
@@ -22,8 +26,7 @@ class ClientSearchAdapter(var clientList: List<Client>, var context: Context, pr
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val binding = ClientSearchRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ViewHolder(binding)
+        return ViewHolder(LayoutInflater.from(context).inflate(R.layout.client_search_row, parent, false))
     }
 
     override fun getItemCount(): Int {
@@ -31,10 +34,10 @@ class ClientSearchAdapter(var clientList: List<Client>, var context: Context, pr
     }
 }
 
-class ViewHolder(val binding: ClientSearchRowBinding) : RecyclerView.ViewHolder(binding.root) {
-    val clientName: TextView? = binding.clientName
-    val clientAccountNo: TextView? =  binding.clientAccountNo
-    private val linearLayout: LinearLayout? = binding.clientSearchRow
+class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    val clientName: TextView? = view.client_name
+    val clientAccountNo: TextView? = view.client_account_no
+    private val linearLayout: LinearLayout? = view.client_search_row
 
     fun setItem(item: Client, listener: (Client) -> Unit) {
         linearLayout?.setOnClickListener { listener(item) }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt
index 3ee4fa1..dd1ab68 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt
@@ -3,12 +3,14 @@ package org.mifos.visionppi.adapters
 import android.content.Context
 import android.graphics.Bitmap
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-
-import org.mifos.visionppi.databinding.ObjectDetectionResultBinding
+import kotlinx.android.synthetic.main.object_detection_result.view.imageObject
+import kotlinx.android.synthetic.main.object_detection_result.view.item1
+import org.mifos.visionppi.R
 
 class ObjectDetectionResultAdapter(var result: List<List<String>>, var images: ArrayList<Bitmap?>, var context: Context) : RecyclerView.Adapter<ResultViewHolder>() {
 
@@ -21,8 +23,7 @@ class ObjectDetectionResultAdapter(var result: List<List<String>>, var images: A
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResultViewHolder {
-        val binding = ObjectDetectionResultBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ResultViewHolder(binding)
+        return ResultViewHolder(LayoutInflater.from(context).inflate(R.layout.object_detection_result, parent, false))
     }
 
     override fun getItemCount(): Int {
@@ -30,7 +31,7 @@ class ObjectDetectionResultAdapter(var result: List<List<String>>, var images: A
     }
 }
 
-class ResultViewHolder(val binding: ObjectDetectionResultBinding) : RecyclerView.ViewHolder(binding.root) {
-    val image: ImageView? = binding.imageObject
-    val res1: TextView? = binding.item1
+class ResultViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    val image: ImageView? = view.imageObject
+    val res1: TextView? = view.item1
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt
index 62c4c40..2c823e0 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt
@@ -2,11 +2,14 @@ package org.mifos.visionppi.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import org.mifos.visionppi.databinding.PpiQuestionLayoutBinding
+import kotlinx.android.synthetic.main.ppi_question_layout.view.question
+import kotlinx.android.synthetic.main.ppi_question_layout.view.responses
+import org.mifos.visionppi.R
 import org.mifos.visionppi.objects.Question
 import org.mifos.visionppi.objects.Response
 
@@ -19,8 +22,7 @@ class QuestionAdapter(var questionList: List<Question>, var context: Context, pr
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QuestionViewHolder {
-        val binding = PpiQuestionLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return QuestionViewHolder(binding)
+        return QuestionViewHolder(LayoutInflater.from(context).inflate(R.layout.ppi_question_layout, parent, false))
     }
 
     override fun getItemCount(): Int {
@@ -28,8 +30,8 @@ class QuestionAdapter(var questionList: List<Question>, var context: Context, pr
     }
 }
 
-class QuestionViewHolder(val binding: PpiQuestionLayoutBinding) : RecyclerView.ViewHolder(binding.root) {
+class QuestionViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 
-    val question: TextView? = binding.question
-    val responseRecyclerView: RecyclerView? = binding.responses
+    val question: TextView? = view.question
+    val responseRecyclerView: RecyclerView? = view.responses
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt
index 606d5cf..1d065cb 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt
@@ -2,18 +2,19 @@ package org.mifos.visionppi.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import org.mifos.visionppi.databinding.PpiResponseRowBinding
+import kotlinx.android.synthetic.main.ppi_response_row.view.response_btn
+import kotlinx.android.synthetic.main.ppi_response_row.view.response_score
 import org.mifos.visionppi.objects.Response
 
 class ResponseAdapter(var responseList: List<Response>, var context: Context, private val responseClicked: (response: Response) -> Unit) : RecyclerView.Adapter<ResponseAdapter.ResponseViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResponseViewHolder {
-        val binding = PpiResponseRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ResponseViewHolder(binding)
+        return ResponseViewHolder(LayoutInflater.from(context).inflate(org.mifos.visionppi.R.layout.ppi_response_row, parent, false))
     }
 
     override fun getItemCount(): Int {
@@ -27,9 +28,9 @@ class ResponseAdapter(var responseList: List<Response>, var context: Context, pr
         holder.setItem(position, responseClicked)
     }
 
-    inner class ResponseViewHolder(val binding: PpiResponseRowBinding) : RecyclerView.ViewHolder(binding.root) {
-        var responseButton: RadioButton? = binding.responseBtn
-        var responseScore: TextView? = binding.responseScore
+    inner class ResponseViewHolder(var view: View) : RecyclerView.ViewHolder(view) {
+        var responseButton: RadioButton? = view.response_btn
+        var responseScore: TextView? = view.response_score
 
         fun setItem(position: Int, responseClicked: (response: Response) -> Unit) {
             responseButton?.setOnClickListener {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt
index 45e1a97..cb3a01b 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt
@@ -3,17 +3,19 @@ package org.mifos.visionppi.adapters
 import android.content.Context
 import android.graphics.Bitmap
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
-import org.mifos.visionppi.databinding.ImageGridLayoutBinding
+import kotlinx.android.synthetic.main.image_grid_layout.view.remove_button
+import kotlinx.android.synthetic.main.image_grid_layout.view.selected_image
+import org.mifos.visionppi.R
 
 class SelectedImageAdapter(private val items: ArrayList<Bitmap?>, val context: Context, val removeImage: (position: Int) -> Unit) : RecyclerView.Adapter<SelectedImageAdapter.SelectedImageViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SelectedImageViewHolder {
-        val binding = ImageGridLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return SelectedImageViewHolder(binding)
+        return SelectedImageViewHolder(LayoutInflater.from(context).inflate(R.layout.image_grid_layout, parent, false))
     }
 
     override fun onBindViewHolder(holder: SelectedImageViewHolder, position: Int) {
@@ -25,9 +27,9 @@ class SelectedImageAdapter(private val items: ArrayList<Bitmap?>, val context: C
         return items.size
     }
 
-    inner class SelectedImageViewHolder(val binding: ImageGridLayoutBinding) : RecyclerView.ViewHolder(binding.root) {
-        val selectedImageImageview: ImageView? = binding.selectedImage
-        private val removeButton: ImageButton? = binding.removeButton
+    inner class SelectedImageViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val selectedImageImageview: ImageView? = view.selected_image
+        private val removeButton: ImageButton? = view.remove_button
         fun setItem(position: Int) {
             removeButton?.setOnClickListener { removeImage(position) }
         }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt b/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt
index 433c364..c751835 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt
@@ -9,9 +9,7 @@ import org.mifos.visionppi.objects.Role
  */
 
 data class User(
-    var firstName: String,
-    var middleName: String,
-    var lastName: String,
+
     var userId: Long = 0,
     var isAuthenticated: Boolean = false,
     var username: String? = null,
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt b/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt
index 0c2ddcf..3ac1424 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt
@@ -1,9 +1,7 @@
 package org.mifos.visionppi.models.mifoserror
 
-import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
-import kotlinx.parcelize.Parceler
 
 /**
  * @author HARSH-nith
@@ -16,25 +14,4 @@ data class Errors(
     var defaultUserMessage: String? = null,
     var userMessageGlobalisationCode: String? = null,
     var parameterName: String? = null
-) : Parcelable {
-    constructor(parcel: Parcel) : this(
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString()) {
-    }
-
-    companion object : Parceler<Errors> {
-
-        override fun Errors.write(parcel: Parcel, flags: Int) {
-            parcel.writeString(developerMessage)
-            parcel.writeString(defaultUserMessage)
-            parcel.writeString(userMessageGlobalisationCode)
-            parcel.writeString(parameterName)
-        }
-
-        override fun create(parcel: Parcel): Errors {
-            return Errors(parcel)
-        }
-    }
-}
+) : Parcelable
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt b/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt
index 6381b59..e042313 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt
@@ -1,9 +1,7 @@
 package org.mifos.visionppi.objects
 
-import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
-import kotlinx.parcelize.Parceler
 
 /**
  * Created by Apoorva M K on 29/06/19.
@@ -21,35 +19,4 @@ data class Client constructor(
     var parentName: String?,
     var entityMobileNo: String?,
     var entityStatus: Status?
-) : Parcelable {
-    constructor(parcel: Parcel) : this(
-            parcel.readValue(Int::class.java.classLoader) as? Int,
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readValue(Int::class.java.classLoader) as? Int,
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readParcelable(Status::class.java.classLoader)) {
-    }
-
-    companion object : Parceler<Client> {
-
-        override fun Client.write(parcel: Parcel, flags: Int) {
-            parcel.writeValue(entityId)
-            parcel.writeString(entityAccountNo)
-            parcel.writeString(entityExternalId)
-            parcel.writeString(entityName)
-            parcel.writeString(entityType)
-            parcel.writeValue(parentId)
-            parcel.writeString(parentName)
-            parcel.writeString(entityMobileNo)
-            parcel.writeParcelable(entityStatus, flags)
-        }
-
-        override fun create(parcel: Parcel): Client {
-            return Client(parcel)
-        }
-    }
-}
+) : Parcelable
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt
index 22a3a3c..8457446 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt
@@ -6,22 +6,20 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import kotlinx.android.synthetic.main.toolbar.*
 import org.mifos.visionppi.MainActivity
 import org.mifos.visionppi.R
-import org.mifos.visionppi.databinding.ToolbarBinding
 
 class AboutActivity : AppCompatActivity() {
     var contributors = "https://github.com/openMF/ppi-vision/graphs/contributors"
     var gitHub = "https://github.com/openMF/ppi-vision"
     var twitter = "https://twitter.com/mifos"
     var license = "https://github.com/openMF/ppi-vision/blob/master/LICENSE"
-    private lateinit var binding: ToolbarBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ToolbarBinding.inflate(layoutInflater)
         setContentView(R.layout.activity_about)
 
-        setSupportActionBar(binding.appToolbar)
+        setSupportActionBar(appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "About Us"
 
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt
index c1abcd0..5f09457 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt
@@ -8,12 +8,10 @@ import android.widget.Toast
 import butterknife.BindView
 import butterknife.ButterKnife
 import javax.inject.Inject
-//import kotlinx.android.synthetic.main.activity_login.til_password
-//import kotlinx.android.synthetic.main.activity_login.til_username
+import kotlinx.android.synthetic.main.activity_login.til_password
+import kotlinx.android.synthetic.main.activity_login.til_username
 import org.mifos.visionppi.MainActivity
 import org.mifos.visionppi.R
-import org.mifos.visionppi.databinding.ActivityLoginBinding
-import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.presenters.LoginPresenter
 import org.mifos.visionppi.ui.activities.base.BaseActivity
 import org.mifos.visionppi.ui.views.LoginView
@@ -34,13 +32,11 @@ class LoginActivity : BaseActivity(), LoginView {
     var llLogin: LinearLayout? = null
 
     private var userName: String? = null
-    private lateinit var binding: ActivityLoginBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivityLoginBinding.inflate(layoutInflater)
         activityComponent!!.inject(this)
-        val view = binding.root
-        setContentView(view)
+        setContentView(R.layout.activity_login)
         ButterKnife.bind(this)
         loginPresenter!!.attachView(this)
     }
@@ -84,27 +80,27 @@ class LoginActivity : BaseActivity(), LoginView {
     }
 
     override fun showUsernameError(error: String?) {
-        binding.tilUsername.error = error
+        til_username.error = error
     }
 
     override fun showPasswordError(error: String?) {
-        binding.tilPassword.error = error
+        til_password.error = error
     }
 
     override fun clearUsernameError() {
-        binding.tilUsername.isErrorEnabled = false
+        til_username.isErrorEnabled = false
     }
 
     override fun clearPasswordError() {
-        binding.tilPassword.isErrorEnabled = false
+        til_password.isErrorEnabled = false
     }
 
     /**
      * Called when Login Button is clicked, used for logging in the user
      */
     fun onLoginClicked(view: View) {
-        val username = binding.tilUsername.editText?.editableText.toString()
-        val password = binding.tilPassword.editText?.editableText.toString()
+        val username = til_username.editText?.editableText.toString()
+        val password = til_password.editText?.editableText.toString()
         if (Network.isConnected(this)) {
             loginPresenter?.login(username, password)
         } else {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
index 4830465..9b74b1a 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
@@ -4,9 +4,15 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import kotlinx.android.synthetic.main.activity_client_profile.accountNoValue
+import kotlinx.android.synthetic.main.activity_client_profile.clientIdValue
+import kotlinx.android.synthetic.main.activity_client_profile.clientNameValue
+import kotlinx.android.synthetic.main.activity_client_profile.clientTypeValue
+import kotlinx.android.synthetic.main.activity_client_profile.mobileNoValue
+import kotlinx.android.synthetic.main.activity_client_profile.new_survey_btn
+import kotlinx.android.synthetic.main.activity_client_profile.uname
+import kotlinx.android.synthetic.main.toolbar.appToolbar
 import org.mifos.visionppi.R
-import org.mifos.visionppi.databinding.ActivityClientProfileBinding
-import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.objects.Client
 import org.mifos.visionppi.ui.new_survey.NewPPISurveyActivity
 
@@ -15,36 +21,31 @@ import org.mifos.visionppi.ui.new_survey.NewPPISurveyActivity
  */
 
 class ClientProfileActivity : AppCompatActivity(), ClientProfileMVPView {
-    private lateinit var toolBarBinding: ToolbarBinding
-    private lateinit var activityClientProfileBinding: ActivityClientProfileBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_client_profile)
-        toolBarBinding = ToolbarBinding.inflate(layoutInflater)
-        activityClientProfileBinding=ActivityClientProfileBinding.inflate(layoutInflater)
-        val clientDetails = intent.getParcelableExtra("client") as Client?
-        if (clientDetails != null) {
-            setClientDetails(clientDetails)
-        }
+        val clientDetails = intent.getParcelableExtra("client") as Client
+        setClientDetails(clientDetails)
 
-        setSupportActionBar(toolBarBinding.appToolbar)
+        setSupportActionBar(appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "Client Profile"
 
-        activityClientProfileBinding.newSurveyBtn.setOnClickListener {
+        new_survey_btn.setOnClickListener {
             val intent = Intent(applicationContext, NewPPISurveyActivity::class.java)
             startActivity(intent)
         }
     }
 
     override fun setClientDetails(client: Client) {
-        activityClientProfileBinding.uname.text = client?.entityName
-        activityClientProfileBinding.clientIdValue.text = client?.entityId.toString()
-        activityClientProfileBinding.clientNameValue.text = client?.entityName
-        activityClientProfileBinding.accountNoValue.text = client?.entityAccountNo
-        activityClientProfileBinding.mobileNoValue.text = client?.entityMobileNo
-        activityClientProfileBinding.clientTypeValue.text = client?.entityType
+        uname.text = client.entityName
+        clientIdValue.text = client.entityId.toString()
+        clientNameValue.text = client.entityName
+        accountNoValue.text = client.entityAccountNo
+        mobileNoValue.text = client.entityMobileNo
+        clientTypeValue.text = client.entityType
     }
 
     override fun showToastMessage(string: String) {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt
index 3fc6857..45fec0a 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt
@@ -23,15 +23,18 @@ import com.google.mlkit.vision.label.custom.CustomImageLabelerOptions
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
+import kotlinx.android.synthetic.main.activity_computer_vision.analyse
+import kotlinx.android.synthetic.main.activity_computer_vision.open_camera_btn
+import kotlinx.android.synthetic.main.activity_computer_vision.res_list
+import kotlinx.android.synthetic.main.activity_computer_vision.selected_images_list
+import kotlinx.android.synthetic.main.activity_computer_vision.upload_from_gallery_btn
+import kotlinx.android.synthetic.main.toolbar.*
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.ObjectDetectionResultAdapter
 import org.mifos.visionppi.adapters.SelectedImageAdapter
-import org.mifos.visionppi.databinding.ActivityComputerVisionBinding
-import org.mifos.visionppi.databinding.ToolbarBinding
 
 class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
-    private lateinit var toolBarBinding: ToolbarBinding
-    private lateinit var activityComputerVisionBinding: ActivityComputerVisionBinding
+
     private val images = ArrayList<Bitmap?>()
     private val pickFromGallery = 1
     private val cameraRequest = 2
@@ -53,28 +56,26 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_computer_vision)
-        toolBarBinding = ToolbarBinding.inflate(layoutInflater)
-        activityComputerVisionBinding = ActivityComputerVisionBinding.inflate(layoutInflater)
-        setSupportActionBar(toolBarBinding.appToolbar)
 
+        setSupportActionBar(appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "Analyse Images"
 
         actionBar?.setDisplayHomeAsUpEnabled(true)
         actionBar?.setDisplayShowHomeEnabled(true)
 
-        activityComputerVisionBinding.uploadFromGalleryBtn.setOnClickListener {
+        upload_from_gallery_btn.setOnClickListener {
             fetchFromGallery()
         }
 
-        activityComputerVisionBinding.openCameraBtn.setOnClickListener {
+        open_camera_btn.setOnClickListener {
             fetchFromCamera()
         }
 
-        activityComputerVisionBinding.selectedImagesList.layoutManager = GridLayoutManager(this, 3)
-        activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+        selected_images_list.layoutManager = GridLayoutManager(this, 3)
+        selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
 
-        activityComputerVisionBinding.analyse.setOnClickListener {
+        analyse.setOnClickListener {
             counter = 0
             imageNos = images.size
             if (images.isNotEmpty()) {
@@ -152,7 +153,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                 val activitySelectIMage = 1234
                 startActivityForResult(Intent.createChooser(intent, "Select Picture"), activitySelectIMage)
 
-                activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+                selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
             }
         } catch (e: Exception) {
             e.printStackTrace()
@@ -173,7 +174,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
     }
 
     override fun analyzeImages() {
-        activityComputerVisionBinding.resList.adapter = null
+        res_list.adapter = null
         for (image in images) {
             detect(image!!)
         }
@@ -198,7 +199,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                     ++counter
                     finalLabels.add(ll)
                     if (counter == imageNos) {
-                        activityComputerVisionBinding.resList.adapter = ObjectDetectionResultAdapter(finalLabels, images, baseContext)
+                        res_list.adapter = ObjectDetectionResultAdapter(finalLabels, images, baseContext)
                     }
                 }
                 .addOnFailureListener { e ->
@@ -219,7 +220,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                     val mImageUri: Uri = data.data!!
                     val bitmap = MediaStore.Images.Media.getBitmap(this.contentResolver, mImageUri)
                     images.add(bitmap)
-                    activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+                    selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
                 } else {
                     if (data?.clipData != null) {
                         val mClipData: ClipData = data.clipData!!
@@ -228,7 +229,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                             val uri: Uri = item.uri
                             val bitmap = MediaStore.Images.Media.getBitmap(this.contentResolver, uri)
                             images.add(bitmap)
-                            activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+                            selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
                         }
                     }
                 }
@@ -238,7 +239,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
         if (requestCode === cameraRequest && resultCode === Activity.RESULT_OK) {
             val photoCaptured = data?.extras?.get("data") as Bitmap
             images.add(photoCaptured)
-            activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+            selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
         }
     }
 
@@ -267,6 +268,6 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
 
     private fun imageRemove(position: Int) {
         images.removeAt(position)
-        activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+        selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
index 6962fb4..830d104 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
@@ -17,12 +17,13 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
+import kotlinx.android.synthetic.main.content_main.client_search_list
+import kotlinx.android.synthetic.main.content_main.search_btn
+import kotlinx.android.synthetic.main.content_main.search_query
 import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.uiThread
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.ClientSearchAdapter
-import org.mifos.visionppi.databinding.ActivityComputerVisionBinding
-import org.mifos.visionppi.databinding.ContentMainBinding
 import org.mifos.visionppi.objects.Client
 import org.mifos.visionppi.ui.client_profile.ClientProfileActivity
 
@@ -31,7 +32,7 @@ import org.mifos.visionppi.ui.client_profile.ClientProfileActivity
  */
 
 class MainActivity : Fragment(), MainMVPView {
-    private lateinit var contentMainBinding: ContentMainBinding
+
     lateinit var clientList: List<Client>
     var mMainPresenter: MainPresenter = MainPresenter()
 
@@ -42,15 +43,14 @@ class MainActivity : Fragment(), MainMVPView {
     ): View? {
         super.onCreate(savedInstanceState)
         val root = inflater.inflate(R.layout.content_main, container, false)
-        contentMainBinding=ContentMainBinding.inflate(layoutInflater)
         return root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        contentMainBinding.clientSearchList.layoutManager = LinearLayoutManager(requireContext())
+        client_search_list.layoutManager = LinearLayoutManager(requireContext())
 
-        contentMainBinding.searchQuery.setOnEditorActionListener(TextView.OnEditorActionListener { _, actionId, _ ->
+        search_query.setOnEditorActionListener(TextView.OnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                 performSearch()
                 return@OnEditorActionListener true
@@ -58,7 +58,7 @@ class MainActivity : Fragment(), MainMVPView {
             false
         })
 
-        contentMainBinding.searchQuery.addTextChangedListener(object : TextWatcher {
+        search_query.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(p0: Editable?) {
             }
 
@@ -67,31 +67,31 @@ class MainActivity : Fragment(), MainMVPView {
 
             override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
                 if (p0.toString().trim().isEmpty()) {
-                    contentMainBinding.searchBtn.isEnabled = false
-                    contentMainBinding.searchBtn.alpha = 0.5F
+                    search_btn.isEnabled = false
+                    search_btn.alpha = 0.5F
                 } else {
-                    contentMainBinding.searchBtn.isEnabled = true
-                    contentMainBinding.searchBtn.alpha = 1.0F
+                    search_btn.isEnabled = true
+                    search_btn.alpha = 1.0F
                 }
             }
         })
 
-        contentMainBinding.searchBtn.setOnClickListener {
+        search_btn.setOnClickListener {
             performSearch()
         }
     }
 
     private fun performSearch() {
         if (networkAvailable(requireActivity())) {
-            contentMainBinding.searchQuery.onEditorAction(EditorInfo.IME_ACTION_DONE)
+            search_query.onEditorAction(EditorInfo.IME_ACTION_DONE)
             println("Going in")
-            if (contentMainBinding.searchQuery.text.toString().isEmpty())
+            if (search_query.text.toString().isEmpty())
                 searchError()
             else {
                 println("going in deeper")
                 val inputMethodManager = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-                inputMethodManager.hideSoftInputFromWindow(contentMainBinding.searchBtn.windowToken, 0)
-                search(contentMainBinding.searchQuery.text.toString())
+                inputMethodManager.hideSoftInputFromWindow(search_btn.windowToken, 0)
+                search(search_query.text.toString())
             }
         } else {
             showToastMessage("Internet connection not available. Please check network settings")
@@ -152,7 +152,7 @@ class MainActivity : Fragment(), MainMVPView {
         if (clientList.isEmpty())
             searchUnsuccessful()
 
-        contentMainBinding.clientSearchList.adapter =
+        client_search_list.adapter =
                 ClientSearchAdapter(clientList, requireContext()) { item -> onClick(item) }
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt
deleted file mode 100644
index 58e3c78..0000000
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.mifos.visionppi.ui.menu
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.Fragment
-import org.mifos.visionppi.R
-import org.mifos.visionppi.api.local.PreferencesHelper
-import org.mifos.visionppi.databinding.ActivityMenuBinding
-import org.mifos.visionppi.models.User
-import org.mifos.visionppi.ui.AboutActivity
-import org.mifos.visionppi.ui.activities.LoginActivity
-import org.mifos.visionppi.ui.user_profile.UserProfileActivity
-import org.mifos.visionppi.utils.PrefManager
-
-class MenuActivity : Fragment(), MenuMVPView {
-
-    lateinit var user: User
-    private lateinit var activityMenuBinding: ActivityMenuBinding
-    var mMenuPresenter: MenuPresenter = MenuPresenter()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        activityMenuBinding=ActivityMenuBinding.inflate(layoutInflater)
-        super.onCreate(savedInstanceState)
-        val shareButton = activityMenuBinding.shareButton
-        val editProfileButton = activityMenuBinding.editProfileButton
-        val aboutButton = activityMenuBinding.aboutButton
-        val logoutButton = activityMenuBinding.logoutButton
-
-        shareButton.setOnClickListener {
-            val shareIntent = Intent()
-            shareIntent.action = Intent.ACTION_SEND
-            shareIntent.putExtra(
-                    Intent.EXTRA_TEXT,
-                    getString(R.string.install_vision).toString() + "\n" + getString(R.string.download_link)
-            )
-            shareIntent.type = "text/plain"
-            startActivity(shareIntent)
-        }
-
-        editProfileButton.setOnClickListener {
-            val editIntent = Intent(requireContext(), UserProfileActivity::class.java)
-            startActivity(editIntent)
-        }
-
-        aboutButton.setOnClickListener{
-            val aboutIntent = Intent(requireContext(), AboutActivity::class.java)
-            startActivity(aboutIntent)
-        }
-
-        logoutButton.setOnClickListener{
-            showLogoutDialog()
-        }
-
-        return activityMenuBinding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        getUserDetails()
-    }
-
-    override fun getUserDetails() {
-        user = mMenuPresenter.fetchUserDetails(requireActivity(), requireContext())
-        setUserDetails()
-    }
-
-    override fun setUserDetails() {
-        activityMenuBinding.uname.text = user.username
-        activityMenuBinding.usernameValue.text = user.username
-        activityMenuBinding.userIdValue.text = user.userId.toString()
-        activityMenuBinding.officeNameValue.text = user.officeName
-        activityMenuBinding.officeIdValue.text = user.officeId.toString()
-        activityMenuBinding.staffIdValue.text = user.staffId.toString()
-        activityMenuBinding.staffDispNameValue.text = user.staffDisplayName
-    }
-
-    override fun showToastMessage(string: String) {
-        Toast.makeText(requireContext(), string, Toast.LENGTH_SHORT).show()
-    }
-
-    fun showLogoutDialog() {
-        val dialogBuilder = AlertDialog.Builder(requireContext())
-
-        dialogBuilder.setMessage("Are you sure you want to logout?")
-        dialogBuilder.setPositiveButton("Yes") { _, _ ->
-            val preferencesHelper = PreferencesHelper(requireContext())
-            preferencesHelper.clear()
-            val prefManager = PrefManager()
-            prefManager.clear(requireActivity(), requireContext())
-            val intent = Intent(requireContext().applicationContext, LoginActivity::class.java)
-            startActivity(intent)
-        }
-
-        dialogBuilder.setNegativeButton("No") { dialog, _ ->
-            dialog.dismiss()
-        }
-        val dialog = dialogBuilder.create()
-        dialog.show()
-    }
-}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt
deleted file mode 100644
index 7c295d7..0000000
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.mifos.visionppi.ui.menu
-import org.mifos.visionppi.base.MVPView
-
-interface MenuMVPView : MVPView {
-    fun getUserDetails()
-
-    fun setUserDetails()
-}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt
deleted file mode 100644
index d4d3e7c..0000000
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.mifos.visionppi.ui.menu
-import android.app.Activity
-import android.content.Context
-import com.google.gson.Gson
-import org.mifos.visionppi.R
-import org.mifos.visionppi.base.BasePresenter
-import org.mifos.visionppi.models.User
-import org.mifos.visionppi.utils.PrefManager
-
-class MenuPresenter : BasePresenter<MenuMVPView>() {
-
-    private val gson: Gson = Gson()
-
-    fun fetchUserDetails(activity: Activity, context: Context): User {
-        val mPrefManager = PrefManager()
-        val sharedPref = activity.getSharedPreferences(context.getString(R.string.pref_file_name), Context.MODE_PRIVATE)
-        val userJsonString = sharedPref.getString(mPrefManager.userDetails, " ")
-
-        return gson.fromJson(userJsonString, User::class.java)
-    }
-}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt
index 5e7c25e..f1d3ba8 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt
@@ -6,29 +6,26 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
+import kotlinx.android.synthetic.main.activity_new_survey.ppi_survey
+import kotlinx.android.synthetic.main.new_survey_toolbar.computer_vision
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.QuestionAdapter
-import org.mifos.visionppi.databinding.ActivityComputerVisionBinding
-import org.mifos.visionppi.databinding.ActivityNewSurveyBinding
-import org.mifos.visionppi.databinding.NewSurveyToolbarBinding
 import org.mifos.visionppi.objects.PPISurvey
 import org.mifos.visionppi.objects.Response
 import org.mifos.visionppi.ui.computer_vision.ComputerVisionActivity
 
 class NewSurveyActivity : AppCompatActivity(), NewSurveyMVPView {
-    private lateinit var newSurveyToolbarBinding: NewSurveyToolbarBinding
-    private lateinit var activityNewSurveyBinding: ActivityNewSurveyBinding
+
     private var mNewSurveyPresenter: NewSurveyPresenter = NewSurveyPresenter()
     lateinit var mPPISurvey: PPISurvey
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_new_survey)
-        newSurveyToolbarBinding=NewSurveyToolbarBinding.inflate(layoutInflater)
-        activityNewSurveyBinding=ActivityNewSurveyBinding.inflate(layoutInflater)
+
         getSurveyQuestions()
 
-        newSurveyToolbarBinding.computerVision.setOnClickListener {
+        computer_vision.setOnClickListener {
             val intent = Intent(applicationContext, ComputerVisionActivity::class.java)
             startActivity(intent)
         }
@@ -41,10 +38,10 @@ class NewSurveyActivity : AppCompatActivity(), NewSurveyMVPView {
 
     override fun renderSurvey(mPPISurvey: PPISurvey) {
         val snapHelper = PagerSnapHelper()
-        snapHelper.attachToRecyclerView(activityNewSurveyBinding.ppiSurvey)
-        activityNewSurveyBinding.ppiSurvey.layoutManager = LinearLayoutManager(this)
-        activityNewSurveyBinding.ppiSurvey.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
-        activityNewSurveyBinding.ppiSurvey.adapter = QuestionAdapter(mPPISurvey.questionDatas, applicationContext) { response: Response -> onResponseClicked(response) }
+        snapHelper.attachToRecyclerView(ppi_survey)
+        ppi_survey.layoutManager = LinearLayoutManager(this)
+        ppi_survey.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
+        ppi_survey.adapter = QuestionAdapter(mPPISurvey.questionDatas, applicationContext) { response: Response -> onResponseClicked(response) }
     }
 
     override fun showToastMessage(string: String) {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt
index bd3ffe0..bc1a3a6 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt
@@ -7,30 +7,30 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import kotlinx.android.synthetic.main.ppi_question_layout.view.question
+import kotlinx.android.synthetic.main.ppi_question_layout.view.res
+import kotlinx.android.synthetic.main.ppi_question_layout.view.responses
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.ResponseAdapter
-import org.mifos.visionppi.databinding.NewSurveyToolbarBinding
-import org.mifos.visionppi.databinding.PpiQuestionLayoutBinding
 import org.mifos.visionppi.objects.Question
 import org.mifos.visionppi.objects.Response
 import org.mifos.visionppi.ui.computer_vision.ComputerVisionActivity
 
 class PPIQuestionFragment(var questionData: Question, private val mContext: Context, private val responseClick: (response: Response) -> Unit) : Fragment() {
-    private lateinit var ppiQuestionLayoutBinding: PpiQuestionLayoutBinding
-    val list get() = ComputerVisionActivity.finalLabels
 
+    val list
+        get() = ComputerVisionActivity.finalLabels
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        val view = inflater.inflate(R.layout.ppi_question_layout, container, false)
 
-        ppiQuestionLayoutBinding=PpiQuestionLayoutBinding.inflate(layoutInflater)
-        ppiQuestionLayoutBinding.responses.adapter = ResponseAdapter(questionData.responseDatas, mContext, responseClick)
-        val view = ppiQuestionLayoutBinding.root
+        view.responses.adapter = ResponseAdapter(questionData.responseDatas, mContext, responseClick)
         return view
     }
 
     override fun onResume() {
         super.onResume()
-        ppiQuestionLayoutBinding.question.text = questionData.text
-        ppiQuestionLayoutBinding.responses.layoutManager = LinearLayoutManager(context)
+        requireView().question.text = questionData.text
+        requireView().responses.layoutManager = LinearLayoutManager(context)
         if (!list.isNullOrEmpty()) {
             var s: String = ""
             var c: Int = 0
@@ -162,9 +162,9 @@ class PPIQuestionFragment(var questionData: Question, private val mContext: Cont
                 s = "There are $c telephones detected"
             }
 
-            ppiQuestionLayoutBinding.res.text = s
+            requireView().res.text = s
 
-            ppiQuestionLayoutBinding.res.visibility = View.VISIBLE
+            requireView().res.visibility = View.VISIBLE
         }
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt
index 174f4df..6160d36 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt
@@ -5,54 +5,57 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import androidx.navigation.findNavController
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.setupActionBarWithNavController
-import androidx.navigation.ui.setupWithNavController
-import com.google.android.material.bottomnavigation.BottomNavigationView
+import kotlinx.android.synthetic.main.activity_user_profile.office_id_value
+import kotlinx.android.synthetic.main.activity_user_profile.office_name_value
+import kotlinx.android.synthetic.main.activity_user_profile.staff_disp_name_value
+import kotlinx.android.synthetic.main.activity_user_profile.staff_id_value
+import kotlinx.android.synthetic.main.activity_user_profile.uname
+import kotlinx.android.synthetic.main.activity_user_profile.user_id_value
+import kotlinx.android.synthetic.main.activity_user_profile.username_value
 import org.mifos.visionppi.R
-import org.mifos.visionppi.databinding.ActivityUserProfileBinding
-import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.models.User
 
 /**
  * Created by Apoorva M K on 27/06/19.
  */
 
-class UserProfileActivity : AppCompatActivity(), UserProfileMVPView {
+class UserProfileActivity : Fragment(), UserProfileMVPView {
 
     lateinit var user: User
-    private lateinit var activityUserProfileBinding: ActivityUserProfileBinding
     var mUserProfilePresenter: UserProfilePresenter = UserProfilePresenter()
-    private lateinit var binding: ToolbarBinding
-    override fun onCreate(savedInstanceState: Bundle?) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         super.onCreate(savedInstanceState)
-        binding = ToolbarBinding.inflate(layoutInflater)
-        activityUserProfileBinding=ActivityUserProfileBinding.inflate(layoutInflater)
-        setContentView(activityUserProfileBinding.root)
-        setSupportActionBar(binding.appToolbar)
+        return inflater.inflate(R.layout.activity_user_profile, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         getUserDetails()
     }
 
     override fun getUserDetails() {
-        user = mUserProfilePresenter.fetchUserDetails(this, this)
+        user = mUserProfilePresenter.fetchUserDetails(requireActivity(), requireContext())
         setUserDetails()
     }
 
     override fun setUserDetails() {
 
-        activityUserProfileBinding.uname.text = user.username
-        activityUserProfileBinding.usernameValue.text = user.username
-        activityUserProfileBinding.userIdValue.text = user.userId.toString()
-        activityUserProfileBinding.officeNameValue.text = user.officeName
-        activityUserProfileBinding.officeIdValue.text = user.officeId.toString()
-        activityUserProfileBinding.staffIdValue.text = user.staffId.toString()
-        activityUserProfileBinding.staffDispNameValue.text = user.staffDisplayName
+        uname.text = user.username
+        username_value.text = user.username
+        user_id_value.text = user.userId.toString()
+        office_name_value.text = user.officeName
+        office_id_value.text = user.officeId.toString()
+        staff_id_value.text = user.staffId.toString()
+        staff_disp_name_value.text = user.staffDisplayName
     }
 
     override fun showToastMessage(string: String) {
-        Toast.makeText(this, string, Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), string, Toast.LENGTH_SHORT).show()
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt b/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt
index e48f885..9cc5e80 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt
@@ -4,7 +4,6 @@ import khttp.structures.authorization.Authorization
 
 data class AuthKey(val authKey: String) : Authorization {
     override val header: Pair<String, String>
-
         get() {
             return "Authorization" to "Basic $authKey"
         }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt b/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt
index 811fbfb..9bb9d56 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt
@@ -17,7 +17,7 @@ object Network {
      */
     private fun getNetworkInfo(context: Context): NetworkInfo {
         val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        return cm.activeNetworkInfo!!
+        return cm.activeNetworkInfo
     }
 
     /**
diff --git a/visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml b/visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml
deleted file mode 100644
index 8fa1695..0000000
--- a/visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-5h2v5zM13,17h-2v-3h2v3zM13,12h-2v-2h2v2zM17,17h-2L15,7h2v10z"/>
-</vector>
diff --git a/visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml b/visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml
deleted file mode 100644
index 543cee9..0000000
--- a/visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
-</vector>
diff --git a/visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml b/visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml
deleted file mode 100644
index a5687c6..0000000
--- a/visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
-</vector>
diff --git a/visionppi/app/src/main/res/layout/activity_about.xml b/visionppi/app/src/main/res/layout/activity_about.xml
index 21540ee..2bd6698 100644
--- a/visionppi/app/src/main/res/layout/activity_about.xml
+++ b/visionppi/app/src/main/res/layout/activity_about.xml
@@ -3,9 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="@android:color/white"
-    tools:viewBindingIgnore="true">
+    android:background="@android:color/white">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/visionppi/app/src/main/res/layout/activity_login.xml b/visionppi/app/src/main/res/layout/activity_login.xml
index 61c0196..d6bb329 100644
--- a/visionppi/app/src/main/res/layout/activity_login.xml
+++ b/visionppi/app/src/main/res/layout/activity_login.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white"
     android:layout_height="match_parent"
diff --git a/visionppi/app/src/main/res/layout/activity_main.xml b/visionppi/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index fad45aa..0000000
--- a/visionppi/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:viewBindingIgnore="true">
-
-    <FrameLayout
-        android:id="@+id/frameLayout"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-    </FrameLayout>
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottomNavigationView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/activity_main2.xml b/visionppi/app/src/main/res/layout/activity_main2.xml
index ed627a6..185cf63 100644
--- a/visionppi/app/src/main/res/layout/activity_main2.xml
+++ b/visionppi/app/src/main/res/layout/activity_main2.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:viewBindingIgnore="true">
+    android:layout_height="match_parent">
 
     <include layout="@layout/toolbar" />
 
@@ -28,11 +26,9 @@
         android:layout_height="match_parent"
         app:defaultNavHost="true"
         app:layout_constraintBottom_toTopOf="@id/nav_view"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0"
         app:navGraph="@navigation/mobile_navigation" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/activity_menu.xml b/visionppi/app/src/main/res/layout/activity_menu.xml
deleted file mode 100644
index edae1c4..0000000
--- a/visionppi/app/src/main/res/layout/activity_menu.xml
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar_layout"
-        android:layout_height="225dp"
-        android:layout_width="match_parent">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsing_toolbar"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            app:contentScrim="?attr/colorPrimary"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed"
-            app:titleEnabled="false">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:gravity="center"
-                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                app:layout_collapseMode="parallax">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="User Profile"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-            </androidx.appcompat.widget.Toolbar>
-
-            <View
-                android:background="@drawable/background"
-                android:layout_gravity="bottom"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"/>
-
-            <LinearLayout
-                android:gravity="center"
-                android:layout_height="match_parent"
-                android:layout_marginTop="56dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
-                android:layout_width="match_parent"
-                android:orientation="vertical"
-                app:layout_collapseMode="parallax">
-                <LinearLayout
-                    android:gravity="center"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    app:layout_collapseMode="parallax">
-
-                    <ImageView
-                        android:id="@+id/profileImage"
-                        android:layout_height="84dp"
-                        android:src="@drawable/ic_wrapped_person_black_24dp"
-                        android:layout_width="84dp"
-                        android:visibility="visible" />
-
-                    <LinearLayout
-                        android:gravity="center_vertical|left"
-                        android:layout_height="match_parent"
-                        android:layout_margin="10dp"
-                        android:layout_width="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_collapseMode="parallax"
-                        >
-
-    <!--                    <TextView-->
-    <!--                        android:gravity="center"-->
-    <!--                        android:layout_width="wrap_content"-->
-    <!--                        android:layout_height="wrap_content"-->
-    <!--                        android:layout_marginLeft="@dimen/text_size"-->
-    <!--                        android:textSize="16sp"-->
-    <!--                        android:textColor="@android:color/black"-->
-    <!--                        android:layout_margin="10dp"-->
-    <!--                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"-->
-    <!--                        android:text="Firstname Middlename Lastname"-->
-    <!--                        android:id="@+id/name"/>-->
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="bottom"
-                            android:layout_margin="10dp"
-                            android:textSize="24sp"
-                            android:textColor="@android:color/black"
-                            android:layout_marginBottom="10dp"
-                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                            android:text="usernamegoeshere"
-                            android:id="@+id/uname"/>
-
-                    </LinearLayout>
-
-                </LinearLayout>
-                <LinearLayout
-                    android:gravity="center"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    app:layout_collapseMode="parallax">
-
-                    <Button
-                        android:id="@+id/editProfileButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="50dp"
-                        android:layout_weight="1"
-                        android:text="Edit Profile" />
-
-                    <Button
-                        android:id="@+id/shareButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="50dp"
-                        android:layout_weight="1"
-                        android:text="Share" />
-                </LinearLayout>
-            </LinearLayout>
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/ncv_customer_details"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:id="@+id/ll_user_profile"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:orientation="vertical">
-
-            <androidx.cardview.widget.CardView
-                android:background="@color/white"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                app:cardElevation="4dp">
-
-                <LinearLayout
-                    android:layout_height="match_parent"
-                    android:layout_width="match_parent"
-                    android:orientation="vertical"
-                    android:padding="16dp">
-
-                    <TextView
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:text="@string/username"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                        android:textColor="@color/primary"/>
-
-                    <TextView
-                        android:gravity="center"
-                        android:id="@+id/username_value"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:paddingTop="4dp"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                        tools:text="@string/medium_text"/>
-
-                    <View
-                        android:background="@color/light_grey"
-                        android:layout_height="1dp"
-                        android:layout_width="match_parent"/>
-
-                    <TextView
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/default_margin"
-                        android:layout_width="wrap_content"
-                        android:text="User ID Value"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                        android:textColor="@color/primary"/>
-
-                    <TextView
-                        android:gravity="center"
-                        android:id="@+id/user_id_value"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:paddingTop="4dp"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                        tools:text="@string/medium_text"/>
-
-                    <View
-                        android:background="@color/light_grey"
-                        android:layout_height="1dp"
-                        android:layout_width="match_parent"/>
-
-                    <TextView
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/default_margin"
-                        android:layout_width="wrap_content"
-                        android:text="Office"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                        android:textColor="@color/primary"/>
-                    <TextView
-                        android:gravity="center"
-                        android:id="@+id/office_name_value"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:paddingTop="4dp"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                        tools:text="@string/medium_text"/>
-
-                    <View
-                        android:background="@color/light_grey"
-                        android:layout_height="1dp"
-                        android:layout_width="match_parent"/>
-
-                    <TextView
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/default_margin"
-                        android:layout_width="wrap_content"
-                        android:text="Office ID"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                        android:textColor="@color/primary"/>
-                    <TextView
-                        android:gravity="center"
-                        android:id="@+id/office_id_value"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:paddingTop="4dp"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                        tools:text="@string/medium_text"/>
-
-                    <View
-                        android:background="@color/light_grey"
-                        android:layout_height="1dp"
-                        android:layout_width="match_parent"/>
-
-                    <TextView
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/default_margin"
-                        android:layout_width="wrap_content"
-                        android:text="Staff ID"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                        android:textColor="@color/primary"/>
-                    <TextView
-                        android:gravity="center"
-                        android:id="@+id/staff_id_value"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:paddingTop="4dp"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                        tools:text="@string/medium_text"/>
-
-                    <View
-                        android:background="@color/light_grey"
-                        android:layout_height="1dp"
-                        android:layout_width="match_parent"/>
-
-                    <TextView
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/default_margin"
-                        android:layout_width="wrap_content"
-                        android:text="Staff Display Name"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                        android:textColor="@color/primary"/>
-                    <TextView
-                        android:gravity="center"
-                        android:id="@+id/staff_disp_name_value"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:paddingTop="4dp"
-                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-                        tools:text="@string/medium_text"/>
-
-                </LinearLayout>
-
-            </androidx.cardview.widget.CardView>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:orientation="vertical"
-        android:layout_marginBottom="56dp">
-        <Button
-            android:id="@+id/aboutButton"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_weight="1"
-            android:text="About" />
-
-        <Button
-            android:id="@+id/logoutButton"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_weight="1"
-            android:text="Logout" />
-    </LinearLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/activity_new_survey.xml b/visionppi/app/src/main/res/layout/activity_new_survey.xml
index 1892a32..86f5fc7 100644
--- a/visionppi/app/src/main/res/layout/activity_new_survey.xml
+++ b/visionppi/app/src/main/res/layout/activity_new_survey.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml b/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml
index 4756387..f42e331 100644
--- a/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml
+++ b/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.viewpager.widget.ViewPager
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ppi_view_pager"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:viewBindingIgnore="true"/>
+    android:layout_height="match_parent" />
diff --git a/visionppi/app/src/main/res/layout/activity_user_profile.xml b/visionppi/app/src/main/res/layout/activity_user_profile.xml
index afa752b..51145b0 100644
--- a/visionppi/app/src/main/res/layout/activity_user_profile.xml
+++ b/visionppi/app/src/main/res/layout/activity_user_profile.xml
@@ -46,19 +46,19 @@
                     android:id="@+id/uname"/>
             </LinearLayout>
 
+            <View
+                android:background="@drawable/background"
+                android:layout_gravity="bottom"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"/>
+
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_height="?attr/actionBarSize"
                 android:layout_width="match_parent"
                 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                app:layout_collapseMode="pin">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="Edit Profile"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-            </androidx.appcompat.widget.Toolbar>
+                app:layout_collapseMode="pin"
+                app:title="User Details"/>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -217,26 +217,4 @@
 
     </androidx.core.widget.NestedScrollView>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:orientation="vertical"
-        android:layout_margin="10dp">
-        <Button
-            android:id="@+id/saveButton"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_weight="1"
-            android:text="Save" />
-    </LinearLayout>
-
-<!--    <View-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="match_parent"-->
-<!--        android:layout_gravity="bottom"-->
-<!--        android:background="@drawable/background"-->
-<!--        app:layout_anchor="@+id/app_bar_layout"-->
-<!--        app:layout_anchorGravity="center" />-->
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/image_grid_layout.xml b/visionppi/app/src/main/res/layout/image_grid_layout.xml
index c6593e0..126dcdf 100644
--- a/visionppi/app/src/main/res/layout/image_grid_layout.xml
+++ b/visionppi/app/src/main/res/layout/image_grid_layout.xml
@@ -4,8 +4,7 @@
     android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="@dimen/foursp_margin"
-    >
+    android:padding="@dimen/foursp_margin">
 
     <ImageView
             android:layout_width="155dp"
diff --git a/visionppi/app/src/main/res/layout/new_survey_toolbar.xml b/visionppi/app/src/main/res/layout/new_survey_toolbar.xml
index b05929d..1fdaa81 100644
--- a/visionppi/app/src/main/res/layout/new_survey_toolbar.xml
+++ b/visionppi/app/src/main/res/layout/new_survey_toolbar.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.Toolbar
         xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/blueDark">
diff --git a/visionppi/app/src/main/res/layout/ppi_response_row.xml b/visionppi/app/src/main/res/layout/ppi_response_row.xml
index dcf3fcd..3b80cc2 100644
--- a/visionppi/app/src/main/res/layout/ppi_response_row.xml
+++ b/visionppi/app/src/main/res/layout/ppi_response_row.xml
@@ -3,8 +3,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="10dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-   >
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
             android:orientation="horizontal"
diff --git a/visionppi/app/src/main/res/menu/bottom_nav_menu.xml b/visionppi/app/src/main/res/menu/bottom_nav_menu.xml
index 3e2d9a3..4f53998 100644
--- a/visionppi/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/visionppi/app/src/main/res/menu/bottom_nav_menu.xml
@@ -3,17 +3,12 @@
 
     <item
         android:id="@+id/navigation_home"
-        android:icon="@drawable/ic_baseline_search_24"
-        android:title="@string/title_search" />
+        android:icon="@drawable/ic_home_black_24dp"
+        android:title="@string/title_home" />
 
     <item
         android:id="@+id/navigation_dashboard"
-        android:icon="@drawable/ic_baseline_analytics_24"
-        android:title="@string/title_analyze" />
-
-    <item
-        android:id="@+id/navigation_menu"
-        android:icon="@drawable/ic_baseline_menu_24"
-        android:title="@string/title_menu" />
+        android:icon="@drawable/ic_profile"
+        android:title="@string/title_dashboard" />
 
 </menu>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/navigation/mobile_navigation.xml b/visionppi/app/src/main/res/navigation/mobile_navigation.xml
index 274534b..b36e273 100644
--- a/visionppi/app/src/main/res/navigation/mobile_navigation.xml
+++ b/visionppi/app/src/main/res/navigation/mobile_navigation.xml
@@ -13,13 +13,7 @@
 
     <fragment
         android:id="@+id/navigation_dashboard"
-        android:name="org.mifos.visionppi.ui.home.MainActivity"
-        android:label="@string/title_analyze"
-        tools:layout="@layout/content_main" />
-
-    <fragment
-        android:id="@+id/navigation_menu"
-        android:name="org.mifos.visionppi.ui.menu.MenuActivity"
-        android:label="@string/title_menu"
-        tools:layout="@layout/activity_menu" />
+        android:name="org.mifos.visionppi.ui.user_profile.UserProfileActivity"
+        android:label="@string/title_dashboard"
+        tools:layout="@layout/activity_user_profile" />
 </navigation>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/values/strings.xml b/visionppi/app/src/main/res/values/strings.xml
index e066930..a16dabe 100644
--- a/visionppi/app/src/main/res/values/strings.xml
+++ b/visionppi/app/src/main/res/values/strings.xml
@@ -51,9 +51,6 @@
     <string name="object_detection_results">Object Detection Results</string>
     <string name="title_activity_main">MainActivity</string>
     <string name="title_home">Home</string>
-    <string name="title_search">Search</string>
-    <string name="title_analyze">Analyze</string>
-    <string name="title_menu">Menu</string>
     <string name="title_dashboard">Profile</string>
     <string name="medium_text">Placeholder</string>
     <string name="about_app">Vision PPI helps officers to fill PPI Surveys automatically with the help of photographs taken in a clients house.</string>
diff --git a/visionppi/build.gradle b/visionppi/build.gradle
index 25b77f9..b1cf4c7 100644
--- a/visionppi/build.gradle
+++ b/visionppi/build.gradle
@@ -4,13 +4,12 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21'
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.7.10"
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'io.fabric.tools:gradle:1.31.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/visionppi/gradle/wrapper/gradle-wrapper.properties b/visionppi/gradle/wrapper/gradle-wrapper.properties
index 083c7c5..00bcd6b 100644
--- a/visionppi/gradle/wrapper/gradle-wrapper.properties
+++ b/visionppi/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

From 4aaf8ce5c32126145c9aaff7da38401e30bc7806 Mon Sep 17 00:00:00 2001
From: gr1nd3lw4ld <gr1nd3lw4ld07@gmail.com>
Date: Wed, 26 Jul 2023 23:55:17 +0530
Subject: [PATCH 5/5] added new ui

---
 visionppi/.idea/gradle.xml                    |   2 +-
 visionppi/.idea/misc.xml                      |  21 ++
 visionppi/app/build.gradle                    |  39 ++-
 visionppi/app/src/main/AndroidManifest.xml    |  19 +-
 .../java/org/mifos/visionppi/MainActivity.kt  |   8 +-
 .../java/org/mifos/visionppi/VisionPPI.kt     |   6 +-
 .../visionppi/adapters/ClientSearchAdapter.kt |  19 +-
 .../adapters/ObjectDetectionResultAdapter.kt  |  15 +-
 .../visionppi/adapters/QuestionAdapter.kt     |  14 +-
 .../visionppi/adapters/ResponseAdapter.kt     |  13 +-
 .../adapters/SelectedImageAdapter.kt          |  14 +-
 .../java/org/mifos/visionppi/models/User.kt   |   4 +-
 .../visionppi/models/mifoserror/Errors.kt     |  25 +-
 .../org/mifos/visionppi/objects/Client.kt     |  35 +-
 .../org/mifos/visionppi/ui/AboutActivity.kt   |   6 +-
 .../visionppi/ui/activities/LoginActivity.kt  |  24 +-
 .../client_profile/ClientProfileActivity.kt   |  37 +--
 .../computer_vision/ComputerVisionActivity.kt |  39 ++-
 .../mifos/visionppi/ui/home/MainActivity.kt   |  34 +-
 .../mifos/visionppi/ui/menu/MenuActivity.kt   | 108 ++++++
 .../mifos/visionppi/ui/menu/MenuMVPView.kt    |   8 +
 .../mifos/visionppi/ui/menu/MenuPresenter.kt  |  21 ++
 .../ui/new_survey/NewSurveyActivity.kt        |  21 +-
 .../ui/new_survey/PPIQuestionFragment.kt      |  22 +-
 .../ui/user_profile/UserProfileActivity.kt    |  53 ++-
 .../java/org/mifos/visionppi/utils/AuthKey.kt |   1 +
 .../java/org/mifos/visionppi/utils/Network.kt |   2 +-
 .../res/drawable/ic_baseline_analytics_24.xml |   5 +
 .../main/res/drawable/ic_baseline_menu_24.xml |   5 +
 .../res/drawable/ic_baseline_search_24.xml    |   5 +
 .../src/main/res/layout/activity_about.xml    |   4 +-
 .../src/main/res/layout/activity_login.xml    |   3 +-
 .../app/src/main/res/layout/activity_main.xml |  27 ++
 .../src/main/res/layout/activity_main2.xml    |   6 +-
 .../app/src/main/res/layout/activity_menu.xml | 307 ++++++++++++++++++
 .../main/res/layout/activity_new_survey.xml   |   1 +
 .../res/layout/activity_ppi_view_pager.xml    |   4 +-
 .../main/res/layout/activity_user_profile.xml |  38 ++-
 .../src/main/res/layout/image_grid_layout.xml |   3 +-
 .../main/res/layout/new_survey_toolbar.xml    |   1 +
 .../src/main/res/layout/ppi_response_row.xml  |   3 +-
 .../app/src/main/res/menu/bottom_nav_menu.xml |  13 +-
 .../main/res/navigation/mobile_navigation.xml |  12 +-
 visionppi/app/src/main/res/values/strings.xml |   3 +
 visionppi/build.gradle                        |   9 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 46 files changed, 844 insertions(+), 217 deletions(-)
 create mode 100644 visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt
 create mode 100644 visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt
 create mode 100644 visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt
 create mode 100644 visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml
 create mode 100644 visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml
 create mode 100644 visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml
 create mode 100644 visionppi/app/src/main/res/layout/activity_main.xml
 create mode 100644 visionppi/app/src/main/res/layout/activity_menu.xml

diff --git a/visionppi/.idea/gradle.xml b/visionppi/.idea/gradle.xml
index 3a6d748..6e5389e 100644
--- a/visionppi/.idea/gradle.xml
+++ b/visionppi/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/visionppi/.idea/misc.xml b/visionppi/.idea/misc.xml
index 568f17d..33453f4 100644
--- a/visionppi/.idea/misc.xml
+++ b/visionppi/.idea/misc.xml
@@ -3,6 +3,27 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_about.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_client_profile.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_computer_vision.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_login.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_main.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_main2.xml" value="0.264" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_menu.xml" value="0.176" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_new_survey.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/activity_user_profile.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/client_search_row.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/content_main.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/image_grid_layout.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/new_survey_toolbar.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/object_detection_result.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/ppi_question_layout.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/ppi_response_row.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/layout/toolbar.xml" value="0.24547101449275363" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/menu/bottom_nav_menu.xml" value="0.25" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/menu/bottom_nav_menu2.xml" value="0.24895833333333334" />
+        <entry key="..\:/GSOC 2023/My Forks/ppi-vision/visionppi/app/src/main/res/menu/options_menu.xml" value="0.25" />
         <entry key="..\:/Users/DELL/Desktop/from github/visionppi/app/src/main/res/layout/activity_about.xml" value="0.1" />
         <entry key="..\:/Users/DELL/Desktop/from github/visionppi/app/src/main/res/layout/activity_login.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_main2.xml" value="0.22395833333333334" />
diff --git a/visionppi/app/build.gradle b/visionppi/app/build.gradle
index 5698bbf..7286b13 100644
--- a/visionppi/app/build.gradle
+++ b/visionppi/app/build.gradle
@@ -1,21 +1,22 @@
 plugins {
     id "com.diffplug.spotless" version "5.1.2"
+    id 'com.android.application'
+    id 'com.google.firebase.crashlytics'
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-parcelize'
+apply plugin: "org.jetbrains.kotlin.kapt"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "org.mifos.visionppi"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         ndkVersion '21.1.6352462'
@@ -40,10 +41,6 @@ android {
         abortOnError false
     }
 
-    androidExtensions {
-        experimental = true
-    }
-
     dataBinding {
         enabled = true
     }
@@ -54,6 +51,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        viewBinding = true
+    }
 }
 
 spotless {
@@ -71,17 +71,25 @@ spotless {
 }
 
 dependencies {
+    // Import the BoM for the Firebase platform
+    implementation platform('com.google.firebase:firebase-bom:32.1.0')
 
+    // Add the dependencies for the Crashlytics and Analytics libraries
+    // When using the BoM, you don't specify versions in Firebase library dependencies
+    implementation 'com.google.firebase:firebase-crashlytics-ktx'
+    implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'androidx.navigation:navigation-fragment:2.1.0'
     implementation 'androidx.navigation:navigation-ui:2.1.0'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
+    implementation 'com.google.firebase:firebase-analytics:17.5.0'
     def lifecycle_version = "2.2.0"
     def kotlin_version="1.3.72"
-
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
@@ -125,9 +133,6 @@ dependencies {
     //Butter Knife
     implementation "com.jakewharton:butterknife:8.0.1"
     kapt "com.jakewharton:butterknife-compiler:8.0.1"
-    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
-        transitive = true
-    }
 
     implementation "org.jetbrains.anko:anko-commons:0.10.0"
 
@@ -154,3 +159,7 @@ dependencies {
 
 
 }
+
+kapt {
+    correctErrorTypes true
+}
\ No newline at end of file
diff --git a/visionppi/app/src/main/AndroidManifest.xml b/visionppi/app/src/main/AndroidManifest.xml
index c8a3a1d..675fc71 100644
--- a/visionppi/app/src/main/AndroidManifest.xml
+++ b/visionppi/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
-            android:label="@string/title_activity_main"></activity>
+            android:label="@string/title_activity_main"/>
         <activity
             android:name=".ui.activities.LoginActivity"
             android:configChanges="orientation|screenSize"
@@ -31,13 +31,14 @@
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.computer_vision.ComputerVisionActivity"
-            android:label="Computer Vision"></activity>
+            android:label="Computer Vision"/>
         <activity
             android:name=".ui.AboutActivity"
             android:label="@string/about"/>
         <activity
             android:name=".ui.activities.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -47,15 +48,21 @@
         <activity
             android:name=".ui.client_profile.ClientProfileActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".ui.new_survey.NewSurveyActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".ui.new_survey.NewPPISurveyActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar"/>
+
+        <activity
+            android:name=".ui.user_profile.UserProfileActivity"
+            android:label="User Profile"
+            android:theme="@style/AppTheme.NoActionBar"/>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt
index 5954b2f..7500b6f 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/MainActivity.kt
@@ -11,18 +11,20 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import kotlinx.android.synthetic.main.toolbar.*
+//import kotlinx.android.synthetic.main.toolbar.*
 import org.mifos.visionppi.api.local.PreferencesHelper
+import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.ui.AboutActivity
 import org.mifos.visionppi.ui.activities.LoginActivity
 import org.mifos.visionppi.utils.PrefManager
 
 class MainActivity : AppCompatActivity() {
-
+    private lateinit var binding: ToolbarBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ToolbarBinding.inflate(layoutInflater)
         setContentView(R.layout.activity_main2)
-        setSupportActionBar(appToolbar)
+        setSupportActionBar(binding.appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "OK"
         val navView: BottomNavigationView = findViewById(R.id.nav_view)
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt b/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt
index 75883e6..bf9e1d9 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/VisionPPI.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDex
 import androidx.multidex.MultiDexApplication
-import com.crashlytics.android.Crashlytics
-import io.fabric.sdk.android.Fabric
+//import com.crashlytics.android.Crashlytics
+//import io.fabric.sdk.android.Fabric
 import java.util.Locale
 import org.mifos.visionppi.injection.component.ApplicationComponent
 import org.mifos.visionppi.injection.component.DaggerApplicationComponent
@@ -36,7 +36,7 @@ class VisionPPI : MultiDexApplication() {
     override fun onCreate() {
         super.onCreate()
         MultiDex.install(this)
-        Fabric.with(this, Crashlytics())
+//        Fabric.with(this, Crashlytics())
         instance = this
     }
 
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt
index d433606..4277c1d 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ClientSearchAdapter.kt
@@ -1,24 +1,20 @@
 package org.mifos.visionppi.adapters
 
 import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.client_search_row.view.client_account_no
-import kotlinx.android.synthetic.main.client_search_row.view.client_name
-import kotlinx.android.synthetic.main.client_search_row.view.client_search_row
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ClientSearchRowBinding
 import org.mifos.visionppi.objects.Client
+import android.view.LayoutInflater
 
 /**
  * Created by Apoorva M K on 01/07/19.
  */
 
 class ClientSearchAdapter(var clientList: List<Client>, var context: Context, private val listener: (Client) -> Unit) : RecyclerView.Adapter<ViewHolder>() {
-
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.clientName?.text = clientList[position].entityName
         holder.clientAccountNo?.text = "#".plus(clientList[position].entityAccountNo)
@@ -26,7 +22,8 @@ class ClientSearchAdapter(var clientList: List<Client>, var context: Context, pr
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(LayoutInflater.from(context).inflate(R.layout.client_search_row, parent, false))
+        val binding = ClientSearchRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ViewHolder(binding)
     }
 
     override fun getItemCount(): Int {
@@ -34,10 +31,10 @@ class ClientSearchAdapter(var clientList: List<Client>, var context: Context, pr
     }
 }
 
-class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-    val clientName: TextView? = view.client_name
-    val clientAccountNo: TextView? = view.client_account_no
-    private val linearLayout: LinearLayout? = view.client_search_row
+class ViewHolder(val binding: ClientSearchRowBinding) : RecyclerView.ViewHolder(binding.root) {
+    val clientName: TextView? = binding.clientName
+    val clientAccountNo: TextView? =  binding.clientAccountNo
+    private val linearLayout: LinearLayout? = binding.clientSearchRow
 
     fun setItem(item: Client, listener: (Client) -> Unit) {
         linearLayout?.setOnClickListener { listener(item) }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt
index dd1ab68..3ee4fa1 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ObjectDetectionResultAdapter.kt
@@ -3,14 +3,12 @@ package org.mifos.visionppi.adapters
 import android.content.Context
 import android.graphics.Bitmap
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.object_detection_result.view.imageObject
-import kotlinx.android.synthetic.main.object_detection_result.view.item1
-import org.mifos.visionppi.R
+
+import org.mifos.visionppi.databinding.ObjectDetectionResultBinding
 
 class ObjectDetectionResultAdapter(var result: List<List<String>>, var images: ArrayList<Bitmap?>, var context: Context) : RecyclerView.Adapter<ResultViewHolder>() {
 
@@ -23,7 +21,8 @@ class ObjectDetectionResultAdapter(var result: List<List<String>>, var images: A
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResultViewHolder {
-        return ResultViewHolder(LayoutInflater.from(context).inflate(R.layout.object_detection_result, parent, false))
+        val binding = ObjectDetectionResultBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ResultViewHolder(binding)
     }
 
     override fun getItemCount(): Int {
@@ -31,7 +30,7 @@ class ObjectDetectionResultAdapter(var result: List<List<String>>, var images: A
     }
 }
 
-class ResultViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-    val image: ImageView? = view.imageObject
-    val res1: TextView? = view.item1
+class ResultViewHolder(val binding: ObjectDetectionResultBinding) : RecyclerView.ViewHolder(binding.root) {
+    val image: ImageView? = binding.imageObject
+    val res1: TextView? = binding.item1
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt
index 2c823e0..62c4c40 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/QuestionAdapter.kt
@@ -2,14 +2,11 @@ package org.mifos.visionppi.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.ppi_question_layout.view.question
-import kotlinx.android.synthetic.main.ppi_question_layout.view.responses
-import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.PpiQuestionLayoutBinding
 import org.mifos.visionppi.objects.Question
 import org.mifos.visionppi.objects.Response
 
@@ -22,7 +19,8 @@ class QuestionAdapter(var questionList: List<Question>, var context: Context, pr
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QuestionViewHolder {
-        return QuestionViewHolder(LayoutInflater.from(context).inflate(R.layout.ppi_question_layout, parent, false))
+        val binding = PpiQuestionLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return QuestionViewHolder(binding)
     }
 
     override fun getItemCount(): Int {
@@ -30,8 +28,8 @@ class QuestionAdapter(var questionList: List<Question>, var context: Context, pr
     }
 }
 
-class QuestionViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+class QuestionViewHolder(val binding: PpiQuestionLayoutBinding) : RecyclerView.ViewHolder(binding.root) {
 
-    val question: TextView? = view.question
-    val responseRecyclerView: RecyclerView? = view.responses
+    val question: TextView? = binding.question
+    val responseRecyclerView: RecyclerView? = binding.responses
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt
index 1d065cb..606d5cf 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/ResponseAdapter.kt
@@ -2,19 +2,18 @@ package org.mifos.visionppi.adapters
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.ppi_response_row.view.response_btn
-import kotlinx.android.synthetic.main.ppi_response_row.view.response_score
+import org.mifos.visionppi.databinding.PpiResponseRowBinding
 import org.mifos.visionppi.objects.Response
 
 class ResponseAdapter(var responseList: List<Response>, var context: Context, private val responseClicked: (response: Response) -> Unit) : RecyclerView.Adapter<ResponseAdapter.ResponseViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ResponseViewHolder {
-        return ResponseViewHolder(LayoutInflater.from(context).inflate(org.mifos.visionppi.R.layout.ppi_response_row, parent, false))
+        val binding = PpiResponseRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return ResponseViewHolder(binding)
     }
 
     override fun getItemCount(): Int {
@@ -28,9 +27,9 @@ class ResponseAdapter(var responseList: List<Response>, var context: Context, pr
         holder.setItem(position, responseClicked)
     }
 
-    inner class ResponseViewHolder(var view: View) : RecyclerView.ViewHolder(view) {
-        var responseButton: RadioButton? = view.response_btn
-        var responseScore: TextView? = view.response_score
+    inner class ResponseViewHolder(val binding: PpiResponseRowBinding) : RecyclerView.ViewHolder(binding.root) {
+        var responseButton: RadioButton? = binding.responseBtn
+        var responseScore: TextView? = binding.responseScore
 
         fun setItem(position: Int, responseClicked: (response: Response) -> Unit) {
             responseButton?.setOnClickListener {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt
index cb3a01b..45e1a97 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/adapters/SelectedImageAdapter.kt
@@ -3,19 +3,17 @@ package org.mifos.visionppi.adapters
 import android.content.Context
 import android.graphics.Bitmap
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.image_grid_layout.view.remove_button
-import kotlinx.android.synthetic.main.image_grid_layout.view.selected_image
-import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ImageGridLayoutBinding
 
 class SelectedImageAdapter(private val items: ArrayList<Bitmap?>, val context: Context, val removeImage: (position: Int) -> Unit) : RecyclerView.Adapter<SelectedImageAdapter.SelectedImageViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SelectedImageViewHolder {
-        return SelectedImageViewHolder(LayoutInflater.from(context).inflate(R.layout.image_grid_layout, parent, false))
+        val binding = ImageGridLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return SelectedImageViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: SelectedImageViewHolder, position: Int) {
@@ -27,9 +25,9 @@ class SelectedImageAdapter(private val items: ArrayList<Bitmap?>, val context: C
         return items.size
     }
 
-    inner class SelectedImageViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val selectedImageImageview: ImageView? = view.selected_image
-        private val removeButton: ImageButton? = view.remove_button
+    inner class SelectedImageViewHolder(val binding: ImageGridLayoutBinding) : RecyclerView.ViewHolder(binding.root) {
+        val selectedImageImageview: ImageView? = binding.selectedImage
+        private val removeButton: ImageButton? = binding.removeButton
         fun setItem(position: Int) {
             removeButton?.setOnClickListener { removeImage(position) }
         }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt b/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt
index c751835..433c364 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/models/User.kt
@@ -9,7 +9,9 @@ import org.mifos.visionppi.objects.Role
  */
 
 data class User(
-
+    var firstName: String,
+    var middleName: String,
+    var lastName: String,
     var userId: Long = 0,
     var isAuthenticated: Boolean = false,
     var username: String? = null,
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt b/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt
index 3ac1424..0c2ddcf 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/models/mifoserror/Errors.kt
@@ -1,7 +1,9 @@
 package org.mifos.visionppi.models.mifoserror
 
+import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parceler
 
 /**
  * @author HARSH-nith
@@ -14,4 +16,25 @@ data class Errors(
     var defaultUserMessage: String? = null,
     var userMessageGlobalisationCode: String? = null,
     var parameterName: String? = null
-) : Parcelable
+) : Parcelable {
+    constructor(parcel: Parcel) : this(
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString()) {
+    }
+
+    companion object : Parceler<Errors> {
+
+        override fun Errors.write(parcel: Parcel, flags: Int) {
+            parcel.writeString(developerMessage)
+            parcel.writeString(defaultUserMessage)
+            parcel.writeString(userMessageGlobalisationCode)
+            parcel.writeString(parameterName)
+        }
+
+        override fun create(parcel: Parcel): Errors {
+            return Errors(parcel)
+        }
+    }
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt b/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt
index e042313..6381b59 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/objects/Client.kt
@@ -1,7 +1,9 @@
 package org.mifos.visionppi.objects
 
+import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parceler
 
 /**
  * Created by Apoorva M K on 29/06/19.
@@ -19,4 +21,35 @@ data class Client constructor(
     var parentName: String?,
     var entityMobileNo: String?,
     var entityStatus: Status?
-) : Parcelable
+) : Parcelable {
+    constructor(parcel: Parcel) : this(
+            parcel.readValue(Int::class.java.classLoader) as? Int,
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readValue(Int::class.java.classLoader) as? Int,
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readParcelable(Status::class.java.classLoader)) {
+    }
+
+    companion object : Parceler<Client> {
+
+        override fun Client.write(parcel: Parcel, flags: Int) {
+            parcel.writeValue(entityId)
+            parcel.writeString(entityAccountNo)
+            parcel.writeString(entityExternalId)
+            parcel.writeString(entityName)
+            parcel.writeString(entityType)
+            parcel.writeValue(parentId)
+            parcel.writeString(parentName)
+            parcel.writeString(entityMobileNo)
+            parcel.writeParcelable(entityStatus, flags)
+        }
+
+        override fun create(parcel: Parcel): Client {
+            return Client(parcel)
+        }
+    }
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt
index 8457446..22a3a3c 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/AboutActivity.kt
@@ -6,20 +6,22 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.android.synthetic.main.toolbar.*
 import org.mifos.visionppi.MainActivity
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ToolbarBinding
 
 class AboutActivity : AppCompatActivity() {
     var contributors = "https://github.com/openMF/ppi-vision/graphs/contributors"
     var gitHub = "https://github.com/openMF/ppi-vision"
     var twitter = "https://twitter.com/mifos"
     var license = "https://github.com/openMF/ppi-vision/blob/master/LICENSE"
+    private lateinit var binding: ToolbarBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ToolbarBinding.inflate(layoutInflater)
         setContentView(R.layout.activity_about)
 
-        setSupportActionBar(appToolbar)
+        setSupportActionBar(binding.appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "About Us"
 
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt
index 5f09457..c1abcd0 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/activities/LoginActivity.kt
@@ -8,10 +8,12 @@ import android.widget.Toast
 import butterknife.BindView
 import butterknife.ButterKnife
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.activity_login.til_password
-import kotlinx.android.synthetic.main.activity_login.til_username
+//import kotlinx.android.synthetic.main.activity_login.til_password
+//import kotlinx.android.synthetic.main.activity_login.til_username
 import org.mifos.visionppi.MainActivity
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ActivityLoginBinding
+import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.presenters.LoginPresenter
 import org.mifos.visionppi.ui.activities.base.BaseActivity
 import org.mifos.visionppi.ui.views.LoginView
@@ -32,11 +34,13 @@ class LoginActivity : BaseActivity(), LoginView {
     var llLogin: LinearLayout? = null
 
     private var userName: String? = null
-
+    private lateinit var binding: ActivityLoginBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        binding = ActivityLoginBinding.inflate(layoutInflater)
         activityComponent!!.inject(this)
-        setContentView(R.layout.activity_login)
+        val view = binding.root
+        setContentView(view)
         ButterKnife.bind(this)
         loginPresenter!!.attachView(this)
     }
@@ -80,27 +84,27 @@ class LoginActivity : BaseActivity(), LoginView {
     }
 
     override fun showUsernameError(error: String?) {
-        til_username.error = error
+        binding.tilUsername.error = error
     }
 
     override fun showPasswordError(error: String?) {
-        til_password.error = error
+        binding.tilPassword.error = error
     }
 
     override fun clearUsernameError() {
-        til_username.isErrorEnabled = false
+        binding.tilUsername.isErrorEnabled = false
     }
 
     override fun clearPasswordError() {
-        til_password.isErrorEnabled = false
+        binding.tilPassword.isErrorEnabled = false
     }
 
     /**
      * Called when Login Button is clicked, used for logging in the user
      */
     fun onLoginClicked(view: View) {
-        val username = til_username.editText?.editableText.toString()
-        val password = til_password.editText?.editableText.toString()
+        val username = binding.tilUsername.editText?.editableText.toString()
+        val password = binding.tilPassword.editText?.editableText.toString()
         if (Network.isConnected(this)) {
             loginPresenter?.login(username, password)
         } else {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
index 9b74b1a..4830465 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt
@@ -4,15 +4,9 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.android.synthetic.main.activity_client_profile.accountNoValue
-import kotlinx.android.synthetic.main.activity_client_profile.clientIdValue
-import kotlinx.android.synthetic.main.activity_client_profile.clientNameValue
-import kotlinx.android.synthetic.main.activity_client_profile.clientTypeValue
-import kotlinx.android.synthetic.main.activity_client_profile.mobileNoValue
-import kotlinx.android.synthetic.main.activity_client_profile.new_survey_btn
-import kotlinx.android.synthetic.main.activity_client_profile.uname
-import kotlinx.android.synthetic.main.toolbar.appToolbar
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ActivityClientProfileBinding
+import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.objects.Client
 import org.mifos.visionppi.ui.new_survey.NewPPISurveyActivity
 
@@ -21,31 +15,36 @@ import org.mifos.visionppi.ui.new_survey.NewPPISurveyActivity
  */
 
 class ClientProfileActivity : AppCompatActivity(), ClientProfileMVPView {
-
+    private lateinit var toolBarBinding: ToolbarBinding
+    private lateinit var activityClientProfileBinding: ActivityClientProfileBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_client_profile)
-        val clientDetails = intent.getParcelableExtra("client") as Client
-        setClientDetails(clientDetails)
+        toolBarBinding = ToolbarBinding.inflate(layoutInflater)
+        activityClientProfileBinding=ActivityClientProfileBinding.inflate(layoutInflater)
+        val clientDetails = intent.getParcelableExtra("client") as Client?
+        if (clientDetails != null) {
+            setClientDetails(clientDetails)
+        }
 
-        setSupportActionBar(appToolbar)
+        setSupportActionBar(toolBarBinding.appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "Client Profile"
 
-        new_survey_btn.setOnClickListener {
+        activityClientProfileBinding.newSurveyBtn.setOnClickListener {
             val intent = Intent(applicationContext, NewPPISurveyActivity::class.java)
             startActivity(intent)
         }
     }
 
     override fun setClientDetails(client: Client) {
-        uname.text = client.entityName
-        clientIdValue.text = client.entityId.toString()
-        clientNameValue.text = client.entityName
-        accountNoValue.text = client.entityAccountNo
-        mobileNoValue.text = client.entityMobileNo
-        clientTypeValue.text = client.entityType
+        activityClientProfileBinding.uname.text = client?.entityName
+        activityClientProfileBinding.clientIdValue.text = client?.entityId.toString()
+        activityClientProfileBinding.clientNameValue.text = client?.entityName
+        activityClientProfileBinding.accountNoValue.text = client?.entityAccountNo
+        activityClientProfileBinding.mobileNoValue.text = client?.entityMobileNo
+        activityClientProfileBinding.clientTypeValue.text = client?.entityType
     }
 
     override fun showToastMessage(string: String) {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt
index 45fec0a..3fc6857 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/computer_vision/ComputerVisionActivity.kt
@@ -23,18 +23,15 @@ import com.google.mlkit.vision.label.custom.CustomImageLabelerOptions
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
-import kotlinx.android.synthetic.main.activity_computer_vision.analyse
-import kotlinx.android.synthetic.main.activity_computer_vision.open_camera_btn
-import kotlinx.android.synthetic.main.activity_computer_vision.res_list
-import kotlinx.android.synthetic.main.activity_computer_vision.selected_images_list
-import kotlinx.android.synthetic.main.activity_computer_vision.upload_from_gallery_btn
-import kotlinx.android.synthetic.main.toolbar.*
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.ObjectDetectionResultAdapter
 import org.mifos.visionppi.adapters.SelectedImageAdapter
+import org.mifos.visionppi.databinding.ActivityComputerVisionBinding
+import org.mifos.visionppi.databinding.ToolbarBinding
 
 class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
-
+    private lateinit var toolBarBinding: ToolbarBinding
+    private lateinit var activityComputerVisionBinding: ActivityComputerVisionBinding
     private val images = ArrayList<Bitmap?>()
     private val pickFromGallery = 1
     private val cameraRequest = 2
@@ -56,26 +53,28 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_computer_vision)
+        toolBarBinding = ToolbarBinding.inflate(layoutInflater)
+        activityComputerVisionBinding = ActivityComputerVisionBinding.inflate(layoutInflater)
+        setSupportActionBar(toolBarBinding.appToolbar)
 
-        setSupportActionBar(appToolbar)
         val actionBar = supportActionBar
         actionBar?.title = "Analyse Images"
 
         actionBar?.setDisplayHomeAsUpEnabled(true)
         actionBar?.setDisplayShowHomeEnabled(true)
 
-        upload_from_gallery_btn.setOnClickListener {
+        activityComputerVisionBinding.uploadFromGalleryBtn.setOnClickListener {
             fetchFromGallery()
         }
 
-        open_camera_btn.setOnClickListener {
+        activityComputerVisionBinding.openCameraBtn.setOnClickListener {
             fetchFromCamera()
         }
 
-        selected_images_list.layoutManager = GridLayoutManager(this, 3)
-        selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+        activityComputerVisionBinding.selectedImagesList.layoutManager = GridLayoutManager(this, 3)
+        activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
 
-        analyse.setOnClickListener {
+        activityComputerVisionBinding.analyse.setOnClickListener {
             counter = 0
             imageNos = images.size
             if (images.isNotEmpty()) {
@@ -153,7 +152,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                 val activitySelectIMage = 1234
                 startActivityForResult(Intent.createChooser(intent, "Select Picture"), activitySelectIMage)
 
-                selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+                activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
             }
         } catch (e: Exception) {
             e.printStackTrace()
@@ -174,7 +173,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
     }
 
     override fun analyzeImages() {
-        res_list.adapter = null
+        activityComputerVisionBinding.resList.adapter = null
         for (image in images) {
             detect(image!!)
         }
@@ -199,7 +198,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                     ++counter
                     finalLabels.add(ll)
                     if (counter == imageNos) {
-                        res_list.adapter = ObjectDetectionResultAdapter(finalLabels, images, baseContext)
+                        activityComputerVisionBinding.resList.adapter = ObjectDetectionResultAdapter(finalLabels, images, baseContext)
                     }
                 }
                 .addOnFailureListener { e ->
@@ -220,7 +219,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                     val mImageUri: Uri = data.data!!
                     val bitmap = MediaStore.Images.Media.getBitmap(this.contentResolver, mImageUri)
                     images.add(bitmap)
-                    selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+                    activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
                 } else {
                     if (data?.clipData != null) {
                         val mClipData: ClipData = data.clipData!!
@@ -229,7 +228,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
                             val uri: Uri = item.uri
                             val bitmap = MediaStore.Images.Media.getBitmap(this.contentResolver, uri)
                             images.add(bitmap)
-                            selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+                            activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
                         }
                     }
                 }
@@ -239,7 +238,7 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
         if (requestCode === cameraRequest && resultCode === Activity.RESULT_OK) {
             val photoCaptured = data?.extras?.get("data") as Bitmap
             images.add(photoCaptured)
-            selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+            activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
         }
     }
 
@@ -268,6 +267,6 @@ class ComputerVisionActivity : AppCompatActivity(), ComputerVisionMVPView {
 
     private fun imageRemove(position: Int) {
         images.removeAt(position)
-        selected_images_list.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
+        activityComputerVisionBinding.selectedImagesList.adapter = SelectedImageAdapter(images, this) { position: Int -> imageRemove(position) }
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
index 830d104..6962fb4 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt
@@ -17,13 +17,12 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.android.synthetic.main.content_main.client_search_list
-import kotlinx.android.synthetic.main.content_main.search_btn
-import kotlinx.android.synthetic.main.content_main.search_query
 import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.uiThread
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.ClientSearchAdapter
+import org.mifos.visionppi.databinding.ActivityComputerVisionBinding
+import org.mifos.visionppi.databinding.ContentMainBinding
 import org.mifos.visionppi.objects.Client
 import org.mifos.visionppi.ui.client_profile.ClientProfileActivity
 
@@ -32,7 +31,7 @@ import org.mifos.visionppi.ui.client_profile.ClientProfileActivity
  */
 
 class MainActivity : Fragment(), MainMVPView {
-
+    private lateinit var contentMainBinding: ContentMainBinding
     lateinit var clientList: List<Client>
     var mMainPresenter: MainPresenter = MainPresenter()
 
@@ -43,14 +42,15 @@ class MainActivity : Fragment(), MainMVPView {
     ): View? {
         super.onCreate(savedInstanceState)
         val root = inflater.inflate(R.layout.content_main, container, false)
+        contentMainBinding=ContentMainBinding.inflate(layoutInflater)
         return root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        client_search_list.layoutManager = LinearLayoutManager(requireContext())
+        contentMainBinding.clientSearchList.layoutManager = LinearLayoutManager(requireContext())
 
-        search_query.setOnEditorActionListener(TextView.OnEditorActionListener { _, actionId, _ ->
+        contentMainBinding.searchQuery.setOnEditorActionListener(TextView.OnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
                 performSearch()
                 return@OnEditorActionListener true
@@ -58,7 +58,7 @@ class MainActivity : Fragment(), MainMVPView {
             false
         })
 
-        search_query.addTextChangedListener(object : TextWatcher {
+        contentMainBinding.searchQuery.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(p0: Editable?) {
             }
 
@@ -67,31 +67,31 @@ class MainActivity : Fragment(), MainMVPView {
 
             override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
                 if (p0.toString().trim().isEmpty()) {
-                    search_btn.isEnabled = false
-                    search_btn.alpha = 0.5F
+                    contentMainBinding.searchBtn.isEnabled = false
+                    contentMainBinding.searchBtn.alpha = 0.5F
                 } else {
-                    search_btn.isEnabled = true
-                    search_btn.alpha = 1.0F
+                    contentMainBinding.searchBtn.isEnabled = true
+                    contentMainBinding.searchBtn.alpha = 1.0F
                 }
             }
         })
 
-        search_btn.setOnClickListener {
+        contentMainBinding.searchBtn.setOnClickListener {
             performSearch()
         }
     }
 
     private fun performSearch() {
         if (networkAvailable(requireActivity())) {
-            search_query.onEditorAction(EditorInfo.IME_ACTION_DONE)
+            contentMainBinding.searchQuery.onEditorAction(EditorInfo.IME_ACTION_DONE)
             println("Going in")
-            if (search_query.text.toString().isEmpty())
+            if (contentMainBinding.searchQuery.text.toString().isEmpty())
                 searchError()
             else {
                 println("going in deeper")
                 val inputMethodManager = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-                inputMethodManager.hideSoftInputFromWindow(search_btn.windowToken, 0)
-                search(search_query.text.toString())
+                inputMethodManager.hideSoftInputFromWindow(contentMainBinding.searchBtn.windowToken, 0)
+                search(contentMainBinding.searchQuery.text.toString())
             }
         } else {
             showToastMessage("Internet connection not available. Please check network settings")
@@ -152,7 +152,7 @@ class MainActivity : Fragment(), MainMVPView {
         if (clientList.isEmpty())
             searchUnsuccessful()
 
-        client_search_list.adapter =
+        contentMainBinding.clientSearchList.adapter =
                 ClientSearchAdapter(clientList, requireContext()) { item -> onClick(item) }
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt
new file mode 100644
index 0000000..58e3c78
--- /dev/null
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuActivity.kt
@@ -0,0 +1,108 @@
+package org.mifos.visionppi.ui.menu
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.Fragment
+import org.mifos.visionppi.R
+import org.mifos.visionppi.api.local.PreferencesHelper
+import org.mifos.visionppi.databinding.ActivityMenuBinding
+import org.mifos.visionppi.models.User
+import org.mifos.visionppi.ui.AboutActivity
+import org.mifos.visionppi.ui.activities.LoginActivity
+import org.mifos.visionppi.ui.user_profile.UserProfileActivity
+import org.mifos.visionppi.utils.PrefManager
+
+class MenuActivity : Fragment(), MenuMVPView {
+
+    lateinit var user: User
+    private lateinit var activityMenuBinding: ActivityMenuBinding
+    var mMenuPresenter: MenuPresenter = MenuPresenter()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        activityMenuBinding=ActivityMenuBinding.inflate(layoutInflater)
+        super.onCreate(savedInstanceState)
+        val shareButton = activityMenuBinding.shareButton
+        val editProfileButton = activityMenuBinding.editProfileButton
+        val aboutButton = activityMenuBinding.aboutButton
+        val logoutButton = activityMenuBinding.logoutButton
+
+        shareButton.setOnClickListener {
+            val shareIntent = Intent()
+            shareIntent.action = Intent.ACTION_SEND
+            shareIntent.putExtra(
+                    Intent.EXTRA_TEXT,
+                    getString(R.string.install_vision).toString() + "\n" + getString(R.string.download_link)
+            )
+            shareIntent.type = "text/plain"
+            startActivity(shareIntent)
+        }
+
+        editProfileButton.setOnClickListener {
+            val editIntent = Intent(requireContext(), UserProfileActivity::class.java)
+            startActivity(editIntent)
+        }
+
+        aboutButton.setOnClickListener{
+            val aboutIntent = Intent(requireContext(), AboutActivity::class.java)
+            startActivity(aboutIntent)
+        }
+
+        logoutButton.setOnClickListener{
+            showLogoutDialog()
+        }
+
+        return activityMenuBinding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        getUserDetails()
+    }
+
+    override fun getUserDetails() {
+        user = mMenuPresenter.fetchUserDetails(requireActivity(), requireContext())
+        setUserDetails()
+    }
+
+    override fun setUserDetails() {
+        activityMenuBinding.uname.text = user.username
+        activityMenuBinding.usernameValue.text = user.username
+        activityMenuBinding.userIdValue.text = user.userId.toString()
+        activityMenuBinding.officeNameValue.text = user.officeName
+        activityMenuBinding.officeIdValue.text = user.officeId.toString()
+        activityMenuBinding.staffIdValue.text = user.staffId.toString()
+        activityMenuBinding.staffDispNameValue.text = user.staffDisplayName
+    }
+
+    override fun showToastMessage(string: String) {
+        Toast.makeText(requireContext(), string, Toast.LENGTH_SHORT).show()
+    }
+
+    fun showLogoutDialog() {
+        val dialogBuilder = AlertDialog.Builder(requireContext())
+
+        dialogBuilder.setMessage("Are you sure you want to logout?")
+        dialogBuilder.setPositiveButton("Yes") { _, _ ->
+            val preferencesHelper = PreferencesHelper(requireContext())
+            preferencesHelper.clear()
+            val prefManager = PrefManager()
+            prefManager.clear(requireActivity(), requireContext())
+            val intent = Intent(requireContext().applicationContext, LoginActivity::class.java)
+            startActivity(intent)
+        }
+
+        dialogBuilder.setNegativeButton("No") { dialog, _ ->
+            dialog.dismiss()
+        }
+        val dialog = dialogBuilder.create()
+        dialog.show()
+    }
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt
new file mode 100644
index 0000000..7c295d7
--- /dev/null
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuMVPView.kt
@@ -0,0 +1,8 @@
+package org.mifos.visionppi.ui.menu
+import org.mifos.visionppi.base.MVPView
+
+interface MenuMVPView : MVPView {
+    fun getUserDetails()
+
+    fun setUserDetails()
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt
new file mode 100644
index 0000000..d4d3e7c
--- /dev/null
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/menu/MenuPresenter.kt
@@ -0,0 +1,21 @@
+package org.mifos.visionppi.ui.menu
+import android.app.Activity
+import android.content.Context
+import com.google.gson.Gson
+import org.mifos.visionppi.R
+import org.mifos.visionppi.base.BasePresenter
+import org.mifos.visionppi.models.User
+import org.mifos.visionppi.utils.PrefManager
+
+class MenuPresenter : BasePresenter<MenuMVPView>() {
+
+    private val gson: Gson = Gson()
+
+    fun fetchUserDetails(activity: Activity, context: Context): User {
+        val mPrefManager = PrefManager()
+        val sharedPref = activity.getSharedPreferences(context.getString(R.string.pref_file_name), Context.MODE_PRIVATE)
+        val userJsonString = sharedPref.getString(mPrefManager.userDetails, " ")
+
+        return gson.fromJson(userJsonString, User::class.java)
+    }
+}
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt
index f1d3ba8..5e7c25e 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/NewSurveyActivity.kt
@@ -6,26 +6,29 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.PagerSnapHelper
-import kotlinx.android.synthetic.main.activity_new_survey.ppi_survey
-import kotlinx.android.synthetic.main.new_survey_toolbar.computer_vision
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.QuestionAdapter
+import org.mifos.visionppi.databinding.ActivityComputerVisionBinding
+import org.mifos.visionppi.databinding.ActivityNewSurveyBinding
+import org.mifos.visionppi.databinding.NewSurveyToolbarBinding
 import org.mifos.visionppi.objects.PPISurvey
 import org.mifos.visionppi.objects.Response
 import org.mifos.visionppi.ui.computer_vision.ComputerVisionActivity
 
 class NewSurveyActivity : AppCompatActivity(), NewSurveyMVPView {
-
+    private lateinit var newSurveyToolbarBinding: NewSurveyToolbarBinding
+    private lateinit var activityNewSurveyBinding: ActivityNewSurveyBinding
     private var mNewSurveyPresenter: NewSurveyPresenter = NewSurveyPresenter()
     lateinit var mPPISurvey: PPISurvey
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_new_survey)
-
+        newSurveyToolbarBinding=NewSurveyToolbarBinding.inflate(layoutInflater)
+        activityNewSurveyBinding=ActivityNewSurveyBinding.inflate(layoutInflater)
         getSurveyQuestions()
 
-        computer_vision.setOnClickListener {
+        newSurveyToolbarBinding.computerVision.setOnClickListener {
             val intent = Intent(applicationContext, ComputerVisionActivity::class.java)
             startActivity(intent)
         }
@@ -38,10 +41,10 @@ class NewSurveyActivity : AppCompatActivity(), NewSurveyMVPView {
 
     override fun renderSurvey(mPPISurvey: PPISurvey) {
         val snapHelper = PagerSnapHelper()
-        snapHelper.attachToRecyclerView(ppi_survey)
-        ppi_survey.layoutManager = LinearLayoutManager(this)
-        ppi_survey.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
-        ppi_survey.adapter = QuestionAdapter(mPPISurvey.questionDatas, applicationContext) { response: Response -> onResponseClicked(response) }
+        snapHelper.attachToRecyclerView(activityNewSurveyBinding.ppiSurvey)
+        activityNewSurveyBinding.ppiSurvey.layoutManager = LinearLayoutManager(this)
+        activityNewSurveyBinding.ppiSurvey.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
+        activityNewSurveyBinding.ppiSurvey.adapter = QuestionAdapter(mPPISurvey.questionDatas, applicationContext) { response: Response -> onResponseClicked(response) }
     }
 
     override fun showToastMessage(string: String) {
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt
index bc1a3a6..bd3ffe0 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/new_survey/PPIQuestionFragment.kt
@@ -7,30 +7,30 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.android.synthetic.main.ppi_question_layout.view.question
-import kotlinx.android.synthetic.main.ppi_question_layout.view.res
-import kotlinx.android.synthetic.main.ppi_question_layout.view.responses
 import org.mifos.visionppi.R
 import org.mifos.visionppi.adapters.ResponseAdapter
+import org.mifos.visionppi.databinding.NewSurveyToolbarBinding
+import org.mifos.visionppi.databinding.PpiQuestionLayoutBinding
 import org.mifos.visionppi.objects.Question
 import org.mifos.visionppi.objects.Response
 import org.mifos.visionppi.ui.computer_vision.ComputerVisionActivity
 
 class PPIQuestionFragment(var questionData: Question, private val mContext: Context, private val responseClick: (response: Response) -> Unit) : Fragment() {
+    private lateinit var ppiQuestionLayoutBinding: PpiQuestionLayoutBinding
+    val list get() = ComputerVisionActivity.finalLabels
 
-    val list
-        get() = ComputerVisionActivity.finalLabels
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        val view = inflater.inflate(R.layout.ppi_question_layout, container, false)
 
-        view.responses.adapter = ResponseAdapter(questionData.responseDatas, mContext, responseClick)
+        ppiQuestionLayoutBinding=PpiQuestionLayoutBinding.inflate(layoutInflater)
+        ppiQuestionLayoutBinding.responses.adapter = ResponseAdapter(questionData.responseDatas, mContext, responseClick)
+        val view = ppiQuestionLayoutBinding.root
         return view
     }
 
     override fun onResume() {
         super.onResume()
-        requireView().question.text = questionData.text
-        requireView().responses.layoutManager = LinearLayoutManager(context)
+        ppiQuestionLayoutBinding.question.text = questionData.text
+        ppiQuestionLayoutBinding.responses.layoutManager = LinearLayoutManager(context)
         if (!list.isNullOrEmpty()) {
             var s: String = ""
             var c: Int = 0
@@ -162,9 +162,9 @@ class PPIQuestionFragment(var questionData: Question, private val mContext: Cont
                 s = "There are $c telephones detected"
             }
 
-            requireView().res.text = s
+            ppiQuestionLayoutBinding.res.text = s
 
-            requireView().res.visibility = View.VISIBLE
+            ppiQuestionLayoutBinding.res.visibility = View.VISIBLE
         }
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt
index 6160d36..174f4df 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt
@@ -5,57 +5,54 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.activity_user_profile.office_id_value
-import kotlinx.android.synthetic.main.activity_user_profile.office_name_value
-import kotlinx.android.synthetic.main.activity_user_profile.staff_disp_name_value
-import kotlinx.android.synthetic.main.activity_user_profile.staff_id_value
-import kotlinx.android.synthetic.main.activity_user_profile.uname
-import kotlinx.android.synthetic.main.activity_user_profile.user_id_value
-import kotlinx.android.synthetic.main.activity_user_profile.username_value
+import androidx.navigation.findNavController
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.setupActionBarWithNavController
+import androidx.navigation.ui.setupWithNavController
+import com.google.android.material.bottomnavigation.BottomNavigationView
 import org.mifos.visionppi.R
+import org.mifos.visionppi.databinding.ActivityUserProfileBinding
+import org.mifos.visionppi.databinding.ToolbarBinding
 import org.mifos.visionppi.models.User
 
 /**
  * Created by Apoorva M K on 27/06/19.
  */
 
-class UserProfileActivity : Fragment(), UserProfileMVPView {
+class UserProfileActivity : AppCompatActivity(), UserProfileMVPView {
 
     lateinit var user: User
+    private lateinit var activityUserProfileBinding: ActivityUserProfileBinding
     var mUserProfilePresenter: UserProfilePresenter = UserProfilePresenter()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+    private lateinit var binding: ToolbarBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        return inflater.inflate(R.layout.activity_user_profile, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        binding = ToolbarBinding.inflate(layoutInflater)
+        activityUserProfileBinding=ActivityUserProfileBinding.inflate(layoutInflater)
+        setContentView(activityUserProfileBinding.root)
+        setSupportActionBar(binding.appToolbar)
         getUserDetails()
     }
 
     override fun getUserDetails() {
-        user = mUserProfilePresenter.fetchUserDetails(requireActivity(), requireContext())
+        user = mUserProfilePresenter.fetchUserDetails(this, this)
         setUserDetails()
     }
 
     override fun setUserDetails() {
 
-        uname.text = user.username
-        username_value.text = user.username
-        user_id_value.text = user.userId.toString()
-        office_name_value.text = user.officeName
-        office_id_value.text = user.officeId.toString()
-        staff_id_value.text = user.staffId.toString()
-        staff_disp_name_value.text = user.staffDisplayName
+        activityUserProfileBinding.uname.text = user.username
+        activityUserProfileBinding.usernameValue.text = user.username
+        activityUserProfileBinding.userIdValue.text = user.userId.toString()
+        activityUserProfileBinding.officeNameValue.text = user.officeName
+        activityUserProfileBinding.officeIdValue.text = user.officeId.toString()
+        activityUserProfileBinding.staffIdValue.text = user.staffId.toString()
+        activityUserProfileBinding.staffDispNameValue.text = user.staffDisplayName
     }
 
     override fun showToastMessage(string: String) {
-        Toast.makeText(requireContext(), string, Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, string, Toast.LENGTH_SHORT).show()
     }
 }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt b/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt
index 9cc5e80..e48f885 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/utils/AuthKey.kt
@@ -4,6 +4,7 @@ import khttp.structures.authorization.Authorization
 
 data class AuthKey(val authKey: String) : Authorization {
     override val header: Pair<String, String>
+
         get() {
             return "Authorization" to "Basic $authKey"
         }
diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt b/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt
index 9bb9d56..811fbfb 100644
--- a/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt
+++ b/visionppi/app/src/main/java/org/mifos/visionppi/utils/Network.kt
@@ -17,7 +17,7 @@ object Network {
      */
     private fun getNetworkInfo(context: Context): NetworkInfo {
         val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        return cm.activeNetworkInfo
+        return cm.activeNetworkInfo!!
     }
 
     /**
diff --git a/visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml b/visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml
new file mode 100644
index 0000000..8fa1695
--- /dev/null
+++ b/visionppi/app/src/main/res/drawable/ic_baseline_analytics_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-5h2v5zM13,17h-2v-3h2v3zM13,12h-2v-2h2v2zM17,17h-2L15,7h2v10z"/>
+</vector>
diff --git a/visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml b/visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml
new file mode 100644
index 0000000..543cee9
--- /dev/null
+++ b/visionppi/app/src/main/res/drawable/ic_baseline_menu_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
+</vector>
diff --git a/visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml b/visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml
new file mode 100644
index 0000000..a5687c6
--- /dev/null
+++ b/visionppi/app/src/main/res/drawable/ic_baseline_search_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/visionppi/app/src/main/res/layout/activity_about.xml b/visionppi/app/src/main/res/layout/activity_about.xml
index 2bd6698..21540ee 100644
--- a/visionppi/app/src/main/res/layout/activity_about.xml
+++ b/visionppi/app/src/main/res/layout/activity_about.xml
@@ -3,7 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@android:color/white"
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/visionppi/app/src/main/res/layout/activity_login.xml b/visionppi/app/src/main/res/layout/activity_login.xml
index d6bb329..61c0196 100644
--- a/visionppi/app/src/main/res/layout/activity_login.xml
+++ b/visionppi/app/src/main/res/layout/activity_login.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white"
     android:layout_height="match_parent"
diff --git a/visionppi/app/src/main/res/layout/activity_main.xml b/visionppi/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..fad45aa
--- /dev/null
+++ b/visionppi/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
+
+    <FrameLayout
+        android:id="@+id/frameLayout"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    </FrameLayout>
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottomNavigationView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/activity_main2.xml b/visionppi/app/src/main/res/layout/activity_main2.xml
index 185cf63..ed627a6 100644
--- a/visionppi/app/src/main/res/layout/activity_main2.xml
+++ b/visionppi/app/src/main/res/layout/activity_main2.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <include layout="@layout/toolbar" />
 
@@ -26,9 +28,11 @@
         android:layout_height="match_parent"
         app:defaultNavHost="true"
         app:layout_constraintBottom_toTopOf="@id/nav_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
         app:navGraph="@navigation/mobile_navigation" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/activity_menu.xml b/visionppi/app/src/main/res/layout/activity_menu.xml
new file mode 100644
index 0000000..edae1c4
--- /dev/null
+++ b/visionppi/app/src/main/res/layout/activity_menu.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:layout_height="225dp"
+        android:layout_width="match_parent">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            app:contentScrim="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:titleEnabled="false">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:gravity="center"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+                app:layout_collapseMode="parallax">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="User Profile"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+            </androidx.appcompat.widget.Toolbar>
+
+            <View
+                android:background="@drawable/background"
+                android:layout_gravity="bottom"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"/>
+
+            <LinearLayout
+                android:gravity="center"
+                android:layout_height="match_parent"
+                android:layout_marginTop="56dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                app:layout_collapseMode="parallax">
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:layout_width="match_parent"
+                    android:orientation="horizontal"
+                    app:layout_collapseMode="parallax">
+
+                    <ImageView
+                        android:id="@+id/profileImage"
+                        android:layout_height="84dp"
+                        android:src="@drawable/ic_wrapped_person_black_24dp"
+                        android:layout_width="84dp"
+                        android:visibility="visible" />
+
+                    <LinearLayout
+                        android:gravity="center_vertical|left"
+                        android:layout_height="match_parent"
+                        android:layout_margin="10dp"
+                        android:layout_width="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_collapseMode="parallax"
+                        >
+
+    <!--                    <TextView-->
+    <!--                        android:gravity="center"-->
+    <!--                        android:layout_width="wrap_content"-->
+    <!--                        android:layout_height="wrap_content"-->
+    <!--                        android:layout_marginLeft="@dimen/text_size"-->
+    <!--                        android:textSize="16sp"-->
+    <!--                        android:textColor="@android:color/black"-->
+    <!--                        android:layout_margin="10dp"-->
+    <!--                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"-->
+    <!--                        android:text="Firstname Middlename Lastname"-->
+    <!--                        android:id="@+id/name"/>-->
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="bottom"
+                            android:layout_margin="10dp"
+                            android:textSize="24sp"
+                            android:textColor="@android:color/black"
+                            android:layout_marginBottom="10dp"
+                            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                            android:text="usernamegoeshere"
+                            android:id="@+id/uname"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+                <LinearLayout
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:layout_width="match_parent"
+                    android:orientation="horizontal"
+                    app:layout_collapseMode="parallax">
+
+                    <Button
+                        android:id="@+id/editProfileButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="50dp"
+                        android:layout_weight="1"
+                        android:text="Edit Profile" />
+
+                    <Button
+                        android:id="@+id/shareButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="50dp"
+                        android:layout_weight="1"
+                        android:text="Share" />
+                </LinearLayout>
+            </LinearLayout>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/ncv_customer_details"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:id="@+id/ll_user_profile"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:orientation="vertical">
+
+            <androidx.cardview.widget.CardView
+                android:background="@color/white"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                app:cardElevation="4dp">
+
+                <LinearLayout
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:text="@string/username"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/username_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="User ID Value"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/user_id_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="Office"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/office_name_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="Office ID"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/office_id_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="Staff ID"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/staff_id_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                    <View
+                        android:background="@color/light_grey"
+                        android:layout_height="1dp"
+                        android:layout_width="match_parent"/>
+
+                    <TextView
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/default_margin"
+                        android:layout_width="wrap_content"
+                        android:text="Staff Display Name"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                        android:textColor="@color/primary"/>
+                    <TextView
+                        android:gravity="center"
+                        android:id="@+id/staff_disp_name_value"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+                        tools:text="@string/medium_text"/>
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="vertical"
+        android:layout_marginBottom="56dp">
+        <Button
+            android:id="@+id/aboutButton"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:text="About" />
+
+        <Button
+            android:id="@+id/logoutButton"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:text="Logout" />
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/activity_new_survey.xml b/visionppi/app/src/main/res/layout/activity_new_survey.xml
index 86f5fc7..1892a32 100644
--- a/visionppi/app/src/main/res/layout/activity_new_survey.xml
+++ b/visionppi/app/src/main/res/layout/activity_new_survey.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml b/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml
index f42e331..4756387 100644
--- a/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml
+++ b/visionppi/app/src/main/res/layout/activity_ppi_view_pager.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.viewpager.widget.ViewPager
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ppi_view_pager"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true"/>
diff --git a/visionppi/app/src/main/res/layout/activity_user_profile.xml b/visionppi/app/src/main/res/layout/activity_user_profile.xml
index 51145b0..afa752b 100644
--- a/visionppi/app/src/main/res/layout/activity_user_profile.xml
+++ b/visionppi/app/src/main/res/layout/activity_user_profile.xml
@@ -46,19 +46,19 @@
                     android:id="@+id/uname"/>
             </LinearLayout>
 
-            <View
-                android:background="@drawable/background"
-                android:layout_gravity="bottom"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"/>
-
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_height="?attr/actionBarSize"
                 android:layout_width="match_parent"
                 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                app:layout_collapseMode="pin"
-                app:title="User Details"/>
+                app:layout_collapseMode="pin">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="Edit Profile"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+            </androidx.appcompat.widget.Toolbar>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -217,4 +217,26 @@
 
     </androidx.core.widget.NestedScrollView>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="vertical"
+        android:layout_margin="10dp">
+        <Button
+            android:id="@+id/saveButton"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:text="Save" />
+    </LinearLayout>
+
+<!--    <View-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        android:layout_gravity="bottom"-->
+<!--        android:background="@drawable/background"-->
+<!--        app:layout_anchor="@+id/app_bar_layout"-->
+<!--        app:layout_anchorGravity="center" />-->
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/layout/image_grid_layout.xml b/visionppi/app/src/main/res/layout/image_grid_layout.xml
index 126dcdf..c6593e0 100644
--- a/visionppi/app/src/main/res/layout/image_grid_layout.xml
+++ b/visionppi/app/src/main/res/layout/image_grid_layout.xml
@@ -4,7 +4,8 @@
     android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="@dimen/foursp_margin">
+    android:padding="@dimen/foursp_margin"
+    >
 
     <ImageView
             android:layout_width="155dp"
diff --git a/visionppi/app/src/main/res/layout/new_survey_toolbar.xml b/visionppi/app/src/main/res/layout/new_survey_toolbar.xml
index 1fdaa81..b05929d 100644
--- a/visionppi/app/src/main/res/layout/new_survey_toolbar.xml
+++ b/visionppi/app/src/main/res/layout/new_survey_toolbar.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.Toolbar
         xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/blueDark">
diff --git a/visionppi/app/src/main/res/layout/ppi_response_row.xml b/visionppi/app/src/main/res/layout/ppi_response_row.xml
index 3b80cc2..dcf3fcd 100644
--- a/visionppi/app/src/main/res/layout/ppi_response_row.xml
+++ b/visionppi/app/src/main/res/layout/ppi_response_row.xml
@@ -3,7 +3,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="10dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+   >
 
     <LinearLayout
             android:orientation="horizontal"
diff --git a/visionppi/app/src/main/res/menu/bottom_nav_menu.xml b/visionppi/app/src/main/res/menu/bottom_nav_menu.xml
index 4f53998..3e2d9a3 100644
--- a/visionppi/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/visionppi/app/src/main/res/menu/bottom_nav_menu.xml
@@ -3,12 +3,17 @@
 
     <item
         android:id="@+id/navigation_home"
-        android:icon="@drawable/ic_home_black_24dp"
-        android:title="@string/title_home" />
+        android:icon="@drawable/ic_baseline_search_24"
+        android:title="@string/title_search" />
 
     <item
         android:id="@+id/navigation_dashboard"
-        android:icon="@drawable/ic_profile"
-        android:title="@string/title_dashboard" />
+        android:icon="@drawable/ic_baseline_analytics_24"
+        android:title="@string/title_analyze" />
+
+    <item
+        android:id="@+id/navigation_menu"
+        android:icon="@drawable/ic_baseline_menu_24"
+        android:title="@string/title_menu" />
 
 </menu>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/navigation/mobile_navigation.xml b/visionppi/app/src/main/res/navigation/mobile_navigation.xml
index b36e273..274534b 100644
--- a/visionppi/app/src/main/res/navigation/mobile_navigation.xml
+++ b/visionppi/app/src/main/res/navigation/mobile_navigation.xml
@@ -13,7 +13,13 @@
 
     <fragment
         android:id="@+id/navigation_dashboard"
-        android:name="org.mifos.visionppi.ui.user_profile.UserProfileActivity"
-        android:label="@string/title_dashboard"
-        tools:layout="@layout/activity_user_profile" />
+        android:name="org.mifos.visionppi.ui.home.MainActivity"
+        android:label="@string/title_analyze"
+        tools:layout="@layout/content_main" />
+
+    <fragment
+        android:id="@+id/navigation_menu"
+        android:name="org.mifos.visionppi.ui.menu.MenuActivity"
+        android:label="@string/title_menu"
+        tools:layout="@layout/activity_menu" />
 </navigation>
\ No newline at end of file
diff --git a/visionppi/app/src/main/res/values/strings.xml b/visionppi/app/src/main/res/values/strings.xml
index a16dabe..e066930 100644
--- a/visionppi/app/src/main/res/values/strings.xml
+++ b/visionppi/app/src/main/res/values/strings.xml
@@ -51,6 +51,9 @@
     <string name="object_detection_results">Object Detection Results</string>
     <string name="title_activity_main">MainActivity</string>
     <string name="title_home">Home</string>
+    <string name="title_search">Search</string>
+    <string name="title_analyze">Analyze</string>
+    <string name="title_menu">Menu</string>
     <string name="title_dashboard">Profile</string>
     <string name="medium_text">Placeholder</string>
     <string name="about_app">Vision PPI helps officers to fill PPI Surveys automatically with the help of photographs taken in a clients house.</string>
diff --git a/visionppi/build.gradle b/visionppi/build.gradle
index b1cf4c7..25b77f9 100644
--- a/visionppi/build.gradle
+++ b/visionppi/build.gradle
@@ -4,12 +4,13 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath 'io.fabric.tools:gradle:1.31.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.7.10"
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/visionppi/gradle/wrapper/gradle-wrapper.properties b/visionppi/gradle/wrapper/gradle-wrapper.properties
index 00bcd6b..083c7c5 100644
--- a/visionppi/gradle/wrapper/gradle-wrapper.properties
+++ b/visionppi/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip