-
Notifications
You must be signed in to change notification settings - Fork 897
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added dividers between sections. Updated color on switch to tab icon.
- Loading branch information
Showing
5 changed files
with
122 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
app/src/main/java/com/duckduckgo/app/browser/autocomplete/SuggestionItemDecoration.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * Copyright (c) 2024 DuckDuckGo | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.duckduckgo.app.browser.autocomplete | ||
|
|
||
| import android.graphics.Canvas | ||
| import android.graphics.drawable.Drawable | ||
| import android.view.ViewGroup.MarginLayoutParams | ||
| import androidx.recyclerview.widget.RecyclerView | ||
|
|
||
| class SuggestionItemDecoration(private val divider: Drawable) : RecyclerView.ItemDecoration() { | ||
|
|
||
| override fun onDrawOver( | ||
| canvas: Canvas, | ||
| parent: RecyclerView, | ||
| state: RecyclerView.State, | ||
| ) { | ||
| canvas.save() | ||
|
|
||
| val childCount = parent.childCount | ||
| val parentRight = parent.width - parent.paddingRight | ||
|
|
||
| for (i in 0 until childCount) { | ||
| val child = parent.getChildAt(i) | ||
| val params = child.layoutParams as MarginLayoutParams | ||
| val currentViewType = child.tag | ||
| val nextViewType = if (i + 1 < childCount) parent.getChildAt(i + 1).tag else UNKNOWN | ||
|
|
||
| if (nextViewType == UNKNOWN) { | ||
| continue | ||
| } | ||
|
|
||
| if (currentViewType == SEARCH_ITEM && nextViewType == OTHER_ITEM) { | ||
| drawDivider(canvas, child, params, parentRight) | ||
| } | ||
|
|
||
| if (currentViewType == OTHER_ITEM && nextViewType == SEARCH_ITEM) { | ||
| drawDivider(canvas, child, params, parentRight) | ||
| } | ||
| } | ||
|
|
||
| canvas.restore() | ||
| } | ||
|
|
||
| private fun drawDivider( | ||
| canvas: Canvas, | ||
| child: android.view.View, | ||
| params: MarginLayoutParams, | ||
| parentRight: Int, | ||
| ) { | ||
| val horizontalSize = parentRight | ||
| val verticalSize = child.bottom + params.bottomMargin | ||
| divider.setBounds(0, verticalSize, horizontalSize, verticalSize + divider.intrinsicHeight) | ||
| divider.draw(canvas) | ||
| } | ||
|
|
||
| companion object { | ||
| internal const val SEARCH_ITEM = "SEARCH_ITEM" | ||
| internal const val OTHER_ITEM = "OTHER_ITEM" | ||
| internal const val UNKNOWN = "UNKNOWN" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?xml version="1.0" encoding="utf-8"?><!-- | ||
| ~ Copyright (c) 2024 DuckDuckGo | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
|
|
||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
|
|
||
| <size | ||
| android:width="1dp" | ||
| android:height="1dp" /> | ||
|
|
||
| <solid android:color="?daxColorLines" /> | ||
|
|
||
| </shape> |