Merge branch 'main' of https://github.com/FlodCoding/Weather-Challenge into main

Author: FlodCoding

README.md

@@ -24,6 +24,10 @@ A simple and beautiful weather app, intuitively and dynamically show the current
 
 <img src="/results/screenshot_5.png" width="260">
 
+
+## Something Found
+- when start Ui testing, should stop Layout Inspector, seems conflict
+- can not add semantics inside Canvas, Canvas is the smallest unit
 ## License
 ```
 Copyright 2020 The Android Open Source Project

app/src/androidTest/java/com/flod/androiddevchallenge/CurveChartTest.kt

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 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
+ *
+ * https://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.flod.androiddevchallenge
+
+import androidx.compose.ui.test.junit4.createComposeRule
+import com.flod.androiddevchallenge.ui.component.TemperatureChart
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+
+class CurveChartTest {
+
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ @Test
+ @Ignore("Can not find Canvas content")
+ fun loadData() {
+
+ val list = List(50) {
+ Pair(it.toString(), (10..50).random())
+ }
+ composeTestRule.setContent {
+ TemperatureChart(list = list)
+ }
+ }
+}

app/src/androidTest/java/com/flod/androiddevchallenge/MainTest.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021 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
+ *
+ * https://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.flod.androiddevchallenge
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performGesture
+import androidx.compose.ui.test.swipeLeft
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+
+class MainTest {
+
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ @Before
+ fun setUp() {
+ composeTestRule.launchApp()
+ }
+
+ @Test
+ @Ignore("passes locally but fail on CI")
+ fun testDrawer() {
+ // Open it
+ composeTestRule.onNodeWithContentDescription("select location")
+ .assertIsDisplayed().performClick()
+
+ composeTestRule.onNodeWithTag("LocationList").assertIsDisplayed()
+
+ // close Drawer using Gesture
+ composeTestRule.onNodeWithTag("LocationList").performGesture {
+ swipeLeft()
+ }
+ composeTestRule.onNodeWithContentDescription("select location").assertIsDisplayed()
+ }
+}

app/src/androidTest/java/com/flod/androiddevchallenge/Util.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 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
+ *
+ * https://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.flod.androiddevchallenge
+
+import androidx.compose.ui.test.junit4.ComposeContentTestRule
+
+fun ComposeContentTestRule.launchApp() {
+ setContent {
+ MyApp()
+ }
+}

app/src/main/java/com/flod/androiddevchallenge/ui/component/TemperatureChart.kt

@@ -19,6 +19,7 @@ import android.graphics.Paint
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
@@ -34,8 +35,10 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.flod.androiddevchallenge.ui.theme.MyThemedPreview
 
 /**
  * unfinished, maybe can more flexible
@@ -161,3 +164,14 @@ fun TemperatureChart(
  }
  }
 }
+
+@Preview
+@Composable
+fun ChartLightPreview() {
+ MyThemedPreview {
+ val list = List(10) {
+ Pair(it.toString(), (10..20).random())
+ }
+ TemperatureChart(Modifier.padding(30.dp), list)
+ }
+}

app/src/main/java/com/flod/androiddevchallenge/ui/view/LocationList.kt

@@ -36,6 +36,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -51,6 +52,7 @@ fun LocationList(list: List<Simple>, selected: Int = 0, onSelected: (Int, Simple
  Column(
  modifier = Modifier
  .padding(top = 50.dp)
+ .semantics { testTag = "LocationList" }
  .selectableGroup(),
  horizontalAlignment = Alignment.CenterHorizontally
  ) {

app/src/main/java/com/flod/androiddevchallenge/ui/view/Main.kt

@@ -89,9 +89,7 @@ fun Main(viewModel: MainViewModel) {
  Modifier
  .padding(top = 40.dp, start = 20.dp, end = 20.dp)
  .fillMaxWidth(),
- data,
- coroutineScope,
- drawerState
+ data, coroutineScope, drawerState
  )
 
  Header(data, scrollState.value)
@@ -110,6 +108,7 @@ fun Title(modifier: Modifier, detail: Detail, coroutineScope: CoroutineScope, dr
 
  Box(modifier = modifier) {
  // drawer open button
+
  IconButton(
  modifier = Modifier.align(Alignment.CenterStart),
  onClick = {