Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_virtual.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20,18c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2H4C2.9,4 2,4.9 2,6v10c0,1.1 0.9,2 2,2H0v2h24v-2H20zM4,6h16v10H4V6z"/>
</vector>
43 changes: 43 additions & 0 deletions app/src/main/res/layout/fragment_search_filter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@
android:textStyle="bold"
android:textSize="@dimen/text_size_expanded_title" />


<TextView
android:visibility="gone"
android:id="@+id/tvSelectLocation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -102,6 +104,47 @@
android:text="@string/anywhere"
android:textSize="@dimen/text_size_large" />

<CheckBox
android:id="@+id/ckSelectLocation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/anywhere"
android:textColor="@color/light_grey"
android:textSize="@dimen/text_size_large" />
<CheckBox
android:id="@+id/ckSelectvirtual"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/virtual"
android:textColor="@color/light_grey"
android:textSize="@dimen/text_size_large" />

<TextView
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:textAlignment="center"
android:padding="@dimen/padding_small"
android:text="or"
android:textSize="@dimen/text_size_large"
tools:ignore="RtlCompat" />

<TextView
android:visibility="gone"
android:id="@+id/tvSelectvirtual"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:drawableStart="@drawable/ic_virtual"
android:drawablePadding="@dimen/padding_medium"
android:drawableTint="@color/light_grey"
android:gravity="center_vertical"
android:padding="@dimen/padding_small"
android:text="@string/virtual"
android:textSize="@dimen/text_size_large" />

<View
android:layout_width="match_parent"
android:layout_height="@dimen/event_details_divider"
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/layout/fragment_search_location.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@
android:textSize="@dimen/text_size_large" />

</LinearLayout>
<CheckBox
android:id="@+id/chkvirtualevt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/virtual_location"
android:textColor="@color/light_grey"
android:textSize="@dimen/text_size_large" />

<ProgressBar
android:id="@+id/locationProgressBar"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<string name="search_hint">Search for. . .</string>
<string name="go_out">I want to go out</string>
<string name="anywhere">Anywhere</string>
<string name="virtual">Virtual</string>
<string name="anytime">Anytime</string>
<string name="today">Today</string>
<string name="tomorrow">Tomorrow</string>
Expand Down Expand Up @@ -369,6 +370,9 @@

<string name="filter">Filter Search</string>
<string name="free_stuff">Free stuff only</string>
<string name="both">Both</string>
<string name="virtual_location">Also Search For Virtual Event</string>

<string name="speakers">Speakers</string>
<string name="speakers_call">Speakers Call</string>
<string name="sponsors">Sponsors</string>
Expand Down