Skip to content

Commit 889282f

Browse files
committed
Replace the app label with a horizontal divider
1 parent c019c5e commit 889282f

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ class SystemSearchActivity : DuckDuckGoActivity() {
146146
private var nestedScrollViewPosition: Int = 0
147147
private var nestedScrollViewRestorePosition: Int = 0
148148

149-
private val isOmnibarAtTop = settingsDataStore.omnibarPosition == OmnibarPosition.TOP
149+
private val isOmnibarAtTop by lazy {
150+
settingsDataStore.omnibarPosition == OmnibarPosition.TOP
151+
}
150152

151153
private val systemSearchOnboarding
152154
get() = binding.includeSystemSearchOnboarding
@@ -473,7 +475,7 @@ class SystemSearchActivity : DuckDuckGoActivity() {
473475
deviceAppSuggestionsAdapter.updateData(viewState.appResults)
474476

475477
binding.autocompleteSuggestions.isVisible = !viewState.autocompleteResults.suggestions.isEmpty()
476-
binding.deviceLabel.isVisible = viewState.appResults.isNotEmpty()
478+
binding.listDivider.isVisible = viewState.appResults.isNotEmpty()
477479
binding.deviceAppSuggestions.isVisible = !viewState.appResults.isEmpty()
478480
}
479481

app/src/main/res/layout/activity_system_search.xml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -222,30 +222,31 @@
222222
android:layout_width="0dp"
223223
android:layout_height="wrap_content"
224224
app:layout_constraintEnd_toEndOf="parent"
225+
app:layout_constraintHorizontal_bias="1.0"
225226
app:layout_constraintStart_toStartOf="parent"
226227
app:layout_constraintTop_toTopOf="parent"
227228
tools:itemCount="4"
228229
tools:listitem="@layout/item_autocomplete_search_suggestion" />
229230

230-
<com.duckduckgo.common.ui.view.text.DaxTextView
231-
android:id="@+id/deviceLabel"
232-
android:layout_width="0dp"
233-
android:layout_height="wrap_content"
234-
android:paddingHorizontal="?attr/autocompleteListItemHorizontalPadding"
235-
android:paddingVertical="@dimen/keyline_2"
236-
android:text="@string/systemSearchDeviceAppLabel"
237-
android:visibility="gone"
231+
<View
232+
android:id="@+id/listDivider"
233+
android:layout_width="match_parent"
234+
android:layout_height="0.5dp"
235+
android:background="?attr/daxColorShade"
236+
android:layout_marginVertical="@dimen/keyline_2"
238237
app:layout_constraintEnd_toEndOf="parent"
239238
app:layout_constraintStart_toStartOf="parent"
240-
app:layout_constraintTop_toBottomOf="@id/autocompleteSuggestions"/>
239+
app:layout_constraintTop_toBottomOf="@id/autocompleteSuggestions"
240+
app:layout_constraintBottom_toTopOf="@id/deviceAppSuggestions"/>
241241

242242
<androidx.recyclerview.widget.RecyclerView
243243
android:id="@+id/deviceAppSuggestions"
244244
android:layout_width="0dp"
245245
android:layout_height="wrap_content"
246+
android:layout_marginTop="@dimen/keyline_2"
246247
app:layout_constraintEnd_toEndOf="parent"
247248
app:layout_constraintStart_toStartOf="parent"
248-
app:layout_constraintTop_toBottomOf="@id/deviceLabel"
249+
app:layout_constraintTop_toBottomOf="@id/listDivider"
249250
tools:itemCount="4"
250251
tools:listitem="@layout/item_device_app_suggestion" />
251252

app/src/main/res/values/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,6 @@
426426
<string name="crashedWebViewErrorAction">"Reload"</string>
427427

428428
<!-- System Search-->
429-
<string name="systemSearchDeviceAppLabel">From This Device</string>
430429
<string name="systemSearchAppNotFound">Application could not be found</string>
431430
<string name="systemSearchOnboardingThanks">Thanks for choosing DuckDuckGo!\nUsing our browser helps keep you protected from hackers, scammers, and data-hungry companies.</string>
432431
<string name="systemSearchOnboardingFeaturesIntroText">The DuckDuckGo app also:</string>

0 commit comments

Comments
 (0)