Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker

643: Translations update from Hosted Weblate r=TheLastProject a=weblate

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


It also includes following components:

* [Catima/Fastlane](https://hosted.weblate.org/projects/catima/fastlane/)



Current translation status:

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


Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Nyatsuki <Odamaki@yandex.ru>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v2.11.2 - 95 (2021-12-04)
+
+- Fix crash on sharing card
+
+## v2.11.1 - 94 (2021-11-30)
+
+- Fix blurriness of main screen letter icons
+- Fix icons sometimes disappearing after selection
+- Fix status bar icons possibly being invisible on Android 5
+
 ## v2.11.0 - 93 (2021-11-28)
 
 - Add Catima to [Quick Access Device Controls](https://developer.android.com/guide/topics/ui/device-control)

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 93
-        versionName "2.11.0"
+        versionCode 95
+        versionName "2.11.2"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -106,7 +106,7 @@ dependencies {
 // Testing
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.7.2'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
 }
 
 tasks.withType(SpotBugsTask) {

app/src/main/java/protect/card_locker/ImportURIHelper.java

@@ -197,6 +197,7 @@ public class ImportURIHelper {
         sendIntent.setType("text/plain");
 
         Intent shareIntent = Intent.createChooser(sendIntent, null);
+        shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(shareIntent);
     }
 }

app/src/main/java/protect/card_locker/LoyaltyCardAnimator.java

@@ -1,37 +0,0 @@
-package protect.card_locker;
-
-import android.animation.AnimatorInflater;
-import android.animation.AnimatorSet;
-import android.content.Context;
-import android.view.View;
-
-public class LoyaltyCardAnimator {
-
-    private static AnimatorSet selectedViewIn, defaultViewOut, selectedViewOut, defaultViewIn;
-
-    public static void flipView(Context inputContext, final View inputSelectedView, final View inputDefaultView, boolean inputItemSelected) {
-
-        selectedViewIn = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_left_in);
-        defaultViewOut = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_right_out);
-        selectedViewOut = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_left_out);
-        defaultViewIn = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_right_in);
-
-        final AnimatorSet showFrontAnim = new AnimatorSet();
-        final AnimatorSet showBackAnim = new AnimatorSet();
-
-        selectedViewIn.setTarget(inputSelectedView);
-        defaultViewOut.setTarget(inputDefaultView);
-        showFrontAnim.playTogether(selectedViewIn, defaultViewOut);
-
-        selectedViewOut.setTarget(inputSelectedView);
-        defaultViewIn.setTarget(inputDefaultView);
-        showBackAnim.playTogether(defaultViewIn, selectedViewOut);
-
-        if (inputItemSelected) {
-            showFrontAnim.start();
-        } else {
-            showBackAnim.start();
-        }
-    }
-
-}

app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java

@@ -163,35 +163,19 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition) {
         if (mSelectedItems.get(inputPosition, false)) {
             inputHolder.mCardIcon.setVisibility(View.GONE);
-            resetIconYAxis(inputHolder.mTickIcon);
             inputHolder.mTickIcon.setVisibility(View.VISIBLE);
             if (mCurrentSelectedIndex == inputPosition) {
-                LoyaltyCardAnimator.flipView(mContext, inputHolder.mTickIcon, inputHolder.mCardIcon, true);
                 resetCurrentIndex();
             }
         } else {
             inputHolder.mTickIcon.setVisibility(View.GONE);
-            resetIconYAxis(inputHolder.mCardIcon);
             inputHolder.mCardIcon.setVisibility(View.VISIBLE);
             if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition) {
-                LoyaltyCardAnimator.flipView(mContext, inputHolder.mTickIcon, inputHolder.mCardIcon, false);
                 resetCurrentIndex();
             }
         }
     }
 
-    private void resetIconYAxis(View inputView) {
-        if (inputView.getRotationY() != 0) {
-            inputView.setRotationY(0);
-        }
-    }
-
-    public void resetAnimationIndex() {
-        mReverseAllAnimations = false;
-        mAnimationItemsIndex.clear();
-    }
-
-
     public void toggleSelection(int inputPosition) {
         mCurrentSelectedIndex = inputPosition;
         if (mSelectedItems.get(inputPosition, false)) {

app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java

@@ -48,6 +48,7 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.widget.NestedScrollView;
 import androidx.core.widget.TextViewCompat;
@@ -583,8 +584,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         // Make notification area light if dark icons are needed
         if (Build.VERSION.SDK_INT >= 23) {
             window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0);
+            window.setStatusBarColor(Color.TRANSPARENT);
+        } else {
+            // Darken statusbar if icons won't be visible otherwise
+            window.setStatusBarColor(backgroundNeedsDarkIcons ? ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.15f) : Color.TRANSPARENT);
         }
-        window.setStatusBarColor(Color.TRANSPARENT);
 
         // Set shadow colour of store text so even same color on same color would be readable
         storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE);

app/src/main/java/protect/card_locker/MainActivity.java

@@ -168,12 +168,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         public void onDestroyActionMode(ActionMode inputMode) {
             mAdapter.clearSelections();
             mCurrentActionMode = null;
-            mCardList.post(new Runnable() {
-                @Override
-                public void run() {
-                    mAdapter.resetAnimationIndex();
-                }
-            });
         }
     };
 

app/src/main/java/protect/card_locker/Utils.java

@@ -84,7 +84,7 @@ public class Utils {
             tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
         }
 
-        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
+        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterImageSize);
 
         if (backgroundColor == null) {
             backgroundColor = LetterBitmap.getDefaultColor(context, store);

app/src/main/res/animator/flip_left_in.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-   <objectAnimator
-        android:duration="0"
-        android:propertyName="alpha"
-        android:valueFrom="1.0"
-        android:valueTo="0.0" />
-
-    <objectAnimator
-        android:duration="@integer/full_rotation_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="rotationY"
-        android:valueFrom="-180"
-        android:valueTo="0" />
-
-    <objectAnimator
-        android:duration="1"
-        android:propertyName="alpha"
-        android:startOffset="@integer/half_rotation_duration"
-        android:valueFrom="0.0"
-        android:valueTo="1.0" />
-</set>

app/src/main/res/animator/flip_left_out.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-        android:duration="@integer/full_rotation_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="rotationY"
-        android:valueFrom="0"
-        android:valueTo="180" />
-
-   <objectAnimator
-        android:duration="1"
-        android:propertyName="alpha"
-        android:startOffset="@integer/half_rotation_duration"
-        android:valueFrom="1.0"
-        android:valueTo="0.0" />
-</set>

app/src/main/res/animator/flip_right_in.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-   <objectAnimator
-        android:duration="0"
-        android:propertyName="alpha"
-        android:valueFrom="1.0"
-        android:valueTo="0.0" />
-
-    <objectAnimator
-        android:duration="@integer/full_rotation_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="rotationY"
-        android:valueFrom="180"
-        android:valueTo="0" />
-
-    <objectAnimator
-        android:duration="1"
-        android:propertyName="alpha"
-        android:startOffset="@integer/half_rotation_duration"
-        android:valueFrom="0.0"
-        android:valueTo="1.0" />
-</set>

app/src/main/res/animator/flip_right_out.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-        android:duration="@integer/full_rotation_duration"
-        android:interpolator="@android:interpolator/accelerate_decelerate"
-        android:propertyName="rotationY"
-        android:valueFrom="0"
-        android:valueTo="-180" />
-
-    <objectAnimator
-        android:duration="1"
-        android:propertyName="alpha"
-        android:startOffset="@integer/half_rotation_duration"
-        android:valueFrom="1.0"
-        android:valueTo="0.0" />
-</set>

app/src/main/res/values-bg/strings.xml

@@ -217,4 +217,7 @@
     <string name="selectColor">Избиране на цвят</string>
     <string name="group_name_is_empty">Името на списъка не може да е празно</string>
     <string name="group_edit">Редактиране на списък</string>
+    <string name="action_show_details">Повече детайли</string>
+    <string name="action_hide_details">По-малко детайли</string>
+    <string name="noGiftCardsGroup">Няма карти. След като добавите ще можете да ги зачислите към списък от тук.</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -196,7 +196,7 @@
     <string name="rate_this_app">このアプリを評価する</string>
     <string name="on_github">GitHub</string>
     <string name="source_repository">ソースリポジトリ</string>
-    <string name="exportPassword">パスワードを設定してエクスポートしたファイルを保護する(任意)</string>
+    <string name="exportPassword">パスワードを設定する(不要なら空欄)</string>
     <string name="exportPasswordHint">パスワードを入力してください</string>
     <string name="version_history">更新履歴</string>
     <string name="credits">貢献者</string>
@@ -206,4 +206,13 @@
     <string name="report_error">エラーを報告する</string>
     <string name="reverse">逆順</string>
     <string name="and_data_usage">and data usage</string>
+    <string name="group_updated">グループを更新しました</string>
+    <string name="editGroup">グループ編集: <xliff:g>%s</xliff:g></string>
+    <string name="action_show_details">詳細を表示</string>
+    <string name="action_hide_details">詳細を非表示</string>
+    <string name="selectColor">色を選択</string>
+    <string name="setIcon">アイコン設定</string>
+    <string name="group_edit">グループ編集</string>
+    <string name="group_name_already_in_use">このグループ名は既に使用されています</string>
+    <string name="group_name_is_empty">グループ名を入力してください</string>
 </resources>

app/src/main/res/values/dimens.xml

@@ -33,7 +33,8 @@
     <dimen name="activity_margin">16dp</dimen>
 
     <!-- The default letter tile text size -->
-    <dimen name="tileLetterFontSize">33sp</dimen>
-    <dimen name="tileLetterFontSizeForShortcut">24dp</dimen>
+    <dimen name="tileLetterFontSize">66sp</dimen>
+    <dimen name="tileLetterFontSizeForShortcut">48dp</dimen>
+    <dimen name="tileLetterImageSize">92dp</dimen>
     <dimen name="cardViewLetterFontSize">100sp</dimen>
 </resources>

fastlane/metadata/android/en-US/changelogs/94.txt

@@ -0,0 +1,3 @@
+- Fix blurriness of main screen letter icons
+- Fix icons sometimes disappearing after selection
+- Fix status bar icons possibly being invisible on Android 5

fastlane/metadata/android/nb-NO/changelogs/93.txt

@@ -0,0 +1,2 @@
+- Catima lagt til i hurtigtilgang til kontroller for enheter (https://developer.android.com/guide/topics/ui/device-control)
+- Grupper vises nå riktig i gruppehåndtering

fastlane/metadata/android/nb-NO/full_description.txt

@@ -8,7 +8,7 @@ Med dette essensielle verktøyet kan du erstatte unyttig plast med kontanter.
 - Unngå spionasje med veldig få tilganger. Ingen tilgang til Internett, og ingen reklame.
 - Legg til kort eller koder med navn og egne farger.
 - Manuell kodeinnskriving hvis det ikke er noen strekkode å lagre, eller den ikke kan brukes.
-- Importer kort og koder fra filer ,Catima, FidMe, Kundekortknippe, Stocard og Voucher Vault.
+- Importer kort og koder fra filer, Catima, FidMe, Kundekortknippe, Stocard og Voucher Vault.
 - Lag en sikkerhetskopi av alle kortene dine og overfør dem til en ny enhet hvis du ønsker det.
 - Del kupponger, eksklusive tilbud, promokoder eller kort og koder ved bruk av ethvert program.
 - Mørk drakt og tilgjengelighetsvalg for synshemmede brukere.

fastlane/metadata/android/tr-TR/changelogs/10.txt

@@ -0,0 +1,3 @@
+- Öntanımlı içe/dışa aktarma dosya adı değiştirildi. (https://github.com/brarcher/loyalty-card-locker/pull/84)
+- İçe/dışa aktarma sayfasındaki dizge düzeltildi. (https://github.com/brarcher/loyalty-card-locker/pull/87)
+- Kart görünümü sayfasının düzeni iyileştirildi. Metnin okunması daha kolay olmalı ve uzun bir tıklama ile seçilebilir olmalıdır. https://github.com/brarcher/loyalty-card-locker/pull/91)

fastlane/metadata/android/tr-TR/changelogs/12.txt

@@ -0,0 +1 @@
+- İlk çalıştırma giriş sihirbazında ekranı döndürürken oluşan çökmeyi önle.

fastlane/metadata/android/tr-TR/changelogs/19.txt

@@ -0,0 +1,3 @@
+- Belirli türdeki bozuk CSV dosyalarını içe aktarırken oluşan çökme düzeltildi. (https://github.com/brarcher/loyalty-card-locker/pull/177)
+- Yedekleri doğrudan dosya sisteminden içe aktarma düzeltildi. (https://github.com/brarcher/loyalty-card-locker/pull/180)
+- Belirli içerik sağlayıcı türlerinden yedekleri içe aktarma düzeltildi. (https://github.com/brarcher/loyalty-card-locker/pull/179)

fastlane/metadata/android/tr-TR/changelogs/2.txt

@@ -0,0 +1,3 @@
+- İtalyanca çeviri
+- Tüm 1B barkod türleri için destek. (Başlangıçta yalnızca ürün 1B barkodları destekleniyordu)
+- Başlangıçta eksik olan gerekli kamera izni eklendi.

fastlane/metadata/android/tr-TR/changelogs/21.txt

@@ -0,0 +1,2 @@
+- Kart listesi düzeni iyileştirildi. (https://github.com/brarcher/loyalty-card-locker/pull/188)
+- Kartı görüntüleme düzeni iyileştirildi. (https://github.com/brarcher/loyalty-card-locker/pull/190)

fastlane/metadata/android/tr-TR/changelogs/93.txt

@@ -0,0 +1,2 @@
+- Catima'yı Hızlı Erişim Aygıt Denetimlerine ekle (https://developer.android.com/guide/topics/ui/device-control)
+- Grup yönetimi ekranında bazı grupların doğru görünmemesini düzelt

fastlane/metadata/android/tr-TR/changelogs/94.txt

@@ -0,0 +1,3 @@
+- Ana ekran harf simgelerinin bulanıklığını düzelt
+- Simgelerin seçtikten sonra bazen kaybolmasını düzelt
+- Android 5'te bazen görünmez olan durum çubuğu simgelerini düzelt