Skip to content

Commit

Permalink
Merge pull request #34 from OutSystems/development
Browse files Browse the repository at this point in the history
RMET-3379 - Prepare to release version `1.1.3`
  • Loading branch information
alexgerardojacinto authored Aug 27, 2024
2 parents 7379b57 + 27511c9 commit d19b4c0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

The changes documented here do not include those from the original repository.

## [1.1.3]

### 22-08-2024
- Fix: Avoid UI bug on background when layout is portrait (https://outsystemsrd.atlassian.net/browse/RMET-3379).

## [1.1.2]

### 21-05-2024
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
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.1.2</version>
<version>1.1.3</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,13 @@ class OSBARCScannerActivity : ComponentActivity() {
verticalArrangement = Arrangement.Center
) {

Box(
modifier = Modifier
.fillMaxWidth()
.weight(1f, fill = true)
.background(ScannerBackgroundBlack)
)

ScanInstructions(
modifier = Modifier
.fillMaxWidth(),
Expand Down Expand Up @@ -764,7 +771,7 @@ class OSBARCScannerActivity : ComponentActivity() {
*/
@Composable
fun ScanInstructions(modifier: Modifier, parameters: OSBARCScanParameters) {
if (!parameters.scanInstructions.isNullOrEmpty()) {
if (!parameters.scanInstructions.isNullOrBlank()) {
Box(
modifier = Modifier
.background(ScannerBackgroundBlack)
Expand Down

0 comments on commit d19b4c0

Please sign in to comment.