fixed up padding for button and card

Author: Jian Liew

udsnative/src/main/java/com/telus/udsnative/components/button/Button.kt

@@ -88,7 +88,7 @@ fun Button(
                     onClick = onClick,
                     enabled = appearance.state != ButtonState.Inactive
                 )
-                .padding(2.dp + tokens.outerBorderGap)
+                .padding(2.dp + tokens.outerBorderGap) //outer border padding
                 .indication(
                     interactionSource = interactionSource,
                     indication = null
@@ -103,7 +103,7 @@ fun Button(
                     color = tokens.borderColor.color
                 )
                 .clip(shape = RoundedCornerShape(tokens.borderRadius))
-                .padding(start = tokens.paddingLeft, top = tokens.paddingTop, end = tokens.paddingRight, bottom = tokens.paddingBottom),
+                .padding(start = tokens.paddingLeft, top = tokens.paddingTop +2.dp, end = tokens.paddingRight, bottom = tokens.paddingBottom + 2.dp), //inner button padding
             horizontalArrangement = Arrangement.spacedBy(
                 space = contentSpacing,
                 alignment = contentAlignment

udsnative/src/main/java/com/telus/udsnative/components/card/CardAppearance.kt

@@ -5,17 +5,14 @@ import com.telus.udsnative.models.Appearance
 class CardAppearance(variant: CardVariant): Appearance {
     val background: Background
     val padding: Padding
-    val viewport: Viewport // Temporary hardcoded value until viewport is removed from theme file
 
     init {
         this.background = variant.background
         this.padding = variant.padding
-        this.viewport = variant.viewport
     }
 
     override fun asMap(): Map<String, Any> = mapOf(
         "background" to background.name,
-        "padding" to padding.name,
-        "viewport" to viewport.name
+        "padding" to padding.name
     )
 }

udsnative/src/main/java/com/telus/udsnative/components/typography/TypographyAppearance.kt

@@ -14,6 +14,7 @@ class TypographyAppearance(variant: TypographyVariant) : Appearance {
         "colour" to variant.colour.name,
         "compact" to variant.compact,
         "inverse" to variant.inverse,
-        "size" to variant.size.name
+        "size" to variant.size.name,
+        "viewport" to variant.viewport.name // Temporary hardcoded value until viewport is removed from theme file
     )
 }

udsnative/src/main/java/com/telus/udsnative/components/typography/TypographyVariant.kt

@@ -7,6 +7,7 @@ data class TypographyVariant(
     val colour: TypographyColor = TypographyColor.default,
     val compact: Boolean = false,
     val inverse: Boolean = false,
-    val size: TypographySize = TypographySize.default
+    val size: TypographySize = TypographySize.default,
+    val viewport: TypographyViewport = TypographyViewport.lg
 
 ) : Variant

udsnative/src/main/java/com/telus/udsnative/components/typography/TypographyViewport.kt

@@ -0,0 +1,5 @@
+package com.telus.udsnative.components.typography
+
+enum class TypographyViewport {
+    xs, sm, md, lg, xl
+}