Merge pull request #133 from brarcher/pre-v0.13

Update for v0.13

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "protect.card_locker"
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 12
-        versionName "0.11.1"
+        versionCode 14
+        versionName "0.13"
     }
     buildTypes {
         release {

app/src/main/AndroidManifest.xml

@@ -49,7 +49,7 @@
             android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
         <activity
-            android:name=".IntroActivity"
+            android:name=".intro.IntroActivity"
             android:label=""
             android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>

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

@@ -21,7 +21,7 @@ import java.lang.ref.WeakReference;
 class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
     private static final String TAG = "LoyaltyCardLocker";
-    private static final int MAX_WIDTH = 600;
+    private static final int MAX_WIDTH = 500;
 
     private final WeakReference<ImageView> imageViewReference;
     private final String cardId;
@@ -29,7 +29,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
     private final int imageHeight;
     private final int imageWidth;
 
-    public BarcodeImageWriterTask(ImageView imageView, String cardIdString,
+    BarcodeImageWriterTask(ImageView imageView, String cardIdString,
                                   BarcodeFormat barcodeFormat)
     {
         // Use a WeakReference to ensure the ImageView can be garbage collected
@@ -37,11 +37,19 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
         cardId = cardIdString;
         format = barcodeFormat;
-        imageHeight = imageView.getHeight();
 
-        // No matter how long the window is, there is only so much space
-        // needed for the barcode. Put a limit on it to reduce memory usage
-        imageWidth = Math.min(imageView.getWidth(), MAX_WIDTH);
+        if(imageView.getWidth() < MAX_WIDTH)
+        {
+            imageHeight = imageView.getHeight();
+            imageWidth = imageView.getWidth();
+        }
+        else
+        {
+            // Scale down the image to reduce the memory needed to produce it
+            imageWidth = MAX_WIDTH;
+            double ratio = (double)MAX_WIDTH / (double)imageView.getWidth();
+            imageHeight = (int)(imageView.getHeight() * ratio);
+        }
     }
 
     public Bitmap doInBackground(Void... params)

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

@@ -1,43 +0,0 @@
-package protect.card_locker;
-
-import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.v4.app.Fragment;
-
-import com.github.paolorotolo.appintro.AppIntro;
-
-
-public class IntroActivity extends AppIntro
-{
-    @Override
-    public void init(Bundle savedInstanceState)
-    {
-        addIntroSlide(R.layout.intro1_layout);
-        addIntroSlide(R.layout.intro2_layout);
-        addIntroSlide(R.layout.intro3_layout);
-        addIntroSlide(R.layout.intro4_layout);
-        addIntroSlide(R.layout.intro5_layout);
-        addIntroSlide(R.layout.intro6_layout);
-    }
-
-    private void addIntroSlide(@LayoutRes int layout)
-    {
-        Fragment slide = new IntroSlide();
-        Bundle args = new Bundle();
-        args.putInt("layout", layout);
-        slide.setArguments(args);
-        addSlide(slide);
-    }
-
-    @Override
-    public void onSkipPressed(Fragment fragment) {
-        finish();
-    }
-
-    @Override
-    public void onDonePressed(Fragment fragment) {
-        finish();
-    }
-}
-
-

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

@@ -2,8 +2,11 @@ package protect.card_locker;
 
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
@@ -22,6 +25,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.integration.android.IntentIntegrator;
@@ -53,6 +57,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     boolean updateLoyaltyCard;
     boolean viewLoyaltyCard;
 
+    boolean rotationEnabled;
+
     DBHelper db;
 
     @Override
@@ -74,6 +80,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         updateLoyaltyCard = b != null && b.getBoolean("update", false);
         viewLoyaltyCard = b != null && b.getBoolean("view", false);
 
+        Log.d(TAG, "View activity: id=" + loyaltyCardId
+                + ", updateLoyaltyCard=" + Boolean.toString(updateLoyaltyCard)
+                + ", viewLoyaltyCard=" + Boolean.toString(viewLoyaltyCard));
+
         db = new DBHelper(this);
     }
 
@@ -116,6 +126,13 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         if(updateLoyaltyCard || viewLoyaltyCard)
         {
             final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+            if(loyaltyCard == null)
+            {
+                Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
+                Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
 
             if(storeFieldEdit.getText().length() == 0)
             {
@@ -305,6 +322,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             getMenuInflater().inflate(R.menu.card_add_menu, menu);
         }
 
+        rotationEnabled = true;
+
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -361,6 +380,22 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 finish();
                 return true;
 
+            case R.id.action_lock_unlock:
+                if(rotationEnabled)
+                {
+                    item.setIcon(R.drawable.ic_lock_outline_white_24dp);
+                    item.setTitle(R.string.unlockScreen);
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
+                }
+                else
+                {
+                    item.setIcon(R.drawable.ic_lock_open_white_24dp);
+                    item.setTitle(R.string.lockScreen);
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+                }
+                rotationEnabled = !rotationEnabled;
+                return true;
+
             case R.id.action_save:
                 doSave();
                 return true;

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

@@ -29,6 +29,8 @@ import com.google.common.collect.ImmutableMap;
 import java.util.Calendar;
 import java.util.Map;
 
+import protect.card_locker.intro.IntroActivity;
+
 public class MainActivity extends AppCompatActivity
 {
     private static final String TAG = "LoyaltyCardLocker";

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

@@ -0,0 +1,36 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.annotation.LayoutRes;
+import android.support.v4.app.Fragment;
+
+import com.github.paolorotolo.appintro.AppIntro;
+
+import protect.card_locker.R;
+
+
+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

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.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,4 +1,4 @@
-package protect.card_locker;
+package protect.card_locker.intro;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -6,20 +6,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-public class IntroSlide extends Fragment
-{
-    int _layout;
+import protect.card_locker.R;
 
-    @Override
-    public void setArguments(Bundle bundle)
-    {
-        _layout = bundle.getInt("layout");
-    }
+public class IntroSlide2 extends Fragment
+{
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
     {
-        View v = inflater.inflate(_layout, container, false);
+        View v = inflater.inflate(R.layout.intro2_layout, container, false);
         return v;
     }
 }

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

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.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

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.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

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.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

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.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/menu/card_view_menu.xml

@@ -2,6 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/action_lock_unlock"
+        android:icon="@drawable/ic_lock_open_white_24dp"
+        android:title="@string/lockScreen"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_edit"
         android:icon="@drawable/ic_mode_edit_white_24dp"

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

@@ -19,6 +19,8 @@
     <string name="edit">Editovat</string>
     <string name="delete">Smazat</string>
     <string name="confirm">Potvrdit</string>
+    <!-- NEEDS TRANSLATED --><string name="lockScreen">Block Rotation</string>
+    <!-- NEEDS TRANSLATED --><string name="unlockScreen">Unblock Rotation</string>
     <string name="deleteTitle">Odstzranit věrnostní kartu</string>
     <string name="deleteConfirmation">Opravdu chcete smazat tuto věrnostní kartu?</string>
     <string name="ok">Ano</string>
@@ -33,6 +35,7 @@
 
     <string name="noStoreError">Nebyl zadán Obchod</string>
     <string name="noCardIdError">Nebylo zadáno ID karty</string>
+    <!-- NEEDS TRANSLATED --><string name="noCardExistsError">Could not lookup loyalty card</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
 

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

@@ -8,15 +8,15 @@
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Lizensiert unter der GPLv3.</string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> benutzt die folgenden Fremdbibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <!-- NEEDS TRANSLATED --><string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> verwendet folgenden Dritt-Ressourcen: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="viewCardTitle">Kundenkarte anzeigen</string>
     <string name="ok">Ok</string>
     <string name="note">Notiz</string>
     <string name="save">Speichern</string>
     <string name="scanCardBarcode">Barcode scannen</string>
     <string name="selectBarcodeTitle">Barcode auswählen</string>
-    <string name="storeName">Firma</string>
-    <string name="noStoreError">Keine Firma angegeben</string>
+    <string name="storeName">Geschäft</string>
+    <string name="noStoreError">Kein Geschäft angegeben</string>
     <string name="exportName">Exportieren</string>
     <string name="exportedTo">Exportiert nach: %1$s</string>
     <string name="fileMissing">Datei fehlt: %1$s</string>
@@ -25,27 +25,30 @@
     <string name="importName">Import</string>
     <string name="importedFrom">Importiert von: %1$s</string>
     <string name="noCardIdError">Keine Kartennummer angegeben</string>
+    <!-- NEEDS TRANSLATED --><string name="noCardExistsError">Could not lookup loyalty card</string>
     <string name="noExternalStoragePermissionError">Ohne die Berechtigung für den externen Speicher kann kein Import oder Export erfolgen.</string>
-    <string name="noGiftCards">Du hast noch keine Kundenkarte angelegt. Über den "+" Button oben rechts, kannst du welche anlegen.\n\nDiese App ermöglicht es dir, deine Kundenkarten immer mit dir zu führen.</string>
-    <string name="cancel">Abrechen</string>
-    <string name="capture">Karte aufnehmen</string>
+    <string name="noGiftCards">Sie haben noch keine Kundenkarte angelegt. Über den "+" Button oben rechts, können welche angelegt werden.\n\nDiese App ermöglicht es, Kundenkarten immer mit zu führen.</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="capture">Karte erfassen</string>
     <string name="cardId">Kartennummer</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="confirm">Bestätigen</string>
     <string name="copy_to_clipboard">Kopiere die Nummer in die Zwischenablage</string>
+    <!-- NEEDS TRANSLATED --><string name="lockScreen">Block Rotation</string>
+    <!-- NEEDS TRANSLATED --><string name="unlockScreen">Unblock Rotation</string>
     <string name="delete">Löschen</string>
-    <string name="deleteConfirmation">Bitte bestätige, dass du die Karte löschen möchtest.</string>
-    <string name="deleteTitle">Lösche die Kundenkarte</string>
+    <string name="deleteConfirmation">Bitte bestätigen Sie, dass diese Karte gelöscht werden soll.</string>
+    <string name="deleteTitle">Lösche die Kundenkarte</string><!-- NEEDS TRANSLATED -->
     <string name="edit">Bearbeiten</string>
     <string name="editCardTitle">Kundenkarte bearbeiten</string>
     <string name="enterCard">Karte einfügen</string>
-    <!-- NEEDS TRANSLATED --><string name="editCard">Edit Card</string>
+    <string name="editCard">Karte bearbeiten</string>
     <string name="exportFailed">Export fehlgeschlagen: %1$s</string>
     <string name="barcodeType">Barcodeart</string>
     <string name="barcodeImageDescription">Bild des Barcodes</string>
     <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
-    <string name="enterBarcodeInstructions">Füge die Kundennummer ein, anschließend wähle die korrekte Barcodeart aus.</string>
+    <string name="enterBarcodeInstructions">Fügen Sie die Kundennummer ein, anschließend wählen Sie die korrekte Barcodeart aus.</string>
     <string name="app_revision_fmt">Versions Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>
@@ -55,29 +58,29 @@
     <string name="importFailedTitle">Import fehlgeschlagen</string>
     <string name="exportSuccessfulTitle">Export erfolgreich</string>
     <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportOptionExplanation">Die Datei wird ins Wurzelverzeichnis des externen Speichers geschrieben.</string>
+    <string name="exportOptionExplanation">Die Datei wird ins Rootverzeichnis des externen Speichers geschrieben.</string>
     <string name="importOptionFilesystemTitle">Importiere vom Dateisystem</string>
     <string name="importOptionFilesystemExplanation">Wähle eine Datei im Speicher aus.</string>
     <string name="importOptionFilesystemButton">Vom Dateisystem</string>
     <string name="importOptionApplicationTitle">Nutze eine externe App</string>
-    <string name="importOptionApplicationExplanation">Wähle eine Datei aus einer App wie Dropbox, Google Drive, oder deinem bevorzugten Dateisystem aus.</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 vom Export Ort</string>
-    <string name="importOptionFixedExplanation">Importiere von derselben Stelle, wo die exportiere Datei liegen würde.</string>
-    <string name="importOptionFixedButton">Verwende die exportierte Stelle</string>
+    <string name="importOptionFixedTitle">Importiere vom Export-Pfad</string>
+    <string name="importOptionFixedExplanation">Importiere vom Export-Pfad.</string>
+    <string name="importOptionFixedButton">Verwende den Export-Pfad.</string>
     <string name="sendLabel">Senden&#8230;</string>
 
-    <!-- NEEDS TRANSLATED --><string name="startIntro">Start Intro</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Description">Manage your barcode-based store/loyalty cards on your phone!\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Description">Add a new card by touching the plus from the card list.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Description">To add the barcode, either capture with the camera or type in manually.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Title">Show Card\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Description">To display a card, click on the store name from the main screen\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro5Title">Backup\n</string>
-    <!-- NEEDS TRANSLATED --><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>
-    <!-- NEEDS TRANSLATED --><string name="intro6Title">Feedback\n</string>
-    <!-- NEEDS TRANSLATED --><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>
-</resources>
+    <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>
+</resources>

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

@@ -18,6 +18,8 @@
     <string name="editCard">Modifier</string>
     <string name="edit">Modifier</string>
     <string name="delete">Supprimer</string>
+    <!-- NEEDS TRANSLATED --><string name="lockScreen">Block Rotation</string>
+    <!-- NEEDS TRANSLATED --><string name="unlockScreen">Unblock Rotation</string>
     <string name="confirm">Confirmer</string>
     <string name="deleteTitle">Supprimer la carte de fidélité</string>
     <string name="deleteConfirmation">Confirmez que vous souhaitez supprimer cette carte</string>
@@ -33,6 +35,7 @@
 
     <string name="noStoreError">Aucun nom n\'a été saisi</string>
     <string name="noCardIdError">Aucun numéro n\'a été saisi</string>
+    <!-- NEEDS TRANSLATED --><string name="noCardExistsError">Could not lookup loyalty card</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
 
@@ -55,7 +58,7 @@
     <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Notes sur les versions : <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utilise les bibliothèques-tierces suivantes : <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <!-- NEEDS TRANSLATED --><string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> utilise les ressources-tierces suivantes : <xliff:g id="app_resources_list">%s</xliff:g></string>
 
     <string name="selectBarcodeTitle">Choisissez le code-barre</string>
     <string name="enterBarcodeInstructions">Saisissez les chiffres du code-barres et sélectionnez l\'image qui le représente</string>
@@ -79,11 +82,11 @@
     <string name="importOptionFixedButton">Utiliser l\'emplacement de l\'export</string>
     <string name="sendLabel">Envoyer&#8230;</string>
 
-    <string name="startIntro">Démarrer la présentation</string>
-    <string name="intro1Title">Bienvenue dans Loyalty Card Keychain\n</string>
-    <string name="intro1Description">Gérez vos cartes de fidélité à codes-barres sur votre téléphone !\n\n</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">Touchez le signe \'+\' en haut de la liste des cartes pour en ajouter une.\n\n</string>
+    <string name="intro2Description">Touchez le signe \'+\' en haut de l\'écran pour ajouter une carte.\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>

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

@@ -25,6 +25,7 @@
 
     <string name="noStoreError">Nessun negozio inserito</string>
     <string name="noCardIdError">Nessun codice carta inserito</string>
+    <!-- NEEDS TRANSLATED --><string name="noCardExistsError">Could not lookup loyalty card</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="note">Note</string>
@@ -47,7 +48,7 @@
     <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informazione sulla revisione: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> usa le seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <!-- NEEDS TRANSLATED --><string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> usa le seguenti risorse di terze parti: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="ok">Ok</string>
     <string name="enterCard">Inserisci carta</string>
     <string name="editCard">Modifica carta</string>
@@ -56,6 +57,8 @@
     <string name="copy_to_clipboard">Copia ID negli appunti</string>
     <string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>
     <string name="confirm">Conferma</string>
+    <string name="lockScreen">Blocca rotazione</string>
+    <string name="unlockScreen">Sblocca rotazione</string>
     <string name="deleteTitle">Rimuovi carta fedeltà</string>
     <string name="deleteConfirmation">Conferma che vuoi eliminare questa carta.</string>
     <string name="importExportHelp">Fare il backup dei dati ti permette di spostare le tue tessere da un dispositivo ad un altro.</string>

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

@@ -19,6 +19,8 @@
     <string name="edit">Redaguoti</string>
     <string name="delete">Ištrinti</string>
     <string name="confirm">Patvirtinti</string>
+    <!-- NEEDS TRANSLATED --><string name="lockScreen">Block Rotation</string>
+    <!-- NEEDS TRANSLATED --><string name="unlockScreen">Unblock Rotation</string>
     <string name="deleteTitle">Panaikinti lojalumo kortelę</string>
     <string name="deleteConfirmation">Prašome patvirtinti jog Jūs norite panaikinti šią lojalumo kortelę.</string>
     <string name="ok">Gerai</string>
@@ -33,6 +35,7 @@
 
     <string name="noStoreError">Parduotuvė neįvesta</string>
     <string name="noCardIdError">Neįvestas kortelės ID</string>
+    <!-- NEEDS TRANSLATED --><string name="noCardExistsError">Could not lookup loyalty card</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
 

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

@@ -25,6 +25,7 @@
 
     <string name="noStoreError">Geen winkel toegevoegd</string>
     <string name="noCardIdError">Geen kaart-ID toegevoegd</string>
+    <!-- NEEDS TRANSLATED --><string name="noCardExistsError">Could not lookup loyalty card</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="note">Notitie</string>
@@ -58,7 +59,8 @@
     <string name="confirm">Bevestig</string>
     <string name="deleteConfirmation">Bevestig deze kaart te verwijderen.</string>
     <string name="deleteTitle">Verwijder kaart</string>
-
+    <!-- NEEDS TRANSLATED --><string name="lockScreen">Block Rotation</string>
+    <!-- NEEDS TRANSLATED --><string name="unlockScreen">Unblock Rotation</string>
     <string name="importExportHelp">Data die is geback-upt maakt het mogelijk om je klantenkaarten naar een ander apparaat te verplaatsen.</string>
     <string name="importSuccessfulTitle">Importeren succesvol</string>
     <string name="importFailedTitle">Importeren mislukte</string>

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

@@ -19,6 +19,8 @@
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <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="deleteConfirmation">Please confirm that you want to delete this card.</string>
     <string name="ok">OK</string>
@@ -34,6 +36,7 @@
 
     <string name="noStoreError">No Store entered</string>
     <string name="noCardIdError">No Card ID entered</string>
+    <string name="noCardExistsError">Could not lookup loyalty card</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="storeNameAndNoteFormat" translatable="false">%1$s - %2$s</string>

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

@@ -6,6 +6,7 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
+import android.view.Menu;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -24,12 +25,13 @@ import org.robolectric.annotation.Config;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowLog;
-import org.robolectric.util.ActivityController;
+import org.robolectric.android.controller.ActivityController;
 
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
@@ -414,4 +416,47 @@ public class LoyaltyCardViewActivityTest
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());
     }
+
+    @Test
+    public void checkMenu() throws IOException
+    {
+        ActivityController activityController = createActivityWithLoyaltyCard(false);
+        Activity activity = (Activity)activityController.get();
+        DBHelper db = new DBHelper(activity);
+
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE);
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        final Menu menu = shadowOf(activity).getOptionsMenu();
+        assertTrue(menu != null);
+
+        // The settings and add button should be present
+        assertEquals(menu.size(), 2);
+
+        assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
+        assertEquals("Edit", menu.findItem(R.id.action_edit).getTitle().toString());
+    }
+
+    @Test
+    public void startWithMissingLoyaltyCard() throws IOException
+    {
+        ActivityController activityController = createActivityWithLoyaltyCard(true);
+        Activity activity = (Activity)activityController.get();
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        // The activity should find that the card is missing and shut down
+
+        assertTrue(activity.isFinishing());
+
+        // Make sure the activity can close down
+        activityController.pause();
+        activityController.stop();
+        activityController.destroy();
+    }
 }

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

@@ -21,7 +21,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
+import org.robolectric.android.controller.ActivityController;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -131,7 +131,7 @@ public class MainActivityTest
 
         ComponentName componentName = next.getComponent();
         String name = componentName.flattenToShortString();
-        assertEquals("protect.card_locker/.IntroActivity", name);
+        assertEquals("protect.card_locker/.intro.IntroActivity", name);
 
         Bundle extras = next.getExtras();
         assertNull(extras);