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

[Quick View] Merging compose-latest to main #985

Merged
merged 43 commits into from
Oct 24, 2022
Merged

Commits on Aug 5, 2022

  1. Merge pull request #919 from android/ben/merge_main_latest

    Merge main in to latest
    bentrengrove authored Aug 5, 2022
    Configuration menu
    Copy the full SHA
    40ad9dc View commit details
    Browse the repository at this point in the history
  2. Upgrade to Compose 1.3

    bentrengrove committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    c733b55 View commit details
    Browse the repository at this point in the history
  3. Fix lint on JetNews

    bentrengrove committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    fbb1e66 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0f862df View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2022

  1. Configuration menu
    Copy the full SHA
    f1ebfe3 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. Merge pull request #918 from android/ben/1.3

    Upgrade to Compose 1.3
    JolandaVerhoef authored Aug 9, 2022
    Configuration menu
    Copy the full SHA
    12764b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. Update compose-latest | Compose 1.3.0-alpha03 | Compiler 1.3.0 | Kotl…

    …in 1.7.10 (#925)
    
    * Update versions
    
    * Fix review comments
    JolandaVerhoef authored Aug 12, 2022
    Configuration menu
    Copy the full SHA
    69f4ea7 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2022

  1. [compose-latest Crane] Bugfix for destinations not found in Crane (#939)

    * [Crane] Fix destinations not in list issue.
    riggaroo authored Aug 15, 2022
    Configuration menu
    Copy the full SHA
    9302ed0 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2022

  1. Merge branch 'main' into compose-latest

    # Conflicts:
    #	Crane/app/build.gradle
    #	Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt
    #	JetNews/app/build.gradle
    #	JetNews/build.gradle
    #	Jetcaster/app/build.gradle
    #	Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt
    #	Jetchat/app/build.gradle
    #	Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt
    #	Jetsnack/app/build.gradle
    #	Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt
    #	Jetsurvey/app/build.gradle
    #	Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt
    #	Owl/app/build.gradle
    #	Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt
    #	Reply/app/build.gradle
    #	Reply/build.gradle
    #	scripts/upgrade_samples.sh
    riggaroo committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    dc6d23c View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2022

  1. Main into Compose-latest (#965)

    Co-authored-by: Rebecca Franks <riggaroo@google.com>
    Co-authored-by: Ben Trengrove <bentrengrove@users.noreply.github.com>
    Co-authored-by: Ben Trengrove <bentrengrove@google.com>
    4 people authored Aug 24, 2022
    Configuration menu
    Copy the full SHA
    58d8728 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2022

  1. [compose-latest] Update samples on compose-latest branch to Compose 1…

    ….3.0-beta01 (#967)
    
    Update samples on compose-latest branch to Compose 1.3.0-beta01
    
    Co-authored-by: Ben Trengrove <bentrengrove@google.com>
    simona-anomis and bentrengrove authored Aug 29, 2022
    Configuration menu
    Copy the full SHA
    d3aa517 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. [Jetsurvey] Converted to use Material 3 (#954) (#971)

    This updates Jetsurvey from Material 2 to Material 3. All Compose components now use Material 3 instead of Material 2. The date picker is currently still using the MaterialDatePicker DialogFragment the same as before this change. This also fixes the visibility of the status bars when in light mode and updates the screenshot and animated gif.
    
    Before: https://raw.githubusercontent.com/android/compose-samples/70d05efe9c5de6d3788ac3c6023caa20761d410a/Jetsurvey/screenshots/survey.gif
    After: https://raw.githubusercontent.com/android/compose-samples/ede93fc907ad32c61bd7f3d55a33af48e782ea2a/Jetsurvey/screenshots/survey.gif
    IanGClifton authored Sep 2, 2022
    Configuration menu
    Copy the full SHA
    7a9fa37 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2022

  1. Configuration menu
    Copy the full SHA
    c6812c6 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2022

  1. Configuration menu
    Copy the full SHA
    172bd85 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. main > compose-latest (#984)

    Co-authored-by: Rebecca Franks <riggaroo@google.com>
    Co-authored-by: Ben Trengrove <bentrengrove@users.noreply.github.com>
    Co-authored-by: Ben Trengrove <bentrengrove@google.com>
    Co-authored-by: Ian G. Clifton <1033551+IanGClifton@users.noreply.github.com>
    Co-authored-by: Ian G. Clifton <IanGClifton@users.noreply.github.com>
    Co-authored-by: Ale Stamato <alejandra.stamato@gmail.com>
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    8 people authored Sep 30, 2022
    Configuration menu
    Copy the full SHA
    8ecabc5 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Ben/merge main into latest (#988)

    Merge main to compose-latest
    
    Co-authored-by: Rebecca Franks <riggaroo@google.com>
    Co-authored-by: Jolanda Verhoef <JolandaVerhoef@users.noreply.github.com>
    Co-authored-by: Ian G. Clifton <1033551+IanGClifton@users.noreply.github.com>
    Co-authored-by: Ian G. Clifton <IanGClifton@users.noreply.github.com>
    Co-authored-by: Ale Stamato <alejandra.stamato@gmail.com>
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Nick Rout <nickrout@google.com>
    8 people authored Oct 3, 2022
    Configuration menu
    Copy the full SHA
    b83ce65 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Configuration menu
    Copy the full SHA
    4d17b11 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f21dbbe View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    90145a6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    148b4d8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    734ab7f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7bf22ba View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2022

  1. Configuration menu
    Copy the full SHA
    90ee320 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fab8511 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. Configuration menu
    Copy the full SHA
    c278506 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    67e1e32 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1079eaa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b20ef93 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2022

  1. Configuration menu
    Copy the full SHA
    b94906f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fd05483 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0a3ac4d View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2022

  1. Update Jetcaster/README.md with correct refdoc

    Co-authored-by: Manuel Vivo <mvivo@google.com>
    astamato and Manuel Vivo authored Oct 10, 2022
    Configuration menu
    Copy the full SHA
    0a38a42 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9dad1d8 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. [Jetsurvey] Removed Slider workaround for M3 bug

    https://issuetracker.google.com/248164773 was fixed in material3
    1.0.0-rc01, which the compose-latest branch is now on. I've removed the
      workaround of placing the slider in a box and confirmed it's
    functioning as expected on a Pixel 5.
    IanGClifton committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    316b8c6 View commit details
    Browse the repository at this point in the history
  2. [Jetsurvey] Removed Slider workaround for M3 bug (#998)

    https://issuetracker.google.com/248164773 was fixed in material3
    1.0.0-rc01, which the compose-latest branch is now on. I've removed the
    workaround of placing the slider in a box and confirmed it's functioning
    as expected on a Pixel 5.
    IanGClifton authored Oct 11, 2022
    Configuration menu
    Copy the full SHA
    e56a368 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. Merge remote-tracking branch 'origin/main' into compose-latest

    # Conflicts:
    #	Crane/gradle/libs.versions.toml
    #	JetNews/gradle/libs.versions.toml
    #	Jetcaster/gradle/libs.versions.toml
    #	Jetchat/gradle/libs.versions.toml
    #	Jetsnack/gradle/libs.versions.toml
    #	Jetsurvey/gradle/libs.versions.toml
    #	Owl/gradle/libs.versions.toml
    #	Reply/app/src/main/java/com/example/reply/ui/MainActivity.kt
    #	Reply/gradle/libs.versions.toml
    #	scripts/libs.versions.toml
    JolandaVerhoef committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    07b0a26 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9c8064e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2389cf5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    47f4777 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1933558 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d526aaa View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2022

  1. Configuration menu
    Copy the full SHA
    7484956 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7659a1d View commit details
    Browse the repository at this point in the history