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,039 Commits 31 Branches 165 Tags
a00a69e0c004fa7fc558ff8e174ad3944f42293b
Commit Graph
1286 Commits
Author SHA1 Message Date
Katharine Chui a00a69e0c0 UI changes, group cache, code cleanup 
hash maps are cloned manually to make android studio and spotbug happy
 2021-11-03 10:13:59 +08:00
Katharine 426acc701e remove setSort which will likely not be implemented in here 2021-11-03 10:13:59 +08:00
Katharine d6eccd11a5 UI touch ups 2021-11-03 10:13:59 +08:00
Katharine cb8275771f remove database shortcuts 2021-11-03 10:13:59 +08:00
Katharine 9252c01aa7 Group does not need to be a Parcelable anymore 2021-11-03 10:13:59 +08:00
Katharine b4b544e342 remove modularity 2021-11-03 10:13:59 +08:00
Katharine f667fcbebe requested manifest changes 2021-11-03 10:13:59 +08:00
Katharine cc402c39be fixing errors reported by spotbugs 2021-11-03 10:13:59 +08:00
Katharine d5d921a1c8 Group management POC 2021-11-03 10:13:59 +08:00
Allan Nordhøy e56795307e Translated using Weblate (Norwegian Bokmål) 
Currently translated at 99.5% (221 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-11-02 16:35:12 +01:00
TheLastProject 2998a4d553 Update contributors 2021-10-31 05:15:42 +00:00
SC 1455265045 Translated using Weblate (Portuguese) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
 2021-10-30 18:38:17 +02:00
mondstern d5516c59a6 Translated using Weblate (Welsh) 
Currently translated at 16.2% (36 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/cy/
 2021-10-28 23:01:42 +02:00
mondstern 5654abe6e9 Translated using Weblate (Latvian) 
Currently translated at 56.3% (125 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lv/
 2021-10-28 23:01:42 +02:00
Joel A b17a50f9c2 Translated using Weblate (Swedish) 
Currently translated at 99.0% (220 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2021-10-28 23:01:42 +02:00
Eric 87c9bb590b Translated using Weblate (Chinese (Simplified)) 
Currently translated at 81.5% (181 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/zh_Hans/
 2021-10-28 23:01:42 +02:00
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
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
Miha Frangež e16d2e22ac Made name and ID inputs single-line 2021-10-27 23:24:06 +02: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 2021-10-27 18:24:46 +02:00
Dheeraj ffb24c973a fix: Overlapping TextView and ImageView. 2021-10-27 19:21:09 +05:30
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
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
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
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
mondstern 5203f89e9d Added translation using Weblate (Luxembourgish) 2021-10-25 20:09:59 +02:00
mondstern 3d376e2a90 Translated using Weblate (Icelandic) 
Currently translated at 31.9% (71 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/is/
 2021-10-25 19:53:19 +02:00
Sylvia van Os 7afbe41f95 Release Catima 2.8.0 2021-10-25 17:28:02 +02:00
Sylvia van Os 3ba0649891 Add missing languages 2021-10-25 17:18:51 +02:00
Sylvia van Os 297ecc371e Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-10-25 17:14:57 +02:00
Sylvia van Os 79c8570507 Work around a race condition crash 2021-10-25 17:11:19 +02:00