Merge pull request android#106 from android/develop

Merge develop into master

Author: nickbutcher

Diff for: JetNews/app/build.gradle

@@ -18,11 +18,11 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId 'com.example.jetnews'
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName '1.0'
         vectorDrawables.useSupportLibrary = true

Diff for: JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsApp.kt

@@ -22,6 +22,7 @@ import androidx.ui.core.Alignment
 import androidx.ui.core.Modifier
 import androidx.ui.foundation.Image
 import androidx.ui.foundation.Text
+import androidx.ui.graphics.Color
 import androidx.ui.graphics.ColorFilter
 import androidx.ui.graphics.vector.VectorAsset
 import androidx.ui.layout.Arrangement
@@ -162,7 +163,7 @@ private fun DrawerButton(
     val backgroundColor = if (isSelected) {
         colors.primary.copy(alpha = 0.12f)
     } else {
-        colors.surface
+        Color.Transparent
     }
 
     val surfaceModifier = modifier

Diff for: JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt

@@ -264,9 +264,9 @@ private fun HomeScreenPopularSection(
                 style = MaterialTheme.typography.subtitle1
             )
         }
-        HorizontalScroller(modifier = Modifier.padding(end = 16.dp, bottom = 16.dp)) {
+        HorizontalScroller(modifier = Modifier.padding(end = 16.dp)) {
             posts.forEach { post ->
-                PostCardPopular(post, navigateTo, Modifier.padding(start = 16.dp))
+                PostCardPopular(post, navigateTo, Modifier.padding(start = 16.dp, bottom = 16.dp))
             }
         }
         HomeScreenDivider()

Diff for: JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCardYourNetwork.kt

@@ -51,9 +51,8 @@ fun PostCardPopular(
     Card(
         shape = MaterialTheme.shapes.medium,
         modifier = modifier.preferredSize(280.dp, 240.dp)
-            .clickable(onClick = { navigateTo(Screen.Article(post.id)) })
     ) {
-        Column {
+        Column(modifier = Modifier.clickable(onClick = { navigateTo(Screen.Article(post.id)) })) {
             val image = post.image ?: imageResource(R.drawable.placeholder_4_3)
             Image(
                 asset = image,

Diff for: JetNews/build.gradle

@@ -23,7 +23,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0-alpha02'
+        classpath 'com.android.tools.build:gradle:4.2.0-alpha03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

Diff for: JetNews/gradle.properties

@@ -1,17 +1,22 @@
-## For more details on how to configure your build environment visit
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-#
+
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx1024m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-#
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-#Thu Apr 02 12:49:33 CEST 2020
-android.enableJetifier=true
+org.gradle.jvmargs=-Xmx2048m
+
+org.gradle.configureondemand=true
+org.gradle.caching=true
+org.gradle.parallel=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+
+# Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"