From 036748ee5697bc13d51de0d84bce67a47d0f2755 Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Sun, 11 Mar 2018 23:02:36 -0400
Subject: [PATCH] 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.
---
 app/build.gradle                              |  2 +-
 .../res/layout/loyalty_card_edit_activity.xml | 25 ++++++++++++++-----
 .../main/res/layout/loyalty_card_layout.xml   |  1 +
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 201e9259b..dd8b29db9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         applicationId "protect.card_locker"
-        minSdkVersion 17
+        minSdkVersion 15
         targetSdkVersion 27
         versionCode 26
         versionName "0.23.1"
diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml
index 04003fd0b..84e2a412c 100644
--- 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
diff --git a/app/src/main/res/layout/loyalty_card_layout.xml b/app/src/main/res/layout/loyalty_card_layout.xml
index 7106bc671..7f80ab3ab 100644
--- 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"/>