mirror/Android
1
0 Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-09-19 12:28:13 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,017 Commits 31 Branches 165 Tags
c8d2aa26f544185cc517bc6318aff68d76ecb86a
Commit Graph
2017 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os c8d2aa26f5 Add cy to selector 2021-10-28 22:56:59 +02:00
Sylvia van Os a5074eb191 Fix invalid translation 2021-10-28 22:37:00 +02:00
mondstern 9df0a8ff57 Added translation using Weblate (Welsh) 2021-10-28 20:01:19 +02:00
mondstern a79cf72ad7 Translated using Weblate (Latvian) 
Currently translated at 21.1% (47 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lv/
 2021-10-28 12:01:22 +02:00
mondstern db0134a44c Translated using Weblate (Croatian) 
Currently translated at 51.8% (115 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/hr/
 2021-10-28 12:01:21 +02:00
Reza Almanda 5f6424778a Translated using Weblate (Indonesian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/id/
 2021-10-28 12:01:21 +02:00
mondstern 950264105b Translated using Weblate (Portuguese) 
Currently translated at 51.3% (114 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
 2021-10-28 12:01:20 +02:00
Oğuz Ersen 7b2d9eb47f Translated using Weblate (Turkish) 
Currently translated at 17.9% (16 of 89 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/
 2021-10-28 12:01:19 +02:00
109247019824 088ee66b5a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2021-10-28 12:01:18 +02:00
bors[bot]andMiha Frangež 2487edf4b2 Merge #554 
554: Made name and ID inputs single-line r=TheLastProject a=franga2000

Since I already had the IDE open... (also still need that last Hacktoberfest PR 😅)

Fixes #553 

Co-authored-by: Miha Frangež <miha.frangez@gmail.com>
 2021-10-27 21:39:37 +00:00
Miha Frangež e16d2e22ac Made name and ID inputs single-line 2021-10-27 23:24:06 +02:00
bors[bot]mondsternSylvia van Os
 		7b335c69ba Merge #552 
552: Translations update from Weblate r=TheLastProject a=weblate

Translations update from [Weblate](https://hosted.weblate.org/projects/catima/catima/) for Catima/Catima.



Current translation status:

![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg)


Co-authored-by: mondstern <mondstern@snopyta.org>
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2021-10-27 18:33:36 +00:00
Sylvia van Os c1bd7043b1 Add Latvian to language selector 2021-10-27 20:32:58 +02:00
mondstern 71f3b5bc5f Added translation using Weblate (Latvian) 2021-10-27 20:26:24 +02:00
Sylvia van Os e2f33bf4b4 Release Catima 2.8.1 v2.8.1 2021-10-27 18:24:46 +02:00
bors[bot]andTheLastProject b1685ac90e Merge #549 
549: 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: TheLastProject <TheLastProject@users.noreply.github.com>
 2021-10-27 15:40:23 +00:00
TheLastProject 394cc6b30f Update Fastlane changelogs 2021-10-27 15:38:49 +00:00
Sylvia van Os 75e320e108 Update CHANGELOG 2021-10-27 17:38:19 +02:00
bors[bot]andDheeraj e8b38b3367 Merge #548 
548: fix: Overlapping TextView and ImageView. r=TheLastProject a=KasinaDheeraj

fixes #542 

Co-authored-by: Dheeraj <dheerukd2002@gmail.com>
 2021-10-27 15:30:33 +00:00
Dheeraj ffb24c973a fix: Overlapping TextView and ImageView. 2021-10-27 19:21:09 +05:30
bors[bot]andTheLastProject d43693b1d8 Merge #547 
547: 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: TheLastProject <TheLastProject@users.noreply.github.com>
 2021-10-27 11:13:39 +00:00
TheLastProject b7f17181f9 Update Fastlane changelogs 2021-10-27 11:12:50 +00:00
Sylvia van Os 10dc84820c Update CHANGELOG.md 2021-10-27 13:12:30 +02:00
bors[bot]andSylvia van Os 5f0d92470e Merge #545 
545: Update CHANGELOG r=TheLastProject a=TheLastProject

bors r+

Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2021-10-27 11:04:35 +00:00
Sylvia van Os 6bb4376e4d Update CHANGELOG 2021-10-27 12:57:24 +02:00
bors[bot]andKatharine 92da792378 Merge #539 
539: fix for #533, fix for #510 + LoyaltyCardViewActivity crashing on returning from day/night theme change r=TheLastProject a=Kethen

please review, fixes #533, and avoids a crash from loading LoyaltyCardViewActivity, switch out to settings and switch day/night mode, switch back, which fixes #510 as well

Co-authored-by: Katharine <kwchuiaa@connect.ust.hk>
 2021-10-27 10:55:51 +00:00
Katharine 81499cd362 onProgressChanged handles only user input now, always store user zoom level input 2021-10-27 18:49:09 +08:00
Katharine fc91f1ae63 avoid system theme change activity crash 2021-10-27 18:24:23 +08:00
Katharine cec7bc880e view dots that respects themening in app settings 2021-10-27 18:24:23 +08:00
Katharine 4027df2119 refactor centerGuideLine resizing logic -sylvia 2021-10-27 18:24:23 +08:00
bors[bot]andKatharine 93132961d3 Merge #544 
544: fixing #320 by not recreating main activity returning from another activity, requires testing r=TheLastProject a=Kethen

targetting #320

Co-authored-by: Katharine <kwchuiaa@connect.ust.hk>
 2021-10-27 09:34:24 +00:00
Katharine 638528d4fc do not recreate main activity returning from another activity 2021-10-27 15:22:31 +08:00
bors[bot]mondsternRosdyana Kusuma
 		67ef623761 Merge #543 
543: Translations update from Weblate r=TheLastProject a=weblate

Translations update from [Weblate](https://hosted.weblate.org/projects/catima/catima/) for Catima/Catima.



Current translation status:

![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg)


Co-authored-by: mondstern <mondstern@snopyta.org>
Co-authored-by: Rosdyana Kusuma <rosdyana.kusuma@gmail.com>
 2021-10-27 06:58:40 +00:00
mondstern cb3afe1878 Translated using Weblate (Croatian) 
Currently translated at 27.4% (61 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/hr/
 2021-10-27 08:02:54 +02:00
mondstern e3f4aec1c5 Translated using Weblate (Luxembourgish) 
Currently translated at 51.8% (115 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lb/
 2021-10-27 08:02:53 +02:00
Rosdyana Kusuma d2f196da21 Translated using Weblate (Indonesian) 
Currently translated at 98.6% (219 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/id/
 2021-10-27 08:02:52 +02:00
mondstern e491a960d7 Translated using Weblate (Icelandic) 
Currently translated at 52.2% (116 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/is/
 2021-10-27 08:02:52 +02:00
mondstern f5c83793bf Translated using Weblate (Portuguese) 
Currently translated at 33.3% (74 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
 2021-10-27 08:02:51 +02:00
bors[bot]anddependabot[bot] e334a5e454 Merge #538 
538: Bump zxing-android-embedded from 4.2.0 to 4.3.0 r=TheLastProject a=dependabot[bot]

Bumps [zxing-android-embedded](https://github.com/journeyapps/zxing-android-embedded) from 4.2.0 to 4.3.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/journeyapps/zxing-android-embedded/releases">zxing-android-embedded's releases</a>.</em></p>
<blockquote>
<h2>v4.3.0</h2>
<ul>
<li>Minimum SDK version 19, but requires additional config (see readme) for &lt; 24 compatibility.</li>
<li>Add ScanOptions and ScanContract for use with <code>registerForActivityResult()</code>.</li>
<li>Deprecates IntentIntegrator. It is still available, but <code>registerForActivityResult()</code> is recommended instead.</li>
<li>Use minimal AndroidX libraries.</li>
<li>Use zxing:core 3.4.1 by default.</li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/journeyapps/zxing-android-embedded/compare/v4.2.0...v4.3.0">https://github.com/journeyapps/zxing-android-embedded/compare/v4.2.0...v4.3.0</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/journeyapps/zxing-android-embedded/blob/master/CHANGES.md">zxing-android-embedded's changelog</a>.</em></p>
<blockquote>
<h3>4.3.0 (2021-10-25)</h3>
<ul>
<li>Minimum SDK version 19, but requires additional config (see readme) for &lt; 24 compatibility.</li>
<li>Add ScanOptions and ScanContract for use with <code>registerForActivityResult()</code>.</li>
<li>Deprecates IntentIntegrator.</li>
<li>Use minimal AndroidX libraries.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/24d02945fec5f2c5a65b24ea7848cb5ca18f9f81"><code>24d0294</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/journeyapps/zxing-android-embedded/issues/665">#665</a> from journeyapps/fixes</li>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/6ccf3a9d1a8919dfc06e4aeb2754354d267fe978"><code>6ccf3a9</code></a> Fix lint report location.</li>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/23f29e5a560fb5026928a7a2aa4099646405d0de"><code>23f29e5</code></a> Ignore lint error.</li>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/1a8d94932511cd82968cd18d737b574d28f4c05d"><code>1a8d949</code></a> Tweaks.</li>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/f1554b7478c313841ef2814fb6dc17554387633b"><code>f1554b7</code></a> Use GitHub Actions.</li>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/cc12c103e0f1f9f37da5aea59224a2e88e32141c"><code>cc12c10</code></a> v4.3.0 and cleanup.</li>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/a13ce2b161033a0cee33d9629deeb7cd3eff55bb"><code>a13ce2b</code></a> Cleanup.</li>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/0c97cf70cc9d562431e771fcc026c9c8bdf412ca"><code>0c97cf7</code></a> ScanOptions and ScanContract.</li>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/9beeac79603c6aae8f86338fabc2e5a4a757dd54"><code>9beeac7</code></a> minSdkVersion 19. Multidex and desugaring.</li>
<li><a href="https://github.com/journeyapps/zxing-android-embedded/commit/cc34502f13a04d9cd30b3508f2844fba61abfad6"><code>cc34502</code></a> Smaller libs.</li>
<li>Additional commits viewable in <a href="https://github.com/journeyapps/zxing-android-embedded/compare/v4.2.0...v4.3.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.journeyapps:zxing-android-embedded&package-manager=gradle&previous-version=4.2.0&new-version=4.3.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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-10-26 19:19:40 +00:00
bors[bot]mondsternSylvia van Os
 		cbbd071f4f Merge #541 
541: Translations update from Weblate r=TheLastProject a=weblate

Translations update from [Weblate](https://hosted.weblate.org/projects/catima/catima/) for Catima/Catima.



Current translation status:

![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg)


Co-authored-by: mondstern <mondstern@snopyta.org>
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2021-10-26 18:39:49 +00:00
Sylvia van Os 524a6b1ffb Add hr to language selector 2021-10-26 20:38:38 +02:00
mondstern 7954adf7e3 Added translation using Weblate (Croatian) 2021-10-26 20:11:22 +02:00
Sylvia van Os 0b31a08b9f Really fix 2021-10-26 19:23:39 +02:00
Sylvia van Os a0884aa81c Fix empty changelog check 2021-10-26 19:20:11 +02:00
Sylvia van Os 46f64d1a61 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-10-26 19:12:26 +02:00
Sylvia van Os 81cb6ad4fd Don't generate fastlane file if changelog entry is empty 2021-10-26 19:12:05 +02:00
dependabot[bot] f2f330e3e4 Bump zxing-android-embedded from 4.2.0 to 4.3.0 
Bumps [zxing-android-embedded](https://github.com/journeyapps/zxing-android-embedded) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/journeyapps/zxing-android-embedded/releases)
- [Changelog](https://github.com/journeyapps/zxing-android-embedded/blob/master/CHANGES.md)
- [Commits](https://github.com/journeyapps/zxing-android-embedded/compare/v4.2.0...v4.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-26 02:16:29 +00:00
Sylvia van Os 5b14670785 Fix changelog 2021-10-26 00:06:52 +02:00
bors[bot]andmondstern c5f68aa50f Merge #535 
535: Translations update from Weblate r=TheLastProject a=weblate

Translations update from [Weblate](https://hosted.weblate.org/projects/catima/catima/) for Catima/Catima.



Current translation status:

![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg)


Co-authored-by: mondstern <mondstern@snopyta.org>
 2021-10-25 18:12:29 +00:00
mondstern 5203f89e9d Added translation using Weblate (Luxembourgish) 2021-10-25 20:09:59 +02:00