Commonize `:compose:material3:adaptive` modules #1468

terrakok · 2024-07-29T12:13:26Z

Commonize and configure publishing for

:compose:material3:adaptive:adaptive
:compose:material3:adaptive:adaptive-layout
:compose:material3:adaptive:adaptive-navigation
:window:window-core
modules.

Added new method to non-android source set to get WindowAdaptiveInfo.

Fixes https://youtrack.jetbrains.com/issue/CMP-5817

Testing

Checked it in the MPP demo app:

Release Notes

Features - Multiple Platforms

Commonized :compose:material3:adaptive:adaptive, :compose:material3:adaptive:adaptive-layout, :compose:material3:adaptive:adaptive-navigation and :window:window-core modules

igordmn · 2024-07-29T12:18:08Z

Just copy-pasted material3/adaptive directory from the androidx to JetBrains fork

Please specify the source commit. is it androidx/compose-material3/1.3.0-beta03?

...rc/jvmStubsMain/kotlin/androidx/compose/material3/adaptive/layout/NotImplemented.jvmStubs.kt

...rc/commonTest/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirectiveTest.kt

MULTIPLATFORM.md

MatkovIvan · 2024-07-31T17:03:16Z

compose/material3/adaptive/adaptive-navigation/build.gradle

I'm surprised to see no dependencies to a navigation library here.

It is quite small module with independent logic how to behave when a screen has different layouts

MatkovIvan · 2024-08-01T10:19:39Z

libraryversions.toml

@@ -292,6 +292,7 @@ WEAR_TILES = { group = "androidx.wear.tiles", atomicGroupVersion = "versions.WEA
 WEAR_WATCHFACE = { group = "androidx.wear.watchface", atomicGroupVersion = "versions.WEAR_WATCHFACE" }
 WEBKIT = { group = "androidx.webkit", atomicGroupVersion = "versions.WEBKIT" }
 WINDOW = { group = "androidx.window", atomicGroupVersion = "versions.WINDOW" }
+WINDOW_CORE = { group = "org.jetbrains.window.core", atomicGroupVersion = "versions.WINDOW", overrideInclude = [ ":window:window-core" ]  }


"versions.WINDOW" is already 1.6.0-alpha01 in AOSP. Shouldn't we update it here?

I didn't touch the version. As I understand the version was set in the commit we based our fork on

This is because we don't merge window and libversions to jb-main, they can be old. The actual state is in integration, but as with any other lib we merge only released commits to jb-main

MatkovIvan · 2024-08-01T10:21:04Z

gradle.properties

 # We use artifactRedirecting not only for Compose libs:
 artifactRedirecting.androidx.collection.version=1.4.0
 artifactRedirecting.androidx.annotation.version=1.8.0
 artifactRedirecting.androidx.lifecycle.version=2.8.0
 artifactRedirecting.androidx.navigation.version=2.8.0-beta05
 artifactRedirecting.androidx.savedstate.version=1.2.1
+# Look for `WINDOW` in libraryversions.toml
+artifactRedirecting.androidx.window.core.version=1.3.0-alpha01


The stable 1.3.0 was release a few months ago. Any reason to use alpha?

I didn't touch the version. As I understand the version was set in the commit we based our fork on

window subfolder wasn't involved in specific version selection, If it's outdated, please merge the stable state (might be done separately)

Actually, I'm almost sure that this version doesn't match to the commit/state of the code. Blocking the merge before explicit check

MULTIPLATFORM.md

MatkovIvan

LGTM overall, no blockers. Please recheck the versions on our CI and redirecting artifacts before merge

MatkovIvan · 2024-08-01T11:08:45Z

gradle.properties

 # We use artifactRedirecting not only for Compose libs:
 artifactRedirecting.androidx.collection.version=1.4.0
 artifactRedirecting.androidx.annotation.version=1.8.0
 artifactRedirecting.androidx.lifecycle.version=2.8.0
 artifactRedirecting.androidx.navigation.version=2.8.0-beta05
 artifactRedirecting.androidx.savedstate.version=1.2.1
+# Look for `WINDOW` in libraryversions.toml
+artifactRedirecting.androidx.window.core.version=1.3.0-alpha01


Actually, I'm almost sure that this version doesn't match to the commit/state of the code. Blocking the merge before explicit check

igordmn · 2024-08-01T23:09:14Z

...yout/src/commonTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneMotionTest.kt

-                    visibilityThreshold = 0.1f,
-                    delayedRatio = delayedRatio,
-                )
+                dampingRatio = 0.7f,


Let's reset formatting to avoid merge conflicts (in the other files too)

gradle.properties

igordmn · 2024-08-01T23:34:38Z

libraryversions.toml

@@ -292,6 +292,7 @@ WEAR_TILES = { group = "androidx.wear.tiles", atomicGroupVersion = "versions.WEA
 WEAR_WATCHFACE = { group = "androidx.wear.watchface", atomicGroupVersion = "versions.WEAR_WATCHFACE" }
 WEBKIT = { group = "androidx.webkit", atomicGroupVersion = "versions.WEBKIT" }
 WINDOW = { group = "androidx.window", atomicGroupVersion = "versions.WINDOW" }
+WINDOW_CORE = { group = "org.jetbrains.window.core", atomicGroupVersion = "versions.WINDOW", overrideInclude = [ ":window:window-core" ]  }


This is because we don't merge window and libversions to jb-main, they can be old. The actual state is in integration, but as with any other lib we merge only released commits to jb-main

MULTIPLATFORM.md

… publication.

…nfigure publication.

…hecks.

…d configure publication.

…rial3:adaptive:adaptive-navigation` API.

It was pinned in the original `androidx.compose.material3.adaptive` module dependencies

gradle.properties

Commonize and configure publishing for - `:compose:material3:adaptive:adaptive` - `:compose:material3:adaptive:adaptive-layout` - `:compose:material3:adaptive:adaptive-navigation` - `:window:window-core` modules. Added new method to non-android source set to get `WindowAdaptiveInfo`. Fixes https://youtrack.jetbrains.com/issue/CMP-5817 ## Testing Checked it in the MPP demo app: <img width="600" alt="image" src="https://github.com/user-attachments/assets/e2dbe01f-1481-4e4f-ab9d-e2641bc441d0"> ## Release Notes ### Features - Multiple Platforms - Commonized `:compose:material3:adaptive:adaptive`, `:compose:material3:adaptive:adaptive-layout`, `:compose:material3:adaptive:adaptive-navigation` and `:window:window-core` modules

terrakok requested a review from igordmn July 29, 2024 12:13

igordmn reviewed Jul 29, 2024

View reviewed changes

...rc/jvmStubsMain/kotlin/androidx/compose/material3/adaptive/layout/NotImplemented.jvmStubs.kt Outdated Show resolved Hide resolved

terrakok force-pushed the k.tskh/material3-adaptive-upstream branch 4 times, most recently from 9b2b35d to 5b1a50a Compare July 30, 2024 12:08

terrakok changed the title ~~Apply material3/adaptive from androidx~~ Commonize :compose:material3:adaptive:adaptive module Jul 30, 2024

terrakok requested review from MatkovIvan and igordmn July 30, 2024 12:09

terrakok force-pushed the k.tskh/material3-adaptive-upstream branch from 06914eb to 1a9612c Compare July 31, 2024 12:54

terrakok changed the title ~~Commonize :compose:material3:adaptive:adaptive module~~ Commonize :compose:material3:adaptive modules Jul 31, 2024

terrakok force-pushed the k.tskh/material3-adaptive-upstream branch from d707981 to 76106df Compare July 31, 2024 13:50

MatkovIvan reviewed Jul 31, 2024

View reviewed changes

...rc/commonTest/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirectiveTest.kt Outdated Show resolved Hide resolved

terrakok requested a review from MatkovIvan July 31, 2024 16:37

MatkovIvan reviewed Jul 31, 2024

View reviewed changes

MatkovIvan reviewed Aug 1, 2024

View reviewed changes

MatkovIvan approved these changes Aug 1, 2024

View reviewed changes

MatkovIvan requested changes Aug 1, 2024

View reviewed changes

terrakok requested a review from MatkovIvan August 1, 2024 13:17

MatkovIvan approved these changes Aug 1, 2024

View reviewed changes

igordmn requested changes Aug 1, 2024

View reviewed changes

terrakok requested a review from igordmn August 2, 2024 14:01

MatkovIvan mentioned this pull request Aug 6, 2024

Support material3-adaptive JetBrains/compose-multiplatform#3688

Closed

terrakok added 6 commits August 12, 2024 18:15

Commonize :window:window-core module and configure publication.

dc1a1f3

Commonize :compose:material3:adaptive:adaptive module and configure…

a1c08b5

… publication.

Add an usage of material3:adaptive:adaptive to the MPP demo

717e7e9

Commonize :compose:material3:adaptive:adaptive-layout module and co…

6aceeea

…nfigure publication.

Restore original :compose:material3:adaptive:adaptive-layout test c…

64dc6ff

…hecks.

Fix PaneMotionTest imports

d9927f2

terrakok added 4 commits August 13, 2024 12:44

Commonize :compose:material3:adaptive:adaptive-navigation module an…

5c1f3f5

…d configure publication.

Dump :compose:material3:adaptive:adaptive-layout and `:compose:mate…

506c484

…rial3:adaptive:adaptive-navigation` API.

Restore files formatting.

2bc5542

Change androidx.window.core redirect version to 1.3.0-beta02.

a986c98

It was pinned in the original `androidx.compose.material3.adaptive` module dependencies

terrakok force-pushed the k.tskh/material3-adaptive-upstream branch from f10cc9f to a986c98 Compare August 13, 2024 10:48

igordmn reviewed Aug 13, 2024

View reviewed changes

gradle.properties Outdated Show resolved Hide resolved

gradle.properties Outdated Show resolved Hide resolved

terrakok added 2 commits August 13, 2024 13:58

Update redirecting versions.

220a05a

Fix import.

48ed8cd

terrakok requested a review from igordmn August 13, 2024 12:47

igordmn approved these changes Aug 13, 2024

View reviewed changes

terrakok merged commit 16b3858 into jb-main Aug 13, 2024
6 checks passed

terrakok deleted the k.tskh/material3-adaptive-upstream branch August 13, 2024 13:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commonize `:compose:material3:adaptive` modules #1468

Commonize `:compose:material3:adaptive` modules #1468

terrakok commented Jul 29, 2024 •

edited

Loading

igordmn commented Jul 29, 2024

MatkovIvan Jul 31, 2024

terrakok Aug 1, 2024

MatkovIvan Aug 1, 2024

terrakok Aug 1, 2024

igordmn Aug 1, 2024

MatkovIvan Aug 1, 2024

terrakok Aug 1, 2024

MatkovIvan Aug 1, 2024

MatkovIvan Aug 1, 2024

MatkovIvan left a comment

MatkovIvan Aug 1, 2024

igordmn Aug 1, 2024

igordmn Aug 1, 2024

Commonize :compose:material3:adaptive modules #1468

Commonize :compose:material3:adaptive modules #1468

Conversation

terrakok commented Jul 29, 2024 • edited Loading

Testing

Release Notes

Features - Multiple Platforms

igordmn commented Jul 29, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MatkovIvan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Commonize `:compose:material3:adaptive` modules #1468

Commonize `:compose:material3:adaptive` modules #1468

terrakok commented Jul 29, 2024 •

edited

Loading