Merge pull request #121 from brarcher/pre-v0.11.1

Update for v0.11.1
2025-12-28 09:37:52 -05:00 · 2017-06-29 10:13:07 -04:00 · 2017-06-28 22:49:44 -04:00 · 2017-06-28 22:48:50 -04:00 · 2017-06-28 22:42:02 -04:00 · 2017-06-26 22:56:36 -04:00
10 changed files with 32 additions and 10 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
        applicationId "protect.card_locker"
        minSdkVersion 17
        targetSdkVersion 23
-        versionCode 11
-        versionName "0.11"
+        versionCode 12
+        versionName "0.11.1"
    }
    buildTypes {
        release {
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -51,6 +51,7 @@
        <activity
            android:name=".IntroActivity"
            android:label=""
+            android:configChanges="orientation|screenSize"
            android:theme="@style/AppTheme.NoActionBar"/>
    </application>

--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -185,6 +185,11 @@ public class MainActivity extends AppCompatActivity
            "AppIntro", "https://github.com/apl-devs/AppIntro"
        );

+        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())
        {
@@ -192,6 +197,13 @@ public class MainActivity extends AppCompatActivity
        }
        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);

@@ -229,7 +241,9 @@ public class MainActivity extends AppCompatActivity
            "</p><hr/><p>" +
            getString(R.string.app_license) +
            "</p><hr/><p>" +
-            String.format(getString(R.string.app_libraries), appName, libs.toString());
+            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)
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -49,12 +49,13 @@
    <string name="noExternalStoragePermissionError">Nelze importovat nebo exportovat karty bez přístupu k externímu uložišti</string>

    <string name="about">O aplikaci</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
    <string name="app_license">Licensed under the GPLv3.</string>
    <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Revizní informace: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> používá tyto knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <!-- NEEDS TRANSLATED --><string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Vyberte čárový kód</string>
    <string name="enterBarcodeInstructions">Zadejte hodnotu čárového kódu a potm vyberte kód, který představuje čárový kód, který je na kartě.</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -5,9 +5,10 @@
    <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
    <string name="action_add">Neu</string>
    <string name="addCardTitle">Neue Kundenkarte</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
    <string name="app_license">Lizensiert unter der GPLv3.</string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> benutzt die folgenden Fremdbibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <!-- NEEDS TRANSLATED --><string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="viewCardTitle">Kundenkarte anzeigen</string>
    <string name="ok">Ok</string>
    <string name="note">Notiz</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -49,12 +49,13 @@
    <string name="noExternalStoragePermissionError">Impossible d\'importer ou d\'exporter les données sans l\'autorisation d\'accès au stockage externe</string>

    <string name="about">À propos</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
    <string name="app_license">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 sur les versions : <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utilise les bibliothèques-tierces suivantes : <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <!-- NEEDS TRANSLATED --><string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Choisissez le code-barre</string>
    <string name="enterBarcodeInstructions">Saisissez les chiffres du code-barres et sélectionnez l\'image qui le représente</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -41,12 +41,13 @@
    <string name="exporting">Esportazione in corso&#8230;</string>
    <string name="noExternalStoragePermissionError">Impossibile importare o esportare i dati senza il permesso per l\'uso della memoria esterna.</string>
    <string name="about">Informazioni</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
    <string name="app_license">Pubblicato sotto licenza GPLv3.</string>
    <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Informazione sulla revisione: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> usa le seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <!-- NEEDS TRANSLATED --><string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="ok">Ok</string>
    <string name="enterCard">Inserisci carta</string>
    <string name="editCard">Modifica carta</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -49,12 +49,13 @@
    <string name="noExternalStoragePermissionError">Negalima importuoti/eksportuoti kortelių be išorinės atminties leidimo</string>

    <string name="about">Apie</string>
-    <string name="app_copyright_fmt">Visos teisės saugomos 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Visos teisės saugomos 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
    <string name="app_license">Licenzijuota pagal GPLv3.</string>
    <string name="about_title_fmt">Apie <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Versija: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Revizijos informacija: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> naudoja šias trečiosios šalies bibliotekas: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <!-- NEEDS TRANSLATED --><string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Pasirinkite brūkšninį kodą</string>
    <string name="enterBarcodeInstructions">Enter the barcode value then select the image which represents the barcode you want to use</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -41,12 +41,13 @@
    <string name="exporting">Exporterende&#8230;</string>
    <string name="noExternalStoragePermissionError">Niet mogelijk te importeren of exporteren zonder rechten op externe opslag</string>
    <string name="about">Over</string>
-    <string name="app_copyright_fmt">Auteursrecht 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Auteursrecht 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
    <string name="app_license">Gelicenseerd met GPLv3.</string>
    <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Revisieïnformatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bibliotheken van derden: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <!-- NEEDS TRANSLATED --><string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="ok">Oké</string>
    <string name="enterCard">Voer kaart in</string>
    <!-- NEEDS TRANSLATED --><string name="editCard">Edit Card</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,12 +66,13 @@
    <string name="importOptionFixedButton">Use export location</string>

    <string name="about">About</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
    <string name="app_license">Licensed under the GPLv3.</string>
    <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> uses the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>

    <string name="selectBarcodeTitle">Select Barcode</string>
    <string name="enterBarcodeInstructions">Enter the barcode value then select the image which represents the barcode you want to use</string>
Author	SHA1	Message	Date
Branden Archer	b38ec7b753	Merge pull request #121 from brarcher/pre-v0.11.1 Update for v0.11.1	2017-06-29 10:13:07 -04:00
Branden Archer	32d5aec76b	Update for v0.11.1	2017-06-28 22:49:44 -04:00
Branden Archer	bdbcaf4b1e	Merge pull request #120 from brarcher/handleConfigChanges handle orientation and resize config change for IntroActivity	2017-06-28 22:48:50 -04:00
Branden Archer	f54905f218	handle orientation and resize config change for IntroActivity If orientation and resize are not handled if the screen is rotate or resized the IntroSlide fragment loses its layout, and when it tries inflates the layout it fails to do so.	2017-06-28 22:42:02 -04:00
Branden Archer	2d3bd4a375	Merge pull request #118 from brarcher/credit Add credit for save icon & update copyright string format	2017-06-26 22:56:36 -04:00
Branden Archer	de4ab95437	Add credit for save icon in about dialog	2017-06-26 22:10:09 -04:00
Branden Archer	09fba71710	Fix string format for copyright year The year is an integer, but the format was for a string.	2017-06-26 22:10:09 -04:00