diff options
| author | 2023-08-08 13:05:41 +0000 | |
|---|---|---|
| committer | 2023-08-08 13:05:41 +0000 | |
| commit | 80d2bb03303ab43cfad25eb6b63ad44e130e6067 (patch) | |
| tree | 21614cd80a4efcc8ed404716375304b28df30cbb | |
| parent | 79b68bd9e39ece46b8917a5bb3e923b5ad1a7b5a (diff) | |
| parent | f2bc3386e47cb5f81135a8c3ae4467e5d775f660 (diff) | |
Merge "Delete ExampleFeature(Screenshot)(Test) (1/2)" into udc-qpr-dev am: f2bc3386e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342414
Change-Id: I57fd23c51653e1ece02d1fb13ba8d8c99258a28e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/compose/features/src/com/android/systemui/ExampleFeature.kt | 94 | ||||
| -rw-r--r-- | packages/SystemUI/compose/features/tests/src/com/android/systemui/ExampleFeatureTest.kt | 46 |
2 files changed, 0 insertions, 140 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/ExampleFeature.kt b/packages/SystemUI/compose/features/src/com/android/systemui/ExampleFeature.kt deleted file mode 100644 index c58c16259abe..000000000000 --- a/packages/SystemUI/compose/features/src/com/android/systemui/ExampleFeature.kt +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui - -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.BoxWithConstraints -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp -import kotlin.math.roundToInt - -/** - * This is an example Compose feature, which shows a text and a count that is incremented when - * clicked. We also show the max width available to this component, which is displayed either next - * to or below the text depending on that max width. - */ -@Composable -fun ExampleFeature(text: String, modifier: Modifier = Modifier) { - BoxWithConstraints(modifier) { - val maxWidth = maxWidth - if (maxWidth < 600.dp) { - Column { - CounterTile(text) - Spacer(Modifier.size(16.dp)) - MaxWidthTile(maxWidth) - } - } else { - Row { - CounterTile(text) - Spacer(Modifier.size(16.dp)) - MaxWidthTile(maxWidth) - } - } - } -} - -@Composable -private fun CounterTile(text: String, modifier: Modifier = Modifier) { - Surface( - modifier, - color = MaterialTheme.colorScheme.primaryContainer, - shape = RoundedCornerShape(28.dp), - ) { - var count by remember { mutableStateOf(0) } - Column( - Modifier.clickable { count++ }.padding(16.dp), - ) { - Text(text) - Text("I was clicked $count times.") - } - } -} - -@Composable -private fun MaxWidthTile(maxWidth: Dp, modifier: Modifier = Modifier) { - Surface( - modifier, - color = MaterialTheme.colorScheme.tertiaryContainer, - shape = RoundedCornerShape(28.dp), - ) { - Text( - "The max available width to me is: ${maxWidth.value.roundToInt()}dp", - Modifier.padding(16.dp) - ) - } -} diff --git a/packages/SystemUI/compose/features/tests/src/com/android/systemui/ExampleFeatureTest.kt b/packages/SystemUI/compose/features/tests/src/com/android/systemui/ExampleFeatureTest.kt deleted file mode 100644 index 1c2e8fab0337..000000000000 --- a/packages/SystemUI/compose/features/tests/src/com/android/systemui/ExampleFeatureTest.kt +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui - -import androidx.compose.ui.test.assertIsDisplayed -import androidx.compose.ui.test.junit4.createComposeRule -import androidx.compose.ui.test.onNodeWithText -import androidx.compose.ui.test.performClick -import androidx.test.ext.junit.runners.AndroidJUnit4 -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith - -@RunWith(AndroidJUnit4::class) -class ExampleFeatureTest { - @get:Rule val composeRule = createComposeRule() - - @Test - fun testProvidedTextIsDisplayed() { - composeRule.setContent { ExampleFeature("foo") } - - composeRule.onNodeWithText("foo").assertIsDisplayed() - } - - @Test - fun testCountIsIncreasedWhenClicking() { - composeRule.setContent { ExampleFeature("foo") } - - composeRule.onNodeWithText("I was clicked 0 times.").assertIsDisplayed().performClick() - composeRule.onNodeWithText("I was clicked 1 times.").assertIsDisplayed() - } -} |