Merge branch 'master' of github.com:natura-cosmeticos/natds-android

README.md

@@ -120,3 +120,4 @@ And:
 - Menu
 - Navigation View
 - Text Field
+- [Shortcut](doc/shortcut.md)

build.gradle

@@ -51,4 +51,5 @@ ext {
     materialVersion = '1.1.0'
     espressoIntentsVersion = '3.1.0'
     mockKVersion = '1.10.0'
+    coreKTXVersion = '1.3.0'
 }

designsystem/build.gradle

@@ -55,13 +55,14 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "com.google.android.material:material:$rootProject.materialVersion"
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayout"
-
+    implementation "androidx.core:core-ktx:$rootProject.coreKTXVersion"
     testImplementation "junit:junit:$rootProject.junitVersion"
     testImplementation "androidx.test.ext:truth:$rootProject.truthVersion"
     testImplementation "androidx.test:runner:$rootProject.androidXTestVersion"
     testImplementation "androidx.test:core-ktx:$rootProject.testCoreKtxVersion"
     testImplementation "androidx.test.ext:junit:$rootProject.androidxJunitVersion"
     testImplementation "org.robolectric:robolectric:$rootProject.robolectricVersion"
+    testImplementation "io.mockk:mockk:$rootProject.mockKVersion"
 }
 
 androidExtensions {

designsystem/src/main/kotlin/com/natura/android/appbar/AppBar.kt

@@ -1,101 +1,124 @@
 package com.natura.android.appbar
 
-import android.app.Activity
 import android.content.Context
-import android.graphics.Color
-import android.os.Build
+import android.graphics.drawable.Drawable
 import android.util.AttributeSet
+import android.util.DisplayMetrics
 import android.util.TypedValue
+import android.view.Gravity
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager
+import android.widget.ImageView
 import androidx.appcompat.widget.Toolbar
 import com.natura.android.R
-import kotlin.math.sqrt
+import com.natura.android.ext.setVisibilityFromBoolean
+import com.natura.android.badge.BadgeDrawable
 
-// WIP
 class AppBar(context: Context, attrs: AttributeSet) : Toolbar(context, attrs) {
-    var color: Int
+
+    private lateinit var badgeDrawable: BadgeDrawable
+    private var showLogo: Boolean
+    private val logo: ImageView
 
     init {
-        context
-            .theme
-            .obtainStyledAttributes(attrs, R.styleable.AppBar, 0, 0)
-            .apply {
-                try {
-                    color = this.getInt(R.styleable.AppBar_appBarType, 0)
-                } finally {
-                    recycle()
-                }
-            }
-    }
+        logo = createLogo(context, attrs)
 
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        setStatusBarStyle()
+        val typedValue = context.obtainStyledAttributes(attrs, R.styleable.AppBar)
+        showLogo = typedValue.getBoolean(R.styleable.AppBar_showLogo, false)
+        setLogoVisibility()
 
-        this.setBackgroundColor(getThemeColor(getMainColorFromAttrs()))
-        this.setTitleTextColor(getThemeColor(getMainOnColorFromAttrs()))
+        addView(logo)
 
-        if (isOnColorTooLight(getThemeColor(getMainOnColorFromAttrs()))) {
-            setStatusBarIconsLighter()
-        } else {
-            setStatusBarIconsDarker()
+        contentInsetStartWithNavigation = 0
+        elevation = getElevationFromTheme(context)
+
+        typedValue.recycle()
+    }
+
+    private fun setLogoVisibility() {
+        logo.setVisibilityFromBoolean(showLogo)
+
+        if (showLogo) {
+            title = ""
         }
     }
 
-    private fun isOnColorTooLight(color: Int): Boolean {
-        val rgb = intArrayOf(Color.red(color), Color.green(color), Color.blue(color))
-        val brightness = sqrt(rgb[0] * rgb[0] * .241 + (rgb[1] * rgb[1] * .691) + rgb[2] * rgb[2] * .068).toInt()
-        return brightness >= 200
+    fun showLogo() {
+        showLogo = true
+        setLogoVisibility()
     }
 
-    private fun setStatusBarStyle() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+    fun hideLogo() {
+        showLogo = false
+        setLogoVisibility()
+    }
+
+    fun addMenuIconBadge(menuIcon: Drawable, initBadgeValue: Int) {
+        badgeDrawable = BadgeDrawable(context, initBadgeValue, menuIcon)
+    }
 
-            val context = context as Activity
-            val window = context.window
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-            window.statusBarColor = getThemeColor(getMainColorFromAttrs())
+    fun updateBadgeValue(value: Int) {
+        if (this::badgeDrawable.isInitialized) {
+            badgeDrawable.updateBadgeDrawable(value)
         }
     }
 
-    private fun getMainColorFromAttrs(): Int {
-        return when (color) {
-                1 -> R.attr.colorPrimary
-                2 -> R.attr.colorSecondary
-                3 -> android.R.color.transparent
-                else -> R.attr.colorSurface
-            }
+    private fun createLogo(context: Context, attrs: AttributeSet): ImageView {
+        val imageView = ImageView(context)
+        imageView.setImageResource(getLogoResId(context, attrs))
+        val logoWidth = getLogoWidthFromTheme(context)
+        imageView.layoutParams =
+            LayoutParams(logoWidth, ViewGroup.LayoutParams.WRAP_CONTENT, getLogoAlign(context))
+        imageView.visibility = View.GONE
+        return imageView
     }
 
-    private fun getMainOnColorFromAttrs(): Int {
-        return when (color) {
-            1 -> R.attr.colorOnPrimary
-            2 -> R.attr.colorOnSecondary
-            3 -> R.attr.colorOnSurface
-            else -> R.attr.colorOnSurface
+    private fun getLogoAlign(context: Context): Int {
+        return if (getWindowWidthInPx(context) < MINIMUM_SCREEN_SIZE_FOR_CENTRALIZED_LOGO) {
+            Gravity.START
+        } else {
+            Gravity.CENTER
         }
     }
 
-    private fun getThemeColor(colorAttr: Int): Int {
-        val outValue = TypedValue()
-        context.theme.resolveAttribute(colorAttr, outValue, true)
-        return outValue.data
+    private fun getLogoWidthFromTheme(context: Context): Int {
+        val typedValue = TypedValue()
+        if (context.theme.resolveAttribute(R.attr.sizeHugeX, typedValue, true)) {
+            return TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics)
+        }
+
+        return ViewGroup.LayoutParams.WRAP_CONTENT
     }
 
-    private fun setStatusBarIconsDarker() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            val context = context as Activity
-            val window = context.window
-            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+    private fun getElevationFromTheme(context: Context): Float {
+        val typedValue = TypedValue()
+        if (context.theme.resolveAttribute(R.attr.elevation02, typedValue, true)) {
+            return TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics).toFloat()
         }
+
+        return 0f
     }
 
-    private fun setStatusBarIconsLighter() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            val context = context as Activity
-            val window = context.window
-            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+    private fun getLogoResId(context: Context, attrs: AttributeSet): Int {
+        val typedValue = context.theme
+            .obtainStyledAttributes(attrs, intArrayOf(R.attr.logoHorizontal), 0, 0)
+        return typedValue.getResourceId(0, 0)
+    }
+
+    private fun getWindowWidthInPx(context: Context): Int {
+        return try {
+            val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+            val metrics = DisplayMetrics()
+            windowManager.defaultDisplay.getMetrics(metrics)
+
+            metrics.widthPixels
+        } catch (ex: Exception) {
+            MINIMUM_SCREEN_SIZE_FOR_CENTRALIZED_LOGO
         }
     }
+
+    companion object {
+        private const val MINIMUM_SCREEN_SIZE_FOR_CENTRALIZED_LOGO = 361
+    }
 }

designsystem/src/main/kotlin/com/natura/android/exceptions/MissingThemeException.kt

@@ -0,0 +1,6 @@
+package com.natura.android.exceptions
+
+import java.lang.IllegalArgumentException
+
+class MissingThemeException :
+    IllegalArgumentException("⚠️ ⚠️ Missing DS Theme. You are using a DS component without setting a DS Theme. You MUST set a DS theme at the component or in a parent view")

designsystem/src/main/kotlin/com/natura/android/extensions/TextFieldExtensions.kt

@@ -0,0 +1,12 @@
+package com.natura.android.extensions
+
+import android.os.Build
+import android.widget.TextView
+
+fun TextView.setAppearance(textAppearance: Int) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+        this.setTextAppearance(context, textAppearance)
+    } else {
+        this.setTextAppearance(textAppearance)
+    }
+}