From 1bc5cc378afa8d749286dcb3591df8fc9230523d Mon Sep 17 00:00:00 2001
From: rkodev <43806892+rkodev@users.noreply.github.com>
Date: Mon, 14 Dec 2020 09:33:24 +0300
Subject: [PATCH 1/2] Add checks to master v1

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 89653a1fcd..a4a400a77a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,9 +5,9 @@ name: Android CI with Gradle
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master , master-v1 ]
   pull_request:
-    branches: [ master ]
+    branches: [ master , master-v1 ]
 
 jobs:
   unit_tests:

From ec0b387c647de0433b933bc1667f6e43d85efda1 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Mon, 14 Dec 2020 15:18:40 +0500
Subject: [PATCH 2/2] Fix issue#1300

---
 .../res/layout/base_register_search_bar.xml   | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 opensrp-chw/src/main/res/layout/base_register_search_bar.xml

diff --git a/opensrp-chw/src/main/res/layout/base_register_search_bar.xml b/opensrp-chw/src/main/res/layout/base_register_search_bar.xml
new file mode 100644
index 0000000000..139ec9ba60
--- /dev/null
+++ b/opensrp-chw/src/main/res/layout/base_register_search_bar.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/search_bar_layout"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:layout_weight="2"
+    android:background="@color/search_bar_background_black"
+    android:gravity="center_vertical">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="@dimen/ec_main_header_search_layout_height"
+        android:layout_marginStart="@dimen/register_search_bar_margin"
+        android:layout_marginEnd="@dimen/register_search_bar_min_margin"
+        android:layout_weight="1.5">
+
+        <EditText
+            android:id="@+id/edt_search"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentStart="true"
+            android:layout_marginEnd="0dp"
+            android:background="@drawable/grey_edit_text_shape"
+            android:ellipsize="end"
+            android:hint="@string/search_hint"
+            android:maxLines="1"
+            android:minWidth="100dp"
+            android:padding="@dimen/register_search_bar_padding"
+            android:textColor="@android:color/white"
+            android:textColorHint="@color/search_hint_white"
+            android:textSize="@dimen/default_font_size_search_bar" />
+
+        <ImageButton
+            android:id="@+id/btn_search_cancel"
+            android:layout_width="@dimen/ec_main_header_search_cancel_button_width"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="@dimen/search_view_cancel_image_margin_right"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_cross"
+            android:visibility="gone" />
+
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:id="@+id/filter_sort_layout"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/ec_main_header_search_layout_height"
+        android:layout_marginEnd="@dimen/register_search_bar_margin"
+        android:layout_marginLeft="@dimen/search_bar_min_margin"
+        android:layout_marginRight="@dimen/register_search_bar_margin"
+        android:layout_marginStart="@dimen/search_bar_min_margin"
+        android:layout_weight="0.5">
+
+        <TextView
+            android:id="@+id/filter_text_view"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginEnd="5dp"
+            android:layout_marginRight="5dp"
+            android:drawableLeft="@drawable/ic_icon_filter"
+            android:drawablePadding="@dimen/register_search_bar_min_margin"
+            android:drawableStart="@drawable/ic_icon_filter"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:scrollHorizontally="true"
+            android:text="@string/filter"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/default_font_size_search_bar" />
+
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/due_only_layout"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/ec_main_header_search_layout_height"
+        android:layout_marginEnd="@dimen/register_search_bar_margin"
+        android:layout_marginLeft="@dimen/search_bar_min_margin"
+        android:layout_marginRight="@dimen/register_search_bar_margin"
+        android:layout_marginStart="@dimen/search_bar_min_margin"
+        android:visibility="gone"
+        android:layout_weight="0.75">
+
+
+        <TextView
+            android:id="@+id/due_only_text_view"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
+            android:drawableEnd="@drawable/ic_due_filter_off"
+            android:drawableRight="@drawable/ic_due_filter_off"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="2"
+            android:scrollHorizontally="true"
+            android:text="@string/due_only"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/default_font_size_search_bar"/>
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file