Skip to content

Commit

Permalink
Merge pull request #615 from Yalantis/fix/crash_vector_drawable_fix_n…
Browse files Browse the repository at this point in the history
…ative

Fix vector drawable crash on device < 21 api native
  • Loading branch information
Kirill authored Mar 18, 2020
2 parents f876977 + 740730a commit 74cc268
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ucrop/src/main/java/com/yalantis/ucrop/UCropActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.transition.AutoTransition;
Expand Down Expand Up @@ -116,6 +117,10 @@ public class UCropActivity extends AppCompatActivity {
private int mCompressQuality = DEFAULT_COMPRESS_QUALITY;
private int[] mAllowedGestures = new int[]{SCALE, ROTATE, ALL};

static {
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
}

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down
5 changes: 5 additions & 0 deletions ucrop/src/main/java/com/yalantis/ucrop/UCropFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.transition.AutoTransition;
Expand Down Expand Up @@ -94,6 +95,10 @@ public class UCropFragment extends Fragment {
private int mCompressQuality = DEFAULT_COMPRESS_QUALITY;
private int[] mAllowedGestures = new int[]{SCALE, ROTATE, ALL};

static {
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
}

public static UCropFragment newInstance(Bundle uCrop) {
UCropFragment fragment = new UCropFragment();
fragment.setArguments(uCrop);
Expand Down

0 comments on commit 74cc268

Please sign in to comment.