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.

Sign up for GitHub

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

Merge development into main #23

Merged
merged 32 commits into from
Mar 28, 2024
Merged

Merge development into main #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4db2248
chore: Update GitHub Actions
OS-ricardomoreirasilva Feb 22, 2024
4132c64
Merge pull request #18 from OutSystems/fix/RMET-2568/update-github-ac…
OS-ricardomoreirasilva Feb 23, 2024
ee7871c
feat: first version of zoom buttons
alexgerardojacinto Mar 25, 2024
1d4f627
feat: add round buttons and round background for zoom options
alexgerardojacinto Mar 25, 2024
0a1b419
feat: finish UI for zoom buttons
alexgerardojacinto Mar 26, 2024
c9669d2
refactor: multiple refactors on zoom buttons
alexgerardojacinto Mar 26, 2024
411a41b
feat: check if 2x zoom is available before drawing button
alexgerardojacinto Mar 26, 2024
c78c2d8
feat: use new close button
alexgerardojacinto Mar 26, 2024
975b962
fix: include correct R class
alexgerardojacinto Mar 26, 2024
cfaacef
refactor: remove extra lines
alexgerardojacinto Mar 26, 2024
e36ef54
refactor: remove unnecessary comma
alexgerardojacinto Mar 26, 2024
558e63c
refactor: remove extra lines
alexgerardojacinto Mar 26, 2024
f8b039f
chore: raise lib version to 1.0.0.1
alexgerardojacinto Mar 26, 2024
73b6e95
refactor: remove extra space
alexgerardojacinto Mar 26, 2024
bf7df32
refactor: fix function parameters
alexgerardojacinto Mar 26, 2024
54ce8f6
chore: raise lib version to 1.0.0.2
alexgerardojacinto Mar 26, 2024
9475972
feat: use new close button
alexgerardojacinto Mar 26, 2024
b486f87
chore: raise lib version to 1.0.0.3
alexgerardojacinto Mar 26, 2024
c5abed2
fix: only show 1x button if there are more buttons
alexgerardojacinto Mar 26, 2024
1a9ec26
refactor: remove nested if's
alexgerardojacinto Mar 26, 2024
fa064b6
chore: raise lib version to 1.0.0.5
alexgerardojacinto Mar 26, 2024
7bc8922
chore: update changelog
alexgerardojacinto Mar 26, 2024
66c3adb
refactor: remove unnecessary padding
alexgerardojacinto Mar 26, 2024
0f4e818
refactor: fix method's docs
alexgerardojacinto Mar 26, 2024
8d77f6d
Merge pull request #20 from OutSystems/feat/RMET-2987/add-zoom
alexgerardojacinto Mar 27, 2024
dbcf3fa
refactor: change close button color
alexgerardojacinto Mar 27, 2024
e3a9897
Merge pull request #21 from OutSystems/feat/RMET-2987/add-zoom
alexgerardojacinto Mar 27, 2024
bf46488
Merge branch 'main' into development
OS-ricardomoreirasilva Mar 28, 2024
ceb1846
chore: Ignore Gemfile.lock
OS-ricardomoreirasilva Mar 28, 2024
246188c
chore: Move `LICENSE` to root
OS-ricardomoreirasilva Mar 28, 2024
8a595c4
chore: Remove unused files
OS-ricardomoreirasilva Mar 28, 2024
e21bb03
Merge pull request #22 from OutSystems/chore/fix-snyk-vulnerabilities
OS-ricardomoreirasilva Mar 28, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/github_actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
Expand All @@ -32,7 +32,7 @@ jobs:
run: bundle exec fastlane coverage

- name: Setup sonarqube
uses: warchant/setup-sonar-scanner@v7
uses: warchant/setup-sonar-scanner@v8

- name: Send to Sonarcloud
run: bundle exec fastlane sonarqube
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,4 @@ lint/tmp/
# lint/reports/

.DS_Store
Gemfile.lock
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ The changes documented here do not include those from the original repository.

## [Unreleased]

### 26-03-2024
- Add zoom options (https://outsystemsrd.atlassian.net/browse/RMET-2987).

### 22-02-2024
- Update `github_actions.yml` file steps versions (https://outsystemsrd.atlassian.net/browse/RMET-2568).

## [1.0.0]

### 09-01-2024
Expand Down
218 changes: 0 additions & 218 deletions Gemfile.lock
View file
Open in desktop

This file was deleted.

0 docs/LICENSE → LICENSE
View file
Open in desktop
File renamed without changes.
Binary file removed docs/assets/createRepositoryButton.png
View file
Open in desktop
Binary file not shown.
Binary file removed docs/assets/repositoryNameExample.png
View file
Open in desktop
Binary file not shown.
Binary file removed docs/assets/useThisTemplateButton.png
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.outsystems</groupId>
<artifactId>osbarcode-android</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
</project>
Loading