Commit eca05d1

committed

version updates

1 parent cacd146 commit eca05d1Copy full SHA for eca05d1

File tree

23 files changed

+170

-61

lines changed

.idea
- codeStyles
  - Project.xml
- misc.xml
app
- build.gradle
- src/main
  - java/app/layout/motion/motionlayoutexample
    - ComplexAnimationActivity.kt
    - DemoActivity.kt
  - res
    - drawable
    - xml
build.gradle
gradle/wrapper
- gradle-wrapper.properties

23 files changed

+170

-61

lines changed

`‎.idea/codeStyles/Project.xml‎`

Lines changed: 109 additions & 25 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎.idea/misc.xml‎`

Lines changed: 15 additions & 3 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎app/build.gradle‎`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ android {`
`9`	`9`	`defaultConfig {`
`10`	`10`	`applicationId "app.layout.motion.motionlayoutexample"`
`11`	`11`	`minSdkVersion 18`
`12`		`- targetSdkVersion 28`
	`12`	`+ targetSdkVersion 29`
`13`	`13`	`versionCode 1`
`14`	`14`	`versionName "1.0"`
`15`	`15`	`vectorDrawables.useSupportLibrary = true`
`@@ -26,14 +26,14 @@ android {`
`26`	`26`	`dependencies {`
`27`	`27`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`28`	`28`	`implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`
`29`		`- implementation 'androidx.appcompat:appcompat:1.0.0-rc02'`
`30`		`- implementation 'androidx.legacy:legacy-support-v4:1.0.0-rc02'`
`31`		`- implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'`
`32`		`- implementation 'androidx.constraintlayout:constraintlayout-solver:2.0.0-alpha2'`
`33`		`- implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02'`
	`29`	`+ implementation 'androidx.appcompat:appcompat:1.1.0'`
	`30`	`+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'`
	`31`	`+ implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'`
	`32`	`+ implementation 'androidx.constraintlayout:constraintlayout-solver:2.0.0-beta3'`
	`33`	`+ implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'`
`34`	`34`	`implementation 'de.hdodenhof:circleimageview:2.2.0'`
`35`		`- implementation 'androidx.fragment:fragment:1.0.0-rc02'`
	`35`	`+ implementation 'androidx.fragment:fragment:1.2.0-rc02'`
`36`	`36`	`testImplementation 'junit:junit:4.12'`
`37`		`- androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'`
`38`		`- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'`
	`37`	`+ androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'`
	`38`	`+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'`
`39`	`39`	`}`

`‎app/src/main/java/app/layout/motion/motionlayoutexample/ComplexAnimationActivity.kt‎`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import androidx.constraintlayout.motion.widget.MotionLayout`
`11`	`11`
`12`	`12`
`13`	`13`	`class ComplexAnimationActivity: AppCompatActivity(), MotionLayout.TransitionListener {`
	`14`	`+`
`14`	`15`	`private val motionLayout by lazy {`
`15`	`16`	`findViewById<MotionLayout>(R.id.motionLayout)`
`16`	`17`	`}`
`@@ -31,6 +32,12 @@ class ComplexAnimationActivity: AppCompatActivity(), MotionLayout.TransitionList`
`31`	`32`
`32`	`33`	`var layoutId = 0`
`33`	`34`
	`35`	`+ override fun onTransitionTrigger(p0: MotionLayout?, p1: Int, p2: Boolean, p3: Float) {`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ override fun onTransitionStarted(p0: MotionLayout?, p1: Int, p2: Int) {`
	`39`	`+ }`
	`40`	`+`
`34`	`41`	`override fun onTransitionChange(p0: MotionLayout?, p1: Int, p2: Int, p3: Float) {`
`35`	`42`	`}`
`36`	`43`

`‎app/src/main/java/app/layout/motion/motionlayoutexample/DemoActivity.kt‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager`
`15`	`15`	`import androidx.recyclerview.widget.RecyclerView`
`16`	`16`
`17`	`17`	`class DemoActivity : AppCompatActivity(), MotionLayout.TransitionListener {`
	`18`	`+`
`18`	`19`	`var motionLayout: MotionLayout? = null`
`19`	`20`	`var recyclerView: RecyclerView? = null`
`20`	`21`	`var layout = R.layout.collapsing_toolbar`
`@@ -96,5 +97,10 @@ class DemoActivity : AppCompatActivity(), MotionLayout.TransitionListener {`
`96`	`97`
`97`	`98`	`override fun onTransitionCompleted(p0: MotionLayout?, p1: Int) {`
`98`	`99`	`}`
	`100`	`+`
	`101`	`+ override fun onTransitionTrigger(p0: MotionLayout?, p1: Int, p2: Boolean, p3: Float) {`
	`102`	`+ }`
`99`	`103`
	`104`	`+ override fun onTransitionStarted(p0: MotionLayout?, p1: Int, p2: Int) {`
	`105`	`+ }`
`100`	`106`	`}`