Release 1.4.0

Compressed Images

.gitignore

@@ -6,3 +6,5 @@
 .DS_Store
 /build
 /captures
+/app/release
+/app/debug

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v1.4.0 (2020-11-28)
+
+Changes:
+
+- Move About screen into its own activity
+- Ask user if they want to use their camera or manually enter ID on add/edit card
+- Make group ordering manual instead of forced alphabetically
+
 ## v1.3.0 (2020-11-22)
 
 Changes:

app/build.gradle

@@ -13,8 +13,9 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 47
-        versionName "1.3.0"
+        versionCode 48
+        versionName "1.4.0"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
@@ -53,7 +54,6 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.jaredrummler:colorpicker:1.0.2'
     implementation group: 'com.google.guava', name: 'guava', version: '20.0'
-    implementation 'com.github.apl-devs:appintro:v4.2.0'
     implementation "com.vanniktech:vntnumberpickerpreference:1.0.0"
     implementation 'androidx.cardview:cardview:1.0.0'
     testImplementation 'junit:junit:4.12'

app/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":41,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -33,6 +33,11 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/about"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
         <activity
             android:name=".ManageGroupsActivity"
             android:label="@string/groups"

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

@@ -0,0 +1,125 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.text.InputType;
+import android.text.method.LinkMovementMethod;
+import android.text.util.Linkify;
+import android.util.Log;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.common.collect.ImmutableMap;
+
+import org.w3c.dom.Text;
+
+import java.util.Calendar;
+import java.util.Map;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.text.HtmlCompat;
+
+public class AboutActivity extends AppCompatActivity
+{
+    private static final String TAG = "Catima";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.about_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        final Map<String, String> USED_LIBRARIES = new ImmutableMap.Builder<String, String>()
+                .put("Commons CSV", "https://commons.apache.org/proper/commons-csv/")
+                .put("Guava", "https://github.com/google/guava")
+                .put("ZXing", "https://github.com/zxing/zxing")
+                .put("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded")
+                .put("Color Picker", "https://github.com/jaredrummler/ColorPicker")
+                .put("VNTNumberPickerPreference", "https://github.com/vanniktech/VNTNumberPickerPreference")
+                .build();
+
+        final Map<String, String> USED_ASSETS = ImmutableMap.of
+                (
+                        "Save by Bernar Novalyi", "https://thenounproject.com/term/save/716011"
+                );
+
+        StringBuilder libs = new StringBuilder().append("<br/>");
+        for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
+        {
+            libs.append("<br/><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a><br/>");
+        }
+
+        StringBuilder resources = new StringBuilder().append("<br/>");
+        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
+        {
+            resources.append("<br/><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a><br/>");
+        }
+
+        String appName = getString(R.string.app_name);
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+
+        String version = "?";
+        try
+        {
+            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
+            version = pi.versionName;
+        }
+        catch (PackageManager.NameNotFoundException e)
+        {
+            Log.w(TAG, "Package name not found", e);
+        }
+
+        setTitle(String.format(getString(R.string.about_title_fmt), appName));
+
+        TextView aboutTextView = findViewById(R.id.aboutText);
+        aboutTextView.setText(HtmlCompat.fromHtml(String.format(getString(R.string.debug_version_fmt), version) +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_revision_fmt),
+                        "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
+                                "GitHub" +
+                                "</a>") +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_copyright_fmt), year) +
+                "<br/><br/>" +
+                getString(R.string.app_copyright_old) +
+                "<br/><br/>" +
+                getString(R.string.app_license) +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_libraries), appName, libs.toString()) +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_resources), appName, resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finish();
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -0,0 +1,23 @@
+package protect.card_locker;
+
+public class BarcodeValues {
+    private final String mFormat;
+    private final String mContent;
+
+    public BarcodeValues(String format, String content) {
+        mFormat = format;
+        mContent = content;
+    }
+
+    public String format() {
+        return mFormat;
+    }
+
+    public String content() {
+        return mContent;
+    }
+
+    public boolean isEmpty() {
+        return mFormat == null && mContent == null;
+    }
+}

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

@@ -14,12 +14,13 @@ public class DBHelper extends SQLiteOpenHelper
 {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 5;
+    public static final int DATABASE_VERSION = 6;
 
     static class LoyaltyCardDbGroups
     {
         public static final String TABLE = "groups";
         public static final String ID = "_id";
+        public static final String ORDER = "orderId";
     }
 
     static class LoyaltyCardDbIds
@@ -52,7 +53,8 @@ public class DBHelper extends SQLiteOpenHelper
     {
         // create table for card groups
         db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
-                LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
+                LoyaltyCardDbGroups.ID + " TEXT primary key not null," +
+                LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0')");
 
         // create table for cards
         db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
@@ -109,6 +111,13 @@ public class DBHelper extends SQLiteOpenHelper
                     LoyaltyCardDbIdsGroups.groupID + " TEXT," +
                     "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
         }
+
+        // Upgrade from version 5 to 6
+        if(oldVersion < 6 && newVersion >= 6)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbGroups.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0'");
+        }
     }
 
     public long insertLoyaltyCard(final String store, final String note, final String cardId,
@@ -376,7 +385,7 @@ public class DBHelper extends SQLiteOpenHelper
         SQLiteDatabase db = getReadableDatabase();
 
         Cursor res = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
-                " ORDER BY " + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
+                " ORDER BY " + LoyaltyCardDbGroups.ORDER + " ASC," + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
         return res;
     }
 
@@ -398,6 +407,26 @@ public class DBHelper extends SQLiteOpenHelper
         return groups;
     }
 
+    public void reorderGroups(final List<Group> groups)
+    {
+        Integer order = 0;
+
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues;
+
+        for (Group group : groups)
+        {
+            contentValues = new ContentValues();
+            contentValues.put(LoyaltyCardDbGroups.ORDER, order);
+
+            db.update(LoyaltyCardDbGroups.TABLE, contentValues,
+                    LoyaltyCardDbGroups.ID + "=?",
+                    new String[]{group._id});
+
+            order++;
+        }
+    }
+
     public Group getGroup(final String groupName)
     {
         SQLiteDatabase db = getReadableDatabase();
@@ -467,6 +496,7 @@ public class DBHelper extends SQLiteOpenHelper
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbGroups.ID, name);
+        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
         final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
         return newId;
     }
@@ -475,6 +505,7 @@ public class DBHelper extends SQLiteOpenHelper
     {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbGroups.ID, name);
+        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
         final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
         return (newId != -1);
     }

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

@@ -37,8 +37,8 @@ class GroupCursorAdapter extends CursorAdapter
     public void bindView(View view, Context context, Cursor cursor)
     {
         // Find fields to populate in inflated template
-        TextView nameField = (TextView) view.findViewById(R.id.name);
-        TextView countField = (TextView) view.findViewById(R.id.cardCount);
+        TextView nameField = view.findViewById(R.id.name);
+        TextView countField = view.findViewById(R.id.cardCount);
 
         // Extract properties from cursor
         Group group = Group.toGroup(cursor);

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

@@ -48,8 +48,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 {
     private static final String TAG = "Catima";
 
-    protected static final int SELECT_BARCODE_REQUEST = 1;
-
     ImageView thumbnail;
     EditText storeFieldEdit;
     EditText noteFieldEdit;
@@ -62,11 +60,13 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     View barcodeImageLayout;
     View barcodeCaptureLayout;
 
-    Button captureButton;
     Button enterButton;
 
     int loyaltyCardId;
     boolean updateLoyaltyCard;
+    String barcodeType;
+    String cardId;
+
     Uri importLoyaltyCardUri = null;
     Integer headingColorValue = null;
 
@@ -82,6 +82,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt("id") : 0;
         updateLoyaltyCard = b != null && b.getBoolean("update", false);
+
+        barcodeType = b != null ? b.getString("barcodeType") : null;
+        cardId = b != null ? b.getString("cardId") : null;
+
         importLoyaltyCardUri = intent.getData();
 
         Log.d(TAG, "View activity: id=" + loyaltyCardId
@@ -119,7 +123,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
 
-        captureButton = findViewById(R.id.captureButton);
         enterButton = findViewById(R.id.enterButton);
 
         storeFieldEdit.addTextChangedListener(new TextWatcher() {
@@ -318,6 +321,21 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         thumbnail.setOnClickListener(new ColorSelectListener(headingColorValue));
 
+        if (!initDone) {
+            hasChanged = false;
+            initDone = true;
+        }
+
+        // Update from intent
+        if (barcodeType != null) {
+            barcodeTypeField.setText(barcodeType.isEmpty() ? getString(R.string.noBarcode) : barcodeType);
+            barcodeType = null;
+        }
+        if (cardId != null) {
+            cardIdFieldView.setText(cardId);
+            cardId = null;
+        }
+
         if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
         {
             String formatString = barcodeTypeField.getText().toString();
@@ -335,23 +353,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             }
         }
 
-        View.OnClickListener captureCallback = new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                IntentIntegrator integrator = new IntentIntegrator(LoyaltyCardEditActivity.this);
-                integrator.setDesiredBarcodeFormats(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
-
-                String prompt = getResources().getString(R.string.scanCardBarcode);
-                integrator.setPrompt(prompt);
-                integrator.setBeepEnabled(false);
-                integrator.initiateScan();
-            }
-        };
-
-        captureButton.setOnClickListener(captureCallback);
-
         enterButton.setOnClickListener(new EditCardIdAndBarcode());
         barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
 
@@ -380,11 +381,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         });
 
         generateIcon(storeFieldEdit.getText().toString());
-
-        if (!initDone) {
-            hasChanged = false;
-            initDone = true;
-        }
     }
 
     @Override
@@ -425,17 +421,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         @Override
         public void onClick(View v)
         {
-            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-
-            String cardId = cardIdFieldView.getText().toString();
-            if(cardId.length() > 0)
-            {
-                final Bundle b = new Bundle();
-                b.putString("initialCardId", cardId);
-                i.putExtras(b);
-            }
-
-            startActivityForResult(i, SELECT_BARCODE_REQUEST);
+            Utils.createSetBarcodeDialog(LoyaltyCardEditActivity.this, LoyaltyCardEditActivity.this, true, cardIdFieldView.getText().toString());
         }
     }
 
@@ -590,41 +576,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        String contents = null;
-        String format = null;
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
 
-        IntentResult result =
-                IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
-        if (result != null)
-        {
-            Log.i(TAG, "Received barcode information from capture");
-            contents = result.getContents();
-            format = result.getFormatName();
-        }
+        barcodeType = barcodeValues.format();
+        cardId = barcodeValues.content();
 
-        if(requestCode == SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK)
-        {
-            Log.i(TAG, "Received barcode information from typing it");
-
-            contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
-            format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
-        }
-
-        if(contents != null && contents.isEmpty() == false &&
-                format != null)
-        {
-            Log.i(TAG, "Read barcode id: " + contents);
-            Log.i(TAG, "Read format: " + format);
-
-            TextView cardIdView = findViewById(R.id.cardIdView);
-            cardIdView.setText(contents);
-
-            // Set special NO_BARCODE value to prevent onResume from overwriting it
-            barcodeTypeField.setText(format.isEmpty() ? getString(R.string.noBarcode) : format);
-            onResume();
-
-            hasChanged = true;
-        }
+        onResume();
     }
 
     private void showBarcode() {

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

@@ -1,5 +1,6 @@
 package protect.card_locker;
 
+import android.app.AlertDialog;
 import android.app.SearchManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -7,41 +8,36 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.GestureDetector;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.webkit.WebView;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
-import com.google.common.collect.ImmutableMap;
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
 
-import java.util.Calendar;
 import java.util.List;
-import java.util.Map;
 import protect.card_locker.preferences.SettingsActivity;
 
 public class MainActivity extends AppCompatActivity implements GestureDetector.OnGestureListener
 {
     private static final String TAG = "Catima";
-    private static final int MAIN_REQUEST_CODE = 1;
 
     private Menu menu;
     private GestureDetector gestureDetector;
@@ -145,18 +141,16 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         addButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                startActivityForResult(i, MAIN_REQUEST_CODE);
+                Utils.createSetBarcodeDialog(MainActivity.this, MainActivity.this, false, null);
             }
         });
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
 
-        if (requestCode == MAIN_REQUEST_CODE)
-        {
+        if (requestCode == Utils.MAIN_REQUEST) {
             // We're coming back from another view so clear the search
             // We only do this now to prevent a flash of all entries right after picking one
             filter = "";
@@ -168,6 +162,19 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
 
             // In case the theme changed
             recreate();
+
+            return;
+        }
+
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
+
+        if(!barcodeValues.isEmpty()) {
+            Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            Bundle newBundle = new Bundle();
+            newBundle.putString("barcodeType", barcodeValues.format());
+            newBundle.putString("cardId", barcodeValues.content());
+            newIntent.putExtras(newBundle);
+            startActivity(newIntent);
         }
     }
 
@@ -253,7 +260,7 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
 
                 ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
 
-                startActivityForResult(i, MAIN_REQUEST_CODE);
+                startActivityForResult(i, Utils.MAIN_REQUEST);
             }
         });
     }
@@ -376,129 +383,34 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         if (id == R.id.action_manage_groups)
         {
             Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
-            startActivityForResult(i, MAIN_REQUEST_CODE);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
             return true;
         }
 
         if(id == R.id.action_import_export)
         {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
-            startActivityForResult(i, MAIN_REQUEST_CODE);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
             return true;
         }
 
         if(id == R.id.action_settings)
         {
             Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
-            startActivityForResult(i, MAIN_REQUEST_CODE);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
             return true;
         }
 
         if(id == R.id.action_about)
         {
-            displayAboutDialog();
+            Intent i = new Intent(getApplicationContext(), AboutActivity.class);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
-    private void displayAboutDialog()
-    {
-        final Map<String, String> USED_LIBRARIES = new ImmutableMap.Builder<String, String>()
-            .put("Commons CSV", "https://commons.apache.org/proper/commons-csv/")
-            .put("Guava", "https://github.com/google/guava")
-            .put("ZXing", "https://github.com/zxing/zxing")
-            .put("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded")
-            .put("AppIntro", "https://github.com/apl-devs/AppIntro")
-            .put("Color Picker", "https://github.com/jaredrummler/ColorPicker")
-            .put("VNTNumberPickerPreference", "https://github.com/vanniktech/VNTNumberPickerPreference")
-            .build();
-
-        final Map<String, String> USED_ASSETS = ImmutableMap.of
-        (
-            "Save by Bernar Novalyi", "https://thenounproject.com/term/save/716011"
-        );
-
-        StringBuilder libs = new StringBuilder().append("<ul>");
-        for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
-        {
-            libs.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
-        }
-        libs.append("</ul>");
-
-        StringBuilder resources = new StringBuilder().append("<ul>");
-        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
-        {
-            resources.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
-        }
-        resources.append("</ul>");
-
-        String appName = getString(R.string.app_name);
-        int year = Calendar.getInstance().get(Calendar.YEAR);
-
-        String version = "?";
-        try
-        {
-            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
-            version = pi.versionName;
-        }
-        catch (PackageManager.NameNotFoundException e)
-        {
-            Log.w(TAG, "Package name not found", e);
-        }
-
-        WebView wv = new WebView(this);
-
-        // Set CSS for dark mode if dark mode
-        String css = "";
-        if(isDarkModeEnabled(this))
-        {
-            css = "<style>body {color:white; background-color:black;}</style>";
-        }
-
-        String html =
-            "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
-            css +
-            "<h1>" +
-            String.format(getString(R.string.about_title_fmt),
-                    "<a href=\"" + getString(R.string.app_webpage_url)) + "\">" +
-            appName +
-            "</a>" +
-            "</h1><p>" +
-            appName +
-            " " +
-            String.format(getString(R.string.debug_version_fmt), version) +
-            "</p><p>" +
-            String.format(getString(R.string.app_revision_fmt),
-                    "<a href=\"" + 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>" +
-            String.format(getString(R.string.app_libraries), appName, libs.toString()) +
-            "</p><hr/><p>" +
-            String.format(getString(R.string.app_resources), appName, resources.toString());
-
-        wv.loadDataWithBaseURL("file:///android_res/drawable/", html, "text/html", "utf-8", null);
-        new AlertDialog.Builder(this)
-            .setView(wv)
-            .setCancelable(true)
-            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
-            {
-                public void onClick(DialogInterface dialog, int which)
-                {
-                    dialog.dismiss();
-                }
-            })
-            .show();
-    }
-
     protected static boolean isDarkModeEnabled(Context inputContext)
     {
         Configuration config = inputContext.getResources().getConfiguration();

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

@@ -15,6 +15,8 @@ import android.widget.TextView;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
+import java.util.List;
+
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -112,12 +114,16 @@ public class ManageGroupsActivity extends AppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
+    public void moveGroupUp(View view) {
+        moveGroup(view, true);
+    }
+
+    public void moveGroupDown(View view) {
+        moveGroup(view, false);
+    }
+
     public void editGroup(View view) {
-        LinearLayout parentRow = (LinearLayout) view.getParent();
-
-        TextView groupNameTextView = (TextView) parentRow.findViewById(R.id.name);
-
-        final String groupName = (String) groupNameTextView.getText();
+        final String groupName = getGroupname(view);
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.enter_group_name);
@@ -131,8 +137,6 @@ public class ManageGroupsActivity extends AppCompatActivity
             public void onClick(DialogInterface dialog, int which) {
                 db.updateGroup(groupName, input.getText().toString());
                 updateGroupList();
-                // Rename may change ordering, so invalidate
-                invalidateHomescreenActiveTab();
             }
         });
         builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
@@ -146,11 +150,7 @@ public class ManageGroupsActivity extends AppCompatActivity
     }
 
     public void deleteGroup(View view) {
-        LinearLayout parentRow = (LinearLayout) view.getParent();
-
-        TextView groupNameTextView = (TextView) parentRow.findViewById(R.id.name);
-
-        final String groupName = (String) groupNameTextView.getText();
+        final String groupName = getGroupname(view);
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.deleteConfirmationGroup);
@@ -187,8 +187,6 @@ public class ManageGroupsActivity extends AppCompatActivity
             public void onClick(DialogInterface dialog, int which) {
                 db.insertGroup(input.getText().toString());
                 updateGroupList();
-                // Create may change ordering, so invalidate
-                invalidateHomescreenActiveTab();
             }
         });
         builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
@@ -201,4 +199,56 @@ public class ManageGroupsActivity extends AppCompatActivity
 
         return dialog;
     }
+
+    private String getGroupname(View view) {
+        LinearLayout parentRow = (LinearLayout) view.getParent().getParent();
+        TextView groupNameTextView = parentRow.findViewById(R.id.name);
+        return (String) groupNameTextView.getText();
+    }
+
+    private void moveGroup(View view, boolean up) {
+        final String groupName = getGroupname(view);
+
+        List<Group> groups = db.getGroups();
+
+        int currentIndex = -1;
+        Integer newIndex;
+
+        // Get current index in group list
+        for (int i = 0; i < groups.size(); i++) {
+            if (groups.get(i)._id.equals(groupName)) {
+                currentIndex = i;
+
+                break;
+            }
+        }
+
+        if (currentIndex == -1) {
+            throw new IndexOutOfBoundsException();
+        }
+
+        // Reinsert group in correct position
+        if (up) {
+            newIndex = currentIndex - 1;
+        } else {
+            newIndex = currentIndex + 1;
+        }
+
+        // Don't try to move out of bounds
+        if (newIndex < 0 || newIndex >= groups.size()) {
+            return;
+        }
+
+        Group group = groups.remove(currentIndex);
+        groups.add(newIndex, group);
+
+        // Update database
+        db.reorderGroups(groups);
+
+        // Update UI
+        updateGroupList();
+
+        // Ordering may have changed, so invalidate
+        invalidateHomescreenActiveTab();
+    }
 }

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

@@ -1,11 +1,31 @@
 package protect.card_locker;
 
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.Color;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
 
 import androidx.core.graphics.ColorUtils;
 
 public class Utils {
+    private static final String TAG = "Catima";
+
+    // Barcode config dialog
+    private static AlertDialog setBarcodeDialog;
+
+    // Activity request codes
+    public static final int MAIN_REQUEST = 1;
+    public static final int SELECT_BARCODE_REQUEST = 2;
+
     static final double LUMINANCE_MIDPOINT = 0.5;
 
     static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor) {
@@ -27,4 +47,92 @@ public class Utils {
     static public boolean needsDarkForeground(Integer backgroundColor) {
         return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
     }
+
+    static public void startCameraBarcodeScan(Context context, Activity activity) {
+        IntentIntegrator integrator = new IntentIntegrator(activity);
+        integrator.setDesiredBarcodeFormats(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
+
+        String prompt = context.getResources().getString(R.string.scanCardBarcode);
+        integrator.setPrompt(prompt);
+        integrator.setBeepEnabled(false);
+        integrator.initiateScan();
+    }
+
+    static public void createSetBarcodeDialog(final Context context, final Activity activity, boolean isUpdate, final String initialCardId) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        // Get the layout inflater
+        LayoutInflater inflater = activity.getLayoutInflater();
+
+        // Inflate and set the layout for the dialog
+        // Pass null as the parent view because its going in the dialog layout
+        builder.setView(inflater.inflate(R.layout.dialog_create, null));
+
+        if (isUpdate) {
+            builder.setTitle(context.getString(R.string.editCardTitle));
+        } else {
+            builder.setTitle(context.getString(R.string.addCardTitle));
+        }
+
+        builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int id) {
+                setBarcodeDialog.cancel();
+            }
+        });
+        setBarcodeDialog = builder.create();
+        setBarcodeDialog.show();
+
+        View addFromCamera = setBarcodeDialog.getWindow().findViewById(R.id.add_from_camera);
+        View addManually = setBarcodeDialog.getWindow().findViewById(R.id.add_manually);
+
+        addFromCamera.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Utils.startCameraBarcodeScan(context, activity);
+
+                setBarcodeDialog.hide();
+            }
+        });
+
+        addManually.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent i = new Intent(context, BarcodeSelectorActivity.class);
+                if (initialCardId != null) {
+                    final Bundle b = new Bundle();
+                    b.putString("initialCardId", initialCardId);
+                    i.putExtras(b);
+                }
+                activity.startActivityForResult(i, Utils.SELECT_BARCODE_REQUEST);
+
+                setBarcodeDialog.hide();
+            }
+        });
+    }
+
+    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent) {
+        String contents = null;
+        String format = null;
+
+        IntentResult result =
+                IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+        if (result != null)
+        {
+            Log.i(TAG, "Received barcode information from capture");
+            contents = result.getContents();
+            format = result.getFormatName();
+        }
+
+        if(requestCode == Utils.SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK)
+        {
+            Log.i(TAG, "Received barcode information from typing it");
+
+            contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
+            format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
+        }
+
+        Log.i(TAG, "Read barcode id: " + contents);
+        Log.i(TAG, "Read format: " + format);
+
+        return new BarcodeValues(format, contents);
+    }
 }

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="protect.card_locker.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/aboutText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:linksClickable="true"
+            android:singleLine="false"
+            android:focusable="true" />
+
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <LinearLayout
+        android:id="@+id/add_from_camera"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/inputPadding">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_camera_white"
+            app:tint="@color/iconColor"
+            android:padding="@dimen/inputPadding" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/addWithCamera"
+            android:padding="@dimen/inputPadding" />
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@android:color/darker_gray"/>
+    <LinearLayout
+        android:id="@+id/add_manually"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/inputPadding">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_mode_edit_white_24dp"
+            app:tint="@color/iconColor"
+            android:padding="@dimen/inputPadding" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/addManually"
+            android:padding="@dimen/inputPadding" />
+    </LinearLayout>
+</LinearLayout>

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

@@ -2,7 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical"
@@ -11,58 +11,74 @@
 
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="0dip"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
-
-            <LinearLayout
-                android:id="@+id/valueLayout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="visible">
-
-                <TextView
-                    android:id="@+id/name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/storeNameTextSize"
-                    android:textStyle="bold"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:textSize="@dimen/storeNameTextSize"
+            android:textStyle="bold"/>
 
         <TextView
             android:id="@+id/cardCount"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="end"
             android:maxLines="1"
             android:ellipsize="end"
             android:textSize="@dimen/noteTextSize"/>
     </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/edit"
-        android:layout_width="@dimen/cardThumbnailSize"
-        android:layout_height="@dimen/cardThumbnailSize"
-        android:layout_marginLeft="@dimen/activity_margin"
-        android:src="@drawable/ic_mode_edit_white_24dp"
-        android:contentDescription="@string/edit"
-        app:tint="#000000"
-        android:onClick="editGroup" />
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
 
-    <ImageButton
-        android:id="@+id/delete"
-        android:layout_width="@dimen/cardThumbnailSize"
-        android:layout_height="@dimen/cardThumbnailSize"
-        android:layout_marginLeft="@dimen/activity_margin"
-        android:src="@drawable/ic_delete_white_24dp"
-        android:contentDescription="@string/delete"
-        app:tint="#000000"
-        android:onClick="deleteGroup"/>
+        <ImageButton
+            android:id="@+id/moveUp"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
+            android:layout_weight="1"
+            android:src="@drawable/ic_baseline_arrow_drop_up_24"
+            android:contentDescription="@string/moveUp"
+            app:tint="@color/iconColor"
+            android:onClick="moveGroupUp"/>
+
+        <ImageButton
+            android:id="@+id/moveDown"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
+            android:layout_weight="1"
+            android:src="@drawable/ic_baseline_arrow_drop_down_24"
+            android:contentDescription="@string/moveDown"
+            app:tint="@color/iconColor"
+            android:onClick="moveGroupDown"/>
+
+        <ImageButton
+            android:id="@+id/edit"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
+            android:layout_weight="1"
+            android:src="@drawable/ic_mode_edit_white_24dp"
+            android:contentDescription="@string/edit"
+            app:tint="@color/iconColor"
+            android:onClick="editGroup" />
+
+        <ImageButton
+            android:id="@+id/delete"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
+            android:layout_weight="1"
+            android:src="@drawable/ic_delete_white_24dp"
+            android:contentDescription="@string/delete"
+            app:tint="@color/iconColor"
+            android:onClick="deleteGroup"/>
+
+    </LinearLayout>
 
 </LinearLayout>

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

@@ -136,12 +136,6 @@
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
                         android:id="@+id/barcodeCaptureLayout">
-                        <Button android:id="@+id/captureButton"
-                            android:layout_margin="@dimen/inputMargin"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text="@string/capture"
-                            android:layout_weight="1.0"/>
                         <Button android:id="@+id/enterButton"
                             android:layout_margin="@dimen/inputMargin"
                             android:layout_width="0dp"

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="protect.card_locker.MainActivity">
+    tools:context="protect.card_locker.ManageGroupsActivity">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabAdd"

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

@@ -2,8 +2,10 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_search">Suche</string>
     <string name="action_add">Neu</string>
-    <string name="noGiftCards">Sie haben noch keine Kundenkarte angelegt. Über den \"+\"-Button oben rechts können welche angelegt werden.\n\nDiese App ermöglicht es, Kundenkarten immer mit zu führen.</string>
-    <string name="noMatchingGiftCards">Es passen keine Kundenkarten zum Filter. Bitte probiere verschiedene Begriffe aus.</string>
+    <string name="noGiftCards">Klicken Sie auf die Schaltfläche + (plus), um zuerst eine Karte hinzuzufügen.
+\n
+\nCatima trägt Ihre Karten auf dem Gerät, so dass sie immer in Reichweite sind.</string>
+    <string name="noMatchingGiftCards">Nichts gefunden. Versuchen Sie, Ihre Suche zu ändern.</string>
     <string name="storeName">Geschäft</string>
     <string name="note">Notiz</string>
     <string name="cardId">Kartennummer</string>
@@ -28,7 +30,7 @@
     <string name="addCardTitle">Neue Kundenkarte</string>
     <string name="scanCardBarcode">Strichcode 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>
+    <string name="noCardsMessage">Fügen Sie zuerst eine Karte hinzu</string>
     <string name="barcodeImageDescription">Bild des Strichcodes</string>
     <string name="noStoreError">Kein Geschäft angegeben</string>
     <string name="noCardIdError">Keine Kartennummer angegeben</string>
@@ -36,24 +38,24 @@
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</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="importSuccessfulTitle">Import erfolgreich</string>
+    <string name="importExportHelp">Durch das Sichern Ihrer Karten können Sie sie auf ein anderes Gerät verschieben.</string>
+    <string name="importSuccessfulTitle">Importiert</string>
     <string name="importFailedTitle">Import fehlgeschlagen</string>
-    <string name="importFailed">Import fehlgeschlagen</string>
-    <string name="exportSuccessfulTitle">Export erfolgreich</string>
+    <string name="importFailed">Karten konnten nicht importiert werden</string>
+    <string name="exportSuccessfulTitle">Exportiert</string>
     <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportFailed">Export fehlgeschlagen</string>
+    <string name="exportFailed">Karten konnten nicht exportiert werden</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="noExternalStoragePermissionError">Erteilen Sie zuerst die Erlaubnis zur externen Speicherung, um Karten zu importieren oder zu exportieren</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 Anwendung 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="importOptionApplicationExplanation">Verwenden Sie eine beliebige Anwendung oder Ihren bevorzugten Dateiverwaltungsprogramm, um eine Datei zu öffnen.</string>
+    <string name="importOptionApplicationButton">Externe Anwendung nutzen</string>
     <string name="about">Über</string>
-    <string name="app_license">Lizensiert unter der GPLv3.</string>
+    <string name="app_license">Freie Software, lizensiert unter der GPLv3+.</string>
     <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informationen zu dieser Version: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -69,19 +71,19 @@
     <string name="storeNameColorDescription">Farbe für den Geschäftsnamen</string>
     <string name="settings">Einstellungen</string>
     <string name="settings_category_title_ui">Benutzeroberfläche</string>
-    <string name="settings_card_title_list_font_size">Schriftgröße des Titels in der Listenansicht</string>
-    <string name="settings_card_note_list_font_size">Schriftgröße der Notiz in der Listenansicht</string>
-    <string name="settings_card_title_font_size">Schriftgröße des Titels</string>
+    <string name="settings_card_title_list_font_size">Schriftgröße des Kartentitels (Listenmodus)</string>
+    <string name="settings_card_note_list_font_size">Schriftgröße der Kartennotiz (Listenmodus)</string>
+    <string name="settings_card_title_font_size">Schriftgröße des Kartentitels (Vorschau)</string>
     <string name="settings_card_id_font_size">Schriftgröße der Kartennummer</string>
-    <string name="settings_card_note_font_size">Schriftgröße der Notiz</string>
+    <string name="settings_card_note_font_size">Schriftgröße der Kartennotiz (Vorschau)</string>
     <string name="settings_display_barcode_max_brightness">Helligkeit bei Strichcode Ansicht erhöhen</string>
     <string name="settings_lock_barcode_orientation">Strichcodeausrichtung sperren</string>
-    <string name="exportSuccessful">Kundenkartendaten erflogreich exportiert</string>
-    <string name="importSuccessful">Kundenkartendaten erflogreich importiert</string>
+    <string name="exportSuccessful">Kartendaten exportiert</string>
+    <string name="importSuccessful">Kartendaten importiert</string>
     <string name="intent_import_card_from_url_share_text">Ich will eine Karte mit Ihnen teilen</string>
     <string name="settings_dark_theme">Dunkel</string>
     <string name="settings_light_theme">Hell</string>
-    <string name="settings_system_theme">Systemvorgabe</string>
+    <string name="settings_system_theme">System</string>
     <string name="settings_theme">Design</string>
     <string name="enterBarcodeInstructions">Geben Sie die Karten-ID ein und wählen Sie das Bild aus, das den Strichcode darstellt, den Sie verwenden möchten, oder wählen Sie „Diese Karte hat keinen Strichcode“, um keinen Strichcode zu verwenden.</string>
     <string name="app_copyright_old">Basiert auf Loyalty Card Keychain, Copyright 2016–2020 Branden Archer.</string>
@@ -95,9 +97,13 @@
     <string name="deleteConfirmationGroup">Bitte bestätigen Sie, dass Sie diese Gruppe löschen möchten</string>
     <string name="all">Alle</string>
     <string name="groupCardCount">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; Karten</string>
-    <string name="noGroups">Sie haben im Moment keine Gruppen. Klicken Sie auf die Schaltfläche + (Plus), um loszulegen.
+    <string name="noGroups">Klicken Sie auf die Schaltfläche + (plus), um zuerst Gruppen hinzuzufügen.
 \n
-\nKarten können Gruppen zugewiesen werden, um sie leichter zu finden.</string>
+\nGruppen machen es einfacher, Dinge zu finden.</string>
     <string name="groups">Gruppen</string>
     <string name="enter_group_name">Geben Sie den Gruppennamen ein</string>
+    <string name="leaveWithoutSaveConfirmation">Sind Sie sicher, dass Sie diesen Bildschirm verlassen wollen\? Vorgenommene Änderungen werden nicht gespeichert.</string>
+    <string name="leaveWithoutSaveTitle">Beenden ohne zu speichern</string>
+    <string name="failedOpeningFileManager">Fehler beim Öffnen eines Dateiverwaltungsprogrammes. Stellen Sie sicher, dass eine installiert ist.</string>
+    <string name="noBarcode">Kein Strichcode</string>
 </resources>

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

@@ -28,7 +28,7 @@
     <string name="cardShortcut">Raccourci de carte</string>
     <string name="noCardsMessage">Ajoutez d\'abord une carte</string>
     <string name="barcodeImageDescription">Image du code-barres</string>
-    <string name="noStoreError">Aucun nom n\'a été saisi</string>
+    <string name="noStoreError">Aucun nom de magasin saisi</string>
     <string name="noCardIdError">Aucun numéro de carte saisi</string>
     <string name="noCardExistsError">Aucune carte trouvée</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
@@ -51,7 +51,7 @@
     <string name="importOptionApplicationExplanation">Utilisez le gestionnaire de fichiers de votre choix pour importer un fichier.</string>
     <string name="importOptionApplicationButton">Utiliser une application externe</string>
     <string name="about">À propos</string>
-    <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+.</string>
+    <string name="app_license">Logiciel libre à copyleft, sous licence GPLv3+.</string>
     <string name="about_title_fmt">À propos de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Notes de version : &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"app_revision_url\"&gt;%s&lt;/xliff:g&gt;</string>
@@ -75,7 +75,7 @@
     <string name="settings_display_barcode_max_brightness">Augmenter la luminosité du code-barres</string>
     <string name="settings_lock_barcode_orientation">Verrouiller l\'orientation du code-barres</string>
     <string name="exportSuccessful">Carte exportée avec succès</string>
-    <string name="importSuccessful">Données importées avec succès</string>
+    <string name="importSuccessful">Carte de fidélité importée</string>
     <string name="intent_import_card_from_url_share_text">Je veux partager une carte avec toi</string>
     <string name="settings_dark_theme">Sombre</string>
     <string name="settings_light_theme">Clair</string>

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

@@ -106,4 +106,6 @@
     <string name="failedOpeningFileManager">Klarte ikke å åpne noen filbehandler. Forsikre deg om at du har installert en.</string>
     <string name="leaveWithoutSaveConfirmation">Er du sikker på at du vil forlate denne skjermen\? Endringer vil ikke bli lagret.</string>
     <string name="leaveWithoutSaveTitle">Forlat uten å lagre</string>
+    <string name="addManually">Skriv inn kort-ID manuelt</string>
+    <string name="addWithCamera">Skann strekkoden med kameraet ditt</string>
 </resources>

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

@@ -15,4 +15,6 @@
     <color name="inputBackground">#000000</color>
     <color name="inputBorder">#222222</color>
     <color name="inputDividerBorder">#666666</color>
+
+    <color name="iconColor">#ffffff</color>
 </resources>

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

@@ -14,4 +14,6 @@
     <color name="inputBackground">#FFFFFF</color>
     <color name="inputBorder">#DDDDDD</color>
     <color name="inputDividerBorder">#AAAAAA</color>
+
+    <color name="iconColor">#000000</color>
 </resources>

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

@@ -134,6 +134,10 @@
     <string name="all">All</string>
     <string name="deleteConfirmationGroup">Please confirm you want to delete this group</string>
     <string name="failedOpeningFileManager">Failed opening a file manager. Please make sure one is installed.</string>
+    <string name="moveUp">Move up in list</string>
+    <string name="moveDown">Move down in list</string>
     <string name="leaveWithoutSaveTitle">Leave without saving</string>
     <string name="leaveWithoutSaveConfirmation">Are you sure you want to leave this screen? Changed made will not be saved.</string>
+    <string name="addWithCamera">Scan the barcode with your camera</string>
+    <string name="addManually">Manually enter card ID</string>
 </resources>

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

@@ -29,5 +29,4 @@
         <item name="android:padding">@dimen/no_data_padding</item>
         <item name="android:textSize">@dimen/no_data_textSize</item>
     </style>
-
 </resources>

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

@@ -202,7 +202,7 @@ public class ImportExportTest
     private void checkGroups()
     {
         Cursor cursor = db.getGroupCursor();
-        int index = 1;
+        int index = db.getGroupCount();
 
         while(cursor.moveToNext())
         {
@@ -212,7 +212,7 @@ public class ImportExportTest
 
             assertEquals(expectedGroupName, group._id);
 
-            index++;
+            index--;
         }
         cursor.close();
     }

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

@@ -7,6 +7,7 @@ import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
@@ -38,6 +39,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowDialog;
 import org.robolectric.shadows.ShadowLog;
 
 @RunWith(RobolectricTestRunner.class)
@@ -145,11 +147,15 @@ public class LoyaltyCardViewActivityTest
      * Initiate and complete a barcode capture, either in success
      * or in failure
      */
-    private void captureBarcodeWithResult(final Activity activity, final int buttonId, final boolean success) throws IOException
+    private void captureBarcodeWithResult(final Activity activity, final boolean success) throws IOException
     {
         // Start image capture
-        final Button captureButton = activity.findViewById(buttonId);
-        captureButton.performClick();
+        final Button startButton = activity.findViewById(R.id.enterButton);
+        startButton.performClick();
+
+        Dialog dialog = ShadowDialog.getLatestDialog();
+        ShadowDialog shadowDialog = shadowOf(dialog);
+        shadowDialog.clickOn(R.id.add_from_camera);
 
         ShadowActivity.IntentForResult intentForResult = shadowOf(activity).peekNextStartedActivityForResult();
         assertNotNull(intentForResult);
@@ -181,11 +187,15 @@ public class LoyaltyCardViewActivityTest
      * Initiate and complete a barcode selection, either in success
      * or in failure
      */
-    private void selectBarcodeWithResult(final Activity activity, final int buttonId, final String barcodeData, final String barcodeType, final boolean success) throws IOException
+    private void selectBarcodeWithResult(final Activity activity, final String barcodeData, final String barcodeType, final boolean success) throws IOException
     {
-        // Start image capture
-        final Button captureButton = activity.findViewById(buttonId);
-        captureButton.performClick();
+        // Start barcode selector
+        final Button startButton = activity.findViewById(R.id.enterButton);
+        startButton.performClick();
+
+        Dialog dialog = ShadowDialog.getLatestDialog();
+        ShadowDialog shadowDialog = shadowOf(dialog);
+        shadowDialog.clickOn(R.id.add_manually);
 
         ShadowActivity.IntentForResult intentForResult = shadowOf(activity).peekNextStartedActivityForResult();
         assertNotNull(intentForResult);
@@ -231,8 +241,6 @@ public class LoyaltyCardViewActivityTest
         }
         else
         {
-            int captureVisibility = (mode == ViewMode.UPDATE_CARD || mode == ViewMode.ADD_CARD) ? View.VISIBLE : View.GONE;
-
             int editVisibility = View.VISIBLE;
 
             checkFieldProperties(activity, R.id.storeNameEdit, editVisibility, store);
@@ -240,7 +248,6 @@ public class LoyaltyCardViewActivityTest
             checkFieldProperties(activity, R.id.cardAndBarcodeLayout, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
             checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId);
             checkFieldProperties(activity, R.id.barcodeTypeField, View.VISIBLE, barcodeType);
-            checkFieldProperties(activity, R.id.captureButton, captureVisibility, null);
             checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
         }
     }
@@ -318,7 +325,7 @@ public class LoyaltyCardViewActivityTest
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
 
         // Complete barcode capture successfully
-        captureBarcodeWithResult(activity, R.id.captureButton, true);
+        captureBarcodeWithResult(activity, true);
 
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", BARCODE_DATA, BARCODE_TYPE);
 
@@ -339,7 +346,7 @@ public class LoyaltyCardViewActivityTest
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
 
         // Complete barcode capture in failure
-        captureBarcodeWithResult(activity, R.id.captureButton, false);
+        captureBarcodeWithResult(activity, false);
 
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
     }
@@ -357,7 +364,7 @@ public class LoyaltyCardViewActivityTest
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
 
         // Complete barcode capture successfully
-        captureBarcodeWithResult(activity, R.id.captureButton, true);
+        captureBarcodeWithResult(activity, true);
 
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", BARCODE_DATA, BARCODE_TYPE);
 
@@ -449,7 +456,7 @@ public class LoyaltyCardViewActivityTest
         checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
 
         // Complete barcode capture successfully
-        captureBarcodeWithResult(activity, R.id.captureButton, true);
+        captureBarcodeWithResult(activity, true);
 
         checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
     }
@@ -470,7 +477,7 @@ public class LoyaltyCardViewActivityTest
         checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
 
         // Complete barcode capture successfully
-        captureBarcodeWithResult(activity, R.id.captureButton, true);
+        captureBarcodeWithResult(activity, true);
 
         checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
 
@@ -620,7 +627,7 @@ public class LoyaltyCardViewActivityTest
         checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
 
         // Complete empty barcode selection successfully
-        selectBarcodeWithResult(activity, R.id.enterButton, BARCODE_DATA, "", true);
+        selectBarcodeWithResult(activity, BARCODE_DATA, "", true);
 
         // Check if the barcode type is NO_BARCODE as expected
         checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, activity.getApplicationContext().getString(R.string.noBarcode));

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

@@ -1,6 +1,7 @@
 package protect.card_locker;
 
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -20,6 +21,8 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.ShadowDialog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -70,16 +73,16 @@ public class MainActivityTest
     }
 
     @Test
-    public void clickAddLaunchesLoyaltyCardEditActivity()
+    public void clickAddLaunchesAddDialog()
     {
         final MainActivity activity = Robolectric.setupActivity(MainActivity.class);
 
         activity.findViewById(R.id.fabAdd).performClick();
 
-        Intent intent = shadowOf(activity).peekNextStartedActivityForResult().intent;
+        Dialog dialog = ShadowDialog.getLatestDialog();
+        ShadowDialog shadowDialog = shadowOf(dialog);
 
-        assertEquals(new ComponentName(activity, LoyaltyCardEditActivity.class), intent.getComponent());
-        assertNull(intent.getExtras());
+        assertEquals("Add Card", shadowDialog.getTitle());
     }
 
     @Test
@@ -190,14 +193,14 @@ public class MainActivityTest
         assertEquals("All", groupTabs.getTabAt(0).getText().toString());
         assertEquals("One", groupTabs.getTabAt(1).getText().toString());
 
-        // Adding another group should have them sorted alphabetically
+        // Adding another group should have it added to the end
         db.insertGroup("Alphabetical two");
         activityController.pause();
         activityController.resume();
         assertEquals(3, groupTabs.getTabCount());
         assertEquals("All", groupTabs.getTabAt(0).getText().toString());
-        assertEquals("Alphabetical two", groupTabs.getTabAt(1).getText().toString());
-        assertEquals("One", groupTabs.getTabAt(2).getText().toString());
+        assertEquals("One", groupTabs.getTabAt(1).getText().toString());
+        assertEquals("Alphabetical two", groupTabs.getTabAt(2).getText().toString());
 
         // Removing a group should also change the list
         db.deleteGroup("Alphabetical two");