Merge branch 'main' into feature/open_settings_app_from_timetable_det…

…ail_snack_bar_compose_multiplatform
DroidKaigi · Sep 1, 2024 · d6911cb · d6911cb
2 parents 5354a6e + c8b8910
commit d6911cb
Show file tree

Hide file tree

Showing 13 changed files with 201 additions and 51 deletions.
diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt b/app-android/src/main/java/io/github/droidkaigi/confsched/KaigiApp.kt
@@ -362,7 +362,8 @@ private class ExternalNavController(
 
     fun onShareClick(timetableItem: TimetableItem) {
         shareNavigator.share(
-            "[${timetableItem.room.name.currentLangTitle}] ${timetableItem.startsTimeString} - ${timetableItem.endsTimeString}\n" +
+            "[${timetableItem.room.name.currentLangTitle}] ${timetableItem.formattedMonthAndDayString} " +
+                "${timetableItem.startsTimeString} - ${timetableItem.endsTimeString}\n" +
                 "${timetableItem.title.currentLangTitle}\n" +
                 timetableItem.url,
         )

diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpKtorfitPlugin.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpKtorfitPlugin.kt
@@ -53,15 +53,6 @@ class KmpKtorfitPlugin : Plugin<Project> {
                     add("ksp$it", libs.library("ktorfitKsp"))
                 }
             }
-
-            // https://github.com/DroidKaigi/conference-app-2024/issues/485#issuecomment-2304251937
-            tasks.withType<KspTaskNative>().configureEach {
-                notCompatibleWithConfigurationCache("Configuration chache not supported for a system property read at configuration time")
-
-            }
-            tasks.withType<KotlinNativeLink>().configureEach {
-                notCompatibleWithConfigurationCache("Configuration chache not supported for a system property read at configuration time")
-            }
         }
     }
 }
diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpPlugin.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpPlugin.kt
@@ -1,5 +1,6 @@
 package io.github.droidkaigi.confsched.primitive
 
+import com.google.devtools.ksp.gradle.KspTaskNative
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -13,6 +14,11 @@ class KmpPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply("org.jetbrains.kotlin.multiplatform")
 
+                withPlugin(libs.plugin("kspGradlePlugin").pluginId) {
+                    tasks.withType<KspTaskNative>().configureEach {
+                        notCompatibleWithConfigurationCache("Configuration chache not supported for a system property read at configuration time")
+                    }
+                }
             }
             tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java) {
                 kotlinOptions.jvmTarget = "11"

diff --git a/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/TimetableItem.kt b/core/model/src/commonMain/kotlin/io/github/droidkaigi/confsched/model/TimetableItem.kt
@@ -93,6 +93,11 @@ public sealed class TimetableItem {
         "$startsDateString / $formattedTimeString ($minutesString)"
     }
 
+    public val formattedMonthAndDayString: String by lazy {
+        val localDate = startsAt.toLocalDateTime(TimeZone.currentSystemDefault())
+        "${localDate.monthNumber}".padStart(2, '0') + "/" + "${localDate.dayOfMonth}".padStart(2, '0')
+    }
+
     public val url: String get() = if (defaultLang() == Lang.JAPANESE) {
         "https://2024.droidkaigi.jp/timetable/${id.value}"
     } else {

diff --git a/...ting/src/main/java/io/github/droidkaigi/confsched/testing/robot/ProfileCardScreenRobot.kt b/...ting/src/main/java/io/github/droidkaigi/confsched/testing/robot/ProfileCardScreenRobot.kt
@@ -3,6 +3,7 @@ package io.github.droidkaigi.confsched.testing.robot
 import android.graphics.RenderNode
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsEnabled
+import androidx.compose.ui.test.assertIsNotDisplayed
 import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.assertTextEquals
 import androidx.compose.ui.test.hasTestTag
@@ -14,6 +15,7 @@ import io.github.droidkaigi.confsched.profilecard.ProfileCardCardScreenTestTag
 import io.github.droidkaigi.confsched.profilecard.ProfileCardCreateButtonTestTag
 import io.github.droidkaigi.confsched.profilecard.ProfileCardEditButtonTestTag
 import io.github.droidkaigi.confsched.profilecard.ProfileCardEditScreenColumnTestTag
+import io.github.droidkaigi.confsched.profilecard.ProfileCardInputErrorTextTestTag
 import io.github.droidkaigi.confsched.profilecard.ProfileCardLinkTextFieldTestTag
 import io.github.droidkaigi.confsched.profilecard.ProfileCardNicknameTextFieldTestTag
 import io.github.droidkaigi.confsched.profilecard.ProfileCardOccupationTextFieldTestTag
@@ -140,6 +142,22 @@ class ProfileCardScreenRobot @Inject constructor(
             .assertTextEquals(link)
     }
 
+    fun checkLinkError(
+        link: String,
+    ) {
+        composeTestRule
+            .onNode(hasTestTag(ProfileCardInputErrorTextTestTag.plus(link)))
+            .assertIsDisplayed()
+    }
+
+    fun checkLinkNotError(
+        link: String,
+    ) {
+        composeTestRule
+            .onNode(hasTestTag(ProfileCardInputErrorTextTestTag.plus(link)))
+            .assertIsNotDisplayed()
+    }
+
     fun checkCardScreenDisplayed() {
         composeTestRule
             .onNode(hasTestTag(ProfileCardCardScreenTestTag))

diff --git a/...ommonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeBottomNavigation.kt b/...ommonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeBottomNavigation.kt
@@ -6,6 +6,7 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.spring
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
@@ -21,6 +22,7 @@ import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -77,7 +79,13 @@ fun GlassLikeBottomNavigation(
             .padding(horizontal = 48.dp)
             .fillMaxWidth()
             .height(64.dp)
-            .hazeChild(state = hazeState, shape = CircleShape)
+            .run {
+                if (isBlurSupported()) {
+                    hazeChild(state = hazeState, shape = CircleShape)
+                } else {
+                    background(MaterialTheme.colorScheme.background.copy(alpha = .95f))
+                }
+            }
             .border(
                 width = Dp.Hairline,
                 brush =
@@ -130,15 +138,32 @@ fun GlassLikeBottomNavigation(
                 },
         ) {
             val tabWidth = size.width / MainScreenTab.size
-            drawCircle(
-                color = animatedColor.copy(alpha = .6f),
-                radius = size.height / 2,
-                center =
-                Offset(
-                    (tabWidth * animatedSelectedTabIndex) + tabWidth / 2,
-                    size.height / 2,
-                ),
+            val center = Offset(
+                (tabWidth * animatedSelectedTabIndex) + tabWidth / 2,
+                size.height / 2,
             )
+            val radius = size.height / 2
+
+            if (isBlurSupported()) {
+                drawCircle(
+                    color = animatedColor.copy(alpha = .6f),
+                    radius = radius,
+                    center = center,
+                )
+            } else {
+                drawCircle(
+                    brush = Brush.radialGradient(
+                        colors = listOf(
+                            animatedColor.copy(alpha = .5f),
+                            animatedColor.copy(alpha = .1f),
+                        ),
+                        center = center,
+                        radius = radius,
+                    ),
+                    radius = radius,
+                    center = center,
+                )
+            }
         }
 
         Canvas(

diff --git a/...ain/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt b/...ain/src/commonMain/kotlin/io/github/droidkaigi/confsched/main/section/GlassLikeNavRail.kt
@@ -5,6 +5,7 @@ import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.spring
 import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
@@ -19,6 +20,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -59,6 +61,7 @@ import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched.droidkaigiui.animation.onGloballyPositionedWithFavoriteAnimationScope
 import io.github.droidkaigi.confsched.droidkaigiui.useIf
 import io.github.droidkaigi.confsched.main.MainScreenTab
+import io.github.droidkaigi.confsched.model.isBlurSupported
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
@@ -72,16 +75,22 @@ fun GlassLikeNavRail(
 ) {
     Box(
         modifier = modifier.size(width = 64.dp, height = 320.dp)
-            .hazeChild(state = hazeState, shape = CircleShape).border(
-                width = Dp.Hairline,
-                brush = Brush.verticalGradient(
-                    colors = listOf(
-                        Color.White.copy(alpha = .8f),
-                        Color.White.copy(alpha = .2f),
-                    ),
-                ),
-                shape = CircleShape,
-            ),
+            .run {
+                if (isBlurSupported()) {
+                    hazeChild(state = hazeState, shape = CircleShape).border(
+                        width = Dp.Hairline,
+                        brush = Brush.verticalGradient(
+                            colors = listOf(
+                                Color.White.copy(alpha = .8f),
+                                Color.White.copy(alpha = .2f),
+                            ),
+                        ),
+                        shape = CircleShape,
+                    )
+                } else {
+                    background(MaterialTheme.colorScheme.background.copy(alpha = .95f))
+                }
+            },
     ) {
         NavRailTabs(
             selectedTab = currentTab,
@@ -113,15 +122,32 @@ fun GlassLikeNavRail(
                 .blur(50.dp, edgeTreatment = BlurredEdgeTreatment.Unbounded),
         ) {
             val tabWidth = size.height / MainScreenTab.size
-            drawCircle(
-                color = animatedColor.copy(alpha = .6f),
-                radius = size.width / 2,
-                center =
-                Offset(
-                    size.width / 2,
-                    (tabWidth * animatedSelectedTabIndex) + tabWidth / 2,
-                ),
+            val radius = size.width / 2
+            val center = Offset(
+                size.width / 2,
+                (tabWidth * animatedSelectedTabIndex) + tabWidth / 2,
             )
+
+            if (isBlurSupported()) {
+                drawCircle(
+                    color = animatedColor.copy(alpha = .6f),
+                    radius = radius,
+                    center = center,
+                )
+            } else {
+                drawCircle(
+                    brush = Brush.radialGradient(
+                        colors = listOf(
+                            animatedColor.copy(alpha = .5f),
+                            animatedColor.copy(alpha = .1f),
+                        ),
+                        center = center,
+                        radius = radius,
+                    ),
+                    radius = radius,
+                    center = center,
+                )
+            }
         }
 
         Canvas(

diff --git a/...ndroidUnitTest/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenTest.kt b/...ndroidUnitTest/kotlin/io/github/droidkaigi/confsched/profilecard/ProfileCardScreenTest.kt
@@ -49,6 +49,64 @@ class ProfileCardScreenTest(
                             checkEditScreenDisplayed()
                         }
                     }
+
+                    describe("when url protocol is invalid") {
+                        val url = "ttps://example.com"
+                        doIt {
+                            inputLink("ttps://example.com")
+                        }
+                        itShould("show error message") {
+                            captureScreenWithChecks {
+                                checkLinkError(url)
+                            }
+                        }
+                    }
+
+                    describe("when url top level domain is missing") {
+                        val url = "https://example"
+                        doIt {
+                            inputLink(url)
+                        }
+                        itShould("show error message") {
+                            captureScreenWithChecks {
+                                checkLinkError(url)
+                            }
+                        }
+                    }
+                    describe("when url contains IDN domain name") {
+                        val url = "https://example.xn--com"
+                        doIt {
+                            inputLink(url)
+                        }
+                        itShould("not show error message") {
+                            captureScreenWithChecks {
+                                checkLinkNotError(url)
+                            }
+                        }
+                    }
+                    describe("when protocol is missing") {
+                        val url = "example.com/foobar"
+                        doIt {
+                            inputLink(url)
+                        }
+                        itShould("not show error message") {
+                            captureScreenWithChecks {
+                                checkLinkNotError(url)
+                            }
+                        }
+                    }
+                    describe("when url contains sub domain") {
+                        val url = "https://www.example.co.jp/foobar"
+                        doIt {
+                            inputLink(url)
+                        }
+                        itShould("not show error message") {
+                            captureScreenWithChecks {
+                                checkLinkNotError(url)
+                            }
+                        }
+                    }
+
                     // FIXME Add a test to confirm that it is possible to transition to the Card screen after entering the required input fields, including images.
                     // FIXME Currently, the test code does not allow the user to select and input an image from the Add Image button.
                 }
@@ -63,7 +121,7 @@ class ProfileCardScreenTest(
                             checkProfileCardFrontDisplayed()
                         }
                     }
-                    describe("flip prifle card") {
+                    describe("flip profile card") {
                         doIt {
                             flipProfileCard()
                         }

diff --git a/feature/profilecard/src/commonMain/composeResources/values-ja/strings.xml b/feature/profilecard/src/commonMain/composeResources/values-ja/strings.xml
@@ -12,6 +12,7 @@
     <string name="add_image">画像を追加</string>
     <string name="enter_validate_format">%1$sを入力してください</string>
     <string name="add_validate_format">%1$sを追加してください</string>
+    <string name="url_is_invalid">URLの形式が正しくありません</string>
     <string name="share">共有する</string>
     <string name="edit">編集する</string>
     <string name="share_description">DroidKaigiのプロフィールカードを作成しました！イベントでつながりましょう。#DroidKaigi</string>

diff --git a/feature/profilecard/src/commonMain/composeResources/values/strings.xml b/feature/profilecard/src/commonMain/composeResources/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="add_image">Add Image</string>
     <string name="enter_validate_format">Please enter a %1$s</string>
     <string name="add_validate_format">Please add %1$s</string>
+    <string name="url_is_invalid">The URL format is incorrect</string>
     <string name="share">Share</string>
     <string name="edit">Edit</string>
     <string name="share_description">Check out my DroidKaigi Profile Card! Let's connect at the event. #DroidKaigi</string>