Skip to content

Commit

Permalink
Latest -> Main (#322)
Browse files Browse the repository at this point in the history
* Add snippets for Indication and Ripple migration (#191)

* Add ripple snippets.

* Add new ripple APIs.

* Add snippets for interactions.

* Added more ripple snippets.

* Update foundation and material to 1.7.0-alpha01

* Fix snippet tag.

* Apply Spotless

---------

Co-authored-by: arriolac <[email protected]>

* Convert NeonIndication to data class. (#193)

* Adding pip snippets to latest branch (#196)

* Adding pip snippets to latest branch

* Apply Spotless

* Adding pip snippets to latest

---------

Co-authored-by: MagicalMeghan <[email protected]>

* Delete pictureInPicture. (#213)

* Update activity compose level and align log tag with main branch (#215)

* Migrate recomposeHighlighter to Modifier.Node (#197) (#238)

* Migrate recomposeHighlighter to Modifier.Node

* Apply Spotless

* Simplify recompose highlighter

* Apply Spotless

---------

Co-authored-by: Tomáš Mlynarič <[email protected]>
Co-authored-by: mlykotom <[email protected]>

* Adding samples for ContextualFlowRow  (#234)

* Add snippets for ContextualFlowRow

* Apply Spotless

* Update flow snippets

* Apply Spotless

---------

Co-authored-by: riggaroo <[email protected]>

* Update libs.versions.toml (#247) (#248)

Update Compose BOM to 2024.04.00

Co-authored-by: MagicalMeghan <[email protected]>

* Update Bitmap to image snippet to use new Graphics Layers (#254)

* Update libs.versions.toml (#251)

* Replace Graphics bitmap snippets with new Graphics Layer snippets.

* Replace Graphics bitmap snippets with new Graphics Layer snippets.

* Apply Spotless

---------

Co-authored-by: Simona <[email protected]>
Co-authored-by: riggaroo <[email protected]>

* add shared element snippets

* Apply Spotless

* Split snippets into different files.

* Apply Spotless

* Shared element snippets (#256)

* add shared element snippets

* Apply Spotless

* Split snippets into different files.

* Apply Spotless

---------

Co-authored-by: riggaroo <[email protected]>

* Update libs.versions.toml (#251) (#252)

Co-authored-by: Simona <[email protected]>

* Snippet updates based on peer feedback.

* Shared element snippets (#258)

* add shared element snippets

* Apply Spotless

* Split snippets into different files.

* Apply Spotless

* Snippet updates based on peer feedback.

* Apply Spotless

---------

Co-authored-by: riggaroo <[email protected]>

* Unique key snippet

* Update SharedElementsWithNavigationSnippets.kt

* Update AsyncImage snippet

* Add placeholder size example

* Add comment to  snippet about unmatched bounds

* 🤖 Sync main to latest (#259)

* Update libs.versions.toml (#251)

* Updated ListDetailPaneScaffold use to alpha12 (#255)

This eliminates storing state outside and directly uses the navigator as
the source of truth. This also gets rid of the Modifier for AnimatedPane
as it's no longer a required argument.

* Added NavigationSuiteScaffold snippets (#261)

* Added NavigationSuiteScaffold snippets

* Apply Spotless

* 🤖 Update Dependencies (#262)

* Added snippets for SupportingPaneScaffold (#260)

* Added snippets for SupportingPaneScaffold
* Apply Spotless
* Update compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleSupportingPaneScaffold.kt

* Migrate to material3-adaptive WindowSizeClass method (#264)

* Migrate to material3-adaptive WindowSizeClass method

* Update comments to be single line

* Apply Spotless

---------

Co-authored-by: Simona <[email protected]>
Co-authored-by: Ian G. Clifton <[email protected]>
Co-authored-by: Alex Vanyo <[email protected]>
Co-authored-by: compose-devrel-github-bot <[email protected]>

* Update to new lazy list snippets. (#265)

* Compose - beta01 (#270)

* Update to new beta01 version

* Apply Spotless

* Update shared element text composable

* Apply Spotless

---------

Co-authored-by: riggaroo <[email protected]>

* Added snippet for AnimatedVisibility usage with Shared elements (#272)

* Added AnimatedVisibility shared element examples.

* Apply Spotless

* Switch to using LazyColumn instead of Grid as it has better animation support at present.

* Apply Spotless

* Fixed import.

* Apply Spotless

* Seperate samples into different files, simplify snippet.

* Apply Spotless

---------

Co-authored-by: riggaroo <[email protected]>

* Add clickable text snippets (#297)

* 🤖 Sync main to latest (#266)

* Update CenterAlignedTopAppBar snippet to use centerAlignedTopAppBarColors

* Time pickers comments (#295)

* Adding advanced examples

* Apply Spotless

* Adding advanced examples

* Rename AdvancedTimePickerExample

* Rename AdvancedTimePickerExample

---------

Co-authored-by: jakeroseman <[email protected]>

* Adds preview and breakpoint

---------

Co-authored-by: Jamal Eason <[email protected]>
Co-authored-by: Jake Roseman <[email protected]>
Co-authored-by: jakeroseman <[email protected]>
Co-authored-by: Kat Kuan <[email protected]>
Co-authored-by: Chiara Chiappini <[email protected]>
Co-authored-by: Chiara Chiappini <[email protected]>

* 🤖 Sync main to latest (#301)

* Update CenterAlignedTopAppBar snippet to use centerAlignedTopAppBarColors

* Time pickers comments (#295)

* Adding advanced examples

* Apply Spotless

* Adding advanced examples

* Rename AdvancedTimePickerExample

* Rename AdvancedTimePickerExample

---------

Co-authored-by: jakeroseman <[email protected]>

* Adds preview and breakpoint

* Updating DeviceConfigurationOverride snippet comment (#232)

* Timepickers redux (#296)

* Reworking the time picker examples to be more friendly to copy-pasting

* Apply Spotless

* Updating the time picker examples to be more copy-pastable

* Change in-use tag name back to the current form.

* Apply Spotless

* Renaming region tags

* Renaming region tags

---------

Co-authored-by: jakeroseman <[email protected]>

* Date pickers (#302)

* Reworking the time picker examples to be more friendly to copy-pasting

* Apply Spotless

* Updating the time picker examples to be more copy-pastable

* Change in-use tag name back to the current form.

* Apply Spotless

* Renaming region tags

* Renaming region tags

* Adding date picker snippets

* Apply Spotless

* fixing region tags

* Adding additional range tags

---------

Co-authored-by: jakeroseman <[email protected]>

* Break long instruction in 2 lines to optimize for DAC

* Prevent redrawing twice and running timer when compositions =0 (#304)

---------

Co-authored-by: Jamal Eason <[email protected]>
Co-authored-by: Jake Roseman <[email protected]>
Co-authored-by: jakeroseman <[email protected]>
Co-authored-by: Kat Kuan <[email protected]>
Co-authored-by: Chiara Chiappini <[email protected]>
Co-authored-by: Chiara Chiappini <[email protected]>
Co-authored-by: Alex Vanyo <[email protected]>
Co-authored-by: Tomáš Mlynarič <[email protected]>

* Snippet updates for type safe navigation APIs

* Downgrade compileSdk to 34

* 🤖 Sync main to latest (#313)

* Update CenterAlignedTopAppBar snippet to use centerAlignedTopAppBarColors

* Time pickers comments (#295)

* Adding advanced examples

* Apply Spotless

* Adding advanced examples

* Rename AdvancedTimePickerExample

* Rename AdvancedTimePickerExample

---------

Co-authored-by: jakeroseman <[email protected]>

* Adds preview and breakpoint

* Updating DeviceConfigurationOverride snippet comment (#232)

* Timepickers redux (#296)

* Reworking the time picker examples to be more friendly to copy-pasting

* Apply Spotless

* Updating the time picker examples to be more copy-pastable

* Change in-use tag name back to the current form.

* Apply Spotless

* Renaming region tags

* Renaming region tags

---------

Co-authored-by: jakeroseman <[email protected]>

* Date pickers (#302)

* Reworking the time picker examples to be more friendly to copy-pasting

* Apply Spotless

* Updating the time picker examples to be more copy-pastable

* Change in-use tag name back to the current form.

* Apply Spotless

* Renaming region tags

* Renaming region tags

* Adding date picker snippets

* Apply Spotless

* fixing region tags

* Adding additional range tags

---------

Co-authored-by: jakeroseman <[email protected]>

* Break long instruction in 2 lines to optimize for DAC

* Prevent redrawing twice and running timer when compositions =0 (#304)

* Allow Spotless to make commits on a user's behalf (#312)

See diffplug/spotless#1242

---------

Co-authored-by: Jamal Eason <[email protected]>
Co-authored-by: Jake Roseman <[email protected]>
Co-authored-by: jakeroseman <[email protected]>
Co-authored-by: Kat Kuan <[email protected]>
Co-authored-by: Chiara Chiappini <[email protected]>
Co-authored-by: Chiara Chiappini <[email protected]>
Co-authored-by: Alex Vanyo <[email protected]>
Co-authored-by: Tomáš Mlynarič <[email protected]>
Co-authored-by: Jolanda Verhoef <[email protected]>

* Latest beta06 updates for Compose (#300)

* Do latest 1.7.0-beta06 version updates

* Apply Spotless

* Code cleanup

* Apply Spotless

* Fix broken test

* Fix tests

---------

Co-authored-by: riggaroo <[email protected]>

* Migrate CompositionLocal snippets to m3 (#321) (#323)

Co-authored-by: Ben Trengrove <[email protected]>

* Update snippets to use material3-adaptive rc01 (#324)

* Migrate many snippets to use Material 3 instead of Material 2.  (#320)

* Do latest 1.7.0-beta06 version updates

* Apply Spotless

* Code cleanup

* Apply Spotless

* Fix broken test

* Remove M2 usage from many snippets.

* Apply Spotless

* Remove M2 usage from many snippets.

* Remove M2 usage from many snippets.

* Revert incorrect commit

---------

Co-authored-by: riggaroo <[email protected]>

* Revert shape changes for now.

* Fix text snippets in latest (#326)

* Fix text snippets in latest

* Apply Spotless

* 🤖 Sync main to latest (#327)

* Migrate CompositionLocal snippets to m3 (#321)

* Migrate Custom design system page to M3 (#325)

* Migrate Custom design system page to M3

* Apply Spotless

---------

Co-authored-by: riggaroo <[email protected]>

---------

Co-authored-by: Ben Trengrove <[email protected]>
Co-authored-by: Rebecca Franks <[email protected]>
Co-authored-by: riggaroo <[email protected]>

* Updating DeviceConfigurationOverride snippet comment (#232)

(cherry picked from commit a84c80d)

* Bump actions/checkout from 3 to 4 (#222)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 2f34f3b)

* Create dependabot.yml (#218)

(cherry picked from commit db5ffc0)

* Bump stefanzweifel/git-auto-commit-action from 4 to 5 (#221)

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4 to 5.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](stefanzweifel/git-auto-commit-action@v4...v5)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit d8ef2dd)

* Bump actions/setup-java from 2 to 4 (#220)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v2...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit cea0c7d)

* Set git config user for sync_main_latest workflow. (#230)

* Set git config user for sync_main_latest workflow.

* Update PR description.

(cherry picked from commit ad9ffb0)

* Fix merge

* Fix merge

* Apply Spotless

* Fix merge

---------

Co-authored-by: Chris Arriola <[email protected]>
Co-authored-by: arriolac <[email protected]>
Co-authored-by: MagicalMeghan <[email protected]>
Co-authored-by: MagicalMeghan <[email protected]>
Co-authored-by: compose-devrel-github-bot <[email protected]>
Co-authored-by: compose-devrel-github-bot <[email protected]>
Co-authored-by: Tomáš Mlynarič <[email protected]>
Co-authored-by: mlykotom <[email protected]>
Co-authored-by: riggaroo <[email protected]>
Co-authored-by: Simona <[email protected]>
Co-authored-by: Ian G. Clifton <[email protected]>
Co-authored-by: Alex Vanyo <[email protected]>
Co-authored-by: compose-devrel-github-bot <[email protected]>
Co-authored-by: Ben Trengrove <[email protected]>
Co-authored-by: Jamal Eason <[email protected]>
Co-authored-by: Jake Roseman <[email protected]>
Co-authored-by: jakeroseman <[email protected]>
Co-authored-by: Kat Kuan <[email protected]>
Co-authored-by: Chiara Chiappini <[email protected]>
Co-authored-by: Chiara Chiappini <[email protected]>
Co-authored-by: Don Turner <[email protected]>
Co-authored-by: Don Turner <[email protected]>
Co-authored-by: Jolanda Verhoef <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
25 people authored Sep 6, 2024
1 parent b2a0075 commit 14f817b
Show file tree
Hide file tree
Showing 73 changed files with 3,312 additions and 468 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.sample.android.bluetoothle.java.MainActivity

class MainActivity : AppCompatActivity() {

Expand Down
2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ plugins {
alias(libs.plugins.kapt) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.kotlin.parcelize) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.kotlin.serialization) apply false
}

apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
Expand Down
4 changes: 1 addition & 3 deletions compose/recomposehighlighter/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose.compiler)
}
android {
compileSdk = libs.versions.compileSdk.get().toInt()
Expand Down Expand Up @@ -40,9 +41,6 @@ android {
viewBinding = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
}
dependencies {
val composeBom = platform(libs.androidx.compose.bom)
Expand Down
7 changes: 3 additions & 4 deletions compose/snippets/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ plugins {
alias(libs.plugins.kapt)
alias(libs.plugins.hilt)
alias(libs.plugins.kotlin.parcelize)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.kotlin.serialization)
}

android {
Expand Down Expand Up @@ -62,10 +64,6 @@ android {
viewBinding = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

packaging.resources {
// Multiple dependency bring these files in. Exclude them to enable
// our test APK to build (has no effect on our AARs)
Expand Down Expand Up @@ -138,6 +136,7 @@ dependencies {
implementation(libs.androidx.navigation.compose)
implementation(libs.hilt.android)
implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.kotlinx.serialization.json)

implementation(libs.androidx.recyclerview)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.example.compose.snippets.animations.AnimationExamplesScreen
import com.example.compose.snippets.animations.sharedelement.PlaceholderSizeAnimated_Demo
import com.example.compose.snippets.components.AppBarExamples
import com.example.compose.snippets.components.BadgeExamples
import com.example.compose.snippets.components.ButtonExamples
import com.example.compose.snippets.components.CardExamples
import com.example.compose.snippets.components.CheckboxExamples
import com.example.compose.snippets.components.ChipExamples
import com.example.compose.snippets.components.ComponentsScreen
Expand All @@ -45,14 +47,13 @@ import com.example.compose.snippets.components.SliderExamples
import com.example.compose.snippets.components.SwitchExamples
import com.example.compose.snippets.components.TimePickerExamples
import com.example.compose.snippets.graphics.ApplyPolygonAsClipImage
import com.example.compose.snippets.graphics.BitmapFromComposableSnippet
import com.example.compose.snippets.graphics.BitmapFromComposableFullSnippet
import com.example.compose.snippets.graphics.BrushExamplesScreen
import com.example.compose.snippets.images.ImageExamplesScreen
import com.example.compose.snippets.landing.LandingScreen
import com.example.compose.snippets.navigation.Destination
import com.example.compose.snippets.navigation.TopComponentsDestination
import com.example.compose.snippets.ui.theme.SnippetsTheme
import com.example.topcomponents.CardExamples

class SnippetsActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -76,13 +77,14 @@ class SnippetsActivity : ComponentActivity() {
Destination.BrushExamples -> BrushExamplesScreen()
Destination.ImageExamples -> ImageExamplesScreen()
Destination.AnimationQuickGuideExamples -> AnimationExamplesScreen()
Destination.ScreenshotExample -> BitmapFromComposableSnippet()
Destination.ScreenshotExample -> BitmapFromComposableFullSnippet()
Destination.ComponentsExamples -> ComponentsScreen {
navController.navigate(
it.route
)
}
Destination.ShapesExamples -> ApplyPolygonAsClipImage()
Destination.SharedElementExamples -> PlaceholderSizeAnimated_Demo()
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
* limitations under the License.
*/

@file:OptIn(ExperimentalMaterial3AdaptiveNavigationSuiteApi::class)

package com.example.compose.snippets.adaptivelayouts

import androidx.annotation.StringRes
Expand All @@ -29,7 +27,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationBarItemDefaults
import androidx.compose.material3.Text
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
import androidx.compose.material3.adaptive.navigationsuite.ExperimentalMaterial3AdaptiveNavigationSuiteApi
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffoldDefaults
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawBehind
Expand Down Expand Up @@ -720,7 +719,6 @@ private fun LoadingScreen() {
}
}

@OptIn(ExperimentalComposeUiApi::class)
@Preview
@Composable
fun AnimationLayout() {
Expand Down
Loading

0 comments on commit 14f817b

Please sign in to comment.