Compare commits

...

64 Commits

Author SHA1 Message Date
Sylvia van Os
be54c50786 Release Catima 2.34.3 2025-01-15 17:50:02 +01:00
Sylvia van Os
2624924f53 Merge pull request #2295 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2025-01-15 17:47:42 +01:00
Priit Jõerüüt
724552eaa3 Translated using Weblate (Estonian)
Currently translated at 7.6% (11 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/et/
2025-01-15 08:51:45 +01:00
Edgars Andersons
bef0d70d09 Translated using Weblate (Latvian)
Currently translated at 6.2% (9 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/lv/
2025-01-15 08:51:45 +01:00
大王叫我来巡山
d7201f62ab Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
2025-01-15 08:51:45 +01:00
Максим Горпиніч
1f229980b7 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/
2025-01-15 08:51:44 +01:00
solokot
8f08b1989b Translated using Weblate (Russian)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ru/
2025-01-15 08:51:44 +01:00
Kachelkaiser
e3c83c0cb0 Translated using Weblate (German)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
2025-01-15 08:51:44 +01:00
Sylvia van Os
431e380f5e Merge pull request #2294 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2025-01-14 17:15:43 +01:00
josé m
5c7b102e08 Translated using Weblate (Galician)
Currently translated at 10.4% (15 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/gl/
2025-01-14 07:11:44 +01:00
B o d o
6dc1a1b196 Translated using Weblate (German)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
2025-01-14 07:11:44 +01:00
Sylvia van Os
6c01d2ffa9 Merge pull request #2291 from CatimaLoyalty/dependabot/github_actions/actions/upload-artifact-4.6.0
Bump actions/upload-artifact from 4.5.0 to 4.6.0
2025-01-13 18:58:47 +01:00
dependabot[bot]
3156fd6daf Bump actions/upload-artifact from 4.5.0 to 4.6.0
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4.5.0...v4.6.0)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-13 02:20:56 +00:00
Sylvia van Os
6fa4ab3e3b Add Contributor Covenant Code of Conduct 2025-01-12 11:54:15 +01:00
Sylvia van Os
9fa67b59c7 Merge pull request #2290 from CatimaLoyalty/create-pull-request/patch-1736655501
Update contributors
2025-01-12 10:34:20 +01:00
TheLastProject
0935a17fec Update contributors 2025-01-12 04:18:21 +00:00
Sylvia van Os
5fdc575485 Merge pull request #2289 from CatimaLoyalty/hack/espass_as_pkpass
Add unofficial support for espass
2025-01-11 12:50:06 +01:00
Sylvia van Os
d6bbd16945 Add unofficial support for espass
While espass files aren't pkpass files, they are so similar we can
generally parse them fine with the pkpass parser. While this feature
shouldn't be advertised as it is kinda hacky, it does make it easier for
PassAndroid users to share cards with Catima users.
2025-01-11 12:38:03 +01:00
Sylvia van Os
1110f7ee99 Merge pull request #2288 from CatimaLoyalty/create-pull-request/patch-1736595116
Update Fastlane changelogs
2025-01-11 12:32:10 +01:00
TheLastProject
d64860a34e Update Fastlane changelogs 2025-01-11 11:31:56 +00:00
Sylvia van Os
9fb0da6954 Update CHANGELOG 2025-01-11 12:31:43 +01:00
Sylvia van Os
12b0f8806b Merge pull request #2286 from CatimaLoyalty/fix/add_secondary_pkpass_mimetype
Also parse application/vnd-com.apple.pkpass as pkpass files
2025-01-11 12:30:52 +01:00
Sylvia van Os
5c5a1df39d Also parse application/vnd-com.apple.pkpass as pkpass files 2025-01-11 12:19:48 +01:00
Sylvia van Os
5b0ac65fbe Merge pull request #2217 from CatimaLoyalty/dependabot/gradle/androidx.core-core-ktx-1.15.0
Bump androidx.core:core-ktx from 1.13.1 to 1.15.0
2025-01-11 11:40:24 +01:00
dependabot[bot]
e9b542ee6e Bump androidx.core:core-ktx from 1.13.1 to 1.15.0
Bumps androidx.core:core-ktx from 1.13.1 to 1.15.0.

---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-11 10:07:38 +00:00
Sylvia van Os
ae6bf5e8f6 Merge pull request #2285 from CatimaLoyalty/fix/bumpCompileSdk
Bump compile SDK
2025-01-11 11:06:40 +01:00
Sylvia van Os
4dc564ffcf Bump AGP 2025-01-11 10:55:56 +01:00
Sylvia van Os
49a9ef2f80 Bump compile SDK 2025-01-11 10:44:23 +01:00
Sylvia van Os
1907f482eb Merge pull request #2277 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2025-01-10 20:02:52 +01:00
Sylvia van Os
08aad7ce20 Merge pull request #2275 from CatimaLoyalty/dependabot/gradle/com.android.application-8.8.0
Bump com.android.application from 8.7.3 to 8.8.0
2025-01-10 19:28:48 +01:00
josé m
f555a160d5 Translated using Weblate (Galician)
Currently translated at 9.7% (14 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/gl/
2025-01-10 07:31:36 +01:00
Максим Горпиніч
2d9b7f358e Translated using Weblate (Ukrainian)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/
2025-01-10 07:31:36 +01:00
solokot
db396b5f21 Translated using Weblate (Russian)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ru/
2025-01-10 07:31:34 +01:00
B o d o
018d36c3fd Translated using Weblate (German)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
2025-01-10 07:31:31 +01:00
dependabot[bot]
e6621244b8 Bump com.android.application from 8.7.3 to 8.8.0
Bumps com.android.application from 8.7.3 to 8.8.0.

---
updated-dependencies:
- dependency-name: com.android.application
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-10 02:58:19 +00:00
Sylvia van Os
29aef64d97 Merge pull request #2273 from CatimaLoyalty/fix/weblate_conflict_20250109
Fix/weblate conflict 20250109
2025-01-09 18:21:14 +01:00
Edgars Andersons
cbe243feb3 Translated using Weblate (Latvian)
Currently translated at 6.2% (9 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/lv/
2025-01-09 17:29:39 +01:00
Joel A
ff02c59f85 Translated using Weblate (Swedish)
Currently translated at 94.8% (315 of 332 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
2025-01-09 17:29:39 +01:00
大王叫我来巡山
3895bc1f73 Translated using Weblate (Chinese (Simplified Han script))
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
2025-01-09 17:29:39 +01:00
ikanakova
cd0cce532a Translated using Weblate (Czech)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
2025-01-09 17:29:39 +01:00
Максим Горпиніч
3fdf6693d2 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/
2025-01-09 17:29:39 +01:00
solokot
d2be344700 Translated using Weblate (Russian)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ru/
2025-01-09 17:29:39 +01:00
B o d o
9bd2898678 Translated using Weblate (German)
Currently translated at 100.0% (143 of 143 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
2025-01-09 17:29:39 +01:00
Sylvia van Os
07f2348a6d Merge pull request #2270 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2025-01-08 17:29:55 +01:00
Sylvia van Os
ddd1c1a516 Merge pull request #2269 from CatimaLoyalty/create-pull-request/patch-1736289127
Update Fastlane changelogs
2025-01-07 23:32:20 +01:00
TheLastProject
8de76e3c52 Update Fastlane changelogs 2025-01-07 22:32:07 +00:00
Sylvia van Os
6ea2645e9d Update CHANGELOG 2025-01-07 23:31:40 +01:00
Sylvia van Os
ed166b1b33 Merge pull request #2268 from CatimaLoyalty/fix/incorrectSoftInputModes
Ensure save button stays pressable while keyboard is visible in edit screen
2025-01-07 23:29:59 +01:00
Sylvia van Os
2dd53a5300 Ensure save button stays pressable while keyboard is visible in edit screen
Also cleans up some other unnecessary windowSoftInputMode configurations
left over from years ago
2025-01-07 23:12:11 +01:00
ikanakova
97f9120acf Translated using Weblate (Czech)
Currently translated at 100.0% (142 of 142 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
2025-01-07 19:54:10 +01:00
Sylvia van Os
dd29be75f2 Merge pull request #2266 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2025-01-07 19:11:39 +01:00
Sylvia van Os
fa87df2ed8 Merge pull request #2267 from CatimaLoyalty/create-pull-request/patch-1736269587
Update Fastlane changelogs
2025-01-07 18:06:56 +01:00
TheLastProject
1fb94de809 Update Fastlane changelogs 2025-01-07 17:06:26 +00:00
Sylvia van Os
0e18e84c8f Update CHANGELOG 2025-01-07 18:06:11 +01:00
Sylvia van Os
0ba2261033 Merge pull request #2263 from CatimaLoyalty/fix/sdk35
Android 15 (SDK 35) support
2025-01-07 18:05:35 +01:00
ikanakova
703ebf9418 Translated using Weblate (Czech)
Currently translated at 100.0% (142 of 142 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
2025-01-07 18:03:24 +01:00
Sylvia van Os
ff08dbe5d5 Android 15 (SDK 35) support 2025-01-04 15:20:07 +01:00
Sylvia van Os
3003a10550 Merge pull request #2261 from CatimaLoyalty/dependabot/github_actions/peter-evans/create-pull-request-7.0.6
Bump peter-evans/create-pull-request from 7.0.5 to 7.0.6
2024-12-30 11:47:11 +01:00
dependabot[bot]
f95be6cc71 Bump peter-evans/create-pull-request from 7.0.5 to 7.0.6
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7.0.5 to 7.0.6.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v7.0.5...v7.0.6)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-30 02:49:57 +00:00
Sylvia van Os
23bc40e630 Merge pull request #2260 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2024-12-29 12:26:53 +01:00
Jiri Grönroos
45c47674fb Translated using Weblate (Finnish)
Currently translated at 100.0% (332 of 332 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fi/
2024-12-29 11:01:14 +00:00
David
cf1d1a8122 Translated using Weblate (French)
Currently translated at 100.0% (142 of 142 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/fr/
2024-12-29 11:01:13 +00:00
Sylvia van Os
45d2629863 Merge pull request #2259 from CatimaLoyalty/create-pull-request/patch-1735445907
Update contributors
2024-12-29 09:19:29 +01:00
TheLastProject
f6b0736bbf Update contributors 2024-12-29 04:18:27 +00:00
43 changed files with 253 additions and 50 deletions

View File

@@ -68,7 +68,7 @@ jobs:
run: ./gradlew spotbugs${{ matrix.flavor }}Release
- name: Archive test results
if: always()
uses: actions/upload-artifact@v4.5.0
uses: actions/upload-artifact@v4.6.0
with:
name: test-results-flavor${{ matrix.flavor }}
path: app/build/reports

View File

@@ -35,7 +35,7 @@ jobs:
- name: Run converter script
run: python .scripts/changelog_to_fastlane.py
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7.0.5
uses: peter-evans/create-pull-request@v7.0.6
with:
title: "Update Fastlane changelogs"
commit-message: "Update Fastlane changelogs"

View File

@@ -33,7 +33,7 @@ jobs:
file_in_repo: app/src/main/res/raw/contributors.txt
min_commit_count: 5
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7.0.5
uses: peter-evans/create-pull-request@v7.0.6
with:
title: "Update contributors"
commit-message: "Update contributors"

View File

@@ -39,7 +39,7 @@ jobs:
- name: Generate featureGraphic.png for each language
run: .scripts/generate_feature_graphic/generate_feature_graphic.sh
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7.0.5
uses: peter-evans/create-pull-request@v7.0.6
with:
title: "Update feature graphic"
commit-message: "Update feature graphic"

View File

@@ -26,7 +26,7 @@ jobs:
id: gradle-update
- uses: gradle/actions/wrapper-validation@v4
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7.0.5
uses: peter-evans/create-pull-request@v7.0.6
with:
title: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
commit-message: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"

View File

@@ -31,7 +31,7 @@ jobs:
- name: Update locales
run: .scripts/locales.py
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7.0.5
uses: peter-evans/create-pull-request@v7.0.6
with:
title: "Update locales"
commit-message: "Update locales"

View File

@@ -1,5 +1,11 @@
# Changelog
## v2.34.3 - 145 (2025-01-15)
- Target Android 15
- Fix keyboard covering save button in edit screen
- Fix some pkpass files not being detected as pkpass (application/vnd-com.apple.pkpass mime type support)
## v2.34.2 - 144 (2024-12-26)
- Improve archive/starred icon display

128
CODE_OF_CONDUCT.md Normal file
View File

@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct
## Our Pledge
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.
We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.
## Our Standards
Examples of behavior that contributes to a positive environment for our
community include:
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community
Examples of unacceptable behavior include:
* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Enforcement Responsibilities
Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.
Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.
## Scope
This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
catima.g9ex3@hackerchick.me.
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
reporter of any incident.
## Enforcement Guidelines
Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:
### 1. Correction
**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.
**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.
### 2. Warning
**Community Impact**: A violation through a single incident or series
of actions.
**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.
### 3. Temporary Ban
**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.
**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.
### 4. Permanent Ban
**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.
**Consequence**: A permanent ban from any sort of public interaction within
the community.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).
[homepage]: https://www.contributor-covenant.org
For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.

View File

@@ -16,14 +16,14 @@ spotbugs {
android {
namespace = "protect.card_locker"
compileSdk = 34
compileSdk = 35
defaultConfig {
applicationId = "me.hackerchick.catima"
minSdk = 21
targetSdk = 34
versionCode = 144
versionName = "2.34.2"
targetSdk = 35
versionCode = 145
versionName = "2.34.3"
vectorDrawables.useSupportLibrary = true
multiDexEnabled = true
@@ -112,7 +112,7 @@ dependencies {
// AndroidX
implementation("androidx.appcompat:appcompat:1.7.0")
implementation("androidx.constraintlayout:constraintlayout:2.2.0")
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.exifinterface:exifinterface:1.3.7")
implementation("androidx.palette:palette:1.0.0")

View File

@@ -49,6 +49,8 @@
<data android:mimeType="image/*" />
<data android:mimeType="application/pdf" />
<data android:mimeType="application/vnd.apple.pkpass" />
<data android:mimeType="application/vnd-com.apple.pkpass" />
<data android:mimeType="application/vnd.espass-espass" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
@@ -58,6 +60,8 @@
<data android:mimeType="image/*" />
<data android:mimeType="application/pdf" />
<data android:mimeType="application/vnd.apple.pkpass" />
<data android:mimeType="application/vnd-com.apple.pkpass" />
<data android:mimeType="application/vnd.espass-espass" />
</intent-filter>
</activity>
<activity
@@ -75,13 +79,12 @@
<activity
android:name=".LoyaltyCardViewActivity"
android:exported="true"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="stateHidden" />
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".LoyaltyCardEditActivity"
android:exported="true"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="stateHidden">
android:windowSoftInputMode="adjustResize">
<intent-filter
android:autoVerify="true"
android:label="@string/app_name">
@@ -119,8 +122,7 @@
<activity
android:name=".BarcodeSelectorActivity"
android:label="@string/selectBarcodeTitle"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="stateHidden" />
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".preferences.SettingsActivity"
android:label="@string/settings"

View File

@@ -500,7 +500,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
parseResultList = Utils.retrieveBarcodesFromImage(this, data);
} else if (receivedType.equals("application/pdf")) {
parseResultList = Utils.retrieveBarcodesFromPdf(this, data);
} else if (receivedType.equals("application/vnd.apple.pkpass")) {
} else if (Arrays.asList("application/vnd.apple.pkpass", "application/vnd-com.apple.pkpass").contains(receivedType)) {
parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
} else if (receivedType.equals("application/vnd.espass-espass")) {
// FIXME: espass is not pkpass
// However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
// So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
} else {
Log.e(TAG, "Wrong mime-type");

View File

@@ -4,7 +4,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_height="fill_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="fill_parent"

View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"

View File

@@ -8,7 +8,8 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
@@ -25,7 +26,8 @@
android:layout_marginBottom="100dp"
android:orientation="vertical"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp">
android:layout_marginEnd="0dp"
android:fitsSystemWindows="true">
<LinearLayout
android:id="@+id/icon_container"
@@ -147,7 +149,8 @@
android:id="@+id/fullscreen_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:fitsSystemWindows="false">
<ImageView
android:importantForAccessibility="no"
@@ -206,13 +209,13 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary"
app:contentInsetLeft="0dp"
app:contentInsetStart="0dp"
app:contentInsetRight="0dp"
app:contentInsetEnd="0dp"
app:fabAlignmentMode="center">
app:fabAlignmentMode="center"
app:fabCradleVerticalOffset="2dp"
android:fitsSystemWindows="true">
<LinearLayout
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutDirection="ltr">

View File

@@ -5,6 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ScanActivity">
<com.google.android.material.appbar.AppBarLayout

View File

@@ -16,46 +16,46 @@ Altonss
Michael Moroni
Eric
GM
laralem
Petr Novák
laralem
Joel A
Taco
pfaffenrodt
Максим Горпиніч
Aayush Gupta
B o d o
Scrambled777
Priit Jõerüüt
Максим Горпиніч
B o d o
Giovanni Donisi
HudobniVolk
Nyatsuki
Jiri Grönroos
ikanakova
Samantaz Fox
Balázs Meskó
Milo Ivir
Arno-github
Ankit Tiwari
Sergio Paredes
Cliff Heraldo
Sergio Paredes
Jose Delvani
mdvhimself
Milan Šalka
ikanakova
josé m
huuhaa
Skrripy
Edgars Andersons
Kachelkaiser
Projjal Moitra
Quentin PAGÈS
josé m
ngocanhtve
Silvério Santos
waffshappen
Marnick L'Eau
Robin
Ziad OUALHADJ
Robin Liu
Denis Shilin
Edgars Andersons
Robin Liu
Renko
しいたけ
Alexander Ivanov
@@ -66,12 +66,13 @@ stavpup
ehrt74
Virginie
Vasilis
MisterCosta96
arshbeerSingh
Augustin LAVILLE
Freddo espresso
Govind S Nair
Kim Seohyun
Tim Trek
rudy3
Peter Dave Hello
Michael Gangolf
rudy3
Kim Seohyun
Govind S Nair
Freddo espresso
Augustin LAVILLE
arshbeerSingh
MisterCosta96

View File

@@ -305,4 +305,7 @@
<string name="settings_column_count_4">4</string>
<string name="settings_column_count_5">5</string>
<string name="settings_column_count_7">7</string>
<string name="addFromPkpass">Valitse Passbook-tiedosto (.pkpass)</string>
<string name="unsupportedFile">Tämä tiedosto ei ole tuettu</string>
<string name="generic_error_please_retry">Pahoittelut, jokin meni pieleen. Yritä uudelleen...</string>
</resources>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
<string name="settings_display_barcode_max_brightness">Gör streckkodsvyn ljusare</string>
<string name="settings_display_barcode_max_brightness">Gör skärmen ljusare</string>
<string name="settings_keep_screen_on">Håll skärmen påslagen</string>
<string name="importFidmeMessage">Välj den exporterade <i>fidme-export-request-xxxxxx.zip</i> från FidMe som du vill importera och välj streckkodstyper manuellt efteråt.
\nSkapa den från din FidMe-profil först genom att välja \"Data Protection\" och sen trycka på \"Extract my data\".</string>

View File

@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.7.3" apply false
id("com.android.application") version "8.8.0" apply false
id("com.github.spotbugs") version "5.1.4" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
}

View File

@@ -0,0 +1 @@
- Zlepšení zobrazení ikon archivu/hvězdiček

View File

@@ -0,0 +1 @@
- Cíl Android 15

View File

@@ -0,0 +1,3 @@
- Ziel Android 15
- Die Tastatur verdeckt jetzt nicht mehr den "Speichern"-Button im Bearbeitungsbildschirm
- Einige pkpass-Dateien wurden nicht als pkpass erkannt (Unterstützung des Mime-Typs application/vnd-com.apple.pkpass)

View File

@@ -0,0 +1,3 @@
- Target Android 15
- Fix keyboard covering save button in edit screen
- Fix some pkpass files not being detected as pkpass (application/vnd-com.apple.pkpass mime type support)

View File

@@ -0,0 +1,3 @@
- Lisasime võimaluse liikuda kaartide vahel helivaljuse nuppudega
- Parandasime Stocardi impordi vead
- Parandasime "Import on katkestatud" vea peale õnnestunud importi

View File

@@ -0,0 +1 @@
- Parandasime arhiveeritud/lemmik ikoonide kuvamise

View File

@@ -0,0 +1,3 @@
- Alusplatvorm on nüüd Android 15
- Parandasime olukorra, kus klahvistik kattis muutmisvaates salvestusnupu
- Parandasime olukorra, kus mõned pkpass failid jäid tuvastamata (application/vnd-com.apple.pkpass mime-tüüpi tugi)

View File

@@ -0,0 +1 @@
- Parandasime erinevad TalkBacki vead

View File

@@ -0,0 +1 @@
- Võtsime kasutusele Material You kujunduskeele

View File

@@ -0,0 +1 @@
- Corriger le retour à la ligne sur la fenêtre d'ajout

View File

@@ -0,0 +1 @@
- Améliorer l'affichage des icônes d'archive/étoile

View File

@@ -0,0 +1 @@
- mellora da aparencia da icona arquivar/estrela

View File

@@ -0,0 +1,3 @@
- versión obxectivo Android 15
- solución a teclado que tapa o botón gardar na pantalla de edición
- solución a que non detectaba algúns ficheiros .pkpass como tales (compatibilidade co tipo mime application/vnd-com.apple.pkpass)

View File

@@ -0,0 +1,4 @@
- mellora na xestión dos grupos
- pódense recortar as imaxes
- solución da perda de datos da imaxe ao gardar despois de rotar na edición
- pódese poñer unha imaxe persoal como icona da tarxeta

View File

@@ -0,0 +1,2 @@
- nova disposición da pantalla principal
- arranxo do tamaño da parte inferior cando se entraba e saía de pantalla completa

View File

@@ -0,0 +1,2 @@
- Engadir Catima a Quick Access Device Controls (https://developer.android.com/guide/topics/ui/device-control)
- Arranxo de algúns grupos que non se mostran correctamente na pantalla de xestión dos grupos

View File

@@ -0,0 +1,3 @@
- arranxo da borrosidade nas iconas de letras na pantalla principal
- arranxo da desaparición puntual de iconas despois da selección
- arranxo das iconas na barra de estado non visibles en Android 5

View File

@@ -0,0 +1 @@
- solución ao problema na tarxeta compartir

View File

@@ -0,0 +1,2 @@
- engadida compatibilidade con CODE 93
- arranxos menores e melloras

View File

@@ -0,0 +1,4 @@
- solución a crear múltiples entradas a premer varias veces o botón gardar
- menor tamaño da cabeceira das tarxetas en ocultar detalles para que se vexan aínda máis tarxetas
- reorganización da pantalla de edición
- mellora do contraste da icona da estrela na pantalla principal

View File

@@ -0,0 +1,3 @@
- Android 15 atbalsts
- Labošanas ekrānā novērsta saglabāšanas pogas aizsegšana ar tastatūru
- Novērsta atsevišķu pkpass datņu neatpazīšana kā pkpass (application/vnd-com.apple.pkpass MIME veida atbalsts)

View File

@@ -0,0 +1,3 @@
- Ориентация на Android 15
- Исправлено перекрывание клавиатурой кнопки сохранения на экране редактирования
- Исправлено нераспознавание некоторых файлов pkpass (поддержка mime-типа application/vnd-com.apple.pkpass)

View File

@@ -0,0 +1,3 @@
- Цільова версія Android 15
— Виправлено клавіатуру, яка закриває кнопку збереження на екрані редагування
— Виправлено деякі файли pkpass, які не виявлялися як pkpass (підтримка типу mime у додатку/vnd-com.apple.pkpass)

View File

@@ -0,0 +1,3 @@
- 以 Android 15API 级别35为目标平台
- 修复编辑屏中键盘遮住保存按钮的问题
- 修复一些 pkpass 文件未被检测未pkpass 的问题 application/vnd-com.apple.pkpass mime 类型支持)