Merge branch 'master' into feature/multiple-barcodes

2026-01-15 02:18:01 -05:00 · 2020-02-21 15:29:26 +01:00
parent 67383a7f10 2f562b432c
commit d092cbe930
24 changed files with 435 additions and 171 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## v0.27 (2020-01-26)
+
+Changes:
+- Tapping on a barcode now moves it to the top of the screen ([#348](https://github.com/brarcher/loyalty-card-locker/pull/348))
+- Add white space around barcodes to improve scanning in dark mode ([#328](https://github.com/brarcher/loyalty-card-locker/issues/328))
+- Fix swapped import buttons. ([#346](https://github.com/brarcher/loyalty-card-locker/pull/346))
+
+## v0.26.1 (2020-01-09)
+
+Changes:
+- Fix issue with sharing cards without background color ([#343](https://github.com/brarcher/loyalty-card-locker/pull/343))
+
+## v0.26 (2020-01-05)
+
+Changes:
+- Add ability to search for a card ([#320](https://github.com/brarcher/loyalty-card-locker/pull/320))
+- Add ability to share and receive loyalty cards ([#321](https://github.com/brarcher/loyalty-card-locker/pull/321))
+- Dark mode support ([#322](https://github.com/brarcher/loyalty-card-locker/pull/322))
+- Loyalty cards can now be barcodeless (e.g. not have a barcode) ([#324](https://github.com/brarcher/loyalty-card-locker/pull/324))
+- Notes can span multiple lines ([#326](https://github.com/brarcher/loyalty-card-locker/pull/326))
+- Improvements with the sizing of notes ([#319](https://github.com/brarcher/loyalty-card-locker/pull/319))
+- Improve notification and app icon visibility ([#330](https://github.com/brarcher/loyalty-card-locker/pull/330))
+- Update target SDK to Android 10
+- Improve the following translations:
+  * German
+  * Italian
+  * Dutch
+  * Polish
+  * Russian
+
 ## v0.25.4 (2019-10-04)

 Changes
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
        applicationId "protect.card_locker"
        minSdkVersion 16
        targetSdkVersion 29
-        versionCode 35
-        versionName "0.25.4"
+        versionCode 38
+        versionName "0.27"
    }
    buildTypes {
        release {
--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -81,36 +81,14 @@ public class ImportExportActivity extends AppCompatActivity
            }
        });

-
-        // Check that there is an activity that can bring up a file chooser
-        final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
-
-        Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
-        importFilesystem.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                chooseFileWithIntent(intentPickAction);
-            }
-        });
-
-        if(isCallable(getApplicationContext(), intentPickAction) == 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 application that can find content
+        // Check that there is a file manager available
        final Intent intentGetContentAction = new Intent(Intent.ACTION_GET_CONTENT);
        intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
        intentGetContentAction.setType("*/*");

-        Button importApplication = findViewById(R.id.importOptionApplicationButton);
-        importApplication.setOnClickListener(new View.OnClickListener()
+
+        Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
+        importFilesystem.setOnClickListener(new View.OnClickListener()
        {
            @Override
            public void onClick(View v)
@@ -120,6 +98,27 @@ 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);
+
+        Button importApplication = findViewById(R.id.importOptionApplicationButton);
+        importApplication.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                chooseFileWithIntent(intentPickAction);
+            }
+        });
+
+        if(isCallable(getApplicationContext(), intentPickAction) == false)
        {
            findViewById(R.id.dividerImportApplication).setVisibility(View.GONE);
            findViewById(R.id.importOptionApplicationTitle).setVisibility(View.GONE);
@@ -127,7 +126,6 @@ public class ImportExportActivity extends AppCompatActivity
            importApplication.setVisibility(View.GONE);
        }

-
        // This option, to import from the fixed location, should always be present

        Button importButton = findViewById(R.id.importOptionFixedButton);
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -35,12 +35,24 @@ public class ImportURIHelper {
        }

        try {
+            // These values are allowed to be null
+            Integer headerColor = null;
+            Integer headerTextColor = null;
+
            String store = uri.getQueryParameter(STORE);
            String note = uri.getQueryParameter(NOTE);
            String cardId = uri.getQueryParameter(CARD_ID);
            String barcodeType = uri.getQueryParameter(BARCODE_TYPE);
-            Integer headerColor = Integer.parseInt(uri.getQueryParameter(HEADER_COLOR));
-            Integer headerTextColor = Integer.parseInt(uri.getQueryParameter(HEADER_TEXT_COLOR));
+            String unparsedHeaderColor = uri.getQueryParameter(HEADER_COLOR);
+            if(unparsedHeaderColor != null)
+            {
+                headerColor = Integer.parseInt(unparsedHeaderColor);
+            }
+            String unparsedHeaderTextColor = uri.getQueryParameter(HEADER_TEXT_COLOR);
+            if(unparsedHeaderTextColor != null)
+            {
+                headerTextColor = Integer.parseInt(unparsedHeaderTextColor);
+            }
            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor);
        } catch (NullPointerException | NumberFormatException ex) {
            throw new InvalidObjectException("Not a valid import URI");
@@ -57,8 +69,14 @@ public class ImportURIHelper {
        uriBuilder.appendQueryParameter(NOTE, loyaltyCard.note);
        uriBuilder.appendQueryParameter(CARD_ID, loyaltyCard.cardId);
        uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType);
-        uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
-        uriBuilder.appendQueryParameter(HEADER_TEXT_COLOR, loyaltyCard.headerTextColor.toString());
+        if(loyaltyCard.headerColor != null)
+        {
+            uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
+        }
+        if(loyaltyCard.headerTextColor != null)
+        {
+            uriBuilder.appendQueryParameter(HEADER_TEXT_COLOR, loyaltyCard.headerTextColor.toString());
+        }

        return uriBuilder.build();
    }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -7,6 +7,8 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.GestureDetectorCompat;
@@ -23,6 +25,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
@@ -62,7 +65,12 @@ public class LoyaltyCardViewActivity extends AppCompatActivity implements Gestur
    ImportURIHelper importURIHelper;
    Settings settings;

+    String cardIdString;
+    BarcodeFormat format;
+
    boolean backgroundNeedsDarkIcons;
+    boolean barcodeIsFullscreen = false;
+    ViewGroup.LayoutParams barcodeImageState;

    private void extractIntentFields(Intent intent)
    {
@@ -161,6 +169,21 @@ public class LoyaltyCardViewActivity extends AppCompatActivity implements Gestur
        savedInstanceState.putInt("id", loyaltyCardId);

        super.onSaveInstanceState(savedInstanceState);
+
+        // Allow making barcode fullscreen on tap
+        barcodeImage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(barcodeIsFullscreen)
+                {
+                    setFullscreen(false);
+                }
+                else
+                {
+                    setFullscreen(true);
+                }
+            }
+        });
    }

    @Override
@@ -179,6 +202,15 @@ public class LoyaltyCardViewActivity extends AppCompatActivity implements Gestur

        Log.i(TAG, "To view card: " + loyaltyCardId);

+        if(barcodeIsFullscreen)
+        {
+            // Completely reset state
+            //
+            // This prevents the barcode from taking up the entire screen
+            // on resume and thus being stretched out of proportion.
+            recreate();
+        }
+
        // The brightness value is on a scale from [0, ..., 1], where
        // '1' is the brightest. We attempt to maximize the brightness
        // to help barcode readers scan the barcode.
@@ -232,8 +264,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity implements Gestur
        }

        String formatString = loyaltyCard.barcodeType;
-        final BarcodeFormat format = !formatString.isEmpty() ? BarcodeFormat.valueOf(formatString) : null;
-        final String cardIdString = loyaltyCard.cardId;
+        format = !formatString.isEmpty() ? BarcodeFormat.valueOf(formatString) : null;
+        cardIdString = loyaltyCard.cardId;

        cardIdFieldView.setText(loyaltyCard.cardId);
        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(cardIdFieldView,
@@ -335,6 +367,18 @@ public class LoyaltyCardViewActivity extends AppCompatActivity implements Gestur
        }
    }

+    @Override
+    public void onBackPressed() {
+        if (barcodeIsFullscreen)
+        {
+            setFullscreen(false);
+            return;
+        }
+
+        super.onBackPressed();
+        return;
+    }
+
    @Override
    public boolean onCreateOptionsMenu(Menu menu)
    {
@@ -460,5 +504,72 @@ public class LoyaltyCardViewActivity extends AppCompatActivity implements Gestur
    {
        gestureDetector.onTouchEvent(motionEvent);
        return super.onTouchEvent(motionEvent);
+
+    /**
+     * When enabled, hides the status bar and moves the barcode to the top of the screen.
+     *
+     * The purpose of this function is to make sure the barcode can be scanned from the phone
+     * by machines which offer no space to insert the complete device.
+     */
+    private void setFullscreen(boolean enable)
+    {
+        ActionBar actionBar = getSupportActionBar();
+        if(enable && !barcodeIsFullscreen)
+        {
+            // Save previous barcodeImage state
+            barcodeImageState = barcodeImage.getLayoutParams();
+
+            // Hide actionbar
+            if(actionBar != null)
+            {
+                actionBar.hide();
+            }
+
+            // Hide collapsingToolbar
+            collapsingToolbarLayout.setVisibility(View.GONE);
+
+            // Set Android to fullscreen mode
+            getWindow().getDecorView().setSystemUiVisibility(
+                getWindow().getDecorView().getSystemUiVisibility()
+                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                | View.SYSTEM_UI_FLAG_FULLSCREEN
+            );
+
+            // Make barcode take all space
+            barcodeImage.setLayoutParams(new ConstraintLayout.LayoutParams(
+                ConstraintLayout.LayoutParams.MATCH_PARENT,
+                ConstraintLayout.LayoutParams.MATCH_PARENT
+            ));
+
+            // Move barcode to top
+            barcodeImage.setScaleType(ImageView.ScaleType.FIT_START);
+
+            // Set current state
+            barcodeIsFullscreen = true;
+        }
+        else if(!enable && barcodeIsFullscreen)
+        {
+            // Show actionbar
+            if(actionBar != null)
+            {
+                actionBar.show();
+            }
+
+            // Show collapsingToolbar
+            collapsingToolbarLayout.setVisibility(View.VISIBLE);
+
+            // Unset fullscreen mode
+            getWindow().getDecorView().setSystemUiVisibility(
+                getWindow().getDecorView().getSystemUiVisibility()
+                & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                & ~View.SYSTEM_UI_FLAG_FULLSCREEN
+            );
+
+            // Turn barcode back to normal
+            barcodeImage.setLayoutParams(barcodeImageState);
+
+            // Set current state
+            barcodeIsFullscreen = false;
+        }
    }
 }
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -364,6 +364,8 @@
                        android:layout_width="0dp"
                        android:layout_height="@dimen/barcode_disp_height"
                        android:layout_gravity="center_horizontal"
+                        android:padding="10.0dp"
+                        android:background="#ffffff"
                        android:id="@+id/barcode"
                        android:contentDescription="@string/barcodeImageDescription"
                        android:layout_weight="1.0"/>
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -45,6 +45,8 @@
                android:layout_marginStart="15.0dip"
                android:layout_marginEnd="15.0dip"
                app:layout_constraintTop_toTopOf="parent"
+                android:padding="10.0dp"
+                android:background="#ffffff"
                app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -5,12 +5,10 @@
    <string name="action_add">Přidat</string>

    <string name="noGiftCards">ZAtím némáte žádné věrnostní karty. Klikněte na tlačítko "+" (plus) nahoře a začněte.\n\nLoyalty Card Locker umožňuje nosit své věrnostní karty v telefonu, takže jsou vždy na dosah.</string>
-
    <string name="storeName">Obchod</string>
    <string name="note">Poznámka</string>
    <string name="cardId">ID karty</string>
    <string name="barcodeType">Typ čárového kódu</string>
-
    <string name="cancel">Zrušit</string>
    <string name="save">Uložit</string>
    <string name="capture">Naskenovat kartu</string>
@@ -67,8 +65,6 @@
    <string name="app_revision_fmt">Revizní informace: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> používá tyto knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Vyberte čárový kód</string>
-    <string name="enterBarcodeInstructions">Zadejte hodnotu čárového kódu a potm vyberte kód, který představuje čárový kód, který je na kartě.</string>
-
    <string name="copy_to_clipboard_toast">ID karty zkopírováno do schránky</string>

    </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,15 +2,16 @@
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Loyalty Card Keychain</string>
+    <string name="action_search">Suche</string>
    <string name="action_add">Neu</string>

    <string name="noGiftCards">Sie haben noch keine Kundenkarte angelegt. Über den \"+\"-Button oben rechts können welche angelegt werden.\n\nDiese App ermöglicht es, Kundenkarten immer mit zu führen.</string>
+    <string name="noMatchingGiftCards">Es passen keine Kundenkarten zum Suchfilter. Bitte probiere verschiedene Begriffe aus.</string>

    <string name="storeName">Geschäft</string>
    <string name="note">Notiz</string>
    <string name="cardId">Kartennummer</string>
    <string name="barcodeType">Barcodeart</string>
-
    <string name="cancel">Abbrechen</string>
    <string name="save">Speichern</string>
    <string name="capture">Karte scannen</string>
@@ -40,7 +41,6 @@
    <string name="noStoreError">Kein Geschäft angegeben</string>
    <string name="noCardIdError">Keine Kartennummer angegeben</string>
    <string name="noCardExistsError">Karte konnte nicht gefunden werden</string>
-
    <string name="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Import/Export</string>
    <string name="importName">Import</string>
@@ -79,8 +79,6 @@
    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> verwendet folgenden Dritt-Ressourcen: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Barcode auswählen</string>
-    <string name="enterBarcodeInstructions">Fügen Sie die Kundennummer ein, anschließend wählen Sie die korrekte Barcodeart aus.</string>
-
    <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>

    <string name="thumbnailDescription">Vorschaubild für die Karte</string>
@@ -113,4 +111,5 @@
    <string name="settings_card_id_font_size">Schriftgröße der Kartennummer</string>
    <string name="settings_card_note_font_size">Schriftgröße der Notiz</string>
    <string name="settings_display_barcode_max_brightness">Helligkeit bei Barcode Ansicht erhöhen</string>
+    <string name="settings_lock_barcode_orientation">Barcodeausrichtung sperren</string>
    </resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -5,12 +5,10 @@
    <string name="action_add">Προσθήκη</string>

    <string name="noGiftCards">Δεν έχετε κάρτες προς το παρόν. Πατήστε το κουμπί \"+\" (συν) στο πάνω μέρος για να ξεκινήσετε.\n\nΤο Loyalty Card Keychain σας δίνει τη δυνατότητα να έχετε τις κάρτες σας στο τηλέφωνο σας, έτσι ώστε να τις έχετε πάντα μαζί σας.</string>
-
    <string name="storeName">Κατάστημα</string>
    <string name="note">Σημείωση</string>
    <string name="cardId">Κωδικός Κάρτας</string>
    <string name="barcodeType">Τύπος Barcode</string>
-
    <string name="cancel">Άκυρο</string>
    <string name="save">Αποθήκευση</string>
    <string name="capture">Φωτογράφιση Κάρτας</string>
@@ -40,7 +38,6 @@
    <string name="noStoreError">Δεν δώσατε κατάστημα</string>
    <string name="noCardIdError">Δεν δώσατε κωδικό κάρτας</string>
    <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί κάρτα</string>
-
    <string name="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Εισαγωγή/Εξαγωγή</string>
    <string name="importName">Εισαγωγή</string>
@@ -79,8 +76,6 @@
    <string name="app_resources">Το <xliff:g id="app_name">%s</xliff:g> χρησιμοποιεί τους παρακάτω πόρους τρίτων: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Επιλέξτε Barcode</string>
-    <string name="enterBarcodeInstructions">Δώστε την τιμή του barcode και μετά επιλέξτε την εικόνα που αναπαριστά το barcode που θέλετε να χρησιμοποιείσετε</string>
-
    <string name="copy_to_clipboard_toast">Ο κωδικός της κάρτας αντιγράφτηκε στο πρόχειρο</string>

    <string name="thumbnailDescription">Μικρογραφία κάρτας</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -5,12 +5,10 @@
    <string name="action_add">Añadir</string>

    <string name="noGiftCards">Actualmente no tienes ninguna tarjeta guardada. Presiona el botón \"+\" para comenzar.\n\nEsta cartera te permite llevar tus tarjetas de fidelización en tu teléfono para que estén siempre a tu alcance.</string>
-
    <string name="storeName">Tienda</string>
    <string name="note">Nota</string>
    <string name="cardId">ID de la Tarjeta</string>
    <string name="barcodeType">Tipo de Código de Barras</string>
-
    <string name="cancel">Cancelar</string>
    <string name="save">Guardar</string>
    <string name="capture">Escanear Tarjeta</string>
@@ -40,7 +38,6 @@
    <string name="noStoreError">Establecimiento no especificado</string>
    <string name="noCardIdError">ID de la Tarjeta no especificado</string>
    <string name="noCardExistsError">No se ha podido encontrar la tarjeta de fidelización</string>
-
    <string name="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Importar/Exportar</string>
    <string name="importName">Importar</string>
@@ -79,8 +76,6 @@
    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> utiliza los siguientes recursos de terceros: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Selecciona el Código de Barras</string>
-    <string name="enterBarcodeInstructions">Introduce el valor del código de barras y después presiona en una imagen para seleccionar el tipo de código de barras.</string>
-
    <string name="copy_to_clipboard_toast">ID de la Tarjeta copiado al portapapeles</string>

    <string name="thumbnailDescription">Miniatura para la tarjeta</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -5,12 +5,10 @@
    <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="storeName">Nom</string>
    <string name="note">Note</string>
    <string name="cardId">Numéro</string>
    <string name="barcodeType">Type de code-barres</string>
-
    <string name="cancel">Annuler</string>
    <string name="save">Enregistrer</string>
    <string name="capture">Mode capture</string>
@@ -40,7 +38,6 @@
    <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="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Importer/Exporter</string>
    <string name="importName">Importer</string>
@@ -79,8 +76,6 @@
    <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-barre</string>
-    <string name="enterBarcodeInstructions">Saisissez les chiffres du code-barres et sélectionnez l\'image qui le représente</string>
-
    <string name="copy_to_clipboard_toast">Numéro de carte copié dans le presse-papier</string>

    <string name="thumbnailDescription">Miniature pour la carte</string>
--- a/app/src/main/res/values-he-rIL/strings.xml
+++ b/app/src/main/res/values-he-rIL/strings.xml
@@ -5,7 +5,6 @@

    <string name="cardId">מזהה כרטיס</string>
    <string name="barcodeType">סוג ברקוד</string>
-
    <string name="cancel">ביטול</string>
    <string name="save">שמור</string>
    <string name="capture">צלם כרטיס</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2,14 +2,17 @@
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Carte fedeltà</string>
+    <string name="action_search">Cerca</string>
    <string name="action_add">Aggiungi</string>

-    <string name="noGiftCards">Non hai ancora alcuna tessera fedeltà al momento. Premi sul bottone "+" (più) in alto per incominciare.\n\nL\'app ti permette di portare con te le tue tessere fedeltà, così da averle sempre a disposizione.</string>
+    <string name="noGiftCards">Non hai ancora alcuna carta fedeltà. Premi sul bottone +(più) in alto per incominciare.\n\nL\'app ti permette di portare con te le tue carte fedeltà, così da averle sempre a disposizione.</string>
+    <string name="noMatchingGiftCards">Nessuna carta fedeltà corrisponde al filtro. Riprovare con altri valori</string>

    <string name="storeName">Negozio</string>
    <string name="note">Note</string>
    <string name="cardId">Codice</string>
    <string name="barcodeType">Tipo codice a barre</string>
+    <string name="barcodeNoBarcode">Questa carta non ha un codice a barre</string>

    <string name="cancel">Annulla</string>
    <string name="save">Salva</string>
@@ -25,6 +28,7 @@
    <string name="deleteConfirmation">Conferma che vuoi eliminare questa carta.</string>
    <string name="ok">Ok</string>
    <string name="copy_to_clipboard">Copia ID negli appunti</string>
+    <string name="share">Condividi</string>
    <string name="sendLabel">Invia&#8230;</string>
    <string name="addedShortcut">Aggiunto al launcher</string>

@@ -39,11 +43,14 @@

    <string name="noStoreError">Nessun negozio inserito</string>
    <string name="noCardIdError">Nessun codice carta inserito</string>
+    <string name="noCardExistsError">Impossibile trovare la carta</string>
+    <string name="failedParsingImportUriError">Impossibile analizzare l\'URI</string>
+
    <string name="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Importa/Esporta</string>
    <string name="importName">Importa</string>
    <string name="exportName">Esporta</string>
-    <string name="importExportHelp">Fare il backup dei dati ti permette di spostare le tue tessere da un dispositivo ad un altro.</string>
+    <string name="importExportHelp">Fare il backup dei dati ti permette di spostare le tue carte da un dispositivo ad un altro.</string>
    <string name="importedFrom">Importato da: %1$s</string>
    <string name="exportedTo">Esportato in: %1$s</string>
    <string name="fileMissing">File mancante: %1$s</string>
@@ -72,18 +79,20 @@
    <string name="app_license">Pubblicato sotto licenza GPLv3.</string>
    <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informazione sulla revisione: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informazione sulla versione: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> usa le seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> usa le seguenti risorse di terze parti: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Seleziona codice a barre</string>
-    <string name="enterBarcodeInstructions">Digita il valore del codice a barre, quindi seleziona l\'immagine che rappresenta il codice a barre che vuoi usare.</string>
+    <string name="enterBarcodeInstructions">Immettere l\'ID della carta, quindi selezionare l\'immagine che rappresenta il codice a barre desiderato oppure selezionare &#8220;Questa carta non ha un codice a barre&#8221; per non valorizzare il dato.</string>

    <string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>

-    <string name="startIntro">Incomincia introduzione</string>
-    <string name="intro1Title">Benvenuto in Carte fedeltà\n</string>
-    <string name="intro1Description">Gestisci le tue tessere direttamente dal telefono!\n\n</string>
+    <string name="thumbnailDescription">Miniatura carta</string>
+
+    <string name="startIntro">Introduzione</string>
+    <string name="intro1Title">Benvenuto in Carte Fedeltà\n</string>
+    <string name="intro1Description">Gestisci le tue carte direttamente dal telefono!\n\n</string>
    <string name="intro2Title">Aggiungi carte\n</string>
    <string name="intro2Description">Aggiungi una nuova carta premendo il + dall\'elenco delle carte.\n\n</string>
    <string name="intro3Title">Aggiungi carte\n</string>
@@ -93,6 +102,27 @@
    <string name="intro5Title">Backup\n</string>
    <string name="intro5Description">I dati delle tessere possono essere salvati. Per esportare o importare tessere premi Importa/Esporta nel menù nella schermata principale.\n\n</string>
    <string name="intro6Title">Feedback\n</string>
-    <string name="intro6Description">Questa app è gratuita, priva di pubblicità e open source. Guarda i dettagli premendo su Informazioni nella schermata principale.\n\nPer favore, lascia un feedback nell\'app store! (:</string>
+    <string name="intro6Description">Questa app è gratuita, priva di pubblicità e open source. Guarda i dettagli premendo su \"Informazioni\" nella schermata principale.\n\nPer favore, lascia un feedback nell\'app store! (:</string>

+    <string name="change">Cambia</string>
+    <string name="storeTextColorTitle">Colore titolo</string>
+    <string name="storeTextBackgroundColorTitle">Colore scheda</string>
+    <string name="storeNameBackgroundColorDescription">Colore di sfondo del titolo carta</string>
+    <string name="storeNameColorDescription">Colore del titolo carta</string>
+
+    <string name="settings">Impostazioni</string>
+    <string name="settings_category_title_ui">Interfaccia utente</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_system_theme">Tema del sistema</string>
+    <string name="settings_light_theme">Tema chiaro</string>
+    <string name="settings_dark_theme">Tema scuro</string>
+    <string name="settings_card_title_list_font_size">Dimensione testo del titolo carta (in lista carte)</string>
+    <string name="settings_card_note_list_font_size">Dimensione testo delle note carta (in lista carte)</string>
+    <string name="settings_card_title_font_size">Dimensione testo del titolo carta</string>
+    <string name="settings_card_id_font_size">Dimensione testo dell\'ID carta</string>
+    <string name="settings_card_note_font_size">Dimensione testo delle note carta</string>
+    <string name="settings_display_barcode_max_brightness">Aumenta luminosità dello schermo quando apro un codice a barre</string>
+    <string name="settings_lock_barcode_orientation">Blocca orientamento del codice a barre</string>
+    <string name="intent_import_card_from_url">Importa carte fedeltà</string>
+    <string name="intent_import_card_from_url_share_text">Voglio condividere una carta fedeltà con te</string>
    </resources>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -5,12 +5,10 @@
    <string name="action_add">Pridėti</string>

    <string name="noGiftCards">Šiuo metu neturite nė vienos įvestos lojalumo kortelės. Paspauskite "+" (pliuso) pliuso mygtuką, kad pradėtumėte.\n\nLoyalty Card Locker leidžia Jums visada nešiotis lojalumo kortelių informaciją savo telefone ar planšetėje, taip jos visada pasiekiamos.</string>
-
    <string name="storeName">Parduotuvė</string>
    <string name="note">Užrašas</string>
    <string name="cardId">Kortelės ID</string>
    <string name="barcodeType">Brūkšninio kodo tipas</string>
-
    <string name="cancel">Atšaukti</string>
    <string name="save">Išsaugoti</string>
    <string name="capture">Nufotografuoti kortelę</string>
@@ -50,8 +48,6 @@
    <string name="app_revision_fmt">Revizijos informacija: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> naudoja šias trečiosios šalies bibliotekas: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Pasirinkite brūkšninį kodą</string>
-    <string name="enterBarcodeInstructions">Enter the barcode value then select the image which represents the barcode you want to use</string>
-
    <string name="copy_to_clipboard_toast">Kortelės ID nukopijuota į iškarpinę</string>

    </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1,19 +1,15 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name">Kundekortknippe</string>
    <string name="action_add">Legg til</string>
-
    <string name="noGiftCards">Du har ingen kundekort for øyeblikket. Klikk på \"+\" (pluss)-knappen øverst for å komme igang.\n\nDa har du dem alltid hendig.</string>
-
    <string name="storeName">Butikk</string>
    <string name="note">Merknad</string>
    <string name="cardId">Kort-ID</string>
    <string name="barcodeType">Strekkodetype</string>
-
    <string name="cancel">Avbryt</string>
    <string name="save">Lagre</string>
-    <string name="capture">Fang opp kort</string>
+    <string name="capture">Les inn kort</string>
    <string name="enterCard">Skriv inn kort</string>
    <string name="editCard">Rediger kort</string>
    <string name="edit">Rediger</string>
@@ -25,25 +21,19 @@
    <string name="deleteConfirmation">Bekreft at du ønsker å slette dette kortet.</string>
    <string name="ok">OK</string>
    <string name="copy_to_clipboard">Kopier ID til utklippstavle</string>
-    <string name="sendLabel">Send&#8230;</string>
+    <string name="sendLabel">Send…</string>
    <string name="addedShortcut">Lagt til på hjemmeskjerm</string>
-
    <string name="editCardTitle">Rediger kundekort</string>
    <string name="addCardTitle">Legg til kundekort</string>
    <string name="viewCardTitle">Vis kundekort</string>
    <string name="scanCardBarcode">Skann kortets strekkode</string>
    <string name="cardShortcut">Kort-snarvei</string>
    <string name="noCardsMessage">Legg til et kort først</string>
-
    <string name="barcodeImageDescription">Bilde av kortets strekkode</string>
-
    <string name="noStoreError">Ingen butikk angitt</string>
    <string name="noCardIdError">Ingen kort-ID innskrevet</string>
    <string name="noCardExistsError">Kunne ikke finne kundekort</string>
-
    <string name="cardIdFormat">%1$s: %2$s</string>
-    <string name="storeNameAndNoteFormat" translatable="false">%1$s - %2$s</string>
-
    <string name="importExport">Import/eksport</string>
    <string name="importName">Importer</string>
    <string name="exportName">Eksporter</string>
@@ -57,9 +47,9 @@
    <string name="exportSuccessfulTitle">Eksportert</string>
    <string name="exportFailedTitle">Kunne ikke eksportere</string>
    <string name="exportFailed">Klarte ikke å eksportere: %1$s</string>
-    <string name="importing">Importerer&#8230;</string>
-    <string name="exporting">Exporterer&#8230;</string>
-    <string name="noExternalStoragePermissionError">Kunne ikke importere eller eksportere kort uten tilgang til ekstern lagring.</string>
+    <string name="importing">Importerer…</string>
+    <string name="exporting">Exporterer…</string>
+    <string name="noExternalStoragePermissionError">Kan ikke importere eller eksportere kort uten tilgang til ekstern lagring</string>
    <string name="exportOptionExplanation">Data skrives til rotmappen i eksternt lagringsområde.</string>
    <string name="importOptionFilesystemTitle">Importer fra filsystem</string>
    <string name="importOptionFilesystemExplanation">Velg spesifikk fil fra filsystemet.</string>
@@ -70,57 +60,57 @@
    <string name="importOptionFixedTitle">Importer fra eksporteringsområde</string>
    <string name="importOptionFixedExplanation">Importer fra området i filsystemet eksporter skrives til.</string>
    <string name="importOptionFixedButton">Bruk eksporteringsplassering</string>
-
-    <string name="about">About</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="about">Om</string>
+    <string name="app_copyright_fmt">Kopirett 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
    <string name="app_license">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="app_revision_fmt">Slippinformasjon: <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>
-
+    <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="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>
    <string name="selectBarcodeTitle">Velg strekkode</string>
    <string name="enterBarcodeInstructions">Skriv inn strekkodeverdien og velg så bildet som representerer strekkoden du ønsker å bruke.</string>
-
    <string name="copy_to_clipboard_toast">Kort-ID kopiert til utklippstavle</string>
-
    <string name="thumbnailDescription">Miniatyrbilde for kort</string>
-
    <string name="startIntro">Start intro</string>
    <string name="intro1Title">Velkommen til Kundekortknippe\n</string>
    <string name="intro1Description">Håndter strekkodekodekundekort på din enhet.\n\n</string>
    <string name="intro2Title">Tillegg av kort\n</string>
-    <string name="intro2Description">Legg til et nytt kort ved å trykke på pluss-tegnet i kortlisten.\n\n</string>
+    <string name="intro2Description">Legg til et nytt kort ved å trykke på + i kortlisten.
+\n
+\n</string>
    <string name="intro3Title">Tillegg av kort\n</string>
-    <string name="intro3Description">For å legge til en strekkode, ta bilde av den med kamera, eller skriv den inn manuelt.\n\n</string>
+    <string name="intro3Description">Legg til strekkoder med kamera eller skriv dem inn manuelt.
+\n
+\n</string>
    <string name="intro4Title">Vis kort\n</string>
    <string name="intro4Description">For å vise et kort, klikk på butikknavnet fra hovedskjermen\n\n</string>
    <string name="intro5Title">Sikkerhetskopi\n</string>
-    <string name="intro5Description">Kortene kan sikkerhetskopieres. For å eksportere eller importere kortdata, trykk på \"Importer/eksporter\" i menyen på hovedsiden.\n\n</string>
+    <string name="intro5Description">Kortene kan sikkerhetskopieres. For å eksportere eller importere kortdata, trykk på \"Importer/eksporter\" i hovedsidemenyen.
+\n
+\n</string>
    <string name="intro6Title">Tilbakemeldinger\n</string>
-    <string name="intro6Description">Dette programmet er reklamefri og gratis fri programvare. Se flere detaljer ved å trykke på \"Om\"-skjermen på hovedsiden.\n\nLevn en vurdering i programbutikken. (:</string>
-
+    <string name="intro6Description">Dette programmet er reklamefri og gratis genenslig fri programvare. Se flere detaljer ved å trykke på \"Om\"-skjermen på hovedsiden.
+\n
+\nLevn en vurdering i programbutikken. (:</string>
    <string name="change">Endre</string>
-    <string name="storeTextColorTitle">Butikktekstfarge</string>
+    <string name="storeTextColorTitle">Skriftstørrelse for butikktekst</string>
    <string name="storeTextBackgroundColorTitle">Overskriftsfarge</string>
    <string name="storeNameBackgroundColorDescription">Farge for butikktekstbakgrunn</string>
    <string name="storeNameColorDescription">Butikktekstfarge</string>
-
    <string name="settings">Innstillinger</string>
    <string name="settings_category_title_ui">Brukergrensesnitt</string>
    <string name="settings_card_title_list_font_size">Korttittelskriftstørrelse</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">Kortmerknadsskriftstørrelse</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">Korttittelskriftstørrelse</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">Kort-ID-skriftstørrelse</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">Kortmerknadsskriftstørrelse</string>
-    <string name="settings_key_card_note_font_size" translatable="false">pref_card_note_font_size_sp</string>
+    <string name="settings_card_note_list_font_size">Skriftstørrelse for kortmerknadsliste</string>
+    <string name="settings_card_title_font_size">Skriftstørrelse for korttittel</string>
+    <string name="settings_card_id_font_size">Skriftstørrelse for kort-ID</string>
+    <string name="settings_card_note_font_size">Skriftstørrelse for kortmerknad</string>
    <string name="settings_display_barcode_max_brightness">Lysere strekkodevisning</string>
-    <string name="settings_key_display_barcode_max_brightness" translatable="false">pref_display_card_max_brightness</string>
    <string name="settings_lock_barcode_orientation">Lås strekkodesideretning</string>
-    <string name="settings_key_lock_barcode_orientation" translatable="false">pref_lock_barcode_orientation</string>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2,44 +2,49 @@
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Klantenkaartkluis</string>
+    <string name="action_search">Zoeken</string>
    <string name="action_add">Toevoegen</string>

-    <string name="noGiftCards">Er zijn nog geen klantenkaarten aanwezig. Klik op de knop \"+\" (plus) om te beginnen.\n\nKlantenkaartenkluis beheert klantenkaarten op een smartphone of tablet, zodat ze altijd binnen handbereik zijn.</string>
+    <string name="noGiftCards">Je hebt nog geen klantenkaarten toegevoegd. Druk op de knop \'+\' (plus) om te beginnen.\n\nMet Klantenkaartkluis beheer je je klantenkaarten op je smartphone of tablet zodat ze altijd binnen handbereik zijn.</string>
+    <string name="noMatchingGiftCards">Er zijn geen kaarten die overeenkomen met je zoekopdracht. Probeer het opnieuw.</string>

    <string name="storeName">Winkel</string>
-    <string name="note">Opmerking</string>
-    <string name="cardId">Kaart-ID</string>
-    <string name="barcodeType">Barcodetype</string>
+    <string name="note">Aantekening</string>
+    <string name="cardId">Kaartnummer</string>
+    <string name="barcodeType">Soort barcode</string>
+    <string name="barcodeNoBarcode">Deze kaart heeft geen barcode</string>

    <string name="cancel">Annuleren</string>
    <string name="save">Opslaan</string>
    <string name="capture">Scan een kaart</string>
-    <string name="enterCard">Voer een kaart in</string>
+    <string name="enterCard">Voer een kaartnummer in</string>
    <string name="editCard">Kaart bewerken</string>
    <string name="edit">Bewerken</string>
    <string name="delete">Verwijderen</string>
    <string name="confirm">Bevestigen</string>
-    <string name="lockScreen">Draaien blokkeren</string>
-    <string name="unlockScreen">Draaien deblokkeren</string>
+    <string name="lockScreen">Draaien niet toestaan</string>
+    <string name="unlockScreen">Draaien toestaan</string>
    <string name="deleteTitle">Kaart verwijderen</string>
    <string name="deleteConfirmation">Bevestig dat je deze kaart wilt verwijderen.</string>
    <string name="ok">Oké</string>
-    <string name="copy_to_clipboard">ID kopiëren naar klembord</string>
+    <string name="copy_to_clipboard">Kaartnummer kopiëren naar klembord</string>
+    <string name="share">Delen</string>
    <string name="sendLabel">Versturen&#8230;</string>
-    <string name="addedShortcut">Toegevoegd aan beginscherm</string>
+    <string name="addedShortcut">Toegevoegd aan startscherm</string>

    <string name="editCardTitle">Klantenkaart bewerken</string>
    <string name="addCardTitle">Klantenkaart toevoegen</string>
-    <string name="viewCardTitle">Klantenkaart bekijken</string>
-    <string name="scanCardBarcode">Klantenkaart-barcode scannen</string>
+    <string name="viewCardTitle">Klantenkaart tonen</string>
+    <string name="scanCardBarcode">Scan de barcode van de kaart</string>
    <string name="cardShortcut">Kaartsnelkoppeling</string>
-    <string name="noCardsMessage">Er zijn geen kaarten; voeg er één toe.</string>
+    <string name="noCardsMessage">Je hebt nog geen kaarten toegevoegd.</string>

-    <string name="barcodeImageDescription">Afbeelding van klantenkaart-barcode</string>
+    <string name="barcodeImageDescription">Afbeelding van barcode</string>

-    <string name="noStoreError">Geen winkel ingevoerd</string>
-    <string name="noCardIdError">Geen kaart-ID ingevoerd</string>
-    <string name="noCardExistsError">De klantenkaart kan niet worden opgevraagd.</string>
+    <string name="noStoreError">Geen winkelnaam ingevoerd</string>
+    <string name="noCardIdError">Geen kaartnummer ingevoerd</string>
+    <string name="noCardExistsError">De klantenkaart kan niet worden opgevraagd</string>
+    <string name="failedParsingImportUriError">Kan de import-uri niet verwerken</string>

    <string name="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Importeren/Exporteren</string>
@@ -58,7 +63,7 @@
    <string name="importing">Bezig met importeren&#8230;...</string>
    <string name="exporting">Bezig met exporteren&#8230;...</string>
    <string name="noExternalStoragePermissionError">Het importeren of exporteren van kaarten is niet mogelijk zonder de machtiging \'externe opslag\'.</string>
-    <string name="exportOptionExplanation">De gegevens zijn weggeschreven naar de hoogste map op de externe opslag.</string>
+    <string name="exportOptionExplanation">De gegevens worden weggeschreven naar de hoogste map op de externe opslag.</string>
    <string name="importOptionFilesystemTitle">Importeren uit bestandssysteem</string>
    <string name="importOptionFilesystemExplanation">Kies een specifiek bestand uit het bestandssysteem.</string>
    <string name="importOptionFilesystemButton">Uit bestandssysteem</string>
@@ -75,31 +80,31 @@
    <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Versie-informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bibliotheken van derde partijen: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bronnen van derde partijen: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bibliotheken van externe partijen: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bronnen van externe partijen: <xliff:g id="app_resources_list">%s</xliff:g></string>

-    <string name="selectBarcodeTitle">Barcode selecteren</string>
-    <string name="enterBarcodeInstructions">Voer de waarde van de barcode in en kies daarna de afbeelding van de barcode die je wilt gebruiken.</string>
+    <string name="selectBarcodeTitle">Barcode toevoegen</string>
+    <string name="enterBarcodeInstructions">Voer de barcode in en kies daarna de afbeelding van de barcode die je wilt gebruiken., of druk op &#8220;Deze kaart heeft geen barcode&#8221; om geen barcode te gebruiken.</string>

-    <string name="copy_to_clipboard_toast">Kaart-ID is gekopieerd naar het klembord</string>
+    <string name="copy_to_clipboard_toast">Kaartnummer is gekopieerd naar het klembord</string>

-    <string name="thumbnailDescription">Voorbeeldminiatuur voor kaart</string>
+    <string name="thumbnailDescription">Miniatuurvoorbeeld van kaart</string>

    <string name="startIntro">Rondleiding starten</string>
    <string name="intro1Title">Welkom bij Klantenkaartkluis\n</string>
    <string name="intro1Description">Beheer je op barcodes gebaseerde klantenkaarten op je telefoon!\n\n</string>
    <string name="intro2Title">Kaarten toevoegen\n</string>
-    <string name="intro2Description">Voeg een nieuwe kaart toe door in de kaartenlijst op de plus-knop te drukken.\n\n</string>
+    <string name="intro2Description">Voeg een kaart toe door in de lijst met kaarten op de plus-knop te drukken.\n\n</string>
    <string name="intro3Title">Kaarten toevoegen\n</string>
    <string name="intro3Description">De barcode kan worden toegevoegd door deze handmatig in te voeren of te scannen met de camera.\n\n</string>
    <string name="intro4Title">Kaart tonen\n</string>
-    <string name="intro4Description">Als je een kaart wilt tonen, druk dan op het beginscherm op de naam van de winkel.\n\n</string>
+    <string name="intro4Description">Toon een kaart door op het kaartoverzicht op de naam van de winkel te drukken.\n\n</string>
    <string name="intro5Title">Back-uppen\n</string>
-    <string name="intro5Description">De kaarten kunnen worden geback-upt. Als je kaarten wilt exporteren of importeren, druk dan in het menu op het hoofdscherm op Importeren/Exporteren.\n\n</string>
+    <string name="intro5Description">Je kunt je kaarten back-uppen: druk in het menu op het kaartoverzicht op Importeren/Exporteren.\n\n</string>
    <string name="intro6Title">Feedback\n</string>
-    <string name="intro6Description">Deze app is gratis, advertentievrij en open source. Bekijk de details hiervan door op Over te drukken in het menu op het hoofdscherm.\n\nGeef feedback in de app-winkel! (:</string>
+    <string name="intro6Description">Deze app is gratis, reclamevrij en open source. Bekijk alle details door op \'Over\' te drukken in het menu op het kaartoverzicht.\n\nGeef feedback in de app-winkel! (:</string>

-    <string name="change">Wijzigen</string>
+    <string name="change">Aanpassen</string>
    <string name="storeTextColorTitle">Tekstkleur van winkelnaam</string>
    <string name="storeTextBackgroundColorTitle">Kopkleur</string>
    <string name="storeNameBackgroundColorDescription">Achtergrondkleur van winkeltekst</string>
@@ -107,11 +112,17 @@

    <string name="settings">Instellingen</string>
    <string name="settings_category_title_ui">Uiterlijk en bediening</string>
-    <string name="settings_card_title_list_font_size">Kaarttitel lijstlettertypegrootte</string>
-    <string name="settings_card_note_list_font_size">Kaartnotitie lijstlettertypegrootte</string>
-    <string name="settings_card_title_font_size">Kaarttitel-lettertypegrootte</string>
-    <string name="settings_card_id_font_size">Kaart-ID lettertypegrootte</string>
-    <string name="settings_card_note_font_size">Kaartnotitie lettertypegrootte</string>
-    <string name="settings_display_barcode_max_brightness">Barcodeweergave lichter maken</string>
+    <string name="settings_theme">Thema</string>
+    <string name="settings_system_theme">Systeemthema</string>
+    <string name="settings_light_theme">Licht</string>
+    <string name="settings_dark_theme">Donker</string>
+    <string name="settings_card_title_list_font_size">Lettergrootte van kaartnamen op de lijst</string>
+    <string name="settings_card_note_list_font_size">Lettergrootte van aantekeningen op de lijst</string>
+    <string name="settings_card_title_font_size">Lettergrootte van kaartnamen</string>
+    <string name="settings_card_id_font_size">Lettergrootte van kaartnummer</string>
+    <string name="settings_card_note_font_size">Lettergrootte van aantekeningen</string>
+    <string name="settings_display_barcode_max_brightness">Scherm helderder maken bij tonen van barcode</string>
    <string name="settings_lock_barcode_orientation">Barcode-oriëntatie vergrendelen</string>
+    <string name="intent_import_card_from_url">Klantenkaart importeren</string>
+    <string name="intent_import_card_from_url_share_text">Ik wil een klantenkaart met je delen</string>
    </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2,14 +2,17 @@
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Loyalty Card Keychain</string>
+    <string name="action_search">Szukaj</string>
    <string name="action_add">Dodaj</string>

    <string name="noGiftCards">W tej chwili nie masz żadnych kart lojalnościowych. Kliknij przycisk \"+\" (plus) u góry, aby rozpocząć. \n\nLoyalty Locker Card pozwala nosić karty lojalnościowe w telefonie, dzięki czemu są zawsze w zasięgu ręki.</string>
+    <string name="noMatchingGiftCards">Żadne karty lojalnościowe nie pasują do filtra wyszukiwania. Spróbuj użyć innych warunków.</string>

    <string name="storeName">Sklep</string>
    <string name="note">Notatka</string>
    <string name="cardId">Identyfikator karty</string>
    <string name="barcodeType">Typ kodu kreskowego</string>
+    <string name="barcodeNoBarcode">Ta karta nie ma kodu kreskowego</string>

    <string name="cancel">Anuluj</string>
    <string name="save">Zapisz</string>
@@ -25,6 +28,7 @@
    <string name="deleteConfirmation">Potwierdź, że chcesz usunąć tę kartę.</string>
    <string name="ok">OK</string>
    <string name="copy_to_clipboard">Skopiuj identyfikator do schowka</string>
+    <string name="share">Udostępnij</string>
    <string name="sendLabel">Wyślij&#8230;</string>
    <string name="addedShortcut">Dodano do ekranu głównego</string>

@@ -40,6 +44,7 @@
    <string name="noStoreError">Nie wprowadzono nazwy sklepu</string>
    <string name="noCardIdError">Nie wprowadzono identyfikatora karty</string>
    <string name="noCardExistsError">Nie można wyszukać karty lojalnościowej</string>
+    <string name="failedParsingImportUriError">Nie można przeanalizować identyfikatora importu URI</string>

    <string name="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Importuj/Eksportuj</string>
@@ -79,20 +84,20 @@
    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> wykorzystuje następujące zasoby osób trzecich: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Wybierz kod kreskowy</string>
-    <string name="enterBarcodeInstructions">Wprowadź wartość kodu kreskowego, a następnie wybierz obraz, który reprezentuje kod kreskowy, który chcesz użyć</string>
+    <string name="enterBarcodeInstructions">Wprowadź identyfikator karty, a następnie wybierz obraz reprezentujący kod kreskowy, którego chcesz użyć, lub wybierz &#8220;Ta karta nie ma kodu kreskowego&#8221;, aby nie używać kodu kreskowego.</string>

    <string name="copy_to_clipboard_toast">Skopiowano identyfikator karty do schowka</string>

    <string name="thumbnailDescription">Miniaturka karty</string>

    <string name="startIntro">Pokaż ekran powitalny</string>
-    <string name="intro1Title">Witamy w Loyalty Card Keychain\n</string>
+    <string name="intro1Title">Witaj w Loyalty Card Keychain\n</string>
    <string name="intro1Description">Zarządzaj kartami sklepowymi/lojalnościowymi opartymi na kodzie kreskowym na swoim telefonie!\n\n</string>
    <string name="intro2Title">Dodawanie kart\n</string>
    <string name="intro2Description">Dodaj nową kartę, dotykając znaku plus z listy kart. \n\n</string>
-    <string name="intro3Title">Dodawanie kart \n</string>
+    <string name="intro3Title">Dodawanie kart\n</string>
    <string name="intro3Description">Aby dodać kod kreskowy, wykonaj zdjęcie aparatem lub wpisz ręcznie. \n\n</string>
-    <string name="intro4Title">Pokaż kartę \n</string>
+    <string name="intro4Title">Pokaż kartę\n</string>
    <string name="intro4Description">Aby wyświetlić kartę, na głównym ekranie kliknij nazwę sklepu \n\n</string>
    <string name="intro5Title">Kopia zapasowa\n</string>
    <string name="intro5Description">Karty można zarchiwizować. Aby wyeksportować lub zaimportować dane karty, dotknij opcji Importuj/eksportuj w menu na stronie głównej. \n\n</string>
@@ -107,6 +112,10 @@

    <string name="settings">Ustawienia</string>
    <string name="settings_category_title_ui">Interfejs użytkownika</string>
+    <string name="settings_theme">Motyw</string>
+    <string name="settings_system_theme">Systemowy</string>
+    <string name="settings_light_theme">Jasny</string>
+    <string name="settings_dark_theme">Ciemny</string>
    <string name="settings_card_title_list_font_size">Rozmiar czcionki listy tytułów kart</string>
    <string name="settings_card_note_list_font_size">Rozmiar czcionki listy kart</string>
    <string name="settings_card_title_font_size">Rozmiar czcionki tytułu karty</string>
@@ -114,4 +123,6 @@
    <string name="settings_card_note_font_size">Rozmiar czcionki notatki karty</string>
    <string name="settings_display_barcode_max_brightness">Rozjaśnij widok kodu kreskowego</string>
    <string name="settings_lock_barcode_orientation">Zablokuj autoobracanie kodów kreskowych</string>
+    <string name="intent_import_card_from_url">Importuj kartę lojalnościową</string>
+    <string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
    </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2,14 +2,17 @@
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Карты лояльности</string>
+    <string name="action_search">Поиск</string>
    <string name="action_add">Добавить карту</string>

    <string name="noGiftCards">Пока нет ни одной карты. Нажмите на кнопку «+» (плюс) сверху для добавления.\n\n«Карты лояльности» позволяют хранить карты скидок в телефоне, так что они всегда будут под рукой.</string>
+    <string name="noMatchingGiftCards">Карт не найдено, попробуйте поискать по-другому.</string>

    <string name="storeName">Магазин</string>
    <string name="note">Примечание</string>
    <string name="cardId">Номер карты</string>
    <string name="barcodeType">Тип штрих-кода</string>
+    <string name="barcodeNoBarcode">Эта карта без штрихкода</string>

    <string name="cancel">Отменить</string>
    <string name="save">Сохранить</string>
@@ -25,6 +28,7 @@
    <string name="deleteConfirmation">Пожалуйста подтвердите удаление карты.</string>
    <string name="ok">ОК</string>
    <string name="copy_to_clipboard">Скопировать номер карты в буфер обмена</string>
+    <string name="share">Переслать</string>
    <string name="sendLabel">Отправить&#8230;</string>
    <string name="addedShortcut">Карта добавлена на главный экран.</string>

@@ -40,6 +44,7 @@
    <string name="noStoreError">Название магазина не указано</string>
    <string name="noCardIdError">Номер карты не указан</string>
    <string name="noCardExistsError">Карта не найдена</string>
+    <string name="failedParsingImportUriError">Не удалось разобрать импортируемый URI</string>

    <string name="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Импорт/Экспорт</string>
@@ -79,7 +84,7 @@
    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> использует следующие сторонние ресурсы: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Выбор штрих-кода</string>
-    <string name="enterBarcodeInstructions">Введите значение и выберете вид штрих-кода</string>
+    <string name="enterBarcodeInstructions">Введите ID карты и выберите тип штрих-кода.</string>

    <string name="copy_to_clipboard_toast">Номер карты скопирован в буфер обмена</string>

@@ -107,6 +112,10 @@

    <string name="settings">Настройки</string>
    <string name="settings_category_title_ui">Внешний вид</string>
+    <string name="settings_theme">Тема</string>
+    <string name="settings_system_theme">Системная тема</string>
+    <string name="settings_light_theme">Светлая тема</string>
+    <string name="settings_dark_theme">Тёмная тема</string>
    <string name="settings_card_title_list_font_size">Размер шрифта названия карты для списка</string>
    <string name="settings_card_note_list_font_size">Размер шрифта примечания для списка</string>
    <string name="settings_card_title_font_size">Размер шрифта названия карты</string>
@@ -114,4 +123,6 @@
    <string name="settings_card_note_font_size">Размер шрифта примечания</string>
    <string name="settings_display_barcode_max_brightness">Максимальная яркость при показе карты</string>
    <string name="settings_lock_barcode_orientation">Портретная ориентация экрана при показе карты</string>
+    <string name="intent_import_card_from_url">Импортировать карту</string>
+    <string name="intent_import_card_from_url_share_text">Я хочу поделиться картой с вами</string>
    </resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -5,12 +5,10 @@
    <string name="action_add">Pridať</string>

    <string name="noGiftCards">Zatiaľ nemáte žiadne vernostné karty. Kliknite na tlačidlo \"+\" (plus) vyššie a začnite.\n\nAplikácia Vernostné karty umožňuje nosiť svoje vernostné karty v telefóne, kde sú vždy na dosah.</string>
-
    <string name="storeName">Obchod</string>
    <string name="note">Poznámka</string>
    <string name="cardId">ID karty</string>
    <string name="barcodeType">Typ čiarového kódu</string>
-
    <string name="cancel">Zrušiť</string>
    <string name="save">Uložiť</string>
    <string name="capture">Zosnímať kartu</string>
@@ -40,7 +38,6 @@
    <string name="noStoreError">Nebol zadaný obchod</string>
    <string name="noCardIdError">Nebolo zadané ID karty</string>
    <string name="noCardExistsError">Nie je možné vyhľadať vernostnú kartu</string>
-
    <string name="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Import/Export</string>
    <string name="importName">Import</string>
@@ -79,8 +76,6 @@
    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> používa tieto knižnice tretích strán: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Vyberte čiarový kód</string>
-    <string name="enterBarcodeInstructions">Zadajte čiarový kód a vyberte obrázok reprezentujúci čiarový kód, ktorý chcete použiť</string>
-
    <string name="copy_to_clipboard_toast">ID karty skopírované do schránky</string>

    <string name="thumbnailDescription">Náhľad karty</string>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -5,12 +5,10 @@
    <string name="action_add">Dodaj</string>

    <string name="noGiftCards">Trenutno nimate shranjene nobene kartice zvestobe. Kliknite  \"+\" (plus) na vrhu, da jih dodate.\n\n Aplikacija Kartice zvestobe Vam omogoča, da imate kartice zvestobe shranjene na Vašem telefonu in vedno v dosegu roke.</string>
-
    <string name="storeName">Shrani</string>
    <string name="note">Zabeležka</string>
    <string name="cardId">Št. kartice</string>
    <string name="barcodeType">Vrsta črne kode</string>
-
    <string name="cancel">Prekliči</string>
    <string name="save">Shrani</string>
    <string name="capture">Slikaj kartico</string>
@@ -40,7 +38,6 @@
    <string name="noStoreError">Ime trgovine ni bilo vnešeno</string>
    <string name="noCardIdError">Številka kartice ni bila vnešena</string>
    <string name="noCardExistsError">Te kartice zvestobe ni bilo moč najti</string>
-
    <string name="cardIdFormat">%1$s:%2$s</string>
    <string name="importExport">Uvozi/izvozi</string>
    <string name="importName">Uvozi</string>
@@ -79,8 +76,6 @@
    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g>uporablja sledeče zunanje vire: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Izberite črtno kodo</string>
-    <string name="enterBarcodeInstructions">Vnesite vrednost črtne kode in izberite črtno kodo, ki jo želite uporabljati</string>
-
    <string name="copy_to_clipboard_toast">Številka kartice je bila kopirana v odložišče</string>

    <string name="thumbnailDescription">Ikona kartice</string>
--- a/app/src/test/java/protect/card_locker/ImportExportActivityTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportActivityTest.java
@@ -71,7 +71,7 @@ public class ImportExportActivityTest

            if(isInstalled)
            {
-                registerIntentHandler(Intent.ACTION_PICK);
+                registerIntentHandler(Intent.ACTION_GET_CONTENT);
            }

            Activity activity = Robolectric.setupActivity(ImportExportActivity.class);
@@ -102,7 +102,7 @@ public class ImportExportActivityTest

            if(isInstalled)
            {
-                registerIntentHandler(Intent.ACTION_GET_CONTENT);
+                registerIntentHandler(Intent.ACTION_PICK);
            }

            Activity activity = Robolectric.setupActivity(ImportExportActivity.class);
--- a/app/src/test/java/protect/card_locker/ImportURITest.java
+++ b/app/src/test/java/protect/card_locker/ImportURITest.java
@@ -12,6 +12,7 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import java.io.InvalidObjectException;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static protect.card_locker.DBHelper.LoyaltyCardDbIds;

@@ -53,6 +54,30 @@ public class ImportURITest {
        assertEquals(card.store, parsedCard.store);
    }

+    @Test
+    public void ensureNoCrashOnMissingHeaderFields() throws InvalidObjectException
+    {
+        // Generate card
+        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, null, null);
+
+        // Get card
+        LoyaltyCard card = db.getLoyaltyCard(1);
+
+        // Card to URI
+        Uri cardUri = importURIHelper.toUri(card);
+
+        // Parse URI
+        LoyaltyCard parsedCard = importURIHelper.parse(cardUri);
+
+        // Compare everything
+        assertEquals(card.barcodeType, parsedCard.barcodeType);
+        assertEquals(card.cardId, parsedCard.cardId);
+        assertEquals(card.note, parsedCard.note);
+        assertEquals(card.store, parsedCard.store);
+        assertNull(parsedCard.headerColor);
+        assertNull(parsedCard.headerTextColor);
+    }
+
    @Test
    public void failToParseInvalidUri()
    {
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -1,6 +1,7 @@
 package protect.card_locker;

 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
@@ -22,6 +23,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.core.widget.TextViewCompat;

@@ -37,7 +39,6 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowLog;

@@ -727,11 +728,70 @@ public class LoyaltyCardViewActivityTest
        // Check if the card switches correctly
        tabLayout.getTabAt(1).select();

+        checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note2", BARCODE_DATA, BARCODE_TYPE);
+    }
+  
+    @Test
+    public void checkBarcodeFullscreenWorkflow()
+    {
+        ActivityController activityController = createActivityWithLoyaltyCard(false);
+
+        Activity activity = (Activity)activityController.get();
+        DBHelper db = new DBHelper(activity);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
+
        activityController.start();
        activityController.visible();
        activityController.resume();

-        checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note2", BARCODE_DATA, BARCODE_TYPE);
+        assertEquals(false, activity.isFinishing());
+
+        ImageView barcodeImage = activity.findViewById(R.id.barcode);
+        View collapsingToolbarLayout = activity.findViewById(R.id.collapsingToolbarLayout);
+
+        // Android should not be in fullscreen mode
+        int uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
+        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
+        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
+
+        // Elements should be visible
+        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
+
+        // Click barcode to toggle fullscreen
+        barcodeImage.performClick();
+
+        // Android should be in fullscreen mode
+        uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
+        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
+        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
+
+        // Elements should not be visible
+        assertEquals(View.GONE, collapsingToolbarLayout.getVisibility());
+
+        // Clicking barcode again should deactivate fullscreen mode
+        barcodeImage.performClick();
+        uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
+        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
+        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
+        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
+
+        // Another click back to fullscreen
+        barcodeImage.performClick();
+        uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
+        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
+        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
+        assertEquals(View.GONE, collapsingToolbarLayout.getVisibility());
+
+        // In full screen mode, back button should disable fullscreen
+        activity.onBackPressed();
+        uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
+        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
+        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
+        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
+
+        // Pressing back when not in full screen should finish activity
+        activity.onBackPressed();
+        assertEquals(true, activity.isFinishing());
    }

    @Test