Skip to content

Commit

Permalink
Merge pull request #543 from Orange-OpenSource/develop
Browse files Browse the repository at this point in the history
Release 0.13.0
  • Loading branch information
florentmaitre authored Jun 1, 2023
2 parents c146ddb + 9514d32 commit c0ace18
Show file tree
Hide file tree
Showing 361 changed files with 6,496 additions and 871 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Report a bug
description: Tell us about a bug or issue you may have identified in ODS Android.
title: "[Bug]: Bug Summary"
labels: ["bug", "triage"]
labels: ["🐞 bug", "🔍 triage"]
assignees:
- B3nz01d
body:
Expand All @@ -10,7 +10,7 @@ body:
label: Prerequisites
description: Take a couple minutes to help our maintainers work faster.
options:
- label: I have [searched the backlog](https://github.com/Orange-OpenSource/ods-ios/issues) for duplicate or closed feature requests
- label: I have [searched the backlog](https://github.com/Orange-OpenSource/ods-android/issues) for duplicate or closed feature requests
required: true
- type: input
id: device
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/documentation-update.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Documentation Update
description: Describe this issue found in the documentation
title: "[Doc]: "
labels: ["documentation", "triage"]
labels: ["📖+documentation", "🔍 triage"]
assignees:
- B3nz01d
body:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Feature Request
description: Suggest a new Epic to be added to the backlog.
title: "[feature]: "
labels: ["feature", "triage"]
labels: ["feature", "🔍 triage"]
assignees:
- B3nz01d
body:
Expand All @@ -10,7 +10,7 @@ body:
label: Prerequisites
description: Take a couple minutes to help our maintainers work faster.
options:
- label: I have [searched the backlog](https://github.com/Orange-OpenSource/ods-ios/issues) for duplicate or closed feature requests
- label: I have [searched the backlog](https://github.com/Orange-OpenSource/ods-android/issues) for duplicate or closed feature requests
required: true
- type: markdown
attributes:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/android-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: android-build
on:
push:
branches:
- master
- main
- develop
tags:
- '[0-9]+.[0-9]+.[0-9]+'
Expand Down Expand Up @@ -165,8 +165,10 @@ jobs:
distribution: 'zulu'
java-version: '11'

- name: Build unsigned APK and bundle for Google Play Store
run: ./gradlew assembleRelease bundleRelease
- name: Publish release to Google Play Store
run: |
./gradlew assembleRelease bundleRelease
curl -F 'file=@app/build/outputs/bundle/release/app-release.aab' https://oma-portal.orange.fr/oma/api/v1/external/applications/${{ secrets.OMA_APP_ID }}/artifacts -H "apiKey:${{ secrets.OMA_APP_TOKEN }}"
- name: Store Google Play Store artifacts
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/app-distribution-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
git-tag-prefix: 'ci/daily-app'
group: 'ods-android-internal-tests'
github-token: ${{ secrets.GITHUB_TOKEN }}
firebase-token: ${{secrets.FIREBASE_TOKEN}}
firebase-token: ${{ secrets.FIREBASE_TOKEN }}
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "vendor/ods-jekyll-theme"]
path = vendor/ods-jekyll-theme
url = ../ods-jekyll-theme.git
5 changes: 2 additions & 3 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
# Contributing to Orange Design System Android

Looking to contribute something to Orange Design System Android? **Here's how you can help.**

Please take a moment to review this document in order to make the contribution process easy for everyone involved.

Following these guidelines helps to communicate that you respect the time of the developers managing and developing this Open Source project. In return, they should reciprocate that respect in addressing your issue or assessing patches and features.

## Using the Issue Tracker

The [issue tracker](https://github.com/Orange-OpenSource/ods-android/issues) is the preferred channel for [bug reports](#bug-reports), [feature requests](#feature-requests) and [submitting pull requests](#pull-requests), but please respect the following restrictions:

- Please **do not** use the issue tracker for personal support requests. [GitHub Discussions](https://github.com/Orange-OpenSource/ods-android/discussions/categories/q-a) or our internal Orange communication tools are better places to get help.

- Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others.

- Please **do not** post comments consisting solely of "+1" or ":thumbsup:". Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) instead. We reserve the right to delete comments which violate this rule.

## Issues and Labels

Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:

- `feature` - Issues asking for a new feature to be added, or an existing one to be extended or modified. New features require a minor version bump (e.g., `v1.0.0` to `v1.1.0`).
- `help wanted` - Issues we need or would love help from the community to resolve.

For a complete look at our labels, see the [project labels page](https://github.com/Orange-OpenSource/ods-android/labels).

## Bug Reports

A bug is a _demonstrable problem_ that is caused by the code in the repository. Good bug reports are extremely helpful, so thanks!

Guidelines for bug reports:

1. **Use the GitHub issue search** — check if the issue has already been reported.

2. **Check if the issue has been fixed** — try to reproduce it using the latest `main` in the repository.

3. **Isolate the problem** — ideally create a reduced reproducible test case.

A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report. What is your environment? What steps will reproduce the issue? What device(s) and OS experience the problem? Do other devices show the bug differently? What would you expect to be the outcome? All these details will help people to fix any potential bugs.

Example:

> Short and descriptive example bug report title
>
> A summary of the issue and the browser/OS environment in which it occurs. If
> suitable, include the steps required to reproduce the bug.
>
> 1. This is the first step
> 2. This is the second step
> 3. Further steps, etc.
>
> `<url>` - a link to the reduced test case
>
> Any other information you want to share that is relevant to the issue being
> reported. This might include the lines of code that you have identified as
> causing the bug, and potential solutions (and your opinions on their
> merits).
## Feature Requests

Feature requests are welcome. But take a moment to find out whether your idea fits with the scope and aims of the project. It's up to _you_ to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible.

## Pull requests

Good pull requests—patches, improvements, new features—are a fantastic help. They should remain focused in scope and avoid containing unrelated commits.

**Please ask first** before embarking on any **significant** pull request (e.g. implementing features, refactoring code, porting to a different language), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project. For trivial things, or things that don't require a lot of your time, you can go ahead and make a PR.

Please adhere to the [coding guidelines](#code-guidelines) used throughout the project (indentation, accurate comments, etc.) and any other requirements (such as test coverage).

Adhering to the following process is the best way to get your work included in the project:

1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your fork, and configure the remotes:

```bash
# Clone your fork of the repo into the current directory
git clone https://github.com/<your-username>/ods-android.git
# Navigate to the newly cloned directory
cd ods-android
# Assign the original repo to a remote called "upstream"
git remote add upstream https://github.com/Orange-OpenSource/ods-android.git
```

2. If you cloned a while ago, get the latest changes from upstream:

```bash
git checkout main
git pull upstream main
```

3. Create a new topic branch (off the main project development branch) to contain your feature, change, or fix:

```bash
git checkout -b <topic-branch-name>
```

4. Commit your changes in logical chunks. Use Git's [interactive rebase](https://help.github.com/articles/about-git-rebase/) feature to tidy up your commits before making them public.

5. Locally merge (or rebase) the upstream development branch into your topic branch:

```bash
git pull [--rebase] upstream main
```

6. Push your topic branch up to your fork:

```bash
git push origin <topic-branch-name>
```

7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/) with a clear title and description against the `main` branch.

**IMPORTANT**: By submitting a patch, you agree to allow the project owners to license your work under the terms of the [MIT License](LICENSE).

## Code Guidelines

### Checking Coding Style

Format your code before committing to ensure your changes follow our coding standards.

## License

By contributing your code, you agree to license your contribution under the [MIT License](LICENSE).
14 changes: 8 additions & 6 deletions DEVELOP.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ repositories {

```groovy
dependencies {
implementation 'com.orange.ods.android:ods-lib:0.12.0'
implementation 'com.orange.ods.android:ods-lib:0.13.0'
}
```

## Documentation

Execute the commands below to generate and run the documentation:

1. `cd docs`
2. `bundle config set --local path 'vendor/bundle'`
3. `bundle install`
4. `bundle exec jekyll serve --trace --watch --force_polling --livereload --livereload-port 4001`
1. `git submodule init`
2. `git submodule update`
3. `cd docs`
4. `bundle config set --local path 'vendor/bundle'`
5. `bundle install`
6. `bundle exec jekyll serve --trace --watch --force_polling --livereload --livereload-port 4001`

If you encounter errors during installation and your platform is not listed in the `PLATFORMS` section of `Gemfile.lock`, you can optionally run `bundle platform` to retrieve your platform, then `bundle lock --add-platform <your_platform>` to install specific dependencies for you platform.
If you encounter errors during installation and your platform is not listed in the `PLATFORMS` section of `Gemfile.lock`, you can optionally run `bundle platform` to retrieve your platform, then `bundle lock --add-platform <your_platform>` to install specific dependencies for your platform.

Finally, open your browser and go to http://127.0.0.1:4000/ods-android/
39 changes: 19 additions & 20 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ app/src/main/res/drawable/il_lists.xml
app/src/main/res/drawable/il_progress.xml
app/src/main/res/drawable/il_radio_buttons.xml
app/src/main/res/drawable/il_sliders.xml
app/src/main/res/drawable/placeholder_error_small.png
app/src/main/res/drawable/placeholder_error_small_dark.png
app/src/main/res/drawable/placeholder_small.png
app/src/main/res/drawable/placeholder_small_dark.png

app/src/main/res/drawable-hdpi/il_about.png
app/src/main/res/drawable-hdpi/il_app_bars_top.png
Expand All @@ -55,26 +58,9 @@ app/src/main/res/drawable-hdpi/il_text_fields.png
app/src/main/res/drawable-hdpi/il_text_fields_small.png
app/src/main/res/drawable-hdpi/il_typography.png
app/src/main/res/drawable-hdpi/placeholder.png

app/src/main/res/drawable-ldpi/il_about.png
app/src/main/res/drawable-ldpi/il_app_bars_top.png
app/src/main/res/drawable-ldpi/il_app_bars_top_small.png
app/src/main/res/drawable-ldpi/il_buttons.png
app/src/main/res/drawable-ldpi/il_buttons_small.png
app/src/main/res/drawable-ldpi/il_chips.png
app/src/main/res/drawable-ldpi/il_chips_small.png
app/src/main/res/drawable-ldpi/il_color.png
app/src/main/res/drawable-ldpi/il_snackbars.png
app/src/main/res/drawable-ldpi/il_snackbars_small.png
app/src/main/res/drawable-ldpi/il_spacing.png
app/src/main/res/drawable-ldpi/il_switches.png
app/src/main/res/drawable-ldpi/il_switches_small.png
app/src/main/res/drawable-ldpi/il_tabs.png
app/src/main/res/drawable-ldpi/il_tabs_small.png
app/src/main/res/drawable-ldpi/il_text_fields.png
app/src/main/res/drawable-ldpi/il_text_fields_small.png
app/src/main/res/drawable-ldpi/il_typography.png
app/src/main/res/drawable-ldpi/placeholder.png
app/src/main/res/drawable-hdpi/placeholder_dark.png
app/src/main/res/drawable-hdpi/placeholder_error.png
app/src/main/res/drawable-hdpi/placeholder_error_dark.png

app/src/main/res/drawable-mdpi/il_about.png
app/src/main/res/drawable-mdpi/il_app_bars_top.png
Expand All @@ -95,6 +81,9 @@ app/src/main/res/drawable-mdpi/il_text_fields.png
app/src/main/res/drawable-mdpi/il_text_fields_small.png
app/src/main/res/drawable-mdpi/il_typography.png
app/src/main/res/drawable-mdpi/placeholder.png
app/src/main/res/drawable-mdpi/placeholder_dark.png
app/src/main/res/drawable-mdpi/placeholder_error.png
app/src/main/res/drawable-mdpi/placeholder_error_dark.png

app/src/main/res/drawable-xhdpi/il_about.png
app/src/main/res/drawable-xhdpi/il_app_bars_top.png
Expand All @@ -115,6 +104,9 @@ app/src/main/res/drawable-xhdpi/il_text_fields.png
app/src/main/res/drawable-xhdpi/il_text_fields_small.png
app/src/main/res/drawable-xhdpi/il_typography.png
app/src/main/res/drawable-xhdpi/placeholder.png
app/src/main/res/drawable-xhdpi/placeholder_dark.png
app/src/main/res/drawable-xhdpi/placeholder_error.png
app/src/main/res/drawable-xhdpi/placeholder_error_dark.png

app/src/main/res/drawable-xxhdpi/il_about.png
app/src/main/res/drawable-xxhdpi/il_app_bars_top.png
Expand All @@ -135,6 +127,9 @@ app/src/main/res/drawable-xxhdpi/il_text_fields.png
app/src/main/res/drawable-xxhdpi/il_text_fields_small.png
app/src/main/res/drawable-xxhdpi/il_typography.png
app/src/main/res/drawable-xxhdpi/placeholder.png
app/src/main/res/drawable-xxhdpi/placeholder_dark.png
app/src/main/res/drawable-xxhdpi/placeholder_error.png
app/src/main/res/drawable-xxhdpi/placeholder_error_dark.png

app/src/main/res/drawable-xxxhdpi/il_about.png
app/src/main/res/drawable-xxxhdpi/il_app_bars_top.png
Expand All @@ -155,6 +150,10 @@ app/src/main/res/drawable-xxxhdpi/il_text_fields.png
app/src/main/res/drawable-xxxhdpi/il_text_fields_small.png
app/src/main/res/drawable-xxxhdpi/il_typography.png
app/src/main/res/drawable-xxxhdpi/placeholder.png
app/src/main/res/drawable-xxxhdpi/placeholder_dark.png
app/src/main/res/drawable-xxxhdpi/placeholder_error.png
app/src/main/res/drawable-xxxhdpi/placeholder_error_dark.png


app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Expand Down
32 changes: 30 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,35 @@
<a href="https://orange-opensource.github.io/ods-android"><strong>Visit ODS Android</strong></a>
<br>
<br>
<a href="https://github.com/Orange-OpenSource/ods-android/issues/new?assignees=B3nz01d&labels=bug%2Ctriage&template=bug_report.yml&title=%5BBug%5D%3A+Bug+Summary">Report bug</a>
<a href="https://github.com/Orange-OpenSource/ods-android/issues/new?assignees=B3nz01d&labels=%F0%9F%90%9E+bug%2C%F0%9F%94%8D+triage&template=bug_report.yml&title=[Bug]%3A+Bug+Summary">Report bug</a>
·
<a href="https://github.com/Orange-OpenSource/ods-android/issues/new?assignees=B3nz01d&labels=feature%2Ctriage&template=feature_request.yml&title=%5Bfeature%5D%3A+">Request feature</a>
<a href="https://github.com/Orange-OpenSource/ods-android/issues/new?assignees=B3nz01d&labels=feature%2C%F0%9F%94%8D%20triage&template=feature_request.yml&title=[feature]%3A+">Request feature</a>
</p>

## Table of contents

- [Content](#content)
- [Bugs and feature requests](#bugs-and-feature-requests)
- [Contributing](#contributing)
- [Copyright and license](#copyright-and-license)

## Content

This repository contains the Orange Design System Android library that provides Orange Android components, but also a demo application showcasing these different components.

For more specific information:

* [Library README](https://github.com/Orange-OpenSource/ods-android/blob/develop/lib/README.md)
* [Demo application README](https://github.com/Orange-OpenSource/ods-android/blob/develop/app/README.md)

## Bugs and feature requests

Have a bug or a feature request? Please first search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/Orange-OpenSource/ods-android/issues/new/choose).

## Contributing

Please read through our [contributing guidelines](https://github.com/Orange-OpenSource/ods-android/blob/develop/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.

## Copyright and license

Code released under the [MIT License](https://github.com/Orange-OpenSource/ods-android/blob/develop/LICENSE).
12 changes: 12 additions & 0 deletions app/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<h1 align="center">Orange Design System Android Demo Application</h1>

<p align="center">
ODS Android provides Orange Android components to developers.
<br>
<a href="https://orange-opensource.github.io/ods-android"><strong>Visit ODS Android</strong></a>
<br>
<br>
<a href="https://github.com/Orange-OpenSource/ods-android/issues/new?assignees=B3nz01d&labels=bug%2Ctriage&template=bug_report.yml&title=%5BBug%5D%3A+Bug+Summary">Report bug</a>
·
<a href="https://github.com/Orange-OpenSource/ods-android/issues/new?assignees=B3nz01d&labels=feature%2Ctriage&template=feature_request.yml&title=%5Bfeature%5D%3A+">Request feature</a>
</p>
Loading

0 comments on commit c0ace18

Please sign in to comment.