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

Feature/merge non native updates to master #568

Merged
merged 19 commits into from
Sep 16, 2019
Merged

Feature/merge non native updates to master #568

merged 19 commits into from
Sep 16, 2019

Commits on Mar 18, 2019

  1. Updated dependencies and migration to androidx

    kirill committed Mar 18, 2019
    Configuration menu
    Copy the full SHA
    9cf77f5 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2019

  1. Updated gradle version

    @OleksandNekrasov
    OleksandNekrasov committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    ce3edc5 View commit details
    Browse the repository at this point in the history

  2. Updated androidX dependencies versions

    @OleksandNekrasov
    OleksandNekrasov committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    3db2081 View commit details
    Browse the repository at this point in the history

  3. Updated version code

    @OleksandNekrasov
    OleksandNekrasov committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    37a9839 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #495 from Yalantis/feature/non-native_androidx 

    Updated dependencies and migration to androidx
    @ukevgen
    ukevgen committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    45e2c71 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2019

  1. Bottom controls changed 

    (cherry picked from commit 779b084)
    @p1nkydev @OleksandNekrasov
    p1nkydev authored and OleksandNekrasov committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    c08dc50 View commit details
    Browse the repository at this point in the history

  2. Not great solution 

    (cherry picked from commit 47684c6)
    @p1nkydev @OleksandNekrasov
    p1nkydev authored and OleksandNekrasov committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    7705ae6 View commit details
    Browse the repository at this point in the history

  3. Activity redesign ready 

    (cherry picked from commit 5c37c47)
    @p1nkydev @OleksandNekrasov
    p1nkydev authored and OleksandNekrasov committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    fcf8121 View commit details
    Browse the repository at this point in the history

  4. Fragment redesign ready 

    (cherry picked from commit 005a019)
    @p1nkydev @OleksandNekrasov
    p1nkydev authored and OleksandNekrasov committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    8589213 View commit details
    Browse the repository at this point in the history

  5. Dot placed little upper 

    (cherry picked from commit ef97e61)
    @p1nkydev @OleksandNekrasov
    p1nkydev authored and OleksandNekrasov committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    6a68309 View commit details
    Browse the repository at this point in the history

  6. Applied bottom navigation to UCropFragment and added external api for… 

    … navigation color filter

(cherry picked from commit 5b388eb)
    @p1nkydev @OleksandNekrasov
    p1nkydev authored and OleksandNekrasov committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    e4b9cb8 View commit details
    Browse the repository at this point in the history

  7. Fixed androidx transition dependencies

    @OleksandNekrasov
    OleksandNekrasov committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    d13b4ab View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Applied new color schema to uCrop controls

    @OleksandNekrasov
    OleksandNekrasov committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    3a93d08 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2019

  1. Apply UI improvements

    @OleksandNekrasov
    OleksandNekrasov committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    83636c1 View commit details
    Browse the repository at this point in the history

  2. Added ripple effect to rotate controls

    @OleksandNekrasov
    OleksandNekrasov committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    14bd336 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2019

  1. Merge pull request #562 from Yalantis/feature/non-native_apply_materi… 

    …al_design

Feature/non native apply material design
    @ukevgen
    ukevgen committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    2f09f41 View commit details
    Browse the repository at this point in the history

  2. Execute AsyncTask in a parallel manner

    @OleksandNekrasov
    OleksandNekrasov committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    e9e473d View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2019

  1. Merge pull request #564 from Yalantis/feature/non-native_asynctask_in… 

    …_parallel

Execute AsyncTask in a parallel manner
    @ukevgen
    ukevgen committed Sep 13, 2019
    Configuration menu
    Copy the full SHA
    10bb333 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. Merge branch 'feature/non_native' into feature/merge_non_native_updat… 

    …es_to_master

# Conflicts:
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	sample/build.gradle
#	ucrop/build.gradle
#	ucrop/src/main/java/com/yalantis/ucrop/UCropActivity.java
#	ucrop/src/main/java/com/yalantis/ucrop/UCropFragment.java
#	ucrop/src/main/res/drawable/ucrop_ic_crop.xml
#	ucrop/src/main/res/drawable/ucrop_ic_crop_unselected.xml
#	ucrop/src/main/res/drawable/ucrop_ic_rotate.xml
#	ucrop/src/main/res/drawable/ucrop_ic_rotate_unselected.xml
#	ucrop/src/main/res/drawable/ucrop_ic_scale.xml
#	ucrop/src/main/res/drawable/ucrop_ic_scale_unselected.xml
#	ucrop/src/main/res/layout/ucrop_controls.xml
#	ucrop/src/main/res/layout/ucrop_layout_rotate_wheel.xml
#	ucrop/src/main/res/values/colors.xml
#	ucrop/src/main/res/values/styles.xml
    @OleksandNekrasov
    OleksandNekrasov committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    3fa0481 View commit details
    Browse the repository at this point in the history