From adcf7b5183e895f804c06271a4b22664e56de46c Mon Sep 17 00:00:00 2001
From: Adam Kadhim <adamakadhim@gmail.com>
Date: Sat, 20 Feb 2021 02:14:20 -0500
Subject: [PATCH] Adam/cancel search button (#58)

* fixed location issue

* cancel button for search queries
---
 app/build.gradle                              |   1 +
 .../presenters/SearchPresenter.kt             |  13 +++
 .../outline_cancel_black_18dp.png             | Bin 0 -> 393 bytes
 app/src/main/res/drawable/ic_cancel_24px.xml  |   9 ++
 .../res/drawable/ic_cancel_white_18dp.xml     |   9 ++
 app/src/main/res/layout/search_main.xml       |  61 +++++++-----
 app/src/main/res/layout/search_secondary.xml  |  91 ++++++++++++------
 build.gradle                                  |   2 +-
 8 files changed, 135 insertions(+), 51 deletions(-)
 create mode 100644 app/src/main/res/drawable-v24/outline_cancel_black_18dp.png
 create mode 100644 app/src/main/res/drawable/ic_cancel_24px.xml
 create mode 100644 app/src/main/res/drawable/ic_cancel_white_18dp.xml

diff --git a/app/build.gradle b/app/build.gradle
index f58e10d..dbb82f2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -59,5 +59,6 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
     implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.0.0'
 
 }
diff --git a/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/SearchPresenter.kt b/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/SearchPresenter.kt
index 8178cae..37ef80f 100644
--- a/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/SearchPresenter.kt
+++ b/app/src/main/java/com/example/ithaca_transit_android_v2/presenters/SearchPresenter.kt
@@ -2,6 +2,7 @@ package com.example.ithaca_transit_android_v2.presenters
 
 import android.app.Activity
 import android.content.Context
+import android.graphics.PorterDuff
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
@@ -10,6 +11,7 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import com.example.ithaca_transit_android_v2.MapFragment
 import com.example.ithaca_transit_android_v2.NetworkUtils
+import com.example.ithaca_transit_android_v2.R
 import com.example.ithaca_transit_android_v2.Repository
 import com.example.ithaca_transit_android_v2.models.Coordinate
 import com.example.ithaca_transit_android_v2.models.Location
@@ -150,6 +152,13 @@ class SearchPresenter(
             view.edit_start_loc.addTextChangedListener(watcherChangeLoc)
             view.edit_dest_loc.addTextChangedListener(watcherChangeLoc)
 
+            view.cancel_start.setOnClickListener() {
+                view.edit_start_loc.text.clear()
+            }
+            view.cancel_end.setOnClickListener() {
+                view.edit_dest_loc.text.clear()
+            }
+
             view.edit_start_loc.setOnFocusChangeListener { view, hasFocus ->
                 if (hasFocus && mEditing) {
                     mEditingStart = true
@@ -237,6 +246,10 @@ class SearchPresenter(
             Log.w("qwerty", e.stackTrace.toString())
         }
 
+        view.search_input.setOnClickListener() {
+            it.search_input.text.clear()
+        }
+
         return observable
             .observeOn(Schedulers.io())
             .map { state ->
diff --git a/app/src/main/res/drawable-v24/outline_cancel_black_18dp.png b/app/src/main/res/drawable-v24/outline_cancel_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7b20259b5cacbf9c32298375cd6515d215b7844
GIT binary patch
literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003{Nkl<ZNXO-t
zJC4FI6h%*x1|--8Vi%!Dw8IX_8ejv^KnGM=0W}L?8%T5@kf4M*x>H~@NgNnPdeh9<
zU3`7~etr)8!x0iQWy6jeH+F285)=LmQe(sgRm=+`YVTtD94aA?d7%G}L*v|rB|Ta+
zXwag^GIzlEwUZ$$Cp?i5dFv4gC#P7wLQR}#P4lUy$=azV&m<pCF#jeuA#<nvs9LVG
zch=l79Rg1i&~d1{ReS0_XowI;=hT3Vw1f&s$rv~Xj|egJ!+1uB#95OeR6qr!2$4Cf
z5`;LHQxdy`M}<vaDE~|3iXkq7W(cwH&cAQ;F#rpMm=!@Agy@zc^4MI3fi6O9il8k*
zw7uZwuSPleZG_ksL05#lGR&h=uN;~Pas4HbnQLajHcP)*L7H6=vrB8(M$8(UVXHN4
n{$|gS;R9*<WE=iO{E6`iw##4WEvK!)00000NkvXXu0mjf=p~|8

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_cancel_24px.xml b/app/src/main/res/drawable/ic_cancel_24px.xml
new file mode 100644
index 0000000..3adf3cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cancel_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM15.59,7L12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 17,8.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cancel_white_18dp.xml b/app/src/main/res/drawable/ic_cancel_white_18dp.xml
new file mode 100644
index 0000000..0675c8e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cancel_white_18dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM15.59,7L12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 17,8.41z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/layout/search_main.xml b/app/src/main/res/layout/search_main.xml
index 754fb39..a2fa7fd 100644
--- a/app/src/main/res/layout/search_main.xml
+++ b/app/src/main/res/layout/search_main.xml
@@ -30,35 +30,52 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:focusable="true"
+            android:layout_gravity="center_vertical"
             android:focusableInTouchMode="true"
             android:orientation="vertical">
 
-            <EditText
-                android:id="@+id/search_input"
-                android:layout_width="fill_parent"
-                android:layout_height="0dp"
-                android:layout_marginTop="2dp"
-                android:layout_weight="1"
-                android:background="@android:color/transparent"
-                android:drawableStart="@drawable/ic_search"
-                android:drawablePadding="14dp"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:hint="Where to?"
-                android:importantForAutofill="no"
-                android:inputType="textVisiblePassword"
-                android:lines="1"
-                android:maxLines="1"
-                android:paddingStart="20dp"
-                android:paddingTop="12dp"
-                android:paddingEnd="14dp"
-                android:scrollHorizontally="true"
-                android:textSize="16sp" />
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <EditText
+                    android:id="@+id/search_input"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:layout_weight="1"
+                    android:background="@android:color/transparent"
+                    android:drawableStart="@drawable/ic_search"
+                    android:drawablePadding="14dp"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:hint="Where to?"
+                    android:importantForAutofill="no"
+                    android:inputType="textVisiblePassword"
+                    android:lines="1"
+                    android:maxLines="1"
+                    android:paddingStart="20dp"
+                    android:paddingTop="12dp"
+                    android:paddingBottom="12dp"
+                    android:paddingEnd="14dp"
+                    android:scrollHorizontally="true"
+                    android:textSize="16sp" />
+
+                <ImageButton
+                    android:id="@+id/cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_gravity="right|center_vertical"
+                    android:background="@drawable/ic_cancel_24px"
+                    android:scaleType="fitXY"/>
+
+            </FrameLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="15dp"
                 android:background="#1A000000" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/search_secondary.xml b/app/src/main/res/layout/search_secondary.xml
index c64a5b9..92676f5 100644
--- a/app/src/main/res/layout/search_secondary.xml
+++ b/app/src/main/res/layout/search_secondary.xml
@@ -92,40 +92,75 @@
             android:layout_weight="0.62"
             android:orientation="vertical">
 
-            <EditText
-                android:id="@+id/edit_start_loc"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:inputType="textVisiblePassword"
-                android:lines="1"
-                android:maxLines="1"
-                android:minWidth="150dp"
-                android:paddingTop="15dp"
-                android:paddingBottom="15dp"
-                android:scrollHorizontally="true" />
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <EditText
+                    android:id="@+id/edit_start_loc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:inputType="textVisiblePassword"
+                    android:lines="1"
+                    android:maxLines="1"
+                    android:minWidth="150dp"
+                    android:paddingTop="15dp"
+                    android:paddingBottom="15dp"
+                    android:scrollHorizontally="true" />
+
+                <ImageButton
+                    android:id="@+id/cancel_start"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_gravity="right|center_vertical"
+                    android:background="@drawable/ic_cancel_24px"
+                    android:tint="#DADADA"
+                    android:scaleType="fitXY"/>
+
+            </FrameLayout>
+
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#eee" />
 
-            <EditText
-                android:id="@+id/edit_dest_loc"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:inputType="textVisiblePassword"
-                android:lines="1"
-                android:maxLines="1"
-                android:minWidth="150dp"
-                android:paddingTop="15dp"
-                android:paddingBottom="15dp"
-                android:scrollHorizontally="true" />
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <EditText
+                    android:id="@+id/edit_dest_loc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:inputType="textVisiblePassword"
+                    android:lines="1"
+                    android:maxLines="1"
+                    android:minWidth="150dp"
+                    android:paddingTop="15dp"
+                    android:paddingBottom="15dp"
+                    android:scrollHorizontally="true" />
+
+                <ImageButton
+                    android:id="@+id/cancel_end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_gravity="right|center_vertical"
+                    android:background="@drawable/ic_cancel_24px"
+                    android:tint="#DADADA"
+                    android:scaleType="fitXY"/>
+
+            </FrameLayout>
+
+
         </LinearLayout>
 
         <LinearLayout
diff --git a/build.gradle b/build.gradle
index 50f355b..5936015 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files