wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1140 from KryptKode/ref/breadcrumbs-one-liner

Browse source 
Ref/breadcrumbs one liner
This commit is contained in:
Tibor Kaputa 2021-08-27 10:59:59 +02:00 committed by GitHub
commit 8979ca8187
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 196 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FilePickerDialog.kt
View file

@ -74,7 +74,7 @@ class FilePickerDialog(val activity: BaseSimpleActivity,
.setOnKeyListener { dialogInterface, i, keyEvent ->
if (keyEvent.action == KeyEvent.ACTION_UP && i == KeyEvent.KEYCODE_BACK) {
val breadcrumbs = mDialogView.filepicker_breadcrumbs
if (breadcrumbs.childCount > 1) {
if (breadcrumbs.itemsCount > 1) {
breadcrumbs.removeBreadcrumb()
currPath = breadcrumbs.getLastItem().path.trimEnd('/')
tryUpdateItems()
@ -296,7 +296,7 @@ class FilePickerDialog(val activity: BaseSimpleActivity,
tryUpdateItems()
}
} else {
val item = mDialogView.filepicker_breadcrumbs.getChildAt(id).tag as FileDirItem
val item = mDialogView.filepicker_breadcrumbs.getItem(id)
if (currPath != item.path.trimEnd('/')) {
currPath = item.path
tryUpdateItems()

251
commons/src/main/kotlin/com/simplemobiletools/commons/views/Breadcrumbs.kt
View file

@ -1,88 +1,154 @@
package com.simplemobiletools.commons.views
import android.content.Context
import android.content.res.ColorStateList
import android.graphics.drawable.ColorDrawable
import android.util.AttributeSet
import android.util.TypedValue
import android.view.LayoutInflater
import android.view.View
import android.widget.HorizontalScrollView
import android.widget.LinearLayout
import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat
import com.simplemobiletools.commons.R
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.models.FileDirItem
import kotlinx.android.synthetic.main.breadcrumb_item.view.*
class Breadcrumbs(context: Context, attrs: AttributeSet) : LinearLayout(context, attrs), View.OnClickListener {
private var availableWidth = 0
private var inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
class Breadcrumbs(context: Context, attrs: AttributeSet) : HorizontalScrollView(context, attrs) {
private val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
private val itemsLayout: LinearLayout
private var textColor = context.baseConfig.textColor
private var fontSize = resources.getDimension(R.dimen.bigger_text_size)
private var lastPath = ""
private var isLayoutDirty = true
private var isScrollToSelectedItemPending = false
private var isFirstScroll = true
private var stickyRootInitialLeft = 0
private var rootStartPadding = 0
private val textColorStateList: ColorStateList
get() = ColorStateList(
arrayOf(intArrayOf(android.R.attr.state_activated), intArrayOf()),
intArrayOf(
textColor,
textColor.adjustAlpha(0.6f)
)
)
val itemsCount: Int
get() = itemsLayout.childCount
var listener: BreadcrumbsListener? = null
init {
isHorizontalScrollBarEnabled = false
itemsLayout = LinearLayout(context)
itemsLayout.orientation = LinearLayout.HORIZONTAL
rootStartPadding = paddingStart
itemsLayout.setPaddingRelative(0, paddingTop, paddingEnd, paddingBottom)
setPaddingRelative(0, 0, 0, 0)
addView(itemsLayout, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT))
onGlobalLayout {
availableWidth = width
stickyRootInitialLeft = if (itemsLayout.childCount > 0) {
itemsLayout.getChildAt(0).left
} else {
0
}
}
}
override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
val childRight = measuredWidth - paddingRight
val childBottom = measuredHeight - paddingBottom
val childHeight = childBottom - paddingTop
private fun recomputeStickyRootLocation(left: Int) {
stickyRootInitialLeft = left
handleRootStickiness(scrollX)
}
val usableWidth = availableWidth - paddingLeft - paddingRight
var maxHeight = 0
var curWidth: Int
var curHeight: Int
var curLeft = paddingLeft
var curTop = paddingTop
val cnt = childCount
for (i in 0 until cnt) {
val child = getChildAt(i)
child.measure(MeasureSpec.makeMeasureSpec(usableWidth, MeasureSpec.AT_MOST),
MeasureSpec.makeMeasureSpec(childHeight, MeasureSpec.AT_MOST))
curWidth = child.measuredWidth
curHeight = child.measuredHeight
if (curLeft + curWidth >= childRight) {
curLeft = paddingLeft
curTop += maxHeight
maxHeight = 0
}
child.layout(curLeft, curTop, curLeft + curWidth, curTop + curHeight)
if (maxHeight < curHeight)
maxHeight = curHeight
curLeft += curWidth
private fun handleRootStickiness(scrollX: Int) {
if (scrollX > stickyRootInitialLeft) {
stickRoot(scrollX - stickyRootInitialLeft)
} else {
freeRoot()
}
}
private fun freeRoot() {
if (itemsLayout.childCount > 0) {
itemsLayout.getChildAt(0).translationX = 0f
}
}
private fun stickRoot(translationX: Int) {
if (itemsLayout.childCount > 0) {
val root = itemsLayout.getChildAt(0)
root.translationX = translationX.toFloat()
ViewCompat.setTranslationZ(root, translationZ)
}
}
override fun onScrollChanged(scrollX: Int, scrollY: Int, oldScrollX: Int, oldScrollY: Int) {
super.onScrollChanged(scrollX, scrollY, oldScrollX, oldScrollY)
handleRootStickiness(scrollX)
}
override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
super.onLayout(changed, left, top, right, bottom)
isLayoutDirty = false
if (isScrollToSelectedItemPending) {
scrollToSelectedItem()
isScrollToSelectedItemPending = false
}
recomputeStickyRootLocation(left)
}
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
val usableWidth = availableWidth - paddingLeft - paddingRight
var width = 0
var rowHeight = 0
var lines = 1
val heightMode = MeasureSpec.getMode(heightMeasureSpec)
var heightMeasureSpec = heightMeasureSpec
if (heightMode == MeasureSpec.UNSPECIFIED || heightMode == MeasureSpec.AT_MOST) {
var height = context.resources.getDimensionPixelSize(R.dimen.breadcrumbs_layout_height)
if (heightMode == MeasureSpec.AT_MOST) {
height = height.coerceAtMost(MeasureSpec.getSize(heightMeasureSpec))
}
heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
}
super.onMeasure(widthMeasureSpec, heightMeasureSpec)
}
val cnt = childCount
private fun scrollToSelectedItem() {
if (isLayoutDirty) {
isScrollToSelectedItemPending = true
return
}
var selectedIndex = itemsLayout.childCount - 1
val cnt = itemsLayout.childCount
for (i in 0 until cnt) {
val child = getChildAt(i)
measureChild(child, widthMeasureSpec, heightMeasureSpec)
width += child.measuredWidth
rowHeight = child.measuredHeight
if (width / usableWidth > 0) {
lines++
width = child.measuredWidth
val child = itemsLayout.getChildAt(i)
if ((child.tag as? FileDirItem)?.path?.trimEnd('/') == lastPath.trimEnd('/')) {
selectedIndex = i
break
}
}
val parentWidth = MeasureSpec.getSize(widthMeasureSpec)
val calculatedHeight = paddingTop + paddingBottom + rowHeight * lines
setMeasuredDimension(parentWidth, calculatedHeight)
val selectedItemView = itemsLayout.getChildAt(selectedIndex)
val scrollX = if (layoutDirection == View.LAYOUT_DIRECTION_LTR) {
selectedItemView.left - itemsLayout.paddingStart
} else {
selectedItemView.right - width + itemsLayout.paddingStart
}
if (!isFirstScroll && isShown) {
smoothScrollTo(scrollX, 0)
} else {
scrollTo(scrollX, 0)
}
isFirstScroll = false
}
override fun requestLayout() {
isLayoutDirty = true
super.requestLayout()
}
fun setBreadcrumb(fullPath: String) {
@ -91,7 +157,7 @@ class Breadcrumbs(context: Context, attrs: AttributeSet) : LinearLayout(context,
var currPath = basePath
val tempPath = context.humanizePath(fullPath)
removeAllViewsInLayout()
itemsLayout.removeAllViews()
val dirs = tempPath.split("/").dropLastWhile(String::isEmpty)
for (i in dirs.indices) {
val dir = dirs[i]
@ -105,34 +171,67 @@ class Breadcrumbs(context: Context, attrs: AttributeSet) : LinearLayout(context,
currPath = "${currPath.trimEnd('/')}/"
val item = FileDirItem(currPath, dir, true, 0, 0, 0)
addBreadcrumb(item, i > 0)
addBreadcrumb(item, i, i > 0)
scrollToSelectedItem()
}
}
private fun addBreadcrumb(item: FileDirItem, addPrefix: Boolean) {
inflater.inflate(R.layout.breadcrumb_item, null, false).apply {
var textToAdd = item.name
if (addPrefix) {
textToAdd = "/ $textToAdd"
}
private fun addBreadcrumb(item: FileDirItem, index: Int, addPrefix: Boolean) {
if (childCount == 0) {
if (itemsLayout.childCount == 0) {
inflater.inflate(R.layout.breadcrumb_first_item, itemsLayout, false).apply {
resources.apply {
background = getDrawable(R.drawable.button_background)
background.applyColorFilter(textColor)
breadcrumb_text.background = ContextCompat.getDrawable(context, R.drawable.button_background)
breadcrumb_text.background.applyColorFilter(textColor)
elevation = getDimension(R.dimen.medium_margin)
background = ColorDrawable(context.baseConfig.backgroundColor)
val medium = getDimension(R.dimen.medium_margin).toInt()
setPadding(medium, medium, medium, medium)
breadcrumb_text.setPadding(medium, medium, medium, medium)
setPadding(rootStartPadding, 0, 0, 0)
}
isActivated = item.path.trimEnd('/') == lastPath.trimEnd('/')
breadcrumb_text.text = item.name
breadcrumb_text.setTextColor(textColorStateList)
breadcrumb_text.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize)
itemsLayout.addView(this)
breadcrumb_text.setOnClickListener {
if (itemsLayout.getChildAt(index) != null) {
listener?.breadcrumbClicked(index)
}
}
tag = item
}
} else {
inflater.inflate(R.layout.breadcrumb_item, itemsLayout, false).apply {
var textToAdd = item.name
if (addPrefix) {
textToAdd = "> $textToAdd"
}
breadcrumb_text.text = textToAdd
breadcrumb_text.setTextColor(textColor)
breadcrumb_text.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize)
isActivated = item.path.trimEnd('/') == lastPath.trimEnd('/')
addView(this)
setOnClickListener(this@Breadcrumbs)
breadcrumb_text.text = textToAdd
breadcrumb_text.setTextColor(textColorStateList)
breadcrumb_text.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize)
tag = item
itemsLayout.addView(this)
setOnClickListener { v ->
if (itemsLayout.getChildAt(index) != null && itemsLayout.getChildAt(index) == v) {
if ((v.tag as? FileDirItem)?.path?.trimEnd('/') == lastPath.trimEnd('/')) {
scrollToSelectedItem()
} else {
listener?.breadcrumbClicked(index)
}
}
}
tag = item
}
}
}
@ -147,19 +246,13 @@ class Breadcrumbs(context: Context, attrs: AttributeSet) : LinearLayout(context,
}
fun removeBreadcrumb() {
removeView(getChildAt(childCount - 1))
itemsLayout.removeView(itemsLayout.getChildAt(itemsLayout.childCount - 1))
}
fun getLastItem() = getChildAt(childCount - 1).tag as FileDirItem
fun getItem(index: Int) = itemsLayout.getChildAt(index).tag as FileDirItem
fun getLastItem() = itemsLayout.getChildAt(itemsLayout.childCount - 1).tag as FileDirItem
override fun onClick(v: View) {
val cnt = childCount
for (i in 0 until cnt) {
if (getChildAt(i) != null && getChildAt(i) == v) {
listener?.breadcrumbClicked(i)
}
}
}
interface BreadcrumbsListener {
fun breadcrumbClicked(id: Int)

16
commons/src/main/res/layout/breadcrumb_first_item.xml Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/breadcrumb_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/small_margin"
android:paddingTop="@dimen/medium_margin"
android:paddingRight="@dimen/small_margin"
android:paddingBottom="@dimen/medium_margin"
android:textSize="@dimen/normal_text_size" />
</FrameLayout>

2
commons/src/main/res/layout/breadcrumb_item.xml
View file

@ -2,7 +2,7 @@
<com.simplemobiletools.commons.views.MyTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/breadcrumb_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/small_margin"
android:paddingTop="@dimen/medium_margin"
android:paddingRight="@dimen/small_margin"

8
commons/src/main/res/layout/dialog_filepicker.xml
View file

@ -19,10 +19,10 @@
android:id="@+id/filepicker_breadcrumbs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingBottom="@dimen/medium_margin" />
android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/small_margin"
android:paddingTop="@dimen/small_margin"
android:paddingBottom="@dimen/small_margin"/>
<com.simplemobiletools.commons.views.MyRecyclerView
android:id="@+id/filepicker_list"

1
commons/src/main/res/values/dimens.xml
View file

@ -50,4 +50,5 @@
<dimen name="big_text_size">18sp</dimen>
<dimen name="actionbar_text_size">20sp</dimen>
<dimen name="extra_big_text_size">22sp</dimen>
<dimen name="breadcrumbs_layout_height">48dp</dimen>
</resources>