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

Master non native #756

Open
wants to merge 55 commits into
base: develop
Choose a base branch
from
Open

Master non native #756

wants to merge 55 commits into from

Commits on Mar 25, 2019

  1. Fixed crash in UCrop.getOutputCropAspectRatio(data)

    @p1nkydev
    p1nkydev committed Mar 25, 2019
    Configuration menu
    Copy the full SHA
    239190c View commit details
    Browse the repository at this point in the history

  2. branch init

    @p1nkydev
    p1nkydev committed Mar 25, 2019
    Configuration menu
    Copy the full SHA
    336127e View commit details
    Browse the repository at this point in the history

  3. branch init

    @p1nkydev
    p1nkydev committed Mar 25, 2019
    Configuration menu
    Copy the full SHA
    3a154ba View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2019

  1. Merge branch 'feature/non_native' into develop-non-native

    @p1nkydev
    p1nkydev committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    7cfef60 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2019

  1. Merge pull request #498 from Yalantis/bugfix/aspect_ratio_crash 

    Fixed crash in UCrop.getOutputCropAspectRatio(data)
    @ukevgen
    ukevgen committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    c39dcd4 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2019

  1. Merge branch 'feature/redesign' into develop-non-native 

    # Conflicts:
#	ucrop/build.gradle
    @p1nkydev
    p1nkydev committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    0f559e7 View commit details
    Browse the repository at this point in the history

  2. Dependencies versions update

    @p1nkydev
    p1nkydev committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    91ee731 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #506 from Yalantis/feature/redesign_non_native 

    Feature/redesign non native
    @ukevgen
    ukevgen committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    50ee19f View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. Merge pull request #508 from Yalantis/bugfix/sample_max_size_crash 

    Bugfix/sample max size crash
    @ukevgen
    ukevgen committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    5f8f590 View commit details
    Browse the repository at this point in the history

  2. update readme and app version 2.2.3 with version code 24

    ukevgen committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    c1b6788 View commit details
    Browse the repository at this point in the history

  3. gradle properties sync library version

    ukevgen committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    6ed883e View commit details
    Browse the repository at this point in the history

  4. gradle properties add non-native part

    ukevgen committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    765d7ac View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2019

  1. Merge pull request #510 from Yalantis/develop-non-native 

    prepared for new "non-native" release: redesign + fixes
    @Julia-Ts
    Julia-Ts committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    830d924 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

  2. Merge pull request #568 from Yalantis/feature/merge_non_native_update… 

    …s_to_master

Feature/merge non native updates to master
    @ukevgen
    ukevgen committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    df14c58 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Merge pull request #612 from Yalantis/fix/active_color_widget_issue_6… 

    …02_non_native

Implement color applying for scale and angle texts, fixing color appl…
    Kirill committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    901f480 View commit details
    Browse the repository at this point in the history

  2. Changed AppCompatActivity to Activity for UCrop.start.

    @p1nkydev
    p1nkydev committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    b624c61 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. Improve layout

    @hearsilent
    hearsilent committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    9c49279 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #633 from hearsilent/feature/non_native_improve_la… 

    …yout

Improve layout
    Kirill committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    ba16db9 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. Merge remote-tracking branch 'origin/master-non-native' into feature/… 

    …non_native
    ukevgen committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    aeffca7 View commit details
    Browse the repository at this point in the history

  2. up version to 2.2.5

    ukevgen committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    684dd33 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2020

  1. Merge pull request #644 from Yalantis/feature/non_native 

    Feature/non native
    @ukevgen
    ukevgen committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    411a11f View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2020

  1. Fixed cropped image size. 

    Fixed high-resolution crash.
Fixed image saving on Android Q.
    alexeyzalesskyi committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    6b2336e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #693 from zalesskyi/fix/uCrop_non_native_result_size 

    Fixed cropped image size.
    @warko-san
    warko-san committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    281c8e6 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2021

  1. Fix for problems with input and output File Uri with "content" schema. 

    Fix for using uCrop with SAF (Storage Access Framework) on Android 10 and newer.
Sample app changed for context file testing. Added a "choose file destination" button and some other associated controls.
    @fabio-blanco
    fabio-blanco committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    eaa73c7 View commit details
    Browse the repository at this point in the history

  2. Typo fix on sample app button

    @fabio-blanco
    fabio-blanco committed Jan 17, 2021
    Configuration menu
    Copy the full SHA
    aeed753 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2021

  1. Added ability to set custom OkHttpClient for image downloading 

    Updated okhttp dependency for uCrop
Added custom OkHttpClient for sample due to outdated random pic url
    @DeMoss15
    DeMoss15 committed May 20, 2021
    Configuration menu
    Copy the full SHA
    a4c89a1 View commit details
    Browse the repository at this point in the history

  2. added documentation for UCropHttpClientStore methods

    @DeMoss15
    DeMoss15 committed May 20, 2021
    Configuration menu
    Copy the full SHA
    fd919ea View commit details
    Browse the repository at this point in the history

  3. NullPointerException protection on weak reference of context get on c… 

    …rop method.
    @fabio-blanco
    fabio-blanco committed May 20, 2021
    Configuration menu
    Copy the full SHA
    22b24ba View commit details
    Browse the repository at this point in the history

Commits on May 21, 2021

  1. added UCropInitializer, 

    added instruction for README.md
    @DeMoss15
    DeMoss15 committed May 21, 2021
    Configuration menu
    Copy the full SHA
    fd65166 View commit details
    Browse the repository at this point in the history

  2. Refactorings on BitmapCropTask for improving readability protections … 

    …against null pointer exceptions and minor performance improvements
    @fabio-blanco
    fabio-blanco committed May 21, 2021
    Configuration menu
    Copy the full SHA
    eb2d32f View commit details
    Browse the repository at this point in the history

Commits on May 24, 2021

  1. Merge pull request #758 from Yalantis/fix/non_native_ssl_handshake_ex… 

    …ception

Custom OkHttpClient
    @severianremi
    severianremi committed May 24, 2021
    Configuration menu
    Copy the full SHA
    32e0fcd View commit details
    Browse the repository at this point in the history

  2. Added an IllegalArgumentException in the copyFile method to inform th… 

    …at an unsupported URI was used.
    @fabio-blanco
    fabio-blanco committed May 24, 2021
    Configuration menu
    Copy the full SHA
    586493a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master-non-native' into merge_non_native_android-10_saf… 

    …-destination-file

# Conflicts:
#	ucrop/src/main/java/com/yalantis/ucrop/task/BitmapLoadTask.java
    @fabio-blanco
    fabio-blanco committed May 24, 2021
    Configuration menu
    Copy the full SHA
    cd17761 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2021

  1. Merge pull request #732 from fabio-blanco/fix/non_native_android-10_s… 

    …af-destination-file

Fix for problems with input and output File Uri with "content" schema and Android 10 SAF new requirements.
    @DeMoss15
    DeMoss15 committed May 25, 2021
    Configuration menu
    Copy the full SHA
    0ff3e6a View commit details
    Browse the repository at this point in the history

  2. Updated dependencies 

    Removed redundant jcenter mention from README.md
Handled content case in ResultActivity
Code style correction
    @DeMoss15
    DeMoss15 committed May 25, 2021
    Configuration menu
    Copy the full SHA
    70546c1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #762 from Yalantis/improve/update_sample_app 

    Updated dependencies, resolve unexpected error on result screen
    @severianremi
    severianremi committed May 25, 2021
    Configuration menu
    Copy the full SHA
    64c8f5b View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2022

  1. Migrate jcenter usage to mavenCentral 

    Signed-off-by: dmorozov <[email protected]>
    @dmytro1morozov
    dmytro1morozov committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    b89a37c View commit details
    Browse the repository at this point in the history

  2. add zh locale strings

    @TelephoneTan @dmytro1morozov
    TelephoneTan authored and dmytro1morozov committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    1d6f5f9 View commit details
    Browse the repository at this point in the history

  3. Add ru locale

    @alesharik @dmytro1morozov
    alesharik authored and dmytro1morozov committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    0541494 View commit details
    Browse the repository at this point in the history

  4. nl locale

    @rielcs @dmytro1morozov
    rielcs authored and dmytro1morozov committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    f3d915e View commit details
    Browse the repository at this point in the history

  5. Add Farsi (Persian) string translations

    @momvart @dmytro1morozov
    momvart authored and dmytro1morozov committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    9443f87 View commit details
    Browse the repository at this point in the history

  6. update german localization

    @hdruse @dmytro1morozov
    hdruse authored and dmytro1morozov committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    2e1b5b5 View commit details
    Browse the repository at this point in the history

  7. feat(i18n): update Simplified and traditional Chinese language

    @snowyu @dmytro1morozov
    snowyu authored and dmytro1morozov committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    b66e256 View commit details
    Browse the repository at this point in the history

  8. fix portuguese language file

    @luisvasquez @dmytro1morozov
    luisvasquez authored and dmytro1morozov committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    5cedf34 View commit details
    Browse the repository at this point in the history

  9. added google translated Thai, Indonesian and Turkish languages

    @luisvasquez @dmytro1morozov
    luisvasquez authored and dmytro1morozov committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    047ea79 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2022

  1. fix aspect ratio bugs 

    - change fallback for EXTRA_ASPECT_RATIO_X and EXTRA_ASPECT_RATIO_Y to "-1" as "0" has special meaning
- fix usage of useSourceImageAspectRatio (now properly hides mWrapperStateAspectRatio)
- fix setTargetAspectRatio at processOptions due to Float.NaN (allows custom aspect ratio definitions with default ratio set to x=CropImageView.DEFAULT_ASPECT_RATIO and y=CropImageView.DEFAULT_ASPECT_RATIO)
- fix sanity check at setAspectRatioOptions
    @dmytro1morozov
    Johannes Puchberger authored and dmytro1morozov committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    35d4ca6 View commit details
    Browse the repository at this point in the history

  2. Improve readme

    @Drjacky @dmytro1morozov
    Drjacky authored and dmytro1morozov committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    5b1d592 View commit details
    Browse the repository at this point in the history

  3. Added functionality to enable/disable gestures in GestureCropImageView

    @dmytro1morozov
    Prem Suman authored and dmytro1morozov committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    38d909d View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2022

  1. Merge pull request #812 from Yalantis/improve/non_native/2.2.8-prs_in… 

    …tegration

Improve/non native/2.2.8 prs integration
    @severianremi
    severianremi committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    2f52086 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2022

  1. Update compileSdk and targetSdk versions up to 31 

    Signed-off-by: dmorozov <[email protected]>
    @dmytro1morozov
    dmytro1morozov committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    7ee5fe9 View commit details
    Browse the repository at this point in the history

  2. Fix launch of sample app on Android 12

    @denylok @dmytro1morozov
    denylok authored and dmytro1morozov committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    2149b63 View commit details
    Browse the repository at this point in the history

  3. Fix Vector drawable issue on Android 5.0 

    - Correct the vector drawable path due to bad rendering

Signed-off-by: dmorozov <[email protected]>
    @dmytro1morozov
    dmytro1morozov committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    e957285 View commit details
    Browse the repository at this point in the history

  4. Release 2.2.8 

    - Update README.md
- Update version to 2.2.8 in gradle

Signed-off-by: dmorozov <[email protected]>
    @dmytro1morozov
    dmytro1morozov committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    161c792 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #815 from Yalantis/develop-non-native 

    Release 2.2.8
    @severianremi
    severianremi committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    5b190f0 View commit details
    Browse the repository at this point in the history