From a361fca825163155bd17997944bf163434254f66 Mon Sep 17 00:00:00 2001
From: Varun Vaibhav Jha <jha.varun6@gmail.com>
Date: Thu, 7 Jan 2021 18:31:43 +0530
Subject: [PATCH 1/5] fixed overlapping text on image

---
 app/src/main/res/layout/fragment_search.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index e55d52d36..08b6f5e13 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -63,7 +63,7 @@
             android:orientation="vertical"
             android:paddingBottom="@dimen/padding_extra_large"
             android:paddingStart="@dimen/padding_extra_large"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="@id/backgroundImage"
             app:layout_constraintLeft_toLeftOf="parent">
 
             <TextView

From 6de495b5ff890ff064475e7fc602cedee2723d75 Mon Sep 17 00:00:00 2001
From: Varun Vaibhav Jha <60656060+varunvjha@users.noreply.github.com>
Date: Thu, 7 Jan 2021 19:32:53 +0530
Subject: [PATCH 2/5] fix: fixed a display bug on search

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

diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 08b6f5e13..cda84c19a 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -63,8 +63,8 @@
             android:orientation="vertical"
             android:paddingBottom="@dimen/padding_extra_large"
             android:paddingStart="@dimen/padding_extra_large"
-            app:layout_constraintBottom_toBottomOf="@id/backgroundImage"
-            app:layout_constraintLeft_toLeftOf="parent">
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintBottom_toBottomOf="@id/backgroundImage">
 
             <TextView
                 android:layout_width="wrap_content"

From faeda9c80dc7d44077fe3f8201712307a535859b Mon Sep 17 00:00:00 2001
From: Varun Vaibhav Jha <jha.varun6@gmail.com>
Date: Sat, 9 Jan 2021 19:24:20 +0530
Subject: [PATCH 3/5] fix: fixed overlapping text on image

---
 app/src/main/res/layout/fragment_welcome.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index 58c0f7663..bb7ec7e27 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -49,7 +49,7 @@
     <ImageView
         android:layout_width="@dimen/avatar_medium"
         android:layout_height="@dimen/avatar_medium"
-        android:layout_above="@+id/pickCityButton"
+        android:layout_above="@+id/currentLocation"
         android:layout_below="@id/textLinearLayout"
         android:layout_centerHorizontal="true"
         app:srcCompat="@drawable/ic_location_world"
@@ -68,8 +68,8 @@
             android:layout_width="@dimen/item_image_view_medium"
             android:layout_height="@dimen/item_image_view_medium"
             android:layout_margin="@dimen/layout_margin_medium"
-            android:tint="@color/colorPrimary"
-            app:srcCompat="@drawable/ic_location_pin"/>
+            app:srcCompat="@drawable/ic_location_pin"
+            app:tint="@color/colorPrimary" />
 
         <TextView
             android:layout_width="wrap_content"

From e7ae32910ce651246569e114350235730a3d95b7 Mon Sep 17 00:00:00 2001
From: Varun Vaibhav Jha <jha.varun6@gmail.com>
Date: Sat, 9 Jan 2021 19:34:46 +0530
Subject: [PATCH 4/5] fix: rollback

---
 app/src/main/res/layout/fragment_welcome.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index bb7ec7e27..58c0f7663 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -49,7 +49,7 @@
     <ImageView
         android:layout_width="@dimen/avatar_medium"
         android:layout_height="@dimen/avatar_medium"
-        android:layout_above="@+id/currentLocation"
+        android:layout_above="@+id/pickCityButton"
         android:layout_below="@id/textLinearLayout"
         android:layout_centerHorizontal="true"
         app:srcCompat="@drawable/ic_location_world"
@@ -68,8 +68,8 @@
             android:layout_width="@dimen/item_image_view_medium"
             android:layout_height="@dimen/item_image_view_medium"
             android:layout_margin="@dimen/layout_margin_medium"
-            app:srcCompat="@drawable/ic_location_pin"
-            app:tint="@color/colorPrimary" />
+            android:tint="@color/colorPrimary"
+            app:srcCompat="@drawable/ic_location_pin"/>
 
         <TextView
             android:layout_width="wrap_content"

From d7976eced480fb1beb40365d218ea43b8c24e47d Mon Sep 17 00:00:00 2001
From: Varun Vaibhav Jha <jha.varun6@gmail.com>
Date: Sat, 9 Jan 2021 19:46:37 +0530
Subject: [PATCH 5/5] fix: fixed display bug - overlapping text on image

---
 app/src/main/res/layout/fragment_welcome.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index 58c0f7663..bb7ec7e27 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -49,7 +49,7 @@
     <ImageView
         android:layout_width="@dimen/avatar_medium"
         android:layout_height="@dimen/avatar_medium"
-        android:layout_above="@+id/pickCityButton"
+        android:layout_above="@+id/currentLocation"
         android:layout_below="@id/textLinearLayout"
         android:layout_centerHorizontal="true"
         app:srcCompat="@drawable/ic_location_world"
@@ -68,8 +68,8 @@
             android:layout_width="@dimen/item_image_view_medium"
             android:layout_height="@dimen/item_image_view_medium"
             android:layout_margin="@dimen/layout_margin_medium"
-            android:tint="@color/colorPrimary"
-            app:srcCompat="@drawable/ic_location_pin"/>
+            app:srcCompat="@drawable/ic_location_pin"
+            app:tint="@color/colorPrimary" />
 
         <TextView
             android:layout_width="wrap_content"