Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
35484fa
Refactor: Update color theme for transaction type button
LucasOliveiraSimao Aug 2, 2025
e83411e
Refactor: Improve InputText component styling
LucasOliveiraSimao Aug 2, 2025
0fe8f16
Refactor: adjust PetSelectorItem component
LucasOliveiraSimao Aug 2, 2025
1c2ef83
feat: create RegisterTaskScreen
LucasOliveiraSimao Aug 2, 2025
9e338fe
feat: Create TransactionTypeSelector component
LucasOliveiraSimao Aug 2, 2025
965c2de
feat: Create TransactionType enum
LucasOliveiraSimao Aug 2, 2025
0369937
Refactor: Rename DescriptionTextField to TextFieldCustom
LucasOliveiraSimao Aug 2, 2025
ac1d516
Refactor: Remove redundant strings and add recurrence strings
LucasOliveiraSimao Aug 2, 2025
6e8cf1b
Refactor: Adjust SelectableButton layout and style
LucasOliveiraSimao Aug 2, 2025
f00f787
feat: Create ScreenRegisterTask screen
LucasOliveiraSimao Aug 2, 2025
8340d39
feat: integrate ScreenRegisterTask into MainActivity
LucasOliveiraSimao Aug 2, 2025
9322455
Merge branch 'develop' into task-registration-screen
LucasOliveiraSimao Aug 2, 2025
4a12d35
feat: Add unfocused color for WheelTimePicker
LucasOliveiraSimao Aug 30, 2025
be3d9e3
feat: Create DayPicker composable
LucasOliveiraSimao Aug 30, 2025
7bbde0f
feat: Create OneOffTask composable
LucasOliveiraSimao Aug 30, 2025
b0b471d
feat: Create PeriodSelector composable
LucasOliveiraSimao Aug 30, 2025
54ff2ba
feat: Create RecurringTask composable
LucasOliveiraSimao Aug 30, 2025
83b807f
Refactor: Make GroupSelectableButton dynamic
LucasOliveiraSimao Aug 30, 2025
0dce343
feat: Add SelectedPeriodType enum
LucasOliveiraSimao Aug 30, 2025
604a5f1
Refactor: Update TextFieldCustom padding and add new string resources
LucasOliveiraSimao Aug 30, 2025
45a57d4
feat: Create TimePickerWithPeriodSelector Composable
LucasOliveiraSimao Aug 30, 2025
a840ae9
Refactor: Adjust TransactionTypeSelector button size
LucasOliveiraSimao Aug 30, 2025
bc4cc3a
Refactor: Update WheelTimePicker component
LucasOliveiraSimao Aug 30, 2025
74938de
feat: Enhance ScreenRegisterTask UI and functionality
LucasOliveiraSimao Aug 30, 2025
ff3ecdf
Test: Add UI tests for ScreenRegisterTask components
LucasOliveiraSimao Aug 30, 2025
fc55fc0
Merge branch 'develop' into task-registration-screen
LucasOliveiraSimao Oct 7, 2025
f08dcac
Creating TaskState and TaskEvent
Oct 22, 2025
ac591c5
Created tabSelector for day/week/month
Oct 23, 2025
98135aa
Refactor: Update color theme for transaction type button
LucasOliveiraSimao Aug 2, 2025
6cd5d54
Refactor: Improve InputText component styling
LucasOliveiraSimao Aug 2, 2025
fca4ac2
Refactor: adjust PetSelectorItem component
LucasOliveiraSimao Aug 2, 2025
4f3291a
feat: create RegisterTaskScreen
LucasOliveiraSimao Aug 2, 2025
80c7e49
feat: Create TransactionTypeSelector component
LucasOliveiraSimao Aug 2, 2025
66e9541
feat: Create TransactionType enum
LucasOliveiraSimao Aug 2, 2025
47bcb1c
Refactor: Rename DescriptionTextField to TextFieldCustom
LucasOliveiraSimao Aug 2, 2025
e37e6c8
Refactor: Remove redundant strings and add recurrence strings
LucasOliveiraSimao Aug 2, 2025
3ce4e77
Refactor: Adjust SelectableButton layout and style
LucasOliveiraSimao Aug 2, 2025
6bbc63c
feat: Create ScreenRegisterTask screen
LucasOliveiraSimao Aug 2, 2025
877916d
feat: integrate ScreenRegisterTask into MainActivity
LucasOliveiraSimao Aug 2, 2025
b297eb5
feat: Add unfocused color for WheelTimePicker
LucasOliveiraSimao Aug 30, 2025
58179ea
feat: Create DayPicker composable
LucasOliveiraSimao Aug 30, 2025
b79d4d1
feat: Create OneOffTask composable
LucasOliveiraSimao Aug 30, 2025
f80dfe9
feat: Create PeriodSelector composable
LucasOliveiraSimao Aug 30, 2025
ceefb67
feat: Create RecurringTask composable
LucasOliveiraSimao Aug 30, 2025
f2b51ba
Refactor: Make GroupSelectableButton dynamic
LucasOliveiraSimao Aug 30, 2025
1cc96ba
feat: Add SelectedPeriodType enum
LucasOliveiraSimao Aug 30, 2025
ba315cb
Refactor: Update TextFieldCustom padding and add new string resources
LucasOliveiraSimao Aug 30, 2025
4ea5e67
feat: Create TimePickerWithPeriodSelector Composable
LucasOliveiraSimao Aug 30, 2025
dcb9f30
Refactor: Adjust TransactionTypeSelector button size
LucasOliveiraSimao Aug 30, 2025
7a5a3f7
Refactor: Update WheelTimePicker component
LucasOliveiraSimao Aug 30, 2025
805ac72
feat: Enhance ScreenRegisterTask UI and functionality
LucasOliveiraSimao Aug 30, 2025
45bf5b2
Test: Add UI tests for ScreenRegisterTask components
LucasOliveiraSimao Aug 30, 2025
6e6bec9
Merge branch 'task-registration-screen' of https://github.com/PetJour…
gusoliveira21 Oct 29, 2025
c3b26bd
feat(ui): improve UI components styling and functionality
gusoliveira21 Oct 29, 2025
8e1a89c
refactor(strings): update pet registration string label
gusoliveira21 Oct 29, 2025
3af5ae5
fix(ui): apply temporary color fixes to TaskSuccessDialog
gusoliveira21 Oct 29, 2025
26f131e
feat(ui): improve register pet screen layout and add preview components
gusoliveira21 Oct 29, 2025
72a80bf
fix(navigation): update pet list route and add navigation functionality
gusoliveira21 Oct 29, 2025
511af56
fix(test): correct parameter order in RegisterPetScreenTest
gusoliveira21 Oct 29, 2025
528fe13
fixed size of the bottom button from the TaskCard component
Oct 29, 2025
0cafa37
fixed size of the texts form bottom button and edit task button
Oct 29, 2025
67da8b4
Added lazycolumn to screen
Oct 29, 2025
6cdf70b
Adicionados objetos de request para a tela de criacao de tarefas
Oct 31, 2025
a8d8f5e
test(deps): add mockk-android dependency for android tests
gusoliveira21 Nov 6, 2025
0ce481f
test(ui): add PetFilterList tests and expand ScreenRegisterTask tests
gusoliveira21 Nov 6, 2025
c4f3b6a
refactor(ui): improve UI components with spacing and test tags
gusoliveira21 Nov 6, 2025
fac9f5b
feat(ui): improve register task screen layout and functionality
gusoliveira21 Nov 6, 2025
63bc817
refactor(navigation): restore PresentationManager in MainActivity
gusoliveira21 Nov 6, 2025
a282520
feat: add task cards component and pre-commit config
gusoliveira21 Nov 7, 2025
f10941d
refactor: update task card and data components
gusoliveira21 Nov 7, 2025
218478a
feat: update task date components and models
gusoliveira21 Nov 7, 2025
29df358
refactor: update task screen and date component structure
gusoliveira21 Nov 8, 2025
7bc4c77
Merge branch 'task-registration-screen' into feature/create-task-cards
gusoliveira21 Nov 17, 2025
7e5d28f
update: upgrade sdk version to 36
gusoliveira21 Dec 2, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/petJournalAndroid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
# JAVA_HOME: /opt/hostedtoolcache/Java_1.8.0

# - name: Run unit tests
# run: ./gradlew test
# run: ./gradlew test
# working-directory: petJournal

# - name: Upload unit tests report
Expand Down
2 changes: 1 addition & 1 deletion .idea/workspace.xml

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

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Ao entrar em nosso projeto voluntário, valorizamos sua contribuição e entusia


## 4. Telas e seus diagramas de funcionamento
Nesta seção, você encontrará informações detalhadas sobre as diferentes telas do nosso aplicativo e sobre seus funcionamentos.
Nesta seção, você encontrará informações detalhadas sobre as diferentes telas do nosso aplicativo e sobre seus funcionamentos.
- [Splash](doc/screens/splash_screen.md)
- [Login](doc/screens/login.md)
- [Cadastro](doc/screens/cadastro.md)
Expand All @@ -52,7 +52,7 @@ Nesta seção, você encontrará informações detalhadas sobre as diferentes te


## 5. Padrões de Design e Melhores Práticas
Utilizamos os recursos a baixo em nosso app, o que torna importante conhecer tais padrões.
Utilizamos os recursos a baixo em nosso app, o que torna importante conhecer tais padrões.
- [FormEvent](doc/pattern/FormEvent.md)
- [FormState](doc/pattern/FormState.md)
- [FormState e FormEvent](doc/pattern/FormStateAndFormEvent.md)
Expand Down
14 changes: 7 additions & 7 deletions doc/architecture/architecture.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@

- **Visão Geral da Arquitetura**: MVVM para separação da lógica de negócios e interface do usuário.

![arquitetura-basic.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/13b05a7f-afe4-466f-8cb3-8e753fffb0dc)

- **Diagrama da Arquitetura expandido**:

![arquitetura-Cópia do arquitetura.drawio.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/4b80e624-e101-42aa-9708-0565b4f99d54)

- **Organização das pastas:**
- **Modulos** :

![modulos.png](https://github.com/PetJournal/petjournal.android/assets/42920754/3ccdde18-4ae3-4717-993b-6144b4857322)

- **App, Domain, Data, Database** :
<p>

<p>
<img src='https://github.com/PetJournal/petjournal.android/assets/42920754/b0a54bb3-3288-4a34-a6ff-707d31621ace' width='20.5%'>
<img src='https://github.com/PetJournal/petjournal.android/assets/42920754/96ec7de2-339c-4d0b-bfac-5b44faec8a5b' width='20.5%'>
<img src='https://github.com/PetJournal/petjournal.android/assets/42920754/2849611f-15a4-454c-b5ab-19221e8c16d4' width='20.5%'>
Expand Down
8 changes: 4 additions & 4 deletions doc/pattern/FormEvent.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ Para utilizar um padrão semelhante em outras telas, siga estas etapas:
val error: String? = null
)
```

```kotlin
class ScreenViewModel : ViewModel() {
private val _state = MutableLiveData<ScreenState>()
val state: LiveData<ScreenState> = _state

fun onEvent(event: ScreenEvent) {
when (event) {
is ScreenEvent.EventA -> {
Expand All @@ -46,7 +46,7 @@ Para utilizar um padrão semelhante em outras telas, siga estas etapas:
}
}
}

```
3. **Emita eventos a partir da UI**: Na interface do usuário, emita os eventos apropriados em resposta às ações do usuário.
```kotlin
Expand Down Expand Up @@ -75,4 +75,4 @@ Usar `FormEvent` ajuda a manter uma arquitetura clara e reativa, facilitando o g

---

Nota: Sinta-se à vontade para adaptar ou expandir este texto conforme necessário para nossa documentação!
Nota: Sinta-se à vontade para adaptar ou expandir este texto conforme necessário para nossa documentação!
2 changes: 1 addition & 1 deletion doc/pattern/FormState.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ Utilizar o `FormState` ajuda a manter seu código organizado, facilita a leitura

---

Nota: Sinta-se à vontade para adaptar ou expandir este texto conforme necessário para nossa documentação!
Nota: Sinta-se à vontade para adaptar ou expandir este texto conforme necessário para nossa documentação!
2 changes: 1 addition & 1 deletion doc/pattern/FormStateAndFormFormEvent.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ A integração de `FormState` e `FormEvent` oferece uma maneira organizada e efi

---

Nota: Sinta-se à vontade para adaptar ou expandir este texto conforme necessário para nossa documentação!
Nota: Sinta-se à vontade para adaptar ou expandir este texto conforme necessário para nossa documentação!
60 changes: 30 additions & 30 deletions doc/screens/Screens.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,81 +4,81 @@
- **Fluxo de Navegação**: Transição para a tela de Login.
- **Componentes Principais**: Logo do app e animação.
- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/9d0da331-4b5b-4365-8818-50af5108abc9" width="20.0%">


- **Login:**
- **Descrição**: Tela para autenticação do usuário.
- **Componentes Principais**: Campos de email e senha, botões de login.
- **Diagrama UML:**

![fluxoTelas-login.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/3cae1a55-fe11-42f5-b05b-345c968521d8)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/8f85dcc9-fbad-4c27-8824-794d2d66ab9d" width="20.0%">


- **Cadastro:**
- **Descrição**: Tela para cadastrar uma nova conta.
- **Diagrama UML:**

![fluxoTelas-registro.drawio.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/8ef35f86-7653-45d4-95e4-3f37da3f589f)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/2e6ffd82-4ba8-4696-8eaa-62dfc524fffd" width="20.0%">


- **Esqueceu a senha:**
- **Diagrama UML:**

![fluxoTelas-esqueceu_sua_senha.drawio.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/7f71071b-64d3-4e48-bd24-28e1289cd577g)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/f9c0e94f-7df5-4863-9cb2-e6cc7b31d845" width="20.0%">


- **Aguardando código:**
- **Diagrama UML:**

![fluxoTelas-aguardando_codigo.drawio.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/adf3322a-e755-41d8-908c-33a5d8a86aba)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/24c3a038-e9e8-405f-9dff-37593cd61c00" width="20.0%">


- **Troque a senha:**
- **Diagrama UML:**

![fluxoTelas-troque_sua_senha.drawio.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/84c9e097-405c-4a67-a78c-3d62900b9e16)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/6ecc23a2-fd30-4951-b3cd-9f122db6d9ea" width="20.0%">


- **Ambiente do usuário:**
- **Diagrama UML:**
![Home](https://github.com/PetJournal/petjournal.android/assets/42920754/26a580eb-4d1d-4aac-a1ba-ef8e33652bb5)

![Home](https://github.com/PetJournal/petjournal.android/assets/42920754/26a580eb-4d1d-4aac-a1ba-ef8e33652bb5)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/759ab05a-143f-47e8-a454-1d7dd1dfa7b8" width="20.0%">

- **Tela padrão inicial:**
- **Diagrama UML:**

![IntroNomeGenero](https://github.com/PetJournal/petjournal.android/assets/42920754/13642153-2b67-430f-969e-f129f531df1e)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/007228cd-df7e-41fc-9b46-7016c8862d0b" width="20.0%">

- **Tela padrão espécie:**
- **Diagrama UML:**
- **UX/Design:**
Expand Down
7 changes: 3 additions & 4 deletions doc/screens/aguardando_codigo.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
- **Aguardando código:**
- **Diagrama UML:**

![fluxoTelas-aguardando_codigo.drawio.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/adf3322a-e755-41d8-908c-33a5d8a86aba)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/24c3a038-e9e8-405f-9dff-37593cd61c00" width="20.0%">

6 changes: 3 additions & 3 deletions doc/screens/ambiente_do_usuario.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- **Ambiente do usuário:**
- **Diagrama UML:**
![Home](https://github.com/PetJournal/petjournal.android/assets/42920754/26a580eb-4d1d-4aac-a1ba-ef8e33652bb5)

![Home](https://github.com/PetJournal/petjournal.android/assets/42920754/26a580eb-4d1d-4aac-a1ba-ef8e33652bb5)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/759ab05a-143f-47e8-a454-1d7dd1dfa7b8" width="20.0%">
7 changes: 3 additions & 4 deletions doc/screens/cadastro.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
- **Cadastro:**
- **Descrição**: Tela para cadastrar uma nova conta.
- **Diagrama UML:**

![fluxoTelas-registro.drawio.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/8ef35f86-7653-45d4-95e4-3f37da3f589f)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/2e6ffd82-4ba8-4696-8eaa-62dfc524fffd" width="20.0%">

8 changes: 3 additions & 5 deletions doc/screens/esqueceu_a_senha.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
- **Esqueceu a senha:**
- **Diagrama UML:**

![fluxoTelas-esqueceu_sua_senha.drawio.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/7f71071b-64d3-4e48-bd24-28e1289cd577g)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/f9c0e94f-7df5-4863-9cb2-e6cc7b31d845" width="20.0%">


7 changes: 3 additions & 4 deletions doc/screens/login.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
- **Descrição**: Tela para autenticação do usuário.
- **Componentes Principais**: Campos de email e senha, botões de login.
- **Diagrama UML:**

![fluxoTelas-login.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/3cae1a55-fe11-42f5-b05b-345c968521d8)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/8f85dcc9-fbad-4c27-8824-794d2d66ab9d" width="20.0%">

3 changes: 1 addition & 2 deletions doc/screens/splash_screen.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
- **Fluxo de Navegação**: Transição para a tela de Login.
- **Componentes Principais**: Logo do app e animação.
- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/9d0da331-4b5b-4365-8818-50af5108abc9" width="20.0%">

4 changes: 2 additions & 2 deletions doc/screens/tela_padrao_especie.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- **Tela padrão espécie:**
- **Diagrama UML:**
<img src="https://github.com/PetJournal/petjournal.android/assets/53880840/f861ea8d-a395-4a07-bf46-7a6b50ad392a">

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/53880840/9d5ccea7-d44e-4221-86d8-c017714b9ca9" width="20.0%">
8 changes: 4 additions & 4 deletions doc/screens/tela_padrao_inicial.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- **Tela padrão inicial:**
- **Diagrama UML:**

![IntroNomeGenero](https://github.com/PetJournal/petjournal.android/assets/42920754/13642153-2b67-430f-969e-f129f531df1e)

- **UX/Design:**
<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/007228cd-df7e-41fc-9b46-7016c8862d0b" width="20.0%">

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/007228cd-df7e-41fc-9b46-7016c8862d0b" width="20.0%">
2 changes: 1 addition & 1 deletion doc/screens/tela_padrao_raca_e_porte.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/63371272/ebc57878-12c1-456f-bbf0-debfcaea6b23" width="20.0%">
<img src="https://github.com/PetJournal/petjournal.android/assets/63371272/ebc57878-12c1-456f-bbf0-debfcaea6b23" width="20.0%">
7 changes: 3 additions & 4 deletions doc/screens/troque_a_senha.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
- **Troque a senha:**
- **Diagrama UML:**

![fluxoTelas-troque_sua_senha.drawio.svg](https://github.com/PetJournal/petjournal.android/assets/42920754/84c9e097-405c-4a67-a78c-3d62900b9e16)

- **UX/Design:**

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/6ecc23a2-fd30-4951-b3cd-9f122db6d9ea" width="20.0%">

<img src="https://github.com/PetJournal/petjournal.android/assets/42920754/6ecc23a2-fd30-4951-b3cd-9f122db6d9ea" width="20.0%">
2 changes: 1 addition & 1 deletion petJournal/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ petJournal/.idea/discord.xml
petJournal/.idea/gradle.xml
petJournal/.idea/inspectionProfiles/Project_Default.xml
petJournal/.idea/vcs.xml
/.idea/workspace.xml
/.idea/workspace.xml
16 changes: 16 additions & 0 deletions petJournal/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
- id: mixed-line-ending
- id: trailing-whitespace
- id: end-of-file-fixer

# - repo: local
# hooks:
# - id: ktlint
# name: Ktlint
# entry: cmd /c gradlew.bat ktlintCheck
# language: system
# types: [kotlin]
# pass_filenames: false
2 changes: 1 addition & 1 deletion petJournal/app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/build
/build
Loading
Loading