Release 1.6.2

Library updates and AndroidX Preferences

.github/workflows/android.yml

@@ -23,5 +23,11 @@ jobs:
       run: ./gradlew lintRelease
     - name: Run unit tests
       run: ./gradlew testReleaseUnitTest
-    - name: FindBugs
-      run: ./gradlew findbugs
+    - name: SpotBugs
+      run: ./gradlew spotbugsRelease
+    - name: Archive test results
+      if: always()
+      uses: actions/upload-artifact@v1
+      with:
+        name: test-results
+        path: app/build/reports

.gitignore

@@ -1,10 +1,9 @@
 *.iml
 .gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+local.properties
+.idea/
 .DS_Store
-/build
-/captures
-/app/release
-/app/debug
+build/
+captures/
+**/release
+**/debug

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v1.6.2 (2021-01-04)
+
+Changes:
+
+- Fix edit button or more info bottom sheet drawing over barcode ID
+
+## v1.6.1 (2020-12-16)
+
+Changes:
+
+- Fix regression causing manual barcode entry to not be saved
+
 ## v1.6.0 (2020-12-15)
 
 Changes:

app/.gitignore

@@ -1 +0,0 @@
-/build

app/build.gradle

@@ -1,77 +1,90 @@
-apply plugin: 'com.android.application'
-apply plugin: 'findbugs'
+import com.github.spotbugs.snom.SpotBugsTask
 
-findbugs {
-    sourceSets = []
+apply plugin: 'com.android.application'
+apply plugin: 'com.github.spotbugs'
+
+spotbugs {
     ignoreFailures = false
+    effort = 'max'
+    excludeFilter = file("./config/spotbugs/exclude.xml")
+    reportsDir = file("$buildDir/reports/spotbugs/")
 }
 
 android {
     compileSdkVersion 29
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "me.hackerchick.catima"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 52
-        versionName "1.6.0"
-        vectorDrawables.useSupportLibrary = true
+        versionCode 54
+        versionName "1.6.2"
+
+        vectorDrawables.useSupportLibrary true
     }
+
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            resValue "string", "app_name", "Catima"
         }
         debug {
             applicationIdSuffix ".debug"
+            resValue "string", "app_name", "Catima Debug"
         }
     }
+
+    compileOptions {
+        encoding "UTF-8"
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     lintOptions {
-        disable "GoogleAppIndexingWarning"
-        disable "ButtonStyle"
-        disable "AlwaysShowAction"
-        disable "MissingTranslation"
-        disable "MissingPrefix"
+        disable "GoogleAppIndexingWarning", "ButtonStyle", "AlwaysShowAction",
+                "MissingTranslation", "MissingPrefix"
     }
 
     // Starting with Android Studio 3 Robolectric is unable to find resources.
     // The following allows it to find the resources.
     testOptions {
         unitTests {
-            includeAndroidResources = true
+            includeAndroidResources true
         }
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+// AndroidX
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.journeyapps:zxing-android-embedded:4.0.2@aar'
-    implementation 'com.google.zxing:core:3.3.0'
-    implementation 'org.apache.commons:commons-csv:1.5'
-    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.vanniktech:vntnumberpickerpreference:1.0.0"
     implementation 'androidx.cardview:cardview:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:4.0.2"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'com.google.android.material:material:1.2.1'
+
+// Third-party
+    implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
+    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'org.apache.commons:commons-csv:1.8'
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
+    implementation 'com.google.guava:guava:30.1-jre'
+    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.1'
+
+// Testing
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.robolectric:robolectric:4.0.2'
 }
 
-task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
+tasks.withType(SpotBugsTask) {
 
-    description 'Run findbugs'
+    description 'Run spotbugs'
     group 'verification'
 
-    classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
-    source = fileTree('src/main/java')
-    classpath = files()
-
-    effort = 'max'
-
-    excludeFilter = file("./config/findbugs/exclude.xml")
+    //classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
+    //source = fileTree('src/main/java')
+    //classpath = files()
 
     reports {
         xml.enabled = false

app/src/androidTest/java/protect/card_locker/ApplicationTest.java

@@ -1,15 +0,0 @@
-package protect.card_locker;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application>
-{
-    public ApplicationTest()
-    {
-        super(Application.class);
-    }
-}

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

@@ -41,7 +41,7 @@ public class AboutActivity extends AppCompatActivity
                 .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")
+                .put("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference")
                 .build();
 
         final Map<String, String> USED_ASSETS = ImmutableMap.of

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

@@ -47,6 +47,8 @@ public class CsvDatabaseImporter implements DatabaseImporter
             default:
                 throw new FormatException(String.format("No code to parse version %s", version));
         }
+
+        bufferedReader.close();
     }
 
     public void parseV1(DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
@@ -131,7 +133,6 @@ public class CsvDatabaseImporter implements DatabaseImporter
         }
     }
 
-
     public void parseV2Groups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
     {
         // Parse groups
@@ -145,10 +146,10 @@ public class CsvDatabaseImporter implements DatabaseImporter
                     throw new InterruptedException();
                 }
             }
-
-            groupParser.close();
         } catch (IllegalArgumentException | IllegalStateException e) {
             throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            groupParser.close();
         }
     }
 
@@ -165,10 +166,10 @@ public class CsvDatabaseImporter implements DatabaseImporter
                     throw new InterruptedException();
                 }
             }
-
-            cardParser.close();
         } catch (IllegalArgumentException | IllegalStateException e) {
             throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            cardParser.close();
         }
     }
 
@@ -185,10 +186,10 @@ public class CsvDatabaseImporter implements DatabaseImporter
                     throw new InterruptedException();
                 }
             }
-
-            cardGroupParser.close();
         } catch (IllegalArgumentException | IllegalStateException e) {
             throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            cardGroupParser.close();
         }
     }
 

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

@@ -215,6 +215,7 @@ public class DBHelper extends SQLiteOpenHelper
         List<Group> groups = new ArrayList<>();
 
         if (!data.moveToFirst()) {
+            data.close();
             return groups;
         }
 
@@ -224,6 +225,8 @@ public class DBHelper extends SQLiteOpenHelper
             groups.add(Group.toGroup(data));
         }
 
+        data.close();
+
         return groups;
     }
 
@@ -395,6 +398,7 @@ public class DBHelper extends SQLiteOpenHelper
         List<Group> groups = new ArrayList<>();
 
         if (!data.moveToFirst()) {
+            data.close();
             return groups;
         }
 
@@ -404,6 +408,8 @@ public class DBHelper extends SQLiteOpenHelper
             groups.add(Group.toGroup(data));
         }
 
+        data.close();
+
         return groups;
     }
 

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

@@ -446,7 +446,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                     // Nothing to do, no change made
                 }
             });
-            dialog.show(getFragmentManager(), "color-picker-dialog");
+            dialog.show(getSupportFragmentManager(), "color-picker-dialog");
         }
     }
 

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

@@ -73,6 +73,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     private Drawable getIcon(int icon, boolean dark)
     {
         Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
+        assert unwrappedIcon != null;
         Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
         if(dark)
         {
@@ -123,7 +124,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         barcodeImage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if(barcodeIsFullscreen)
+                if (barcodeIsFullscreen)
                 {
                     setFullscreen(false);
                 }

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

@@ -120,13 +120,13 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         Object group = null;
 
         if (groupsTabLayout.getTabCount() != 0) {
-            TabLayout.Tab tab = groupsTabLayout.getTabAt(0);
-
-            if (selectedTab < groupsTabLayout.getTabCount()) {
-                tab = groupsTabLayout.getTabAt(selectedTab);
+            TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
+            if (tab == null) {
+                tab = groupsTabLayout.getTabAt(0);
             }
 
             groupsTabLayout.selectTab(tab);
+            assert tab != null;
             group = tab.getTag();
         }
         updateLoyaltyCardList(filter, group);
@@ -361,8 +361,13 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
                     filter = newText;
 
                     TabLayout groupsTabLayout = findViewById(R.id.groups);
+                    TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
+
+                    updateLoyaltyCardList(
+                        newText,
+                        currentTab != null ? currentTab.getTag() : null
+                    );
 
-                    updateLoyaltyCardList(newText, groupsTabLayout.getTabCount() > 0 ? groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition()).getTag() : null);
                     return true;
                 }
             });

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

@@ -31,32 +31,23 @@ public class MultiFormatImporter
                 break;
         }
 
-        if(importer != null)
+        if (importer != null)
         {
             try
             {
                 importer.importData(db, input);
                 return true;
             }
-            catch(IOException e)
+            catch(IOException | FormatException | InterruptedException e)
             {
-                Log.e(TAG, "Failed to input data", e);
-            }
-            catch(FormatException e)
-            {
-                Log.e(TAG, "Failed to input data", e);
-            }
-            catch(InterruptedException e)
-            {
-                Log.e(TAG, "Failed to input data", e);
+                Log.e(TAG, "Failed to import data", e);
             }
 
-            return false;
         }
         else
         {
             Log.e(TAG, "Unsupported data format imported: " + format.name());
-            return false;
         }
+        return false;
     }
 }

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

@@ -127,6 +127,24 @@ public class ScanActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent intent)
+    {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
+
+        if (!barcodeValues.isEmpty()) {
+            Intent manualResult = new Intent();
+            Bundle manualResultBundle = new Bundle();
+            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
+            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
+            manualResult.putExtras(manualResultBundle);
+            ScanActivity.this.setResult(RESULT_OK, manualResult);
+            finish();
+        }
+    }
+
     public void addManually(View view) {
         Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
         if (cardId != null) {

app/src/main/java/protect/card_locker/preferences/Settings.java

@@ -2,7 +2,7 @@ package protect.card_locker.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;

app/src/main/java/protect/card_locker/preferences/SettingsActivity.java

@@ -1,13 +1,17 @@
 package protect.card_locker.preferences;
 
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import android.view.MenuItem;
 
+import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
+import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.R;
 
 public class SettingsActivity extends AppCompatActivity
@@ -20,11 +24,11 @@ public class SettingsActivity extends AppCompatActivity
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
         {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
         // Display the fragment as the main content.
-        getFragmentManager().beginTransaction()
+        getSupportFragmentManager().beginTransaction()
                 .replace(android.R.id.content, new SettingsFragment())
                 .commit();
     }
@@ -43,17 +47,18 @@ public class SettingsActivity extends AppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
-    public static class SettingsFragment extends PreferenceFragment
+    public static class SettingsFragment extends PreferenceFragmentCompat
     {
+        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
         @Override
-        public void onCreate(final Bundle savedInstanceState)
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey)
         {
-            super.onCreate(savedInstanceState);
-
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences);
 
-            findPreference(getResources().getString(R.string.settings_key_theme)).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+            Preference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
+            assert themePreference != null;
+            themePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
             {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object o)
@@ -71,11 +76,36 @@ public class SettingsActivity extends AppCompatActivity
                         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
                     }
 
-                    getActivity().recreate();
+                    FragmentActivity activity = getActivity();
+                    if (activity != null) {
+                        activity.recreate();
+                    }
                     return true;
                 }
             });
         }
+
+        @Override
+        public void onDisplayPreferenceDialog(Preference preference)
+        {
+            if (preference instanceof NumberDialogPreference)
+            {
+                NumberDialogPreference dialogPreference = (NumberDialogPreference) preference;
+                DialogFragment dialogFragment = NumberPickerPreferenceDialogFragment
+                        .newInstance(
+                                dialogPreference.getKey(),
+                                dialogPreference.getMinValue(),
+                                dialogPreference.getMaxValue(),
+                                dialogPreference.getUnitText()
+                        );
+                dialogFragment.setTargetFragment(this, 0);
+                dialogFragment.show(getParentFragmentManager(), DIALOG_FRAGMENT_TAG);
+            }
+            else
+            {
+                super.onDisplayPreferenceDialog(preference);
+            }
+        }
     }
 }
 

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

@@ -58,6 +58,7 @@
                 android:layout_height="0dp"
                 android:layout_marginLeft="10.0dip"
                 android:layout_marginRight="10.0dip"
+                android:layout_marginBottom="80dp"
                 app:layout_constraintTop_toBottomOf="@+id/barcode"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -102,4 +102,5 @@
         <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> Karte</item>
         <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> Karten</item>
     </plurals>
-</resources>
+    <string name="groupsList">Gruppen: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+</resources>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_add">Añadir</string>
-    <string name="noGiftCards">Actualmente no tiene ninguna tarjeta guardada. Pulse el botón «+» para comenzar.
+    <string name="noGiftCards">Pulse el botón «+» para añadir una nueva tarjeta.
 \n
-\nCatima le permite llevar sus tarjetas en el teléfono para que estén siempre a su alcance.</string>
+\nCatima guarda sus tarjetas en el dispositivo, para que estén siempre a su alcance.</string>
     <string name="storeName">Tienda</string>
     <string name="note">Nota</string>
     <string name="cardId">Id. de tarjeta</string>
@@ -16,7 +16,7 @@
     <string name="lockScreen">Bloquear rotación</string>
     <string name="unlockScreen">Desbloquear rotación</string>
     <string name="deleteTitle">Eliminar tarjeta</string>
-    <string name="deleteConfirmation">Confirme que quiere eliminar esta tarjeta.</string>
+    <string name="deleteConfirmation">Por favor, confirme que quiere eliminar esta tarjeta.</string>
     <string name="ok">Aceptar</string>
     <string name="copy_to_clipboard">Copiar id. en portapapeles</string>
     <string name="sendLabel">Enviar…</string>
@@ -24,47 +24,47 @@
     <string name="addCardTitle">Añadir tarjeta</string>
     <string name="scanCardBarcode">Escanear código de barras de la tarjeta</string>
     <string name="cardShortcut">Atajo de tarjeta</string>
-    <string name="noCardsMessage">No hay ninguna tarjeta; añada una primero</string>
+    <string name="noCardsMessage">Añada una tarjeta primero</string>
     <string name="barcodeImageDescription">Imagen del código de barras de la tarjeta</string>
     <string name="noStoreError">Establecimiento no especificado</string>
     <string name="noCardIdError">Id. de tarjeta no especificado</string>
-    <string name="noCardExistsError">No se ha podido encontrar la tarjeta de fidelización</string>
+    <string name="noCardExistsError">No se ha podido encontrar la tarjeta</string>
     <string name="importExport">Importar/exportar</string>
     <string name="exportName">Exportar</string>
     <string name="importExportHelp">La copia de respaldo le permite transferir sus tarjetas a otro dispositivo.</string>
-    <string name="importSuccessfulTitle">Datos importados correctamente</string>
+    <string name="importSuccessfulTitle">Importado</string>
     <string name="importFailedTitle">Falló la importación</string>
-    <string name="importFailed">No se pudo importar</string>
-    <string name="exportSuccessfulTitle">Datos exportados correctamente</string>
+    <string name="importFailed">No se han podido importar tarjetas</string>
+    <string name="exportSuccessfulTitle">Exportado</string>
     <string name="exportFailedTitle">Falló la exportación</string>
-    <string name="exportFailed">No se pudo exportar</string>
+    <string name="exportFailed">No se han podido exportar las tarjetas</string>
     <string name="importing">Importando…</string>
     <string name="exporting">Exportando…</string>
-    <string name="noExternalStoragePermissionError">No se pueden importar o exportar tarjetas sin el permiso de almacenamiento</string>
+    <string name="noExternalStoragePermissionError">Otorgar permiso de almacenamiento para importar o exportar tarjetas</string>
     <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
     <string name="importOptionFilesystemExplanation">Elegir un archivo concreto del sistema de archivos.</string>
     <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
     <string name="importOptionApplicationTitle">Utilizar aplicación externa</string>
-    <string name="importOptionApplicationExplanation">Use una aplicación externa como Dropbox, Google Drive o tu gestor de archivos favoritos para abrir un archivo.</string>
+    <string name="importOptionApplicationExplanation">Use una aplicación o su gestor de archivos favoritos para abrir un archivo.</string>
     <string name="importOptionApplicationButton">Utilizar aplicación externa</string>
     <string name="about">Acerca de</string>
-    <string name="app_license">Disponible en virtud de la GPLv3.</string>
+    <string name="app_license">Software libre con copyleft, disponible bajo la licencia GPLv3+.</string>
     <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
     <string name="settings">Configuración</string>
     <string name="settings_category_title_ui">Interfaz de usuario</string>
-    <string name="settings_card_title_list_font_size">Tamaño de la letra para el título (lista)</string>
-    <string name="settings_card_note_list_font_size">Tamaño de la letra para notas (lista)</string>
-    <string name="settings_card_title_font_size">Tamaño de la letra para el título</string>
+    <string name="settings_card_title_list_font_size">Tamaño de fuente del título de la tarjeta (modo lista)</string>
+    <string name="settings_card_note_list_font_size">Tamaño de fuente de las notas de la tarjeta (modo lista)</string>
+    <string name="settings_card_title_font_size">Tamaño de fuente del título de la tarjeta (vista previa)</string>
     <string name="settings_card_id_font_size">Tamaño de la letra para el ID de la tarjeta</string>
-    <string name="settings_display_barcode_max_brightness">Iluminar vista de código de barras</string>
-    <string name="exportSuccessful">Se exportaron correctamente los datos de tarjetas de fidelización</string>
-    <string name="importSuccessful">Se importaron correctamente los datos de tarjetas de fidelización</string>
+    <string name="settings_display_barcode_max_brightness">Iluminar vista del código de barras</string>
+    <string name="exportSuccessful">Datos de las tarjetas exportados</string>
+    <string name="importSuccessful">Datos de las tarjetas importados</string>
     <string name="intent_import_card_from_url_share_text">Quiero compartirle una tarjeta</string>
-    <string name="settings_lock_barcode_orientation">Bloquear orientación de código de barras</string>
-    <string name="settings_dark_theme">Tema oscuro</string>
-    <string name="settings_light_theme">Tema claro</string>
-    <string name="settings_system_theme">Tema del sistema</string>
+    <string name="settings_lock_barcode_orientation">Bloquear orientación del código de barras</string>
+    <string name="settings_dark_theme">Oscuro</string>
+    <string name="settings_light_theme">Claro</string>
+    <string name="settings_system_theme">Sistema</string>
     <string name="settings_theme">Tema</string>
     <string name="enterBarcodeInstructions">Introduzca el identificador de tarjeta y seleccione la imagen que represente el código de barras que se utilizará, o bien, elija «Esta tarjeta no tiene código de barras» para no utilizar ninguno.</string>
     <string name="app_copyright_old">Basado en Loyalty Card Keychain, derechos de autor 2016–2020 de Branden Archer.</string>
@@ -73,6 +73,34 @@
     <string name="share">Compartir</string>
     <string name="barcodeNoBarcode">Esta tarjeta no tiene código de barras</string>
     <string name="barcodeType">Tipo de código de barras</string>
-    <string name="noMatchingGiftCards">Ninguna tarjeta coincide con el filtro de búsqueda. Pruebe con términos distintos.</string>
+    <string name="noMatchingGiftCards">No se ha encontrado nada. Pruebe a modificar su búsqueda.</string>
     <string name="action_search">Buscar</string>
-</resources>
+    <string name="app_libraries"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> usa las siguientes librerías de terceros: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">Información de la revisión: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url">%s</xliff:g></string>
+    <string name="noGroups">Pulse el botón «+» para añadir grupos.
+\n
+\nLos grupos permiten encontrar cosas fácilmente.</string>
+    <string name="starImage">Favorito</string>
+    <string name="thumbnailDescription">Miniatura de la tarjeta</string>
+    <string name="copy_to_clipboard_toast">Id. de la tarjeta copiado al portapapeles</string>
+    <string name="selectBarcodeTitle">Seleccionar el código de barras</string>
+    <string name="app_resources"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> usa los siguientes recursos de terceros: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_resources_list">%s</xliff:g></string>
+    <string name="unstar">Eliminar de favoritos</string>
+    <string name="noBarcode">Sin código de barras</string>
+    <string name="enter_group_name">Introducir nombre del grupo</string>
+    <string name="groups">Grupos</string>
+    <string name="groupsList">Grupos: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="addManually">Introducir el id. de la tarjeta manualmente</string>
+    <string name="leaveWithoutSaveConfirmation">¿Está seguro de querer abandonar esta página\? Los cambios no se guardarán.</string>
+    <string name="leaveWithoutSaveTitle">Salir sin guardar</string>
+    <string name="moveDown">Bajar en la lista</string>
+    <string name="moveUp">Subir en la lista</string>
+    <string name="failedOpeningFileManager">Fallo al abrir el gestor de archivos. Por favor, asegúrese de que haya uno instalado.</string>
+    <string name="deleteConfirmationGroup">Por favor, confirme que desea eliminar este grupo</string>
+    <string name="all">Todo</string>
+    <string name="star">Añadir a favoritos</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> tarjeta</item>
+        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> tarjetas</item>
+    </plurals>
+</resources>

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

@@ -102,4 +102,5 @@
         <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carte</item>
         <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> cartes</item>
     </plurals>
-</resources>
+    <string name="groupsList">Groupes : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+</resources>

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

@@ -2,8 +2,10 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_search">Cerca</string>
     <string name="action_add">Aggiungi</string>
-    <string name="noGiftCards">Non hai ancora alcuna carta fedeltà. Premi sul bottone +(più) in alto per incominciare.\n\nL\'app ti permette di portare con te le tue carte fedeltà, così da averle sempre a disposizione.</string>
-    <string name="noMatchingGiftCards">Nessuna carta fedeltà corrisponde al filtro. Riprovare con altri valori.</string>
+    <string name="noGiftCards">Fai clic sul pulsante + (più) per aggiungere prima una carta.
+\n
+\nCatima trasporta le tue carte sul dispositivo, quindi sono sempre a portata di mano.</string>
+    <string name="noMatchingGiftCards">Non ho trovato niente. Prova a cambiare la tua ricerca.</string>
     <string name="storeName">Negozio</string>
     <string name="note">Note</string>
     <string name="cardId">Codice</string>
@@ -17,44 +19,44 @@
     <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="deleteConfirmation">Conferma di voler eliminare questa carta.</string>
     <string name="ok">Ok</string>
     <string name="copy_to_clipboard">Copia ID negli appunti</string>
     <string name="share">Condividi</string>
     <string name="sendLabel">Invia…</string>
     <string name="editCardTitle">Modifica carta</string>
     <string name="addCardTitle">Aggiungi carta</string>
-    <string name="scanCardBarcode">Scansiona codice carta</string>
+    <string name="scanCardBarcode">Scansiona il codice carta</string>
     <string name="cardShortcut">Scorciatoia per la carta</string>
-    <string name="noCardsMessage">Non ci sono carte. Aggiungine prima una</string>
-    <string name="barcodeImageDescription">Immagine del codice a barre della carta</string>
+    <string name="noCardsMessage">Aggiungi prima una carta</string>
+    <string name="barcodeImageDescription">Immagine del codice della carta</string>
     <string name="noStoreError">Nessun negozio inserito</string>
     <string name="noCardIdError">Nessun codice carta inserito</string>
     <string name="noCardExistsError">Impossibile trovare la carta</string>
     <string name="failedParsingImportUriError">Impossibile analizzare l\'URI</string>
     <string name="importExport">Importa/Esporta</string>
     <string name="exportName">Esporta</string>
-    <string name="importExportHelp">Fare il backup dei dati ti permette di spostare le tue carte da un dispositivo ad un altro.</string>
-    <string name="importSuccessfulTitle">Importazione avvenuta con successo</string>
+    <string name="importExportHelp">Il backup delle carte ti consente di spostarle su un altro dispositivo.</string>
+    <string name="importSuccessfulTitle">Importato</string>
     <string name="importFailedTitle">Importazione fallita</string>
-    <string name="importFailed">Impossibile importare</string>
-    <string name="exportSuccessfulTitle">Esportazione avvenuta con successo</string>
+    <string name="importFailed">Impossibile importare le carte</string>
+    <string name="exportSuccessfulTitle">Esportato</string>
     <string name="exportFailedTitle">Esportazione fallita</string>
-    <string name="exportFailed">Impossibile esportare</string>
+    <string name="exportFailed">Impossibile esportare le carte</string>
     <string name="importing">Importazione in corso…</string>
     <string name="exporting">Esportazione in corso…</string>
-    <string name="noExternalStoragePermissionError">Impossibile importare o esportare i dati senza il permesso per l\'uso della memoria esterna</string>
+    <string name="noExternalStoragePermissionError">Concedi l\'autorizzazione all\'archiviazione esterna per importare o esportare prima le carte</string>
     <string name="importOptionFilesystemTitle">Importa dal file system</string>
     <string name="importOptionFilesystemExplanation">Scegli un file dal file system.</string>
     <string name="importOptionFilesystemButton">Dal file system</string>
     <string name="importOptionApplicationTitle">Usa un\'applicazione esterna</string>
-    <string name="importOptionApplicationExplanation">Usa un\'applicazione esterna come Dropbox, Google Drive o il tuo file manager preferito per aprire il file.</string>
+    <string name="importOptionApplicationExplanation">Usa qualsiasi app o il tuo gestore di file preferito per aprire un file.</string>
     <string name="importOptionApplicationButton">Usa un\'applicazione esterna</string>
     <string name="about">Informazioni</string>
-    <string name="app_license">Pubblicato sotto licenza GPLv3.</string>
+    <string name="app_license">Software libero con copyleft, licenza GPLv3+.</string>
     <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informazione sulla versione: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informazioni sulla revisione: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url"> %s </xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> usa le seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> usa le seguenti risorse di terze parti: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Seleziona codice a barre</string>
@@ -64,18 +66,18 @@
     <string name="settings">Impostazioni</string>
     <string name="settings_category_title_ui">Interfaccia utente</string>
     <string name="settings_theme">Tema</string>
-    <string name="settings_system_theme">Tema del sistema</string>
-    <string name="settings_light_theme">Tema chiaro</string>
-    <string name="settings_dark_theme">Tema scuro</string>
-    <string name="settings_card_title_list_font_size">Dimensione testo del titolo carta (in lista carte)</string>
-    <string name="settings_card_note_list_font_size">Dimensione testo delle note carta (in lista carte)</string>
-    <string name="settings_card_title_font_size">Dimensione testo del titolo carta</string>
+    <string name="settings_system_theme">Sistema</string>
+    <string name="settings_light_theme">Chiaro</string>
+    <string name="settings_dark_theme">Scuro</string>
+    <string name="settings_card_title_list_font_size">Dimensione caratteri del titolo della carta (modalità elenco)</string>
+    <string name="settings_card_note_list_font_size">Dimensione caratteri nota della carta (modalità elenco)</string>
+    <string name="settings_card_title_font_size">Dimensione caratteri del titolo della carta (anteprima)</string>
     <string name="settings_card_id_font_size">Dimensione testo dell\'ID carta</string>
     <string name="settings_display_barcode_max_brightness">Aumenta luminosità dello schermo quando apro un codice a barre</string>
     <string name="settings_lock_barcode_orientation">Blocca orientamento del codice a barre</string>
     <string name="intent_import_card_from_url_share_text">Voglio condividere una carta fedeltà con te</string>
-    <string name="exportSuccessful">Dati della carta fedeltà esportati correttamente</string>
-    <string name="importSuccessful">Dati della carta fedeltà importati correttamente</string>
+    <string name="exportSuccessful">Dati della carta importati</string>
+    <string name="importSuccessful">Dati della carta importati</string>
     <string name="app_copyright_old">Basato su Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
     <string name="exportOptionExplanation">I dati verranno scritti in una posizione a tua scelta.</string>
     <string name="barcodeType">Tipo di codice a barre</string>
@@ -84,9 +86,21 @@
     <string name="starImage">Stella preferita</string>
     <string name="deleteConfirmationGroup">Conferma di voler eliminare questo gruppo</string>
     <string name="all">Tutti</string>
-    <string name="noGroups">Al momento non hai gruppi. Fai clic sul pulsante + (più) per iniziare.
+    <string name="noGroups">Fai clic sul pulsante + (più) per aggiungere prima i gruppi.
 \n
-\nLe carte possono essere assegnate a gruppi per renderle più facili da trovare.</string>
+\nI gruppi rendono le cose più facili da trovare.</string>
     <string name="groups">Gruppi</string>
     <string name="enter_group_name">Inserisci il nome del gruppo</string>
+    <string name="groupsList">Gruppi: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="addManually">Inserisci manualmente l\'ID della carta</string>
+    <string name="leaveWithoutSaveConfirmation">Sei sicuro/a di voler uscire da questa schermata\? Le modifiche apportate non verranno salvate.</string>
+    <string name="leaveWithoutSaveTitle">Esci senza salvare</string>
+    <string name="moveDown">Sposta in basso nell\'elenco</string>
+    <string name="moveUp">Sposta in alto nell\'elenco</string>
+    <string name="failedOpeningFileManager">Apertura di un gestore di file non riuscita. Assicurati che ne sia installato uno.</string>
+    <string name="noBarcode">Nessun codice a barre</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carta</item>
+        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carte</item>
+    </plurals>
 </resources>

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="addManually">직접 카드 ID 입력</string>
+    <string name="groupsList">그룹: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="all">모두</string>
+    <string name="groups">그룹</string>
+    <string name="enter_group_name">그룹 이름 입력</string>
+    <string name="settings_lock_barcode_orientation">바코드 회전 잠금</string>
+    <string name="settings_card_id_font_size">카드 ID 글꼴 크기</string>
+    <string name="settings_card_title_font_size">카드 제목 글꼴 크기 (미리 보기)</string>
+    <string name="settings_card_note_list_font_size">카드 노트 글꼴 크기 (목록 모드)</string>
+    <string name="settings_card_title_list_font_size">카드 제목 글꼴 크기 (목록 모드)</string>
+    <string name="settings_dark_theme">어두움</string>
+    <string name="settings_light_theme">밝음</string>
+    <string name="debug_version_fmt">버전: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="version">%s</xliff:g></string>
+    <string name="about_title_fmt"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> 정보</string>
+    <string name="settings_system_theme">시스템</string>
+    <string name="settings_theme">테마</string>
+    <string name="settings_category_title_ui">사용자 인터페이스</string>
+    <string name="settings">설정</string>
+    <string name="enterBarcodeInstructions">카드 ID를 입력하고 카드에서 사용하는 바코드 이미지를 선택하세요. 바코드를 사용하지 않는 경우 \"이 카드는 바코드가 없음\"을 선택하세요.</string>
+    <string name="app_resources"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> 앱은 다음 서드 파티 리소스를 사용합니다: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> 앱은 다음 서드 파티 라이브러리를 사용합니다: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">리비전 정보: &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"app_revision_url\"&gt;%s&lt;/xliff:g&gt;</string>
+    <string name="selectBarcodeTitle">바코드 선택</string>
+    <string name="about">정보</string>
+    <string name="exporting">내보내는 중…</string>
+    <string name="importing">가져오는 중…</string>
+    <string name="importExportHelp">카드를 백업하면 다른 장치로 옮길 수 있습니다.</string>
+    <string name="exportName">내보내기</string>
+    <string name="importExport">가져오기/내보내기</string>
+    <string name="cardShortcut">카드 바로 가기</string>
+    <string name="scanCardBarcode">카드 바코드 스캔</string>
+    <string name="addCardTitle">카드 추가</string>
+    <string name="editCardTitle">카드 편집</string>
+    <string name="sendLabel">보내기…</string>
+    <string name="share">공유</string>
+    <string name="copy_to_clipboard">ID를 클립보드에 복사</string>
+    <string name="ok">확인</string>
+    <string name="deleteConfirmation">정말 이 카드를 삭제하시겠습니까\?</string>
+    <string name="deleteTitle">카드 제거</string>
+    <string name="unlockScreen">회전 잠금 해제</string>
+    <string name="lockScreen">회전 잠금</string>
+    <string name="confirm">확인</string>
+    <string name="delete">삭제</string>
+    <string name="edit">편집</string>
+    <string name="editCard">카드 편집</string>
+    <string name="save">저장</string>
+    <string name="cancel">취소</string>
+    <string name="unstar">즐겨찾기에서 제거</string>
+    <string name="star">즐겨찾기에 추가</string>
+    <string name="noBarcode">바코드 없음</string>
+    <string name="barcodeNoBarcode">이 카드는 바코드가 없음</string>
+    <string name="barcodeType">바코드 형식</string>
+    <string name="cardId">카드 ID</string>
+    <string name="note">노트</string>
+    <string name="noMatchingGiftCards">아무것도 찾지 못했습니다. 검색어를 바꿔 보세요.</string>
+    <string name="noGiftCards">먼저 \'+\' 버튼을 눌러 카드를 추가하세요.
+\n
+\nCatima는 카드를 장치에 보관하므로 어디서든 사용할 수 있습니다.</string>
+    <string name="action_add">추가</string>
+    <string name="action_search">검색</string>
+</resources>

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

@@ -2,7 +2,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <string name="app_name" translatable="false">Catima</string>
     <string name="action_search">Search</string>
     <string name="action_add">Add</string>
 

app/src/main/res/xml/preferences.xml

@@ -4,52 +4,60 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
-        android:title="@string/settings_category_title_ui">
+        android:title="@string/settings_category_title_ui"
+        app:iconSpaceReserved="false">
 
         <ListPreference
             android:key="@string/settings_key_theme"
             android:title="@string/settings_theme"
             android:defaultValue="@string/settings_key_system_theme"
             android:entries="@array/theme_value_strings"
-            android:entryValues="@array/theme_values"/>
+            android:entryValues="@array/theme_values"
+            app:iconSpaceReserved="false" />
 
-        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
+        <nl.invissvenska.numberpickerpreference.NumberDialogPreference
             android:key="@string/settings_key_card_title_list_font_size"
             android:title="@string/settings_card_title_list_font_size"
-            android:defaultValue="@integer/settings_card_title_list_font_size_sp"
-            app:vnt_maxValue="@integer/settings_card_title_list_max_font_size_sp"
-            app:vnt_minValue="@integer/settings_card_title_list_min_font_size_sp" />
+            app:defaultValue="@integer/settings_card_title_list_font_size_sp"
+            app:numberPickerPreference_maxValue="@integer/settings_card_title_list_max_font_size_sp"
+            app:numberPickerPreference_minValue="@integer/settings_card_title_list_min_font_size_sp"
+            app:iconSpaceReserved="false" />
 
-        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
+        <nl.invissvenska.numberpickerpreference.NumberDialogPreference
             android:key="@string/settings_key_card_note_list_font_size"
             android:title="@string/settings_card_note_list_font_size"
-            android:defaultValue="@integer/settings_card_note_list_font_size_sp"
-            app:vnt_maxValue="@integer/settings_card_note_list_max_font_size_sp"
-            app:vnt_minValue="@integer/settings_card_note_list_min_font_size_sp" />
+            app:defaultValue="@integer/settings_card_note_list_font_size_sp"
+            app:numberPickerPreference_maxValue="@integer/settings_card_note_list_max_font_size_sp"
+            app:numberPickerPreference_minValue="@integer/settings_card_note_list_min_font_size_sp"
+            app:iconSpaceReserved="false" />
 
-        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
+        <nl.invissvenska.numberpickerpreference.NumberDialogPreference
             android:key="@string/settings_key_card_title_font_size"
             android:title="@string/settings_card_title_font_size"
-            android:defaultValue="@integer/settings_card_title_font_size_sp"
-            app:vnt_maxValue="@integer/settings_card_title_max_font_size_sp"
-            app:vnt_minValue="@integer/settings_card_title_min_font_size_sp"/>
+            app:defaultValue="@integer/settings_card_title_font_size_sp"
+            app:numberPickerPreference_maxValue="@integer/settings_card_title_max_font_size_sp"
+            app:numberPickerPreference_minValue="@integer/settings_card_title_min_font_size_sp"
+            app:iconSpaceReserved="false" />
 
-        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
+        <nl.invissvenska.numberpickerpreference.NumberDialogPreference
             android:key="@string/settings_key_card_id_font_size"
             android:title="@string/settings_card_id_font_size"
-            android:defaultValue="@integer/settings_card_id_font_size_sp"
-            app:vnt_maxValue="@integer/settings_card_id_max_font_size_sp"
-            app:vnt_minValue="@integer/settings_card_id_min_font_size_sp" />
+            app:defaultValue="@integer/settings_card_id_font_size_sp"
+            app:numberPickerPreference_maxValue="@integer/settings_card_id_max_font_size_sp"
+            app:numberPickerPreference_minValue="@integer/settings_card_id_min_font_size_sp"
+            app:iconSpaceReserved="false" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="@string/settings_key_display_barcode_max_brightness"
-            android:title="@string/settings_display_barcode_max_brightness"/>
+            android:title="@string/settings_display_barcode_max_brightness"
+            app:iconSpaceReserved="false" />
 
-        <CheckBoxPreference
+        <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/settings_key_lock_barcode_orientation"
-            android:title="@string/settings_lock_barcode_orientation"/>
+            android:title="@string/settings_lock_barcode_orientation"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 
 </PreferenceScreen>

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

@@ -170,6 +170,8 @@ public class DatabaseTest
         }
 
         assertTrue(cursor.isAfterLast());
+
+        cursor.close();
     }
 
     @Test
@@ -227,6 +229,8 @@ public class DatabaseTest
         }
 
         assertTrue(cursor.isAfterLast());
+
+        cursor.close();
     }
 
     private void setupDatabaseVersion1(SQLiteDatabase database)

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

@@ -224,6 +224,8 @@ public class ImportExportTest
     {
         SQLiteDatabase database = db.getWritableDatabase();
         database.execSQL("delete from " + DBHelper.LoyaltyCardDbIds.TABLE);
+        database.execSQL("delete from " + DBHelper.LoyaltyCardDbGroups.TABLE);
+        database.execSQL("delete from " + DBHelper.LoyaltyCardDbIdsGroups.TABLE);
         database.close();
 
         assertEquals(0, db.getLoyaltyCardCount());
@@ -454,6 +456,8 @@ public class ImportExportTest
             assertEquals(false, result);
 
             assertEquals(0, db.getLoyaltyCardCount());
+
+            clearDatabase();
         }
     }
 
@@ -549,6 +553,8 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertNull(card.headerColor);
+
+        clearDatabase();
     }
 
     @Test
@@ -582,6 +588,8 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertNull(card.headerColor);
+
+        clearDatabase();
     }
 
     @Test
@@ -606,6 +614,8 @@ public class ImportExportTest
         boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
         assertEquals(false, result);
         assertEquals(0, db.getLoyaltyCardCount());
+
+        clearDatabase();
     }
 
     @Test
@@ -639,6 +649,8 @@ public class ImportExportTest
         assertEquals("", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertEquals(1, (long) card.headerColor);
+
+        clearDatabase();
     }
 
     @Test
@@ -672,10 +684,10 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(1, card.starStatus);
         assertEquals(1, (long) card.headerColor);
+
+        clearDatabase();
     }
 
-
-
     @Test
     public void importWithNoStarredFieldV1() throws IOException
     {
@@ -707,6 +719,8 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertEquals(1, (long) card.headerColor);
+
+        clearDatabase();
     }
 
     @Test
@@ -760,5 +774,7 @@ public class ImportExportTest
         assertEquals("type", card.barcodeType);
         assertEquals(0, card.starStatus);
         assertEquals(1, (long) card.headerColor);
+
+        clearDatabase();
     }
 }

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

@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Color;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -93,6 +93,8 @@ public class LoyaltyCardCursorAdapterTest
         View view = createView(cursor);
 
         checkView(view, card.store, card.note, false);
+
+        cursor.close();
     }
 
     @Test
@@ -107,6 +109,8 @@ public class LoyaltyCardCursorAdapterTest
         View view = createView(cursor);
 
         checkView(view, card.store, card.note, false);
+
+        cursor.close();
     }
 
     @Test
@@ -125,6 +129,8 @@ public class LoyaltyCardCursorAdapterTest
         setFontSizes(30, 31);
         view = createView(cursor);
         checkView(view, card.store, card.note, true);
+
+        cursor.close();
     }
 
     @Test
@@ -134,7 +140,6 @@ public class LoyaltyCardCursorAdapterTest
         db.insertLoyaltyCard("storeB", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
         db.insertLoyaltyCard("storeC", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
 
-
         Cursor cursor = db.getLoyaltyCardCursor();
         cursor.moveToFirst();
         View view = createView(cursor);
@@ -150,5 +155,7 @@ public class LoyaltyCardCursorAdapterTest
         view = createView(cursor);
         star = view.findViewById(R.id.star);
         assertEquals(View.GONE, star.getVisibility());
+
+        cursor.close();
     }
 }

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

@@ -17,7 +17,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -139,6 +139,8 @@ public class LoyaltyCardViewActivityTest
         }
         assertNotNull(card.headerColor);
         assertNotNull(card.headerTextColor);
+
+        db.close();
     }
 
     /**
@@ -287,6 +289,8 @@ public class LoyaltyCardViewActivityTest
         noteField.setText("note");
         activity.findViewById(R.id.fabSave).performClick();
         assertEquals(0, db.getLoyaltyCardCount());
+
+        db.close();
     }
 
     @Test
@@ -416,6 +420,8 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
+
+        db.close();
     }
 
     @Test
@@ -432,6 +438,8 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
+
+        db.close();
     }
 
     @Test
@@ -453,6 +461,8 @@ public class LoyaltyCardViewActivityTest
         captureBarcodeWithResult(activity, true);
 
         checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
+
+        db.close();
     }
 
     @Test
@@ -488,6 +498,8 @@ public class LoyaltyCardViewActivityTest
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(false, activity.hasChanged);
         assertEquals(true, activity.isFinishing());
+
+        db.close();
     }
 
     @Test
@@ -512,6 +524,8 @@ public class LoyaltyCardViewActivityTest
         assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
         assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
         assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
+
+        db.close();
     }
 
     @Test
@@ -550,6 +564,8 @@ public class LoyaltyCardViewActivityTest
         assertEquals(false, activity.isFinishing());
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());
+
+        db.close();
     }
 
     @Test
@@ -568,6 +584,8 @@ public class LoyaltyCardViewActivityTest
         assertEquals(false, activity.isFinishing());
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());
+
+        db.close();
     }
 
     @Test
@@ -585,6 +603,8 @@ public class LoyaltyCardViewActivityTest
 
         // Save and check the loyalty card
         saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, BARCODE_TYPE, false);
+
+        db.close();
     }
 
     @Test
@@ -602,6 +622,8 @@ public class LoyaltyCardViewActivityTest
 
         // Save and check the loyalty card
         saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, activity.getApplicationContext().getString(R.string.noBarcode), false);
+
+        db.close();
     }
 
     @Test
@@ -629,6 +651,8 @@ public class LoyaltyCardViewActivityTest
 
         // Check if the special NO_BARCODE string doesn't get saved
         saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, activity.getApplicationContext().getString(R.string.noBarcode), false);
+
+        db.close();
     }
 
     @Test
@@ -665,6 +689,8 @@ public class LoyaltyCardViewActivityTest
 
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());
+
+        db.close();
     }
 
     @Test
@@ -701,6 +727,8 @@ public class LoyaltyCardViewActivityTest
                 String title = item.getTitle().toString();
                 assertEquals(title, activity.getString(R.string.lockScreen));
             }
+
+            db.close();
         }
     }
 
@@ -731,6 +759,8 @@ public class LoyaltyCardViewActivityTest
 
         shadowOf(activity).clickMenuItem(R.id.action_star_unstar);
         assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
+
+        db.close();
     }
 
     @Test
@@ -794,6 +824,8 @@ public class LoyaltyCardViewActivityTest
         // Pressing back when not in full screen should finish activity
         activity.onBackPressed();
         assertEquals(true, activity.isFinishing());
+
+        db.close();
     }
 
     @Test

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

@@ -111,6 +111,8 @@ public class MainActivityTest
         assertEquals(1, list.getAdapter().getCount());
         Cursor cursor = (Cursor)list.getAdapter().getItem(0);
         assertNotNull(cursor);
+
+        db.close();
     }
 
     @Test
@@ -161,6 +163,8 @@ public class MainActivityTest
         cursor = (Cursor)list.getAdapter().getItem(3);
         assertNotNull(cursor);
         assertEquals("storeB",cursor.getString(cursor.getColumnIndex("store")));
+
+        db.close();
     }
 
     @Test
@@ -209,6 +213,8 @@ public class MainActivityTest
         activityController.pause();
         activityController.resume();
         assertEquals(0, groupTabs.getTabCount());
+
+        db.close();
     }
 
     @Test
@@ -434,5 +440,7 @@ public class MainActivityTest
         assertEquals(View.VISIBLE, list.getVisibility());
 
         assertEquals(2, list.getCount());
+
+        db.close();
     }
 }

build.gradle

@@ -2,13 +2,15 @@
 
 buildscript {
     repositories {
-        jcenter()
-
-        // For the Android Gradle plugin
         google()
+        jcenter()
+        maven { url "https://jitpack.io" }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,9 +19,10 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
-        maven { url 'https://jitpack.io' }
         google()
+        jcenter()
+        maven { url "https://jitpack.io" }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
 }
 

docs/README.md

@@ -59,12 +59,10 @@ Windows:
 
 # Translating
 
+[![Translation status](https://hosted.weblate.org/widgets/catima/-/open-graph.png)](https://hosted.weblate.org/engage/catima/)
+
 Please contribute through [our Weblate page](https://hosted.weblate.org/projects/catima/).
 
-# Thanks
-
-This application uses the following image:
-- [Save](https://thenounproject.com/term/save/716011) by [Bernar Novalyi](https://thenounproject.com/bernar.novalyi)
-
 # Note from Developer
+
 This application is based on the great [Loyalty Card Keychain](https://github.com/brarcher/loyalty-card-locker) by [Branden Archer](https://github.com/brarcher). This fork was created due to the original developer having stopped development of this app.

gradle.properties

@@ -16,11 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-# The aapt2 tool creates an APK which fails to install on Android 5 and below if it contains
-# a bug. Build tools 27.0.1 has a mitigation. Avoiding aapt2 also avoids hitting the bug.
-# See: https://issuetracker.google.com/issues/64434571
-android.enableAapt2=false
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableUnitTestBinaryResources=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Jul 19 15:12:56 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip

gradlew

@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -6,42 +22,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -60,8 +40,49 @@ cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -85,7 +106,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -105,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -134,27 +156,30 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=`save "$@"`
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,20 +24,23 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell