Skip to content

Commit

Permalink
ANDROID-14792 Support Checkbox with Links for Compose implementation (#…
Browse files Browse the repository at this point in the history
…400)

* ANDROID-14792 Update. Replace deprecated provider reference

* ANDROID-14792 Update. Compose UI version and migrate errors from updating

* ANDROID-14792 Support Checkbox with Links for Compose implementation

* ANDROID-14792 Update. Ignore detekt error

* Updated screenshots baseline

* ANDROID-14792 Update. Support custom link tag according to @jeprubio suggestion

* ANDROID-14792 Update. AGP version according to new lint version needed to use new composeui version

* ANDROID-14792 Fix. Lint errors

* ANDROID-14792 Update. Rename link_buttom layout to avoid ResNotFound error

* ANDROID-14792 Update. Rename title layout to avoid unitTest error

---------

Co-authored-by: haynlo <[email protected]>
  • Loading branch information
haynlo and haynlo authored Jan 8, 2025
1 parent 104b522 commit df121ea
Show file tree
Hide file tree
Showing 1,208 changed files with 112 additions and 137 deletions.
5 changes: 5 additions & 0 deletions build-tools/detekt/detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ naming:
FunctionNaming:
active: true
ignoreAnnotated: 'Composable'
MatchingDeclarationName:
active: true
excludes:
- '**/ButtonStyles.kt'


empty-blocks:
EmptyFunctionBlock:
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
ext {
min_sdk_version = 24
target_sdk_version = 34
compose_ui_version = "1.5.4"
compose_ui_version = "1.7.6"
compose_compiler_version = '1.5.7'
kotlin_version = "1.9.21"
androidx_appcompat_version = "1.6.0"
Expand All @@ -22,7 +22,7 @@ buildscript {
}
}
dependencies {
classpath "com.android.tools.build:gradle:8.1.4"
classpath "com.android.tools.build:gradle:8.7.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "gradle.plugin.com.betomorrow.gradle:appcenter-plugin:2.0.3"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detekt_version"
Expand Down
1 change: 1 addition & 0 deletions catalog/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ dependencies {
implementation 'androidx.activity:activity-compose:1.4.0'
implementation "androidx.navigation:navigation-compose:2.5.3"
implementation "androidx.compose.material:material:$compose_ui_version"
implementation("androidx.compose.material:material-icons-extended:$compose_ui_version")
implementation "androidx.compose.ui:ui:$compose_ui_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.telefonica.mistica.catalog.ui.classic.components

import android.annotation.SuppressLint
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
Expand All @@ -21,6 +22,7 @@ class SteppersCatalogFragment : Fragment() {
return layoutInflater.inflate(R.layout.screen_steppers_catalog, container, false)
}

@SuppressLint("SetTextI18n")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

Expand All @@ -42,7 +44,7 @@ class SteppersCatalogFragment : Fragment() {
numberOfSteps.map { it.toString() }
)
)
setText(2.toString())
setText(maxSteps.toString())
setOnItemClickListener { _, _, position, _ ->
maxSteps = numberOfSteps[position]
currentStep = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ fun TabsCatalog() {
text = "Remove last tab",
onClickListener = {
if (tabs.size > 1) {
tabs = tabs.toMutableList().also {
it.removeLast()
tabs = tabs.toMutableList().apply {
removeAt(lastIndex)
}
if (currentIndex >= tabs.size) {
currentIndex = tabs.size - 1
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jan 09 09:55:03 CET 2024
#Fri Dec 20 12:16:17 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout-compose:$constraintComposeVersion"

implementation "androidx.compose.material:material:$compose_ui_version"
implementation("androidx.compose.material:material-icons-extended:$compose_ui_version")
implementation "androidx.compose.ui:ui:$compose_ui_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"

Expand Down
Binary file modified library/screenshots/Badge_numeric_one_digit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Badge_numeric_two_digits.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_BlauBrand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_BlauBrand_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_BlauBrand_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_BlauBrand_icon_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_BlauBrand_icon_loadingText.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_BlauBrand_loadingText.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_BlauBrand_loadingText_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_LINK_BlauBrand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_LINK_BlauBrand_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_LINK_BlauBrand_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_LINK_BlauBrand_icon_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_LINK_BlauBrand_loadingText.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_BlauBrand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_BlauBrand_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_MovistarBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_O2Brand.png
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_O2Brand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_O2Brand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_O2NewBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_TuBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_TuBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_TuBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_INVERSE_VivoBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_MovistarBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_MovistarBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_MovistarBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_O2Brand.png
Binary file modified library/screenshots/Button_DANGER_LINK_O2Brand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_O2Brand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_O2Brand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_O2Brand_loadingText.png
Binary file modified library/screenshots/Button_DANGER_LINK_O2NewBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_O2NewBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_O2NewBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_O2NewBrand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_BlauBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_BlauBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_BlauBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_INVERSE_O2Brand.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_INVERSE_TuBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_MovistarBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_O2Brand.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_O2Brand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_O2Brand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_O2NewBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_O2NewBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_TelefonicaBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_TuBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_TuBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_TuBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_VivoBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_VivoBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_SMALL_VivoBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_TelefonicaBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_TelefonicaBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_TelefonicaBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_TuBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_TuBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_TuBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_TuBrand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_TuBrand_loadingText.png
Binary file modified library/screenshots/Button_DANGER_LINK_VivoBrand.png
Binary file modified library/screenshots/Button_DANGER_LINK_VivoBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_VivoBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_LINK_VivoBrand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_LINK_VivoBrand_loadingText.png
Binary file modified library/screenshots/Button_DANGER_MovistarBrand.png
Binary file modified library/screenshots/Button_DANGER_MovistarBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_MovistarBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_MovistarBrand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_MovistarBrand_loadingText.png
Binary file modified library/screenshots/Button_DANGER_O2Brand.png
Binary file modified library/screenshots/Button_DANGER_O2Brand_dark.png
Binary file modified library/screenshots/Button_DANGER_O2Brand_icon.png
Binary file modified library/screenshots/Button_DANGER_O2Brand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_O2Brand_icon_loadingText.png
Binary file modified library/screenshots/Button_DANGER_O2Brand_loadingText.png
Binary file modified library/screenshots/Button_DANGER_O2Brand_loadingText_dark.png
Binary file modified library/screenshots/Button_DANGER_O2NewBrand.png
Binary file modified library/screenshots/Button_DANGER_O2NewBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_O2NewBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_O2NewBrand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_O2NewBrand_icon_loadingText.png
Binary file modified library/screenshots/Button_DANGER_O2NewBrand_loadingText.png
Binary file modified library/screenshots/Button_DANGER_SMALL_BlauBrand.png
Binary file modified library/screenshots/Button_DANGER_SMALL_BlauBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_SMALL_BlauBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_SMALL_BlauBrand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_SMALL_MovistarBrand.png
Binary file modified library/screenshots/Button_DANGER_SMALL_MovistarBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_SMALL_MovistarBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_SMALL_O2Brand.png
Binary file modified library/screenshots/Button_DANGER_SMALL_O2Brand_dark.png
Binary file modified library/screenshots/Button_DANGER_SMALL_O2Brand_icon.png
Binary file modified library/screenshots/Button_DANGER_SMALL_O2Brand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_SMALL_O2Brand_loadingText.png
Binary file modified library/screenshots/Button_DANGER_SMALL_O2NewBrand.png
Binary file modified library/screenshots/Button_DANGER_SMALL_O2NewBrand_dark.png
Binary file modified library/screenshots/Button_DANGER_SMALL_O2NewBrand_icon.png
Binary file modified library/screenshots/Button_DANGER_SMALL_O2NewBrand_icon_dark.png
Binary file modified library/screenshots/Button_DANGER_SMALL_TelefonicaBrand.png
Binary file modified library/screenshots/Button_DANGER_SMALL_TelefonicaBrand_dark.png
Loading

0 comments on commit df121ea

Please sign in to comment.