Skip to content
This repository was archived by the owner on Aug 2, 2024. It is now read-only.

Commit c4952f5

Browse files
authored
Merge branch 'main' into main
2 parents 5a0c360 + 937fc80 commit c4952f5

File tree

127 files changed

+12927
-2845
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+12927
-2845
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @android/compose-devrel

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Bug Report
2+
description: File a bug report
3+
title: "[Bug]: "
4+
labels: ["bug", "triage me"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
- type: checkboxes
11+
attributes:
12+
label: Is there an existing issue for this?
13+
description: Please search to see if an issue already exists for the bug you encountered.
14+
options:
15+
- label: I have searched the existing issues
16+
required: true
17+
- type: checkboxes
18+
attributes:
19+
label: Is there a StackOverflow question about this issue?
20+
description: Please search [StackOverflow](https://stackoverflow.com/questions/tagged/android-jetpack-compose) if an issue with an answer already exists for the bug you encountered.
21+
options:
22+
- label: I have searched StackOverflow
23+
required: true
24+
- type: checkboxes
25+
attributes:
26+
label: Is this an issue related to the sample app?
27+
description: Please confirm that this is an issue related to this sample repo. If this is a bug related to Compose, file an issue on the Compose [issue tracker](https://issuetracker.google.com/issues/new?component=612128) instead.
28+
options:
29+
- label: Yes, this is a specific issue related to this samples repo.
30+
required: true
31+
- type: textarea
32+
id: what-happened
33+
attributes:
34+
label: What happened?
35+
description: Also tell us, what did you expect to happen?
36+
placeholder: Tell us what you see!
37+
value: "A bug happened!"
38+
validations:
39+
required: true
40+
- type: textarea
41+
id: logs
42+
attributes:
43+
label: Relevant logcat output
44+
description: Please copy and paste any relevant logcat output. This will be automatically formatted into code, so no need for backticks.
45+
render: shell
46+
- type: checkboxes
47+
id: terms
48+
attributes:
49+
label: Code of Conduct
50+
description: By submitting this issue, you agree to follow our [Code of Conduct](CODE_OF_CONDUCT.md)
51+
options:
52+
- label: I agree to follow this project's Code of Conduct
53+
required: true
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Feature request
2+
description: File a feature request
3+
title: "[FR]: "
4+
labels: ["enhancement", "triage me"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report!
10+
- type: checkboxes
11+
attributes:
12+
label: Is there an existing issue for this?
13+
description: Please search to see if an issue already exists for this feature request.
14+
options:
15+
- label: I have searched the existing issues
16+
required: true
17+
- type: checkboxes
18+
attributes:
19+
label: Is this a feature request for the samples?
20+
description: Please confirm that this is a feature request related to this samples repo. If this is a request related to Compose, file a feature request on the Compose [issue tracker](https://issuetracker.google.com/issues/new?component=612128) instead.
21+
options:
22+
- label: Yes, this is a specific request related to this samples repo.
23+
required: true
24+
- type: textarea
25+
id: describe-problem
26+
attributes:
27+
label: Describe the problem
28+
description: Is your feature request related to a problem? Please describe.
29+
placeholder: I'm always frustrated when...
30+
validations:
31+
required: true
32+
- type: textarea
33+
id: solution
34+
attributes:
35+
label: Describe the solution
36+
description: Please describe the solution you'd like. A clear and concise description of what you want to happen.
37+
validations:
38+
required: true
39+
- type: textarea
40+
id: context
41+
attributes:
42+
label: Additional context
43+
description: Add any other context or screenshots about the feature request here.
44+
validations:
45+
required: false
46+
- type: checkboxes
47+
id: terms
48+
attributes:
49+
label: Code of Conduct
50+
description: By submitting this issue, you agree to follow our [Code of Conduct](CODE_OF_CONDUCT.md)
51+
options:
52+
- label: I agree to follow this project's Code of Conduct
53+
required: true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Pull request
3+
about: Create a pull request
4+
label: 'triage me'
5+
---
6+
Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
7+
- [ ] Make sure to open a GitHub issue as a bug/feature request before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
8+
- [ ] Ensure the tests and linter pass
9+
- [ ] Appropriate docs were updated (if necessary)
10+
11+
Fixes #<issue_number_goes_here> 🦕

.github/workflows/android.yml

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ jobs:
2424

2525
build:
2626
name: Build
27-
runs-on: ubuntu-18.04
27+
runs-on: ubuntu-20.04
2828

2929
steps:
30-
- uses: actions/checkout@v1
31-
- name: set up JDK 1.8
32-
uses: actions/setup-java@v1
30+
- uses: actions/checkout@v3
31+
- name: set up JDK 17
32+
uses: actions/setup-java@v3
3333
with:
34-
java-version: 1.8
34+
java-version: '17'
35+
distribution: 'temurin'
3536
- name: Build project
3637
run: .github/scripts/gradlew_recursive.sh assembleDebug
3738
- name: Zip artifacts
@@ -41,3 +42,34 @@ jobs:
4142
with:
4243
name: assemble
4344
path: assemble.zip
45+
#
46+
# Disabling androidTest temporarily due to the stability issue b/251319989
47+
# androidTest:
48+
# needs: build
49+
# runs-on: macOS-latest
50+
# timeout-minutes: 45
51+
#
52+
# steps:
53+
# - uses: actions/setup-java@v3
54+
# with:
55+
# distribution: 'temurin'
56+
# java-version: '11'
57+
# - uses: actions/checkout@v3
58+
#
59+
# - name: Setup Android SDK
60+
# uses: android-actions/setup-android@v2
61+
#
62+
# - name: Checkout
63+
# uses: actions/checkout@v3
64+
#
65+
# - name: Run instrumented tests with GMD
66+
# run: ./gradlew pixel2api27DebugAndroidTest -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" -Pandroid.experimental.testOptions.managedDevices.setupTimeoutMinutes=20 -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true --info
67+
#
68+
# - name: Upload test reports
69+
# if: always()
70+
# uses: actions/upload-artifact@v3
71+
# with:
72+
# name: test-reports
73+
# path: |
74+
# '*/build/outputs/androidTest-results/'
75+
# '!**/*"*' # Couldn't exclude a file with double quotation. Revisit the path once b/242988834 is fixed

.google/packaging.yaml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,35 @@
1818
# End users may safely ignore this file. It has no relevance to other systems.
1919
---
2020
status: PUBLISHED
21-
technologies: [Android]
22-
categories: [Getting Started, Jetpack]
21+
technologies: [Android, JetpackCompose, Coroutines]
22+
categories:
23+
- Getting Started
24+
- Jetpack
25+
- AndroidTesting
26+
- AndroidArchitecture
27+
- AndroidArchitectureUILayer
28+
- AndroidArchitectureDataLayer
29+
- AndroidArchitectureStateProduction
30+
- AndroidArchitectureStateHolder
31+
- AndroidArchitectureUIEvents
32+
- JetpackComposeArchitectureAndState
33+
- JetpackComposeMigrationAndInterop
34+
- JetpackComposeDesignSystems
35+
- JetpackComposeNavigation
36+
- JetpackComposeAnimation
37+
- JetpackComposeTesting
2338
languages: [Kotlin]
24-
solutions: [Mobile]
25-
39+
solutions:
40+
- Mobile
41+
- Flow
42+
- JetpackHilt
43+
- JetpackRoom
44+
- JetpackWorkManager
45+
- JetpackNavigation
46+
- JetpackLifecycle
2647
github: android/sunflower
27-
2848
level: INTERMEDIATE
29-
3049
icon: screenshots/ic_launcher-web.png
31-
3250
apiRefs:
3351
- android:android.support.constraint.ConstraintLayout
34-
3552
license: apache2

CODE_OF_CONDUCT.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Google Open Source Community Guidelines
2+
3+
At Google, we recognize and celebrate the creativity and collaboration of open
4+
source contributors and the diversity of skills, experiences, cultures, and
5+
opinions they bring to the projects and communities they participate in.
6+
7+
Every one of Google's open source projects and communities are inclusive
8+
environments, based on treating all individuals respectfully, regardless of
9+
gender identity and expression, sexual orientation, disabilities,
10+
neurodiversity, physical appearance, body size, ethnicity, nationality, race,
11+
age, religion, or similar personal characteristic.
12+
13+
We value diverse opinions, but we value respectful behavior more.
14+
15+
Respectful behavior includes:
16+
17+
* Being considerate, kind, constructive, and helpful.
18+
* Not engaging in demeaning, discriminatory, harassing, hateful, sexualized, or
19+
physically threatening behavior, speech, and imagery.
20+
* Not engaging in unwanted physical contact.
21+
22+
Some Google open source projects [may adopt][] an explicit project code of
23+
conduct, which may have additional detailed expectations for participants. Most
24+
of those projects will use our [modified Contributor Covenant][].
25+
26+
[may adopt]: https://opensource.google/docs/releasing/preparing/#conduct
27+
[modified Contributor Covenant]: https://opensource.google/docs/releasing/template/CODE_OF_CONDUCT/
28+
29+
## Resolve peacefully
30+
31+
We do not believe that all conflict is necessarily bad; healthy debate and
32+
disagreement often yields positive results. However, it is never okay to be
33+
disrespectful.
34+
35+
If you see someone behaving disrespectfully, you are encouraged to address the
36+
behavior directly with those involved. Many issues can be resolved quickly and
37+
easily, and this gives people more control over the outcome of their dispute.
38+
If you are unable to resolve the matter for any reason, or if the behavior is
39+
threatening or harassing, report it. We are dedicated to providing an
40+
environment where participants feel welcome and safe.
41+
42+
## Reporting problems
43+
44+
Some Google open source projects may adopt a project-specific code of conduct.
45+
In those cases, a Google employee will be identified as the Project Steward,
46+
who will receive and handle reports of code of conduct violations. In the event
47+
that a project hasn’t identified a Project Steward, you can report problems by
48+
49+
50+
We will investigate every complaint, but you may not receive a direct response.
51+
We will use our discretion in determining when and how to follow up on reported
52+
incidents, which may range from not taking action to permanent expulsion from
53+
the project and project-sponsored spaces. We will notify the accused of the
54+
report and provide them an opportunity to discuss it before any action is
55+
taken. The identity of the reporter will be omitted from the details of the
56+
report supplied to the accused. In potentially harmful situations, such as
57+
ongoing harassment or threats to anyone's safety, we may take action without
58+
notice.
59+
60+
*This document was adapted from the [IndieWeb Code of Conduct][] and can also
61+
be found at <https://opensource.google/conduct/>.*
62+
63+
[IndieWeb Code of Conduct]: https://indieweb.org/code-of-conduct

0 commit comments

Comments
 (0)