From 60aff8eef500e80ade898d24da7cd28c583a0a38 Mon Sep 17 00:00:00 2001 From: Alejandro Nijamkin Date: Fri, 9 Sep 2022 16:33:00 -0700 Subject: [PATCH] Adds UserSwitcher screen to Compose Gallery app Bug: 246002091 Test: This is a test for the parent CL Change-Id: Ia1e4c360a072c79d8f57bfdb473d55463b27a3e4 --- .../compose/gallery/res/drawable/kitten1.jpeg | Bin 0 -> 4097 bytes .../compose/gallery/res/drawable/kitten2.jpeg | Bin 0 -> 4875 bytes .../compose/gallery/res/drawable/kitten3.jpeg | Bin 0 -> 6268 bytes .../compose/gallery/res/drawable/kitten4.jpeg | Bin 0 -> 5212 bytes .../compose/gallery/res/drawable/kitten5.jpeg | Bin 0 -> 5339 bytes .../compose/gallery/res/drawable/kitten6.jpeg | Bin 0 -> 6109 bytes .../systemui/compose/gallery/GalleryApp.kt | 65 +++++++++++++++--- .../compose/gallery/UserSwitcherScreen.kt | 35 ++++++++++ .../src/com/android/systemui/user/Fakes.kt | 21 +++++- .../common/ui/drawable/CircularDrawable.kt | 54 +++++++++++++++ .../user/ui/binder/UserSwitcherViewBinder.kt | 5 +- .../ui/viewmodel/UserSwitcherViewModel.kt | 3 +- 12 files changed, 170 insertions(+), 13 deletions(-) create mode 100644 packages/SystemUI/compose/gallery/res/drawable/kitten1.jpeg create mode 100644 packages/SystemUI/compose/gallery/res/drawable/kitten2.jpeg create mode 100644 packages/SystemUI/compose/gallery/res/drawable/kitten3.jpeg create mode 100644 packages/SystemUI/compose/gallery/res/drawable/kitten4.jpeg create mode 100644 packages/SystemUI/compose/gallery/res/drawable/kitten5.jpeg create mode 100644 packages/SystemUI/compose/gallery/res/drawable/kitten6.jpeg create mode 100644 packages/SystemUI/compose/gallery/src/com/android/systemui/compose/gallery/UserSwitcherScreen.kt create mode 100644 packages/SystemUI/src/com/android/systemui/common/ui/drawable/CircularDrawable.kt diff --git a/packages/SystemUI/compose/gallery/res/drawable/kitten1.jpeg b/packages/SystemUI/compose/gallery/res/drawable/kitten1.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..6241b0b44bb60c05935e6d1139634ab37653afb0 GIT binary patch literal 4097 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 H_9p)Y`h82; literal 0 HcmV?d00001 diff --git a/packages/SystemUI/compose/gallery/res/drawable/kitten2.jpeg b/packages/SystemUI/compose/gallery/res/drawable/kitten2.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..870ef13ee2d9edc8d6a5dc91f39951dd48dd78fd GIT binary patch literal 4875 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 literal 0 HcmV?d00001 diff --git a/packages/SystemUI/compose/gallery/res/drawable/kitten4.jpeg b/packages/SystemUI/compose/gallery/res/drawable/kitten4.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..e34b7ddf58cef50b47737582577b135c792e3e58 GIT binary patch literal 5212 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 literal 0 HcmV?d00001 diff --git a/packages/SystemUI/compose/gallery/res/drawable/kitten5.jpeg b/packages/SystemUI/compose/gallery/res/drawable/kitten5.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..9cde24be59efbb94c33665e1a72a69c3565d7f71 GIT binary patch literal 5339 zcmbW$cQhN0w*c@EdzPa13SyKRMNq2t9-FxmipL5UsJ@7%VBPt|%$3Dh&oh zjFeP0we|G%Bos`oOmr;Ob@jCWSwccbPtU~2B*4rppe+TK(*8fk?=Aon72qA<9gsv2 zK*~e{WFq<93*Z9)NXY+C|Iz+ekdOk&$SEkPsA*{b3^d&Ukdgp_q+~#Hax$_%(=mVg z05T?WW&xQ86gSOXDFtCHva!fgDv$=gn-x0wO-RlS9!E{Xc8i^ZQ&t)r`_Z(w0*Wo=_?XYcOe>E-R?>lYFl79J596&?R9;d$bVq~wguEL3(*ZeBjR zth}PKsv3iBc+=R_+|t_C-t(cikI+9bI5hQfdWJYV_i29h%i8+J=GOMk?$Pnd>Dl?k z_sgq)TqFSCf3p59`yVc*KQ2--G9Ve{KQ0o|h(85nA|n@&ptSURV&!x@A3!q=!hic-Zsvh$KGAlwSTSJjnt#SXmN?{1irjbJNsk{ zaeZa5y3cUOIINj@-w}`7+X2z=QNN}V(eOnms(8H+Av;>mQvq;iCT}Uq1XWmOrA6lx zwO|YKd69EjCngOA%q00WDvrg00gviF&Oy;NY&{6E7n%&J;vjhT&_*taS*E8#`a&#A zNDxwI@~hb(`SjO!qUh)Ra3I2AZ^we527^g&eK$M*4cMEGuwfK{2|8>@XXKX@n55fgBaZ-wh*Dt~TRN1 z&5wWjULRHz1>cf4ggX;b8#Y*G0>l2E;QnD%04MYFdxw{ONqJjVW-4E}P-G=K-{0ML zvn=Z%9R(#RA=M7G&7jq6KD9nJvU@rPsEc}Hm>#pcpA*Z%dfy&90rw+>mZOWt&{NLq zlTl$@4v?iWe-!827bTK58Rx##94m#>x{Oj~sIZB)5D2W}Zu9Fz`eJe~B{zUbaf2)! zurKs6UpT>e!2Kc`q zARS2;Yv^{hpQmzNG>ccvc*@x}xz36r&(A~_LX=}VOGeDj(Y&#UB43yFz)QO0NcvaA zM#%~0s`)Z$cPbUD>hvUJ9Jde))k)euZ?~5w-(iOLo)Vgn z-oiw*Q+zorPJL0<*uh_7IqB}BZK}R7T}J4v(o$rApRU4OqAIrHtUu3ZcQLsPesLti zIoHZFvH6A%ih7_A^4u!w$-(Du+cd@RLhLD^IuZ(BdyQ;bs|^3z0Usm*&M2_yv(Sgf zgyt&ks&G$bEK%DUK8hq3R*%VDP7`Lz0;FrK6&4mT+?+d;paSb5SuOVky z8(8eRnYN)dCGg{O(4oot8I4+sopDA&|NN zjm`Lg<;=#~N9gN3c_DWRy|ge)j>2F*r<8+AK?Y{m)P{5Cf8nz?>l{ltfXHG9f zTEA@+&5o7%$R|dXzIzocWVFvcYtqo*e!mnudqJwl!F5t0Qp;qrrBeMA#Mq*C<~K#I zuqVivi=a1q>o(x--nDaRA1!zDM#}k@wyMWmAA++sA$6NR3JU5& zE#|h$Zw=lu4N~$MB*Wj}!`$-QGV0k{0B}Zw02=oJP^Qi4%;%s7znG({&GbIjOP~ff z+k-;pbb}drqAlxzV}C0nY^gwimB&`OEXbDm*o?Zh6mOxKT&X4Qy8Y?{F*IWVNF~}# zKqxbXp{JA`w2a@BhkFmoTbp)T3G}k+ zklQCkj#@~jSPi(Wvy#i?_(VRW22PbH=uEan(9|!4dk}-C(Q$tZA2p>7#V}SxxMCfa zyoG&!qEE{GO0Xw~W~$xKfTAjSDQ1QFvEvk%~_Vb~?9?(_64kRF2im?b) z`XJj+2~;B#YDMBgjpBDKj2#_IouA{+M3VrrTX;28d!Uh)-urL2Efs??ns>e-GaYw# zbv554jeK%w43|xCDIj~Igew9Y_7(3?*iL5?2ZaJ`%0kZS5X+0Y0a#TDXa7#Rwg80R zngJ~bT3kYkxtg+3FQTT)Tp}{$+y%+pilV4o$`c z$H^eOmpYU@Iucbamp6I#(k9-HH=hsdN)!(@zm>bX0O{v6cXy!eLrRr5= zUD82yu4PmhZb!^Jefj+9+4!MZ%#>2qqM>-Nc@}aGIaMD@@u;~UB*VTpPG;lq#C(lR ziV+vCSTSbRiSR`gH9U?m^X*X(m+Ru4i9%m~9~Dj8B

9l5@b_l+?`I+nt28VL{Yg zpl1KuI|m~MHz=PdTO##&i&rb!^yaP#y}zMHq#pIv4@`PUpJMY9@X50yZu zu7aoT?_Q1)3@G+&BJsq8{Afpk2aAxyRvbV}DX_*A1wR-TUJ^^&yE zw*44?>__3nl=72Ujkrxpusdz9a>++h`vuoJq4n&ohi7%X=g@{XCilkF!=>ah)Fyt)eMw; z6+QM1krJrhUPQ(JSNW_aO!_b6V6C^XyFJY3%OhM+pm0y>U@@VlHS0G3XU145=OjEa z983ZxR-4|ix<_)xN()_1aAIL=3kR{+Wy>AUs#JLfIaI3FJh^$i*(yW(S$X?fggdnj zzhlJhVL1{{mi#PcH;I!U7_Tqrr5wdh$-}n^WbB+;OB&Gy&dhYnVF?ke1@TU(W|IViPZMI^aF5cVhvON z>9A$9f)}-oOnrBqp~bhtJ((Zkmq$0dd9;0My*_&JXDfYy=W$Wb&&|iAHHGtX5DUy2 z{Ao8AS0V1#hRLPnkqXCqK1FmlegoK|o1A7(XC@B=dB@|V%Xs>u;prM&IcTQdRyW9@ zmU3?}#0z0taz^vYfA@Zj0H37L!>yaOcohb{E$^D>;CyjCIid zz@RhW(2kJ>v0(liaI|VyJ=oDuh(@J1EDCy)d0dQoIV}Z|TgDkXWOpN?#@poW0_|Lc z)*1blMBL_Y8K*s3<}N;KyU|0`ew$YSEW!EwIuv<3f4J-&D14AxX$45xERhW{L#xU9 z_5#H88uh$s7>vz|S5i5<_(AShJ^!qcdI zb^3VQ%ANVOP+FJedk=@i;dH^hiy*83}Mr_+cE4F+Nt2dyEoq3zarskgJSI5h` zF1=Oh=PFoFB5V5EZ_IItUNFZ(-Fc{sw9lr~^Yg;b<_%%5eoJ+K>psh;a7H|iPnfH2 zIcg;&KloXTTj5&6y#<@*0xb{G)FwhCx3%LHc91b~VEThHR!_!>dCZYFuRa z#9|)qnm`u25j)#V9@xC;8=?X-?IO~XcPx#3I=Pi%<7Ugs@zXy8|IR@rH1>WtKCJ`c zw?e$hK6pRDGH@Eqmdc}{?yf}klia+y+3rbThv_UUv#Idjny@9W>h47@$Vk!AV)6|b zEivx(au0cEdzFG-R+x|aYOfdpA*<6nuf>2eRJBSws7YSs=vxGqLfO&SLdrI;b{`9L6 zgu`RG03=rO*HO{VQtgjS>o>Q_Ke_~Knx@_5u+`3{2m~Q%2vKYi5$w9ia>6bM}W)t>BkJ+qHk5uosywwv>5RW61JY8c=&yuyJKM2s_k;6w*4};00jH%&6rJ#IB~l zIKE~zKnr)(o66h6Py=_PP~3Gi#336Q*c(w}0ou6xoTYN4ZR1-u8`}@otpg_UK@v*M zfn>?D&1=aS0!^@F@QaeMU|-On<18;&ugFp!*~Nc`F^?*@aty-=0$T2+;UWq>j{5tn z&#TxAlvqxmAyIrdDLV#8303k+%%VjZKlk4TPiCJqiU$%Xj0Msnfb5hfC8@)02pP>g z;X)Qxmjt;pjJx)*n+HiS%zAz%vS-FniL_q}D_SsgH#Cq}_@ zYphyA3DHQy^C$}G^+^wjd?c3YeCw5c7RyflVAA?pgh4~%)(5@{HjN0WH)tt2E8(`D zFWJT&aL!UXDjZYMi{a8rYgS&9g$UVl;Z zb2T~70R-WwUiWrI#u}{EpLznT)EZX?bTO45*p9N5Fk}YL)|#XRpCqPOigxj$tB?TI zQR^&np(#?W+}aLAu!PAxv|sWV(SzsI5tku||19+aWMe!*jw3r4k-$!erdN{LZvNbF zWcE&L6dooi-4Bl~Vqt8J>qqpwj+)eYFT+v$odLwLo*!_4$J}m{XPfq%ZM7MIs_s_5 zU1@Rd!PIuo($M@Ahis4>#V40?A{{Fy>VjdWt;OeXe zTWwjB)lF|-+b9PUTewE7S(H=2RnuuYkGwlBN6<>whiS>X+7g`qsnVtg;u z`*{0Q9}^vk5f*e6pIrO`Qw5c-yCa&`@1)rioB4GeH{P1$+~&EER`o}>{03M{4EGK% Lt8D9P{{HkY`BB_j literal 0 HcmV?d00001 diff --git a/packages/SystemUI/compose/gallery/res/drawable/kitten6.jpeg b/packages/SystemUI/compose/gallery/res/drawable/kitten6.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..17825b639a268c20f0678a82118e2ad448f3a1bf GIT binary patch literal 6109 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 H-IxCW_X}e# literal 0 HcmV?d00001 diff --git a/packages/SystemUI/compose/gallery/src/com/android/systemui/compose/gallery/GalleryApp.kt b/packages/SystemUI/compose/gallery/src/com/android/systemui/compose/gallery/GalleryApp.kt index 2e6456bcc4e11..6805bf83dff44 100644 --- a/packages/SystemUI/compose/gallery/src/com/android/systemui/compose/gallery/GalleryApp.kt +++ b/packages/SystemUI/compose/gallery/src/com/android/systemui/compose/gallery/GalleryApp.kt @@ -28,25 +28,25 @@ import com.android.systemui.compose.theme.SystemUITheme /** The gallery app screens. */ object GalleryAppScreens { - val Typography = ChildScreen("typography") { TypographyScreen() } - val MaterialColors = ChildScreen("material_colors") { MaterialColorsScreen() } - val AndroidColors = ChildScreen("android_colors") { AndroidColorsScreen() } - val Buttons = ChildScreen("buttons") { ButtonsScreen() } - val ExampleFeature = ChildScreen("example_feature") { ExampleFeatureScreen() } + private val Typography = ChildScreen("typography") { TypographyScreen() } + private val MaterialColors = ChildScreen("material_colors") { MaterialColorsScreen() } + private val AndroidColors = ChildScreen("android_colors") { AndroidColorsScreen() } + private val Buttons = ChildScreen("buttons") { ButtonsScreen() } + private val ExampleFeature = ChildScreen("example_feature") { ExampleFeatureScreen() } - val PeopleEmpty = + private val PeopleEmpty = ChildScreen("people_empty") { navController -> EmptyPeopleScreen(onResult = { navController.popBackStack() }) } - val PeopleFew = + private val PeopleFew = ChildScreen("people_few") { navController -> FewPeopleScreen(onResult = { navController.popBackStack() }) } - val PeopleFull = + private val PeopleFull = ChildScreen("people_full") { navController -> FullPeopleScreen(onResult = { navController.popBackStack() }) } - val People = + private val People = ParentScreen( "people", mapOf( @@ -55,6 +55,52 @@ object GalleryAppScreens { "Full" to PeopleFull, ) ) + private val UserSwitcherSingleUser = + ChildScreen("user_switcher_single") { navController -> + UserSwitcherScreen( + userCount = 1, + onFinished = navController::popBackStack, + ) + } + private val UserSwitcherThreeUsers = + ChildScreen("user_switcher_three") { navController -> + UserSwitcherScreen( + userCount = 3, + onFinished = navController::popBackStack, + ) + } + private val UserSwitcherFourUsers = + ChildScreen("user_switcher_four") { navController -> + UserSwitcherScreen( + userCount = 4, + onFinished = navController::popBackStack, + ) + } + private val UserSwitcherFiveUsers = + ChildScreen("user_switcher_five") { navController -> + UserSwitcherScreen( + userCount = 5, + onFinished = navController::popBackStack, + ) + } + private val UserSwitcherSixUsers = + ChildScreen("user_switcher_six") { navController -> + UserSwitcherScreen( + userCount = 6, + onFinished = navController::popBackStack, + ) + } + private val UserSwitcher = + ParentScreen( + "user_switcher", + mapOf( + "Single" to UserSwitcherSingleUser, + "Three" to UserSwitcherThreeUsers, + "Four" to UserSwitcherFourUsers, + "Five" to UserSwitcherFiveUsers, + "Six" to UserSwitcherSixUsers, + ) + ) val Home = ParentScreen( @@ -66,6 +112,7 @@ object GalleryAppScreens { "Example feature" to ExampleFeature, "Buttons" to Buttons, "People" to People, + "User Switcher" to UserSwitcher, ) ) } diff --git a/packages/SystemUI/compose/gallery/src/com/android/systemui/compose/gallery/UserSwitcherScreen.kt b/packages/SystemUI/compose/gallery/src/com/android/systemui/compose/gallery/UserSwitcherScreen.kt new file mode 100644 index 0000000000000..fe9707d226840 --- /dev/null +++ b/packages/SystemUI/compose/gallery/src/com/android/systemui/compose/gallery/UserSwitcherScreen.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * 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.android.systemui.compose.gallery + +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext +import com.android.systemui.user.Fakes.fakeUserSwitcherViewModel +import com.android.systemui.user.ui.compose.UserSwitcherScreen + +@Composable +fun UserSwitcherScreen( + userCount: Int, + onFinished: () -> Unit, +) { + val context = LocalContext.current.applicationContext + UserSwitcherScreen( + viewModel = fakeUserSwitcherViewModel(context, userCount = userCount), + onFinished = onFinished, + ) +} diff --git a/packages/SystemUI/compose/gallery/src/com/android/systemui/user/Fakes.kt b/packages/SystemUI/compose/gallery/src/com/android/systemui/user/Fakes.kt index 02d76f404a32c..91a73ea16dc49 100644 --- a/packages/SystemUI/compose/gallery/src/com/android/systemui/user/Fakes.kt +++ b/packages/SystemUI/compose/gallery/src/com/android/systemui/user/Fakes.kt @@ -58,12 +58,29 @@ object Fakes { (0 until userCount).map { index -> UserModel( id = index, - name = Text.Loaded("user_$index"), + name = + Text.Loaded( + when (index % 6) { + 0 -> "Ross Geller" + 1 -> "Phoebe Buffay" + 2 -> "Monica Geller" + 3 -> "Rachel Greene" + 4 -> "Chandler Bing" + else -> "Joey Tribbiani" + } + ), image = checkNotNull( AppCompatResources.getDrawable( context, - R.drawable.ic_avatar_guest_user + when (index % 6) { + 0 -> R.drawable.kitten1 + 1 -> R.drawable.kitten2 + 2 -> R.drawable.kitten3 + 3 -> R.drawable.kitten4 + 4 -> R.drawable.kitten5 + else -> R.drawable.kitten6 + }, ) ), isSelected = index == 0, diff --git a/packages/SystemUI/src/com/android/systemui/common/ui/drawable/CircularDrawable.kt b/packages/SystemUI/src/com/android/systemui/common/ui/drawable/CircularDrawable.kt new file mode 100644 index 0000000000000..ec71c38241567 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/common/ui/drawable/CircularDrawable.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * 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.android.systemui.common.ui.drawable + +import android.graphics.Canvas +import android.graphics.Path +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.graphics.drawable.DrawableWrapper +import kotlin.math.min + +/** Renders the wrapped [Drawable] as a circle. */ +class CircularDrawable( + drawable: Drawable, +) : DrawableWrapper(drawable) { + private val path: Path by lazy { Path() } + + override fun onBoundsChange(bounds: Rect) { + super.onBoundsChange(bounds) + updateClipPath() + } + + override fun draw(canvas: Canvas) { + canvas.save() + canvas.clipPath(path) + drawable?.draw(canvas) + canvas.restore() + } + + private fun updateClipPath() { + path.reset() + path.addCircle( + bounds.centerX().toFloat(), + bounds.centerY().toFloat(), + min(bounds.width(), bounds.height()) / 2f, + Path.Direction.CW + ) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/binder/UserSwitcherViewBinder.kt b/packages/SystemUI/src/com/android/systemui/user/ui/binder/UserSwitcherViewBinder.kt index 83a3d0d0457a7..d7ad3cefaf069 100644 --- a/packages/SystemUI/src/com/android/systemui/user/ui/binder/UserSwitcherViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/user/ui/binder/UserSwitcherViewBinder.kt @@ -129,7 +129,10 @@ object UserSwitcherViewBinder { viewModel.users.collect { users -> val viewPool = view.children.filter { it.tag == USER_VIEW_TAG }.toMutableList() - viewPool.forEach { view.removeView(it) } + viewPool.forEach { + view.removeView(it) + flowWidget.removeView(it) + } users.forEach { userViewModel -> val userView = if (viewPool.isNotEmpty()) { diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt b/packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt index 66ce01b7a86ef..398341d256d21 100644 --- a/packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/user/ui/viewmodel/UserSwitcherViewModel.kt @@ -20,6 +20,7 @@ package com.android.systemui.user.ui.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import com.android.systemui.R +import com.android.systemui.common.ui.drawable.CircularDrawable import com.android.systemui.power.domain.interactor.PowerInteractor import com.android.systemui.user.domain.interactor.UserInteractor import com.android.systemui.user.legacyhelper.ui.LegacyUserUiHelper @@ -130,7 +131,7 @@ private constructor( return UserViewModel( viewKey = model.id, name = model.name, - image = model.image, + image = CircularDrawable(model.image), isSelectionMarkerVisible = model.isSelected, alpha = if (model.isSelectable) {