Katharine
ad418bc9bd
ScanActivity ActivityResultLauncher
2021-11-23 18:35:29 +08:00
Katharine
b0263d8eb5
MainActivity ActivityResultLauncher
2021-11-23 18:35:29 +08:00
Sylvia van Os
97d3969f93
Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker
2021-11-22 19:11:39 +01:00
Sylvia van Os
1c85172206
Google can't decide
2021-11-22 19:11:24 +01:00
bors[bot] and dependabot[bot]
711fa7ef81
Merge #611
...
611: Bump robolectric from 4.7.1 to 4.7.2 r=TheLastProject a=dependabot[bot]
Bumps [robolectric](https://github.com/robolectric/robolectric ) from 4.7.1 to 4.7.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/robolectric/robolectric/releases ">robolectric's releases</a>.</em></p>
<blockquote>
<h2>Robolectric 4.7.2</h2>
<p>This is a minor release that fixes a memory leak of Theme objects in binary resources for Android S (<a href="https://github-redirect.dependabot.com/robolectric/robolectric/issues/6872 ">#6872</a>). Thanks <a href="https://github.com/calvarez-ov "><code>`@calvarez-ov</code></a>` for the report and helping debug.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/robolectric/robolectric/commit/9ed0797525050a0580cd685308d858c5988575ba "><code>9ed0797</code></a> Bump version to 4.7.2.</li>
<li><a href="https://github.com/robolectric/robolectric/commit/5a8c5def4f8b6a87b316e6a7666146c77127b6c9 "><code>5a8c5de</code></a> Fix theme native object collection in Android S</li>
<li><a href="https://github.com/robolectric/robolectric/commit/666a5213a7ef00fc0840fafecf1c759a725e8084 "><code>666a521</code></a> Migrate ShadowAccessibilityNodeInfo to reflector</li>
<li>See full diff in <a href="https://github.com/robolectric/robolectric/compare/robolectric-4.7.1...robolectric-4.7.2 ">compare view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores )
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
</details>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-22 17:48:11 +00:00
dependabot[bot]
2220a8e3c6
Bump robolectric from 4.7.1 to 4.7.2
...
Bumps [robolectric](https://github.com/robolectric/robolectric ) from 4.7.1 to 4.7.2.
- [Release notes](https://github.com/robolectric/robolectric/releases )
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.7.1...robolectric-4.7.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 >
2021-11-22 02:25:20 +00:00
cd1bd31e23
Merge #610
...
610: Translations update from Hosted Weblate r=TheLastProject a=weblate
Translations update from [Hosted Weblate](https://hosted.weblate.org/projects/catima/catima/ )
for Catima/Catima.
Current translation status:

Co-authored-by: IllusiveMan196 <hamsterrv@gmail.com >
Co-authored-by: SC <lalocas@protonmail.com >
2021-11-21 23:01:08 +00:00
SC
f812194b1a
Translated using Weblate (Portuguese)
...
Currently translated at 100.0% (232 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
2021-11-21 23:53:04 +01:00
IllusiveMan196
79c26cfed7
Translated using Weblate (Ukrainian)
...
Currently translated at 15.3% (14 of 91 strings)
Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/
2021-11-21 23:53:04 +01:00
Sylvia van Os
85ea10303a
Merge pull request #609 from TheLastProject/create-pull-request/patch-1637471752
...
Update contributors
2021-11-21 07:05:15 +01:00
TheLastProject
4196ad8d61
Update contributors
2021-11-21 05:15:51 +00:00
bors[bot] and IllusiveMan196
90be6a418b
Merge #608
...
608: Translations update from Hosted Weblate r=TheLastProject a=weblate
Translations update from [Hosted Weblate](https://hosted.weblate.org/projects/catima/catima/ )
for Catima/Catima.
Current translation status:

Co-authored-by: IllusiveMan196 <hamsterrv@gmail.com >
2021-11-20 21:59:18 +00:00
IllusiveMan196
2e2563cfc0
Translated using Weblate (Ukrainian)
...
Currently translated at 5.4% (5 of 91 strings)
Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/
2021-11-20 22:53:02 +01:00
IllusiveMan196
983c207019
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (232 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
2021-11-20 22:51:35 +01:00
Sylvia van Os
6a5983b7bf
Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker
2021-11-20 14:37:23 +01:00
Sylvia van Os
b34e69d5d5
Delete Portuguese title because it has been disallowed by Google
2021-11-20 14:36:55 +01:00
f1cd9ac935
Merge #606
...
606: Translations update from Hosted Weblate r=TheLastProject a=weblate
Translations update from [Hosted Weblate](https://hosted.weblate.org/projects/catima/catima/ )
for Catima/Catima.
Current translation status:

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca >
Co-authored-by: g <muziejusinfo@gmail.com >
Co-authored-by: Allan Nordhøy <epost@anotheragency.no >
Co-authored-by: Heimen Stoffels <vistausss@fastmail.com >
Co-authored-by: solokot <solokot@gmail.com >
2021-11-20 12:02:05 +00:00
solokot
5eb56c934b
Translated using Weblate (Russian)
...
Currently translated at 100.0% (232 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
2021-11-20 12:53:08 +01:00
Heimen Stoffels
f9b24d4b1b
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (232 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
2021-11-20 12:53:07 +01:00
Allan Nordhøy
537b2cba82
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 98.2% (228 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
2021-11-20 12:53:07 +01:00
g
d788a274a8
Translated using Weblate (Lithuanian)
...
Currently translated at 100.0% (232 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/
2021-11-20 12:53:07 +01:00
J. Lavoie
57c383c064
Translated using Weblate (Italian)
...
Currently translated at 100.0% (232 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
2021-11-20 12:53:07 +01:00
J. Lavoie
49a8828007
Translated using Weblate (French)
...
Currently translated at 100.0% (232 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
2021-11-20 12:53:06 +01:00
J. Lavoie
d56a31160a
Translated using Weblate (German)
...
Currently translated at 100.0% (232 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
2021-11-20 12:53:06 +01:00
Sylvia van Os
bb78f9c12a
Fastlane cleanup
2021-11-20 00:32:15 +01:00
Sylvia van Os
00c005afce
Tag CHANGELOG
v2.10.0
2021-11-20 00:15:09 +01:00
Sylvia van Os
c008767bd6
Release Catima 2.10.0
2021-11-20 00:14:33 +01:00
Sylvia van Os
5e15555ad4
Fix deprecations
2021-11-19 15:07:04 +01:00
bors[bot] and dependabot[bot]
916d12c504
Merge #604
...
604: Bump robolectric from 4.7 to 4.7.1 r=TheLastProject a=dependabot[bot]
Bumps [robolectric](https://github.com/robolectric/robolectric ) from 4.7 to 4.7.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/robolectric/robolectric/releases ">robolectric's releases</a>.</em></p>
<blockquote>
<h2>Robolectric 4.7.1</h2>
<p>This is a minor release that fixes <a href="https://github-redirect.dependabot.com/robolectric/robolectric/issues/6858 ">#6858</a>. In that issue, certain Android classes could not be mocked by Mockito due to some changes to Robolectric instrumentation performed on interfaces.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/robolectric/robolectric/commit/c1e4fed8669a16de3b0281b2b15f3290aee1747c "><code>c1e4fed</code></a> Bump version to 4.7.1.</li>
<li><a href="https://github.com/robolectric/robolectric/commit/c9e861d3d70bd29617246f2d7c7cf31931d59b0a "><code>c9e861d</code></a> Bump to version 3 of preinstrumented jars</li>
<li><a href="https://github.com/robolectric/robolectric/commit/434a5347f18dc6bbe7a5381a30c6f20ac567bad5 "><code>434a534</code></a> Limit instrumentation on interfaces</li>
<li>See full diff in <a href="https://github.com/robolectric/robolectric/compare/robolectric-4.7...robolectric-4.7.1 ">compare view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores )
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
</details>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-19 07:49:40 +00:00
bors[bot] and dependabot[bot]
854958e364
Merge #603
...
603: Bump zip4j from 2.9.0 to 2.9.1 r=TheLastProject a=dependabot[bot]
Bumps [zip4j](https://github.com/srikanth-lingala/zip4j ) from 2.9.0 to 2.9.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/srikanth-lingala/zip4j/releases ">zip4j's releases</a>.</em></p>
<blockquote>
<h2>v2.9.1</h2>
<p>Improvements:</p>
<ul>
<li><a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/341 ">#341</a> Add caching to Travis build process</li>
<li><a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/359 ">#359</a> Add PasswordCallback for encrypted Input Streams</li>
</ul>
<p>Bug fixes:</p>
<ul>
<li><a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/354 ">#354</a> Skip checking for directory when reading entries</li>
<li><a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/347 ">#347</a> Extract contents of sub-directory even when sub-directory entry does not exist</li>
<li><a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/348 ">#348</a> Fix bug in sub-folder extraction when folder name appears at the end of central directory</li>
<li><a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/363 ">#363</a> Avoid replacing Windows file name separator</li>
<li><a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/365 ">#365</a> Improve file header equals check to include offset of local file header</li>
<li><a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/380 ">#380</a> Use exception type WRONG_PASSWORD when password is null or empty for AES</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/860965237a746e481071a656377633f84dfb388b "><code>8609652</code></a> <a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/365 ">#365</a> Improve file header equals check to include offset of local file header</li>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/9eab02b675d23079fc87fe9a6c0d5503465d2e3e "><code>9eab02b</code></a> <a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/380 ">#380</a> Use exception type WRONG_PASSWORD when password is null or empty for AES</li>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/4e5e2d45ffb69255e8266b6d994b579c47fe9e2f "><code>4e5e2d4</code></a> <a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/363 ">#363</a> Removed invalid test</li>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/de9bb5f35d4e01451381c113c04040bd70f50f1c "><code>de9bb5f</code></a> Remove functional interface annotation</li>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/ec78cea98c505292a6d22d0ad6fbdccb38aa4b22 "><code>ec78cea</code></a> <a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/363 ">#363</a> Avoid replacing Windows file name separator</li>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/2ec68db8b7dcac1e6867362c3cb1c80d5d793762 "><code>2ec68db</code></a> <a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/359 ">#359</a> Add PasswordCallback for encrypted Input Streams</li>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/7a139612cea3b7abe5c666087e24d587de9ebeda "><code>7a13961</code></a> <a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/347 ">#347</a> Use exception type FILE_NOT_FOUND when entry does not exist in zip</li>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/3224fb8ef5b3f9dd8fc9b18683f20384f550d274 "><code>3224fb8</code></a> <a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/347 ">#347</a> Fix failing tests</li>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/9ae5253f4b8bcf8ca9d8bf6263354d73fa6e19a4 "><code>9ae5253</code></a> <a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/347 ">#347</a> Extract contents of sub-directory even when sub-directory entry does not...</li>
<li><a href="https://github.com/srikanth-lingala/zip4j/commit/14aebe0d05e7c7c3537fb2e4fcb80a31b07e8168 "><code>14aebe0</code></a> <a href="https://github-redirect.dependabot.com/srikanth-lingala/zip4j/issues/348 ">#348</a> Fix bug in sub-folder extraction when folder name appears at the end of ...</li>
<li>Additional commits viewable in <a href="https://github.com/srikanth-lingala/zip4j/compare/v2.9.0...v2.9.1 ">compare view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores )
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
</details>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-19 07:45:09 +00:00
dependabot[bot]
d295dd40fd
Bump robolectric from 4.7 to 4.7.1
...
Bumps [robolectric](https://github.com/robolectric/robolectric ) from 4.7 to 4.7.1.
- [Release notes](https://github.com/robolectric/robolectric/releases )
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.7...robolectric-4.7.1 )
---
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 >
2021-11-19 02:24:23 +00:00
dependabot[bot]
069a3c99ef
Bump zip4j from 2.9.0 to 2.9.1
...
Bumps [zip4j](https://github.com/srikanth-lingala/zip4j ) from 2.9.0 to 2.9.1.
- [Release notes](https://github.com/srikanth-lingala/zip4j/releases )
- [Commits](https://github.com/srikanth-lingala/zip4j/compare/v2.9.0...v2.9.1 )
---
updated-dependencies:
- dependency-name: net.lingala.zip4j:zip4j
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-11-19 02:24:13 +00:00
bors[bot] and Oğuz Ersen
f1e7e5494d
Merge #602
...
602: Translations update from Hosted Weblate r=TheLastProject a=weblate
Translations update from [Hosted Weblate](https://hosted.weblate.org/projects/catima/catima/ )
for Catima/Catima.
Current translation status:

Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com >
2021-11-18 15:58:55 +00:00
Oğuz Ersen
189fe7d101
Translated using Weblate (Turkish)
...
Currently translated at 19.7% (18 of 91 strings)
Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/
2021-11-18 16:53:14 +01:00
Oğuz Ersen
9a9ff77d1c
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (232 of 232 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
2021-11-18 16:53:13 +01:00
bors[bot] and solokot
b8c1eaf88e
Merge #601
...
601: Translations update from Hosted Weblate r=TheLastProject a=weblate
Translations update from [Hosted Weblate](https://hosted.weblate.org/projects/catima/catima/ )
for Catima/Catima.
Current translation status:

Co-authored-by: solokot <solokot@gmail.com >
2021-11-18 15:23:53 +00:00
solokot
e525a32511
Translated using Weblate (Russian)
...
Currently translated at 100.0% (230 of 230 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
2021-11-18 16:20:39 +01:00
Sylvia van Os
de9f108534
Merge branch 'master' of github.com:TheLastProject/Catima
2021-11-18 16:20:28 +01:00
Sylvia van Os
c5f0d03a1c
Add button to toggle showing details on main screen
2021-11-18 16:20:00 +01:00
Sylvia van Os
e592452d02
Use card shape for icons by default
2021-11-18 15:41:48 +01:00
d3d2b37001
Merge #599 #600
...
599: Bump appcompat from 1.3.1 to 1.4.0 r=TheLastProject a=dependabot[bot]
Bumps appcompat from 1.3.1 to 1.4.0.
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores )
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
</details>
600: Translations update from Hosted Weblate r=TheLastProject a=weblate
Translations update from [Hosted Weblate](https://hosted.weblate.org/projects/catima/catima/ )
for Catima/Catima.
Current translation status:

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: solokot <solokot@gmail.com >
2021-11-18 11:13:17 +00:00
solokot
3dbe4f8327
Translated using Weblate (Russian)
...
Currently translated at 100.0% (230 of 230 strings)
Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
2021-11-18 09:53:07 +01:00
dependabot[bot]
3d81c1be08
Bump appcompat from 1.3.1 to 1.4.0
...
Bumps appcompat from 1.3.1 to 1.4.0.
---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-11-18 02:15:36 +00:00
bors[bot] and bors[bot]
333874e5e1
Merge #598
...
598: Update Fastlane changelogs r=TheLastProject a=github-actions[bot]
Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request ) GitHub action
Co-authored-by: bors[bot] <bors[bot]@users.noreply.github.com>
2021-11-17 19:46:55 +00:00
bors[bot]
69a53a8408
Update Fastlane changelogs
2021-11-17 19:45:07 +00:00
bors[bot] and Sylvia van Os
8dc479793b
Merge #597
...
597: New card layout r=TheLastProject a=TheLastProject
TODO:
- [x] Fix cards sizing up to stay equal size but failing to size back down on group switch
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me >
2021-11-17 19:39:27 +00:00
Sylvia van Os
a2d48a236b
Tweak margins
2021-11-17 20:35:47 +01:00
Sylvia van Os
67f390f594
Update screenshots
2021-11-17 20:12:18 +01:00
Sylvia van Os
1a5109e036
Fix card sizing
2021-11-17 19:56:27 +01:00
bors[bot] and Sylvia van Os
ff42ead6b7
Merge #595
...
595: Cleanup barcode selector r=TheLastProject a=TheLastProject
Should make #592 easier to implement.
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me >
2021-11-17 18:17:41 +00:00