mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-10 10:28:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #226 from brarcher/sdk-15

Browse Source 
Add additional layout options to support SDK 15
This commit is contained in:
Branden Archer
2018-03-11 23:19:18 -04:00
committed by GitHub
parent 5cae97482f 036748ee56
commit 73b6c99d9e
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -11,7 +11,7 @@ android {
defaultConfig {
applicationId "protect.card_locker"
minSdkVersion 17
minSdkVersion 15
targetSdkVersion 27
versionCode 26
versionName "0.23.1"

25
app/src/main/res/layout/loyalty_card_edit_activity.xml
View File

@@ -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

1
app/src/main/res/layout/loyalty_card_layout.xml
View File

@@ -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"/>