ANDROID-13592 - Unify Ids Title

library/src/main/java/com/telefonica/mistica/compose/title/Title.kt

@@ -1,14 +1,14 @@
 package com.telefonica.mistica.compose.title
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.unit.dp
+import com.telefonica.mistica.compose.button.Button
+import com.telefonica.mistica.compose.button.ButtonStyle
 import com.telefonica.mistica.compose.theme.MisticaTheme
 
 @Composable
@@ -20,7 +20,7 @@ fun Title(
     onLinkClicked: (() -> Unit)? = null,
 ) {
     Row(
-        modifier = modifier,
+        modifier = modifier.testTag(TitleTestTag.TITLE),
     ) {
         TitleText(
             modifier = Modifier
@@ -31,12 +31,11 @@ fun Title(
         )
 
         linkText?.let {
-            Link(
-                modifier = Modifier
-                    .padding(start = 16.dp)
-                    .alignByBaseline(),
-                text = it,
-                onClick = onLinkClicked
+            Button(
+                modifier = modifier.testTag(TitleTestTag.TITLE_LINK),
+                text = text,
+                buttonStyle = ButtonStyle.LINK,
+                onClickListener = { onLinkClicked?.invoke() }
             )
         }
     }
@@ -66,34 +65,20 @@ private fun TitleText(
     }
 
     Text(
-        modifier = modifier,
+        modifier = modifier.testTag(TitleTestTag.TITLE_TEXT),
         text = if (isAllCaps) text.uppercase() else text,
         style = preset,
         color = textColor
     )
 }
 
-@Composable
-private fun Link(
-    modifier: Modifier,
-    text: String,
-    onClick: (() -> Unit)? = null,
-) {
-    val linkModifier = if (onClick != null) {
-        modifier.then(Modifier.clickable { onClick() })
-    } else {
-        modifier
-    }
-
-    Text(
-        modifier = linkModifier,
-        text = text,
-        style = MisticaTheme.typography.presetLink,
-        color = MisticaTheme.colors.textLink
-    )
-}
-
 enum class TitleStyle {
     TITLE_1,
     TITLE_2
 }
+
+object TitleTestTag {
+    const val TITLE = "title"
+    const val TITLE_TEXT = "title_text"
+    const val TITLE_LINK = "title_link"
+}

library/src/main/java/com/telefonica/mistica/title/TitleView.kt

@@ -8,9 +8,11 @@ import androidx.annotation.AttrRes
 import androidx.annotation.IntDef
 import androidx.annotation.StyleRes
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
 import androidx.databinding.BindingMethod
 import androidx.databinding.BindingMethods
 import com.telefonica.mistica.R
+import com.telefonica.mistica.button.Button
 import com.telefonica.mistica.util.getThemeColor
 import com.telefonica.mistica.util.setTextAndVisibility
 import com.telefonica.mistica.util.setTextPreset
@@ -50,14 +52,14 @@ class TitleView @JvmOverloads constructor(
     )
     annotation class TitleStyle
 
-    private var linkTextView: TextView
+    private var linkTextView: Button
     private var titleTextView: TextView
 
     init {
         LayoutInflater.from(context).inflate(R.layout.title, this, true)
 
         titleTextView = findViewById(R.id.title_text)
-        linkTextView = findViewById(R.id.link_text)
+        linkTextView = findViewById(R.id.title_link)
 
         if (attrs != null) {
             val styledAttrs =
@@ -70,8 +72,12 @@ class TitleView @JvmOverloads constructor(
 
             titleTextView.setTextAndVisibility(styledAttrs.getText(R.styleable.TitleView_title))
             setTitleStyle(styledAttrs.getInt(R.styleable.TitleView_titleStyle, -1))
-
-            linkTextView.setTextAndVisibility(styledAttrs.getText(R.styleable.TitleView_link))
+            if (styledAttrs.getText(R.styleable.TitleView_link)?.isNotBlank() == true) {
+                linkTextView.text = styledAttrs.getText(R.styleable.TitleView_link)
+                linkTextView.isVisible = true
+            } else {
+                linkTextView.isVisible = false
+            }
 
             styledAttrs.recycle()
         }
@@ -98,7 +104,12 @@ class TitleView @JvmOverloads constructor(
     fun getLink(): String = linkTextView.text.toString()
 
     fun setLink(text: CharSequence?) {
-        linkTextView.setTextAndVisibility(text)
+        if (text?.isNotBlank() == true) {
+            linkTextView.text = text
+            linkTextView.isVisible = true
+        } else {
+            linkTextView.isVisible = false
+        }
     }
 
     fun setOnLinkClickedListener(listener: () -> Unit) {
@@ -127,4 +138,4 @@ private data class TitleStyleConfig(
     @StyleRes val preset: Int,
     @AttrRes val colorAttrRes: Int,
     val isAllCaps: Boolean,
-)
+)

library/src/main/res/layout/title.xml

@@ -2,6 +2,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/title"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
@@ -14,24 +15,23 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/link_text"
+        app:layout_constraintEnd_toStartOf="@id/title_link"
         app:layout_constraintTop_toTopOf="parent"
         android:textAppearance="@style/AppTheme.TextAppearance.Preset1.Medium"
         android:textColor="?colorTextSecondary"
         tools:text="Some title that can get really long and almost fill the whole line" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/link_text"
+    <com.telefonica.mistica.button.Button
+        android:id="@+id/title_link"
+        style="@style/AppTheme.Button.LinkButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:textAppearance="@style/AppTheme.TextAppearance.PresetLink"
         app:layout_constraintBaseline_toBaselineOf="@id/title_text"
-        android:textColor="?colorTextLink"
         android:visibility="gone"
         tools:text="Some link"
         tools:visibility="visible"
         tools:ignore="RtlSymmetry" />
-</merge>
+</merge>