Update topics buttons.

Author: nickbutcher

JetNews/app/build.gradle

@@ -63,6 +63,7 @@ dependencies {
     implementation("androidx.ui:ui-core:$compose_version")
     implementation("androidx.ui:ui-layout:$compose_version")
     implementation("androidx.ui:ui-material:$compose_version")
+    implementation("androidx.ui:ui-material-icons-extended:$compose_version")
     implementation("androidx.ui:ui-foundation:$compose_version")
     implementation("androidx.ui:ui-animation:$compose_version")
     implementation "androidx.ui:ui-tooling:$compose_version"

JetNews/app/src/main/java/com/example/jetnews/ui/interests/SelectTopicButton.kt

@@ -17,54 +17,42 @@
 package com.example.jetnews.ui.interests
 
 import androidx.compose.Composable
+import androidx.compose.Pivotal
 import androidx.ui.core.Modifier
-import androidx.ui.foundation.Box
 import androidx.ui.foundation.Icon
 import androidx.ui.foundation.shape.corner.CircleShape
 import androidx.ui.layout.padding
 import androidx.ui.layout.preferredSize
+import androidx.ui.material.EmphasisAmbient
 import androidx.ui.material.MaterialTheme
-import androidx.ui.res.vectorResource
+import androidx.ui.material.ProvideEmphasis
+import androidx.ui.material.Surface
+import androidx.ui.material.icons.Icons
+import androidx.ui.material.icons.filled.Add
+import androidx.ui.material.icons.filled.Done
 import androidx.ui.tooling.preview.Preview
 import androidx.ui.unit.dp
-import com.example.jetnews.R
 import com.example.jetnews.ui.ThemedPreview
 
 @Composable
 fun SelectTopicButton(
     modifier: Modifier = Modifier,
-    selected: Boolean = false
+    @Pivotal selected: Boolean = false
 ) {
-    if (selected) {
-        SelectTopicButtonOn(modifier.preferredSize(36.dp, 36.dp))
+    val icon = if (selected) Icons.Filled.Done else Icons.Filled.Add
+    val backgroundColor = if (selected) {
+        MaterialTheme.colors.primary
     } else {
-        SelectTopicButtonOff(modifier.preferredSize(36.dp, 36.dp))
+        MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
     }
-}
-
-@Composable
-private fun SelectTopicButtonOn(modifier: Modifier = Modifier) {
-    Box(
-        backgroundColor = MaterialTheme.colors.primary,
-        shape = CircleShape,
-        modifier = modifier
-    ) {
-        Icon(
-            asset = vectorResource(R.drawable.ic_check),
-            tint = MaterialTheme.colors.onPrimary
-        )
-    }
-}
-
-@Composable
-private fun SelectTopicButtonOff(modifier: Modifier = Modifier) {
-    val borderColor = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
-    Box(
-        backgroundColor = borderColor,
+    Surface(
+        color = backgroundColor,
         shape = CircleShape,
-        modifier = modifier
+        modifier = modifier.preferredSize(36.dp, 36.dp)
     ) {
-        Icon(vectorResource(R.drawable.ic_add))
+        ProvideEmphasis(EmphasisAmbient.current.high) {
+            Icon(icon)
+        }
     }
 }
 

JetNews/app/src/main/res/drawable/ic_add.xml

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

JetNews/app/src/main/res/drawable/ic_check.xml

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%