mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-04 23:53:51 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,133 Commits 40 Branches 158 Tags
182e7ef9a6b654f5f0d9b37df9ecc3a340318c8a
Commit Graph

5133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
182e7ef9a6 Merge pull request #1897 from CatimaLoyalty/fix/threadedImportExport 
Run Import/Export on non-UI thread
 2024-05-22 18:15:54 +02:00
Sylvia van Os
08e6600880 Lower severity of import/export starting log entries to debug 
Co-authored-by: FC (Fay) Stegerman <flx@obfusk.net>
 2024-05-22 18:08:37 +02:00
Sylvia van Os
edeb95aee0 Run Import/Export on non-UI thread 
This seems to fix Android sometimes throwing
NetworkOnMainThreadException when importing bit files through the
Nextcloud app.

I'm not sure if this is necessary for the export too, but it doesn't
seem to break anything so for consistency it makes sense to also wrap
the exporter into a thread.

This change is suboptimal because it will still block the UI with a
ProgressDialog (which is deprecated) and force the user to wait until
the import/export completes (and will kill the import/export if the app
gets backgrounded) but it should at least fix the most common crash for
most users.
 2024-05-21 21:04:25 +02:00
Sylvia van Os
4b1d1f4541 Merge pull request #1896 from CatimaLoyalty/dependabot/gradle/com.android.application-8.4.1 
Bump com.android.application from 8.4.0 to 8.4.1
 2024-05-21 08:25:15 +02:00
dependabot[bot]
801d3fa8cd --- 
updated-dependencies:
- dependency-name: com.android.application
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-21 02:19:26 +00:00
Sylvia van Os
d15a46fc6f Fix typo 2024-05-20 20:04:01 +02:00
Sylvia van Os
7f46a267b6 Merge pull request #1895 from CatimaLoyalty/create-pull-request/patch-1716220734 
Update Fastlane changelogs
 2024-05-20 18:12:04 +02:00
TheLastProject
195cb8d5ee Update Fastlane changelogs 2024-05-20 15:58:53 +00:00
Sylvia van Os
7454a965bc Update CHANGELOG 2024-05-20 17:58:40 +02:00
Sylvia van Os
9ef988c259 Merge pull request #1894 from CatimaLoyalty/feature/showImageTypeInCardIdVield 
Show image type on view screen when not viewing barcode
 2024-05-20 17:54:09 +02:00
Sylvia van Os
7a2ff0995f Show image type on view screen when not viewing barcode 2024-05-20 17:47:19 +02:00
Sylvia van Os
9b65d3926b Merge pull request #1893 from CatimaLoyalty/create-pull-request/patch-1716210906 
Update Fastlane changelogs
 2024-05-20 15:20:35 +02:00
TheLastProject
06b3536079 Update Fastlane changelogs 2024-05-20 13:15:06 +00:00
Sylvia van Os
315396fd42 Merge pull request #1892 from CatimaLoyalty/feature/1860 
Support for creating a card from shared text
 2024-05-20 15:14:53 +02:00
Sylvia van Os
b90c43f667 Support for creating a card from shared text 2024-05-20 14:53:10 +02:00
Aglag257
6d97a29e9c Fix describeContents() in LoyaltyCard Class (#1887) 2024-05-20 13:19:13 +02:00
Sylvia van Os
7f0e2acab9 Merge pull request #1891 from CatimaLoyalty/dependabot/gradle/org.robolectric-robolectric-4.12.2 
Bump org.robolectric:robolectric from 4.12.1 to 4.12.2
 2024-05-20 11:52:00 +02:00
Sylvia van Os
be35886c92 Merge pull request #1890 from CatimaLoyalty/dependabot/github_actions/actions/checkout-4.1.6 
Bump actions/checkout from 4.1.5 to 4.1.6
 2024-05-20 11:51:23 +02:00
dependabot[bot]
73ad9c5365 Bump org.robolectric:robolectric from 4.12.1 to 4.12.2 
Bumps [org.robolectric:robolectric](https://github.com/robolectric/robolectric) from 4.12.1 to 4.12.2.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.12.1...robolectric-4.12.2)

---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-20 02:34:37 +00:00
dependabot[bot]
818751ffad Bump actions/checkout from 4.1.5 to 4.1.6 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.5 to 4.1.6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.5...v4.1.6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-20 02:12:05 +00:00
Sylvia van Os
d5856e7974 Release Catima 2.29.1 v2.29.1 2024-05-19 10:53:43 +02:00
Sylvia van Os
2caf3d42f4 Update fastlane 2024-05-18 10:18:33 +02:00
Sylvia van Os
e766743baa Merge pull request #1885 from CatimaLoyalty/fix/properSeparatorFix 
Properly fix decimal separator detection logic
 2024-05-14 17:06:20 +02:00
Sylvia van Os
facb23f0a5 Properly fix decimal separator detection logic 2024-05-13 21:17:13 +02:00
Sylvia van Os
a2dff0e6bf Merge pull request #1884 from CatimaLoyalty/dependabot/github_actions/actions/checkout-4.1.5 
Bump actions/checkout from 4.1.4 to 4.1.5
 2024-05-13 18:42:40 +02:00
dependabot[bot]
60c53ec1d1 Bump actions/checkout from 4.1.4 to 4.1.5 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.4...v4.1.5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-13 02:55:49 +00:00
Sylvia van Os
e3c903f773 Merge pull request #1883 from CatimaLoyalty/create-pull-request/patch-1715516406 
Update Fastlane changelogs
 2024-05-12 15:05:00 +02:00
TheLastProject
955764aa18 Update Fastlane changelogs 2024-05-12 12:20:06 +00:00
Sylvia van Os
ed22aa844f Document balance handling improvements 2024-05-12 14:19:36 +02:00
Sylvia van Os
6b8fc50021 Merge pull request #1878 from CatimaLoyalty/feature/acceptBothSeparators 
Disable currency grouping and accept thousand separator as decimal separator
 2024-05-12 14:17:58 +02:00
Sylvia van Os
1aed5c36b1 Merge pull request #1882 from CatimaLoyalty/create-pull-request/patch-1715487330 
Update contributors
 2024-05-12 10:33:39 +02:00
TheLastProject
4690f53be7 Update contributors 2024-05-12 04:15:30 +00:00
Sylvia van Os
29a22926aa Merge pull request #1879 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2024-05-10 23:31:27 +02:00
ΣΤΑΥΡΟΣ ΔΑΛΙΑΚΟΠΟΥΛΟΣ
a4da8144c3 Translated using Weblate (Greek) 
Currently translated at 100.0% (312 of 312 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/el/
 2024-05-10 23:24:06 +02:00
Sylvia van Os
84bfa304c4 Disable currency grouping and accept thousand separator as decimal separator 2024-05-10 20:01:39 +02:00
Sylvia van Os
72749015dd Merge pull request #1877 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2024-05-09 21:57:52 +02:00
ΣΤΑΥΡΟΣ ΔΑΛΙΑΚΟΠΟΥΛΟΣ
ae5d656a64 Translated using Weblate (Greek) 
Currently translated at 100.0% (1 of 1 strings)

Translation: Catima/Android (Debug)
Translate-URL: https://hosted.weblate.org/projects/catima/android-debug/el/
 2024-05-07 16:07:57 +02:00
ΣΤΑΥΡΟΣ ΔΑΛΙΑΚΟΠΟΥΛΟΣ
d8f2cde9de Translated using Weblate (Greek) 
Currently translated at 100.0% (312 of 312 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/el/
 2024-05-07 16:07:57 +02:00
Sylvia van Os
935a4ae46e Merge pull request #1874 from CatimaLoyalty/create-pull-request/patch-1714882546 
Update contributors
 2024-05-05 10:37:59 +02:00
TheLastProject
ffecec9cba Update contributors 2024-05-05 04:15:45 +00:00
Sylvia van Os
734845eff0 Merge pull request #1871 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2024-05-03 17:03:36 +02:00
Sébastien Delord
bd6b18eea2 Translated using Weblate (French) 
Currently translated at 98.4% (130 of 132 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/fr/
 2024-05-03 09:43:43 +02:00
Sylvia van Os
6473bfe84e Merge pull request #1868 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2024-05-03 08:26:25 +02:00
Sylvia van Os
66fff2d3d9 Merge pull request #1870 from CatimaLoyalty/dependabot/gradle/com.google.android.material-material-1.12.0 
Bump com.google.android.material:material from 1.11.0 to 1.12.0
 2024-05-03 08:20:50 +02:00
dependabot[bot]
ef1b470f0a Bump com.google.android.material:material from 1.11.0 to 1.12.0 
Bumps [com.google.android.material:material](https://github.com/material-components/material-components-android) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.11.0...1.12.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-03 02:49:31 +00:00
Milo Ivir
b087d49530 Translated using Weblate (Croatian) 
Currently translated at 100.0% (312 of 312 strings)

Co-authored-by: Milo Ivir <mail@milotype.de>
Translate-URL: https://hosted.weblate.org/projects/catima/catima/hr/
Translation: Catima/Android
 2024-05-03 02:09:26 +02:00
Sylvia van Os
cd46cd3f8d Merge pull request #1866 from CatimaLoyalty/dependabot/gradle/com.android.application-8.4.0 
Bump com.android.application from 8.3.2 to 8.4.0
 2024-05-01 18:38:37 +02:00
dependabot[bot]
c44133942a Bump com.android.application from 8.3.2 to 8.4.0 
Bumps com.android.application from 8.3.2 to 8.4.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>
 2024-05-01 02:24:02 +00:00
Sylvia van Os
24e40f41a5 Merge pull request #1865 from CatimaLoyalty/dependabot/github_actions/actions/checkout-4.1.4 
Bump actions/checkout from 4.1.3 to 4.1.4
 2024-04-29 19:22:01 +02:00
Sylvia van Os
43b90587a5 Merge pull request #1864 from CatimaLoyalty/dependabot/github_actions/actions/upload-artifact-4.3.3 
Bump actions/upload-artifact from 4.3.2 to 4.3.3
 2024-04-29 19:02:36 +02:00