Skip to content

updated system search activity to match the current designs #1166

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

Merged
merged 3 commits into from
Apr 13, 2021
Merged

updated system search activity to match the current designs #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23ec234
updated system search activity to match the current designs
malmstein Apr 9, 2021
f60d0d8
Merge branch 'develop' into feature/david/interstitial_screen_update
malmstein Apr 9, 2021
cfedfbf
cleaning up old reference
malmstein Apr 9, 2021
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
13 changes: 11 additions & 2 deletions app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@ import com.duckduckgo.app.pixels.AppPixelName
import com.duckduckgo.app.systemsearch.SystemSearchViewModel.Command.*
import com.duckduckgo.app.systemsearch.SystemSearchViewModel.SystemSearchResultsViewState
import kotlinx.android.synthetic.main.activity_system_search.*
import kotlinx.android.synthetic.main.activity_system_search.appBarLayout
import kotlinx.android.synthetic.main.activity_system_search.autocompleteSuggestions
import kotlinx.android.synthetic.main.activity_system_search.clearTextButton
import kotlinx.android.synthetic.main.activity_system_search.deviceAppSuggestions
import kotlinx.android.synthetic.main.activity_system_search.deviceLabel
import kotlinx.android.synthetic.main.activity_system_search.logo
import kotlinx.android.synthetic.main.activity_system_search.omnibarTextInput
import kotlinx.android.synthetic.main.activity_system_search.results
import kotlinx.android.synthetic.main.activity_system_search.resultsContent
import kotlinx.android.synthetic.main.include_system_search_onboarding.*
import javax.inject.Inject

Expand Down Expand Up @@ -165,10 +174,10 @@ class SystemSearchActivity : DuckDuckGoActivity() {
private fun updateScroll() {
val scrollable = resultsContent.height > (results.height - results.paddingTop - results.paddingBottom)
if (scrollable) {
omnibarScrolling.enableOmnibarScrolling(toolbar)
omnibarScrolling.enableOmnibarScrolling(toolbarContainer)
} else {
showOmnibar()
omnibarScrolling.disableOmnibarScrolling(toolbar)
omnibarScrolling.disableOmnibarScrolling(toolbarContainer)
}
}

Expand Down
163 changes: 88 additions & 75 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 @@ -25,84 +25,96 @@
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.Dark.AppBarOverlay">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbarContainer"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/OmnibarToolbarTheme"
app:contentInsetEnd="0dp"
app:contentInsetStart="0dp"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.Dark.PopupOverlay">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/omniBarContainer"
android:layout_height="match_parent"
android:background="?toolbarBgColor">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp">

<ImageView
android:id="@+id/logo"
android:layout_width="30dp"
android:layout_height="30dp"
android:importantForAccessibility="no"
android:src="@drawable/logo_mini"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/omnibarTextInput"
style="@style/Base.V7.Widget.AppCompat.EditText"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@android:color/transparent"
android:fontFamily="sans-serif-medium"
android:hint="@string/systemSearchOmnibarInputHint"
android:imeOptions="flagNoExtractUi|actionGo|flagNoPersonalizedLearning"
android:inputType="textUri|textNoSuggestions"
android:maxLines="1"
android:selectAllOnFocus="true"
android:textColor="?attr/omnibarTextColor"
android:textColorHint="?attr/omnibarHintColor"
android:textCursorDrawable="@drawable/text_cursor"
android:textSize="16sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/clearTextButton"
app:layout_constraintStart_toEndOf="@id/logo"
app:layout_constraintTop_toTopOf="parent"
tools:text="https://duckduckgo.com/?q=areallylongexampleexample">

<requestFocus />

</androidx.appcompat.widget.AppCompatEditText>

<ImageView
android:id="@+id/clearTextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:contentDescription="@string/clearButtonContentDescription"
android:padding="3dp"
android:src="@drawable/ic_close_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.appcompat.widget.Toolbar>
android:layout_height="?attr/actionBarSize"
android:background="?attr/toolbarBgColor"
app:contentInsetEnd="0dp"
app:contentInsetStart="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="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
android:id="@+id/omniBarContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="8dp"
android:background="@drawable/omnibar_field_background"
android:paddingStart="6dp"
android:paddingEnd="6dp">

<ImageView
android:id="@+id/logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
android:src="@drawable/ic_ddg_logo"
android:padding="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/omnibarTextInput"
style="@style/Base.V7.Widget.AppCompat.EditText"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:background="@null"
android:fontFamily="sans-serif"
android:hint="@string/systemSearchOmnibarInputHint"
android:imeOptions="flagNoExtractUi|actionGo|flagNoPersonalizedLearning"
android:inputType="textUri|textNoSuggestions"
android:maxLines="1"
android:selectAllOnFocus="true"
android:textColor="?attr/omnibarTextColor"
android:textColorHint="?attr/omnibarHintColor"
android:textCursorDrawable="@drawable/text_cursor"
android:textSize="16sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/clearTextButton"
app:layout_constraintStart_toEndOf="@id/logo"
app:layout_constraintTop_toTopOf="parent"
tools:text="https://duckduckgo.com/?q=areallylongexampleexample">

<requestFocus />

</androidx.appcompat.widget.AppCompatEditText>

<ImageView
android:id="@+id/clearTextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:contentDescription="@string/clearButtonContentDescription"
android:padding="3dp"
android:src="@drawable/ic_close"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />

</androidx.constraintlayout.widget.ConstraintLayout>


</androidx.appcompat.widget.Toolbar>

</androidx.constraintlayout.widget.ConstraintLayout>


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

Expand All @@ -119,8 +131,9 @@
android:id="@+id/resultsContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:clipToPadding="false"
android:background="?toolbarBgColor"
android:backgroundTint="?toolbarBgColor"
android:elevation="4dp">

<androidx.recyclerview.widget.RecyclerView
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/include_omnibar_toolbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
app:layout_constraintBottom_toBottomOf="@id/omnibarIconContainer"
app:layout_constraintStart_toStartOf="@id/omnibarIconContainer"
app:layout_constraintTop_toTopOf="@id/omnibarIconContainer"

tools:ignore="RtlSymmetry" >
</androidx.constraintlayout.widget.ConstraintLayout>

Expand Down