Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b2e13be authored by Austin Tankiang's avatar Austin Tankiang
Browse files

Apply extra round corners to first and last job item cards 

This is done by setting the item view type depending on the position of
the item in the list. Then a different view can be created for the top
and bottom items.

Bug: 407673809
Test: atest -c 'DocumentsUIGoogleTests:com.android.documentsui.JobPanelUiTest'
Flag: com.android.documentsui.flags.visual_signals_ro
Change-Id: I63631cd225599c783c3c20e9b4be250ceb61aac0
parent 74ace355

res/flag(com.android.documentsui.flags.use_material3)/values/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -198,9 +198,11 @@ 


    <style name="JobProgressItemCardStyle" parent="@style/Widget.Material3.CardView.Filled">

        <item name="cardBackgroundColor">?attr/colorSurfaceContainer</item>

        <item name="shapeAppearance">@style/ShapeAppearance.Material3.Corner.ExtraSmall</item>

        <item name="shapeAppearance">@style/JobProgressItemCardBaseShape</item>

    </style>



    <style name="JobProgressItemCardBaseShape" parent="@style/ShapeAppearance.Material3.Corner.ExtraSmall" />



    <style name="JobProgressItemTitleStyle" parent="">

        <item name="android:textAppearance">@style/JobProgressItemTitleText</item>

    </style>

src/com/android/documentsui/JobPanelController.kt

+37 −2
Original line number Diff line number Diff line
@@ -40,7 +40,9 @@ import com.android.documentsui.services.FileOperationService.EXTRA_PROGRESS 
import com.android.documentsui.services.Job

import com.android.documentsui.services.JobProgress

import com.android.documentsui.util.FormatUtils

import com.google.android.material.card.MaterialCardView

import com.google.android.material.progressindicator.LinearProgressIndicator

import com.google.android.material.shape.ShapeAppearanceModel



/**

 * Adds a gap between items in a vertical Recycler View.
@@ -133,9 +135,42 @@ class JobPanelController(private val mContext: Context) : BroadcastReceiver() { 
    class ProgressListAdapter(val mController: JobPanelController) :

        ListAdapter<JobProgress, ProgressItemHolder>(JobDiffCallback) {



        companion object {

            // Constants for the different view types created by this adapter. The type depends on

            // the position of the item in the list.

            private const val VIEW_MIDDLE = 0

            private const val VIEW_TOP = 1

            private const val VIEW_BOTTOM = 2

            private const val VIEW_TOP_BOTTOM = 3

        }



        override fun getItemViewType(position: Int): Int {

            if (itemCount == 1) return VIEW_TOP_BOTTOM

            if (position == 0) return VIEW_TOP

            if (position == itemCount - 1) return VIEW_BOTTOM

            return VIEW_MIDDLE

        }



        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProgressItemHolder {

            val view = LayoutInflater.from(parent.context)

                .inflate(R.layout.job_progress_item, parent, false)

            val context = parent.context

            val view = LayoutInflater.from(context)

                .inflate(R.layout.job_progress_item, parent, false) as MaterialCardView

            if (viewType != 0) {

                val outerRadius =

                    context.resources.getDimension(R.dimen.job_progress_list_corner_radius)

                view.shapeAppearanceModel = ShapeAppearanceModel

                    .builder(context, R.style.JobProgressItemCardBaseShape, 0)

                    .apply {

                        if (viewType == VIEW_TOP_BOTTOM || viewType == VIEW_TOP) {

                            setTopLeftCornerSize(outerRadius)

                            setTopRightCornerSize(outerRadius)

                        }

                        if (viewType == VIEW_TOP_BOTTOM || viewType == VIEW_BOTTOM) {

                            setBottomLeftCornerSize(outerRadius)

                            setBottomRightCornerSize(outerRadius)

                        }

                    }.build()

            }

            return ProgressItemHolder(mController, view)

        }