Skip to content

Commit

Permalink
Adam/cancel search button (#58)
Browse files Browse the repository at this point in the history 
* fixed location issue

* cancel button for search queries
  • Loading branch information
@hockeymonday
hockeymonday authored Feb 20, 2021
1 parent 8d8bd57 commit adcf7b5
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 51 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'

}
13 changes: 13 additions & 0 deletions app/src/main/java/com/example/ithaca_transit_android_v2/presenters/SearchPresenter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ->
Expand Down
Binary file added app/src/main/res/drawable-v24/outline_cancel_black_18dp.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_cancel_24px.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_cancel_white_18dp.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
61 changes: 39 additions & 22 deletions app/src/main/res/layout/search_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
91 changes: 63 additions & 28 deletions app/src/main/res/layout/search_secondary.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit adcf7b5

Please sign in to comment.