Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add interstitial search #719

Merged
merged 29 commits into from
Feb 27, 2020
Merged

Add interstitial search #719

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
165adc0
Update to latest tooling
subsymbolic Jan 30, 2020
b0a920c
Remove unused parameter
subsymbolic Jan 30, 2020
84cdb3a
Remove unneeded unwrapping as per lint warning
subsymbolic Jan 30, 2020
75ae65e
Remove duplicate data and presentation logic from AutoCompleteApi
subsymbolic Jan 30, 2020
3271174
Initial interstitial screen
subsymbolic Jan 30, 2020
b4365ba
Add app list to view
subsymbolic Feb 3, 2020
45676b3
Tidy up device lookup and move off main thread
subsymbolic Feb 9, 2020
ea4578c
Use mini logo for better sizing
subsymbolic Feb 9, 2020
2214715
Merge branch 'develop' into feature/mia/interstitial_search
subsymbolic Feb 9, 2020
36b1d4b
Add scrolling
subsymbolic Feb 9, 2020
026a68e
Add view state reset and tweak app label text size
subsymbolic Feb 9, 2020
12b22bc
Remove colon from system search text as per design feedback
subsymbolic Feb 17, 2020
3be73e3
Update layout to show shadow at the bottom of autocomplete
subsymbolic Feb 17, 2020
b9b06de
Enable "no suggestions" and ensure it doesn't flash up on the screen
subsymbolic Feb 17, 2020
7a6cf08
Fix scrolling
subsymbolic Feb 20, 2020
e545232
Improve app lookup speed by reducing package manager lookups
subsymbolic Feb 20, 2020
bda60f6
Remove additional dev logging
subsymbolic Feb 20, 2020
b0ddd90
Tweak scrolling further
subsymbolic Feb 21, 2020
b235b09
Switch to word prefix matching
subsymbolic Feb 21, 2020
61fe705
Small tidy ups, remove dev logging, add explanatory comment and cance…
subsymbolic Feb 21, 2020
fa43e94
Make dax launch DuckDuckGo
subsymbolic Feb 21, 2020
6864a0e
Merge branch 'develop' into feature/mia/interstitial_search
subsymbolic Feb 21, 2020
95284bb
Add pixels
subsymbolic Feb 21, 2020
96d672f
Merge branch 'develop' into feature/mia/interstitial_search
subsymbolic Feb 21, 2020
005e188
Unit tests
subsymbolic Feb 24, 2020
cbea4ca
Merge branch 'develop' into feature/mia/interstitial_search
subsymbolic Feb 24, 2020
12451af
Rename variables and methods for clarity
subsymbolic Feb 26, 2020
c1343bd
Store app icon to avoid duplicate lookups and show message when app n…
subsymbolic Feb 26, 2020
4353881
Lint
subsymbolic Feb 26, 2020
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
Prev Previous commit
Next Next commit
Add scrolling
  • Loading branch information
@subsymbolic
subsymbolic committed Feb 9, 2020
commit 36b1d4be1eb0d0d800a18b5b4461bbe215a642db
116 changes: 65 additions & 51 deletions app/src/main/res/layout/activity_system_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@
~ limitations under the License.
-->

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
app:layout_scrollFlags="scroll|enterAlways">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.Dark.AppBarOverlay"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_scrollFlags="scroll|enterAlways">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbarContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/OmnibarToolbarTheme">
android:theme="@style/OmnibarToolbarTheme"
app:layout_scrollFlags="scroll|enterAlways">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
Expand All @@ -48,6 +48,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.Dark.PopupOverlay">

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down Expand Up @@ -119,47 +120,60 @@

</com.google.android.material.appbar.AppBarLayout>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/autocompleteSuggestions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:backgroundTint="?attr/colorPrimary"
android:elevation="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/appBarLayout"
tools:itemCount="4"
tools:listitem="@layout/item_autocomplete_search_suggestion" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/deviceLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:backgroundTint="?attr/colorPrimary"
android:elevation="4dp"
android:paddingStart="8dp"
android:paddingTop="8dp"
android:paddingEnd="8dp"
android:text="@string/system_search_app_label"
android:textColor="@color/warGreyTwo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/autocompleteSuggestions"
app:textAllCaps="true" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/deviceAppSuggestions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:backgroundTint="?attr/colorPrimary"
android:elevation="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/deviceLabel"
tools:itemCount="4"
tools:listitem="@layout/item_device_app_suggestion" />

</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/autocompleteSuggestions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:backgroundTint="?attr/colorPrimary"
android:elevation="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:itemCount="4"
tools:listitem="@layout/item_autocomplete_search_suggestion" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/deviceLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:backgroundTint="?attr/colorPrimary"
android:elevation="4dp"
android:paddingStart="8dp"
android:paddingTop="8dp"
android:paddingEnd="8dp"
android:text="@string/system_search_app_label"
android:textColor="@color/warGreyTwo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/autocompleteSuggestions"
app:textAllCaps="true" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/deviceAppSuggestions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:backgroundTint="?attr/colorPrimary"
android:elevation="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/deviceLabel"
tools:itemCount="4"
tools:listitem="@layout/item_device_app_suggestion" />

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.core.widget.NestedScrollView>

</androidx.coordinatorlayout.widget.CoordinatorLayout>