Release/1.0.19 (#88)

Spendesk · Apr 15, 2022 · 17e58ac · 17e58ac
1 parent 1315125
commit 17e58ac
Show file tree

Hide file tree

Showing 49 changed files with 1,591 additions and 393 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@
 buildscript {
 
     ext {
-        grapes_version = '1.0.18'
+        grapes_version = '1.0.19'
 
         kotlin_version = '1.5.31'
         firebase_app_distribution_version = '2.1.2'

diff --git a/library/src/main/java/com/spendesk/grapes/ActionMessageBottomSheetDialogFragment.kt b/library/src/main/java/com/spendesk/grapes/ActionMessageBottomSheetDialogFragment.kt
@@ -12,9 +12,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.spendesk.grapes.databinding.FragmentBottomSheetInfoBinding
-import com.spendesk.grapes.extensions.getHeight
-import com.spendesk.grapes.extensions.visibleOrGone
-import com.spendesk.grapes.extensions.visibleWithTextOrGone
+import com.spendesk.grapes.extensions.*
 
 /**
  * @author danyboucanova
@@ -95,8 +93,8 @@ open class ActionMessageBottomSheetDialogFragment : BottomSheetDialogFragment()
             actionMessageBottomSheetTitleText.text = configuration.title
 
             actionMessageBottomSheetDescriptionText.visibleWithTextOrGone(configuration.description)
-            actionMessageBottomSheetPrimaryButton.visibleWithTextOrGone(configuration.primaryButtonText)
-            actionMessageBottomSheetSecondaryButton.visibleWithTextOrGone(configuration.secondaryButtonText)
+            with(actionMessageBottomSheetPrimaryButton) { configuration.primaryButtonText?.let { visible(); setText(it) } ?: gone() }
+            with(actionMessageBottomSheetSecondaryButton) { configuration.secondaryButtonText?.let { visible(); setText(it) } ?: gone() }
             actionMessageBottomSheetPullView.visibleOrGone(configuration.shouldShowHandle)
 
             actionMessageBottomSheetDescriptionText.apply {

diff --git a/library/src/main/java/com/spendesk/grapes/BadgeView.kt b/library/src/main/java/com/spendesk/grapes/BadgeView.kt
@@ -5,15 +5,15 @@ import android.graphics.Typeface
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.Gravity
-import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
+import com.google.android.material.textview.MaterialTextView
 
 /**
  * @author danyboucanova
  * @since 18/11/2020
  */
-class BadgeView : AppCompatTextView {
+class BadgeView : MaterialTextView {
 
     //region constructors
     constructor(context: Context) : super(context)