Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes part of #1159 & #1161: Topic-Lessons high-fi animation #1465

Merged
merged 12 commits into from
Jul 28, 2020
Merged

Fixes part of #1159 & #1161: Topic-Lessons high-fi animation #1465

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7d87806
-Finished initial steps for animation
MohamedMedhat1998 Jul 13, 2020
38d8b99
-Removed "Ripple Effect" in MaterialCardView
MohamedMedhat1998 Jul 13, 2020
89ce123
Merge branch 'develop' into t-lessons-animation
BenHenning Jul 13, 2020
c8b46bf
Merge branch 'develop' into t-lessons-animation
BenHenning Jul 14, 2020
f27bded
Merge remote-tracking branch 'origin/develop' into t-lessons-animation
MohamedMedhat1998 Jul 15, 2020
29848b1
-Removed the blinking
MohamedMedhat1998 Jul 15, 2020
815d675
Merge branch 'develop' into t-lessons-animation
MohamedMedhat1998 Jul 15, 2020
4b51ab0
Merge remote-tracking branch 'origin/t-lessons-animation' into t-less…
MohamedMedhat1998 Jul 15, 2020
e16d838
Merge remote-tracking branch 'origin/develop' into t-lessons-animation
MohamedMedhat1998 Jul 28, 2020
c657f77
-generalized the arrow animation
MohamedMedhat1998 Jul 28, 2020
5508034
-Fixed lint issues
MohamedMedhat1998 Jul 28, 2020
2a1ee9a
-nit changes
MohamedMedhat1998 Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
-generalized the arrow animation
  • Loading branch information
@MohamedMedhat1998
MohamedMedhat1998 committed Jul 28, 2020
commit c657f7782faaca584b1b84b387ddca9a08c4d0a1
19 changes: 0 additions & 19 deletions app/src/main/java/org/oppia/app/databinding/ImageViewBindingAdapters.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,3 @@ fun setProfileImage(imageView: ImageView, profileAvatar: ProfileAvatar?) {
.into(imageView)
}
}

@BindingAdapter("app:expand_rotation_anim")
fun setExpandRotationAnimation(imageView: ImageView, isExpanded: Boolean) {
if (isExpanded) {
val valueAnimator = ValueAnimator.ofFloat(0f, 180f)
valueAnimator.duration = 300
valueAnimator.addUpdateListener {
imageView.rotation = it.animatedValue as Float
}
valueAnimator.start()
} else {
val valueAnimator = ValueAnimator.ofFloat(180f, 0f)
valueAnimator.duration = 300
valueAnimator.addUpdateListener {
imageView.rotation = it.animatedValue as Float
}
valueAnimator.start()
}
}
26 changes: 26 additions & 0 deletions app/src/main/java/org/oppia/app/databinding/ViewBindingAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,29 @@ fun setFlashingAnimation(view: View, isFlashing: Boolean) {
view.alpha = 0f
}
}

@BindingAdapter(
"app:hasRotationAnimation",
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
"app:isRotationClockwise",
"app:rotationAngle",
requireAll = true
)
fun setRotationAnimation(view: View, hasAnimation: Boolean, isClockwise: Boolean, angle: Float) {
if (hasAnimation) {
if (isClockwise) {
val valueAnimator = ValueAnimator.ofFloat(0f, angle)
valueAnimator.duration = 300
valueAnimator.addUpdateListener {
view.rotation = it.animatedValue as Float
}
valueAnimator.start()
} else {
val valueAnimator = ValueAnimator.ofFloat(angle, 0f)
valueAnimator.duration = 300
valueAnimator.addUpdateListener {
view.rotation = it.animatedValue as Float
}
valueAnimator.start()
}
}
}
1 change: 0 additions & 1 deletion app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsFragmentPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ class TopicLessonsFragmentPresenter @Inject constructor(
)
binding.storySummaryRecyclerView.apply {
adapter = storySummaryAdapter
(itemAnimator as SimpleItemAnimator).changeDuration = 0
}
if (storyId.isNotEmpty())
binding.storySummaryRecyclerView.layoutManager!!.scrollToPosition(
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout-land/topic_lessons_story_summary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@
android:layout_gravity="center_horizontal|bottom"
android:contentDescription="@{@string/show_hide_chapter_list(viewModel.storySummary.storyName)}"
android:src="@drawable/ic_arrow_drop_down_black_24dp"
app:expand_rotation_anim="@{isListExpanded}" />
app:hasRotationAnimation="@{true}"
app:rotationAngle="@{180f}"
app:isRotationClockwise="@{isListExpanded}" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@
android:layout_gravity="center_horizontal|bottom"
android:contentDescription="@{@string/show_hide_chapter_list(viewModel.storySummary.storyName)}"
android:src="@drawable/ic_arrow_drop_down_black_24dp"
app:expand_rotation_anim="@{isListExpanded}" />
app:hasRotationAnimation="@{true}"
app:rotationAngle="@{180f}"
app:isRotationClockwise="@{isListExpanded}" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout-sw600dp-port/topic_lessons_story_summary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@
android:layout_gravity="center_horizontal|bottom"
android:contentDescription="@{@string/show_hide_chapter_list(viewModel.storySummary.storyName)}"
android:src="@drawable/ic_arrow_drop_down_black_24dp"
app:expand_rotation_anim="@{isListExpanded}" />
app:hasRotationAnimation="@{true}"
app:rotationAngle="@{180f}"
app:isRotationClockwise="@{isListExpanded}" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/layout/topic_lessons_story_summary.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@
android:layout_gravity="center_horizontal|bottom"
android:contentDescription="@{@string/show_hide_chapter_list(viewModel.storySummary.storyName)}"
android:src="@drawable/ic_arrow_drop_down_black_24dp"
app:expand_rotation_anim="@{isListExpanded}" />
app:hasRotationAnimation="@{true}"
app:rotationAngle="@{180f}"
app:isRotationClockwise="@{isListExpanded}" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
Expand Down