Compare commits

...

23 Commits

Author SHA1 Message Date
Sylvia van Os
224ab7f2e7 Release Catima v2.24.2 2023-06-18 18:15:55 +02:00
Sylvia van Os
1b47a62c70 Merge pull request #1380 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2023-06-18 16:48:15 +02:00
Sylvia van Os
f241bad3e4 Fix broken translation 2023-06-18 16:42:40 +02:00
Viktor Broov
c8657870af Translated using Weblate (Esperanto)
Currently translated at 37.6% (108 of 287 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/eo/
2023-06-18 16:38:07 +02:00
Sylvia van Os
0ed7a0a6e1 Merge pull request #1378 from CatimaLoyalty/create-pull-request/patch-1687070038
Update contributors
2023-06-18 10:25:47 +02:00
TheLastProject
325330c542 Update contributors 2023-06-18 06:33:57 +00:00
Sylvia van Os
2506f60348 Merge pull request #1377 from CatimaLoyalty/create-pull-request/patch-1686995327
Update Fastlane changelogs
2023-06-17 11:51:42 +02:00
TheLastProject
5bf6f52425 Update Fastlane changelogs 2023-06-17 09:48:47 +00:00
Sylvia van Os
fb1728e5de Update CHANGELOG 2023-06-17 11:48:32 +02:00
Sylvia van Os
d321f733c1 Merge pull request #1376 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2023-06-16 21:00:30 +02:00
SC
8ff46f8754 Translated using Weblate (Portuguese)
Currently translated at 95.9% (118 of 123 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pt/
2023-06-16 20:51:09 +02:00
SC
a061978c93 Translated using Weblate (Portuguese)
Currently translated at 97.9% (281 of 287 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
2023-06-16 20:51:09 +02:00
solokot
f3bfc9b278 Translated using Weblate (Russian)
Currently translated at 100.0% (123 of 123 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ru/
2023-06-16 20:51:09 +02:00
gallegonovato
43ebe5e029 Translated using Weblate (Spanish)
Currently translated at 100.0% (287 of 287 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
2023-06-16 20:51:09 +02:00
Sylvia van Os
2357f4d430 Merge pull request #1375 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2023-06-15 23:35:41 +02:00
Pierre NIKOLOV
7869feb3a1 Translated using Weblate (French)
Currently translated at 98.3% (121 of 123 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/fr/
2023-06-14 05:54:10 +02:00
Sylvia van Os
53ce856c33 Merge pull request #1372 from obfusk/rtl-buttons
LoyaltyCardViewActivity: RTL fixes for buttons
2023-06-13 23:53:04 +02:00
Sylvia van Os
aa321a71ad Merge pull request #1370 from obfusk/sort-rtl
sorting_option.xml: RTL fix
2023-06-13 19:35:16 +02:00
Sylvia van Os
f721237fbc Merge pull request #1373 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2023-06-13 19:29:43 +02:00
FC Stegerman
194a7ae365 improve button bar RTL handling using linear layouts 2023-06-12 15:26:21 +02:00
Slávek Banko
1aa1d8bcc1 Translated using Weblate (Czech)
Currently translated at 100.0% (123 of 123 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
2023-06-12 10:54:13 +02:00
FC Stegerman
a8355f609b LoyaltyCardViewActivity: RTL fixes for buttons 2023-06-11 23:09:47 +02:00
FC Stegerman
3abe99470e sorting_option.xml: RTL fix 2023-06-11 15:34:42 +02:00
16 changed files with 126 additions and 75 deletions

View File

@@ -1,5 +1,9 @@
# Changelog
## v2.24.2 - 126 (2023-06-18)
- Various RTL fixes
## v2.24.1 - 125 (2023-06-11)
- Deal more gracefully with missing header colours

View File

@@ -19,8 +19,8 @@ android {
applicationId "me.hackerchick.catima"
minSdk 21
targetSdk 33
versionCode 125
versionName "2.24.1"
versionCode 126
versionName "2.24.2"
vectorDrawables.useSupportLibrary true
multiDexEnabled true

View File

@@ -984,22 +984,33 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
return;
}
final ImageButton prevButton;
final ImageButton nextButton;
if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
prevButton = binding.mainRightButton;
nextButton = binding.mainLeftButton;
} else {
prevButton = binding.mainLeftButton;
nextButton = binding.mainRightButton;
}
// Enable left button if we can go further left
if (mainImageIndex > 0) {
binding.mainLeftButton.setVisibility(View.VISIBLE);
binding.mainLeftButton.setOnClickListener(view -> setMainImage(false, false));
prevButton.setVisibility(View.VISIBLE);
prevButton.setOnClickListener(view -> setMainImage(false, false));
} else {
binding.mainLeftButton.setVisibility(View.INVISIBLE);
binding.mainLeftButton.setOnClickListener(null);
prevButton.setVisibility(View.INVISIBLE);
prevButton.setOnClickListener(null);
}
// Enable right button if we can go further right
if (mainImageIndex < (imageTypes.size() - 1)) {
binding.mainRightButton.setVisibility(View.VISIBLE);
binding.mainRightButton.setOnClickListener(view -> setMainImage(true, false));
nextButton.setVisibility(View.VISIBLE);
nextButton.setOnClickListener(view -> setMainImage(true, false));
} else {
binding.mainRightButton.setVisibility(View.INVISIBLE);
binding.mainRightButton.setOnClickListener(null);
nextButton.setVisibility(View.INVISIBLE);
nextButton.setOnClickListener(null);
}
}

View File

@@ -83,7 +83,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp">
android:layout_marginEnd="0dp"
android:layoutDirection="ltr">
<!-- We don't use these buttons for Talkback -->
<ImageButton
@@ -213,53 +214,70 @@
app:contentInsetEnd="0dp"
app:fabAlignmentMode="center">
<ImageButton
android:id="@+id/bottom_app_bar_previous_button"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="left"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_baseline_chevron_left_24"
android:tooltipText="@string/previousCard"
android:visibility="gone" />
android:layoutDirection="ltr">
<ImageButton
android:id="@+id/bottom_app_bar_info_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_baseline_info_24"
android:tooltipText="@string/showMoreInfo"
android:visibility="gone" />
<ImageButton
android:id="@+id/bottom_app_bar_previous_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_baseline_chevron_left_24"
android:tooltipText="@string/previousCard"
android:visibility="gone" />
<ImageButton
android:id="@+id/bottom_app_bar_next_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="right"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_baseline_chevron_right_24"
android:tooltipText="@string/nextCard"
android:visibility="gone" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal"
android:layoutDirection="locale">
<ImageButton
android:id="@+id/bottom_app_bar_update_balance_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:background="@android:color/transparent"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:src="@drawable/ic_baseline_shopping_cart_24"
android:tooltipText="@string/updateBalance"
android:visibility="gone" />
<ImageButton
android:id="@+id/bottom_app_bar_info_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_baseline_info_24"
android:tooltipText="@string/showMoreInfo"
android:visibility="gone" />
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<ImageButton
android:id="@+id/bottom_app_bar_update_balance_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_baseline_shopping_cart_24"
android:tooltipText="@string/updateBalance"
android:visibility="gone" />
</LinearLayout>
<ImageButton
android:id="@+id/bottom_app_bar_next_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:background="@android:color/transparent"
android:src="@drawable/ic_baseline_chevron_right_24"
android:tooltipText="@string/nextCard"
android:visibility="gone" />
</LinearLayout>
</com.google.android.material.bottomappbar.BottomAppBar>

View File

@@ -10,7 +10,7 @@
<CheckBox
android:id="@+id/checkBox_reverse"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:paddingStart="20dp"

View File

@@ -7,27 +7,27 @@ Heimen Stoffels
Oğuz Ersen
Katharine Chui
mondstern
IllusiveMan196
StoyanDimitrov
IllusiveMan196
SlavekB
Altonss
Michael Moroni
Gediminas Murauskas
Petr Novák
Joel A
Taco
laralem
Taco
pfaffenrodt
Nyatsuki
gallegonovato
Nyatsuki
HudobniVolk
FC Stegerman
Samantaz Fox
arno-github
Ankit Tiwari
Sergio Paredes
Clxff H3r4ld0
Aayush Gupta
FC Stegerman
huuhaa
Quentin PAGÈS
Balázs Meskó
@@ -98,6 +98,7 @@ Mohamed A. Salah
the7thNightmare
Rishi Agarwal
Rosdyana Kusuma
Sabri Ünal
umoenks
Simon Rusinov
Siriusmart
@@ -107,6 +108,7 @@ Thomas Bertels
Thomas Cruveilher
Tian Jiale
Tong Liu
Tymofii Lytvynenko
Wanath
Runner
ce i moa
@@ -142,6 +144,7 @@ CherryMonster222
Csaba
Mylou53
danieluhrinyi
Daniele Tricoli
Kasina Dheeraj
Donno
Flav
@@ -158,6 +161,7 @@ Jacopo Gennaro Esposito
Jean-Baptiste
Kung-chih
Karvjorm
polar
krkk
Laura Ferraz
Lucas da Costa
@@ -180,6 +184,7 @@ Nosnahc
pa4k
pbeckmann
Peer Beckmann
vandman
Piotr Strebski
Piotr Zet
Poorva Patidar
@@ -190,7 +195,6 @@ Rohan Babbar
Ronak Upadhyay
Rose Liverman
SKULD
Sabri Ünal
Salem Malus
Samarth Asthan
Shailendra Maurya
@@ -204,7 +208,6 @@ Mehedi Hasan
Titas Pažereckas
atakujonc
Tony C
Tymofii Lytvynenko
Vancha March
Waldemar Stoczkowski
Yevgeny M

View File

@@ -82,4 +82,9 @@
<string name="intent_import_card_from_url_share_text">Mi deziras dividi karto kun vi</string>
<string name="exportSuccessful">Karto datumo eksportita</string>
<string name="noGroupCards">Ĉi tiu grupo ne enhavas ajnan kartoj</string>
</resources>
<string name="noGiftCards">Klavu la \"+\" butonon por aldoni karton, aŭ importu uzi menuo \" ⋮\".</string>
<plurals name="selectedCardCount">
<item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> elektita</item>
<item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> elektitaj</item>
</plurals>
</resources>

View File

@@ -216,7 +216,7 @@
<string name="translate_platform">en Weblate</string>
<string name="action_show_details">Mostrar detalles</string>
<string name="selectColor">Seleccione el color</string>
<string name="setIcon">Establecer icono</string>
<string name="setIcon">Establecer una miniatura</string>
<string name="sort">Ordenar</string>
<string name="sort_by">Ordenar por</string>
<string name="rate_this_app">Califica esta aplicación</string>
@@ -275,4 +275,9 @@
<string name="donate">Donar</string>
<string name="switchToBarcode">Cambiar a código de barras</string>
<string name="switchToBackImage">Cambiar a imagen trasera</string>
<string name="icon_header_click_text">Pulsación larga para editar la miniatura</string>
<string name="show_name_below_image_thumbnail">Mostrar el nombre debajo de la miniatura de la imagen</string>
<string name="show_note">Mostrar la nota</string>
<string name="show_validity">Mostrar la validez</string>
<string name="show_balance">Mostrar el saldo</string>
</resources>

View File

@@ -271,8 +271,8 @@
<string name="height">Altura:</string>
<string name="switchToBackImage">Mudar para a imagem de trás</string>
<string name="switchToBarcode">Mudar para o código de barras</string>
<string name="openFrontImageInGalleryApp">Abra a imagem frontal no aplicativo da galeria</string>
<string name="openBackImageInGalleryApp">Abra a imagem traseira no aplicativo da galeria</string>
<string name="openFrontImageInGalleryApp">Abrir a imagem frontal na aplicação da galeria</string>
<string name="openBackImageInGalleryApp">Abrir a imagem traseira na aplicação da galeria</string>
<string name="setBarcodeHeight">Definir altura do código de barras</string>
<string name="donate">Doar</string>
</resources>
</resources>

View File

@@ -0,0 +1 @@
- Elegantnější vypořádání s chybějícími barvami hlaviček

View File

@@ -0,0 +1 @@
- Various RTL fixes

View File

@@ -0,0 +1 @@
- Prise en charge de la sélection exacte des détails à afficher dans l'aperçu de la carte

View File

@@ -0,0 +1 @@
- Meilleur gestion des couleurs d'en-tête manquantes

View File

@@ -1,10 +1,10 @@
- IMPORTANT : Le format de sauvegarde a changé, voir https ://github.com/TheLastProject/Catima/wiki/Export-format
- IMPORTANT : Le format de partage d'URL a changé, voir https ://github.com/TheLastProject/Catima/wiki/Card-sharing-URL-format
- CHANGEMENT MAJEUR : Le format de sauvegarde a changé, voir https ://github.com/TheLastProject/Catima/wiki/Export-format
- CHANGEMENT MAJEUR : Le format de partage d'URL a changé, voir https ://github.com/TheLastProject/Catima/wiki/Card-sharing-URL-format
- Possibilité d'activer ou non la lampe de poche lors du scan
- Prise en charge UPC-E
- Ajout de photo avant et arrière à chaque carte
- Importation de zip protégés par mot de passe
- Importation via Stocard (Bêta)
- Ajout de la prise en charge UPC-E
- Possibilité d'ajouter une photo avant et arrière à chaque carte
- Possibilité d'importation de fichier zip protégés par mot de passe
- Possibilité d'importation via Stocard (Bêta)
- Correction d'espaces inutiles des notes importées depuis Fidme
- Prise en charge du format d'exportation Voucher Vault
- Correction des boutons d'action flottants sur Android 4

View File

@@ -1,3 +1,3 @@
- Redesenho completo das telas principais e de visualização do cartão de fidelidade
- Material que você projeta para a tela de configurações
- Correção de falha ao usar "Tirar uma foto" com o aplicativo de câmera desativado
- Redesenho completo dos ecrãs principais e de visualização do cartão de fidelidade
- Utilização de "Material You" no ecrã de configurações
- Correção de falha ao usar "Tirar uma foto" com a aplicação da câmara desativado

View File

@@ -0,0 +1 @@
- Более аккуратная обработка ситуации с отсутствующими цветами заголовка