From 51379a249db820fac375ac8c793285a36300861e Mon Sep 17 00:00:00 2001 From: gururani-abhishek Date: Sun, 30 Apr 2023 14:04:15 +0530 Subject: [PATCH 1/5] fix #614 : removed unused onItemClick parameter from NewsResourceCardList.kt 1. removed the unused onItemClick parameter 2. removed now redundant variables it used 3. removed its description from the comments. --- .../apps/nowinandroid/core/ui/NewsResourceCardList.kt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt index 5cf7d7313..4d04ea620 100644 --- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt +++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt @@ -31,23 +31,18 @@ import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource * [UserNewsResource]s. * * [onToggleBookmark] defines the action invoked when a user wishes to bookmark an item - * [onItemClick] optional parameter for action to be performed when the card is clicked. The - * default action launches an intent matching the card. + * Default action launches an intent matching the card. */ fun LazyListScope.userNewsResourceCardItems( items: List, onToggleBookmark: (item: UserNewsResource) -> Unit, onNewsResourceViewed: (String) -> Unit, - onItemClick: ((item: UserNewsResource) -> Unit)? = null, onTopicClick: (String) -> Unit, itemModifier: Modifier = Modifier, ) = items( items = items, key = { it.id }, itemContent = { userNewsResource -> - val resourceUrl = Uri.parse(userNewsResource.url) - val backgroundColor = MaterialTheme.colorScheme.background.toArgb() - val context = LocalContext.current val analyticsHelper = LocalAnalyticsHelper.current NewsResourceCardExpanded( @@ -59,10 +54,6 @@ fun LazyListScope.userNewsResourceCardItems( analyticsHelper.logNewsResourceOpened( newsResourceId = userNewsResource.id, ) - when (onItemClick) { - null -> launchCustomChromeTab(context, resourceUrl, backgroundColor) - else -> onItemClick(userNewsResource) - } onNewsResourceViewed(userNewsResource.id) }, onTopicClick = onTopicClick, From bbc80bb0e2b836981e3d335a6e457d910375fd3a Mon Sep 17 00:00:00 2001 From: gururani-abhishek Date: Wed, 3 May 2023 16:40:36 +0530 Subject: [PATCH 2/5] added back launchCustomChromeTab() --- .../samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt index 4d04ea620..81a5b9c4a 100644 --- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt +++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt @@ -43,6 +43,9 @@ fun LazyListScope.userNewsResourceCardItems( items = items, key = { it.id }, itemContent = { userNewsResource -> + val resourceUrl = Uri.parse(userNewsResource.url) + val backgroundColor = MaterialTheme.colorScheme.background.toArgb() + val context = LocalContext.current val analyticsHelper = LocalAnalyticsHelper.current NewsResourceCardExpanded( @@ -54,6 +57,7 @@ fun LazyListScope.userNewsResourceCardItems( analyticsHelper.logNewsResourceOpened( newsResourceId = userNewsResource.id, ) + launchCustomChromeTab(context, resourceUrl, backgroundColor) onNewsResourceViewed(userNewsResource.id) }, onTopicClick = onTopicClick, From f6bdba08d9f3f65acc27777f97e0fcda38bf8961 Mon Sep 17 00:00:00 2001 From: gururani-abhishek Date: Wed, 3 May 2023 22:39:50 +0530 Subject: [PATCH 3/5] added comment to document what happens on tapping news resource card. --- .../samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt index 81a5b9c4a..ea1c09d01 100644 --- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt +++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt @@ -31,7 +31,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource * [UserNewsResource]s. * * [onToggleBookmark] defines the action invoked when a user wishes to bookmark an item - * Default action launches an intent matching the card. + * When a news resource card is tapped it will open the news resource URL in a Chrome Custom Tab. */ fun LazyListScope.userNewsResourceCardItems( items: List, From 831b766ec20f9b196b982dfc169e8b2c16b79ea0 Mon Sep 17 00:00:00 2001 From: tsumuchan Date: Sat, 13 May 2023 06:01:59 +0900 Subject: [PATCH 4/5] Clarify dependencies of the included build-logic --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5dbf401e5..3ce5e9077 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -103,9 +103,7 @@ firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.r firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" } firebase-cloud-messaging = { group = "com.google.firebase", name = "firebase-messaging-ktx" } firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" } -firebase-crashlytics-gradle = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" } firebase-performance = { group = "com.google.firebase", name = "firebase-perf-ktx" } -firebase-performance-gradle = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" } hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" } hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } @@ -130,6 +128,8 @@ turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine # Dependencies of the included build-logic android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" } +firebase-crashlytics-gradle = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" } +firebase-performance-gradle = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" } kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" } From e1025d8363605ddfc4d8ef3b4b9d417738486107 Mon Sep 17 00:00:00 2001 From: tsumuchan Date: Sat, 13 May 2023 06:09:02 +0900 Subject: [PATCH 5/5] Update gradle plugin naming --- build-logic/convention/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index 571ba8c2f..fecdb7057 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -37,8 +37,8 @@ tasks.withType().configureEach { dependencies { compileOnly(libs.android.gradlePlugin) - compileOnly(libs.firebase.crashlytics.gradle) - compileOnly(libs.firebase.performance.gradle) + compileOnly(libs.firebase.crashlytics.gradlePlugin) + compileOnly(libs.firebase.performance.gradlePlugin) compileOnly(libs.kotlin.gradlePlugin) compileOnly(libs.ksp.gradlePlugin) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3ce5e9077..5705059b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -128,8 +128,8 @@ turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine # Dependencies of the included build-logic android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" } -firebase-crashlytics-gradle = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" } -firebase-performance-gradle = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" } +firebase-crashlytics-gradlePlugin = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" } +firebase-performance-gradlePlugin = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" } kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }