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

merged 12 commits into from
Jul 28, 2020

Commits on Jul 13, 2020

  1. -Finished initial steps for animation

    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    7d87806 View commit details
    Browse the repository at this point in the history

  2. -Removed "Ripple Effect" in MaterialCardView

    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    38d8b99 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into t-lessons-animation

    @BenHenning
    BenHenning committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    89ce123 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. Merge branch 'develop' into t-lessons-animation

    @BenHenning
    BenHenning committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    c8b46bf View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. Merge remote-tracking branch 'origin/develop' into t-lessons-animation

    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    f27bded View commit details
    Browse the repository at this point in the history

  2. -Removed the blinking

    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    29848b1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into t-lessons-animation

    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    815d675 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/t-lessons-animation' into t-less… 

    …ons-animation
    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    4b51ab0 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. Merge remote-tracking branch 'origin/develop' into t-lessons-animation 

    # Conflicts (Resolved):
#	app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml
#	app/src/main/res/layout-sw600dp-port/topic_lessons_story_summary.xml
    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    e16d838 View commit details
    Browse the repository at this point in the history

  2. -generalized the arrow animation

    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    c657f77 View commit details
    Browse the repository at this point in the history

  3. -Fixed lint issues

    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    5508034 View commit details
    Browse the repository at this point in the history

  4. -nit changes

    @MohamedMedhat1998
    MohamedMedhat1998 committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    2a1ee9a View commit details
    Browse the repository at this point in the history