From 6d6a636fbd073c24094776c43a559e42ea643433 Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Wed, 19 Jan 2022 22:49:56 -0300 Subject: [PATCH 01/13] fix: fixes shell script warnings --- tools/pipeline_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pipeline_build.sh b/tools/pipeline_build.sh index 59ae18ac..d1d20af6 100644 --- a/tools/pipeline_build.sh +++ b/tools/pipeline_build.sh @@ -1,6 +1,6 @@ #!/bin/sh # task :sample:verifyDebugAndroidTestScreenshotTest removed because of an instability in Travis emulator -if [ $TRAVIS_BRANCH = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then +if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then ./gradlew clean build publish -PdisablePreDex --stacktrace else ./gradlew clean build -PdisablePreDex --stacktrace From 7d153de7873afff390336496787631005f7ee15d Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Wed, 19 Jan 2022 23:12:30 -0300 Subject: [PATCH 02/13] fix: fixes kotlin warnings --- .../main/kotlin/com/natura/android/checkbox/CheckBox.kt | 9 ++++----- .../src/main/kotlin/com/natura/android/logo/Logo.kt | 2 +- .../kotlin/com/natura/android/textfield/TextField.kt | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/designsystem/src/main/kotlin/com/natura/android/checkbox/CheckBox.kt b/designsystem/src/main/kotlin/com/natura/android/checkbox/CheckBox.kt index 66bed3d2..b31e523f 100644 --- a/designsystem/src/main/kotlin/com/natura/android/checkbox/CheckBox.kt +++ b/designsystem/src/main/kotlin/com/natura/android/checkbox/CheckBox.kt @@ -22,15 +22,14 @@ class CheckBox : AppCompatCheckBox { updateDrawable() } - private lateinit var STATE_INDETERMINATE: IntArray + private lateinit var indeterminateState: IntArray private fun init() { updateDrawable() } private fun updateDrawable() { - var btnDrawable = R.drawable.checkbox_status_indeterminate - btnDrawable = when (state) { + val btnDrawable: Int = when (state) { INDETERMINATE -> R.drawable.checkbox_status_indeterminate UNCHECKED -> R.drawable.checkbox_status_unchecked CHECKED -> R.drawable.checkbox_status_checked @@ -40,9 +39,9 @@ class CheckBox : AppCompatCheckBox { } override fun onCreateDrawableState(extraSpace: Int): IntArray { - STATE_INDETERMINATE = intArrayOf(R.attr.state_indeterminate) + indeterminateState = intArrayOf(R.attr.state_indeterminate) val drawableState = super.onCreateDrawableState(extraSpace + 1) - mergeDrawableStates(drawableState, STATE_INDETERMINATE) + mergeDrawableStates(drawableState, indeterminateState) return drawableState } diff --git a/designsystem/src/main/kotlin/com/natura/android/logo/Logo.kt b/designsystem/src/main/kotlin/com/natura/android/logo/Logo.kt index 8f12534d..151a8a4e 100644 --- a/designsystem/src/main/kotlin/com/natura/android/logo/Logo.kt +++ b/designsystem/src/main/kotlin/com/natura/android/logo/Logo.kt @@ -16,7 +16,7 @@ import com.natura.android.resources.getDrawableFromTheme class Logo @JvmOverloads constructor( context: Context, - private val attrs: AttributeSet? = null, + attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : ConstraintLayout(context, attrs, defStyleAttr) { diff --git a/designsystem/src/main/kotlin/com/natura/android/textfield/TextField.kt b/designsystem/src/main/kotlin/com/natura/android/textfield/TextField.kt index d8a045f7..28c28114 100644 --- a/designsystem/src/main/kotlin/com/natura/android/textfield/TextField.kt +++ b/designsystem/src/main/kotlin/com/natura/android/textfield/TextField.kt @@ -126,9 +126,6 @@ open class TextField @JvmOverloads constructor( var stateLayout = LayoutStates(context) - private val SUCCESS_ICON = "EA15" - private val ERROR_ICON = "EA13" - private val inputLabel by lazy { findViewById(R.id.text_field_input_label) } private val inputBox by lazy { findViewById(R.id.text_field_input_box) } @@ -570,5 +567,8 @@ open class TextField @JvmOverloads constructor( const val MEDIUMX_PADDING_TOP = 18 const val MEDIUMX_PADDING_BOTTOM = 17 const val MULTILINE_TYPE = 131073 + + private const val SUCCESS_ICON = "EA15" + private const val ERROR_ICON = "EA13" } } From 53b8357d9c2e996cf2a69b124d60f91f96c601bd Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Wed, 19 Jan 2022 23:21:28 -0300 Subject: [PATCH 03/13] fix: fixes kotlin warnings in Dialog Activity --- .../sample/components/DialogActivity.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/DialogActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/DialogActivity.kt index 62e0bbe6..e5424acd 100644 --- a/sample/src/main/kotlin/com/natura/android/sample/components/DialogActivity.kt +++ b/sample/src/main/kotlin/com/natura/android/sample/components/DialogActivity.kt @@ -13,16 +13,16 @@ import com.natura.android.sample.databinding.ActivityDialogBinding import com.natura.android.sample.setChosenDefaultTheme class DialogActivity : AppCompatActivity() { - lateinit var standardDialog: DialogStandard - lateinit var standardDialogVerticalButtons: DialogStandard - lateinit var standardDialogHeaderIconButtons: DialogStandard - lateinit var standardDialogMaxHeight: DialogStandard - lateinit var standardDialogCustomView: DialogStandard - lateinit var standardDialogWithDivider: DialogStandard - lateinit var standardDialogWithOutlinedButton: DialogStandard - lateinit var dialogNoDismissable: DialogStandard - - lateinit var alertDialog: DialogAlert + private lateinit var standardDialog: DialogStandard + private lateinit var standardDialogVerticalButtons: DialogStandard + private lateinit var standardDialogHeaderIconButtons: DialogStandard + private lateinit var standardDialogMaxHeight: DialogStandard + private lateinit var standardDialogCustomView: DialogStandard + private lateinit var standardDialogWithDivider: DialogStandard + private lateinit var standardDialogWithOutlinedButton: DialogStandard + private lateinit var dialogNoDismissable: DialogStandard + + private lateinit var alertDialog: DialogAlert private lateinit var binding: ActivityDialogBinding override fun onCreate(savedInstanceState: Bundle?) { From d4af3abb23e46bf88c6e2809b2a4365937a58fdb Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Thu, 20 Jan 2022 07:10:08 -0300 Subject: [PATCH 04/13] fix: fixes shell script warnings --- tools/finish_emulators.sh | 2 +- tools/pipeline_build.sh | 2 +- tools/update_icons.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/finish_emulators.sh b/tools/finish_emulators.sh index 7e791a93..62f4f2b3 100644 --- a/tools/finish_emulators.sh +++ b/tools/finish_emulators.sh @@ -1,2 +1,2 @@ #!/bin/sh -adb devices | grep emulator | cut -f1 | while read line; do adb -s "$line" emu kill; done \ No newline at end of file +adb devices | grep emulator | cut -f1 | while read -r line; do adb -s "$line" emu kill; done \ No newline at end of file diff --git a/tools/pipeline_build.sh b/tools/pipeline_build.sh index d1d20af6..3d948c39 100644 --- a/tools/pipeline_build.sh +++ b/tools/pipeline_build.sh @@ -1,6 +1,6 @@ #!/bin/sh # task :sample:verifyDebugAndroidTestScreenshotTest removed because of an instability in Travis emulator -if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then +if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./gradlew clean build publish -PdisablePreDex --stacktrace else ./gradlew clean build -PdisablePreDex --stacktrace diff --git a/tools/update_icons.sh b/tools/update_icons.sh index 3ff34d5e..5d048830 100755 --- a/tools/update_icons.sh +++ b/tools/update_icons.sh @@ -1,6 +1,6 @@ #!/bin/bash -NATDS_ICON_VERSION="$(grep -o "iconsVersion\s=\s.*" build.gradle | awk '{ print $3 }' | tr -d \''"\')" +NATDS_ICON_VERSION="$(grep -o "iconsVersion\s=\s.*" build.gradle | awk '{ print $3 }' | tr -d \'''\''')" # get commons from github domain='https://raw.githubusercontent.com/natura-cosmeticos/natds-commons/@naturacosmeticos/natds-icons@' path="/packages/natds-icons/dist/" From 90e57ebeedc48e4bde483db822cb0645ed8135fd Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Thu, 20 Jan 2022 07:27:37 -0300 Subject: [PATCH 05/13] fix: fixes warning in create docs script --- tools/create_docs.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/create_docs.sh b/tools/create_docs.sh index db0dca17..ae324de7 100644 --- a/tools/create_docs.sh +++ b/tools/create_docs.sh @@ -5,9 +5,10 @@ npm install markdown-to-document -g --only=prod for file in $( find . -path ./fastlane -prune -o \ - -name 'README.md' -type f -print + -name 'README.md' -type f -print find ./doc -iname "*.md" -type f -print ) + do [[ $file = "./README.md" ]] && BASE_URL="https:\/\/github.com\/natura-cosmeticos\/natds-android\/blob\/master\/" || BASE_URL="https:\/\/github.com\/natura-cosmeticos\/natds-android\/blob\/master\/doc\/" echo "Working on $file file now" @@ -15,7 +16,8 @@ do mdtodoc "$file" --dest ./doc/html --layout "page" --theme "github" --numbered-headings --code-copy --mermaid done -for file in $(find ./doc/html -type f -print) -do +find ./doc/html -type f -print >tmp + +while IFS= read -r -d '' file; do sed -i "s/ Date: Thu, 20 Jan 2022 07:32:49 -0300 Subject: [PATCH 06/13] fix: removes broken reference at Expandable Navigation View --- .../src/main/res/layout/ds_expandable_navigation_view.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/designsystem/src/main/res/layout/ds_expandable_navigation_view.xml b/designsystem/src/main/res/layout/ds_expandable_navigation_view.xml index b6ad5d70..01819944 100644 --- a/designsystem/src/main/res/layout/ds_expandable_navigation_view.xml +++ b/designsystem/src/main/res/layout/ds_expandable_navigation_view.xml @@ -1,11 +1,9 @@ + android:layout_gravity="start"> Date: Thu, 20 Jan 2022 07:47:33 -0300 Subject: [PATCH 07/13] fix: fixes warnings in Standard App Bar top layout and class --- .../com/natura/android/sample/components/AppBarTopActivity.kt | 2 +- sample/src/main/res/layout/appbartop_button_action.xml | 2 +- sample/src/main/res/layout/appbartop_search.xml | 2 +- sample/src/main/res/layout/appbartop_threeactions.xml | 2 +- sample/src/main/res/layout/appbartop_title_center.xml | 2 +- sample/src/main/res/layout/appbartop_title_long.xml | 2 +- sample/src/main/res/layout/appbartop_twoactions.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/AppBarTopActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/AppBarTopActivity.kt index 36bd4442..67c39d33 100644 --- a/sample/src/main/kotlin/com/natura/android/sample/components/AppBarTopActivity.kt +++ b/sample/src/main/kotlin/com/natura/android/sample/components/AppBarTopActivity.kt @@ -40,7 +40,7 @@ class AppBarTopActivity : AppCompatActivity() { setContentView(binding.root) - setSupportActionBar(layoutThreeActionsBinding.appBar.toolbar) + setSupportActionBar(layoutThreeActionsBinding.appBarWithThreeActions.toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(false) diff --git a/sample/src/main/res/layout/appbartop_button_action.xml b/sample/src/main/res/layout/appbartop_button_action.xml index 3bfecf18..a8a27cda 100644 --- a/sample/src/main/res/layout/appbartop_button_action.xml +++ b/sample/src/main/res/layout/appbartop_button_action.xml @@ -10,7 +10,7 @@ app:layout_constraintTop_toTopOf="parent"> Date: Thu, 20 Jan 2022 07:51:11 -0300 Subject: [PATCH 08/13] fix: removes unnused params and syntaxes --- .../src/main/kotlin/com/natura/android/avatar/Avatar.kt | 2 +- .../src/main/kotlin/com/natura/android/iconButton/IconButton.kt | 2 +- designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designsystem/src/main/kotlin/com/natura/android/avatar/Avatar.kt b/designsystem/src/main/kotlin/com/natura/android/avatar/Avatar.kt index 553dab17..65d77912 100644 --- a/designsystem/src/main/kotlin/com/natura/android/avatar/Avatar.kt +++ b/designsystem/src/main/kotlin/com/natura/android/avatar/Avatar.kt @@ -252,7 +252,7 @@ class Avatar : AbstractComposeView { } } - private fun init(attrs: AttributeSet? = null, defStyleAttr: Int = 0) { + private fun init(attrs: AttributeSet? = null) { if (attrs != null) { this.attrs = attrs diff --git a/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt b/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt index 3f3a2b8b..5ac981b4 100644 --- a/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt +++ b/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt @@ -40,7 +40,7 @@ class IconButton @JvmOverloads constructor( private var styleAttribute: Int = 0 private var enabledAttribute: Boolean = true - private lateinit var binding: IconButtonBinding + private var binding: IconButtonBinding init { try { diff --git a/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt b/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt index 739f124d..8bcc6e98 100644 --- a/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt +++ b/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt @@ -29,7 +29,7 @@ class Tag @JvmOverloads constructor( private var labelTextColorResourceAttribute = 0 private var tagAttributesArray: TypedArray - private lateinit var binding: TagBinding + private var binding: TagBinding init { try { From 07650ce844aeb7994d447577a1b53ae9f88a5c35 Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Thu, 20 Jan 2022 08:05:15 -0300 Subject: [PATCH 09/13] fix: fixes wrong property in ExpansionPanel layout --- designsystem/src/main/res/layout/ds_expansion_panel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designsystem/src/main/res/layout/ds_expansion_panel.xml b/designsystem/src/main/res/layout/ds_expansion_panel.xml index 152241db..0d8d5e04 100644 --- a/designsystem/src/main/res/layout/ds_expansion_panel.xml +++ b/designsystem/src/main/res/layout/ds_expansion_panel.xml @@ -57,7 +57,7 @@ android:layout_marginEnd="?spacingStandard" android:background="?selectableItemBackgroundBorderless" android:contentDescription="Collapse Arrow Icon" - android:tint="?colorOnBackground" + app:tint="?colorOnBackground" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/ds_expansion_panel_title" app:layout_constraintTop_toTopOf="@id/ds_expansion_panel_title" From ae32c3067761ede2eace6d7fea937e541178b135 Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Thu, 20 Jan 2022 08:21:16 -0300 Subject: [PATCH 10/13] fix: fixes the way to get the drawable to ensure backward compatibility with old android versions --- .../com/natura/android/badge/BadgeDrawable.kt | 36 ++++++++++--------- .../natura/android/iconButton/IconButton.kt | 5 +-- .../com/natura/android/listitem/ListItem.kt | 5 +-- .../progressindicator/ProgressIndicator.kt | 3 +- .../com/natura/android/shortcut/Shortcut.kt | 9 ++--- .../main/kotlin/com/natura/android/tag/Tag.kt | 3 +- 6 files changed, 34 insertions(+), 27 deletions(-) diff --git a/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt b/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt index e83c8daa..10a3457d 100644 --- a/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt +++ b/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt @@ -5,6 +5,7 @@ import android.graphics.* import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable import android.util.TypedValue +import androidx.core.content.res.ResourcesCompat import com.natura.android.R @@ -60,7 +61,7 @@ class BadgeDrawable( val bounds = bounds val badgeWith = getDimenFromTheme(R.attr.badgeDotHeight).toInt() - context.resources.getDrawable(R.drawable.badge_dot, context.theme).apply { + ResourcesCompat.getDrawable(context.resources,R.drawable.badge_dot, context.theme).apply { setTint(getColorFromTheme(getBackgroundColorByAttr())) setBounds( bounds.right - badgeWith, @@ -120,22 +121,23 @@ class BadgeDrawable( val bounds = bounds val badgeWidth = mTxtRect.width() + getDimenFromTheme(R.attr.spacingTiny).toInt() - context.resources.getDrawable(R.drawable.badge_standard, context.theme).apply { - setTint(getColorFromTheme(getBackgroundColorByAttr())) - setBounds( - bounds.right - badgeWidth, - bounds.top, - bounds.right, - getDimenFromTheme(R.attr.badgeStandardHeight).toInt() - ) - draw(canvas) - - drawText( - canvas, - this.bounds.exactCenterX(), - this.bounds.centerY() + getDimenFromTheme(R.attr.sizeMicro) - ) - } + ResourcesCompat.getDrawable(context.resources,R.drawable.badge_standard, context.theme) + ?.apply { + setTint(getColorFromTheme(getBackgroundColorByAttr())) + setBounds( + bounds.right - badgeWidth, + bounds.top, + bounds.right, + getDimenFromTheme(R.attr.badgeStandardHeight).toInt() + ) + draw(canvas) + + drawText( + canvas, + this.bounds.exactCenterX(), + this.bounds.centerY() + getDimenFromTheme(R.attr.sizeMicro) + ) + } } private fun drawText(canvas: Canvas, x: Float, y: Float) { diff --git a/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt b/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt index 5ac981b4..00a4ebc5 100644 --- a/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt +++ b/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt @@ -8,6 +8,7 @@ import android.view.View import android.widget.ImageView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat +import androidx.core.content.res.ResourcesCompat import androidx.core.content.res.getIntOrThrow import androidx.core.content.res.getResourceIdOrThrow import androidx.core.content.res.getStringOrThrow @@ -293,7 +294,7 @@ class IconButton @JvmOverloads constructor( android.graphics.PorterDuff.Mode.SRC_IN ) binding.iconButtonRippleBackground.background = - resources.getDrawable(rippleDrawableResourceAttribute, context.theme) + ResourcesCompat.getDrawable(context.resources,rippleDrawableResourceAttribute, context.theme) } private fun configureSize() { @@ -315,7 +316,7 @@ class IconButton @JvmOverloads constructor( private fun configureStyle() { if (styleAttribute != Style.INHERIT.value) { binding.iconButtonContainer.background = - resources.getDrawable(backgroundDrawableResourceAttribute, context.theme) + ResourcesCompat.getDrawable(context.resources,backgroundDrawableResourceAttribute, context.theme) binding.iconButtonContainer.elevation = resources.getDimension(elevationResourceAttribute) } } diff --git a/designsystem/src/main/kotlin/com/natura/android/listitem/ListItem.kt b/designsystem/src/main/kotlin/com/natura/android/listitem/ListItem.kt index 732c2b34..c4dc09ad 100644 --- a/designsystem/src/main/kotlin/com/natura/android/listitem/ListItem.kt +++ b/designsystem/src/main/kotlin/com/natura/android/listitem/ListItem.kt @@ -5,6 +5,7 @@ import android.content.res.TypedArray import android.util.AttributeSet import android.view.View import android.widget.RelativeLayout +import androidx.core.content.res.ResourcesCompat import com.natura.android.R import com.natura.android.divider.Divider import com.natura.android.exceptions.MissingThemeException @@ -72,7 +73,7 @@ class ListItem @JvmOverloads constructor( } fun enableSelectedState() { - this.background = resources.getDrawable(R.color.list_item_color_background_selected, context.theme) + this.background = ResourcesCompat.getDrawable(context.resources,R.color.list_item_color_background_selected, context.theme) isViewSelected = true } @@ -98,7 +99,7 @@ class ListItem @JvmOverloads constructor( return } - this.background = resources.getDrawable(R.drawable.list_item_ripple_background, context.theme) + this.background = ResourcesCompat.getDrawable(context.resources,R.drawable.list_item_ripple_background, context.theme) allowTouch(true) } diff --git a/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt b/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt index 9cc51b1e..52c8c725 100644 --- a/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt +++ b/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.res.TypedArray import android.util.AttributeSet import android.widget.ProgressBar +import androidx.core.content.res.ResourcesCompat import androidx.core.content.res.getResourceIdOrThrow import com.natura.android.R import com.natura.android.exceptions.MissingThemeException @@ -94,7 +95,7 @@ class ProgressIndicator @JvmOverloads constructor( private fun configureAppearance() { if (layerAttribute) { this.background = - context.resources.getDrawable(R.drawable.progress_indicator_layer, context.theme) + ResourcesCompat.getDrawable(context.resources,R.drawable.progress_indicator_layer, context.theme) } } diff --git a/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt b/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt index cfd52fb3..8c67235c 100644 --- a/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt +++ b/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt @@ -10,6 +10,7 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat +import androidx.core.content.res.ResourcesCompat import androidx.core.content.res.getIntOrThrow import androidx.core.content.res.getResourceIdOrThrow import androidx.core.content.res.getStringOrThrow @@ -191,15 +192,15 @@ class Shortcut @JvmOverloads constructor( } private fun setBackgroundContained() { - val background = resources.getDrawable(R.drawable.shortcut_background, null) - val backgroundWrap = DrawableCompat.wrap(background).mutate() - DrawableCompat.setTint(backgroundWrap, ContextCompat.getColor(context, backgroundColorResourceAttribute)) + val background = ResourcesCompat.getDrawable(context.resources,R.drawable.shortcut_background, null) + val backgroundWrap = background?.let { DrawableCompat.wrap(it).mutate() } + backgroundWrap?.let { DrawableCompat.setTint(it, ContextCompat.getColor(context, backgroundColorResourceAttribute)) } backgroundContainer.background = background } private fun setBackgroundOutlined() { - val background = resources.getDrawable(R.drawable.shortcut_background, null) as GradientDrawable + val background = ResourcesCompat.getDrawable(context.resources,R.drawable.shortcut_background, null) as GradientDrawable background.setColor(ContextCompat.getColor(context, backgroundColorResourceAttribute)) background.setStroke(1, ContextCompat.getColor(context, iconColorResourceAttribute)) diff --git a/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt b/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt index 8bcc6e98..9b672f11 100644 --- a/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt +++ b/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt @@ -7,6 +7,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat +import androidx.core.content.res.ResourcesCompat import androidx.core.content.res.getResourceIdOrThrow import androidx.core.content.res.getStringOrThrow import androidx.core.graphics.drawable.DrawableCompat @@ -91,7 +92,7 @@ class Tag @JvmOverloads constructor( private fun setBackground() { val background: GradientDrawable = - resources.getDrawable(R.drawable.tag_background, null) as GradientDrawable + ResourcesCompat.getDrawable(context.resources,R.drawable.tag_background, null) as GradientDrawable val backgroundWrap = DrawableCompat.wrap(background).mutate() val cornerRadius = 50F From 1863d3d8db0e6e4f8a3cdf715dfdd8ef4275bcc6 Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Thu, 20 Jan 2022 08:26:56 -0300 Subject: [PATCH 11/13] fix: fixes lint appoitments --- .../src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt | 4 ++-- .../main/kotlin/com/natura/android/iconButton/IconButton.kt | 4 ++-- .../src/main/kotlin/com/natura/android/listitem/ListItem.kt | 4 ++-- .../com/natura/android/progressindicator/ProgressIndicator.kt | 2 +- .../src/main/kotlin/com/natura/android/shortcut/Shortcut.kt | 4 ++-- designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt b/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt index 10a3457d..d6359506 100644 --- a/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt +++ b/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt @@ -61,7 +61,7 @@ class BadgeDrawable( val bounds = bounds val badgeWith = getDimenFromTheme(R.attr.badgeDotHeight).toInt() - ResourcesCompat.getDrawable(context.resources,R.drawable.badge_dot, context.theme).apply { + ResourcesCompat.getDrawable(context.resources, R.drawable.badge_dot, context.theme).apply { setTint(getColorFromTheme(getBackgroundColorByAttr())) setBounds( bounds.right - badgeWith, @@ -121,7 +121,7 @@ class BadgeDrawable( val bounds = bounds val badgeWidth = mTxtRect.width() + getDimenFromTheme(R.attr.spacingTiny).toInt() - ResourcesCompat.getDrawable(context.resources,R.drawable.badge_standard, context.theme) + ResourcesCompat.getDrawable(context.resources, R.drawable.badge_standard, context.theme) ?.apply { setTint(getColorFromTheme(getBackgroundColorByAttr())) setBounds( diff --git a/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt b/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt index 00a4ebc5..b17431c0 100644 --- a/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt +++ b/designsystem/src/main/kotlin/com/natura/android/iconButton/IconButton.kt @@ -294,7 +294,7 @@ class IconButton @JvmOverloads constructor( android.graphics.PorterDuff.Mode.SRC_IN ) binding.iconButtonRippleBackground.background = - ResourcesCompat.getDrawable(context.resources,rippleDrawableResourceAttribute, context.theme) + ResourcesCompat.getDrawable(context.resources, rippleDrawableResourceAttribute, context.theme) } private fun configureSize() { @@ -316,7 +316,7 @@ class IconButton @JvmOverloads constructor( private fun configureStyle() { if (styleAttribute != Style.INHERIT.value) { binding.iconButtonContainer.background = - ResourcesCompat.getDrawable(context.resources,backgroundDrawableResourceAttribute, context.theme) + ResourcesCompat.getDrawable(context.resources, backgroundDrawableResourceAttribute, context.theme) binding.iconButtonContainer.elevation = resources.getDimension(elevationResourceAttribute) } } diff --git a/designsystem/src/main/kotlin/com/natura/android/listitem/ListItem.kt b/designsystem/src/main/kotlin/com/natura/android/listitem/ListItem.kt index c4dc09ad..5dd1902b 100644 --- a/designsystem/src/main/kotlin/com/natura/android/listitem/ListItem.kt +++ b/designsystem/src/main/kotlin/com/natura/android/listitem/ListItem.kt @@ -73,7 +73,7 @@ class ListItem @JvmOverloads constructor( } fun enableSelectedState() { - this.background = ResourcesCompat.getDrawable(context.resources,R.color.list_item_color_background_selected, context.theme) + this.background = ResourcesCompat.getDrawable(context.resources, R.color.list_item_color_background_selected, context.theme) isViewSelected = true } @@ -99,7 +99,7 @@ class ListItem @JvmOverloads constructor( return } - this.background = ResourcesCompat.getDrawable(context.resources,R.drawable.list_item_ripple_background, context.theme) + this.background = ResourcesCompat.getDrawable(context.resources, R.drawable.list_item_ripple_background, context.theme) allowTouch(true) } diff --git a/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt b/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt index 52c8c725..071681a5 100644 --- a/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt +++ b/designsystem/src/main/kotlin/com/natura/android/progressindicator/ProgressIndicator.kt @@ -95,7 +95,7 @@ class ProgressIndicator @JvmOverloads constructor( private fun configureAppearance() { if (layerAttribute) { this.background = - ResourcesCompat.getDrawable(context.resources,R.drawable.progress_indicator_layer, context.theme) + ResourcesCompat.getDrawable(context.resources, R.drawable.progress_indicator_layer, context.theme) } } diff --git a/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt b/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt index 8c67235c..ba0307d9 100644 --- a/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt +++ b/designsystem/src/main/kotlin/com/natura/android/shortcut/Shortcut.kt @@ -192,7 +192,7 @@ class Shortcut @JvmOverloads constructor( } private fun setBackgroundContained() { - val background = ResourcesCompat.getDrawable(context.resources,R.drawable.shortcut_background, null) + val background = ResourcesCompat.getDrawable(context.resources, R.drawable.shortcut_background, null) val backgroundWrap = background?.let { DrawableCompat.wrap(it).mutate() } backgroundWrap?.let { DrawableCompat.setTint(it, ContextCompat.getColor(context, backgroundColorResourceAttribute)) } @@ -200,7 +200,7 @@ class Shortcut @JvmOverloads constructor( } private fun setBackgroundOutlined() { - val background = ResourcesCompat.getDrawable(context.resources,R.drawable.shortcut_background, null) as GradientDrawable + val background = ResourcesCompat.getDrawable(context.resources, R.drawable.shortcut_background, null) as GradientDrawable background.setColor(ContextCompat.getColor(context, backgroundColorResourceAttribute)) background.setStroke(1, ContextCompat.getColor(context, iconColorResourceAttribute)) diff --git a/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt b/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt index 9b672f11..744740bf 100644 --- a/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt +++ b/designsystem/src/main/kotlin/com/natura/android/tag/Tag.kt @@ -92,7 +92,7 @@ class Tag @JvmOverloads constructor( private fun setBackground() { val background: GradientDrawable = - ResourcesCompat.getDrawable(context.resources,R.drawable.tag_background, null) as GradientDrawable + ResourcesCompat.getDrawable(context.resources, R.drawable.tag_background, null) as GradientDrawable val backgroundWrap = DrawableCompat.wrap(background).mutate() val cornerRadius = 50F From 4e4b809dda2bf7818e3cd08ee9735920c934e8dd Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Thu, 20 Jan 2022 09:07:11 -0300 Subject: [PATCH 12/13] chore: reverts the refactoring of the ResourceCompat getDrawable method --- .../com/natura/android/badge/BadgeDrawable.kt | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt b/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt index d6359506..107e7aef 100644 --- a/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt +++ b/designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt @@ -5,7 +5,6 @@ import android.graphics.* import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable import android.util.TypedValue -import androidx.core.content.res.ResourcesCompat import com.natura.android.R @@ -61,7 +60,8 @@ class BadgeDrawable( val bounds = bounds val badgeWith = getDimenFromTheme(R.attr.badgeDotHeight).toInt() - ResourcesCompat.getDrawable(context.resources, R.drawable.badge_dot, context.theme).apply { + context.resources.getDrawable(R.drawable.badge_dot, context.theme).apply { + setTint(getColorFromTheme(getBackgroundColorByAttr())) setBounds( bounds.right - badgeWith, @@ -121,23 +121,22 @@ class BadgeDrawable( val bounds = bounds val badgeWidth = mTxtRect.width() + getDimenFromTheme(R.attr.spacingTiny).toInt() - ResourcesCompat.getDrawable(context.resources, R.drawable.badge_standard, context.theme) - ?.apply { - setTint(getColorFromTheme(getBackgroundColorByAttr())) - setBounds( - bounds.right - badgeWidth, - bounds.top, - bounds.right, - getDimenFromTheme(R.attr.badgeStandardHeight).toInt() - ) - draw(canvas) - - drawText( - canvas, - this.bounds.exactCenterX(), - this.bounds.centerY() + getDimenFromTheme(R.attr.sizeMicro) - ) - } + context.resources.getDrawable(R.drawable.badge_standard, context.theme).apply { + setTint(getColorFromTheme(getBackgroundColorByAttr())) + setBounds( + bounds.right - badgeWidth, + bounds.top, + bounds.right, + getDimenFromTheme(R.attr.badgeStandardHeight).toInt() + ) + draw(canvas) + + drawText( + canvas, + this.bounds.exactCenterX(), + this.bounds.centerY() + getDimenFromTheme(R.attr.sizeMicro) + ) + } } private fun drawText(canvas: Canvas, x: Float, y: Float) { From 39c612417368c804618b806b09a1bf2c732110a5 Mon Sep 17 00:00:00 2001 From: Guilherme Leonel Date: Thu, 20 Jan 2022 15:45:51 -0300 Subject: [PATCH 13/13] refactor: removes unused Travis script file --- tools/pipeline_build.sh | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 tools/pipeline_build.sh diff --git a/tools/pipeline_build.sh b/tools/pipeline_build.sh deleted file mode 100644 index 3d948c39..00000000 --- a/tools/pipeline_build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# task :sample:verifyDebugAndroidTestScreenshotTest removed because of an instability in Travis emulator -if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then - ./gradlew clean build publish -PdisablePreDex --stacktrace -else - ./gradlew clean build -PdisablePreDex --stacktrace -fi \ No newline at end of file