Merge pull request #227 from brarcher/pre-v0.23.2

Update for v0.23.2
2025-12-27 09:07:55 -05:00 · 2018-03-11 23:27:29 -04:00 · 2018-03-11 23:20:01 -04:00 · 2018-03-11 23:19:18 -04:00 · 2018-03-11 23:11:51 -04:00 · 2018-03-11 22:44:13 -04:00
5 changed files with 40 additions and 12 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## v0.23.1 (2018-03-07)
+
+Changes:
+- Prevent crash when rendering a barcode exhausts the application's memory. (https://github.com/brarcher/loyalty-card-locker/pull/219)
+
+## v0.23 (2018-02-28)
+
+Changes:
+- Reduce space in header when viewing a card. (https://github.com/brarcher/loyalty-card-locker/pull/213)
+- Disable beep when scanning a barcode. (https://github.com/brarcher/loyalty-card-locker/pull/216)
+
 ## v0.22 (2018-02-19)

 Changes:
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,10 +11,10 @@ android {

    defaultConfig {
        applicationId "protect.card_locker"
-        minSdkVersion 17
+        minSdkVersion 15
        targetSdkVersion 27
-        versionCode 25
-        versionName "0.23"
+        versionCode 27
+        versionName "0.23.2"
    }
    buildTypes {
        release {
@@ -37,9 +37,6 @@ android {
            includeAndroidResources = true
        }
    }
-
-    // This is for Robolectric support for SDK 23
-    useLibrary 'org.apache.http.legacy'
 }

 dependencies {
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -149,6 +149,12 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
        {
            Log.e(TAG, "Failed to generate barcode of type " + format + ": " + cardId, e);
        }
+        catch(OutOfMemoryError e)
+        {
+            Log.w(TAG, "Insufficient memory to render barcode, "
+                + imageWidth + "x" + imageHeight + ", " + format.name()
+                + ", length=" + cardId.length(), e);
+        }

        return null;
    }
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -61,7 +61,8 @@
                            android:layout_width="wrap_content"
                            android:textSize="@dimen/inputSize"
                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"/>
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"/>

                        <EditText
                            android:id="@+id/storeNameEdit"
@@ -70,7 +71,9 @@
                            android:layout_width="match_parent"
                            android:padding="@dimen/inputPadding"
                            android:textSize="@dimen/inputSize"
-                            android:layout_toEndOf="@id/storeNameField"/>
+                            android:layout_toEndOf="@id/storeNameField"
+                            android:layout_toRightOf="@id/storeNameField"
+                            />

                    </RelativeLayout>

@@ -110,7 +113,9 @@
                            android:layout_width="wrap_content"
                            android:textSize="@dimen/inputSize"
                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"/>
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            />

                        <EditText
                            android:id="@+id/noteEdit"
@@ -119,7 +124,9 @@
                            android:layout_width="match_parent"
                            android:padding="@dimen/inputPadding"
                            android:textSize="@dimen/inputSize"
-                            android:layout_toEndOf="@id/noteField"/>
+                            android:layout_toEndOf="@id/noteField"
+                            android:layout_toRightOf="@id/noteField"
+                            />
                    </RelativeLayout>

                    <View
@@ -190,6 +197,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="match_parent"
                           android:layout_toEndOf="@id/headingColorSampleBorder"
+                           android:layout_toRightOf="@id/headingColorSampleBorder"
                           app:layout_constraintEnd_toEndOf="parent"/>
                    </android.support.constraint.ConstraintLayout>

@@ -261,6 +269,7 @@
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_toEndOf="@id/headingStoreTextColorSampleBorder"
+                            android:layout_toRightOf="@id/headingStoreTextColorSampleBorder"
                            app:layout_constraintEnd_toEndOf="parent"/>
                    </android.support.constraint.ConstraintLayout>

@@ -303,7 +312,9 @@
                            android:layout_width="wrap_content"
                            android:textSize="@dimen/inputSize"
                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"/>
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            />

                        <TextView
                            android:id="@+id/cardIdView"
@@ -312,7 +323,9 @@
                            android:padding="@dimen/inputPadding"
                            android:textSize="@dimen/inputSize"
                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/cardIdField"/>
+                            android:layout_toEndOf="@id/cardIdField"
+                            android:layout_toRightOf="@id/cardIdField"
+                            />
                    </RelativeLayout>

                    <View
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -13,6 +13,7 @@
        android:layout_width="@dimen/cardThumbnailSize"
        android:layout_height="@dimen/cardThumbnailSize"
        android:layout_marginEnd="@dimen/activity_margin"
+        android:layout_marginRight="@dimen/activity_margin"
        android:src="@mipmap/ic_launcher"
        android:contentDescription="@string/thumbnailDescription"/>
Author	SHA1	Message	Date
Branden Archer	a2e99c2b9d	Merge pull request #227 from brarcher/pre-v0.23.2 Update for v0.23.2	2018-03-11 23:27:29 -04:00
Branden Archer	607dff03d4	Update for v0.23.2	2018-03-11 23:20:01 -04:00
Branden Archer	73b6c99d9e	Merge pull request #226 from brarcher/sdk-15 Add additional layout options to support SDK 15	2018-03-11 23:19:18 -04:00
Branden Archer	036748ee56	Add additional layout options to support SDK<17 Google Play statistics show that the earliest Android version in use which has installs for this app is 4.0.3, which is SDK 15. This changes cleans up some layouts so that it will work on SDK 15.	2018-03-11 23:11:51 -04:00
Branden Archer	5cae97482f	Merge pull request #225 from brarcher/test-cleanup Remove unnecessary apache legacy usage	2018-03-11 22:44:13 -04:00
Branden Archer	f67d27167e	Remove unnecessary apache legacy usage The version of robolectric used no longer requires this.	2018-03-11 22:33:31 -04:00
Branden Archer	0832c7fc97	Merge pull request #222 from brarcher/changelog Update CHANGELOG	2018-03-08 11:33:32 -05:00
Branden Archer	f5e1a2d732	Update CHANGELOG	2018-03-07 23:29:17 -05:00
Branden Archer	7b799df98a	Merge pull request #221 from brarcher/pre-v0.23.1 Update for pre-v0.23.1	2018-03-07 23:25:10 -05:00
Branden Archer	968c3e71a1	Update for pre-v0.23.1	2018-03-07 23:14:53 -05:00
Branden Archer	29d8da99cd	Merge pull request #219 from brarcher/barcode-oom Catch case where barcode rendering runs into an OOM	2018-03-04 14:17:53 -05:00
Branden Archer	79213aa3ec	Catch case where barcode rendering runs into an OOM There are still cases where the barcode could not be rendered because the process runs out of its memory limit. To avoid a crash, catch the failure and log it. The barcode will not be displayed, but at least the app will not crash.	2018-03-04 13:10:12 -05:00
Branden Archer	50fdfe92fa	Merge pull request #217 from brarcher/changelog Update CHANGELOG	2018-02-28 23:13:10 -05:00
Branden Archer	4eab1121b0	Update CHANGELOG	2018-02-28 23:07:15 -05:00