Skip to content

[MOB-7678] constraint finalization #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 25, 2024
Merged

[MOB-7678] constraint finalization #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46767db
sets up constraint layout
Jan 22, 2024
f80ddfc
adds layout updates for all three view types
Jan 23, 2024
86097e8
resets android versions
Jan 23, 2024
25f0228
cleanup
Jan 23, 2024
288beb3
updates button container constraints
Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions iterableapi-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ dependencies {
implementation 'com.google.android.flexbox:flexbox:3.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation "com.github.bumptech.glide:glide:4.8.0"
implementation 'com.google.android.material:material:1.2.0'

testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
Expand Down
24 changes: 11 additions & 13 deletions iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/embedded/IterableEmbeddedView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
Expand All @@ -23,14 +24,14 @@ class IterableEmbeddedView(
private var config: IterableEmbeddedViewConfig?
): Fragment() {

private val defaultBackgroundColor : Int by lazy { getDefaultColor(viewType, R.color.notification_background_color, R.color.banner_background_color) }
private val defaultBorderColor : Int by lazy { getDefaultColor(viewType, R.color.notification_border_color, R.color.banner_border_color) }
private val defaultPrimaryBtnBackgroundColor: Int by lazy { getDefaultColor(viewType, R.color.white, R.color.banner_button_color) }
private val defaultPrimaryBtnTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.white) }
private val defaultSecondaryBtnBackgroundColor: Int by lazy { getDefaultColor(viewType, R.color.notification_background_color, R.color.white) }
private val defaultSecondaryBtnTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.banner_button_color) }
private val defaultTitleTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.title_text_color) }
private val defaultBodyTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.body_text_color) }
private val defaultBackgroundColor : Int by lazy { getDefaultColor(viewType, R.color.notification_background_color, R.color.banner_background_color, R.color.banner_background_color) }
private val defaultBorderColor : Int by lazy { getDefaultColor(viewType, R.color.notification_border_color, R.color.banner_border_color, R.color.banner_border_color) }
private val defaultPrimaryBtnBackgroundColor: Int by lazy { getDefaultColor(viewType, R.color.white, R.color.white, R.color.banner_button_color) }
private val defaultPrimaryBtnTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.banner_button_color, R.color.white) }
private val defaultSecondaryBtnBackgroundColor: Int by lazy { getDefaultColor(viewType, R.color.notification_background_color, R.color.white, R.color.white) }
private val defaultSecondaryBtnTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.banner_button_color, R.color.banner_button_color) }
private val defaultTitleTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.title_text_color, R.color.title_text_color) }
private val defaultBodyTextColor: Int by lazy { getDefaultColor(viewType, R.color.notification_text_color, R.color.body_text_color, R.color.body_text_color) }
private val defaultBorderWidth = 1
private val defaultBorderCornerRadius = 8f

Expand Down Expand Up @@ -108,10 +109,6 @@ class IterableEmbeddedView(
else ContextCompat.getDrawable(requireContext(), R.drawable.secondary_banner_button_background) as? GradientDrawable
secondaryBtnBackgroundDrawable?.setColor(secondaryBtnBackgroundColor)

val params = secondButton.layoutParams as FlexboxLayout.LayoutParams
params.leftMargin = (8 * resources.displayMetrics.density).toInt()
secondButton.layoutParams = params

secondButton.setBackgroundDrawable(secondaryBtnBackgroundDrawable)
}

Expand Down Expand Up @@ -184,9 +181,10 @@ class IterableEmbeddedView(
}
}

private fun getDefaultColor(viewType: IterableEmbeddedViewType, notificationColor: Int, bannerColor: Int): Int {
private fun getDefaultColor(viewType: IterableEmbeddedViewType, notificationColor: Int, cardColor: Int, bannerColor: Int): Int {
return when (viewType) {
IterableEmbeddedViewType.NOTIFICATION -> ContextCompat.getColor(requireContext(), notificationColor)
IterableEmbeddedViewType.CARD -> ContextCompat.getColor(requireContext(), cardColor)
else -> ContextCompat.getColor(requireContext(), bannerColor)
}
}
Expand Down
13 changes: 13 additions & 0 deletions iterableapi-ui/src/main/res/drawable/primary_card_button_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/white" />

<stroke
android:width="1dp"
android:color="@color/white" />

<corners
android:radius="32dp" />
</shape>
13 changes: 13 additions & 0 deletions iterableapi-ui/src/main/res/drawable/secondary_card_button_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/white" />

<stroke
android:width="1dp"
android:color="@color/white" />

<corners
android:radius="32dp" />
</shape>
135 changes: 74 additions & 61 deletions iterableapi-ui/src/main/res/layout-v21/banner_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="358dp"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginTop="12dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="8dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="12dp"
app:cardCornerRadius="8dp"
app:cardElevation="0dp"
android:background="@drawable/banner_card_border"
android:orientation="vertical">

<LinearLayout
<TextView
android:id="@+id/embedded_message_title"
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_marginBottom="16dp" >

<LinearLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginEnd="16dp"
android:orientation="vertical">

<TextView
android:id="@+id/embedded_message_title"
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text=""
android:textSize="16sp"
android:textStyle="bold"
android:maxLines="2"
android:ellipsize="end" />
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:ellipsize="end"
android:maxLines="2"
android:text=""
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/embedded_message_image"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/embedded_message_body"
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text=""
android:maxLines="3"
android:ellipsize="end" />

</LinearLayout>
<TextView
android:id="@+id/embedded_message_body"
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:ellipsize="end"
android:maxLines="2"
android:text=""
app:layout_constraintBottom_toTopOf="@+id/embedded_message_buttons_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/embedded_message_title"
app:layout_constraintVertical_bias="0.0" />

<ImageView
android:id="@+id/embedded_message_image"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:contentDescription="" />
<ImageView
android:id="@+id/embedded_message_image"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:contentDescription=""
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</LinearLayout>

<com.google.android.flexbox.FlexboxLayout
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/embedded_message_buttons_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
app:flexWrap="wrap"
app:alignContent="flex_start"
app:alignItems="flex_start">
android:layout_marginEnd="16dp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent">

<Button
android:id="@+id/embedded_message_first_button"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginStart="16dp"
android:background="@drawable/primary_banner_button_background"
android:ellipsize="end"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:singleLine="true"
android:stateListAnimator="@null"
android:text=""
android:textColor="@color/white"
android:textAllCaps="false"
app:cornerRadius="32dp"
app:layout_flexBasisPercent="50%" />
android:textSize="14sp"
android:textColor="@color/white"
app:cornerRadius="32dp" />

<Button
android:id="@+id/embedded_message_second_button"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:background="@drawable/secondary_banner_button_background"
android:ellipsize="end"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:singleLine="true"
android:stateListAnimator="@null"
android:text=""
android:textColor="@color/white"
android:textAllCaps="false"
android:textSize="14sp"
android:textColor="@color/white"
app:cornerRadius="32dp" />

</com.google.android.flexbox.FlexboxLayout>
</LinearLayout>

</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
Loading