Skip to content

Commit eca05d1

Browse files
committed
version updates
1 parent cacd146 commit eca05d1

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 numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
defaultConfig {
1010
applicationId "app.layout.motion.motionlayoutexample"
1111
minSdkVersion 18
12-
targetSdkVersion 28
12+
targetSdkVersion 29
1313
versionCode 1
1414
versionName "1.0"
1515
vectorDrawables.useSupportLibrary = true
@@ -26,14 +26,14 @@ android {
2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
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'
3434
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'
3636
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'
3939
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import androidx.constraintlayout.motion.widget.MotionLayout
1111

1212

1313
class ComplexAnimationActivity: AppCompatActivity(), MotionLayout.TransitionListener {
14+
1415
private val motionLayout by lazy {
1516
findViewById<MotionLayout>(R.id.motionLayout)
1617
}
@@ -31,6 +32,12 @@ class ComplexAnimationActivity: AppCompatActivity(), MotionLayout.TransitionList
3132

3233
var layoutId = 0
3334

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+
3441
override fun onTransitionChange(p0: MotionLayout?, p1: Int, p2: Int, p3: Float) {
3542
}
3643

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
1515
import androidx.recyclerview.widget.RecyclerView
1616

1717
class DemoActivity : AppCompatActivity(), MotionLayout.TransitionListener {
18+
1819
var motionLayout: MotionLayout? = null
1920
var recyclerView: RecyclerView? = null
2021
var layout = R.layout.collapsing_toolbar
@@ -96,5 +97,10 @@ class DemoActivity : AppCompatActivity(), MotionLayout.TransitionListener {
9697

9798
override fun onTransitionCompleted(p0: MotionLayout?, p1: Int) {
9899
}
100+
101+
override fun onTransitionTrigger(p0: MotionLayout?, p1: Int, p2: Boolean, p3: Float) {
102+
}
99103

104+
override fun onTransitionStarted(p0: MotionLayout?, p1: Int, p2: Int) {
105+
}
100106
}
-17.5 KB
Binary file not shown.
7.64 KB
Binary file not shown.
-729 KB
Binary file not shown.
Binary file not shown.
-78.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)