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

Latest -> Main #322

Merged
merged 71 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
d71778c
Add snippets for Indication and Ripple migration (#191)
arriolac Jan 24, 2024
0bad025
Convert NeonIndication to data class. (#193)
arriolac Jan 24, 2024
ef49816
Merge branch 'main' into latest
arriolac Jan 25, 2024
5cb7dd2
Adding pip snippets to latest branch (#196)
MagicalMeghan Jan 30, 2024
5152ffc
Merge branch 'main' into latest
arriolac Feb 6, 2024
940a400
Delete pictureInPicture. (#213)
arriolac Feb 9, 2024
41acfd7
Update activity compose level and align log tag with main branch (#215)
MagicalMeghan Feb 14, 2024
aa8c5fe
Merge remote-tracking branch 'origin/main' into latest
compose-devrel-github-bot Feb 28, 2024
3637c7f
Merge pull request #229 from android/bot-sync-main
arriolac Feb 28, 2024
d9dbbf7
Merge remote-tracking branch 'origin/main' into latest
compose-devrel-github-bot Feb 29, 2024
c616bd2
Merge pull request #231 from android/bot-sync-main
arriolac Feb 29, 2024
fc0a273
Merge remote-tracking branch 'origin/main' into latest
compose-devrel-github-bot Mar 6, 2024
67f4f28
Merge pull request #235 from android/bot-sync-main
arriolac Mar 6, 2024
74e4d28
Merge remote-tracking branch 'origin/main' into latest
compose-devrel-github-bot Mar 6, 2024
72e3789
Merge pull request #237 from android/bot-sync-main
arriolac Mar 6, 2024
8242f9e
Migrate recomposeHighlighter to Modifier.Node (#197) (#238)
compose-devrel-github-bot Mar 11, 2024
bf83206
Adding samples for ContextualFlowRow (#234)
riggaroo Mar 12, 2024
6d2b166
Merge remote-tracking branch 'origin/main' into latest
compose-devrel-github-bot Mar 20, 2024
2441cae
Merge pull request #245 from android/bot-sync-main
arriolac Mar 20, 2024
2e672f9
Update libs.versions.toml (#247) (#248)
compose-devrel-github-bot Apr 8, 2024
c8a6c3b
Merge remote-tracking branch 'origin/main' into latest
compose-devrel-github-bot Apr 12, 2024
a9f1084
Merge pull request #250 from android/bot-sync-main
arriolac Apr 12, 2024
21a691c
Update Bitmap to image snippet to use new Graphics Layers (#254)
riggaroo Apr 23, 2024
b365d6d
add shared element snippets
riggaroo Apr 29, 2024
7c2c698
Apply Spotless
riggaroo Apr 29, 2024
f45f8ad
Split snippets into different files.
riggaroo Apr 29, 2024
d6e029f
Merge branch 'riggaroo/shared-element-snippets' of https://github.com…
riggaroo Apr 29, 2024
8e22485
Apply Spotless
riggaroo Apr 29, 2024
ee796a9
Shared element snippets (#256)
riggaroo Apr 30, 2024
90bcd56
Update libs.versions.toml (#251) (#252)
compose-devrel-github-bot Apr 30, 2024
664855e
Snippet updates based on peer feedback.
riggaroo May 1, 2024
4b60d08
Merge branch 'latest' into riggaroo/shared-element-snippets
riggaroo May 1, 2024
2c46281
Shared element snippets (#258)
riggaroo May 1, 2024
23d2ab2
Unique key snippet
riggaroo May 1, 2024
0349cd8
Merge branch 'latest' into riggaroo/shared-element-snippets
riggaroo May 1, 2024
fb5f982
Update SharedElementsWithNavigationSnippets.kt
riggaroo May 1, 2024
d6d77eb
Update AsyncImage snippet
riggaroo May 2, 2024
5a44e5e
Add placeholder size example
riggaroo May 2, 2024
d918044
Add comment to snippet about unmatched bounds
riggaroo May 3, 2024
77e9ab1
🤖 Sync main to latest (#259)
compose-devrel-github-bot May 7, 2024
3f7adbe
Update to new lazy list snippets. (#265)
riggaroo May 9, 2024
8abe5cc
Compose - beta01 (#270)
riggaroo May 14, 2024
960f6de
Added snippet for AnimatedVisibility usage with Shared elements (#272)
riggaroo May 24, 2024
f3f38d4
Merge branch 'refs/heads/main' into latest
riggaroo Jul 15, 2024
6846c24
Add clickable text snippets (#297)
bentrengrove Jul 24, 2024
536e487
🤖 Sync main to latest (#266)
compose-devrel-github-bot Jul 29, 2024
0442b19
🤖 Sync main to latest (#301)
compose-devrel-github-bot Aug 13, 2024
a6cfa39
Snippet updates for type safe navigation APIs
dturner Aug 20, 2024
750acf3
Downgrade compileSdk to 34
dturner Aug 20, 2024
b2cdbdc
Merge pull request #316 from android/dt/type-safe-nav-2
dturner Aug 22, 2024
c5d4717
🤖 Sync main to latest (#313)
compose-devrel-github-bot Aug 27, 2024
74aaf25
Latest beta06 updates for Compose (#300)
riggaroo Aug 28, 2024
9942a9a
Merge branch 'main' into latest
riggaroo Aug 28, 2024
43c9fe8
Migrate CompositionLocal snippets to m3 (#321) (#323)
compose-devrel-github-bot Aug 28, 2024
2b78281
Update snippets to use material3-adaptive rc01 (#324)
alexvanyo Aug 29, 2024
cf8e3c9
Migrate many snippets to use Material 3 instead of Material 2. (#320)
riggaroo Aug 30, 2024
bbdb61b
Revert shape changes for now.
riggaroo Sep 2, 2024
be01a96
Fix text snippets in latest (#326)
bentrengrove Sep 3, 2024
7045d7d
🤖 Sync main to latest (#327)
compose-devrel-github-bot Sep 3, 2024
6eedaf3
Merge branch 'main' into latest
riggaroo Sep 3, 2024
a33c495
Updating DeviceConfigurationOverride snippet comment (#232)
alexvanyo Jul 29, 2024
d40747f
Bump actions/checkout from 3 to 4 (#222)
dependabot[bot] Feb 22, 2024
89e3cfe
Create dependabot.yml (#218)
riggaroo Feb 20, 2024
a6199b5
Bump stefanzweifel/git-auto-commit-action from 4 to 5 (#221)
dependabot[bot] Feb 21, 2024
ac40734
Bump actions/setup-java from 2 to 4 (#220)
dependabot[bot] Feb 21, 2024
fc8eaf1
Merge branch 'main' into latest
riggaroo Sep 5, 2024
47579b8
Set git config user for sync_main_latest workflow. (#230)
arriolac Feb 29, 2024
cbec137
Fix merge
arriolac Feb 26, 2024
a004789
Fix merge
riggaroo Sep 6, 2024
113c769
Apply Spotless
riggaroo Sep 6, 2024
f7f7cfe
Fix merge
riggaroo Sep 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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