Skip to content
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

decrease min sdk version to 21 #10

Merged
merged 4 commits into from
Mar 29, 2022
Merged

decrease min sdk version to 21 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01bcb25
decrease min sdk version to 21
creative-dev-lab Mar 29, 2022
b34d945
deprecated functions handled
creative-dev-lab Mar 29, 2022
3f47539
update aar
creative-dev-lab Mar 29, 2022
aae4669
update aar
creative-dev-lab Mar 29, 2022
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
2 changes: 1 addition & 1 deletion AirRobeWidget/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
compileSdk 32

defaultConfig {
minSdk 24
minSdk 21
targetSdk 32
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand Down
Binary file added AirRobeWidget/releases/AirRobeWidget-1.0.0-alpha-4.aar
View file
Open in desktop
Binary file not shown.
21 changes: 15 additions & 6 deletions AirRobeWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/utils/AirRobeAppUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package com.airrobe.widgetsdk.airrobewidget.utils

import android.content.Context
import android.os.Build
import android.text.Html
import android.text.Spanned
import android.view.MotionEvent
import android.view.View
import android.view.animation.AnimationUtils
Expand Down Expand Up @@ -31,11 +34,17 @@ internal object AirRobeAppUtils {
return false
}

fun isBelowPriceThreshold(
department: String,
productPriceCents: Float? = null
) : Boolean {
if (productPriceCents == null) return false
return true
fun getColor(context: Context, color: Int): Int {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
return context.getColor(color)
}
return context.resources.getColor(color)
}

fun fromHtml(text: String): Spanned {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
return Html.fromHtml(text, Html.FROM_HTML_MODE_COMPACT)
}
return Html.fromHtml(text)
}
}
16 changes: 8 additions & 8 deletions ...Widget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/widgets/AirRobeConfirmation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class AirRobeConfirmation @JvmOverloads constructor(

var borderColor: Int =
if (widgetInstance.borderColor == 0)
context.getColor(R.color.airrobe_widget_default_border_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_border_color)
else
widgetInstance.borderColor
set(value) {
Expand All @@ -52,7 +52,7 @@ class AirRobeConfirmation @JvmOverloads constructor(

var textColor: Int =
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
set(value) {
Expand All @@ -63,7 +63,7 @@ class AirRobeConfirmation @JvmOverloads constructor(

var buttonBorderColor: Int =
if (widgetInstance.buttonBorderColor == 0)
context.getColor(R.color.airrobe_widget_default_button_border_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_button_border_color)
else
widgetInstance.buttonBorderColor
set(value) {
Expand All @@ -74,7 +74,7 @@ class AirRobeConfirmation @JvmOverloads constructor(

var buttonTextColor: Int =
if (widgetInstance.buttonTextColor == 0)
context.getColor(R.color.airrobe_widget_default_button_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_button_text_color)
else
widgetInstance.buttonTextColor
set(value) {
Expand Down Expand Up @@ -115,28 +115,28 @@ class AirRobeConfirmation @JvmOverloads constructor(
borderColor =
typedArray.getColor(R.styleable.AirRobeConfirmation_borderColor,
if (widgetInstance.borderColor == 0)
context.getColor(R.color.airrobe_widget_default_border_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_border_color)
else
widgetInstance.borderColor
)
textColor =
typedArray.getColor(R.styleable.AirRobeConfirmation_textColor,
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
buttonBorderColor =
typedArray.getColor(R.styleable.AirRobeConfirmation_buttonBackgroundColor,
if (widgetInstance.buttonBorderColor == 0)
context.getColor(R.color.airrobe_widget_default_button_border_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_button_border_color)
else
widgetInstance.buttonBorderColor
)
buttonTextColor =
typedArray.getColor(R.styleable.AirRobeConfirmation_buttonTextColor,
if (widgetInstance.buttonTextColor == 0)
context.getColor(R.color.airrobe_widget_default_button_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_button_text_color)
else
widgetInstance.buttonTextColor
)
Expand Down
52 changes: 26 additions & 26 deletions ...obeWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/widgets/AirRobeLearnMore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,133 +95,133 @@ internal class AirRobeLearnMore(context: Context) : Dialog(context) {
val step1Background = rlStep1Container.background as GradientDrawable
step1Background.setStroke(1,
if (widgetInstance.borderColor == 0)
context.getColor(R.color.airrobe_widget_default_border_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_border_color)
else
widgetInstance.borderColor
)
val step2Background = rlStep2Container.background as GradientDrawable
step2Background.setStroke(1,
if (widgetInstance.borderColor == 0)
context.getColor(R.color.airrobe_widget_default_border_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_border_color)
else
widgetInstance.borderColor
)
val toggleBackground = rlToggleContainer.background as GradientDrawable
toggleBackground.setStroke(1,
if (widgetInstance.borderColor == 0)
context.getColor(R.color.airrobe_widget_default_border_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_border_color)
else
widgetInstance.borderColor
)

divider.setBackgroundColor(
if (widgetInstance.separatorColor == 0)
context.getColor(R.color.airrobe_widget_default_separator_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_separator_color)
else
widgetInstance.separatorColor
)
step1Divider.setBackgroundColor(
if (widgetInstance.separatorColor == 0)
context.getColor(R.color.airrobe_widget_default_separator_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_separator_color)
else
widgetInstance.separatorColor
)
step2Divider.setBackgroundColor(
if (widgetInstance.separatorColor == 0)
context.getColor(R.color.airrobe_widget_default_separator_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_separator_color)
else
widgetInstance.separatorColor
)

tvTitle.setTextColor(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
tvStep1Title.setTextColor(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
tvStep1Description.setTextColor(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
tvStep2Title.setTextColor(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
tvStep2Description.setTextColor(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
tvQuestion.setTextColor(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
tvAnswer.setTextColor(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
tvReady.setTextColor(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
tvToggleOn.setTextColor(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)

ivClose.setColorFilter(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
ivCheck.setColorFilter(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
ivPlant1.setColorFilter(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
ivEmoji.setColorFilter(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)
ivPlant2.setColorFilter(
if (widgetInstance.textColor == 0)
context.getColor(R.color.airrobe_widget_default_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_text_color)
else
widgetInstance.textColor
)

tvFindOutMore.setLinkTextColor(
if (widgetInstance.linkTextColor == 0)
context.getColor(R.color.airrobe_widget_default_link_text_color)
AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_link_text_color)
else
widgetInstance.linkTextColor
)
Expand All @@ -235,14 +235,14 @@ internal class AirRobeLearnMore(context: Context) : Dialog(context) {
)
val thumbColors = intArrayOf(
Color.WHITE,
if (widgetInstance.switchColor == 0) context.getColor(R.color.airrobe_widget_default_switch_color) else widgetInstance.switchColor,
if (widgetInstance.switchColor == 0) AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_switch_color) else widgetInstance.switchColor,
)
val trackColors = intArrayOf(
if (widgetInstance.borderColor == 0) context.getColor(R.color.airrobe_widget_default_border_color) else widgetInstance.borderColor,
if (widgetInstance.switchColor == 0) context.getColor(R.color.airrobe_widget_default_switch_color) else widgetInstance.switchColor,
if (widgetInstance.borderColor == 0) AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_border_color) else widgetInstance.borderColor,
if (widgetInstance.switchColor == 0) AirRobeAppUtils.getColor(context,R.color.airrobe_widget_default_switch_color) else widgetInstance.switchColor,
)
optInSwitch.thumbTintList = ColorStateList(states, thumbColors)
optInSwitch.trackTintList = ColorStateList(states, trackColors)
optInSwitch.thumbDrawable.setTintList(ColorStateList(states, thumbColors))
optInSwitch.trackDrawable.setTintList(ColorStateList(states, trackColors))
}

@SuppressLint("ClickableViewAccessibility")
Expand Down
Loading