Create shared custom view for library items
Tiger Oakes
5 years ago
committed by
Emily Kager
parent
ed60bdf470
commit
2467588c4a
@ -0,0 +1,69 @@
|
|||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
package org.mozilla.fenix.library
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.widget.ImageButton
|
||||||
|
import android.widget.ImageView
|
||||||
|
import android.widget.TextView
|
||||||
|
import androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
import androidx.core.view.isVisible
|
||||||
|
import kotlinx.android.synthetic.main.library_site_item.view.*
|
||||||
|
import org.mozilla.fenix.R
|
||||||
|
import org.mozilla.fenix.ext.components
|
||||||
|
import org.mozilla.fenix.ext.increaseTapArea
|
||||||
|
import org.mozilla.fenix.ext.loadIntoView
|
||||||
|
|
||||||
|
class LibrarySiteItemView(
|
||||||
|
context: Context
|
||||||
|
) : ConstraintLayout(context) {
|
||||||
|
|
||||||
|
val titleView: TextView get() = title
|
||||||
|
|
||||||
|
val urlView: TextView get() = url
|
||||||
|
|
||||||
|
val iconView: ImageView get() = favicon
|
||||||
|
|
||||||
|
val overflowView: ImageButton get() = overflow_menu
|
||||||
|
|
||||||
|
init {
|
||||||
|
LayoutInflater.from(context).inflate(R.layout.library_site_item, this, true)
|
||||||
|
|
||||||
|
overflow_menu.increaseTapArea(OVERFLOW_EXTRA_DIPS)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Change visibility of parts of this view based on what type of item is being represented.
|
||||||
|
*/
|
||||||
|
fun displayAs(mode: ItemType) {
|
||||||
|
favicon.isVisible = mode != ItemType.SEPARATOR
|
||||||
|
title.isVisible = mode != ItemType.SEPARATOR
|
||||||
|
url.isVisible = mode == ItemType.SITE
|
||||||
|
overflow_menu.isVisible = mode != ItemType.SEPARATOR
|
||||||
|
separator.isVisible = mode == ItemType.SEPARATOR
|
||||||
|
isClickable = mode != ItemType.SEPARATOR
|
||||||
|
isFocusable = mode != ItemType.SEPARATOR
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Changes the icon to show a check mark if [isSelected]
|
||||||
|
*/
|
||||||
|
fun changeSelected(isSelected: Boolean) {
|
||||||
|
icon.displayedChild = if (isSelected) 1 else 0
|
||||||
|
}
|
||||||
|
|
||||||
|
fun loadFavicon(url: String) {
|
||||||
|
context.components.core.icons.loadIntoView(favicon, url)
|
||||||
|
}
|
||||||
|
|
||||||
|
enum class ItemType {
|
||||||
|
SITE, FOLDER, SEPARATOR;
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val OVERFLOW_EXTRA_DIPS = 16
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,87 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout 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/bookmark_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="56dp"
|
|
||||||
android:background="?android:attr/selectableItemBackground"
|
|
||||||
android:clickable="true"
|
|
||||||
android:focusable="true">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/bookmark_favicon"
|
|
||||||
android:layout_width="40dp"
|
|
||||||
android:layout_height="40dp"
|
|
||||||
android:layout_marginStart="20dp"
|
|
||||||
android:background="@drawable/favicon_background"
|
|
||||||
android:importantForAccessibility="no"
|
|
||||||
android:padding="10dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
tools:src="@drawable/ic_folder_icon" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/bookmark_title"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="12dp"
|
|
||||||
android:layout_marginEnd="12dp"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:textAlignment="viewStart"
|
|
||||||
android:textColor="?primaryText"
|
|
||||||
android:textSize="18sp"
|
|
||||||
app:layout_constraintBottom_toTopOf="@+id/bookmark_url"
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/bookmark_overflow"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/bookmark_favicon"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:layout_constraintVertical_chainStyle="packed"
|
|
||||||
tools:text="Internet" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/bookmark_url"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="12dp"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:textAlignment="viewStart"
|
|
||||||
android:textColor="?secondaryText"
|
|
||||||
android:textSize="12sp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/bookmark_overflow"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/bookmark_favicon"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/bookmark_title"
|
|
||||||
tools:text="https://github.com/mozilla-mobile/fenix" />
|
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/bookmark_overflow"
|
|
||||||
android:layout_width="@dimen/glyph_button_width"
|
|
||||||
android:layout_height="@dimen/glyph_button_height"
|
|
||||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
|
||||||
android:contentDescription="@string/bookmark_menu_content_description"
|
|
||||||
android:src="@drawable/ic_menu"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/bookmark_separator"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="2dp"
|
|
||||||
android:layout_marginStart="16dp"
|
|
||||||
android:layout_marginEnd="16dp"
|
|
||||||
android:background="?neutralFaded"
|
|
||||||
android:importantForAccessibility="no"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:id="@+id/history_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="56dp"
|
|
||||||
android:background="?android:attr/selectableItemBackground"
|
|
||||||
android:clickable="true"
|
|
||||||
android:focusable="true"
|
|
||||||
android:padding="4dp"
|
|
||||||
android:paddingStart="20dp"
|
|
||||||
android:paddingEnd="0dp">
|
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/history_item_overflow"
|
|
||||||
android:layout_width="@dimen/glyph_button_width"
|
|
||||||
android:layout_height="@dimen/glyph_button_height"
|
|
||||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
|
||||||
android:contentDescription="@string/content_description_history_menu"
|
|
||||||
android:src="@drawable/ic_menu"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/history_favicon"
|
|
||||||
android:layout_width="@dimen/history_favicon_width_height"
|
|
||||||
android:layout_height="@dimen/history_favicon_width_height"
|
|
||||||
android:background="@drawable/favicon_background"
|
|
||||||
android:padding="10dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/history_url"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="12dp"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:textAlignment="viewStart"
|
|
||||||
android:textColor="?secondaryText"
|
|
||||||
android:textSize="12sp"
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/history_item_overflow"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/history_favicon"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/history_title" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/history_title"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="12dp"
|
|
||||||
android:layout_marginEnd="12dp"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:textAlignment="viewStart"
|
|
||||||
android:textColor="?primaryText"
|
|
||||||
android:textSize="18sp"
|
|
||||||
android:layout_marginTop="2dp"
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/history_item_overflow"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/history_favicon"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
@ -0,0 +1,98 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
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:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/library_item_height"
|
||||||
|
android:background="?android:attr/selectableItemBackground">
|
||||||
|
|
||||||
|
<ImageSwitcher
|
||||||
|
android:id="@+id/icon"
|
||||||
|
android:layout_width="@dimen/history_favicon_width_height"
|
||||||
|
android:layout_height="@dimen/history_favicon_width_height"
|
||||||
|
android:layout_marginStart="20dp"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/favicon"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:padding="10dp"
|
||||||
|
android:background="@drawable/favicon_background"
|
||||||
|
android:backgroundTint="?neutral"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
tools:src="@drawable/ic_folder_icon" />
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/checkmark"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:padding="10dp"
|
||||||
|
android:background="@drawable/favicon_background"
|
||||||
|
android:backgroundTint="?accentHighContrast"
|
||||||
|
android:src="@drawable/mozac_ic_check" />
|
||||||
|
</ImageSwitcher>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/title"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:textColor="?primaryText"
|
||||||
|
tools:text="Example site"
|
||||||
|
app:layout_constraintEnd_toStartOf="@id/overflow_menu"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/icon"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toTopOf="@+id/url"
|
||||||
|
app:layout_constraintVertical_chainStyle="packed"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/url"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
|
android:textColor="?secondaryText"
|
||||||
|
android:textSize="12sp"
|
||||||
|
tools:text="https://example.com/"
|
||||||
|
app:layout_constraintEnd_toStartOf="@id/overflow_menu"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/icon"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/title"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:id="@+id/overflow_menu"
|
||||||
|
android:layout_width="@dimen/glyph_button_width"
|
||||||
|
android:layout_height="@dimen/glyph_button_height"
|
||||||
|
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||||
|
android:contentDescription="@string/content_description_menu"
|
||||||
|
android:src="@drawable/ic_menu"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"/>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/separator"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="2dp"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginEnd="16dp"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
android:background="?neutralFaded"
|
||||||
|
android:visibility="gone"/>
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
Loading…
Reference in New Issue