Merge pull request #215 from brarcher/pre-v0.23

Update for v0.23
Merge branch 'master' into pre-v0.23
2025-12-25 08:07:56 -05:00 · 2018-02-28 23:05:38 -05:00 · 2018-02-28 22:59:37 -05:00 · 2018-02-28 22:59:27 -05:00 · 2018-02-28 22:53:05 -05:00 · 2018-02-28 22:48:49 -05:00
4 changed files with 13 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v0.22 (2018-02-19)
+
+Changes:
+- Update translations. (https://github.com/brarcher/loyalty-card-locker/pull/208)
+- Barcode rendering updates: (https://github.com/brarcher/loyalty-card-locker/pull/209)
+  * Reload card view activity when screen is rotated, so barcode image is correct size.
+  * Render 1D barcodes in a larger space, allowing them to better fill the screen. 
+
 ## v0.21 (2018-02-17)

 Changes
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
        applicationId "protect.card_locker"
        minSdkVersion 17
        targetSdkVersion 27
-        versionCode 24
-        versionName "0.22"
+        versionCode 25
+        versionName "0.23"
    }
    buildTypes {
        release {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -253,6 +253,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity

                String prompt = getResources().getString(R.string.scanCardBarcode);
                integrator.setPrompt(prompt);
+                integrator.setBeepEnabled(false);
                integrator.initiateScan();
            }
        };
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -100,7 +100,7 @@
        android:clipChildren="false"
        android:clipToPadding="false"
        android:layout_width="fill_parent"
-        android:layout_height="224.0dip"
+        android:layout_height="wrap_content"
        android:weightSum="1.0"
        android:fitsSystemWindows="true">
        <android.support.design.widget.CollapsingToolbarLayout
@@ -126,6 +126,7 @@
                android:textAlignment="center"
                android:layout_gravity="center"
                android:layout_marginTop="?actionBarSize"
+                android:layout_marginBottom="?actionBarSize"
                app:layout_collapseMode="parallax"
                android:fitsSystemWindows="true"/>
            <android.support.v7.widget.Toolbar
Author	SHA1	Message	Date
Branden Archer	d3bcd3e273	Merge pull request #215 from brarcher/pre-v0.23 Update for v0.23	2018-02-28 23:05:38 -05:00
Branden Archer	9d1c9c3309	Merge branch 'master' into pre-v0.23	2018-02-28 22:59:37 -05:00
Branden Archer	61e039c456	Merge pull request #216 from brarcher/disable-beep Disable beep upon successful barcode scan	2018-02-28 22:59:27 -05:00
Branden Archer	0e2d725591	Disable beep upon successful barcode scan	2018-02-28 22:53:05 -05:00
Branden Archer	759d42cfcf	Update for v0.23	2018-02-28 22:48:49 -05:00
Branden Archer	2312788a57	Merge pull request #213 from brarcher/header-size Reduce space used in header for card view	2018-02-26 20:52:44 -05:00
Branden Archer	0820be3986	Reduce space used in header for card view The landscape view left little room for the barcode and card ID because the header took up a lot of space. Further, on smaller phones it would take up a large portion of the screen. This change reduces the header from 224dp to two action bar sizes plus the size of the textview for the store name.	2018-02-19 23:21:12 -05:00
Branden Archer	8a11953276	Merge pull request #211 from brarcher/changelog Update CHANGELOG	2018-02-19 15:30:48 -05:00
Branden Archer	182b3ff3c0	Update CHANGELOG	2018-02-19 10:34:41 -05:00