Skip to content
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.

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

Compose 1.7.0 & revised back nav handling #70

Merged
merged 5 commits into from
Oct 16, 2024
Merged

Compose 1.7.0 & revised back nav handling #70

merged 5 commits into from
Oct 16, 2024

Conversation

opatry
Copy link
Owner

@opatry opatry commented Oct 16, 2024

Description

  • Compose 1.7.0 is officially out
  • Abstract BackHandler to allow sharing same code on desktop & Android
  • Merge taskListScreen desktop & android imp, same for aboutScreen
  • Take the opportunity to spread BackHandler further to come back from about screen to tasks/home when doing back on Android

Checklist

  • I have read the CONTRIBUTING guide
  • Code compiles correctly
  • Created tests which fail without the change (if possible)
  • All tests passing

Copy link

©️ Stale credits for :tasks-app-desktop

diff --git a/tasks-app-desktop/src/main/resources/licenses_desktop.json b/tasks-app-desktop/src/main/resources/licenses_desktop.json
index 81c407f..259b121 100644
--- a/tasks-app-desktop/src/main/resources/licenses_desktop.json
+++ b/tasks-app-desktop/src/main/resources/licenses_desktop.json
@@ -715,7 +715,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "2.8.3-rc01",
+ "artifactVersion": "2.8.3",
"description": "Compose integration with Lifecycle",
"name": "Lifecycle Runtime Compose",
"licenses": [
@@ -771,7 +771,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.3.0-rc01",
+ "artifactVersion": "1.3.0",
"description": "WindowManager Core Library.",
"name": "WindowManager Core",
"licenses": [
@@ -785,7 +785,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Animation engine and animation primitives that are the building blocks of the Compose animation library",
"name": "Compose Animation Core",
"licenses": [
@@ -799,7 +799,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose animation library",
"name": "Compose Animation",
"licenses": [
@@ -813,7 +813,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Resources for Compose JB",
"name": "Resources for Compose JB",
"licenses": [
@@ -827,7 +827,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose Desktop",
"name": "Compose Desktop",
"licenses": [
@@ -841,7 +841,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Higher level abstractions of the Compose UI primitives. This library is design system agnostic, providing the high-level building blocks for both application and design-system developers",
"name": "Compose Foundation",
"licenses": [
@@ -855,7 +855,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose layout implementations",
"name": "Compose Layouts",
"licenses": [
@@ -869,7 +869,35 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.0.0-rc01",
+ "artifactVersion": "1.0.0",
+ "description": "Compose Material Design Adaptive Library",
+ "name": "Material Adaptive",
+ "licenses": [
+ "Apache-2.0"
+ ]
+ },
+ {
+ "uniqueId": "org.jetbrains.compose.material3.adaptive:adaptive-layout-desktop",
+ "developers": [
+ {
+ "name": "Compose Multiplatform Team"
+ }
+ ],
+ "artifactVersion": "1.0.0",
+ "description": "Compose Material Design Adaptive Library",
+ "name": "Material Adaptive",
+ "licenses": [
+ "Apache-2.0"
+ ]
+ },
+ {
+ "uniqueId": "org.jetbrains.compose.material3.adaptive:adaptive-navigation-desktop",
+ "developers": [
+ {
+ "name": "Compose Multiplatform Team"
+ }
+ ],
+ "artifactVersion": "1.0.0",
"description": "Compose Material Design Adaptive Library",
"name": "Material Adaptive",
"licenses": [
@@ -883,7 +911,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose Material Design Adaptive Navigation Suite Library",
"name": "Material Adaptive Navigation Suite",
"licenses": [
@@ -897,7 +925,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose Material You Design Components library",
"name": "Compose Material3 Components",
"licenses": [
@@ -911,7 +939,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose Material Design Components library",
"name": "Compose Material Components",
"licenses": [
@@ -925,7 +953,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose Material Design core icons. This module contains the most commonly used set of Material icons.",
"name": "Compose Material Icons Core",
"licenses": [
@@ -939,7 +967,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Material ripple used to build interactive components",
"name": "Compose Material Ripple",
"licenses": [
@@ -953,7 +981,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Tree composition support for code generated by the Compose compiler plugin and corresponding public API",
"name": "Compose Runtime",
"licenses": [
@@ -967,7 +995,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose components that allow saving and restoring the local ui state",
"name": "Compose Saveable",
"licenses": [
@@ -981,7 +1009,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose UI primitives. This library contains the primitives that form the Compose UI Toolkit, such as drawing, measurement and layout.",
"name": "Compose UI primitives",
"licenses": [
@@ -995,7 +1023,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose classes related to dimensions without units",
"name": "Compose Geometry",
"licenses": [
@@ -1009,7 +1037,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose graphics",
"name": "Compose Graphics",
"licenses": [
@@ -1023,7 +1051,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose Text primitives and utilities",
"name": "Compose UI Text",
"licenses": [
@@ -1037,7 +1065,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose tooling library API. This library provides the API required to declare @Preview composables in user apps.",
"name": "Compose UI Preview Tooling",
"licenses": [
@@ -1051,7 +1079,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Compose classes for simple units",
"name": "Compose Unit",
"licenses": [
@@ -1065,7 +1093,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Internal Compose utilities used by other modules",
"name": "Compose Util",
"licenses": [

Run ./gradlew :tasks-app-desktop:exportLibraryDefinitions -PaboutLibraries.exportPath=src/main/resources and commit resulting diff to fix the issue.

Copy link

©️ Stale credits for :tasks-app-android

diff --git a/tasks-app-android/src/main/assets/licenses_android.json b/tasks-app-android/src/main/assets/licenses_android.json
index 04c3922..d49290e 100644
--- a/tasks-app-android/src/main/assets/licenses_android.json
+++ b/tasks-app-android/src/main/assets/licenses_android.json
@@ -2324,7 +2324,7 @@
"name": "Compose Multiplatform Team"
}
],
- "artifactVersion": "1.7.0-rc01",
+ "artifactVersion": "1.7.0",
"description": "Resources for Compose JB",
"name": "Resources for Compose JB",
"licenses": [

Run ./gradlew :tasks-app-android:exportLibraryDefinitions -PaboutLibraries.exportPath=src/main/assets and commit resulting diff to fix the issue.

@opatry opatry merged commit d96a6ed into main Oct 16, 2024
1 check passed
@opatry opatry deleted the compose-1.7.0 branch October 16, 2024 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant