New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes MediaUiModel to use Paintable #2176

Merged

fstanis merged 1 commit into google:main from fstanis:paintable-in-model

Apr 9, 2024

Contributor

fstanis commented Apr 3, 2024

Continuation as part of #1868, to reduce dependency on uris across the library.

fstanis requested a review from yschimke

April 3, 2024 16:16

fstanis self-assigned this

yschimke reviewed

View reviewed changes

images/coil/src/main/java/com/google/android/horologist/images/coil/ArtworkColor.kt

               @Composable
               @ExperimentalHorologistApi
               public fun rememberArtworkColor(
-                  artworkUri: String?,
+                  model: Any?,

Collaborator

yschimke Apr 3, 2024

Is this a stability issue?

Collaborator

yschimke Apr 9, 2024

Would this be better if we split into two APIs?

rememberArtworkColor(String?) and rememberArtworkColor(CoilDrawable)

yschimke approved these changes

View reviewed changes

Collaborator

yschimke left a comment

Quite an invasive change, but I trust your judgement.

Collaborator

yschimke commented Apr 9, 2024

#2182 is going to merge conflict with this. But also I much appreciate this model, can see why it's useful.

fstanis force-pushed the paintable-in-model branch from 2f5b9d8 to f72cfe6 Compare

April 9, 2024 15:34


          Changes MediaUiModel to use Paintable

9ea46b9

fstanis force-pushed the paintable-in-model branch from f72cfe6 to 9ea46b9 Compare

April 9, 2024 15:43

fstanis merged commit bddfbfe into google:main

4 checks passed

LionZXY referenced this pull request in flipperdevices/Flipper-Android-App


          Update all dependencies (#819)

dbe7f01

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change | Age | Adoption | Passing |
Confidence |
|---|---|---|---|---|---|---|---|
|
[gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action)
| action | digest | `b231772` -> `b5418f5` | | | | |
|
[org.mockito.kotlin:mockito-kotlin](https://github.com/mockito/mockito-kotlin)
| dependencies | minor | `5.2.1` -> `5.3.1` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/org.mockito.kotlin:mockito-kotlin/5.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.mockito.kotlin:mockito-kotlin/5.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.mockito.kotlin:mockito-kotlin/5.2.1/5.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.mockito.kotlin:mockito-kotlin/5.2.1/5.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[com.google.android.horologist:horologist-compose-layout](https://github.com/google/horologist)
| dependencies | patch | `0.6.6` -> `0.6.8` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.android.horologist:horologist-compose-layout/0.6.8?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.android.horologist:horologist-compose-layout/0.6.8?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.android.horologist:horologist-compose-layout/0.6.6/0.6.8?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.android.horologist:horologist-compose-layout/0.6.6/0.6.8?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[org.jetbrains.compose:compose-gradle-plugin](https://github.com/JetBrains/compose-jb)
| dependencies | patch | `1.6.1` -> `1.6.2` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/org.jetbrains.compose:compose-gradle-plugin/1.6.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.jetbrains.compose:compose-gradle-plugin/1.6.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.jetbrains.compose:compose-gradle-plugin/1.6.1/1.6.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.jetbrains.compose:compose-gradle-plugin/1.6.1/1.6.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
| [com.android.library](https://developer.android.com/studio/build)
([source](https://android.googlesource.com/platform/tools/base)) |
plugin | patch | `8.3.1` -> `8.3.2` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/com.android.library/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.android.library/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.android.library/8.3.1/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.android.library/8.3.1/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
| [com.android.application](https://developer.android.com/studio/build)
([source](https://android.googlesource.com/platform/tools/base)) |
plugin | patch | `8.3.1` -> `8.3.2` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/com.android.application/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.android.application/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.android.application/8.3.1/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.android.application/8.3.1/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
|
[com.android.tools.build:gradle](https://developer.android.com/studio/build)
([source](https://android.googlesource.com/platform/tools/base)) |
dependencies | patch | `8.3.1` -> `8.3.2` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/com.android.tools.build:gradle/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.android.tools.build:gradle/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.android.tools.build:gradle/8.3.1/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.android.tools.build:gradle/8.3.1/8.3.2?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>mockito/mockito-kotlin
(org.mockito.kotlin:mockito-kotlin)</summary>

###
[`v5.3.1`](https://github.com/mockito/mockito-kotlin/releases/tag/5.3.1)

[Compare
Source](https://github.com/mockito/mockito-kotlin/compare/5.2.1...5.3.1)

<sup><sup>*Changelog generated by [Shipkit Changelog Gradle
Plugin](https://github.com/shipkit/shipkit-changelog)*</sup></sup>

##### 5.3.1

- 2024-04-09 - [3
commit(s)](https://github.com/mockito/mockito-kotlin/compare/5.3.0...5.3.1)
by Oscar Guillén, Róbert Papp
- Follow-up on
[#&#8203;508](https://github.com/mockito/mockito-kotlin/issues/508):
add tests and remove unnecessary methods
[(#&#8203;516)](https://github.com/mockito/mockito-kotlin/pull/516)
- Fix broken release
([#&#8203;509](https://github.com/mockito/mockito-kotlin/issues/509))
[(#&#8203;514)](https://github.com/mockito/mockito-kotlin/pull/514)
- Add support for destructured parameters in answers
[(#&#8203;512)](https://github.com/mockito/mockito-kotlin/pull/512)
- Release is broken
[(#&#8203;509)](https://github.com/mockito/mockito-kotlin/issues/509)
- Port AdditionalMatchers matchers
[(#&#8203;508)](https://github.com/mockito/mockito-kotlin/pull/508)

</details>

<details>
<summary>google/horologist
(com.google.android.horologist:horologist-compose-layout)</summary>

###
[`v0.6.8`](https://github.com/google/horologist/releases/tag/v0.6.8):
0.6.8

-   Media UI Improvements and updated translations

##### What's Changed

- Make MediaUiModel sealed for loading and loaded data object / class by
[@&#8203;laiyichin](https://github.com/laiyichin) in
[https://github.com/google/horologist/pull/2179](https://github.com/google/horologist/pull/2179)
- Update all dependencies by
[@&#8203;renovate-bot](https://github.com/renovate-bot) in
[https://github.com/google/horologist/pull/2185](https://github.com/google/horologist/pull/2185)
- Update dependency com.google.ai.client.generativeai:generativeai 0.2.2
to v0.3.0 by [@&#8203;renovate-bot](https://github.com/renovate-bot)
in
[https://github.com/google/horologist/pull/2187](https://github.com/google/horologist/pull/2187)
- Update translations by [@&#8203;fstanis](https://github.com/fstanis)
in
[https://github.com/google/horologist/pull/2186](https://github.com/google/horologist/pull/2186)

**Full Changelog**:
google/horologist@v0.6.7...v0.6.8

###
[`v0.6.7`](https://github.com/google/horologist/releases/tag/v0.6.7):
0.6.7

-   Media UI improvements
-   Dependency updates
-   Screenshot testing API improvements

##### What's Changed

- Update translations by [@&#8203;fstanis](https://github.com/fstanis)
in
[https://github.com/google/horologist/pull/2164](https://github.com/google/horologist/pull/2164)
- Update all dependencies 4.26.0 to v4.26.1 by
[@&#8203;renovate-bot](https://github.com/renovate-bot) in
[https://github.com/google/horologist/pull/2166](https://github.com/google/horologist/pull/2166)
- Update all dependencies 2.10.0 to v2.11.0 by
[@&#8203;renovate-bot](https://github.com/renovate-bot) in
[https://github.com/google/horologist/pull/2167](https://github.com/google/horologist/pull/2167)
- Updates media display margins by
[@&#8203;fstanis](https://github.com/fstanis) in
[https://github.com/google/horologist/pull/2165](https://github.com/google/horologist/pull/2165)
- Update all dependencies by
[@&#8203;yschimke](https://github.com/yschimke) in
[https://github.com/google/horologist/pull/2169](https://github.com/google/horologist/pull/2169)
- Revert "Update all dependencies" by
[@&#8203;yschimke](https://github.com/yschimke) in
[https://github.com/google/horologist/pull/2171](https://github.com/google/horologist/pull/2171)
- Updates a11y for VolumeScreen by
[@&#8203;fstanis](https://github.com/fstanis) in
[https://github.com/google/horologist/pull/2175](https://github.com/google/horologist/pull/2175)
- Update translations by [@&#8203;fstanis](https://github.com/fstanis)
in
[https://github.com/google/horologist/pull/2174](https://github.com/google/horologist/pull/2174)
- Update dependency com.google.devtools.ksp 1.9.23-1.0.19 to
v1.9.23-1.0.20 by
[@&#8203;renovate-bot](https://github.com/renovate-bot) in
[https://github.com/google/horologist/pull/2178](https://github.com/google/horologist/pull/2178)
- Update all dependencies by
[@&#8203;yschimke](https://github.com/yschimke) in
[https://github.com/google/horologist/pull/2180](https://github.com/google/horologist/pull/2180)
- Migrate screenshot tests to Roborazzi by
[@&#8203;yschimke](https://github.com/yschimke) in
[https://github.com/google/horologist/pull/2181](https://github.com/google/horologist/pull/2181)
- Cleanup a11y tests by
[@&#8203;yschimke](https://github.com/yschimke) in
[https://github.com/google/horologist/pull/2182](https://github.com/google/horologist/pull/2182)
- Update peaceiris/actions-gh-pages action v3 to v4 by
[@&#8203;renovate-bot](https://github.com/renovate-bot) in
[https://github.com/google/horologist/pull/2172](https://github.com/google/horologist/pull/2172)
- Changes MediaUiModel to use Paintable by
[@&#8203;fstanis](https://github.com/fstanis) in
[https://github.com/google/horologist/pull/2176](https://github.com/google/horologist/pull/2176)

**Full Changelog**:
google/horologist@v0.6.6...v0.6.7

</details>

<details>
<summary>JetBrains/compose-jb
(org.jetbrains.compose:compose-gradle-plugin)</summary>

###
[`v1.6.2`](https://github.com/JetBrains/compose-jb/blob/HEAD/CHANGELOG.md#162-April-2024)

*Changes since 1.6.1*

#### Features

##### Common

- [Support Kotlin
`2.0.0-RC1`](https://github.com/JetBrains/compose-multiplatform/pull/4596)

#### Fixes

##### iOS, Desktop, Web

- [Propagate composition locals to layers in the (re)composition
phase](https://github.com/JetBrains/compose-multiplatform-core/pull/1233)
- [Add transactions to `FocusOwnerImpl` `takeFocus` and `releaseFocus`
to prevent crash when a window is
re-shown](https://github.com/JetBrains/compose-multiplatform-core/pull/1231)
- [Fix crash and allow selection in `SelectionContainer` to start when
drag starts below the bounds of the visible
text](https://github.com/JetBrains/compose-multiplatform-core/pull/1230)

##### iOS

- [Fixed crash in `TextField` when a last symbol is a carriage return
symbol](https://github.com/JetBrains/compose-multiplatform-core/pull/1229)

#### Dependencies

This version of Compose Multiplatform is based on the next Jetpack
Compose libraries:

- [Compiler
1.5.11](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.5.11)
- [Runtime
1.6.4](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.6.4)
- [UI
1.6.4](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.6.4)
- [Foundation
1.6.4](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.6.4)
- [Material
1.6.4](https://developer.android.com/jetpack/androidx/releases/compose-material#1.6.4)
- [Material3
1.2.1](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.2.1)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on Monday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/flipperdevices/Flipper-Android-App).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNjkuMiIsInVwZGF0ZWRJblZlciI6IjM3LjI2OS4yIiwidGFyZ2V0QnJhbmNoIjoiZGV2In0=-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet