Skip to content

Commit 18b27b6

Browse files
committed
Merge branch 'master' into feature/background-work-tasks
2 parents ad64861 + cd4ae73 commit 18b27b6

File tree

11 files changed

+462
-217
lines changed

11 files changed

+462
-217
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
## Issues Relacionadas
2121

2222
[Adicione as issues relacionadas a esse PR, se houver.]
23-
- [link da issue 1]
23+
24+
- [link da issue 1]

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Build KMP (Android + iOS)
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master]
88
workflow_dispatch:
99
inputs:
1010
run_ios:
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup JDK
3030
uses: actions/setup-java@v3
3131
with:
32-
distribution: 'temurin'
32+
distribution: "temurin"
3333
java-version: 17
3434

3535
- name: Grant permission to gradlew

.github/workflows/mega-linter.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# MegaLinter GitHub Action configuration file
2+
# More info at https://megalinter.io
3+
---
4+
name: MegaLinter
5+
6+
on:
7+
pull_request:
8+
branches:
9+
- master
10+
11+
concurrency:
12+
group: ${{ github.ref }}-${{ github.workflow }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
megalinter:
17+
name: MegaLinter
18+
runs-on: ubuntu-latest
19+
20+
# Give the default GITHUB_TOKEN write permission to commit and push, comment
21+
# issues, and post new Pull Requests; remove the ones you do not need
22+
permissions:
23+
contents: write
24+
pull-requests: write
25+
26+
steps:
27+
# Git Checkout
28+
- name: Checkout Code
29+
uses: actions/checkout@v4
30+
with:
31+
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
32+
33+
fetch-depth: 0
34+
35+
# MegaLinter
36+
- name: MegaLinter
37+
uses: oxsecurity/megalinter/flavors/java@v8
38+
id: ml
39+
40+
env:
41+
VALIDATE_ALL_CODEBASE: true
42+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.markdownlint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"MD033": {
3+
"allowed_elements": ["img", "a"]
4+
}
5+
}

.mega-linter.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Configuration file for MegaLinter
2+
#
3+
# See all available variables at https://megalinter.io/latest/config-file/ and in
4+
# linters documentation
5+
6+
# all, none, or list of linter keys
7+
APPLY_FIXES: none
8+
9+
# If you use ENABLE variable, all other languages/formats/tooling-formats will
10+
# be disabled by default
11+
# ENABLE:
12+
13+
# If you use ENABLE_LINTERS variable, all other linters will be disabled by
14+
# default
15+
ENABLE_LINTERS:
16+
- YAML_PRETTIER
17+
- MARKDOWN_MARKDOWNLINT
18+
- KOTLIN_DETEKT
19+
20+
DISABLE:
21+
- COPYPASTE # Comment to enable checks of excessive copy-pastes
22+
# - SPELL # Uncomment to disable checks of spelling mistakes
23+
24+
SHOW_ELAPSED_TIME: true
25+
26+
FILEIO_REPORTER: false
27+
28+
# Uncomment if you want MegaLinter to detect errors but not block CI to pass
29+
# DISABLE_ERRORS: true
30+
MARKDOWN_MARKDOWNLINT_CONFIG_FILE: .markdownlint.json
31+
MARKDOWN_MARKDOWNLINT_DISABLE_ERRORS: false
32+
KOTLIN_DETEKT_ARGUMENTS: -c config/detekt/detekt.yml -ex "**/build/**" -p "lib/detekt-formatting-1.23.7.jar"
33+
34+
DISABLE_ERRORS: true

CONTRIBUTOR_PROJECT.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,39 @@
11
**1. Abra a parte de ISSUES do GitHub e escolha uma issue que você se identifica ou gostaria de explorá-la.**
2+
23
- 1.1. Caso você queira aprender algo ou quer explorar o processo de mentoria ou está na dúvida sobre o que pegar.
3-
- Fale com um dos membros apoiadores no grupo do Discord, no canal #projeto-netflix (Rods, Gabriel Moro ou Carlos Vacarri), para ajudar a instruí-l(a/o).
4-
- Essa parte da dinâmica da mentoria será moldada junto com você, então tente/tenha paciência e vamos aprender juntos!
4+
- Fale com um dos membros apoiadores no grupo do Discord, no canal #projeto-netflix (Rods, Gabriel Moro ou Carlos Vacarri), para ajudar a instruí-l(a/o).
5+
- Essa parte da dinâmica da mentoria será moldada junto com você, então tente/tenha paciência e vamos aprender juntos!
56
- 1.2. Caso você queira ajudar a galera no processo de mentoria.
6-
- Fale com um dos membros apoiadores no grupo do Discord, no canal #projeto-netflix, e participe ajudando o pessoal lá.
7-
- Entre em contato conosco no Discord com Rods, Gabriel Moro ou Carlos Vacarri.
7+
- Fale com um dos membros apoiadores no grupo do Discord, no canal #projeto-netflix, e participe ajudando o pessoal lá.
8+
- Entre em contato conosco no Discord com Rods, Gabriel Moro ou Carlos Vacarri.
89
- 1.3. Caso você esteja apenas procurando um pretexto para codar, fazer alguma melhoria ou porque não pegar algo divertido para fazer!
9-
- Siga o resto dos passos e seja bem-vindo!
10+
- Siga o resto dos passos e seja bem-vindo!
1011
- 1.4 Caso tenha sentido falta de algo que não está mapeando, crie uma issue, e fale com nossos membros apoiadores;
1112
- 1.5 Quer gravar video no CodandoTV do que você fez?
12-
- Fale com Rods! [Discord](https://discord.gg/fZMDmjKmju) / [LinkedIn](https://www.linkedin.com/in/rviannaoliveira/)
13+
- Fale com Rods! [Discord](https://discord.gg/fZMDmjKmju) / [LinkedIn](https://www.linkedin.com/in/rviannaoliveira/)
1314

1415
**2. Associe seu nome, se não der, é porque você precisa participar do grupo `Codevs`, entre em contato com nossos membros apoiadores do discord para adicionarem você nesse grupo;**
16+
1517
- 2.2. Se você quer fazer algo que ainda não tem uma issue fale com Rods para instrui-lo
1618

1719
**3. Faça um fork deste repositório na sua máquina;**
1820

1921
**4. Crie uma branch a partir da `master` para a sua feature;**
22+
2023
```git
2124
git checkout -b feature/issue
2225
```
2326

2427
**5. Desenvolva e teste sua feature;**
2528

2629
**6. Faça commit das suas alterações:**
30+
2731
```git
2832
git commit -m 'Adicionando minha feature'
2933
```
3034

3135
**7. Faça push para o repositório remoto;**
36+
3237
```git
3338
git push origin minha-feature
3439
```

CONTRIBUTOR_WIKI.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
**1. Faça um fork do repositório**
22

33
**2. Clone o repositório**
4+
45
```git
56
git clone https://github.com/CodandoTV/StreamPlayerApp.wiki.git
67
```
8+
79
**3. Acessa a pasta wiki**
10+
811
```
912
cd StreamPlayerApp.wiki
1013
```
14+
1115
**4. Faça as alterações desejadas nos arquivos da wiki;**
1216

1317
**5. Commit e push das alterações para o seu repositório forked:**
18+
1419
```git
1520
git checkout -b "nome do seu branch"
1621
git add .
1722
git commit -m "Descrição das alterações"
1823
git push
1924
```
25+
2026
**6. Crie um novo Pull Request, escolhendo o repositório original como base e a branch com as suas alterações.**
2127

2228
**7. Preencha os detalhes do PR, fornecendo um título e uma descrição clara.**

README.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# StreamPlayerApp
2-
<h3 align="center">
2+
3+
<h3 align="center">
34

45
[![Backers on Open Collective](https://opencollective.com/stremplayerapp/backers/badge.svg)](#backers)
56
[![Sponsors on Open Collective](https://opencollective.com/stremplayerapp/sponsors/badge.svg)](#sponsors)
67
<a href="https://www.linkedin.com/company/codandotv"><img src="https://user-images.githubusercontent.com/5540492/212076261-85e22389-eaae-4ac0-9c9d-06196f54ac70.png" height="20px"/></a>
78
<a href="https://www.youtube.com/c/CodandoTV"><img src="https://img.shields.io/badge/YouTube-FF0000?style=for-the-badge&logo=youtube&logoColor=white" height="20px"/></a>
8-
</h3>
9+
</h3>
910

1011
![Logo do Projeto](file_readme/codandotv.png)
1112

@@ -20,42 +21,46 @@ StreamPlayerApp is an open source project based on the Netflix app, all of the f
2021
**Flow, Compose, Koin, NavigationCompose, Arquitetura MVVM com clean architecture entre outras ( ainda será separado um link para isso)**
2122

2223
## 🏋️‍♀️ Goal
24+
2325
This project was initiated with the purpose of providing a hands-on and collaborative learning opportunity for the community. Through it, participants can improve their skills in Android development, Kotlin, clean architecture and teamwork.
2426

2527
## 💬 Communication
28+
2629
We have a specific channel called [#projeto-netflix](https://discord.com/channels/843114243859546142/1101921493010616351)) in our [Discord](https://discord.gg/fZMDmjKmju) server to talk about the project.
2730

28-
------------------------------------------
31+
---
32+
33+
### 🚨 If you arrived here, and you are not subscribed in our YouTube channel, this is a great moment to do that 🙏
2934

30-
### 🚨 If you arrived here, and you are not subscribed in our YouTube channel, this is a great moment to do that 🙏.
3135
[![CodandoTV](https://img.shields.io/badge/YouTube-FF0000?style=for-the-badge&logo=youtube&logoColor=white)](https://bit.ly/3Ob3yPH)
3236

3337
Follow our playlist of videos called [Projeto Netflix](https://www.youtube.com/playlist?list=PL-7tME9TKyA4At5ze9i8-w_trk7nXMGRj), all of the material was produced using this repository.
3438

35-
------------------------------------------
39+
---
3640

3741
## ✨ How to contribute?
3842

3943
If you wish to contribute to this project, chose the best path that suits you:
4044

4145
1. If you want to learn something or want to explore the mentoring process or you have questions about what you should do.
42-
- Talk to someone in our [Discord](https://discord.gg/fZMDmjKmju), you can use the channel called [#projeto-netflix](https://discord.com/channels/843114243859546142/1101921493010616351)(Rods, Gabriel Moro or Carlos Vaccari) to help you.
43-
- The mentoring will be shaped together with we do not know how it will be, so be patient and let's learn together 😊!
44-
- The main goal is to use the Discord as main communication tool.
45-
46+
- Talk to someone in our [Discord](https://discord.gg/fZMDmjKmju), you can use the channel called [#projeto-netflix](https://discord.com/channels/843114243859546142/1101921493010616351)(Rods, Gabriel Moro or Carlos Vaccari) to help you.
47+
- The mentoring will be shaped together with we do not know how it will be, so be patient and let's learn together 😊!
48+
- The main goal is to use the Discord as main communication tool.
4649
2. If you want to help mentoring people:
47-
- Talk to someone in the Discord, use the channel `#projeto-netflix`, you can start from there helping people there.
48-
- Reach us in the [Discord](https://discord.gg/fZMDmjKmju) server, you can reach out Rods, Moro or Carlos Vaccari.
50+
51+
- Talk to someone in the Discord, use the channel `#projeto-netflix`, you can start from there helping people there.
52+
- Reach us in the [Discord](https://discord.gg/fZMDmjKmju) server, you can reach out Rods, Moro or Carlos Vaccari.
4953

5054
3. If you are just trying to find an excuse to code, do some fun or why do not you find something fun to do!
51-
- Follow the [steps](https://github.com/CodandoTV/StreamPlayerApp/blob/master/CONTRIBUTOR_PROJECT.md) and welcome!
55+
56+
- Follow the [steps](https://github.com/CodandoTV/StreamPlayerApp/blob/master/CONTRIBUTOR_PROJECT.md) and welcome!
5257

5358
4. If there is a lack of something that is not being mapped, there is an issue and a failure with our supporting members;
5459

5560
5. If you want to record videos to be published in the CodandoTV channel showing what you did, you can:
56-
- Talk to Rods! [Discord](https://discord.gg/fZMDmjKmju) / [LinkedIn](https://www.linkedin.com/in/rviannaoliveira/)
61+
- Talk to Rods! [Discord](https://discord.gg/fZMDmjKmju) / [LinkedIn](https://www.linkedin.com/in/rviannaoliveira/)
5762

58-
All contributions conditions are available here in the [Step-by-step to be a contributor](https://github.com/CodandoTV/StreamPlayerApp/blob/master/CONTRIBUTOR_PROJECT.md)
63+
All contributions conditions are available here in the [Step-by-step to be a contributor](https://github.com/CodandoTV/StreamPlayerApp/blob/master/CONTRIBUTOR_PROJECT.md)
5964

6065
---
6166

@@ -66,7 +71,7 @@ I hope our wiki becomes richer and richer, so it will be a continuous process. T
6671
If you realize that something relevant is missing here, please vote and post a PR for the wiki as well!
6772
[Step-by-step](https://github.com/CodandoTV/StreamPlayerApp/blob/master/CONTRIBUTOR_WIKI.md)
6873

69-
---
74+
---
7075

7176
## 🎤 How to use the Discussions option (4th tab in our git project)
7277

@@ -84,15 +89,12 @@ We have a section called `discussions`, this is hosted in our repository, so we
8489

8590
### If you arrived here, please subscribe in our YouTube channel 😛 [Codandotv](https://bit.ly/3Ob3yPH)
8691

87-
8892
## Contributors
8993

9094
This project exists thanks to all the people who contribute.
9195
<a href="https://github.com/CodandoTV/StreamPlayerApp"><img src="https://opencollective.com/stremplayerapp/contributors.svg?width=890&button=false" /></a>
9296

93-
94-
License
95-
-------
97+
## License
9698

9799
Copyright 2023 Rodrigo Vianna
98100

@@ -107,5 +109,3 @@ License
107109
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
108110
See the License for the specific language governing permissions and
109111
limitations under the License.
110-
111-

0 commit comments

Comments
 (0)