Merge branch 'master' into dev05_rebase

HSTsou · Mar 6, 2020 · 6d36737 · 6d36737
2 parents 9653017 + 821e336
commit 6d36737
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt b/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt
@@ -21,6 +21,7 @@ import androidx.test.filters.Suppress
 import androidx.ui.test.assertIsDisplayed
 import androidx.ui.test.createComposeRule
 import androidx.ui.test.doClick
+import androidx.ui.test.findAllByText
 import androidx.ui.test.findByText
 import org.junit.Before
 import org.junit.Rule

diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt
@@ -137,13 +137,13 @@ private fun PublicationsTab() {
 }
 
 @Composable
-private fun TabWithTopics(tabname: String, topics: List<String>) {
+private fun TabWithTopics(tabName: String, topics: List<String>) {
     VerticalScroller {
         Column(modifier = LayoutPadding(top = 16.dp)) {
             topics.forEach { topic ->
                 TopicItem(
                     getTopicKey(
-                        tabname,
+                        tabName,
                         "- ",
                         topic
                     ),
@@ -157,7 +157,7 @@ private fun TabWithTopics(tabname: String, topics: List<String>) {
 
 @Composable
 private fun TabWithSections(
-    tabname: String,
+    tabName: String,
     sections: Map<String, List<String>>
 ) {
     VerticalScroller {
@@ -170,7 +170,7 @@ private fun TabWithSections(
                 topics.forEach { topic ->
                     TopicItem(
                         getTopicKey(
-                            tabname,
+                            tabName,
                             section,
                             topic
                         ), topic
@@ -263,5 +263,5 @@ fun PreviewPeopleTab() {
 @Preview
 @Composable
 fun PreviewTabWithTopics() {
-    TabWithTopics(tabname = "preview", topics = listOf("Hello", "Compose"))
+    TabWithTopics(tabName = "preview", topics = listOf("Hello", "Compose"))
 }
diff --git a/JetNews/gradle/wrapper/gradle-wrapper.properties b/JetNews/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon Dec 16 15:55:18 CET 2019
+#Thu Feb 27 20:17:30 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME