Release 1.3.0

Translations update from Weblate

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v1.3.0 (2020-11-22)
+
+Changes:
+
+- Always show all import/export options and show a toast on actual issues (improves compat with XPrivacyLua)
+- Ask for confirmation when leaving edit view after making changes without saving
+
+## v1.2.2 (2020-11-19)
+
+Changes:
+
+- Remember active group tab between screens and sessions
+
 ## v1.2.1 (2020-11-17)
 
 Changes:

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 44
-        versionName "1.2.0"
+        versionCode 47
+        versionName "1.3.0"
     }
     buildTypes {
         release {

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

@@ -100,14 +100,6 @@ public class ImportExportActivity extends AppCompatActivity
             }
         });
 
-        if(isCallable(getApplicationContext(), intentGetContentAction) == false)
-        {
-            findViewById(R.id.dividerImportFilesystem).setVisibility(View.GONE);
-            findViewById(R.id.importOptionFilesystemTitle).setVisibility(View.GONE);
-            findViewById(R.id.importOptionFilesystemExplanation).setVisibility(View.GONE);
-            importFilesystem.setVisibility(View.GONE);
-        }
-
         // Check that there is an app that data can be imported from
         final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
 
@@ -120,14 +112,6 @@ public class ImportExportActivity extends AppCompatActivity
                 chooseFileWithIntent(intentPickAction, CHOOSE_EXPORTED_FILE);
             }
         });
-
-        if(isCallable(getApplicationContext(), intentPickAction) == false)
-        {
-            findViewById(R.id.dividerImportApplication).setVisibility(View.GONE);
-            findViewById(R.id.importOptionApplicationTitle).setVisibility(View.GONE);
-            findViewById(R.id.importOptionApplicationExplanation).setVisibility(View.GONE);
-            importApplication.setVisibility(View.GONE);
-        }
     }
 
     private void startImport(final InputStream target, final Uri targetUri)
@@ -295,31 +279,6 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    /**
-     * Determines if there is at least one activity that can perform the given intent
-     */
-    private boolean isCallable(Context context, final Intent intent)
-    {
-        PackageManager manager = context.getPackageManager();
-        if(manager == null)
-        {
-            return false;
-        }
-
-        List<ResolveInfo> list = manager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-
-        for(ResolveInfo info : list)
-        {
-            if(info.activityInfo.exported)
-            {
-                // There is one activity which is available to be called
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     private void chooseFileWithIntent(Intent intent, int requestCode)
     {
         try
@@ -328,6 +287,7 @@ public class ImportExportActivity extends AppCompatActivity
         }
         catch (ActivityNotFoundException e)
         {
+            Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG);
             Log.e(TAG, "No activity found to handle intent", e);
         }
     }

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

@@ -21,9 +21,9 @@ import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.ArrayAdapter;
@@ -73,6 +73,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     DBHelper db;
     ImportURIHelper importUriHelper;
 
+    boolean hasChanged = false;
+    boolean initDone = false;
+    AlertDialog confirmExitDialog = null;
+
     private void extractIntentFields(Intent intent)
     {
         final Bundle b = intent.getExtras();
@@ -124,6 +128,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
+                hasChanged = true;
+
                 generateIcon(s.toString());
             }
 
@@ -137,6 +143,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
+                hasChanged = true;
+
                 String formatString = barcodeTypeField.getText().toString();
 
                 if (!formatString.isEmpty()) {
@@ -158,6 +166,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
+                hasChanged = true;
+
                 if (!s.toString().isEmpty()) {
                     if (s.toString().equals(getString(R.string.noBarcode))) {
                         hideBarcode();
@@ -284,6 +294,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                         break;
                     }
                 }
+                chip.setOnTouchListener(new View.OnTouchListener() {
+                    @Override
+                    public boolean onTouch(View v, MotionEvent event) {
+                        hasChanged = true;
+
+                        return false;
+                    }
+                });
 
                 groupsChips.addView(chip);
             }
@@ -362,6 +380,44 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         });
 
         generateIcon(storeFieldEdit.getText().toString());
+
+        if (!initDone) {
+            hasChanged = false;
+            initDone = true;
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        askBeforeQuitIfChanged();
+    }
+
+    private void askBeforeQuitIfChanged() {
+        if (!hasChanged) {
+            finish();
+            return;
+        }
+
+        if (confirmExitDialog == null) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(R.string.leaveWithoutSaveTitle);
+            builder.setMessage(R.string.leaveWithoutSaveConfirmation);
+            builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    finish();
+                    dialog.dismiss();
+                }
+            });
+            builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    dialog.dismiss();
+                }
+            });
+            confirmExitDialog = builder.create();
+        }
+        confirmExitDialog.show();
     }
 
     class EditCardIdAndBarcode implements View.OnClickListener
@@ -401,6 +457,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 @Override
                 public void onColorSelected(int dialogId, int color)
                 {
+                    hasChanged = true;
+
                     headingColorValue = color;
 
                     generateIcon(storeFieldEdit.getText().toString());
@@ -487,7 +545,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         switch(id)
         {
             case android.R.id.home:
-                finish();
+                askBeforeQuitIfChanged();
                 break;
 
             case R.id.action_delete:
@@ -564,6 +622,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             // Set special NO_BARCODE value to prevent onResume from overwriting it
             barcodeTypeField.setText(format.isEmpty() ? getString(R.string.noBarcode) : format);
             onResume();
+
+            hasChanged = true;
         }
     }
 

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

@@ -6,6 +6,7 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -63,6 +64,14 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             public void onTabSelected(TabLayout.Tab tab) {
                 selectedTab = tab.getPosition();
                 updateLoyaltyCardList(filter, tab.getTag());
+
+                // Store active tab in Shared Preference to restore next app launch
+                SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
+                        getString(R.string.sharedpreference_active_tab),
+                        Context.MODE_PRIVATE);
+                SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
+                activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), selectedTab);
+                activeTabPrefEditor.apply();
             }
 
             @Override
@@ -107,15 +116,22 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             }
         }
 
+        // Start of active tab logic
         TabLayout groupsTabLayout = findViewById(R.id.groups);
-        boolean hasReset = updateTabGroups(groupsTabLayout);
+        updateTabGroups(groupsTabLayout);
+
+        // Restore active tab from Shared Preference
+        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_active_tab),
+                Context.MODE_PRIVATE);
+        selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
 
         Object group = null;
 
         if (groupsTabLayout.getTabCount() != 0) {
             TabLayout.Tab tab = groupsTabLayout.getTabAt(0);
 
-            if (!hasReset) {
+            if (selectedTab < groupsTabLayout.getTabCount()) {
                 tab = groupsTabLayout.getTabAt(selectedTab);
             }
 
@@ -123,6 +139,7 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             group = tab.getTag();
         }
         updateLoyaltyCardList(filter, group);
+        // End of active tab logic
 
         FloatingActionButton addButton = findViewById(R.id.fabAdd);
         addButton.setOnClickListener(new View.OnClickListener() {
@@ -241,7 +258,7 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         });
     }
 
-    public boolean updateTabGroups(TabLayout groupsTabLayout)
+    public void updateTabGroups(TabLayout groupsTabLayout)
     {
         final DBHelper db = new DBHelper(this);
 
@@ -250,42 +267,24 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         if (newGroups.size() == 0) {
             groupsTabLayout.removeAllTabs();
             groupsTabLayout.setVisibility(View.GONE);
-            return true;
+            return;
         }
 
-        // -1 because there is an "All" tab
-        boolean isChanged = groupsTabLayout.getTabCount() - 1 != newGroups.size();
+        groupsTabLayout.removeAllTabs();
 
-        if (!isChanged) {
-            for (int i = 0; i < newGroups.size(); i++) {
-                if (!((Group) groupsTabLayout.getTabAt(i + 1).getTag())._id.equals(newGroups.get(i)._id)) {
-                    isChanged = true;
-                    break;
-                }
-            }
+        TabLayout.Tab allTab = groupsTabLayout.newTab();
+        allTab.setText(R.string.all);
+        allTab.setTag(null);
+        groupsTabLayout.addTab(allTab, false);
+
+        for (Group group : newGroups) {
+            TabLayout.Tab tab = groupsTabLayout.newTab();
+            tab.setText(group._id);
+            tab.setTag(group);
+            groupsTabLayout.addTab(tab, false);
         }
 
-        if (isChanged) {
-            groupsTabLayout.removeAllTabs();
-
-            TabLayout.Tab allTab = groupsTabLayout.newTab();
-            allTab.setText(R.string.all);
-            allTab.setTag(null);
-            groupsTabLayout.addTab(allTab);
-
-            for (Group group : newGroups) {
-                TabLayout.Tab tab = groupsTabLayout.newTab();
-                tab.setText(group._id);
-                tab.setTag(group);
-                groupsTabLayout.addTab(tab);
-            }
-
-            groupsTabLayout.setVisibility(View.VISIBLE);
-
-            return true;
-        }
-
-        return false;
+        groupsTabLayout.setVisibility(View.VISIBLE);
     }
 
     @Override

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

@@ -1,6 +1,8 @@
 package protect.card_locker;
 
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.text.InputType;
@@ -88,6 +90,16 @@ public class ManageGroupsActivity extends AppCompatActivity
         registerForContextMenu(groupList);
     }
 
+    private void invalidateHomescreenActiveTab()
+    {
+        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_active_tab),
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
+        activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), 0);
+        activeTabPrefEditor.apply();
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item)
     {
@@ -119,6 +131,8 @@ public class ManageGroupsActivity extends AppCompatActivity
             public void onClick(DialogInterface dialog, int which) {
                 db.updateGroup(groupName, input.getText().toString());
                 updateGroupList();
+                // Rename may change ordering, so invalidate
+                invalidateHomescreenActiveTab();
             }
         });
         builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
@@ -147,6 +161,8 @@ public class ManageGroupsActivity extends AppCompatActivity
             public void onClick(DialogInterface dialog, int which) {
                 db.deleteGroup(groupName);
                 updateGroupList();
+                // Delete may change ordering, so invalidate
+                invalidateHomescreenActiveTab();
             }
         });
         builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
@@ -171,6 +187,8 @@ public class ManageGroupsActivity extends AppCompatActivity
             public void onClick(DialogInterface dialog, int which) {
                 db.insertGroup(input.getText().toString());
                 updateGroupList();
+                // Create may change ordering, so invalidate
+                invalidateHomescreenActiveTab();
             }
         });
         builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {

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

@@ -84,7 +84,7 @@
     <string name="settings_system_theme">Systemvorgabe</string>
     <string name="settings_theme">Design</string>
     <string name="enterBarcodeInstructions">Geben Sie die Karten-ID ein und wählen Sie das Bild aus, das den Strichcode darstellt, den Sie verwenden möchten, oder wählen Sie „Diese Karte hat keinen Strichcode“, um keinen Strichcode zu verwenden.</string>
-    <string name="app_copyright_old">Basiert auf Loyalty Card Keychain, Copyright 2016-2020 Branden Archer.</string>
+    <string name="app_copyright_old">Basiert auf Loyalty Card Keychain, Copyright 2016–2020 Branden Archer.</string>
     <string name="exportOptionExplanation">Die Daten werden an einen Ort Ihrer Wahl geschrieben.</string>
     <string name="failedParsingImportUriError">Der Import-URI konnte nicht analysiert werden</string>
     <string name="addedShortcut">Verknüpfung hinzugefügt</string>

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

@@ -76,7 +76,7 @@
     <string name="settings_system_theme">Tema del sistema</string>
     <string name="settings_theme">Tema</string>
     <string name="enterBarcodeInstructions">Introduzca el identificador de tarjeta y seleccione la imagen que represente el código de barras que se utilizará, o bien, elija «Esta tarjeta no tiene código de barras» para no utilizar ninguno.</string>
-    <string name="app_copyright_old">Basado en Loyalty Card Keychain, derechos de autor 2016-2020 de Branden Archer.</string>
+    <string name="app_copyright_old">Basado en Loyalty Card Keychain, derechos de autor 2016–2020 de Branden Archer.</string>
     <string name="exportOptionExplanation">Los datos se guardarán en la ubicación que elija.</string>
     <string name="failedParsingImportUriError">No se pudo procesar el URI de importación</string>
     <string name="addedShortcut">Atajo añadido</string>
@@ -85,4 +85,4 @@
     <string name="barcodeType">Tipo de código de barras</string>
     <string name="noMatchingGiftCards">Ninguna tarjeta coincide con el filtro de búsqueda. Pruebe con términos distintos.</string>
     <string name="action_search">Buscar</string>
-</resources>
+</resources>

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

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_add">Ajouter</string>
-    <string name="noGiftCards">Aucune carte de fidélité enregistrée. Appuyez sur le bouton \"+\" (plus) pour commencer.\n\nLoyalty Card Locker vous permet d\'enregistrer vos cartes de fidélité sur votre téléphone pour toujours les avoir à portée de main.</string>
+    <string name="noGiftCards">Appuyez d\'abord sur le bouton \"+\" (plus) pour ajouter une carte.
+\n
+\nCatima enregistre vos cartes sur votre appareil, pour toujours les avoir à portée de main.</string>
     <string name="storeName">Nom</string>
     <string name="note">Note</string>
     <string name="cardId">Numéro</string>
@@ -16,7 +18,7 @@
     <string name="lockScreen">Désactiver la rotation</string>
     <string name="unlockScreen">Activer la rotation</string>
     <string name="deleteTitle">Supprimer la carte de fidélité</string>
-    <string name="deleteConfirmation">Confirmez que vous souhaitez supprimer cette carte.</string>
+    <string name="deleteConfirmation">Confirmez la suppression de cette carte.</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copier le numéro dans le presse-papier</string>
     <string name="sendLabel">Envoyer…</string>
@@ -24,35 +26,35 @@
     <string name="addCardTitle">Ajouter une carte de fidélité</string>
     <string name="scanCardBarcode">Scanner le code-barres</string>
     <string name="cardShortcut">Raccourci de carte</string>
-    <string name="noCardsMessage">Il n\'y a aucune carte. Ajoutez-en une d\'abord</string>
-    <string name="barcodeImageDescription">Image du code-barres de la carte</string>
+    <string name="noCardsMessage">Ajoutez d\'abord une carte</string>
+    <string name="barcodeImageDescription">Image du code-barres</string>
     <string name="noStoreError">Aucun nom n\'a été saisi</string>
-    <string name="noCardIdError">Aucun numéro n\'a été saisi</string>
-    <string name="noCardExistsError">N\'a pas pu retrouver la carte de fidélité</string>
+    <string name="noCardIdError">Aucun numéro de carte saisi</string>
+    <string name="noCardExistsError">Aucune carte trouvée</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importer/Exporter</string>
     <string name="exportName">Exporter</string>
-    <string name="importExportHelp">Exporter vos données vous permet de récupérer vos cartes sur un autre appareil.</string>
-    <string name="importSuccessfulTitle">Importé avec succès</string>
+    <string name="importExportHelp">Exporter vos cartes vous permet de les récupérer sur un autre appareil.</string>
+    <string name="importSuccessfulTitle">Importé</string>
     <string name="importFailedTitle">Échec de l\'import</string>
-    <string name="importFailed">Échec de l\'import </string>
-    <string name="exportSuccessfulTitle">Exporté avec succès</string>
+    <string name="importFailed">Impossible d\'importer les cartes</string>
+    <string name="exportSuccessfulTitle">Exporté</string>
     <string name="exportFailedTitle">Échec de l\'export</string>
-    <string name="exportFailed">Échec de l\'export </string>
+    <string name="exportFailed">Impossible d\'exporter les cartes</string>
     <string name="importing">Import …</string>
     <string name="exporting">Export …</string>
-    <string name="noExternalStoragePermissionError">Impossible d\'importer ou d\'exporter les données sans l\'autorisation d\'accès au stockage externe</string>
+    <string name="noExternalStoragePermissionError">Veuillez autoriser l\'accès au stockage externe avant d\'importer/exporter les données</string>
     <string name="importOptionFilesystemTitle">Importer depuis le système de fichiers</string>
     <string name="importOptionFilesystemExplanation">Choisissez le fichier à importer.</string>
     <string name="importOptionFilesystemButton">Système de fichiers</string>
     <string name="importOptionApplicationTitle">Utiliser une application externe</string>
-    <string name="importOptionApplicationExplanation">Utilisez une application externe comme Dropbox, Google Drive, ou votre gestionnaire de fichiers favori pour ouvrir un fichier.</string>
-    <string name="importOptionApplicationButton">Application externe</string>
+    <string name="importOptionApplicationExplanation">Utilisez le gestionnaire de fichiers de votre choix pour importer un fichier.</string>
+    <string name="importOptionApplicationButton">Utiliser une application externe</string>
     <string name="about">À propos</string>
-    <string name="app_license">Licence GPLv3.</string>
+    <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+.</string>
     <string name="about_title_fmt">À propos de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Notes sur les versions : <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_revision_fmt">Notes de version : &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"app_revision_url\"&gt;%s&lt;/xliff:g&gt;</string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utilise les bibliothèques-tierces suivantes : <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> utilise les ressources-tierces suivantes : <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Choisissez le code-barres</string>
@@ -65,29 +67,29 @@
     <string name="storeNameColorDescription">Couleur pour le nom du magasin</string>
     <string name="settings">Paramètres</string>
     <string name="settings_category_title_ui">Interface utilisateur</string>
-    <string name="settings_card_title_list_font_size">Taille de police pour les titres de carte en liste</string>
-    <string name="settings_card_note_list_font_size">Taille de police pour les notes de carte en liste</string>
-    <string name="settings_card_title_font_size">Taille de police pour les titres de carte</string>
-    <string name="settings_card_id_font_size">Taille de police pour les numéros de carte</string>
-    <string name="settings_card_note_font_size">Taille de police pour les notes de carte</string>
+    <string name="settings_card_title_list_font_size">Taille du nom des cartes (mode liste)</string>
+    <string name="settings_card_note_list_font_size">Taille de la description (mode liste)</string>
+    <string name="settings_card_title_font_size">Taille du nom de la carte (aperçu)</string>
+    <string name="settings_card_id_font_size">Taille des numéros de carte</string>
+    <string name="settings_card_note_font_size">Taille de la description (aperçu)</string>
     <string name="settings_display_barcode_max_brightness">Augmenter la luminosité du code-barres</string>
     <string name="settings_lock_barcode_orientation">Verrouiller l\'orientation du code-barres</string>
-    <string name="exportSuccessful">Carte de fidélité exportée avec succès</string>
-    <string name="importSuccessful">Carte de fidélité importée avec succès</string>
+    <string name="exportSuccessful">Carte exportée avec succès</string>
+    <string name="importSuccessful">Données importées avec succès</string>
     <string name="intent_import_card_from_url_share_text">Je veux partager une carte avec toi</string>
-    <string name="settings_dark_theme">Thème sombre</string>
-    <string name="settings_light_theme">Thème clair</string>
-    <string name="settings_system_theme">Thème du système</string>
+    <string name="settings_dark_theme">Sombre</string>
+    <string name="settings_light_theme">Clair</string>
+    <string name="settings_system_theme">Système</string>
     <string name="settings_theme">Thème</string>
     <string name="enterBarcodeInstructions">Entrez l\'identifiant de la carte puis sélectionnez l\'image qui représente le code-barres que vous souhaitez utiliser, ou sélectionnez « Cette carte n\'a pas de code-barres » pour ne pas utiliser de code-barres.</string>
-    <string name="app_copyright_old">Basé sur Loyalty Card Keychain, copyright 2016-2020 Branden Archer.</string>
-    <string name="exportOptionExplanation">Les données seront écrites à un emplacement de votre choix.</string>
+    <string name="app_copyright_old">Basé sur Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
+    <string name="exportOptionExplanation">Les données seront eportées vers l\'emplacement de votre choix.</string>
     <string name="failedParsingImportUriError">Impossible d\'analyser l\'URI d\'importation</string>
     <string name="addedShortcut">Raccourci ajouté</string>
     <string name="share">Partager</string>
     <string name="barcodeNoBarcode">Cette carte n\'a pas de code-barres</string>
     <string name="barcodeType">Type de code-barres</string>
-    <string name="noMatchingGiftCards">Aucune carte ne correspond au filtre. Veuillez essayer d\'autres termes.</string>
+    <string name="noMatchingGiftCards">Aucun résultat. Essayez de modifier votre recherche.</string>
     <string name="action_search">Rechercher</string>
     <string name="unstar">Retirer des favoris</string>
     <string name="star">Ajouter aux favoris</string>
@@ -95,9 +97,13 @@
     <string name="deleteConfirmationGroup">Confirmez que vous voulez supprimer cette carte</string>
     <string name="all">Tous</string>
     <string name="groupCardCount">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; cartes</string>
-    <string name="noGroups">Vous n\'avez aucun groupe pour le moment. Cliquez sur le bouton + (plus) pour commencer.
+    <string name="noGroups">Cliquez d\'abord sur le bouton \"+\" (plus) pour ajouter un groupe.
 \n
-\nLes cartes peuvent être attribuées à des groupes pour les rendre plus faciles à trouver.</string>
+\nLes groupes permettent de facilement retrouver vos cartes.</string>
     <string name="groups">Groupes</string>
     <string name="enter_group_name">Entrez le nom du groupe</string>
+    <string name="noBarcode">Aucun code-barres</string>
+    <string name="leaveWithoutSaveConfirmation">Voulez-vous quitter la page \? Toutes vos modifications seront perdues.</string>
+    <string name="leaveWithoutSaveTitle">Quitter sans enregistrer</string>
+    <string name="failedOpeningFileManager">Gestionnaire de fichiers introuvable. Installez-en un si nécessaire.</string>
 </resources>

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

@@ -85,7 +85,7 @@
     <string name="intent_import_card_from_url_share_text">Voglio condividere una carta fedeltà con te</string>
     <string name="exportSuccessful">Dati della carta fedeltà esportati correttamente</string>
     <string name="importSuccessful">Dati della carta fedeltà importati correttamente</string>
-    <string name="app_copyright_old">Basato su Loyalty Card Keychain, copyright 2016-2020 Branden Archer.</string>
+    <string name="app_copyright_old">Basato su Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
     <string name="exportOptionExplanation">I dati verranno scritti in una posizione a tua scelta.</string>
     <string name="addedShortcut">Scorciatoia aggiunta</string>
     <string name="barcodeType">Tipo di codice a barre</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -55,10 +55,8 @@
     <string name="importOptionApplicationButton">Bruk eksternt program</string>
     <string name="about">Om</string>
     <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+.</string>
-    <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g>
-    </string>
-    <string name="debug_version_fmt">Versjon: <xliff:g id="version">%s</xliff:g>
-    </string>
+    <string name="about_title_fmt">Om &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"app_name\"&gt;%s&lt;/xliff:g&gt;</string>
+    <string name="debug_version_fmt">Versjon: &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"version\"&gt;%s&lt;/xliff:g&gt;</string>
     <string name="app_revision_fmt">Utgivelsesinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> brukfer følgende tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> bruker følgende tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
@@ -99,12 +97,13 @@
     <string name="groupCardCount">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; kort</string>
     <string name="noGroups">Klikk på «+»-tegnet for å legge til grupper først.
 \n
-\nGrupper gjør ting enklere å finne.
-\n
-\nKort kan tildeles grupper for å gjøre dem enklere å finne.</string>
+\nGrupper gjør ting enklere å finne.</string>
     <string name="deleteConfirmationGroup">Bekreft at du ønsker å slette denne gruppen</string>
     <string name="all">Alle</string>
     <string name="groups">Grupper</string>
     <string name="enter_group_name">Skriv inn gruppenavn</string>
     <string name="noBarcode">Ingen strekkode</string>
+    <string name="failedOpeningFileManager">Klarte ikke å åpne noen filbehandler. Forsikre deg om at du har installert en.</string>
+    <string name="leaveWithoutSaveConfirmation">Er du sikker på at du vil forlate denne skjermen\? Endringer vil ikke bli lagret.</string>
+    <string name="leaveWithoutSaveTitle">Forlat uten å lagre</string>
 </resources>

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

@@ -97,7 +97,7 @@
     <string name="groups">Groep</string>
     <string name="enter_group_name">Voer groepsnaam in</string>
     <string name="starImage">Favoriete ster</string>
-    <string name="app_copyright_old">Gebaseerd op Loyalty Card Keychain, copyright 2016-2020 Branden Archer.</string>
+    <string name="app_copyright_old">Gebaseerd op Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
     <string name="unstar">Verwijder uit favorieten</string>
     <string name="star">Toevoegen aan favorieten</string>
 </resources>

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

@@ -102,21 +102,23 @@
     <string name="settings_key_light_theme" translatable="false">light</string>
     <string name="settings_dark_theme">Dark</string>
     <string name="settings_key_dark_theme" translatable="false">dark</string>
-    <string name="settings_card_title_list_font_size">Font size for card titles</string>
+    <string name="settings_card_title_list_font_size">Card title font size (list mode)</string>
     <string name="settings_key_card_title_list_font_size" translatable="false">pref_card_title_list_font_size_sp</string>
-    <string name="settings_card_note_list_font_size">Font size for card note list </string>
+    <string name="settings_card_note_list_font_size">Card note font size (list mode)</string>
     <string name="settings_key_card_note_list_font_size" translatable="false">pref_card_note_list_font_size_sp</string>
-    <string name="settings_card_title_font_size">Card title font size</string>
+    <string name="settings_card_title_font_size">Card title font size (preview)</string>
     <string name="settings_key_card_title_font_size" translatable="false">pref_card_title_font_size_sp</string>
     <string name="settings_card_id_font_size">Card ID font size</string>
     <string name="settings_key_card_id_font_size" translatable="false">pref_card_id_font_size_sp</string>
-    <string name="settings_card_note_font_size">Card note font size</string>
+    <string name="settings_card_note_font_size">Card note font size (preview)</string>
     <string name="settings_key_card_note_font_size" translatable="false">pref_card_note_font_size_sp</string>
     <string name="settings_display_barcode_max_brightness">Brighten barcode view</string>
     <string name="settings_key_display_barcode_max_brightness" translatable="false">pref_display_card_max_brightness</string>
     <string name="settings_lock_barcode_orientation">Lock barcode orientation</string>
     <string name="settings_key_lock_barcode_orientation" translatable="false">pref_lock_barcode_orientation</string>
 
+    <string name="sharedpreference_active_tab" translatable="false">sharedpreference_active_tab</string>
+
     <string name="intent_import_card_from_url_share_text">I want to share a card with you</string>
     <string name="intent_import_card_from_url_host" translatable="false">thelastproject.github.io</string>
     <string name="intent_import_card_from_url_path_prefix" translatable="false">/Catima/share</string>
@@ -131,4 +133,7 @@
     <string name="groupCardCount"><xliff:g>%d</xliff:g> cards</string>
     <string name="all">All</string>
     <string name="deleteConfirmationGroup">Please confirm you want to delete this group</string>
+    <string name="failedOpeningFileManager">Failed opening a file manager. Please make sure one is installed.</string>
+    <string name="leaveWithoutSaveTitle">Leave without saving</string>
+    <string name="leaveWithoutSaveConfirmation">Are you sure you want to leave this screen? Changed made will not be saved.</string>
 </resources>

app/src/test/java/protect/card_locker/ImportExportActivityTest.java

@@ -60,56 +60,6 @@ public class ImportExportActivityTest
         assertEquals(state, buttonView.getVisibility());
     }
 
-    @Test
-    public void testImportFilesystemOption()
-    {
-        for(boolean isInstalled : new Boolean[]{false, true})
-        {
-            int visibility = isInstalled ? View.VISIBLE : View.GONE;
-
-            if(isInstalled)
-            {
-                registerIntentHandler(Intent.ACTION_GET_CONTENT);
-            }
-
-            Activity activity = Robolectric.setupActivity(ImportExportActivity.class);
-
-            checkVisibility(activity, visibility, R.id.dividerImportFilesystem,
-                    R.id.importOptionFilesystemTitle, R.id.importOptionFilesystemExplanation,
-                    R.id.importOptionFilesystemButton);
-
-            // Should always be gone, as its provider is never installed
-            checkVisibility(activity, View.GONE, R.id.dividerImportApplication,
-                    R.id.importOptionApplicationTitle, R.id.importOptionApplicationExplanation,
-                    R.id.importOptionApplicationButton);
-        }
-    }
-
-    @Test
-    public void testImportApplicationOption()
-    {
-        for(boolean isInstalled : new Boolean[]{false, true})
-        {
-            int visibility = isInstalled ? View.VISIBLE : View.GONE;
-
-            if(isInstalled)
-            {
-                registerIntentHandler(Intent.ACTION_PICK);
-            }
-
-            Activity activity = Robolectric.setupActivity(ImportExportActivity.class);
-
-            checkVisibility(activity, visibility, R.id.dividerImportApplication,
-                    R.id.importOptionApplicationTitle, R.id.importOptionApplicationExplanation,
-                    R.id.importOptionApplicationButton);
-
-            // Should always be gone, as its provider is never installed
-            checkVisibility(activity, View.GONE, R.id.dividerImportFilesystem,
-                    R.id.importOptionFilesystemTitle, R.id.importOptionFilesystemExplanation,
-                    R.id.importOptionFilesystemButton);
-        }
-    }
-
     @Test
     public void testAllOptionsAvailable()
     {

app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java

@@ -352,7 +352,7 @@ public class LoyaltyCardViewActivityTest
         activityController.visible();
         activityController.resume();
 
-        Activity activity = (Activity)activityController.get();
+        LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
 
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
 
@@ -363,7 +363,17 @@ public class LoyaltyCardViewActivityTest
 
         // Cancel the loyalty card creation
         assertEquals(false, activity.isFinishing());
+
+        // A change was made
         shadowOf(activity).clickMenuItem(android.R.id.home);
+        assertEquals(true, activity.confirmExitDialog.isShowing());
+        assertEquals(true, activity.hasChanged);
+        assertEquals(false, activity.isFinishing());
+
+        // Exit after setting hasChanged to false
+        activity.hasChanged = false;
+        shadowOf(activity).clickMenuItem(android.R.id.home);
+        assertEquals(false, activity.hasChanged);
         assertEquals(true, activity.isFinishing());
     }
 
@@ -448,7 +458,7 @@ public class LoyaltyCardViewActivityTest
     public void startWithLoyaltyCardWithReceiptUpdateReceiptCancel() throws IOException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
-        Activity activity = (Activity)activityController.get();
+        LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
         DBHelper db = new DBHelper(activity);
 
         db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
@@ -466,7 +476,16 @@ public class LoyaltyCardViewActivityTest
 
         // Cancel the loyalty card creation
         assertEquals(false, activity.isFinishing());
+        // A change was made
         shadowOf(activity).clickMenuItem(android.R.id.home);
+        assertEquals(true, activity.confirmExitDialog.isShowing());
+        assertEquals(true, activity.hasChanged);
+        assertEquals(false, activity.isFinishing());
+
+        // Exit after setting hasChanged to false
+        activity.hasChanged = false;
+        shadowOf(activity).clickMenuItem(android.R.id.home);
+        assertEquals(false, activity.hasChanged);
         assertEquals(true, activity.isFinishing());
     }
 

docs/README.md

@@ -6,6 +6,8 @@
 <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
 <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>
+<a href="https://apt.izzysoft.de/fdroid/index/apk/me.hackerchick.catima" target="_blank">
+<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="90"/></a>
 
 ![Logo](https://github.com/TheLastProject/Catima/raw/master/app/src/main/ic_launcher-playstore.png)
 

fastlane/metadata/android/ru/short_description.txt

@@ -0,0 +1 @@
+Управление картами покупателя и скидок со штрих-кодами на вашем телефоне

fastlane/metadata/android/ru/title.txt

@@ -0,0 +1 @@
+Catima - менеджер карт скидок