[Animation] Fix several issues

- Add more comments - Constant color names are capitalized - Remove unnecessary content descriptions

Author: yaraki

AnimationCodelab/README.md

@@ -1,7 +1,7 @@
 # Compose Animation Codelab
 
 This folder contains the source code for the
-[Compose Animation](https://codelabs.developers.google.com/codelabs/android-compose-animation)
+[Compose Animation](https://developer.android.com/codelabs/android-compose-animation)
 codelab.
 
 In this codelab, you will learn how to use some Animation APIs in Jetpack Compose.

AnimationCodelab/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
@@ -23,7 +23,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:7.0.0-alpha06'
+ classpath 'com.android.tools.build:gradle:7.0.0-alpha07'
  classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30'
  }
 }
@@ -32,17 +32,7 @@ allprojects {
  repositories {
  google()
  jcenter()
- maven { url 'https://androidx.dev/snapshots/builds/7141639/artifacts/repository' }
- }
-}
-
-subprojects {
- configurations.configureEach {
- resolutionStrategy.eachDependency { details ->
- if (details.requested.group.startsWith('androidx.compose')) {
- details.useVersion compose_version
- }
- }
+ maven { url 'https://androidx.dev/snapshots/builds/7154166/artifacts/repository' }
  }
 }
 

AnimationCodelab/finished/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
@@ -19,16 +19,6 @@ plugins {
  id 'kotlin-android'
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
- kotlinOptions {
- jvmTarget = "1.8"
- freeCompilerArgs += [
- '-Xopt-in=kotlin.RequiresOptIn',
- '-Xallow-jvm-ir-dependencies'
- ]
- }
-}
-
 android {
  compileSdkVersion 30
  defaultConfig {
@@ -37,7 +27,6 @@ android {
  targetSdkVersion 30
  versionCode 1
  versionName '1.0'
- testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
  }
  compileOptions {
  sourceCompatibility JavaVersion.VERSION_1_8
@@ -46,6 +35,9 @@ android {
  buildFeatures {
  compose true
  }
+ kotlinOptions {
+ jvmTarget = '1.8'
+ }
  composeOptions {
  kotlinCompilerExtensionVersion compose_version
  }
@@ -57,9 +49,5 @@ dependencies {
  implementation "androidx.compose.ui:ui:$compose_version"
  implementation "androidx.compose.material:material:$compose_version"
  implementation "androidx.compose.ui:ui-tooling:$compose_version"
- implementation 'androidx.activity:activity-compose:1.3.0-alpha02'
-
- testImplementation 'junit:junit:4.13.1'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+ implementation 'androidx.activity:activity-compose:1.3.0-SNAPSHOT'
 }

AnimationCodelab/finished/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- ~ Copyright 2021 Google LLC
+ ~ 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.

AnimationCodelab/finished/src/main/java/com/example/android/codelab/animation/MainActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.

AnimationCodelab/finished/src/main/java/com/example/android/codelab/animation/ui/Color.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
@@ -18,10 +18,10 @@ package com.example.android.codelab.animation.ui
 
 import androidx.compose.ui.graphics.Color
 
-val purple100 = Color(0xFFE1BEE7)
-val purple500 = Color(0xFF6200EE)
-val purple700 = Color(0xFF3700B3)
-val teal200 = Color(0xFF03DAC5)
-val green300 = Color(0xFF81C784)
-val green800 = Color(0xFF2E7D32)
-val amber600 = Color(0xFFFFB300)
+val Purple100 = Color(0xFFE1BEE7)
+val Purple500 = Color(0xFF6200EE)
+val Purple700 = Color(0xFF3700B3)
+val Teal200 = Color(0xFF03DAC5)
+val Green300 = Color(0xFF81C784)
+val Green800 = Color(0xFF2E7D32)
+val Amber600 = Color(0xFFFFB300)

AnimationCodelab/finished/src/main/java/com/example/android/codelab/animation/ui/Theme.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC
+ * 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.
@@ -17,31 +17,18 @@
 package com.example.android.codelab.animation.ui
 
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Typography
 import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
 
 @Composable
 fun AnimationCodelabTheme(content: @Composable () -> Unit) {
  val colors = lightColors(
- primary = purple500,
- primaryVariant = purple700,
- secondary = teal200
- )
- val typography = Typography(
- body1 = TextStyle(
- fontFamily = FontFamily.Default,
- fontWeight = FontWeight.Normal,
- fontSize = 16.sp
- )
+ primary = Purple500,
+ primaryVariant = Purple700,
+ secondary = Teal200
  )
  MaterialTheme(
  colors = colors,
- typography = typography,
  content = content
  )
 }