yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "迁移Android X"

Browse Source 
This reverts commit 6df2d64ddb.
This commit is contained in:
oujunhui
2020-04-09 12:35:00 +08:00
parent c8b351c82e
commit 06bd068125
1188 changed files with 3322 additions and 2788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_crop_lib/build.gradle
View File

@@ -20,7 +20,7 @@ android {
}
dependencies {
api 'androidx.annotation:annotation:1.1.0'
api 'androidx.legacy:legacy-support-v4:1.0.0'
api 'com.android.support:support-annotations:23.0.1'
api 'com.android.support:support-v4:26.0.1'
}

8
android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java
View File

@@ -124,7 +124,7 @@ public class Crop {
* @param context Context
* @param fragment Fragment to receive result
*/
public void start(Context context, androidx.fragment.app.Fragment fragment) {
public void start(Context context, android.support.v4.app.Fragment fragment) {
start(context, fragment, REQUEST_CROP);
}
@@ -147,7 +147,7 @@ public class Crop {
* @param fragment Fragment to receive result
* @param requestCode requestCode for result
*/
public void start(Context context, androidx.fragment.app.Fragment fragment, int requestCode) {
public void start(Context context, android.support.v4.app.Fragment fragment, int requestCode) {
fragment.startActivityForResult(getIntent(context), requestCode);
}
@@ -206,7 +206,7 @@ public class Crop {
* @param context Context
* @param fragment Fragment to receive result
*/
public static void pickImage(Context context, androidx.fragment.app.Fragment fragment) {
public static void pickImage(Context context, android.support.v4.app.Fragment fragment) {
pickImage(context, fragment, REQUEST_PICK);
}
@@ -247,7 +247,7 @@ public class Crop {
* @param fragment Fragment to receive result
* @param requestCode requestCode for result
*/
public static void pickImage(Context context, androidx.fragment.app.Fragment fragment, int requestCode) {
public static void pickImage(Context context, android.support.v4.app.Fragment fragment, int requestCode) {
try {
fragment.startActivityForResult(getImagePicker(), requestCode);
} catch (ActivityNotFoundException e) {

2
android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java
View File

@@ -3,7 +3,7 @@ package com.soundcloud.android.crop;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Rect;
import androidx.annotation.NonNull;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.view.MotionEvent;

2
android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java
View File

@@ -25,7 +25,7 @@ import android.net.Uri;
import android.os.Handler;
import android.os.ParcelFileDescriptor;
import android.provider.MediaStore;
import androidx.annotation.Nullable;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import java.io.Closeable;