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

.github/workflows/android.yml

@@ -0,0 +1,27 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build
+      run: ./gradlew assembleRelease
+    - name: Check lint
+      run: ./gradlew lintRelease
+    - name: Run unit tests
+      run: ./gradlew testReleaseUnitTest
+    - name: FindBugs
+      run: ./gradlew findbugs

.travis.yml

@@ -1,16 +0,0 @@
-language: android
-sudo: true
-
-install:
-- echo y | android update sdk -u -a -t tools
-- echo y | android update sdk -u -a -t platform-tools
-- echo y | android update sdk -u -a -t build-tools-26.0.2
-- yes | sdkmanager "platforms;android-27"
-- echo y | android update sdk -u -a -t extra-google-m2repository
-- echo y | android update sdk -u -a -t extra-android-m2repository
-
-script: ./gradlew assembleRelease testReleaseUnitTest lintRelease findbugs
-
-after_failure:
-- cat app/build/reports/findbugs/findbugs.html
-- cat app/build/reports/tests/debug/index.html

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.28 (2020-03-09)
+
+Changes:
+- Fix barcode centering when exiting full screen ([#351](https://github.com/brarcher/loyalty-card-locker/pull/351))
+- Allow backup export location to be selected ([#352](https://github.com/brarcher/loyalty-card-locker/pull/352))
+- Update translations ([#357](https://github.com/brarcher/loyalty-card-locker/pull/357)) & ([#362](https://github.com/brarcher/loyalty-card-locker/pull/362))
+
 ## v0.27 (2020-01-26)
 
 Changes:

app/build.gradle

@@ -10,17 +10,20 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        applicationId "protect.card_locker"
+        applicationId "me.hackerchick.catima"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 38
-        versionName "0.27"
+        versionCode 39
+        versionName "0.28"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            applicationIdSuffix ".debug"
+        }
     }
     lintOptions {
         disable "GoogleAppIndexingWarning"
@@ -46,7 +49,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'androidx.appcompat:appcompat:1.2.0-alpha01'
+    compile 'androidx.appcompat:appcompat:1.2.0'
     compile 'com.google.android.material:material:1.2.0-alpha03'
     compile 'androidx.legacy:legacy-support-v4:1.0.0'
     compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'

app/src/main/AndroidManifest.xml

@@ -45,7 +45,7 @@
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"
             android:exported="true">
-            <intent-filter android:label="@string/intent_import_card_from_url">
+            <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -53,8 +53,11 @@
                 <data android:scheme="https"
                     android:host="@string/intent_import_card_from_url_host"
                     android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host_old"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_old" />
             </intent-filter>
-            <intent-filter android:label="@string/intent_import_card_from_url">
+            <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <!-- Accept pkpass files -->
@@ -83,11 +86,6 @@
             android:label="@string/importExport"
             android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
-        <activity
-            android:name=".intro.IntroActivity"
-            android:label=""
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".CardShortcutConfigure"
             android:label="@string/cardShortcut"

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

@@ -5,6 +5,7 @@ import android.os.AsyncTask;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
@@ -20,7 +21,7 @@ import java.lang.ref.WeakReference;
  */
 class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     // When drawn in a smaller window 1D barcodes for some reason end up
     // squished, whereas 2D barcodes look fine.
@@ -28,16 +29,18 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
     private static final int MAX_WIDTH_2D = 500;
 
     private final WeakReference<ImageView> imageViewReference;
+    private final WeakReference<TextView> textViewReference;
     private final String cardId;
     private final BarcodeFormat format;
     private final int imageHeight;
     private final int imageWidth;
 
     BarcodeImageWriterTask(ImageView imageView, String cardIdString,
-                                  BarcodeFormat barcodeFormat)
+                           BarcodeFormat barcodeFormat, TextView textView)
     {
         // Use a WeakReference to ensure the ImageView can be garbage collected
         imageViewReference = new WeakReference<>(imageView);
+        textViewReference = new WeakReference<>(textView);
 
         cardId = cardIdString;
         format = barcodeFormat;
@@ -58,6 +61,11 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
+    BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
+    {
+        this(imageView, cardIdString, barcodeFormat, null);
+    }
+
     private int getMaxWidth(BarcodeFormat format)
     {
         switch(format)
@@ -175,16 +183,25 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
 
         imageView.setImageBitmap(result);
+        TextView textView = textViewReference.get();
 
         if(result != null)
         {
             Log.i(TAG, "Displaying barcode");
             imageView.setVisibility(View.VISIBLE);
+
+            if (textView != null) {
+                textView.setVisibility(View.VISIBLE);
+                textView.setText(format.name());
+            }
         }
         else
         {
             Log.i(TAG, "Barcode generation failed, removing image from display");
             imageView.setVisibility(View.GONE);
+            if (textView != null) {
+                textView.setVisibility(View.GONE);
+            }
         }
     }
 }

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

@@ -11,11 +11,13 @@ import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.zxing.BarcodeFormat;
@@ -34,7 +36,7 @@ import java.util.Map;
  */
 public class BarcodeSelectorActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     // Result this activity will return
     public static final String BARCODE_CONTENTS = "contents";
@@ -58,7 +60,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 BarcodeFormat.UPC_A.name()
         ));
 
-    private Map<String, Integer> barcodeViewMap;
+    private Map<String, Pair<Integer, Integer>> barcodeViewMap;
     private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
 
     @Override
@@ -75,18 +77,18 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        barcodeViewMap = ImmutableMap.<String, Integer>builder()
-                .put(BarcodeFormat.AZTEC.name(), R.id.aztecBarcode)
-                .put(BarcodeFormat.CODE_39.name(), R.id.code39Barcode)
-                .put(BarcodeFormat.CODE_128.name(), R.id.code128Barcode)
-                .put(BarcodeFormat.CODABAR.name(), R.id.codabarBarcode)
-                .put(BarcodeFormat.DATA_MATRIX.name(), R.id.datamatrixBarcode)
-                .put(BarcodeFormat.EAN_8.name(), R.id.ean8Barcode)
-                .put(BarcodeFormat.EAN_13.name(), R.id.ean13Barcode)
-                .put(BarcodeFormat.ITF.name(), R.id.itfBarcode)
-                .put(BarcodeFormat.PDF_417.name(), R.id.pdf417Barcode)
-                .put(BarcodeFormat.QR_CODE.name(), R.id.qrcodeBarcode)
-                .put(BarcodeFormat.UPC_A.name(), R.id.upcaBarcode)
+        barcodeViewMap = ImmutableMap.<String, Pair<Integer, Integer>>builder()
+                .put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText))
+                .put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText))
+                .put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText))
+                .put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText))
+                .put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText))
+                .put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText))
+                .put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText))
+                .put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText))
+                .put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText))
+                .put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText))
+                .put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText))
                 .build();
 
         EditText cardId = findViewById(R.id.cardId);
@@ -113,8 +115,9 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 // Update barcodes
                 for(String key : barcodeViewMap.keySet())
                 {
-                    ImageView image = findViewById(barcodeViewMap.get(key));
-                    createBarcodeOption(image, key, s.toString());
+                    ImageView image = findViewById(barcodeViewMap.get(key).first);
+                    TextView text = findViewById(barcodeViewMap.get(key).second);
+                    createBarcodeOption(image, key, s.toString(), text);
                 }
 
                 View noBarcodeButtonView = findViewById(R.id.noBarcode);
@@ -153,7 +156,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         });
     }
 
-    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId)
+    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
     {
         final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
         if(format == null)
@@ -198,7 +201,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                         }
 
                         Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format);
+                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
                         barcodeGeneratorTasks.add(task);
                         task.execute();
                     }
@@ -207,7 +210,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         else
         {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format);
+            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
             barcodeGeneratorTasks.add(task);
             task.execute();
         }

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

@@ -17,7 +17,7 @@ import android.widget.Toast;
  */
 public class CardShortcutConfigure extends AppCompatActivity
 {
-    static final String TAG = "LoyaltyCardLocker";
+    static final String TAG = "Catima";
 
     @Override
     public void onCreate(Bundle bundle)

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

@@ -17,7 +17,7 @@ import java.nio.ByteBuffer;
 
 public class DBHelper extends SQLiteOpenHelper
 {
-    public static final String DATABASE_NAME = "LoyaltyCards.db";
+    public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
     public static final int DATABASE_VERSION = 4;
 

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

@@ -10,15 +10,14 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Environment;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
-import androidx.core.content.FileProvider;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -28,21 +27,21 @@ import android.widget.Toast;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.List;
 
 public class ImportExportActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
-    private static final int CHOOSE_EXPORT_FILE = 2;
+    private static final int CHOOSE_EXPORT_LOCATION = 2;
+    private static final int CHOOSE_EXPORTED_FILE = 3;
 
     private ImportExportTask importExporter;
 
-    private final File sdcardDir = Environment.getExternalStorageDirectory();
-    private final File exportFile = new File(sdcardDir, "LoyaltyCardKeychain.csv");
-
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -70,6 +69,11 @@ public class ImportExportActivity extends AppCompatActivity
                     PERMISSIONS_EXTERNAL_STORAGE);
         }
 
+        // Check that there is a file manager available
+        final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+        intentCreateDocumentAction.addCategory(Intent.CATEGORY_OPENABLE);
+        intentCreateDocumentAction.setType("text/csv");
+        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "Catima.csv");
 
         Button exportButton = findViewById(R.id.exportButton);
         exportButton.setOnClickListener(new View.OnClickListener()
@@ -77,7 +81,7 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                startExport();
+                chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
             }
         });
 
@@ -86,14 +90,13 @@ public class ImportExportActivity extends AppCompatActivity
         intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
         intentGetContentAction.setType("*/*");
 
-
         Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
         importFilesystem.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentGetContentAction);
+                chooseFileWithIntent(intentGetContentAction, CHOOSE_EXPORTED_FILE);
             }
         });
 
@@ -114,7 +117,7 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentPickAction);
+                chooseFileWithIntent(intentPickAction, CHOOSE_EXPORTED_FILE);
             }
         });
 
@@ -125,28 +128,6 @@ public class ImportExportActivity extends AppCompatActivity
             findViewById(R.id.importOptionApplicationExplanation).setVisibility(View.GONE);
             importApplication.setVisibility(View.GONE);
         }
-
-        // This option, to import from the fixed location, should always be present
-
-        Button importButton = findViewById(R.id.importOptionFixedButton);
-        importButton.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                Uri uri = Uri.fromFile(exportFile);
-                try
-                {
-                    FileInputStream stream = new FileInputStream(exportFile);
-                    startImport(stream, uri);
-                }
-                catch(FileNotFoundException e)
-                {
-                    Log.e(TAG, "Could not import file " + exportFile.getAbsolutePath(), e);
-                    onImportComplete(false, uri);
-                }
-            }
-        });
     }
 
     private void startImport(final InputStream target, final Uri targetUri)
@@ -165,19 +146,19 @@ public class ImportExportActivity extends AppCompatActivity
         importExporter.execute();
     }
 
-    private void startExport()
+    private void startExport(final OutputStream target, final Uri targetUri)
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
             public void onTaskComplete(boolean success)
             {
-                onExportComplete(success, exportFile);
+                onExportComplete(success, targetUri);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.CSV, exportFile, listener);
+                DataFormat.CSV, target, listener);
         importExporter.execute();
     }
 
@@ -245,13 +226,9 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.importFailedTitle);
         }
 
-        int messageId = success ? R.string.importedFrom : R.string.importFailed;
-        final String template = getResources().getString(messageId);
+        int messageId = success ? R.string.importSuccessful : R.string.importFailed;
+        final String message = getResources().getString(messageId);
 
-        // Get the filename of the file being imported
-        String filename = path.toString();
-
-        final String message = String.format(template, filename);
         builder.setMessage(message);
         builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
         {
@@ -265,7 +242,7 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    private void onExportComplete(boolean success, final File path)
+    private void onExportComplete(boolean success, final Uri path)
     {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
@@ -278,10 +255,9 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.exportFailedTitle);
         }
 
-        int messageId = success ? R.string.exportedTo : R.string.exportFailed;
+        int messageId = success ? R.string.exportSuccessful : R.string.exportFailed;
+        final String message = getResources().getString(messageId);
 
-        final String template = getResources().getString(messageId);
-        final String message = String.format(template, path.getAbsolutePath());
         builder.setMessage(message);
         builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
         {
@@ -301,9 +277,8 @@ public class ImportExportActivity extends AppCompatActivity
                 @Override
                 public void onClick(DialogInterface dialog, int which)
                 {
-                    Uri outputUri = FileProvider.getUriForFile(ImportExportActivity.this, BuildConfig.APPLICATION_ID, path);
                     Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                    sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri);
+                    sendIntent.putExtra(Intent.EXTRA_STREAM, path);
                     sendIntent.setType("text/csv");
 
                     // set flag to give temporary permission to external app to use the FileProvider
@@ -345,11 +320,11 @@ public class ImportExportActivity extends AppCompatActivity
         return false;
     }
 
-    private void chooseFileWithIntent(Intent intent)
+    private void chooseFileWithIntent(Intent intent, int requestCode)
     {
         try
         {
-            startActivityForResult(intent, CHOOSE_EXPORT_FILE);
+            startActivityForResult(intent, requestCode);
         }
         catch (ActivityNotFoundException e)
         {
@@ -362,7 +337,7 @@ public class ImportExportActivity extends AppCompatActivity
     {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (resultCode != RESULT_OK || requestCode != CHOOSE_EXPORT_FILE)
+        if (resultCode != RESULT_OK || (requestCode != CHOOSE_EXPORT_LOCATION && requestCode != CHOOSE_EXPORTED_FILE))
         {
             Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
             return;
@@ -377,24 +352,48 @@ public class ImportExportActivity extends AppCompatActivity
 
         try
         {
-            InputStream reader;
-
-            if(uri.getScheme() != null)
+            if (requestCode == CHOOSE_EXPORT_LOCATION)
             {
-                reader = getContentResolver().openInputStream(uri);
+                OutputStream writer;
+                if (uri.getScheme() != null)
+                {
+                    writer = getContentResolver().openOutputStream(uri);
+                }
+                else
+                {
+                    writer = new FileOutputStream(new File(uri.toString()));
+                }
+
+                Log.e(TAG, "Starting file export with: " + uri.toString());
+                startExport(writer, uri);
             }
             else
             {
-                reader = new FileInputStream(new File(uri.toString()));
-            }
+                InputStream reader;
+                if(uri.getScheme() != null)
+                {
+                    reader = getContentResolver().openInputStream(uri);
+                }
+                else
+                {
+                    reader = new FileInputStream(new File(uri.toString()));
+                }
 
-            Log.e(TAG, "Starting file import with: " + uri.toString());
-            startImport(reader, uri);
+                Log.e(TAG, "Starting file export with: " + uri.toString());
+                startImport(reader, uri);
+            }
         }
         catch(FileNotFoundException e)
         {
-            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
-            onImportComplete(false, uri);
+            Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
+            if (requestCode == CHOOSE_EXPORT_LOCATION)
+            {
+                onExportComplete(false, uri);
+            }
+            else
+            {
+                onImportComplete(false, uri);
+            }
         }
     }
 }

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

@@ -4,27 +4,23 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.os.Environment;
 import android.util.Log;
-import android.widget.Toast;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 
 class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     private Activity activity;
     private boolean doImport;
     private DataFormat format;
-    private File target;
+    private OutputStream outputStream;
     private InputStream inputStream;
     private TaskCompleteListener listener;
 
@@ -33,14 +29,14 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
     /**
      * Constructor which will setup a task for exporting to the given file
      */
-    ImportExportTask(Activity activity, DataFormat format, File target,
+    ImportExportTask(Activity activity, DataFormat format, OutputStream output,
             TaskCompleteListener listener)
     {
         super();
         this.activity = activity;
         this.doImport = false;
         this.format = format;
-        this.target = target;
+        this.outputStream = output;
         this.listener = listener;
     }
 
@@ -78,14 +74,13 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
         return result;
     }
 
-    private boolean performExport(File exportFile, DBHelper db)
+    private boolean performExport(OutputStream stream, DBHelper db)
     {
         boolean result = false;
 
         try
         {
-            FileOutputStream fileWriter = new FileOutputStream(exportFile);
-            OutputStreamWriter writer = new OutputStreamWriter(fileWriter, Charset.forName("UTF-8"));
+            OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
             result = MultiFormatExporter.exportData(db, writer, format);
             writer.close();
         }
@@ -94,7 +89,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
             Log.e(TAG, "Unable to export file", e);
         }
 
-        Log.i(TAG, "Export of '" + exportFile.getAbsolutePath() + "' result: " + result);
+        Log.i(TAG, "Export result: " + result);
 
         return result;
     }
@@ -127,7 +122,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
         }
         else
         {
-            result = performExport(target, db);
+            result = performExport(outputStream, db);
         }
 
         return result;

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

@@ -24,17 +24,21 @@ public class ImportURIHelper {
     private final Context context;
     private final String host;
     private final String path;
+    private final String oldHost;
+    private final String oldPath;
     private final String shareText;
 
     public ImportURIHelper(Context context) {
         this.context = context;
         host = context.getResources().getString(R.string.intent_import_card_from_url_host);
         path = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix);
+        oldHost = context.getResources().getString(R.string.intent_import_card_from_url_host_old);
+        oldPath = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_old);
         shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
     }
 
     public boolean isImportUri(Uri uri) {
-        return uri.getHost().equals(host) && uri.getPath().equals(path);
+        return (uri.getHost().equals(host) && uri.getPath().equals(path)) || (uri.getHost().equals(oldHost) && uri.getPath().equals(oldPath));
     }
 
     public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
@@ -64,12 +68,19 @@ public class ImportURIHelper {
             String iconData = uri.getQueryParameter(ICON);
             Bitmap icon = null;
 
-            if(!iconData.isEmpty())
+            if(iconData != null && !iconData.isEmpty())
             {
                 byte[] iconBytes = Base64.decode(iconData, Base64.URL_SAFE);
                 icon = DBHelper.convertBitmapBlobToBitmap(iconBytes);
             }
-            ExtrasHelper extras = new ExtrasHelper().fromJSON(new JSONObject(uri.getQueryParameter(EXTRAS)));
+
+            String extrasData = uri.getQueryParameter(EXTRAS);
+            ExtrasHelper extras = new ExtrasHelper();
+            if(extrasData != null && !extrasData.isEmpty())
+            {
+                extras.fromJSON(new JSONObject(uri.getQueryParameter(EXTRAS)));
+            }
+
             return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
         } catch (NullPointerException | NumberFormatException | JSONException ex) {
             throw new InvalidObjectException("Not a valid import URI");

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

@@ -9,6 +9,8 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
@@ -39,7 +41,7 @@ import java.io.InvalidObjectException;
 
 public class LoyaltyCardEditActivity extends AppCompatActivity
 {
-    private static final String TAG = "CardLocker";
+    private static final String TAG = "Catima";
     protected static final String NO_BARCODE = "_NO_BARCODE_";
 
     protected static final int SELECT_BARCODE_REQUEST = 1;
@@ -140,7 +142,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         cardIdFieldView = findViewById(R.id.cardIdView);
         cardIdDivider = findViewById(R.id.cardIdDivider);
         cardIdTableRow = findViewById(R.id.cardIdTableRow);
-        barcodeTypeField = findViewById(R.id.barcodeType);
+        barcodeTypeField = findViewById(R.id.barcodeTypeView);
         barcodeImage = findViewById(R.id.barcode);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
@@ -199,7 +201,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             if(barcodeTypeField.getText().length() == 0)
             {
-                barcodeTypeField.setText(loyaltyCard.barcodeType);
+                barcodeTypeField.setText(loyaltyCard.barcodeType.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : loyaltyCard.barcodeType);
             }
 
             if(headingColorValue == null)
@@ -248,6 +250,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         else
         {
             setTitle(R.string.addCardTitle);
+            hideBarcode();
         }
 
         if(headingColorValue == null)
@@ -270,9 +273,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
         {
-            if(barcodeTypeField.getText().equals(NO_BARCODE))
+            if(barcodeTypeField.getText().toString().equals(NO_BARCODE))
             {
-                barcodeImageLayout.setVisibility(View.GONE);
+                hideBarcode();
             }
             else
             {
@@ -311,7 +314,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                     new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
                 }
 
-                barcodeImageLayout.setVisibility(View.VISIBLE);
+                showBarcode();
             }
         }
 
@@ -363,6 +366,18 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             cardIdTableRow.setVisibility(View.GONE);
             enterButton.setText(R.string.enterCard);
         }
+
+        FloatingActionButton saveButton = findViewById(R.id.fabSave);
+        saveButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    doSave();
+                } catch (JSONException ex) {
+                    Toast.makeText(getApplicationContext(), R.string.failedSavingCard, Toast.LENGTH_LONG).show();
+                }
+            }
+        });
     }
 
     class ColorSelectListener implements View.OnClickListener
@@ -504,17 +519,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 dialog.show();
 
                 return true;
-
-            case R.id.action_save:
-                try {
-                    doSave();
-                }
-                catch (JSONException ex)
-                {
-                    Toast.makeText(this, R.string.failedSavingCard, Toast.LENGTH_LONG).show();
-                    return false;
-                }
-                return true;
         }
 
         return super.onOptionsItemSelected(item);
@@ -554,10 +558,21 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             TextView cardIdView = findViewById(R.id.cardIdView);
             cardIdView.setText(contents);
 
-            final TextView barcodeTypeField = findViewById(R.id.barcodeType);
             // Set special NO_BARCODE value to prevent onResume from overwriting it
             barcodeTypeField.setText(format.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : format);
             onResume();
         }
     }
+
+    private void showBarcode() {
+        barcodeImageLayout.setVisibility(View.VISIBLE);
+        findViewById(R.id.barcodeTypeDivider).setVisibility(View.VISIBLE);
+        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.VISIBLE);
+    }
+
+    private void hideBarcode() {
+        barcodeImageLayout.setVisibility(View.GONE);
+        findViewById(R.id.barcodeTypeDivider).setVisibility(View.GONE);
+        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.GONE);
+    }
 }

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

@@ -31,6 +31,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.zxing.BarcodeFormat;
 
 import org.json.JSONException;
@@ -44,7 +45,7 @@ import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardViewActivity extends AppCompatActivity
 {
-    private static final String TAG = "CardLocker";
+    private static final String TAG = "Catima";
     private static final double LUMINANCE_MIDPOINT = 0.5;
 
     TextView cardIdFieldView;
@@ -282,6 +283,20 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         {
             findViewById(R.id.barcode).setVisibility(View.GONE);
         }
+
+        FloatingActionButton editButton = findViewById(R.id.fabEdit);
+        editButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putInt("id", loyaltyCardId);
+                bundle.putBoolean("update", true);
+                intent.putExtras(bundle);
+                startActivity(intent);
+                finish();
+            }
+        });
     }
 
     @Override
@@ -318,7 +333,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
 
         menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
-        menu.findItem(R.id.action_edit).setIcon(getIcon(R.drawable.ic_mode_edit_white_24dp, backgroundNeedsDarkIcons));
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -338,16 +352,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 importURIHelper.startShareIntent(loyaltyCard);
                 return true;
 
-            case R.id.action_edit:
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = new Bundle();
-                bundle.putInt("id", loyaltyCardId);
-                bundle.putBoolean("update", true);
-                intent.putExtras(bundle);
-                startActivity(intent);
-                finish();
-                return true;
-
             case R.id.action_lock_unlock:
                 if(rotationEnabled)
                 {
@@ -455,6 +459,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             // Move barcode to top
             barcodeImage.setScaleType(ImageView.ScaleType.FIT_START);
 
+            // Prevent centering
+            barcodeImage.setAdjustViewBounds(false);
+
             // Set current state
             barcodeIsFullscreen = true;
         }
@@ -479,6 +486,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             // Turn barcode back to normal
             barcodeImage.setLayoutParams(barcodeImageState);
 
+            // Fix barcode centering
+            barcodeImage.setAdjustViewBounds(true);
+
             // Set current state
             barcodeIsFullscreen = false;
         }

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

@@ -28,17 +28,17 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Calendar;
 import java.util.Map;
 
-import protect.card_locker.intro.IntroActivity;
 import protect.card_locker.preferences.SettingsActivity;
 
 public class MainActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
     private static final int MAIN_REQUEST_CODE = 1;
 
     private Menu menu;
@@ -53,12 +53,6 @@ public class MainActivity extends AppCompatActivity
         setSupportActionBar(toolbar);
 
         updateLoyaltyCardList("");
-
-        SharedPreferences prefs = getSharedPreferences("protect.card_locker", MODE_PRIVATE);
-        if (prefs.getBoolean("firstrun", true)) {
-            startIntro();
-            prefs.edit().putBoolean("firstrun", false).commit();
-        }
     }
 
     @Override
@@ -75,6 +69,15 @@ public class MainActivity extends AppCompatActivity
         }
 
         updateLoyaltyCardList(filter);
+
+        FloatingActionButton addButton = findViewById(R.id.fabAdd);
+        addButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                startActivityForResult(i, MAIN_REQUEST_CODE);
+            }
+        });
     }
 
     @Override
@@ -261,13 +264,6 @@ public class MainActivity extends AppCompatActivity
     {
         int id = item.getItemId();
 
-        if (id == R.id.action_add)
-        {
-            Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-            startActivityForResult(i, MAIN_REQUEST_CODE);
-            return true;
-        }
-
         if(id == R.id.action_import_export)
         {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
@@ -282,12 +278,6 @@ public class MainActivity extends AppCompatActivity
             return true;
         }
 
-        if(id == R.id.action_intro)
-        {
-            startIntro();
-            return true;
-        }
-
         if(id == R.id.action_about)
         {
             displayAboutDialog();
@@ -356,7 +346,6 @@ public class MainActivity extends AppCompatActivity
         String html =
             "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
             css +
-            "<img src=\"file:///android_res/mipmap/ic_launcher.png\" alt=\"" + appName + "\"/>" +
             "<h1>" +
             String.format(getString(R.string.about_title_fmt),
                     "<a href=\"" + getString(R.string.app_webpage_url)) + "\">" +
@@ -369,10 +358,12 @@ public class MainActivity extends AppCompatActivity
             "</p><p>" +
             String.format(getString(R.string.app_revision_fmt),
                     "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
-                            getString(R.string.app_revision_url) +
+                            "GitHub" +
                             "</a>") +
             "</p><hr/><p>" +
             String.format(getString(R.string.app_copyright_fmt), year) +
+            "</p><p>" +
+            getString(R.string.app_copyright_old) +
             "</p><hr/><p>" +
             getString(R.string.app_license) +
             "</p><hr/><p>" +
@@ -393,10 +384,4 @@ public class MainActivity extends AppCompatActivity
             })
             .show();
     }
-
-    private void startIntro()
-    {
-        Intent intent = new Intent(this, IntroActivity.class);
-        startActivityForResult(intent, MAIN_REQUEST_CODE);
-    }
-}
+}

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

@@ -7,7 +7,7 @@ import java.io.OutputStreamWriter;
 
 public class MultiFormatExporter
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     /**
      * Attempts to export data to the output stream in the

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

@@ -7,7 +7,7 @@ import java.io.InputStreamReader;
 
 public class MultiFormatImporter
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     /**
      * Attempts to import data from the input stream of the

app/src/main/java/protect/card_locker/intro/IntroActivity.java

@@ -1,33 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-
-import com.github.paolorotolo.appintro.AppIntro;
-
-
-public class IntroActivity extends AppIntro
-{
-    @Override
-    public void init(Bundle savedInstanceState)
-    {
-        addSlide(new IntroSlide1());
-        addSlide(new IntroSlide2());
-        addSlide(new IntroSlide3());
-        addSlide(new IntroSlide4());
-        addSlide(new IntroSlide5());
-        addSlide(new IntroSlide6());
-    }
-
-    @Override
-    public void onSkipPressed(Fragment fragment) {
-        finish();
-    }
-
-    @Override
-    public void onDonePressed(Fragment fragment) {
-        finish();
-    }
-}
-
-

app/src/main/java/protect/card_locker/intro/IntroSlide1.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide1 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro1_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide2.java

@@ -1,20 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide2 extends Fragment
-{
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro2_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide3.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide3 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro3_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide4.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide4 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro4_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide5.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide5 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro5_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide6.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide6 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro6_layout, container, false);
-        return v;
-    }
-}

app/src/main/res/layout/barcode_selector_activity.xml

@@ -70,137 +70,236 @@
                 android:layout_height="wrap_content"
                 android:text="@string/barcodeNoBarcode"
                 android:enabled="false" />
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/aztecBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/aztecBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/code39Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/code39BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/code128Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/code128BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/codabarBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/codabarBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/datamatrixBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/datamatrixBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/ean8Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/ean8BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/ean13Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/ean13BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/itfBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/itfBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/pdf417Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/pdf417BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/qrcodeBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/qrcodeBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/upcaBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/upcaBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

app/src/main/res/layout/import_export_activity.xml

@@ -99,7 +99,6 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/importOptionFilesystemButton" />
 
-
             <View
                 android:id="@+id/dividerImportApplication"
                 android:layout_width="fill_parent"
@@ -129,36 +128,6 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="8dp"
                 android:text="@string/importOptionApplicationButton" />
-
-            <View
-                android:id="@+id/dividerImportFixed"
-                android:layout_width="fill_parent"
-                android:layout_height="1dp"
-                android:layout_margin="16dp"
-                android:background="?android:attr/listDivider"/>
-
-            <TextView
-                android:id="@+id/importOptionFixedTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
-                android:text="@string/importOptionFixedTitle"/>
-
-            <TextView
-                android:id="@+id/importOptionFixedExplanation"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/text_size_medium"
-                android:text="@string/importOptionFixedExplanation"/>
-
-            <Button
-                android:id="@+id/importOptionFixedButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="8dp"
-                android:text="@string/importOptionFixedButton" />
         </LinearLayout>
     </ScrollView>
 

app/src/main/res/layout/intro1_layout.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro1Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/app_icon_intro"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro1Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

app/src/main/res/layout/intro2_layout.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro2Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/intro2_image"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro2Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

app/src/main/res/layout/intro3_layout.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro3Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/intro3_image"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro3Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

app/src/main/res/layout/intro4_layout.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro4Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/intro4_image"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro4Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

app/src/main/res/layout/intro5_layout.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro5Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/intro5_image"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro5Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

app/src/main/res/layout/intro6_layout.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro6Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/app_icon_intro"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro6Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

app/src/main/res/layout/loyalty_card_edit_activity.xml

@@ -5,6 +5,15 @@
                                                      android:layout_height="match_parent"
                                                      android:fitsSystemWindows="true">
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabSave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:src="@drawable/save_24dp"
+        android:contentDescription="@string/save"
+        android:layout_margin="16dp" />
+
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -335,16 +344,66 @@
                         android:background="@color/inputBorder" />
                 </TableRow>
 
+                <!-- Barcode Type -->
+                <View
+                    android:id="@+id/barcodeTypeDivider"
+                    android:layout_height="@dimen/inputBorderThickness"
+                    android:layout_width="match_parent"
+                    android:background="@color/inputBorder" />
+                <TableRow
+                    android:id="@+id/barcodeTypeTableRow"
+                    android:background="@color/inputBackground"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <View
+                        android:gravity="start"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+
+                    <RelativeLayout
+                        android:orientation="horizontal"
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="@dimen/inputPadding"
+                        android:paddingEnd="@dimen/inputPadding">
+
+                        <TextView
+                            android:id="@+id/barcodeTypeField"
+                            android:text="@string/barcodeType"
+                            android:layout_height="match_parent"
+                            android:layout_width="wrap_content"
+                            android:textSize="@dimen/inputSize"
+                            android:padding="@dimen/inputPadding"
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            />
+
+                        <TextView
+                            android:id="@+id/barcodeTypeView"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:padding="@dimen/inputPadding"
+                            android:textSize="@dimen/inputSize"
+                            android:textIsSelectable="true"
+                            android:layout_toEndOf="@id/barcodeTypeField"
+                            android:layout_toRightOf="@id/barcodeTypeField"
+                            />
+                    </RelativeLayout>
+
+                    <View
+                        android:gravity="end"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+                </TableRow>
+
                 <View
                     android:layout_height="@dimen/inputBorderThickness"
                     android:layout_width="match_parent"
                     android:background="@color/inputBorder" />
 
-                <TextView android:id="@+id/barcodeType"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:visibility="gone"/>
-
                 <LinearLayout android:orientation="horizontal"
                               android:padding="10.0dip"
                               android:layout_width="fill_parent"

app/src/main/res/layout/loyalty_card_view_layout.xml

@@ -8,6 +8,15 @@
     android:fitsSystemWindows="true"
     >
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabEdit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:src="@drawable/ic_mode_edit_white_24dp"
+        android:contentDescription="@string/edit"
+        android:layout_margin="16dp" />
+
     <FrameLayout
         android:clipChildren="false"
         android:clipToPadding="false"

app/src/main/res/layout/main_activity.xml

@@ -8,6 +8,15 @@
     android:fitsSystemWindows="true"
     tools:context="protect.card_locker.MainActivity">
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabAdd"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:src="@drawable/ic_add_white_24dp"
+        android:contentDescription="@string/action_add"
+        android:layout_margin="16dp" />
+
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/menu/card_add_menu.xml

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_save"
-        android:icon="@drawable/save_24dp"
-        android:title="@string/save"
-        app:showAsAction="always"/>
 </menu>

app/src/main/res/menu/card_update_menu.xml

@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_save"
-        android:icon="@drawable/save_24dp"
-        android:title="@string/save"
-        app:showAsAction="always"/>
-
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/delete"
-        app:showAsAction="never"/>
+        app:showAsAction="always"/>
 </menu>

app/src/main/res/menu/card_view_menu.xml

@@ -12,11 +12,6 @@
         android:icon="@drawable/ic_share_white"
         android:title="@string/share"
         app:showAsAction="always"/>
-    <item
-        android:id="@+id/action_edit"
-        android:icon="@drawable/ic_mode_edit_white_24dp"
-        android:title="@string/edit"
-        app:showAsAction="always"/>
     <item
         android:id="@+id/action_view_extras"
         android:icon="@drawable/ic_info_outline_white"

app/src/main/res/menu/main_menu.xml

@@ -8,11 +8,6 @@
         android:icon="@drawable/ic_search_white"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always|collapseActionView"/>
-    <item
-        android:id="@+id/action_add"
-        android:icon="@drawable/ic_add_white_24dp"
-        android:title="@string/action_add"
-        app:showAsAction="always"/>
     <item
         android:id="@+id/action_import_export"
         android:icon="@drawable/ic_import_export_white_24dp"
@@ -22,10 +17,6 @@
         android:id="@+id/action_settings"
         android:title="@string/settings"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/action_intro"
-        android:title="@string/startIntro"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/action_about"
         android:title="@string/about"

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

@@ -1,14 +1,12 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <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>
@@ -23,7 +21,6 @@
     <string name="sendLabel">Odeslat&#8230;</string>
     <string name="editCardTitle">Editovat věrnostní kartu</string>
     <string name="addCardTitle">Přidat věrnostní kartu</string>
-    <string name="viewCardTitle">Zobrazit věrnostní kartu</string>
     <string name="scanCardBarcode">Oskenujte kód karty</string>
     <string name="barcodeImageDescription">Obrázek kódu karty</string>
 
@@ -31,31 +28,23 @@
     <string name="noCardIdError">Nebylo zadáno ID karty</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</string>
-    <string name="importName">Import</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Zálohování dat vám umožní přesunout vaše uložené karty na jiné zařízení.</string>
-    <string name="importedFrom">Importováno z: %1$s</string>
-    <string name="exportedTo">Exportováno do: %1$s</string>
-    <string name="fileMissing">Doubor chybí: %1$s</string>
     <string name="importSuccessfulTitle">Import proběhl úspěšně</string>
     <string name="importFailedTitle">Import selhal</string>
-    <string name="importFailed">Import selhal: %1$s</string>
+    <string name="importFailed">Import selhal</string>
     <string name="exportSuccessfulTitle">Export proběhl úspěšně</string>
     <string name="exportFailedTitle">Export selhal</string>
-    <string name="exportFailed">Export selhal: %1$s</string>
+    <string name="exportFailed">Export selhal</string>
     <string name="importing">Importuji&#8230;</string>
     <string name="exporting">Exportuji&#8230;</string>
     <string name="noExternalStoragePermissionError">Nelze importovat nebo exportovat karty bez přístupu k externímu uložišti</string>
-    <string name="exportOptionExplanation">Data jsou zapsána do kořenové složky externího uložiště.</string>
     <string name="importOptionFilesystemTitle">Import ze souborového systému</string>
     <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v uložišti.</string>
     <string name="importOptionFilesystemButton">Ze souborového systému</string>
     <string name="importOptionApplicationTitle">Použít externí aplikaci</string>
     <string name="importOptionApplicationExplanation">K otevření souboru použije externí aplikaci jako Dropbox, Google Drive, nebo vámi preferovaný prohlížeč souborů.</string>
     <string name="importOptionApplicationButton">Použít externí aplikaci</string>
-    <string name="importOptionFixedTitle">Import z umístění exportu</string>
-    <string name="importOptionFixedExplanation">Import ze stejné složky souborového systému do níž se zapisuje při exportu.</string>
-    <string name="importOptionFixedButton">Použít složku exportu</string>
 
     <string name="about">O aplikaci</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>

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

@@ -1,7 +1,6 @@
 <resources
     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>
 
@@ -11,7 +10,6 @@
     <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>
@@ -27,11 +25,8 @@
     <string name="ok">Ok</string>
     <string name="copy_to_clipboard">Kopiere die Nummer in die Zwischenablage</string>
     <string name="sendLabel">Senden&#8230;</string>
-    <string name="addedShortcut">Zum Home Screen hinzugefügt</string>
-
     <string name="editCardTitle">Kundenkarte bearbeiten</string>
     <string name="addCardTitle">Neue Kundenkarte</string>
-    <string name="viewCardTitle">Kundenkarte anzeigen</string>
     <string name="scanCardBarcode">Barcode scannen</string>
     <string name="cardShortcut">Shortcut zu einer Karte</string>
     <string name="noCardsMessage">Es ist noch keine Karte vorhanden, bitte zuerst eine hinzufügen</string>
@@ -43,31 +38,23 @@
     <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>
     <string name="exportName">Exportieren</string>
     <string name="importExportHelp">Gesicherte Daten ermöglichen das Verschieben der Kundenkarten auf ein anderes Gerät.</string>
-    <string name="importedFrom">Importiert von: %1$s</string>
-    <string name="exportedTo">Exportiert nach: %1$s</string>
-    <string name="fileMissing">Datei fehlt: %1$s</string>
     <string name="importSuccessfulTitle">Import erfolgreich</string>
     <string name="importFailedTitle">Import fehlgeschlagen</string>
-    <string name="importFailed">Import fehlgeschlagen: %1$s</string>
+    <string name="importFailed">Import fehlgeschlagen</string>
     <string name="exportSuccessfulTitle">Export erfolgreich</string>
     <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportFailed">Export fehlgeschlagen: %1$s</string>
+    <string name="exportFailed">Export fehlgeschlagen</string>
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>
     <string name="noExternalStoragePermissionError">Ohne die Berechtigung für den externen Speicher kann kein Import oder Export erfolgen.</string>
-    <string name="exportOptionExplanation">Die Datei wird ins Rootverzeichnis des externen Speichers geschrieben.</string>
     <string name="importOptionFilesystemTitle">Importiere aus Dateisystem</string>
     <string name="importOptionFilesystemExplanation">Wähle eine Datei aus dem Speicher aus.</string>
     <string name="importOptionFilesystemButton">Aus Dateisystem</string>
     <string name="importOptionApplicationTitle">Externe App verwenden</string>
     <string name="importOptionApplicationExplanation">Wählen Sie eine Datei aus einer App wie Dropbox, Google Drive, oder Ihrem bevorzugten Dateisystem aus.</string>
     <string name="importOptionApplicationButton">Nutze eine externe App</string>
-    <string name="importOptionFixedTitle">Importiere aus Export-Pfad</string>
-    <string name="importOptionFixedExplanation">Nutze den Export-Pfad, um Karten zu importieren (dies stellt zuvor gesicherte Daten wieder her).</string>
-    <string name="importOptionFixedButton">Export-Pfad verwenden</string>
 
     <string name="about">Über</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -83,20 +70,6 @@
 
     <string name="thumbnailDescription">Vorschaubild für die Karte</string>
 
-    <string name="startIntro">Starte Einführung</string>
-    <string name="intro1Title">Willkommen zu Loyalty Card Keychain\n</string>
-    <string name="intro1Description">Verwalten Sie Ihre Barcode-Kundenkarten auf Ihrem Smartphone!\n\n</string>
-    <string name="intro2Title">Karten hinzufügen\n</string>
-    <string name="intro2Description">Fügen Sie neue Karten hinzu indem Sie das "+" Symbol in der Liste berühren.\n\n</string>
-    <string name="intro3Title">Karten hinzufügen\n</string>
-    <string name="intro3Description">Um einen Barcode hinzuzufügen, verwenden Sie die Kamera oder geben Sie den Code manuell ein.\n\n</string>
-    <string name="intro4Title">Karte anzeigen\n</string>
-    <string name="intro4Description">Um eine Karte anzuzeigen, den entsprechenen Namen in der Hauptansicht anwählen.\n\n</string>
-    <string name="intro5Title">Backup\n</string>
-    <string name="intro5Description">Sie können selbstverständlich Backups anlegen. Um Karten zu exportieren oder importieren wählen Sie Import/Export im Menü auf dem Hauptbildschirm.\n\n</string>
-    <string name="intro6Title">Feedback\n</string>
-    <string name="intro6Description">Diese App enthält keine Werbung, und ist freie und quelloffene Software. Für Details berühren Sie Über im Menü auf der Hauptseite.\n\nHinterlassen Sie uns ein Feedback im App-Store (:</string>
-
     <string name="change">Anpassen</string>
     <string name="storeTextColorTitle">Textfarbe</string>
     <string name="storeTextBackgroundColorTitle">Hintergrundfarbe</string>

app/src/main/res/values-el-rGR/strings.xml

@@ -1,14 +1,12 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <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>
@@ -24,11 +22,8 @@
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Αντιγραφή κωδικού στο πρόχειρο</string>
     <string name="sendLabel">Αποστολή&#8230;</string>
-    <string name="addedShortcut">Προστέθηκε στην Αρχική Οθόνη</string>
-
     <string name="editCardTitle">Επεξεργασία Κάρτας</string>
     <string name="addCardTitle">Προσθήκη Κάρτας</string>
-    <string name="viewCardTitle">Εμφάνιση Κάρτας</string>
     <string name="scanCardBarcode">Σαρώστε τον κωδικό της κάρτας</string>
     <string name="cardShortcut">Συντόμευση Κάρτας</string>
     <string name="noCardsMessage">Δεν υπάρχουν κάρτες. προσθέστε μία πρώτα</string>
@@ -40,31 +35,23 @@
     <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί κάρτα</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Εισαγωγή/Εξαγωγή</string>
-    <string name="importName">Εισαγωγή</string>
     <string name="exportName">Εξαγωγή</string>
     <string name="importExportHelp">Τα εφεδρικά δεδομένα σας δίνουν την δυνατότητα να μεταφέρετε τις κάρτες σας σε μία άλλη συσκευή.</string>
-    <string name="importedFrom">Εισαγωγή από: %1$s</string>
-    <string name="exportedTo">Εξαγωγή σε: %1$s</string>
-    <string name="fileMissing">Το αρχείο λείπει: %1$s</string>
     <string name="importSuccessfulTitle">Εισαγωγή επιτυχής</string>
     <string name="importFailedTitle">Εισαγωγή ανεπιτυχής</string>
-    <string name="importFailed">Δεν εισήχθει: %1$s</string>
+    <string name="importFailed">Δεν εισήχθει</string>
     <string name="exportSuccessfulTitle">Εξαγωγή επιτυχής</string>
     <string name="exportFailedTitle">Εξαγωγή ανεπιτυχής</string>
-    <string name="exportFailed">Δεν εξήχθη: %1$s</string>
+    <string name="exportFailed">Δεν εξήχθη</string>
     <string name="importing">Γίνεται εισαγωγή του&#8230;</string>
     <string name="exporting">Γίνεται εξαγωγή του&#8230;</string>
     <string name="noExternalStoragePermissionError">Δεν είναι δυνατή η εισαγωγή ή εξαγωγή καρτών χωρίς την άδεια πρόσβασης στον εξωτερικό χώρο αποθήκευσης</string>
-    <string name="exportOptionExplanation">Τα δεδομένα αποθηκεύονται στον αρχικό φάκελο του εξωτερικού χώρου αποθήκευσης.</string>
     <string name="importOptionFilesystemTitle">Εισαγωγή από το σύστημα αρχείων</string>
     <string name="importOptionFilesystemExplanation">Επιλέξτε ένα συγκεκριμένο αρχείο από το σύστημα αρχείων.</string>
     <string name="importOptionFilesystemButton">Από το σύστημα αρχείων</string>
     <string name="importOptionApplicationTitle">Χρήση εξωτερικής εφαρμογής</string>
     <string name="importOptionApplicationExplanation">Κάντε χρήση μίας εξωτερικής εφαρμογής όπως είναι τα Dropbox, Google Drive ή ο αγαπημένος σας διαχειριστής αρχείων για να ανοίξετε ένα αρχείο.</string>
     <string name="importOptionApplicationButton">Χρήση εξωτερικής εφαρμογής</string>
-    <string name="importOptionFixedTitle">Εισαγωγή από τοποθεσία εξαγωγής</string>
-    <string name="importOptionFixedExplanation">Εισαγωγή από την ίδια τοποθεσία στο σύστημα αρχείων, στην οποία γίνεται αποθήκευση κατά την εξαγωγή.</string>
-    <string name="importOptionFixedButton">Χρήση τοποθεσίας εξαγωγής</string>
 
     <string name="about">Σχετικά</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -80,20 +67,6 @@
 
     <string name="thumbnailDescription">Μικρογραφία κάρτας</string>
 
-    <string name="startIntro">Έναρξη Επεξήγησης</string>
-    <string name="intro1Title">Καλώς ήλθατε στο Loyalty Card Keychain\n</string>
-    <string name="intro1Description">Διαχειριστείτε τις κάρτες σας που βασίζονται σε barcodes μέσα από το κινητό σας!\n\n</string>
-    <string name="intro2Title">Προσθήκη Καρτών\n</string>
-    <string name="intro2Description">Προσθέστε μία νέα κάρτα πατώντας το συν από την λίστα καρτών.\n\n</string>
-    <string name="intro3Title">Προσθήκη Καρτών\n</string>
-    <string name="intro3Description">Για να προσθέσετε το barcode, είτε φωτογραφίστε με την κάμερα είτε γράψτε το χειροκίνητα.\n\n</string>
-    <string name="intro4Title">Εμφάνιση Κάρτας\n</string>
-    <string name="intro4Description">Για να εμφανίσετε μία κάρτα, πατήστε πάνω στο όνομα του καταστήματος, στην κεντρική οθόνη της εφαρμογής\n\n</string>
-    <string name="intro5Title">Αντίγραφα Ασφαλείας\n</string>
-    <string name="intro5Description">Μπορείτε να δημιουργήσετε αντίγραφα ασφαλείας των καρτών. Για εξαγωγή ή εισαγωγή των δεδομένων των καρτών πατήστε Εισαγωγή/Εξαγωγή στο μενού στην κεντρική οθόνη της εφαρμογής.\n\n</string>
-    <string name="intro6Title">Σχόλια\n</string>
-    <string name="intro6Description">Αυτή η εφαρμογή είναι δωρεάν, χωρίς διαφημίσεις και open source. Δείτε λεπτομέρειες πατώντας το Σχετικά στο μενού στην κεντρική οθόνη της εφαρμογής.\n\nΠαρακαλώ αφήστε σχόλια στο app store! (:</string>
-
     <string name="change">Αλλαγή</string>
     <string name="storeTextColorTitle">Χρώμα Κειμένου Καταστήματος</string>
     <string name="storeTextBackgroundColorTitle">Χρώμα Κεφαλίδας</string>

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

@@ -1,14 +1,12 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Cartera para Tarjetas de Fidelización.</string>
     <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>
@@ -24,11 +22,8 @@
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copiar ID al portapapeles</string>
     <string name="sendLabel">Enviar&#8230;</string>
-    <string name="addedShortcut">Añadido a la Pantalla de Inicio</string>
-
     <string name="editCardTitle">Editar Tarjeta de Fidelización</string>
     <string name="addCardTitle">Añadir Tarjeta de Fidelización</string>
-    <string name="viewCardTitle">Ver Tarjeta de Fidelización</string>
     <string name="scanCardBarcode">Escanear el Código de Barras de la Tarjeta</string>
     <string name="cardShortcut">Atajo de Tarjeta</string>
     <string name="noCardsMessage">No hay ninguna tarjeta, añade una primero</string>
@@ -40,31 +35,23 @@
     <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>
     <string name="exportName">Exportar</string>
     <string name="importExportHelp">La copia de seguridad te permite transferir tus tarjetas a otro dispositivo.</string>
-    <string name="importedFrom">Importar desde: %1$s</string>
-    <string name="exportedTo">Exportar a: %1$s</string>
-    <string name="fileMissing">Archivo perdido: %1$s</string>
     <string name="importSuccessfulTitle">Datos importados correctamente</string>
     <string name="importFailedTitle">Ha ocurrido un error al importar los datos</string>
-    <string name="importFailed">Error al importar: %1$s</string>
+    <string name="importFailed">Error al importar</string>
     <string name="exportSuccessfulTitle">Datos exportados correctamente</string>
     <string name="exportFailedTitle">Ha ocurrido un error al exportar los datos</string>
-    <string name="exportFailed">Error al exportar: %1$s</string>
+    <string name="exportFailed">Error al exportar</string>
     <string name="importing">Importando&#8230;</string>
     <string name="exporting">Exportando&#8230;</string>
     <string name="noExternalStoragePermissionError">No se pueden importar o exportar tarjetas sin el permiso de almacenamiento</string>
-    <string name="exportOptionExplanation">Los datos son guardados en la carpeta base del almacenamiento externo.</string>
     <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
     <string name="importOptionFilesystemExplanation">Seleccionar un archivo del sistema de archivos</string>
     <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
     <string name="importOptionApplicationTitle">Usar una applicación externa</string>
     <string name="importOptionApplicationExplanation">Use una aplicación externa como Dropbox, Google Drive o tu gestor de archivos favoritos para abrir un archivo.</string>
     <string name="importOptionApplicationButton">Usar aplicación externa</string>
-    <string name="importOptionFixedTitle">Importar desde el lugar donde los datos son exportados</string>
-    <string name="importOptionFixedExplanation">Importar desde el mismo lugar en el sistema de archivos donde los datos son exportados.</string>
-    <string name="importOptionFixedButton">Utilizar el lugar donde los datos son exportados</string>
 
     <string name="about">Acerca de</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -80,20 +67,6 @@
 
     <string name="thumbnailDescription">Miniatura para la tarjeta</string>
 
-    <string name="startIntro">Empezar Introducción</string>
-    <string name="intro1Title">Bienvenido a la Cartera para Tarjetas de Fidelización\n</string>
-    <string name="intro1Description">Gestiona las tarjetas de fidelización o tarjetas cliente con codigo de barras desde tu teléfono!\n\n</string>
-    <string name="intro2Title">Añadir Tarjetas\n</string>
-    <string name="intro2Description">Añade una nueva tarjeta presionando el signo + en la lista de tarjetas.\n\n</string>
-    <string name="intro3Title">Añadir Tarjetas\n</string>
-    <string name="intro3Description">Para añadir el código de barras, escanea la tarjeta con tu cámara o introduce el código manualmente.\n\n</string>
-    <string name="intro4Title">Mostrar Tarjeta\n</string>
-    <string name="intro4Description">Para mostrar una tarjeta, presiona en el nombre de la tienda desde la pantalla principal\n\n</string>
-    <string name="intro5Title">Copias de Seguridad\n</string>
-    <string name="intro5Description">Puedes hacer una copia de seguridad de tus tarjetas. Para exportar o importar los datos presiona Importar/Exportar en el menú de la pagina principal.\n\n</string>
-    <string name="intro6Title">Tu Opinión\n</string>
-    <string name="intro6Description">Esta aplicación es gratuita, libre de publicidad y de código libre. Para más detalles presiona en Acerca De en el menu principal.\n\nPor favor deja tu opinión en la tienda de applicaciones! (:</string>
-
     <string name="change">Cambiar</string>
     <string name="storeTextColorTitle">Color del Texto de la Tienda</string>
     <string name="storeTextBackgroundColorTitle">Color Principal</string>

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

@@ -1,14 +1,12 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <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>
@@ -24,11 +22,8 @@
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copier le numéro dans le presse-papier</string>
     <string name="sendLabel">Envoyer&#8230;</string>
-    <string name="addedShortcut">Ajouter à l\'écran d\'accueil</string>
-
     <string name="editCardTitle">Modifier la carte de fidélité</string>
     <string name="addCardTitle">Ajouter une carte de fidélité</string>
-    <string name="viewCardTitle">Voir la carte de fidélité</string>
     <string name="scanCardBarcode">Flasher le code-barres de la carte</string>
     <string name="cardShortcut">Raccourci de carte</string>
     <string name="noCardsMessage">Il n\'y a aucune carte. Ajoutez en une d\'abord.</string>
@@ -40,31 +35,23 @@
     <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>
     <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="importedFrom">Importé depuis : %1$s</string>
-    <string name="exportedTo">Exporté vers : %1$s</string>
-    <string name="fileMissing">Fichier manquant : %1$s</string>
     <string name="importSuccessfulTitle">Importé avec succès</string>
     <string name="importFailedTitle">Échec de l\'import</string>
-    <string name="importFailed">Échec de l\'import : %1$s</string>
+    <string name="importFailed">Échec de l\'import </string>
     <string name="exportSuccessfulTitle">Exporté avec succès</string>
     <string name="exportFailedTitle">Échec de l\'export</string>
-    <string name="exportFailed">Échec de l\'export : %1$s</string>
+    <string name="exportFailed">Échec de l\'export </string>
     <string name="importing">Import &#8230;</string>
     <string name="exporting">Export &#8230;</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="exportOptionExplanation">Les données sont sauvegardées à la racine du stockage externe.</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">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="importOptionFixedTitle">Importer depuis le même emplacement que pour l\'export</string>
-    <string name="importOptionFixedExplanation">Importe les données depuis le même emplacement que celui défini pour l\'export.</string>
-    <string name="importOptionFixedButton">Utiliser l\'emplacement de l\'export</string>
 
     <string name="about">À propos</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -80,20 +67,6 @@
 
     <string name="thumbnailDescription">Miniature pour la carte</string>
 
-    <string name="startIntro">Présentation</string>
-    <string name="intro1Title">Bienvenue dans\nLoyalty Card Keychain\n</string>
-    <string name="intro1Description">Gérez vos cartes de fidélité\nsur votre téléphone !\n\n</string>
-    <string name="intro2Title">Ajouter une carte\n</string>
-    <string name="intro2Description">Ajoutez une nouvelle carte en appuyant sur le bouton \"+\" depuis la liste des cartes.\n\n</string>
-    <string name="intro3Title">Ajouter une carte\n</string>
-    <string name="intro3Description">Pour enregistrer le code-barres, utilisez l\'appareil-photo ou entrez-le manuellement.\n\n</string>
-    <string name="intro4Title">Afficher une carte\n</string>
-    <string name="intro4Description">Pour afficher une carte, appuyez sur le nom du magasin depuis l\'écran principal\n\n</string>
-    <string name="intro5Title">Sauvegarde\n</string>
-    <string name="intro5Description">Les cartes peuvent être sauvegardées. Appuyez sur \"Importer/Exporter\" depuis l\'écran principal pour restaurer ou sauvegarder les cartes.\n\n</string>
-    <string name="intro6Title">Commentaire\n</string>
-    <string name="intro6Description">Cette application est gratuite, sans pub, et son code est ouvert. Plus de détails en appuyant sur \"À propos\" depuis l\'écran principal.\n\nMerci de laisser un commentaire sur le Play Store (:</string>
-
     <string name="change">Modifier</string>
     <string name="storeTextColorTitle">Couleur du texte du magasin</string>
     <string name="storeTextBackgroundColorTitle">Couleur du titre</string>

app/src/main/res/values-he-rIL/strings.xml

@@ -4,7 +4,6 @@
     <string name="action_add">הוספה</string>
 
     <string name="cardId">מזהה כרטיס</string>
-    <string name="barcodeType">סוג ברקוד</string>
     <string name="cancel">ביטול</string>
     <string name="save">שמור</string>
     <string name="capture">צלם כרטיס</string>

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

@@ -1,7 +1,6 @@
 <resources
     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>
 
@@ -11,7 +10,6 @@
     <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>
@@ -30,11 +28,8 @@
     <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>
-
     <string name="editCardTitle">Modifica carta</string>
     <string name="addCardTitle">Aggiungi carta</string>
-    <string name="viewCardTitle">Mostra carta</string>
     <string name="scanCardBarcode">Scansiona codice carta</string>
     <string name="cardShortcut">Scorciatoia per la carta</string>
     <string name="noCardsMessage">Non ci sono carte. Aggiungine prima una</string>
@@ -45,34 +40,25 @@
     <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 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>
     <string name="importSuccessfulTitle">Importazione avvenuta con successo</string>
     <string name="importFailedTitle">Importazione fallita</string>
-    <string name="importFailed">Impossibile importare: %1$s</string>
+    <string name="importFailed">Impossibile importare</string>
     <string name="exportSuccessfulTitle">Esportazione avvenuta con successo</string>
     <string name="exportFailedTitle">Esportazione fallita</string>
-    <string name="exportFailed">Impossibile esportare: %1$s</string>
+    <string name="exportFailed">Impossibile esportare</string>
     <string name="importing">Importazione in corso&#8230;</string>
     <string name="exporting">Esportazione in corso&#8230;</string>
     <string name="noExternalStoragePermissionError">Impossibile importare o esportare i dati senza il permesso per l\'uso della memoria esterna.</string>
-    <string name="exportOptionExplanation">I dati sono stati scritti nella cartella principale della memoria esterna.</string>
     <string name="importOptionFilesystemTitle">Importa dal file system</string>
     <string name="importOptionFilesystemExplanation">Scegli un file dal file system.</string>
     <string name="importOptionFilesystemButton">Dal file system</string>
     <string name="importOptionApplicationTitle">Usa un\'applicazione esterna</string>
     <string name="importOptionApplicationExplanation">Usa un\'applicazione esterna come Dropbox, Google Drive o il tuo file manager preferito per aprire il file.</string>
     <string name="importOptionApplicationButton">Usa un\'applicazione esterna</string>
-    <string name="importOptionFixedTitle">Importa da un altro posto</string>
-    <string name="importOptionFixedExplanation">Importa dallo stesso posto del file system dove si è esportato.</string>
-    <string name="importOptionFixedButton">Usa luogo dell\'esportazione</string>
 
     <string name="about">Informazioni</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -90,20 +76,6 @@
 
     <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>
-    <string name="intro3Description">Per aggiungere il codice a barre, catturalo con la fotocamera o inseriscilo manualmente.\n\n</string>
-    <string name="intro4Title">Mostra carta\n</string>
-    <string name="intro4Description">Per mostrare una carta, premi sul nome del negozio dalla schermata principale\n\n</string>
-    <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="change">Cambia</string>
     <string name="storeTextColorTitle">Colore titolo</string>
     <string name="storeTextBackgroundColorTitle">Colore scheda</string>
@@ -123,6 +95,5 @@
     <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>

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

@@ -1,14 +1,12 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <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>
@@ -22,7 +20,6 @@
     <string name="copy_to_clipboard">Nukopijuoti ID į iškarpinę</string>
     <string name="editCardTitle">Redaguoti lojalumo kortelę</string>
     <string name="addCardTitle">Pridėti lojalumo kortelę</string>
-    <string name="viewCardTitle">Paeržiūrėti lojalumo kortelę</string>
     <string name="scanCardBarcode">Nuskanuokite kortelės brūkšninį kodą</string>
     <string name="barcodeImageDescription">Kortelės brūkšninio kodo paveikslėlis</string>
 
@@ -30,13 +27,9 @@
     <string name="noCardIdError">Neįvestas kortelės ID</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importuoti/Exportuoti</string>
-    <string name="importName">Importuoti</string>
     <string name="exportName">Exportuoti</string>
-    <string name="importedFrom">Importuota iš: %1$s</string>
-    <string name="exportedTo">Eksportuota į: %1$s</string>
-    <string name="fileMissing">Failas nerastas: %1$s</string>
-    <string name="importFailed">Nepavyko importuoti: %1$s</string>
-    <string name="exportFailed">Nepavyko eksportuoti: %1$s</string>
+    <string name="importFailed">Nepavyko importuoti</string>
+    <string name="exportFailed">Nepavyko eksportuoti</string>
     <string name="importing">Importuoja&#8230;</string>
     <string name="exporting">Eksportuoja&#8230;</string>
     <string name="noExternalStoragePermissionError">Negalima importuoti/eksportuoti kortelių be išorinės atminties leidimo</string>

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

@@ -1,6 +1,5 @@
 <?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>
@@ -25,7 +24,6 @@
     <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>
@@ -35,18 +33,14 @@
     <string name="noCardExistsError">Kunne ikke finne kundekort</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/eksport</string>
-    <string name="importName">Importer</string>
     <string name="exportName">Eksporter</string>
     <string name="importExportHelp">Sikkerhetskopiering av data lar deg flytte kortene til en annen enhet.</string>
-    <string name="importedFrom">Importert fra: %1$s</string>
-    <string name="exportedTo">Exportert til: %1$s</string>
-    <string name="fileMissing">Fil mangler: %1$s</string>
     <string name="importSuccessfulTitle">Importert</string>
     <string name="importFailedTitle">Kunne ikke importere</string>
-    <string name="importFailed">Klarte ikke å importere: %1$s</string>
+    <string name="importFailed">Klarte ikke å importere</string>
     <string name="exportSuccessfulTitle">Eksportert</string>
     <string name="exportFailedTitle">Kunne ikke eksportere</string>
-    <string name="exportFailed">Klarte ikke å eksportere: %1$s</string>
+    <string name="exportFailed">Klarte ikke å eksportere</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>
@@ -57,9 +51,6 @@
     <string name="importOptionApplicationTitle">Brukt eksternt program</string>
     <string name="importOptionApplicationExplanation">Bruk eksternt program som Nextcloud, eller din favorittfilbehandler til å åpne ei fil.</string>
     <string name="importOptionApplicationButton">Bruk eksternt program</string>
-    <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">Om</string>
     <string name="app_copyright_fmt">Kopirett 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Lisensiert GPLv3+.</string>
@@ -78,27 +69,6 @@
     <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å + i kortlisten.
-\n
-\n</string>
-    <string name="intro3Title">Tillegg av kort\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 hovedsidemenyen.
-\n
-\n</string>
-    <string name="intro6Title">Tilbakemeldinger\n</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">Skriftstørrelse for butikktekst</string>
     <string name="storeTextBackgroundColorTitle">Overskriftsfarge</string>

app/src/main/res/values-night/colors.xml

@@ -2,9 +2,9 @@
 <!-- Palette generated by Material IO https://material.io/color/#!/?view.left=0&view.right=0&primary.color=3F51B5&secondary.color=FFC107 -->
 <!-- Colors manually flipped to dark variants -->
 <resources>
-    <color name="colorPrimary">#3f51b5</color>
-    <color name="colorPrimaryLight">#757de8</color>
-    <color name="colorPrimaryDark">#002984</color>
+    <color name="colorPrimary">#B53F3F</color>
+    <color name="colorPrimaryLight">#E87575</color>
+    <color name="colorPrimaryDark">#840000</color>
     <color name="colorSecondary">#ffc107</color>
     <color name="colorSecondaryLight">#fff350</color>
     <color name="colorSecondaryDark">#c79100</color>

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

@@ -1,7 +1,6 @@
 <resources
     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>
 
@@ -30,11 +29,9 @@
     <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 startscherm</string>
-
+    <string name="addedShortcut">Snelkoppeling is toegevoegd</string>
     <string name="editCardTitle">Klantenkaart bewerken</string>
     <string name="addCardTitle">Klantenkaart toevoegen</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">Je hebt nog geen kaarten toegevoegd.</string>
@@ -45,34 +42,26 @@
     <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>
-    <string name="importName">Importeren</string>
     <string name="exportName">Exporteren</string>
     <string name="importExportHelp">Door de gegevens te back-uppen kun je je kaarten overzetten naar een ander apparaat.</string>
-    <string name="importedFrom">Geïmporteerd uit: %1$s</string>
-    <string name="exportedTo">Geëxporteerd naar: %1$s</string>
-    <string name="fileMissing">Bestand ontbreekt: %1$s</string>
     <string name="importSuccessfulTitle">Importeren voltooid</string>
     <string name="importFailedTitle">Importeren mislukt</string>
-    <string name="importFailed">Het importeren is mislukt: %1$s</string>
+    <string name="importFailed">Het importeren is mislukt</string>
     <string name="exportSuccessfulTitle">Exporteren voltooid</string>
     <string name="exportFailedTitle">Exporteren mislukt</string>
-    <string name="exportFailed">Het exporteren is mislukt: %1$s</string>
+    <string name="exportFailed">Het exporteren is mislukt</string>
     <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 worden weggeschreven naar de hoogste map op de externe opslag.</string>
+    <string name="exportOptionExplanation">De gegevens worden weggeschreven op een locatie naar keuze.</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>
     <string name="importOptionApplicationTitle">Externe app gebruiken</string>
     <string name="importOptionApplicationExplanation">Open een bestand middels een externe app, zoals Dropbox, Google Drive of je favoriete bestandsbeheerder.</string>
     <string name="importOptionApplicationButton">Externe app gebruiken</string>
-    <string name="importOptionFixedTitle">Importeren uit exportlocatie</string>
-    <string name="importOptionFixedExplanation">Importeer uit dezelfde locatie op het bestandssysteem waar tijdens het exporteren naar weggeschreven is.</string>
-    <string name="importOptionFixedButton">Exportlocatie gebruiken</string>
 
     <string name="about">Over</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -90,20 +79,6 @@
 
     <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 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">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">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, 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">Aanpassen</string>
     <string name="storeTextColorTitle">Tekstkleur van winkelnaam</string>
     <string name="storeTextBackgroundColorTitle">Kopkleur</string>
@@ -123,6 +98,5 @@
     <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>

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

@@ -1,7 +1,6 @@
 <resources
     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>
 
@@ -11,7 +10,6 @@
     <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>
@@ -30,11 +28,8 @@
     <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>
-
     <string name="editCardTitle">Edytuj kartę lojalnościową</string>
     <string name="addCardTitle">Dodaj kartę lojalnościową</string>
-    <string name="viewCardTitle">Pokaż kartę lojalnościową</string>
     <string name="scanCardBarcode">Zeskanuj kod kreskowy karty lojalnościowej</string>
     <string name="cardShortcut">Skrót karty</string>
     <string name="noCardsMessage">Nie ma kart, należy dodać pierwszą</string>
@@ -45,34 +40,25 @@
     <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>
-    <string name="importName">Importuj</string>
     <string name="exportName">Eksportuj</string>
     <string name="importExportHelp">Zarchiwizowane dane umożliwiają przeniesienie kart na inne urządzenie.</string>
-    <string name="importedFrom">Zaimportowano z: %1$s</string>
-    <string name="exportedTo">Wyeksportowano do: %1$s</string>
-    <string name="fileMissing">Brak pliku: %1$s</string>
     <string name="importSuccessfulTitle">Zaimportowano pomyślnie</string>
     <string name="importFailedTitle">Import nie powiódł się</string>
-    <string name="importFailed">Nie udało się zaimportować: %1$s</string>
+    <string name="importFailed">Nie udało się zaimportować</string>
     <string name="exportSuccessfulTitle">Wyeksportowano pomyślnie</string>
     <string name="exportFailedTitle">Eksport nie powiódł się</string>
-    <string name="exportFailed">Nie udało się wyeksportować: %1$s</string>
+    <string name="exportFailed">Nie udało się wyeksportować</string>
     <string name="importing">Importowanie&#8230;</string>
     <string name="exporting">Eksportowanie&#8230;</string>
     <string name="noExternalStoragePermissionError">Nie można importować ani eksportować kart bez uprawnień do pamięci zewnętrznej</string>
-    <string name="exportOptionExplanation">Dane zapisywane są w głównym katalogu pamięci zewnętrznej.</string>
     <string name="importOptionFilesystemTitle">Importuj z systemu plików</string>
     <string name="importOptionFilesystemExplanation">Wybierz określony plik z systemu plików.</string>
     <string name="importOptionFilesystemButton">Z systemu plików</string>
     <string name="importOptionApplicationTitle">Użyj zewnętrznej aplikacji</string>
     <string name="importOptionApplicationExplanation">Użyj zewnętrznej aplikacji jak Dropbox, Google Drive, bądź ulubiony menedżer plików, aby otworzyć plik.</string>
     <string name="importOptionApplicationButton">Użyj zewnętrznej aplikacji</string>
-    <string name="importOptionFixedTitle">Importuj z lokalizacji eksportowania</string>
-    <string name="importOptionFixedExplanation">Importuj z tej samej lokalizacji w systemie plików, do którego zapisano przy eksporcie.</string>
-    <string name="importOptionFixedButton">Użyj lokalizacji eksportu</string>
 
     <string name="about">O aplikacji</string>
     <string name="app_copyright_fmt">© 2016 — <xliff:g>%d</xliff:g> Branden Archer.</string>
@@ -90,20 +76,6 @@
 
     <string name="thumbnailDescription">Miniaturka karty</string>
 
-    <string name="startIntro">Pokaż ekran powitalny</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="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="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>
-    <string name="intro6Title">Informacje zwrotne\n</string>
-    <string name="intro6Description">Ta aplikacja jest darmowa, bez reklam i z otwartym kodem źródłowym. Zobacz szczegóły, klikając Informacje w menu na stronie głównej. \n\n Proszę zostawić opinię o programie w sklepie z aplikacjami! (:</string>
-
     <string name="change">Zmień</string>
     <string name="storeTextColorTitle">Kolor tekstu nazwy sklepu</string>
     <string name="storeTextBackgroundColorTitle">Kolor nagłówka</string>
@@ -123,6 +95,5 @@
     <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>

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

@@ -1,7 +1,6 @@
 <resources
     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>
 
@@ -11,7 +10,7 @@
     <string name="storeName">Магазин</string>
     <string name="note">Примечание</string>
     <string name="cardId">Номер карты</string>
-    <string name="barcodeType">Тип штрих-кода</string>
+    <string name="barcodeType">Тип штрихкода</string>
     <string name="barcodeNoBarcode">Эта карта без штрихкода</string>
 
     <string name="cancel">Отменить</string>
@@ -30,11 +29,9 @@
     <string name="copy_to_clipboard">Скопировать номер карты в буфер обмена</string>
     <string name="share">Переслать</string>
     <string name="sendLabel">Отправить&#8230;</string>
-    <string name="addedShortcut">Карта добавлена на главный экран.</string>
-
+    <string name="addedShortcut">Добавленный ярлык</string>
     <string name="editCardTitle">Редактировать карту</string>
     <string name="addCardTitle">Добавить карту</string>
-    <string name="viewCardTitle">Посмотреть карту</string>
     <string name="scanCardBarcode">Отсканируйте штрих-код</string>
     <string name="cardShortcut">Ярлык карты</string>
     <string name="noCardsMessage">Карт нет, добавьте одну для начала</string>
@@ -45,34 +42,26 @@
     <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>
-    <string name="importName">Импорт</string>
     <string name="exportName">Экспорт</string>
     <string name="importExportHelp">Сохранение карт позволяет перенести их на другое устройство.</string>
-    <string name="importedFrom">Импортировано из: %1$s</string>
-    <string name="exportedTo">Экспортировано в: %1$s</string>
-    <string name="fileMissing">Файл не найден: %1$s</string>
     <string name="importSuccessfulTitle">Успешный импорт</string>
     <string name="importFailedTitle">Импорт не удался</string>
-    <string name="importFailed">Не удалось импортировать: %1$s</string>
+    <string name="importFailed">Не удалось импортировать</string>
     <string name="exportSuccessfulTitle">Успешный экспорт</string>
     <string name="exportFailedTitle">Экспорт не удался</string>
-    <string name="exportFailed">Не удалось экспортировать: %1$s</string>
+    <string name="exportFailed">Не удалось экспортировать</string>
     <string name="importing">Импорт&#8230;</string>
     <string name="exporting">Экспорт&#8230;</string>
     <string name="noExternalStoragePermissionError">Импорт или экспорт невозможен без разрешения на доступ к хранилищу</string>
-    <string name="exportOptionExplanation">Данные сохраняются в корневой каталог хранилища.</string>
+    <string name="exportOptionExplanation">Данные будут записаны в выбранное место.</string>
     <string name="importOptionFilesystemTitle">Импорт из файловой системы</string>
     <string name="importOptionFilesystemExplanation">Выберете файл на файловой системе.</string>
     <string name="importOptionFilesystemButton">Выбрать файл</string>
     <string name="importOptionApplicationTitle">Использование другого приложения</string>
     <string name="importOptionApplicationExplanation">Использовать другое приложение такое как Dropbox, Google Drive, или ваш любимый файловый менеджер чтобы открыть файл.</string>
     <string name="importOptionApplicationButton">Использовать другое приложение</string>
-    <string name="importOptionFixedTitle">Импорт из файла экспорта</string>
-    <string name="importOptionFixedExplanation">Импорт из того же файла, куда сохраняется экспорт.</string>
-    <string name="importOptionFixedButton">Использовать файл экспорта</string>
 
     <string name="about">О программе</string>
     <string name="app_copyright_fmt">Все права защищены 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -90,20 +79,6 @@
 
     <string name="thumbnailDescription">Логотип карты</string>
 
-    <string name="startIntro">Введение</string>
-    <string name="intro1Title">Добро пожаловать в Карты лояльности\n</string>
-    <string name="intro1Description">Храните все карты лояльности/магазинов со штрих-кодом в телефоне!\n\n</string>
-    <string name="intro2Title">Добавление карт\n</string>
-    <string name="intro2Description">Добавьте новую карту, нажав на плюс на экране со списком карт.\n\n</string>
-    <string name="intro3Title">Добавление карт\n</string>
-    <string name="intro3Description">Для добавления штрих-кода отсканируйте карту камерой или введите номер вручную.\n\n</string>
-    <string name="intro4Title">Показ карты\n</string>
-    <string name="intro4Description">Для показа карты, нажмите на название магазина на главном экране.\n\n</string>
-    <string name="intro5Title">Резервное копирование\n</string>
-    <string name="intro5Description">Можно сделать резервную копию карт. Для этого нажмите Импорт/Экспорт в меню на главном экране.\n\n</string>
-    <string name="intro6Title">Отзыв\n</string>
-    <string name="intro6Description">Это бесплатное приложение, без рекламы и с открытым исходным кодом. Подробнее в разделе «О программе» в меню на главном экране.\n\nПожалуйста, оставьте отзыв в маркете приложений! (:</string>
-
     <string name="change">Изменить</string>
     <string name="storeTextColorTitle">Цвет текста</string>
     <string name="storeTextBackgroundColorTitle">Цвет фона</string>
@@ -123,6 +98,5 @@
     <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>

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

@@ -1,14 +1,12 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Vernostné karty</string>
     <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>
@@ -24,11 +22,8 @@
     <string name="ok">Áno</string>
     <string name="copy_to_clipboard">Kopírovať ID do schránky</string>
     <string name="sendLabel">Odoslať&#8230;</string>
-    <string name="addedShortcut">Pridané na domovskú obrazovku</string>
-
     <string name="editCardTitle">Upraviť kartu</string>
     <string name="addCardTitle">Pridať kartu</string>
-    <string name="viewCardTitle">Zobraziť kartu</string>
     <string name="scanCardBarcode">Zosnímajte čiarový kód na karte</string>
     <string name="cardShortcut">Skratka</string>
     <string name="noCardsMessage">Nie sú uložené žiadne karty, vložte prvú</string>
@@ -40,31 +35,23 @@
     <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>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Zálohovanie dát Vám umožní presunúť Vaše uložené karty na iné zariadenie.</string>
-    <string name="importedFrom">Importované z: %1$s</string>
-    <string name="exportedTo">Exportované do: %1$s</string>
-    <string name="fileMissing">Chýbajúci súbor: %1$s</string>
     <string name="importSuccessfulTitle">Import bol úspešný</string>
     <string name="importFailedTitle">Import zlyhal</string>
-    <string name="importFailed">Zlyhal import: %1$s</string>
+    <string name="importFailed">Zlyhal import</string>
     <string name="exportSuccessfulTitle">Export bol úspešný</string>
     <string name="exportFailedTitle">Export zlyhal</string>
-    <string name="exportFailed">Zlyhal export: %1$s</string>
+    <string name="exportFailed">Zlyhal export</string>
     <string name="importing">Importujem&#8230;</string>
     <string name="exporting">Exportujem&#8230;</string>
     <string name="noExternalStoragePermissionError">Nie je možné importovať a exportovať karty bez prístupu k externému úložisku</string>
-    <string name="exportOptionExplanation">Dáta sú zapísané do koreňového adresára na externom úložisku.</string>
     <string name="importOptionFilesystemTitle">Import zo súborového systému.</string>
     <string name="importOptionFilesystemExplanation">Vyberte súbor zo súborového systému.</string>
     <string name="importOptionFilesystemButton">Zo súborového systému</string>
     <string name="importOptionApplicationTitle">Použite externú aplikáciu</string>
     <string name="importOptionApplicationExplanation">Na otvorenie súboru použite externú aplikáciu, ako Dropbox, Disk Google, alebo Vášho obľúbeného správcu súborov.</string>
     <string name="importOptionApplicationButton">Použiť externú aplikáciu</string>
-    <string name="importOptionFixedTitle">Importujte z exportovacieho umiestnenia.</string>
-    <string name="importOptionFixedExplanation">Importujte z rovnakého umiestnenia v súborovom systéme, na ktorý je zapisovaný export.</string>
-    <string name="importOptionFixedButton">Použite exportovacie umiestnenie</string>
 
     <string name="about">O aplikácii</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -80,20 +67,6 @@
 
     <string name="thumbnailDescription">Náhľad karty</string>
 
-    <string name="startIntro">Zobraz úvod</string>
-    <string name="intro1Title">Vitajte v aplikácii Vernostné karty\n</string>
-    <string name="intro1Description">Používajte Vaše vernostné karty s čiarovými kódmi na Vašom mobilnom zariadení!\n\n</string>
-    <string name="intro2Title">Pridávanie kariet\n</string>
-    <string name="intro2Description">Pridajte novú kartu stlačením \"+\" v zozname kariet.\n\n</string>
-    <string name="intro3Title">Pridávanie kariet\n</string>
-    <string name="intro3Description">Čiarový kód nasnímajte kamerou, alebo ho vypíšte ručne.\n\n</string>
-    <string name="intro4Title">Zobrazenie karty\n</string>
-    <string name="intro4Description">Pre zobrazenie vernostnej karty stlačte názov obchodu v zozname kariet.\n\n</string>
-    <string name="intro5Title">Záloha\n</string>
-    <string name="intro5Description">Vaše uložené karty môžu byť zálohované. Pre export a import kariet stlačte \"Import/Export\" v menu aplikácie.\n\n</string>
-    <string name="intro6Title">Spätná väzba\n</string>
-    <string name="intro6Description">Táto aplikácia je slobodná, neobsahuje reklamu a má otvorený zdrojový kód. Ďalšie informácie nájdete v položke menu O aplikácii na hlavnej stránke.\n\n Prosíme, zanechajte spätnú väzbu v obchode s aplikáciami. (:</string>
-
     <string name="change">Upraviť</string>
     <string name="storeTextColorTitle">Farba textu</string>
     <string name="storeTextBackgroundColorTitle">Farba hlavičky</string>

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

@@ -1,14 +1,12 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Kartice zvestobe</string>
     <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>
@@ -24,11 +22,8 @@
     <string name="ok">Vredu</string>
     <string name="copy_to_clipboard">Kopirajte številko kartice</string>
     <string name="sendLabel">Pošlji#8230;</string>
-    <string name="addedShortcut">Dodajte na domači zaslon</string>
-
     <string name="editCardTitle">Uredi kartico zvestobe</string>
     <string name="addCardTitle">Dodaj kartico zvestobe</string>
-    <string name="viewCardTitle">Prikaži kartico zvestobe</string>
     <string name="scanCardBarcode">Skeniraj črtno kodo</string>
     <string name="cardShortcut">Bližnjica do kartice</string>
     <string name="noCardsMessage">Trenutno ni na voljo nobene kartice. Najprej jih je potrebno dodati.</string>
@@ -40,31 +35,23 @@
     <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>
     <string name="exportName">Izvozi</string>
     <string name="importExportHelp">Varnostna kopija omogoča varen prenos kartic na druge telefonske naprave.</string>
-    <string name="importedFrom">Uvoženo iz: %1$s</string>
-    <string name="exportedTo">Izvoženo v:%1$s</string>
-    <string name="fileMissing">Manjkajoča datoteka: %1$s</string>
     <string name="importSuccessfulTitle">Uvoz je bil uspešen</string>
     <string name="importFailedTitle">Uvoz ni uspel</string>
-    <string name="importFailed">Napaka pri uvozu: %1$s</string>
+    <string name="importFailed">Napaka pri uvozu</string>
     <string name="exportSuccessfulTitle">Izvoz je uspel</string>
     <string name="exportFailedTitle">Izvoz ni uspel</string>
-    <string name="exportFailed">Napaka pri izvozu: %1$s</string>
+    <string name="exportFailed">Napaka pri izvozu</string>
     <string name="importing">Uvažanje&#8230;</string>
     <string name="exporting">Izvažanje&#8230;</string>
     <string name="noExternalStoragePermissionError">Izvažanje in uvažanje je nemogoče brez omogočenega dostopa do zunanje shrambe</string>
-    <string name="exportOptionExplanation">Podati so bili zapisani v prvo mapo v zunanji shrambi</string>
     <string name="importOptionFilesystemTitle">Uvozi iz datotečnega sistema</string>
     <string name="importOptionFilesystemExplanation">Izberite specifično datoteko iz datotečnega sistema</string>
     <string name="importOptionFilesystemButton">Iz datotečnega sistema</string>
     <string name="importOptionApplicationTitle">Uporabi zunanjo aplikacijo</string>
     <string name="importOptionApplicationExplanation">Uporabi zunanjo aplikacijo, kot npr. Dropbox, Google Drive ali ostale upravljalnike datotek, za odpiranje datoteko.</string>
     <string name="importOptionApplicationButton">Uporabi zunanjo aplikacijo</string>
-    <string name="importOptionFixedTitle">Uvozi iz zunanje aplikacije</string>
-    <string name="importOptionFixedExplanation">Uvozi iz iste lokacije, ki je namenjena izvozu</string>
-    <string name="importOptionFixedButton">Uporabi lokacijo izvoza</string>
 
     <string name="about">Več o aplikaciji</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -80,20 +67,6 @@
 
     <string name="thumbnailDescription">Ikona kartice</string>
 
-    <string name="startIntro">Uvodnik</string>
-    <string name="intro1Title">Dobrodošli v aplikacijo Kartice zvestobe\n</string>
-    <string name="intro1Description">Urejajte vaše črtne kode oziroma kartice na Vašem telefonu!\n\n</string>
-    <string name="intro2Title">Dodajanje kartic\n</string>
-    <string name="intro2Description">Dodajte kartico s klikom na plus na seznamu kartic.\n\n</string>
-    <string name="intro3Title">Dodajanje kartic\n</string>
-    <string name="intro3Description">Če želite dodati črtno kodo jo ali slikajte s fotoaparatom ali jo vnesite ročno.\n\n</string>
-    <string name="intro4Title">Prikaži kartico\n</string>
-    <string name="intro4Description">Za prikaz kartice je potreben klik na ime trgovine na glavnem zaslonu\n\n</string>
-    <string name="intro5Title">Varnostna kopija\n</string>
-    <string name="intro5Description">Kartice lahko shranite s pomočjo varnostne kopije. Za uvoz ali izvoz kartic je potrebno klikniti Uvozi/Izvozi v meniju na glavni strani.\n\n</string>
-    <string name="intro6Title">Povratne informacije razvijalcem\n</string>
-    <string name="intro6Description">Aplikacija je brezplačna, brez oglasov in odprtokodna.  Če želite izvedeti več podrobnosti, kliknite na Več o aplikaciji v meniju na glavni strani.\n\nProsim, napišite Vaše mnenje o aplikaciji v spletni trgovini (:</string>
-
     <string name="change">Spremeni</string>
     <string name="storeTextColorTitle">Barva besedila trgovine</string>
     <string name="storeTextBackgroundColorTitle">Barva naslova</string>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Palette generated by Material IO https://material.io/color/#!/?view.left=0&view.right=0&primary.color=3F51B5&secondary.color=FFC107 -->
 <resources>
-    <color name="colorPrimary">#3f51b5</color>
-    <color name="colorPrimaryLight">#757de8</color>
-    <color name="colorPrimaryDark">#002984</color>
+    <color name="colorPrimary">#B53F3F</color>
+    <color name="colorPrimaryLight">#E87575</color>
+    <color name="colorPrimaryDark">#840000</color>
     <color name="colorSecondary">#ffc107</color>
     <color name="colorSecondaryLight">#fff350</color>
     <color name="colorSecondaryDark">#c79100</color>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_revision_url" translatable="false">https://github.com/brarcher/loyalty-card-locker/releases</string>
-    <string name="app_webpage_url" translatable="false">https://github.com/brarcher/loyalty-card-locker</string>
+    <string name="app_revision_url" translatable="false">https://github.com/TheLastProject/Catima/releases</string>
+    <string name="app_webpage_url" translatable="false">https://github.com/TheLastProject/Catima</string>
 </resources>

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

@@ -1,17 +1,17 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
+    <string name="app_name" translatable="false">Catima</string>
     <string name="action_search">Search</string>
     <string name="action_add">Add</string>
 
-    <string name="noGiftCards">You don\'t have any loyalty cards at the moment. Click the "+" (plus) button up top to get started.\n\nLoyalty Card Locker lets you carry your loyalty cards on your phone, so they are always within reach.</string>
-    <string name="noMatchingGiftCards">No loyalty cards match the search filter. Please try some different terms.</string>
+    <string name="noGiftCards">You don\'t have any cards at the moment. Click the "+" (plus) button to get started.\n\nCatima lets you carry your cards on your phone, so they are always within reach.</string>
+    <string name="noMatchingGiftCards">No cards match the search filter. Please try some different terms.</string>
 
     <string name="storeName">Store</string>
     <string name="note">Note</string>
     <string name="cardId">Card ID</string>
-    <string name="barcodeType">Barcode Type</string>
+    <string name="barcodeType">Barcode type</string>
     <string name="barcodeNoBarcode">This card has no barcode</string>
 
     <string name="cancel">Cancel</string>
@@ -25,17 +25,15 @@
     <string name="confirm">Confirm</string>
     <string name="lockScreen">Block Rotation</string>
     <string name="unlockScreen">Unblock Rotation</string>
-    <string name="deleteTitle">Remove Loyalty Card</string>
+    <string name="deleteTitle">Remove Card</string>
     <string name="deleteConfirmation">Please confirm that you want to delete this card.</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
     <string name="share">Share</string>
     <string name="sendLabel">Send&#8230;</string>
-    <string name="addedShortcut">Added to Home Screen</string>
-
-    <string name="editCardTitle">Edit Loyalty Card</string>
-    <string name="addCardTitle">Add Loyalty Card</string>
-    <string name="viewCardTitle">View Loyalty Card</string>
+    <string name="addedShortcut">Added shortcut</string>
+    <string name="editCardTitle">Edit Card</string>
+    <string name="addCardTitle">Add Card</string>
     <string name="scanCardBarcode">Scan Card\'s Barcode</string>
     <string name="cardShortcut">Card Shortcut</string>
     <string name="noCardsMessage">There are no cards, add one first</string>
@@ -49,39 +47,30 @@
     <string name="failedShowingExtras">Could not show extra information: data not correctly formatted</string>
     <string name="failedSavingCard">Could not save card</string>
     <string name="failedParsingImportUriError">Could not parse the import URI</string>
-
     <string name="cardIdFormat">%1$s: %2$s</string>
-    <string name="storeNameAndNoteFormat" translatable="false">%1$s - %2$s</string>
-
     <string name="importExport">Import/Export</string>
-    <string name="importName">Import</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Backed up data can allow you to move your cards to another device.</string>
-    <string name="importedFrom">Imported from: %1$s</string>
-    <string name="exportedTo">Exported to: %1$s</string>
-    <string name="fileMissing">File missing: %1$s</string>
     <string name="importSuccessfulTitle">Import successful</string>
     <string name="importFailedTitle">Import failed</string>
-    <string name="importFailed">Failed to import: %1$s</string>
+    <string name="importFailed">Failed to import</string>
     <string name="exportSuccessfulTitle">Export successful</string>
     <string name="exportFailedTitle">Export failed</string>
-    <string name="exportFailed">Failed to export: %1$s</string>
+    <string name="exportFailed">Failed to export</string>
     <string name="importing">Importing&#8230;</string>
     <string name="exporting">Exporting&#8230;</string>
     <string name="noExternalStoragePermissionError">Unable to import or export cards without the external storage permission</string>
-    <string name="exportOptionExplanation">Data is written to the top directory in external storage.</string>
+    <string name="exportOptionExplanation">Data will be written to a location of your choice.</string>
     <string name="importOptionFilesystemTitle">Import from filesystem</string>
     <string name="importOptionFilesystemExplanation">Choose a specific file from the filesystem.</string>
     <string name="importOptionFilesystemButton">From filesystem</string>
-    <string name="importOptionApplicationTitle">Use external application</string>
+    <string name="importOptionApplicationTitle">Use external ap1plication</string>
     <string name="importOptionApplicationExplanation">Use an external application like Dropbox, Google Drive, or your favorite file manager to open a file.</string>
     <string name="importOptionApplicationButton">Use external application</string>
-    <string name="importOptionFixedTitle">Import from export location</string>
-    <string name="importOptionFixedExplanation">Import from the same location on the filesystem that is written to on export.</string>
-    <string name="importOptionFixedButton">Use export location</string>
 
     <string name="about">About</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Copyright 2019-<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_old">Based on Loyalty Card Keychain, copyright 2016-2020 Branden Archer.</string>
     <string name="app_license">Licensed under the GPLv3.</string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
@@ -96,20 +85,6 @@
 
     <string name="thumbnailDescription">Thumbnail for card</string>
 
-    <string name="startIntro">Start Intro</string>
-    <string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>
-    <string name="intro1Description">Manage your barcode-based store/loyalty cards on your phone!\n\n</string>
-    <string name="intro2Title">Adding Cards\n</string>
-    <string name="intro2Description">Add a new card by touching the plus from the card list.\n\n</string>
-    <string name="intro3Title">Adding Cards\n</string>
-    <string name="intro3Description">To add the barcode, either capture with the camera or type in manually.\n\n</string>
-    <string name="intro4Title">Show Card\n</string>
-    <string name="intro4Description">To display a card, click on the store name from the main screen\n\n</string>
-    <string name="intro5Title">Backup\n</string>
-    <string name="intro5Description">The cards can be backed-up. To export or import card data touch Import/Export in the menu on the main page.\n\n</string>
-    <string name="intro6Title">Feedback\n</string>
-    <string name="intro6Description">This app is free, ad-free, and open source. See details by touching About in the menu on the main page.\n\nPlease leave feedback in the app store! (:</string>
-
     <string name="change">Change</string>
     <string name="storeTextColorTitle">Store Text Color</string>
     <string name="storeTextBackgroundColorTitle">Heading Color</string>
@@ -141,8 +116,11 @@
     <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="intent_import_card_from_url">Import loyalty card</string>
-    <string name="intent_import_card_from_url_share_text">I want to share a loyalty card with you</string>
-    <string name="intent_import_card_from_url_host" translatable="false">brarcher.github.io</string>
-    <string name="intent_import_card_from_url_path_prefix" translatable="false">/loyalty-card-locker/share</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>
+    <string name="intent_import_card_from_url_host_old" translatable="false">brarcher.github.io</string>
+    <string name="intent_import_card_from_url_path_prefix_old" translatable="false">/loyalty-card-locker/share</string>
+    <string name="importSuccessful">Successfully imported loyalty card data</string>
+    <string name="exportSuccessful">Successfully exported loyalty card data</string>
 </resources>

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

@@ -33,7 +33,7 @@ public class DatabaseTest
 
     private static final Integer DEFAULT_HEADER_COLOR = Color.BLACK;
     private static final Integer DEFAULT_HEADER_TEXT_COLOR = Color.WHITE;
-    private static Bitmap DEFAULT_ICON = BitmapFactory.decodeResource(Resources.getSystem(), R.drawable.app_icon_intro);
+    private static Bitmap DEFAULT_ICON = BitmapFactory.decodeResource(Resources.getSystem(), R.mipmap.ic_launcher);
     private static ExtrasHelper DEFAULT_EXTRAS;
 
     @Before

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

@@ -84,12 +84,6 @@ public class ImportExportActivityTest
             checkVisibility(activity, View.GONE, R.id.dividerImportApplication,
                     R.id.importOptionApplicationTitle, R.id.importOptionApplicationExplanation,
                     R.id.importOptionApplicationButton);
-
-            // Import from file system should always be present
-
-            checkVisibility(activity, View.VISIBLE, R.id.dividerImportFixed,
-                    R.id.importOptionFixedTitle, R.id.importOptionFixedExplanation,
-                    R.id.importOptionFixedButton);
         }
     }
 
@@ -115,12 +109,6 @@ public class ImportExportActivityTest
             checkVisibility(activity, View.GONE, R.id.dividerImportFilesystem,
                     R.id.importOptionFilesystemTitle, R.id.importOptionFilesystemExplanation,
                     R.id.importOptionFilesystemButton);
-
-            // Import from file system should always be present
-
-            checkVisibility(activity, View.VISIBLE, R.id.dividerImportFixed,
-                    R.id.importOptionFixedTitle, R.id.importOptionFixedExplanation,
-                    R.id.importOptionFixedButton);
         }
     }
 
@@ -139,9 +127,5 @@ public class ImportExportActivityTest
         checkVisibility(activity, View.VISIBLE, R.id.dividerImportFilesystem,
                 R.id.importOptionFilesystemTitle, R.id.importOptionFilesystemExplanation,
                 R.id.importOptionFilesystemButton);
-
-        checkVisibility(activity, View.VISIBLE, R.id.dividerImportFixed,
-                R.id.importOptionFixedTitle, R.id.importOptionFixedExplanation,
-                R.id.importOptionFixedButton);
     }
 }

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

@@ -3,6 +3,7 @@ package protect.card_locker;
 import android.app.Activity;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
 import android.os.Environment;
 
 import com.google.zxing.BarcodeFormat;
@@ -22,9 +23,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 
@@ -252,7 +255,8 @@ public class ImportExportTest
             TestTaskCompleteListener listener = new TestTaskCompleteListener();
 
             // Export to the file
-            ImportExportTask task = new ImportExportTask(activity, format, exportFile, listener);
+            FileOutputStream fileOutputStream = new FileOutputStream(exportFile);
+            ImportExportTask task = new ImportExportTask(activity, format, fileOutputStream, listener);
             task.execute();
 
             // Actually run the task to completion

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

@@ -42,7 +42,7 @@ public class ImportURITest {
     public void ensureNoDataLoss() throws InvalidObjectException, JSONException
     {
         // Generate card
-        Bitmap icon = BitmapFactory.decodeResource(Resources.getSystem(), R.drawable.app_icon_intro);
+        Bitmap icon = BitmapFactory.decodeResource(Resources.getSystem(), R.mipmap.ic_launcher);
         assertNotNull(icon);
         ExtrasHelper extrasHelper = new ExtrasHelper();
         extrasHelper.addLanguageValue("en", "key", "value");

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

@@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
+import static protect.card_locker.LoyaltyCardEditActivity.NO_BARCODE;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -111,7 +112,7 @@ public class LoyaltyCardViewActivityTest
         final EditText storeField = activity.findViewById(R.id.storeNameEdit);
         final EditText noteField = activity.findViewById(R.id.noteEdit);
         final TextView cardIdField = activity.findViewById(R.id.cardIdView);
-        final TextView barcodeTypeField = activity.findViewById(R.id.barcodeType);
+        final TextView barcodeTypeField = activity.findViewById(R.id.barcodeTypeView);
 
         storeField.setText(store);
         noteField.setText(note);
@@ -119,7 +120,7 @@ public class LoyaltyCardViewActivityTest
         barcodeTypeField.setText(barcodeType);
 
         assertEquals(false, activity.isFinishing());
-        shadowOf(activity).clickMenuItem(R.id.action_save);
+        activity.findViewById(R.id.fabSave).performClick();
         assertEquals(true, activity.isFinishing());
 
         assertEquals(1, db.getLoyaltyCardCount());
@@ -130,7 +131,7 @@ public class LoyaltyCardViewActivityTest
         assertEquals(cardId, card.cardId);
 
         // The special "No barcode" string shouldn't actually be written to the loyalty card
-        if(barcodeType.equals(LoyaltyCardEditActivity.NO_BARCODE))
+        if(barcodeType.equals(NO_BARCODE))
         {
             assertEquals("", card.barcodeType);
         }
@@ -241,7 +242,7 @@ public class LoyaltyCardViewActivityTest
             checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId);
             checkFieldProperties(activity, R.id.cardIdDivider, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
             checkFieldProperties(activity, R.id.cardIdTableRow, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
-            checkFieldProperties(activity, R.id.barcodeType, View.GONE, barcodeType);
+            checkFieldProperties(activity, R.id.barcodeTypeView, View.VISIBLE, barcodeType);
             checkFieldProperties(activity, R.id.captureButton, captureVisibility, null);
             checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
         }
@@ -258,6 +259,7 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
 
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
+        assertEquals(View.GONE, activity.findViewById(R.id.barcodeTypeTableRow).getVisibility());
     }
 
     @Test
@@ -277,15 +279,15 @@ public class LoyaltyCardViewActivityTest
         final EditText noteField = activity.findViewById(R.id.noteEdit);
         final TextView cardIdField = activity.findViewById(R.id.cardIdView);
 
-        shadowOf(activity).clickMenuItem(R.id.action_save);
+        activity.findViewById(R.id.fabSave).performClick();
         assertEquals(0, db.getLoyaltyCardCount());
 
         storeField.setText("store");
-        shadowOf(activity).clickMenuItem(R.id.action_save);
+        activity.findViewById(R.id.fabSave).performClick();
         assertEquals(0, db.getLoyaltyCardCount());
 
         noteField.setText("note");
-        shadowOf(activity).clickMenuItem(R.id.action_save);
+        activity.findViewById(R.id.fabSave).performClick();
         assertEquals(0, db.getLoyaltyCardCount());
     }
 
@@ -487,12 +489,11 @@ public class LoyaltyCardViewActivityTest
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The rotation, share, edit and info button should be present
-        assertEquals(menu.size(), 4);
+        // The rotation,share and info button should be present
+        assertEquals(menu.size(), 3);
 
         assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
         assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
-        assertEquals("Edit", menu.findItem(R.id.action_edit).getTitle().toString());
         assertEquals("More Info", menu.findItem(R.id.action_view_extras).getTitle().toString());
     }
 
@@ -583,7 +584,7 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, LoyaltyCardEditActivity.NO_BARCODE, false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, NO_BARCODE, false);
     }
 
     @Test
@@ -606,10 +607,11 @@ public class LoyaltyCardViewActivityTest
         selectBarcodeWithResult(activity, R.id.enterButton, BARCODE_DATA, "", true);
 
         // Check if the barcode type is NO_BARCODE as expected
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, LoyaltyCardEditActivity.NO_BARCODE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, NO_BARCODE);
+        assertEquals(View.GONE, activity.findViewById(R.id.barcodeTypeTableRow).getVisibility());
 
         // Check if the special NO_BARCODE string doesn't get saved
-        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, LoyaltyCardEditActivity.NO_BARCODE, false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, NO_BARCODE, false);
     }
 
     @Test
@@ -796,7 +798,28 @@ public class LoyaltyCardViewActivityTest
     @Test
     public void importCard()
     {
-        Uri importUri = Uri.parse("https://brarcher.github.io/loyalty-card-locker/share?store=Example%20Store&note=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1&icon=&extras={}");
+        Uri importUri = Uri.parse("https://thelastproject.github.io/Catima/share?store=Example%20Store&note=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1&icon=&extras={}");
+
+        Intent intent = new Intent();
+        intent.setData(importUri);
+
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class, intent).create();
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        Activity activity = (Activity)activityController.get();
+
+        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", "123456", "AZTEC");
+        assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.headingColorSample).getBackground()).getColor());
+        assertEquals(-1, ((ColorDrawable) activity.findViewById(R.id.headingStoreTextColorSample).getBackground()).getColor());
+    }
+
+    @Test
+    public void importCardOldURL()
+    {
+        Uri importUri = Uri.parse("https://thelastproject.github.io/Catima/share?store=Example%20Store&note=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1");
 
         Intent intent = new Intent();
         intent.setData(importUri);

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

@@ -37,14 +37,6 @@ public class MainActivityTest
 {
     private SharedPreferences prefs;
 
-    @Before
-    public void setUp()
-    {
-        // Assume that this is not the first launch
-        prefs = RuntimeEnvironment.application.getSharedPreferences("protect.card_locker", Context.MODE_PRIVATE);
-        prefs.edit().putBoolean("firstrun", false).commit();
-    }
-
     @Test
     public void initiallyNoLoyaltyCards() throws Exception
     {
@@ -70,12 +62,9 @@ public class MainActivityTest
         assertTrue(menu != null);
 
         // The settings, search and add button should be present
-        assertEquals(menu.size(), 6);
-
+        assertEquals(menu.size(), 4);
         assertEquals("Search", menu.findItem(R.id.action_search).getTitle().toString());
-        assertEquals("Add", menu.findItem(R.id.action_add).getTitle().toString());
         assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString());
-        assertEquals("Start Intro", menu.findItem(R.id.action_intro).getTitle().toString());
         assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString());
         assertEquals("Settings", menu.findItem(R.id.action_settings).getTitle().toString());
     }
@@ -85,7 +74,7 @@ public class MainActivityTest
     {
         final MainActivity activity = Robolectric.setupActivity(MainActivity.class);
 
-        shadowOf(activity).clickMenuItem(R.id.action_add);
+        activity.findViewById(R.id.fabAdd).performClick();
 
         Intent intent = shadowOf(activity).peekNextStartedActivityForResult().intent;
 
@@ -219,26 +208,4 @@ public class MainActivityTest
 
         assertEquals(2, list.getCount());
     }
-
-    @Test
-    public void testFirstRunStartsIntro()
-    {
-        prefs.edit().remove("firstrun").commit();
-
-        ActivityController controller = Robolectric.buildActivity(MainActivity.class).create();
-        Activity activity = (Activity)controller.get();
-
-        assertTrue(activity.isFinishing() == false);
-
-        Intent next = shadowOf(activity).getNextStartedActivity();
-
-        ComponentName componentName = next.getComponent();
-        String name = componentName.flattenToShortString();
-        assertEquals("protect.card_locker/.intro.IntroActivity", name);
-
-        Bundle extras = next.getExtras();
-        assertNull(extras);
-
-        assertEquals(false, prefs.getBoolean("firstrun", true));
-    }
 }

docs/README.md

@@ -1,9 +1,9 @@
-# Loyalty Card Keychain
-[![Build Status](https://travis-ci.org/brarcher/loyalty-card-locker.svg?branch=master)](https://travis-ci.org/brarcher/loyalty-card-locker)
+# Catima
+![Android CI](https://github.com/TheLastProject/Catima/workflows/Android%20CI/badge.svg)
 
-<a href="https://f-droid.org/repository/browse/?fdid=protect.card_locker" target="_blank">
-<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
-<a href="https://play.google.com/store/apps/details?id=protect.card_locker" target="_blank">
+<a href="https://f-droid.org/repository/browse/?fdid=me.hackerchick.catima" target="_blank">
+<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>
 
 Stores all of your store loyalty cards on your phone, removing the need to carry them around.  Currently the following barcode types are supported:
@@ -20,18 +20,22 @@ Stores all of your store loyalty cards on your phone, removing the need to carry
 - QR_CODE
 - UPC_A
 
-If there is any interest in improving this project, kindly submit a pull request with
-proposed changes.
-
 # Screenshots
 
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png)
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png)
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-07.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-07.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-08.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-08.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-09.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-09.png)
+[<img src="https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-10.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-10.png)
 
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png)
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png)
-[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png)
+# Migrating from other apps
+
+[See our migration guides](migrate).
 
 # Building
 
@@ -50,9 +54,12 @@ Windows:
 
 # Translating
 
-If you are interested in translating this application to another language, find the project listing on [Transifex](https://www.transifex.com/na-243/loyalty-card-locker).
+We are going to set up a translation platform soon, please check back later.
 
 # Thanks
 
 This application uses the following image:
 - [Save](https://thenounproject.com/term/save/716011) by [Bernar Novalyi](https://thenounproject.com/bernar.novalyi)
+
+# Note from Developer
+This application is based on the great [Loyalty Card Keychain](https://github.com/brarcher/loyalty-card-locker) by [Branden Archer](https://github.com/brarcher). This fork was created due to the original developer having stopped development of this app.

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

docs/migrate/index.md

@@ -0,0 +1,11 @@
+# Migrating from other apps
+
+We believe people shouldn't be locked into any specific app. That's why Catima will always allow you to export your data.
+
+We also try to support important your data from other applications whenever possible.
+
+Currently, importing is supported from the following apps:
+
+[Loyalty Card Keychain](protect_card_locker)
+
+Is the app you want to import from not listed? [Tell us about it](https://github.com/TheLastProject/Catima/issues) and we will look into supporting it.

docs/migrate/protect_card_locker/index.md

@@ -0,0 +1,35 @@
+# Migrating from Loyalty Card Keychain
+
+As Catima is based on Loyalty Card Keychain, importing your data from it is very simple.
+
+## 1. Open Loyalty Card Keychain
+![Step 1](step_1.png)
+
+## 2. Press the More Options button in the top right
+![Step 2](step_2.png)
+
+## 3. Press Import/Export
+![Step 3](step_3.png)
+
+## 4. Press Export
+![Step 4](step_4.png)
+
+## 5. Choose a save location, filename (default: LoyaltyCardKeychain.csv) and press Save
+![Step 5](step_5.png)
+
+## 6. Confirm the export was succesful
+![Step 6](step_6.png)
+
+## 7. Open Catima
+TODO: Logo
+
+## 8. Press the Import/Export button in the top right
+![Step 8](step_8.png)
+
+## 9. Press From Filesystem
+![Step 9](step_9.png)
+
+## 10. Choose the file you saved in step 5
+![Step 10](step_10.png)
+
+## That's it, you've succesfully imported your Loyalty Card Keychain database into Catima