Skip to content

Commit

Permalink
Merge branch 'master' into test-shards
Browse files Browse the repository at this point in the history
  • Loading branch information
CrisTofani authored Dec 18, 2024
2 parents ef3a9ae + c959d6a commit 80ef3f0
Show file tree
Hide file tree
Showing 49 changed files with 764 additions and 154 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.80.0-rc.4](https://github.com/pagopa/io-app/compare/2.80.0-rc.3...2.80.0-rc.4) (2024-12-18)


### Bug Fixes

* ffi version mismatch on linux environment ([#6563](https://github.com/pagopa/io-app/issues/6563)) ([082241e](https://github.com/pagopa/io-app/commit/082241eec664fb751b5bc7b8289469326b663167))

## [2.80.0-rc.3](https://github.com/pagopa/io-app/compare/2.80.0-rc.2...2.80.0-rc.3) (2024-12-17)


### Chores

* **IT Wallet:** [[SIW-1927](https://pagopa.atlassian.net/browse/SIW-1927)] Add pull-to-refresh to the wallet screen ([#6556](https://github.com/pagopa/io-app/issues/6556)) ([31f4df0](https://github.com/pagopa/io-app/commit/31f4df055509beab9b05de1ad6f55caa0a8eabc6))

## [2.80.0-rc.2](https://github.com/pagopa/io-app/compare/2.80.0-rc.1...2.80.0-rc.2) (2024-12-17)


Expand Down
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ ruby '>=2.6.10'
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem "fastlane", "~> 2.223.1"

# fixes an issue on linux env for android release
# see https://github.com/ffi/ffi/issues/1103#issuecomment-2186974923
gem "ffi", "< 1.17.0"
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
ffi (1.17.0)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
Expand Down Expand Up @@ -292,6 +292,7 @@ DEPENDENCIES
activesupport (>= 6.1.7.5, != 7.1.0)
cocoapods (>= 1.13, != 1.15.0, != 1.15.1)
fastlane (~> 2.223.1)
ffi (< 1.17.0)

RUBY VERSION
ruby 2.7.7p221
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ android {
applicationId "it.pagopa.io.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 100154897
versionName "2.80.0.2"
versionCode 100154899
versionName "2.80.0.4"
multiDexEnabled true
// The resConfigs attribute will remove all not required localized resources while building the application,
// including the localized resources from libraries.
Expand Down
Binary file added android/app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions android/app/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<group android:scaleX="0.65"
android:scaleY="0.65"
android:translateX="179.2"
android:translateY="179.2">
<group>
<clip-path
android:pathData="M0,0h1024v1024h-1024z"/>
<path
android:pathData="M303,265.5C335.3,265.5 361.5,291.7 361.5,324C361.5,356.3 335.3,382.5 303,382.5C270.7,382.5 244.5,356.3 244.5,324C244.5,291.7 270.7,265.5 303,265.5Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M794.5,546.3C794.5,649.7 710.7,733.5 616.2,733.5C503.9,733.5 420,649.7 420,546.3C420,442.9 503.9,359.1 616.2,359.1C710.7,359.1 794.5,442.9 794.5,546.3ZM653.3,526.7H678.2V502.1H653.4V472.5H626.4V571.1C626.4,586.7 628.5,597.4 633,603.1C637.3,609 645.5,611.8 657.7,611.8C662.4,611.8 669.4,610.7 678.4,608.6L677.1,585.8L661.7,586.2C659,586.2 657,585.6 655.8,584.3C654.5,582.9 653.8,581.4 653.6,579.7C653.4,577.8 653.3,575 653.3,570.6V526.7ZM571.7,502.3V609.4H598.7V502.3H571.7ZM531,499.7C535.8,499.7 539.8,501.3 542.9,504.4C546,507.6 547.4,511.5 547.4,516.3C547.4,521.1 546,524.8 542.9,528C539.9,530.8 536.1,532.4 531.2,532.4C526.5,532.4 522.5,530.8 519.4,527.6C516.3,524.5 514.6,520.6 514.6,516C514.6,511.3 516.3,507.5 519.2,504.3C522.3,501.1 526.3,499.7 531,499.7Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M349.8,487.8C349.8,461.9 328.9,441 303,441C277.2,441 256.2,461.9 256.2,487.8V686.7C256.2,712.6 277.2,733.5 303,733.5C328.9,733.5 349.8,712.6 349.8,686.7V487.8Z"
android:fillColor="#ffffff"/>
</group>
</group>
</vector>
20 changes: 20 additions & 0 deletions android/app/src/main/res/drawable/io_app_icon_foreground.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="1024dp"
android:height="1024dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<group>
<clip-path
android:pathData="M0,0h1024v1024h-1024z"/>
<path
android:pathData="M303,265.5C335.3,265.5 361.5,291.7 361.5,324C361.5,356.3 335.3,382.5 303,382.5C270.7,382.5 244.5,356.3 244.5,324C244.5,291.7 270.7,265.5 303,265.5Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M794.5,546.3C794.5,649.7 710.7,733.5 616.2,733.5C503.9,733.5 420,649.7 420,546.3C420,442.9 503.9,359.1 616.2,359.1C710.7,359.1 794.5,442.9 794.5,546.3ZM653.3,526.7H678.2V502.1H653.4V472.5H626.4V571.1C626.4,586.7 628.5,597.4 633,603.1C637.3,609 645.5,611.8 657.7,611.8C662.4,611.8 669.4,610.7 678.4,608.6L677.1,585.8L661.7,586.2C659,586.2 657,585.6 655.8,584.3C654.5,582.9 653.8,581.4 653.6,579.7C653.4,577.8 653.3,575 653.3,570.6V526.7ZM571.7,502.3V609.4H598.7V502.3H571.7ZM531,499.7C535.8,499.7 539.8,501.3 542.9,504.4C546,507.6 547.4,511.5 547.4,516.3C547.4,521.1 546,524.8 542.9,528C539.9,530.8 536.1,532.4 531.2,532.4C526.5,532.4 522.5,530.8 519.4,527.6C516.3,524.5 514.6,520.6 514.6,516C514.6,511.3 516.3,507.5 519.2,504.3C522.3,501.1 526.3,499.7 531,499.7Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M349.8,487.8C349.8,461.9 328.9,441 303,441C277.2,441 256.2,461.9 256.2,487.8V686.7C256.2,712.6 277.2,733.5 303,733.5C328.9,733.5 349.8,712.6 349.8,686.7V487.8Z"
android:fillColor="#ffffff"/>
</group>
</vector>
6 changes: 6 additions & 0 deletions android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
Binary file removed android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions android/app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#0B3EE3</color>
</resources>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ios/ItaliaApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@
CODE_SIGN_ENTITLEMENTS = ItaliaApp/ItaliaApp.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = M2X5YQ4BJ7;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -831,7 +831,7 @@
CODE_SIGN_ENTITLEMENTS = ItaliaApp/ItaliaApp.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = M2X5YQ4BJ7;
ENABLE_BITCODE = NO;
Expand Down
2 changes: 1 addition & 1 deletion ios/ItaliaApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>2</string>
<string>4</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ItaliaAppTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2</string>
<string>4</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "italia-app",
"version": "2.80.0-rc.2",
"version": "2.80.0-rc.4",
"private": true,
"scripts": {
"start": "react-native start",
Expand Down
2 changes: 1 addition & 1 deletion publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ releaseDate: "2024-11-21"
url: "https://github.com/pagopa/io-app"
applicationSuite: IO
landingURL: "https://io.italia.it/"
softwareVersion: 2.80.0-rc.2
softwareVersion: 2.80.0-rc.4
developmentStatus: beta
softwareType: standalone/mobile
roadmap: "https://io.italia.it/"
Expand Down
7 changes: 6 additions & 1 deletion ts/components/ui/IOScrollView.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable sonarjs/cognitive-complexity */
/* eslint-disable functional/immutable-data */
import {
ButtonLink,
Expand Down Expand Up @@ -292,7 +293,11 @@ export const IOScrollView = ({
testID={testID}
onScroll={handleScroll}
scrollEventThrottle={8}
snapToOffsets={[0, snapOffset || 0]}
snapToOffsets={
// If there is a refresh control, don't snap to offsets
// This is a react-native bug: https://github.com/facebook/react-native/issues/27324
RefreshControlComponent ? undefined : [0, snapOffset || 0]
}
snapToEnd={false}
decelerationRate="normal"
refreshControl={RefreshControlComponent}
Expand Down
Loading

0 comments on commit 80ef3f0

Please sign in to comment.