Update Fastlane changelogs

Merge pull request #1965 from CatimaLoyalty/fix/allow_multiline_store_name_if_needed
Allow store name thumbnails to span multiple lines
2025-12-24 23:57:53 -05:00 · 2024-07-01 19:29:59 +00:00 · 2024-07-01 21:29:46 +02:00 · 2024-07-01 19:42:35 +02:00 · 2024-07-01 17:42:06 +02:00 · 2024-07-01 00:05:58 +02:00
9 changed files with 47 additions and 27 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog

+## Unreleased - 137
+
+- Allow long store names in preview to split over multiple lines
+
 ## v2.30.0 - 136 (2024-06-18)

 - Support for creating a card when sharing plain text
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -39,6 +39,7 @@ import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.os.LocaleListCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
+import androidx.core.widget.TextViewCompat;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.palette.graphics.Palette;

@@ -941,6 +942,22 @@ public class Utils {
        if (icon != null) {
            textWhenNoImage.setVisibility(View.GONE);
        } else {
+            // Manually calculate how many lines will be needed
+            // This is necessary because Android's auto sizing will split over lines way before reaching the minimum font size and store names split over multiple lines are harder to scan with a quick glance so we should try to prevent it
+            // Because we have to write the text before we can actually know the exact laid out size (trying to delay this causes bugs where the autosize fails) we have to take some... weird shortcuts
+
+            // At this point textWhenNoImage.getWidth() still returns 0, so we cheat by calculating the whole width of the screen and then dividing it by the amount of columns
+            int textviewWidth = Resources.getSystem().getDisplayMetrics().widthPixels / context.getResources().getInteger(R.integer.main_view_card_columns);
+
+            // Calculate how wide a character is and calculate how many characters fit in a line
+            int characterWidth = TextViewCompat.getAutoSizeMinTextSize(textWhenNoImage);
+            int maxWidthPerLine = textviewWidth - textWhenNoImage.getPaddingStart() - textWhenNoImage.getPaddingEnd();
+
+            // Set amount of lines based on what could fit at most
+            int maxLines = ((loyaltyCard.store.length() * characterWidth) / maxWidthPerLine) + 1;
+            textWhenNoImage.setMaxLines(maxLines);
+
+            // Actually set the text and colour
            textWhenNoImage.setVisibility(View.VISIBLE);
            textWhenNoImage.setText(loyaltyCard.store);
            textWhenNoImage.setTextColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -42,12 +42,8 @@
                android:layout_height="match_parent"
                android:textStyle="bold"
                app:autoSizeTextType="uniform"
-                app:autoSizeMinTextSize="12sp"
-                app:autoSizeMaxTextSize="100sp"
-                app:autoSizeStepGranularity="2sp"
                android:gravity="center"
-                android:maxLines="1"
-                android:layout_margin="20dp" />
+                android:padding="20dp" />

            <ImageView
                android:importantForAccessibility="no"
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -7,8 +7,8 @@ Heimen Stoffels
 Oğuz Ersen
 FC (Fay) Stegerman
 Katharine Chui
-SlavekB
 StoyanDimitrov
+SlavekB
 mondstern
 IllusiveMan196
 Altonss
@@ -28,25 +28,25 @@ Scrambled777
 Giovanni Donisi
 Jiri Grönroos
 Samantaz Fox
+arno-github
 Cliff Heraldo
 Sergio Paredes
 Ankit Tiwari
-arno-github
-mdvhimself
-Milan Šalka
 Milo Ivir
+Milan Šalka
+mdvhimself
 Balázs Meskó
 Skrripy
 huuhaa
-waffshappen
-ngocanhtve
-ikanakova
+Jose Delvani
 Projjal Moitra
 Quentin PAGÈS
-Denis Shilin
-Jose Delvani
-Robin Liu
+ikanakova
+ngocanhtve
+waffshappen
 Ziad OUALHADJ
+Robin Liu
+Denis Shilin
 しいたけ
 Alexander Ivanov
 Viet Nguyen Hoang
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -295,4 +295,5 @@
    <string name="errorReadingFile">Файлът не може да бъде прочетен</string>
    <string name="failedLaunchingFileManager">Не е намерено приложение за управление на файлове</string>
    <string name="multipleBarcodesFoundPleaseChooseOne">Кой от намерените щрихкодове желаете да бъде използван?</string>
+    <string name="noCameraFoundGuideText">Изглежда, устройството няма камера. Ако има опитайте да рестартирате. В противен случай използвайте бутона „Още“, за да добавите шрихкод по друг начин.</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -98,7 +98,7 @@
    <string name="setFrontImage">Definir imagem frontal</string>
    <string name="setBackImage">Definir imagem traseira</string>
    <string name="removeImage">Remover imagem</string>
-    <string name="takePhoto">Tirar uma photo</string>
+    <string name="takePhoto">Tirar uma foto</string>
    <string name="updateBarcodeQuestionTitle">Atualizar valor do código de barras?</string>
    <string name="exportPasswordHint">Insira sua senha</string>
    <string name="passwordRequired">Por favor, insira a senha</string>
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,11 +2,11 @@

 Copylefted libre software (GPLv3+) card management app.

-[![GitHub Version](https://img.shields.io/github/v/release/TheLastProject/Catima.svg?logo=github&label=GitHub)](https://github.com/TheLastProject/Catima/releases)
+[![GitHub Version](https://img.shields.io/github/v/release/CatimaLoyalty/Android.svg?logo=github&label=GitHub)](https://github.com/CatimaLoyalty/Android/releases)
 [![IzzyOnDroid Version](https://img.shields.io/endpoint?url=https://apt.izzysoft.de/fdroid/api/v1/shield/me.hackerchick.catima)](https://apt.izzysoft.de/fdroid/index/apk/me.hackerchick.catima)
 [![Google Play Store Version](https://img.shields.io/endpoint?color=blue&logo=google-play&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Dme.hackerchick.catima%26l%3DGoogle%2520Play%26m%3D%24version)](https://play.google.com/store/apps/details?id=me.hackerchick.catima)

-![Android CI](https://github.com/TheLastProject/Catima/workflows/Android%20CI/badge.svg)
+![Android CI](https://github.com/CatimaLoyalty/Android/workflows/Android%20CI/badge.svg)
 [![Translation status](https://hosted.weblate.org/widgets/catima/-/svg-badge.svg)](https://hosted.weblate.org/engage/catima/)

 [![Matrix](https://img.shields.io/matrix/catima%3Amatrix.org)](https://matrix.to/#/%23catima:matrix.org)
@@ -17,7 +17,7 @@ Copylefted libre software (GPLv3+) card management app.
 <a href="https://play.google.com/store/apps/details?id=me.hackerchick.catima" target="_blank">
 <img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>

-[![Feature graphic](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/featureGraphic.png)](https://catima.app/)
+[![Feature graphic](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/featureGraphic.png)](https://catima.app/)

 *Logo by [Rose (TangentFoxy)](https://github.com/TangentFoxy), feature graphic by [Ziad OUALHADJ](https://github.com/ziadOUA)*

@@ -41,14 +41,14 @@ Supported barcodes:

 # Screenshots

-[<img src="https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png" width=250>](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png)
-[<img src="https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png" width=250>](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png)
+[<img src="https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png)
+[<img src="https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png)
+[<img src="https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png)
+[<img src="https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png)
+[<img src="https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png)
+[<img src="https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png)
+[<img src="https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png" width=250>](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png)
+[<img src="https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png" width=250>](https://github.com/CatimaLoyalty/Android/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png)

 # Moving data from other apps

--- a/fastlane/metadata/android/en-US/changelogs/137.txt
+++ b/fastlane/metadata/android/en-US/changelogs/137.txt
@@ -0,0 +1 @@
+- Allow long store names in preview to split over multiple lines
--- a/fastlane/metadata/android/pt-BR/short_description.txt
+++ b/fastlane/metadata/android/pt-BR/short_description.txt
@@ -0,0 +1 @@
+Para seus códigos de barras, assinaturas, programas de fidelidade, cupons e ingressos.
Author	SHA1	Message	Date
TheLastProject	a097264983	Update Fastlane changelogs	2024-07-01 19:29:59 +00:00
Sylvia van Os	19d5c1144e	Merge pull request #1965 from CatimaLoyalty/fix/allow_multiline_store_name_if_needed Allow store name thumbnails to span multiple lines	2024-07-01 21:29:46 +02:00
Sylvia van Os	c123dd5d42	Allow store name thumbnails to span multiple lines Allowing spanning multiple lines helps in case the store name doesn't fit on a single line. However, the store name should fit a single line if possible because it looks better when the store name isn't split among lines. Due to limitations in Android's autoSizeTextType system, this needs a fairly ugly workaround.	2024-07-01 19:42:35 +02:00
Sylvia van Os	3fe0fec801	Merge pull request #1966 from weblate/weblate-catima-catima Translations update from Hosted Weblate	2024-07-01 17:42:06 +02:00
109247019824	245ff6ade9	Translated using Weblate (Bulgarian) Currently translated at 100.0% (313 of 313 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/	2024-07-01 00:05:58 +02:00
Sylvia van Os	353cf1daad	Merge pull request #1964 from CatimaLoyalty/create-pull-request/patch-1719720956 Update contributors	2024-06-30 10:13:43 +02:00
TheLastProject	2e5dbd5cc1	Update contributors	2024-06-30 04:15:56 +00:00
Sylvia van Os	7d6ce95998	Merge pull request #1963 from weblate/weblate-catima-catima Translations update from Hosted Weblate	2024-06-30 00:23:31 +02:00
Jose Delvani	dca9816fbe	Translated using Weblate (Portuguese (Brazil)) Currently translated at 2.2% (3 of 134 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pt_BR/	2024-06-29 22:36:07 +02:00
Sylvia van Os	a5eee0a3b1	Update README paths	2024-06-28 20:59:58 +02:00
Sylvia van Os	5d0b890de9	Merge pull request #1958 from weblate/weblate-catima-catima Translations update from Hosted Weblate	2024-06-28 17:14:15 +02:00
Jose Delvani	7c6492965f	Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (313 of 313 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt_BR/	2024-06-28 05:09:31 +02:00
				`@@ -0,0 +1 @@`
				`- Allow long store names in preview to split over multiple lines`
				`@@ -0,0 +1 @@`
				`Para seus códigos de barras, assinaturas, programas de fidelidade, cupons e ingressos.`